diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue index d77b3df..33b840e 100644 --- a/pages/WarehouseManage/InStoreConfirm.vue +++ b/pages/WarehouseManage/InStoreConfirm.vue @@ -60,7 +60,7 @@ - + @@ -102,7 +102,7 @@ /** 确认 */ async _stConfirm () { this.disabled = true - if (this.dataList.length === 0) { + if (!this.val1 || this.dataList.length === 0) { this.disabled = false return } diff --git a/pages/WarehouseManage/ProdDeliveryConfirm.vue b/pages/WarehouseManage/ProdDeliveryConfirm.vue index 81ab4bc..9008a94 100644 --- a/pages/WarehouseManage/ProdDeliveryConfirm.vue +++ b/pages/WarehouseManage/ProdDeliveryConfirm.vue @@ -36,8 +36,8 @@ - - {{e.package_box_SN}} + + {{e.package_box_sn}} {{e.container_name}} {{e.product_name}} {{e.product_description}} @@ -124,8 +124,8 @@ } }, toCheck (e) { - this.pkId = this.pkId === e.package_box_SN ? '' : e.package_box_SN - this.pkObj = this.pkId === e.package_box_SN ? 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/ReturngoodsInStore.vue b/pages/WarehouseManage/ReturngoodsInStore.vue index ce8e5ab..4c1a60a 100644 --- a/pages/WarehouseManage/ReturngoodsInStore.vue +++ b/pages/WarehouseManage/ReturngoodsInStore.vue @@ -53,8 +53,8 @@ - - {{e.package_box_SN}} + + {{e.package_box_sn}} {{e.container_name}} {{e.product_name}} {{e.product_description}} @@ -66,7 +66,7 @@ - + @@ -88,8 +88,6 @@ val3: '', isV: '0', dataList: [], - pkId: '', - pkObj: {}, disabled: false }; }, @@ -109,14 +107,12 @@ /** 确认 */ async _stConfirm () { this.disabled = true - if (!this.pkId) { + if (!this.val1 || this.dataList.length === 0) { this.disabled = false return } try { - let res = await stConfirm(this.pkObj, this.val2, '3', this.isV, this.val3) - this.pkId = '' - this.pkObj = {} + let res = await stConfirm(this.dataList, this.val2, '3', this.isV, this.val3) this.disabled = false this._boxQuery(this.val1) uni.showToast({ @@ -126,10 +122,6 @@ } catch (e) { this.disabled = 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/ScrapInStore.vue b/pages/WarehouseManage/ScrapInStore.vue index 1021aff..e3bebea 100644 --- a/pages/WarehouseManage/ScrapInStore.vue +++ b/pages/WarehouseManage/ScrapInStore.vue @@ -47,8 +47,8 @@ - - {{e.package_box_SN}} + + {{e.package_box_sn}} {{e.container_name}} {{e.product_name}} {{e.product_description}} @@ -60,7 +60,7 @@ - + @@ -81,8 +81,6 @@ val2: '', isV: '0', dataList: [], - pkId: '', - pkObj: {}, disabled: false }; }, @@ -102,14 +100,12 @@ /** 确认 */ async _stConfirm () { this.disabled = true - if (!this.pkId) { + if (!this.val1 || this.dataList.length === 0) { this.disabled = false return } try { - let res = await stConfirm(this.pkObj, this.val2, '1', this.isV) - this.pkId = '' - this.pkObj = {} + let res = await stConfirm(this.dataList, this.val2, '1', this.isV) this.disabled = false this._boxQuery(this.val1) uni.showToast({ @@ -119,10 +115,6 @@ } catch (e) { this.disabled = false } - }, - toCheck (e) { - this.pkId = this.pkId === e.package_box_SN ? '' : e.package_box_SN - this.pkObj = this.pkId === e.package_box_SN ? e : {} } } }