From d57245673fc928ea55dc7a057d643261122ab61c Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期四, 28 十二月 2023 15:44:45 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before --- src/views/warehouse/pallettransports/index.vue | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue index 152aa20..65e2ed9 100644 --- a/src/views/warehouse/pallettransports/index.vue +++ b/src/views/warehouse/pallettransports/index.vue @@ -401,7 +401,7 @@ part_no:el.partNo, part_desc:el.partDesc, operation_task_no:el.operationTaskNo, - transfer_quantity:0, + transfer_quantity:el.transferQuantity, unit:el.unit, to_ifs_location_no:el.toIfsLocationName, state:el.state, @@ -651,7 +651,7 @@ return{ partNo:el.partNo, partDesc: el.partDesc, - transferQuantity: el.surplusQuantity, + transferQuantity: 0, toIfsLocationNo:el.toIfsLocationNo, toIfsLocationName: el.toIfsLocationName, transportsId: el.transportsId, @@ -676,6 +676,7 @@ ele.surplusQuantity = 0 } }) + this.getPalletTransportsMaterialData() } else { this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触') } @@ -750,17 +751,35 @@ moveLocation(val){ console.log(val,"---->"); let num = Number(val.transfer_quantity) - if (val.state !="02submitted") { - updateStock({id:val.id,transferQuantity:num}).then((res) =>{ - console.log(res,"------>1"); - this.getPalletTransportsMaterialData() + this.palletTransportsDetailMultipleSelection.forEach(el =>{ + console.log(el.transfer_quantity); + el.transfer_quantity = num }) - }else{ - this.$message.error('绉诲簱宸茬粡鎵ц') - } + console.log(this.palletTransportsDetailMultipleSelection,"--->123"); + }, // 鎵ц绉诲簱 executeMove() { + let data = [] + data = this.palletTransportsDetailMultipleSelection.map(el =>{ + return { + id:el.id, + transferQuantity:el.transfer_quantity + } + }) + console.log(data,"----------++++++++"); + if (data.length>0) { + // if(data[0].transferQuantity){ + updateStock(data).then((res) =>{ + console.log(res,"------>1"); + this.getPalletTransportsMaterialData() + }) + // }else{ + // this.$message.error('绉诲簱涓嶈兘灏忎簬0') + // } + }else{ + this.$message.error('绉诲簱宸茬粡鎵ц') + } if ( this.palletTransportsDetailMultipleSelection && this.palletTransportsDetailMultipleSelection.length > 0 @@ -797,6 +816,7 @@ } else { this.$message.error('璇烽�夋嫨绉诲簱鏄庣粏') } + }, selectDetailLocationCallback() { this.getPalletTransportsDetailData() -- Gitblit v1.9.3