From e06313b6dba4774aef0924f342f13e8433f8d6f6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 01 十二月 2023 15:32:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/warehouse/pallettransports/index.vue | 151 ++++++++++++++++++++++++++------------------------
1 files changed, 78 insertions(+), 73 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index ca2d4ea..78fcdff 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -90,7 +90,8 @@
</div>
<div style="margin-top:10px;display:flex;height:36px;justify-content: space-between;align-items:center;">
<div>
- <span style="font-weight:bold;">绉诲簱鏄庣粏</span><span style="color:red;">({{
+ <span style="font-weight:bold;">绉诲簱鏄庣粏</span>
+ <span style="color:red;">({{
palletTransportsMaterialMultipleSelection.length > 0
? palletTransportsMaterialMultipleSelection[
palletTransportsMaterialMultipleSelection.length - 1
@@ -112,27 +113,27 @@
v-adaptive="{ bottomOffset: 20, fixedHeight: 0 }" height="100px" border
@selection-change="palletTransportsDetailSelectionChange" stripe ref="palletTransportsDetailTable">
<el-table-column type="selection" width="55"> </el-table-column>
- <el-table-column prop="partNo" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
+ <el-table-column prop="part_no" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="partDesc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
+ <el-table-column prop="part_desc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
</el-table-column>
<!-- <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 prop="operationTaskNo" label="宸ュ崟" align="center" show-overflow-tooltip>
+ <el-table-column prop="operation_task_no" label="宸ュ崟" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="transferQuantity" label="绉诲簱鏁伴噺" align="center">
+ <el-table-column prop="transfer_quantity" 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="toIfsLocationNo" label="绉昏嚦搴撲綅" align="center">
- <template slot-scope="scope">
+ <el-table-column prop="to_ifs_location_no" label="绉昏嚦搴撲綅" align="center">
+ <!-- <template slot-scope="scope">
<el-link type="primary" @click="openSingleLocationDialog(scope.row)">{{ scope.row.toIfsLocationNo
}}</el-link>
- </template>
+ </template> -->
</el-table-column>
<el-table-column prop="state" label="鐘舵��" align="center">
<template slot-scope="scope">
@@ -147,8 +148,8 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="85">
<template slot-scope="scope">
- <el-button type="text" @click="openEditStockDialog(scope.row)"
- :disabled="scope.row.state === '01initial' ? false : true">缂栬緫</el-button>
+ <!-- <el-button type="text" @click="openEditStockDialog(scope.row)"
+ :disabled="scope.row.state === '01initial' ? false : true">缂栬緫</el-button> -->
<el-button type="text" @click="delDetail(scope.row)"
:disabled="scope.row.state === '01initial' ? false : true">鍒犻櫎</el-button>
</template>
@@ -187,7 +188,8 @@
delPalletTransportsMaterialObj,
palletTransportsDetailFetchList,
delPalletTransportsDetailObj,
- executeMoveLocation
+ executeMoveLocation,
+ selectAll,
} from '@/api/warehouse/pallettransports'
import { getByPalletTransId } from '@/api/plan/operationtask'
import ttable from '@/views/common/ztt-table.vue'
@@ -203,6 +205,7 @@
export default {
data() {
return {
+ partDesc: null,
ajaxFun: palletTransportsFetchList,
currPalletTransportsRow: null,
palletTransportsMaterialMultipleSelection: [],
@@ -213,6 +216,7 @@
url: ''
},
WorkOrder:{},
+ datalistAPI:'',
prelang: 'pallettransports',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -344,6 +348,15 @@
},
computed: {
...mapGetters(['permissions'])
+ },
+ watch:{
+ palletTransportsMaterialMultipleSelection(newVal){
+ if(newVal.length>0){
+ this.palletTransportsMaterialSelectionChange(newVal)
+ }else{
+ this.palletTransportsDetailData = []
+ }
+ }
},
created() { },
methods: {
@@ -546,70 +559,52 @@
},
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
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)
+ // console.log("瀵瑰簲宸ュ崟",this.WorkOrder);
+ // console.log("閫変腑鐗╂枡闇�姹�",this.palletTransportsMaterialMultipleSelection);
+ let transportsDetails =[]
+ transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
+ return{
+ partNo:el.partNo,
+ partDesc: el.partDesc,
+ transferQuantity: el.surplusQuantity,
+ toIfsLocationNo:el.toIfsLocationNo,
+ toIfsLocationName: el.toIfsLocationName,
+ transportsId: el.transportsId,
+ transportsMaterialId:el.id,
+ operationTaskNo:this.WorkOrder.optaskNo,
+ operationTaskId:this.WorkOrder.id,
+ unit: el.unit,
+ }})
+ // this.palletTransportsDetailData = transportsDetails
+ if (transportsDetails.length > 0) {
+ let selectionList = this.palletTransportsMaterialMultipleSelection
+ saveBatchPalletTransportsDetail(transportsDetails)
.then((response) => {
const resData = response.data
if (resData.code === 0) {
this.innerVisible = false
this.$message.success('娣诲姞绉诲簱鏄庣粏鎴愬姛')
- this.$emit('refreshDataList')
+ let materialRow = selectionList[selectionList.length - 1]
+ console.log("materialRow-----",materialRow);
+ this.palletTransportsMaterialData.forEach(ele=>{
+ if(ele.id==materialRow.id){
+ console.log("ele-------",ele);
+ ele.transferQuantity = materialRow.surplusQuantity
+ ele.surplusQuantity = 0
+ }
+ })
} else {
this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
}
- this.isSubmit = true
+ // this.getPalletTransportsMaterialData()
+ this.palletTransportsMaterialSelectionChange(selectionList)
})
- .catch(() => {
- this.isSubmit = true
- })
+ // .catch(() => {
+ // })
}
- // 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() {
- // 鍒锋柊鐗╂枡闇�姹傘�佸埛鏂扮Щ搴撴槑缁�
- // this.getPalletTransportsMaterialData()
- // 鍒锋柊璐х洏杩愯緭浠诲姟鍒楄〃
- // if (this.showStock) {
- // this.getPallettransportsData()
- // }
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -638,10 +633,11 @@
},
// 鎵撳紑鍗曚釜鏄庣粏鎵归噺鏇存柊搴撲綅寮规
openSingleLocationDialog(row) {
+ console.log(row);
if (row.state === '01initial') {
this.detailList = []
this.detailList.push(row)
- this.showDetailLocation = true
+ // this.showDetailLocation = true
} else {
this.$message.error('绉诲簱鏄庣粏宸叉墽琛�')
}
@@ -724,16 +720,26 @@
},
palletTransportsMaterialSelectionChange(val) {
this.palletTransportsMaterialMultipleSelection = val
- if (this.palletTransportsMaterialMultipleSelection.length > 0) {
- const currPalletTransportsMaterial = this
- .palletTransportsMaterialMultipleSelection[
- this.palletTransportsMaterialMultipleSelection.length - 1
- ]
- this.materialRow = currPalletTransportsMaterial
- } else {
- this.materialRow = null
+ console.log(this.palletTransportsMaterialMultipleSelection);
+ if(val && val.length>0){
+ let ids =[]
+ this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
+ let pId = ids[ids.length - 1];
+ console.log(pId);
+ if(pId!=null){
+ selectAll({
+ transportsId:this.currPalletTransportsRow.id,
+ transportsMaterialId: pId
+ }).then((res) =>{
+ this.palletTransportsDetailData = []
+ if(res.data.data){
+ this.palletTransportsDetailData.push(res.data.data)
+ }
+ })
+ }else{
+ this.palletTransportsDetailData = []
+ }
}
- // this.getPalletTransportsDetailData()
},
palletTransportsDetailSelectionChange(val) {
this.palletTransportsDetailMultipleSelection = val
@@ -750,7 +756,6 @@
})
},
optaskRowClick(row, column) {
- console.log(row,222222222222222);
this.WorkOrder = row
this.palletTransportsOptaskData.forEach((item) => {
if (row.id !== item.id) {
--
Gitblit v1.9.3