From 9f3c0368dba21e16eeb921f8f53c115b8e21eede Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期六, 25 十一月 2023 10:18:01 +0800
Subject: [PATCH] modified: src/views/warehouse/pallettransports/index.vue modified: vue.config.js
---
src/views/warehouse/pallettransports/index.vue | 107 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 68 insertions(+), 39 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index 88571e8..ca2d4ea 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -17,7 +17,8 @@
<div></div>
</div>
<div style="padding:0px 20px 0px;">
- <el-table class="pallet-transports-optask-table" :data="palletTransportsOptaskData" style="width: 100%;"
+ <el-table class="pallet-transports-optask-table" :data="palletTransportsOptaskData"
+ style="width: 100%;"
v-adaptive="{ bottomOffset: 20, fixedHeight: 0 }" height="100px" border highlight-current-row
@row-click="optaskRowClick" stripe ref="palletTransportsOptaskTable">
<el-table-column align="center" width="55" label="鍗曢��">
@@ -99,7 +100,7 @@
</div>
<div>
<el-button type="primary" v-if="permissions.warehouse_pallettransports_detail_add" round
- @click="openStockDialog">娣诲姞鏄庣粏</el-button>
+ @click="getPalletTransportsDetailData">娣诲姞鏄庣粏</el-button>
<!-- <el-button type="warning" v-if="permissions.warehouse_pallettransports_detail_library" round
@click="openDetailLocationDialog">涓�閿嚦搴撲綅</el-button> -->
<el-button type="success" v-if="permissions.warehouse_pallettransports_detail_execute" round
@@ -115,18 +116,18 @@
</el-table-column>
<el-table-column prop="partDesc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="batchNo" label="鎵规鍙�" align="center" show-overflow-tooltip>
+ <!-- <el-table-column prop="batchNo" label="鎵规鍙�" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="wdr" label="WDR" align="center">
- </el-table-column>
+ </el-table-column> -->
<el-table-column prop="operationTaskNo" label="宸ュ崟" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="transferQuantity" label="绉诲簱鏁伴噺" align="center">
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" align="center">
</el-table-column>
- <el-table-column prop="fromIfsLocationNo" label="IFS浠庡簱浣�" align="center">
- </el-table-column>
+ <!-- <el-table-column prop="fromIfsLocationNo" label="IFS浠庡簱浣�" align="center">
+ </el-table-column> -->
<el-table-column prop="toIfsLocationNo" label="绉昏嚦搴撲綅" align="center">
<template slot-scope="scope">
<el-link type="primary" @click="openSingleLocationDialog(scope.row)">{{ scope.row.toIfsLocationNo
@@ -198,7 +199,7 @@
import detailIfsLocationDialog from './detail-ifslocation-form'
import adaptive from '@/util/adaptive'
import { mapGetters } from 'vuex'
-
+import { saveBatchPalletTransportsDetail } from '@/api/warehouse/pallettransports'
export default {
data() {
return {
@@ -211,6 +212,7 @@
isShow: false,
url: ''
},
+ WorkOrder:{},
prelang: 'pallettransports',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -415,31 +417,6 @@
}
})
},
- // 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
- getPalletTransportsDetailData() {
- this.palletTransportsDetailData = []
- if (this.palletTransportsMaterialMultipleSelection.length > 0) {
- const currPalletTransportsMaterial = this
- .palletTransportsMaterialMultipleSelection[
- this.palletTransportsMaterialMultipleSelection.length - 1
- ]
- const queryParam = Object.assign(
- {
- current: 1,
- size: 200
- },
- {
- transportsMaterialId: currPalletTransportsMaterial.id
- }
- )
- palletTransportsDetailFetchList(queryParam).then((response) => {
- const resData = response.data
- if (resData.code === 0) {
- this.palletTransportsDetailData = resData.data.records
- }
- })
- }
- },
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
if (row != null) {
@@ -567,13 +544,63 @@
}
})
},
- // 鎵撳紑ifs鐗╂枡搴撳瓨鍒楄〃
- openStockDialog() {
- if (this.palletTransportsMaterialMultipleSelection.length > 0) {
- this.showStock = true
- } else {
- this.$message.error('璇峰厛閫夋嫨鐗╂枡闇�姹�')
+ // 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
+ getPalletTransportsDetailData() {
+ console.log("瀵瑰簲宸ュ崟",this.WorkOrder);
+ console.log("鐗╂枡闇�姹�",this.palletTransportsMaterialMultipleSelection);
+ const data = {
+ partNo:this.palletTransportsMaterialMultipleSelection[0].partNo,
+ partDesc: this.palletTransportsMaterialMultipleSelection[0].partDesc,
+ transferQuantity: this.palletTransportsMaterialMultipleSelection[0].transferQuantity,
+ operationTaskNo:this.WorkOrder.optaskNo,
+ unit: this.palletTransportsMaterialMultipleSelection[0].unit,
}
+ const PalletTransportsDetail = []
+ PalletTransportsDetail.push(data)
+ console.log(data,"0000000000000");
+ if (PalletTransportsDetail) {
+ saveBatchPalletTransportsDetail(PalletTransportsDetail)
+ .then((response) => {
+ const resData = response.data
+ if (resData.code === 0) {
+ this.innerVisible = false
+ this.$message.success('娣诲姞绉诲簱鏄庣粏鎴愬姛')
+ this.$emit('refreshDataList')
+ } else {
+ this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
+ }
+ this.isSubmit = true
+ })
+ .catch(() => {
+ this.isSubmit = true
+ })
+ }
+ // else {
+ // this.$message.error('璇烽�夋嫨IFS搴撳瓨鐗╂枡')
+ // }
+
+ // this.palletTransportsDetailData = []
+ // console.log(this.palletTransportsMaterialMultipleSelection);
+
+ // if (this.palletTransportsMaterialMultipleSelection.length > 0) {
+ // const currPalletTransportsMaterial = this
+ // .palletTransportsMaterialMultipleSelection[
+ // this.palletTransportsMaterialMultipleSelection.length - 1
+ // ]
+ // let obj = {
+ // partNo: currPalletTransportsMaterial.partNo,
+ // partDesc: currPalletTransportsMaterial.partDesc,
+ // operationTaskNo: this.currOptask.optaskNo,
+ // transferQuantity: currPalletTransportsMaterial.surplusQuantity,
+ // unit: currPalletTransportsMaterial.unit,
+ // toIfsLocationNo: currPalletTransportsMaterial.currPalletTransportsMaterial,
+ // state: null
+ // }
+ // this.palletTransportsDetailData.push(obj)
+ // } else {
+ // this.$message.error('璇峰厛閫夋嫨鐗╂枡闇�姹�')
+ // }
+
},
// 娣诲姞ifs鐗╂枡搴撳瓨鍥炶皟
addIfsStockCallback() {
@@ -706,7 +733,7 @@
} else {
this.materialRow = null
}
- this.getPalletTransportsDetailData()
+ // this.getPalletTransportsDetailData()
},
palletTransportsDetailSelectionChange(val) {
this.palletTransportsDetailMultipleSelection = val
@@ -723,6 +750,8 @@
})
},
optaskRowClick(row, column) {
+ console.log(row,222222222222222);
+ this.WorkOrder = row
this.palletTransportsOptaskData.forEach((item) => {
if (row.id !== item.id) {
item.commonChecked = false
--
Gitblit v1.9.3