From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/warehouse/pallettransports/index.vue | 21 +++++----------------
1 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index caff534..5303f6a 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -376,7 +376,6 @@
}
})
this.palletTransportsMaterialSelectionChange([row])
- console.log(row);
},
// 宸ヨ壓绫诲瀷涓枃鏍煎紡鍖�
formatStateType(row, column, cellValue) {
@@ -518,12 +517,10 @@
openLocationDialog() {
if (this.palletTransportsMaterialMultipleSelection.length > 0) {
let flag = true
- console.log(this.palletTransportsMaterialMultipleSelection)
this.palletTransportsMaterialMultipleSelection.forEach((item) => {
if (item.detailExistState) {
flag = false
}
- console.log(item.detailExistState)
})
if (flag) {
this.showLocation = true
@@ -578,8 +575,6 @@
},
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
getPalletTransportsDetailData() {
- // console.log("瀵瑰簲宸ュ崟",this.WorkOrder);
- // console.log("閫変腑鐗╂枡闇�姹�",this.palletTransportsMaterialMultipleSelection);
let transportsDetails =[]
transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
return{
@@ -604,10 +599,8 @@
this.innerVisible = false
this.$message.success('娣诲姞绉诲簱鏄庣粏鎴愬姛')
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
}
@@ -652,7 +645,6 @@
},
// 鎵撳紑鍗曚釜鏄庣粏鎵归噺鏇存柊搴撲綅寮规
openSingleLocationDialog(row) {
- console.log(row);
if (row.state === '01initial') {
this.detailList = []
this.detailList.push(row)
@@ -663,17 +655,15 @@
},
// 鍒犻櫎绉诲簱鏄庣粏
delDetail(row) {
- /* const delRow = this.palletTransportsDetailData.find((item) => {
+ const delRow = this.palletTransportsDetailData.find((item) => {
return item.id === row.id
- }) */
-
+ })
delPalletTransportsDetailObj(row.id).then((response) => {
const resData = response.data
if (resData.code === 0) {
- // const findRowIndex = this.palletTransportsDetailData.indexOf(delRow)
- // this.palletTransportsDetailData.splice(findRowIndex, 1)
+ const findRowIndex = this.palletTransportsDetailData.indexOf(delRow)
+ this.palletTransportsDetailData.splice(findRowIndex, 1)
this.$message.success('绉诲簱鏄庣粏鍒犻櫎鎴愬姛')
- // this.getPalletTransportsMaterialData()
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -705,6 +695,7 @@
if (resData.code === 0) {
this.$message.success('鎵ц鎴愬姛')
// this.getPalletTransportsMaterialData()
+ this.palletTransportsDetailData=[]
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -739,12 +730,10 @@
},
palletTransportsMaterialSelectionChange(val) {
this.palletTransportsMaterialMultipleSelection = val
- 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,
--
Gitblit v1.9.3