From bb64664360bc37c4a1bc6f665cb90eee0c402930 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Fri, 11 Nov 2022 18:22:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/ProductManage/EmptyPipeInStore.vue | 8 ++--- pages/ProductManage/EmptyPipeOutStore.vue | 8 ++--- pages/ProductManage/SboProcess.vue | 16 ++++----- pages/WarehouseManage/InStoreConfirm.vue | 36 +++++++------------ pages/WarehouseManage/ProdDeliveryConfirm.vue | 16 ++++----- pages/WarehouseManage/ReturngoodsInStore.vue | 9 +++-- pages/WarehouseManage/ScrapInStore.vue | 9 +++-- pages/WarehouseManage/SemifinishedInStore.vue | 9 +++-- .../WarehouseManage/SemifinishedOutStore.vue | 9 +++-- pages/WarehouseManage/XuniDeliveryConfirm.vue | 4 +-- 10 files changed, 54 insertions(+), 70 deletions(-) diff --git a/pages/ProductManage/EmptyPipeInStore.vue b/pages/ProductManage/EmptyPipeInStore.vue index 9c2bd60..2743621 100644 --- a/pages/ProductManage/EmptyPipeInStore.vue +++ b/pages/ProductManage/EmptyPipeInStore.vue @@ -114,14 +114,14 @@ } try { let res = await emptyConfirm(this.pkObj, this.qty, this.val1, '2') - uni.showToast({ - title: res.message, - icon: 'none' - }) this.disabled = false this.pkId = '' this.pkObj = {} this._queryMaterialInfo() + uni.showToast({ + title: res.message, + icon: 'none' + }) } catch (e) { this.disabled = false } diff --git a/pages/ProductManage/EmptyPipeOutStore.vue b/pages/ProductManage/EmptyPipeOutStore.vue index fbebcbb..28ba367 100644 --- a/pages/ProductManage/EmptyPipeOutStore.vue +++ b/pages/ProductManage/EmptyPipeOutStore.vue @@ -114,14 +114,14 @@ } try { let res = await emptyConfirm(this.pkObj, this.qty, this.val1, '1') - uni.showToast({ - title: res.message, - icon: 'none' - }) this.disabled = false this.pkId = '' this.pkObj = {} this._queryMaterialInfo() + uni.showToast({ + title: res.message, + icon: 'none' + }) } catch (e) { this.disabled = false } diff --git a/pages/ProductManage/SboProcess.vue b/pages/ProductManage/SboProcess.vue index 0a411af..34a53bc 100644 --- a/pages/ProductManage/SboProcess.vue +++ b/pages/ProductManage/SboProcess.vue @@ -112,14 +112,14 @@ } try { let res = await needEmptyAxis(this.pkObj) - uni.showToast({ - title: res.message, - icon: 'none' - }) this.disabled1 = false this.pkId = '' this.pkObj = {} this._queryRawFoilList() + uni.showToast({ + title: res.message, + icon: 'none' + }) } catch (e) { this.disabled1 = false } @@ -132,14 +132,14 @@ } try { let res = await confirmBlanking(this.pkObj) - uni.showToast({ - title: res.message, - icon: 'none' - }) this.disabled2 = false this.pkId = '' this.pkObj = {} this._queryRawFoilList() + uni.showToast({ + title: res.message, + icon: 'none' + }) } catch (e) { this.disabled2 = false } diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue index 32ae3a2..6bcb03a 100644 --- a/pages/WarehouseManage/InStoreConfirm.vue +++ b/pages/WarehouseManage/InStoreConfirm.vue @@ -47,8 +47,8 @@ - - {{e.package_box_SN}} + + {{package_box_sn}} {{e.container_name}} {{e.product_name}} {{e.product_description}} @@ -60,8 +60,8 @@ - - + + @@ -82,8 +82,6 @@ val2: '', isV: '0', dataList: [], - pkId: '', - pkObj: {}, disabled: false, disabled1: false }; @@ -104,21 +102,18 @@ /** 确认 */ async _stConfirm () { this.disabled = true - if (!this.pkId) { + if (this.dataList.length === 0) { this.disabled = false return } try { - let res = await stConfirm(this.pkObj, this.val2, '2', this.isV) + let res = await stConfirm(this.dataList, this.val2, '2', this.isV) + this.disabled = false + this._boxQuery(this.val1) uni.showToast({ title: res.message, icon: 'none' }) - this.pkId = '' - this.pkObj = {} - this.disabled = false - this._boxQuery(this.val1) - } catch (e) { this.disabled = false } @@ -126,28 +121,21 @@ /** 补码 */ async _stPrint () { this.disabled1 = true - if (!this.pkId) { + if (this.dataList.length === 0) { this.disabled1 = false return } try { - let res = await stPrint(this.pkObj) + let res = await stPrint(this.dataList) + this.disabled1 = false + this._boxQuery() uni.showToast({ title: res.message, icon: 'none' }) - this.pkId = '' - this.pkObj = {} - this.disabled1 = false - this._boxQuery() - } catch (e) { this.disabled1 = false } - }, - toCheck (e) { - this.pkId = this.pkId === e.package_box_SN ? '' : e.package_box_SN - this.pkObj = this.pkId === e.package_box_SN ? e : {} } } } diff --git a/pages/WarehouseManage/ProdDeliveryConfirm.vue b/pages/WarehouseManage/ProdDeliveryConfirm.vue index d49233c..81ab4bc 100644 --- a/pages/WarehouseManage/ProdDeliveryConfirm.vue +++ b/pages/WarehouseManage/ProdDeliveryConfirm.vue @@ -91,14 +91,14 @@ this.disabled1 = true try { let res = await stoutConfirm(this.dataList, this.val1) - uni.showToast({ - title: res.message, - icon: 'none' - }) this.disabled1 = false this.pkId = '' this.pkObj = {} this._stivtQuery() + uni.showToast({ + title: res.message, + icon: 'none' + }) } catch (e) { this.disabled1 = false } @@ -111,14 +111,14 @@ } try { let res = await stoutPrint(this.pkObj) - uni.showToast({ - title: res.message, - icon: 'none' - }) this.disabled1 = false this.pkId = '' this.pkObj = {} this._stivtQuery() + uni.showToast({ + title: res.message, + icon: 'none' + }) } catch (e) { this.disabled1 = false } diff --git a/pages/WarehouseManage/ReturngoodsInStore.vue b/pages/WarehouseManage/ReturngoodsInStore.vue index 4c0cfff..ce8e5ab 100644 --- a/pages/WarehouseManage/ReturngoodsInStore.vue +++ b/pages/WarehouseManage/ReturngoodsInStore.vue @@ -115,15 +115,14 @@ } try { let res = await stConfirm(this.pkObj, this.val2, '3', this.isV, this.val3) - uni.showToast({ - title: res.message, - icon: 'none' - }) this.pkId = '' this.pkObj = {} this.disabled = false this._boxQuery(this.val1) - + uni.showToast({ + title: res.message, + icon: 'none' + }) } catch (e) { this.disabled = false } diff --git a/pages/WarehouseManage/ScrapInStore.vue b/pages/WarehouseManage/ScrapInStore.vue index bbf1041..1021aff 100644 --- a/pages/WarehouseManage/ScrapInStore.vue +++ b/pages/WarehouseManage/ScrapInStore.vue @@ -108,15 +108,14 @@ } try { let res = await stConfirm(this.pkObj, this.val2, '1', this.isV) - uni.showToast({ - title: res.message, - icon: 'none' - }) this.pkId = '' this.pkObj = {} this.disabled = false this._boxQuery(this.val1) - + uni.showToast({ + title: res.message, + icon: 'none' + }) } catch (e) { this.disabled = false } diff --git a/pages/WarehouseManage/SemifinishedInStore.vue b/pages/WarehouseManage/SemifinishedInStore.vue index fa4a4e0..7b0e77d 100644 --- a/pages/WarehouseManage/SemifinishedInStore.vue +++ b/pages/WarehouseManage/SemifinishedInStore.vue @@ -119,15 +119,14 @@ } try { let res = await confirmInstor(this.pkObj, this.val1, this.index) - uni.showToast({ - title: res.message, - icon: 'none' - }) this.disabled = false this.pkId = '' this.pkObj = {} this._coolIOQuery() - + uni.showToast({ + title: res.message, + icon: 'none' + }) } catch (e) { this.disabled = false } diff --git a/pages/WarehouseManage/SemifinishedOutStore.vue b/pages/WarehouseManage/SemifinishedOutStore.vue index 8db3ff9..4ed2029 100644 --- a/pages/WarehouseManage/SemifinishedOutStore.vue +++ b/pages/WarehouseManage/SemifinishedOutStore.vue @@ -116,15 +116,14 @@ } try { let res = await outconfirmInstor(this.pkObj, this.val1) - uni.showToast({ - title: res.message, - icon: 'none' - }) this.disabled = false this.pkId = '' this.pkObj = {} this._outcoolIOQuery() - + uni.showToast({ + title: res.message, + icon: 'none' + }) } catch (e) { this.disabled = false } diff --git a/pages/WarehouseManage/XuniDeliveryConfirm.vue b/pages/WarehouseManage/XuniDeliveryConfirm.vue index f2ad717..ad4d8c9 100644 --- a/pages/WarehouseManage/XuniDeliveryConfirm.vue +++ b/pages/WarehouseManage/XuniDeliveryConfirm.vue @@ -93,12 +93,12 @@ this.disabled1 = true try { let res = await virtualoutConfirm(this.dataList, this.val1) + this.disabled1 = false + this._virtualivtQuery() uni.showToast({ title: res.message, icon: 'none' }) - this.disabled1 = false - this._virtualivtQuery() } catch (e) { this.disabled1 = false }