From 8b6af70e74af8c918524eb2f65e18ac2f5258b16 Mon Sep 17 00:00:00 2001 From: jsy_zjg <31502350@qq.com> Date: Thu, 13 Feb 2025 10:18:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E8=B4=A7?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/retrace/transferGoodsAdd.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/retrace/transferGoodsAdd.vue b/pages/retrace/transferGoodsAdd.vue index 6d322d7..76c10ac 100644 --- a/pages/retrace/transferGoodsAdd.vue +++ b/pages/retrace/transferGoodsAdd.vue @@ -181,6 +181,7 @@ } } this.getDeviceStorageUserList(); + this.getDeviceStorageData(); this.getPdaDeviceData(); if (this.type == "edit") { this.getDeviceBill(); @@ -349,6 +350,7 @@ //获取调货仓库 getDeviceStorageData() { getDeviceStorageList().then(res => { + console.log(res) if (res && res.data) { this.storageOutData = res.data.map( item => { From 3aac9f556cfb8d956e8d262ad10c27d343fa496c Mon Sep 17 00:00:00 2001 From: jsy_zjg <31502350@qq.com> Date: Thu, 13 Feb 2025 10:29:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=BD=E6=BA=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/retrace/signBillAdd.vue | 23 ++++++------ pages/retrace/stockRefunAdd.vue | 58 ++++++----------------------- pages/retrace/transferGoodsAdd.vue | 60 ++++++++---------------------- 3 files changed, 37 insertions(+), 104 deletions(-) diff --git a/pages/retrace/signBillAdd.vue b/pages/retrace/signBillAdd.vue index 85f777f..f52215b 100644 --- a/pages/retrace/signBillAdd.vue +++ b/pages/retrace/signBillAdd.vue @@ -45,9 +45,6 @@ {{ item.deviceCode }}：{{ item.deviceTypeName }} - @@ -192,15 +189,17 @@ }, //删除明细 deleteDetail(item) { - let index = this.dataList.findIndex(x => x.deviceId == item.deviceId); - if (index != -1) { - this.dataList.splice(index, 1); - } - if (this.type == "edit") { - //明细时删除明细及更改设备仓库id及在库状态 - deleteDeviceBillWms(item.billDetailId) - .then(res => {}) - } + plugin.modal.confirm("确定删除吗?").then(res => { + let index = this.dataList.findIndex(x => x.deviceId == item.deviceId); + if (index != -1) { + this.dataList.splice(index, 1); + } + if (this.type == "edit") { + //明细时删除明细及更改设备仓库id及在库状态 + deleteDeviceBillWms(item.billDetailId) + .then(res => {}) + } + }) }, onStorageInSelect(e) { this.briefForm.storageInId = e.id diff --git a/pages/retrace/stockRefunAdd.vue b/pages/retrace/stockRefunAdd.vue index 2861e2b..c0c8e97 100644 --- a/pages/retrace/stockRefunAdd.vue +++ b/pages/retrace/stockRefunAdd.vue @@ -10,11 +10,6 @@ - @@ -199,15 +194,17 @@ }, //删除明细 deleteDetail(item) { - let index = this.dataList.findIndex(x => x.deviceId == item.deviceId); - if (index != -1) { - this.dataList.splice(index, 1); - } - if (this.type == "edit") { - //明细时删除明细及更改设备仓库id及在库状态 - deleteDeviceBillWms(item.billDetailId) - .then(res => {}) - } + plugin.modal.confirm("确定删除吗?").then(res => { + let index = this.dataList.findIndex(x => x.deviceId == item.deviceId); + if (index != -1) { + this.dataList.splice(index, 1); + } + if (this.type == "edit") { + //明细时删除明细及更改设备仓库id及在库状态 + deleteDeviceBillWms(item.billDetailId) + .then(res => {}) + } + }) }, onStorageInSelect(e) { this.briefForm.storageInId = e.id @@ -286,12 +283,6 @@ } }) }, - //选择签收单 - onselectBillCode: function() { - uni.navigateTo({ - url: '/pages/retrace/selectDeviceBill?billTypeId=2002' - }); - }, //获取扫码或nfc查询设备 getDeviceInfo(code) { let query = {}; @@ -405,32 +396,5 @@ margin: 0px 20px; } } - - // .item-container { - // margin: 10px 10px; - // background-color: white; - // padding-bottom: 10px; - // border-radius: 10px; - // box-shadow: 1px 1px 2px 2px rgba(0, 0, 0, 0.05); - // } - - // .flex-text { - // display: flex; - // align-items: center; - - // .flex-text-one { - // color: #939393; - // font-weight: bold; - // } - // } - - // .data { - // margin: 10px 20px !important; - // width: 100%; - - // .uni-col { - // margin-bottom: 5px; - // } - // } } \ No newline at end of file diff --git a/pages/retrace/transferGoodsAdd.vue b/pages/retrace/transferGoodsAdd.vue index 76c10ac..d41516a 100644 --- a/pages/retrace/transferGoodsAdd.vue +++ b/pages/retrace/transferGoodsAdd.vue @@ -10,11 +10,6 @@ - @@ -106,10 +101,10 @@ addType: 1, showDeviceModal: false, showStorageIn: false, - showStorageOut:false, + showStorageOut: false, showDevicePda: false, storageInData: [], - storageOutData:[], + storageOutData: [], devicePdaData: [], deviceInfoData: { deviceCode: null @@ -193,7 +188,7 @@ this.briefForm = { billId: null, billTypeId: 2005, - billCode:null, + billCode: null, storageInId: null, storageInName: null, devicePdaId: null, @@ -216,21 +211,23 @@ }, //删除明细 deleteDetail(item) { - let index = this.dataList.findIndex(x => x.deviceId == item.deviceId); - if (index != -1) { - this.dataList.splice(index, 1); - } - if (this.type == "edit") { - //明细时删除明细及更改设备仓库id及在库状态 - deleteDeviceBillWms(item.billDetailId) - .then(res => {}) - } + plugin.modal.confirm("确定删除吗?").then(res => { + let index = this.dataList.findIndex(x => x.deviceId == item.deviceId); + if (index != -1) { + this.dataList.splice(index, 1); + } + if (this.type == "edit") { + //明细时删除明细及更改设备仓库id及在库状态 + deleteDeviceBillWms(item.billDetailId) + .then(res => {}) + } + }) }, onStorageInSelect(e) { this.briefForm.storageInId = e.id this.briefForm.storageInName = e.name }, - onStorageOutSelect(e){ + onStorageOutSelect(e) { this.briefForm.storageOutId = e.id this.briefForm.storageOutName = e.name }, @@ -438,32 +435,5 @@ margin: 0px 20px; } } - - // .item-container { - // margin: 10px 10px; - // background-color: white; - // padding-bottom: 10px; - // border-radius: 10px; - // box-shadow: 1px 1px 2px 2px rgba(0, 0, 0, 0.05); - // } - - // .flex-text { - // display: flex; - // align-items: center; - - // .flex-text-one { - // color: #939393; - // font-weight: bold; - // } - // } - - // .data { - // margin: 10px 20px !important; - // width: 100%; - - // .uni-col { - // margin-bottom: 5px; - // } - // } } \ No newline at end of file From 11ac07d76fa746c1c974eebfe875b6ac89461961 Mon Sep 17 00:00:00 2001 From: jsy_zjg <31502350@qq.com> Date: Thu, 13 Feb 2025 10:46:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/retrace/stockRefunAdd.vue | 19 ++++++++++++++----- pages/retrace/transferGoodsAdd.vue | 19 ++++++++++++++----- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/pages/retrace/stockRefunAdd.vue b/pages/retrace/stockRefunAdd.vue index c0c8e97..58b44c4 100644 --- a/pages/retrace/stockRefunAdd.vue +++ b/pages/retrace/stockRefunAdd.vue @@ -1,11 +1,13 @@