From c4d11a1537dd15bdcd60e25585d78dd0d8d70991 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 17 Nov 2022 14:23:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/WarehouseManage/ProdDeliveryConfirm.vue | 8 ++++----
 pages/WarehouseManage/ReturngoodsInStore.vue  | 8 ++++----
 pages/WarehouseManage/ScrapInStore.vue        | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

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 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_SN === pkId, 'bgyellow': e.colro_flag === '1'}">
-								<td>{{e.package_box_SN}}</td>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_sn === pkId, 'bgyellow': e.colro_flag === '1'}">
+								<td>{{e.package_box_sn}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.product_name}}</td>
 								<td>{{e.product_description}}</td>
@@ -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..2db48c4 100644
--- a/pages/WarehouseManage/ReturngoodsInStore.vue
+++ b/pages/WarehouseManage/ReturngoodsInStore.vue
@@ -53,8 +53,8 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_SN === pkId}">
-								<td>{{e.package_box_SN}}</td>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_sn === pkId}">
+								<td>{{e.package_box_sn}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.product_name}}</td>
 								<td>{{e.product_description}}</td>
@@ -128,8 +128,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/ScrapInStore.vue b/pages/WarehouseManage/ScrapInStore.vue
index 1021aff..5fb6df1 100644
--- a/pages/WarehouseManage/ScrapInStore.vue
+++ b/pages/WarehouseManage/ScrapInStore.vue
@@ -47,8 +47,8 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_SN === pkId}">
-								<td>{{e.package_box_SN}}</td>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_sn === pkId}">
+								<td>{{e.package_box_sn}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.product_name}}</td>
 								<td>{{e.product_description}}</td>
@@ -121,8 +121,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 : {}
 			}
 		}
 	}

From 1629470112826348acca4639b9549b54630a8ca6 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 17 Nov 2022 14:43:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/WarehouseManage/InStoreConfirm.vue     |  4 ++--
 pages/WarehouseManage/ReturngoodsInStore.vue | 16 ++++------------
 pages/WarehouseManage/ScrapInStore.vue       | 16 ++++------------
 3 files changed, 10 insertions(+), 26 deletions(-)

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 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': dataList.length === 0}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || dataList.length === 0}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
 			<button class="submit-button" :class="{'btn-disabled': dataList.length === 0}" :disabled="disabled1" @tap="_stPrint">补码</button>
 			<button class="submit-button" @tap="_boxQuery(val1)">查询</button>
 		</view>
@@ -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/ReturngoodsInStore.vue b/pages/WarehouseManage/ReturngoodsInStore.vue
index 2db48c4..4c1a60a 100644
--- a/pages/WarehouseManage/ReturngoodsInStore.vue
+++ b/pages/WarehouseManage/ReturngoodsInStore.vue
@@ -53,7 +53,7 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_sn === pkId}">
+							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{e.package_box_sn}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.product_name}}</td>
@@ -66,7 +66,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || dataList.length === 0}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
 			<button class="submit-button" @tap="_boxQuery(val1)">查询</button>
 		</view>
 	</view>
@@ -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 5fb6df1..e3bebea 100644
--- a/pages/WarehouseManage/ScrapInStore.vue
+++ b/pages/WarehouseManage/ScrapInStore.vue
@@ -47,7 +47,7 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_sn === pkId}">
+							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{e.package_box_sn}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.product_name}}</td>
@@ -60,7 +60,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || dataList.length === 0}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
 			<button class="submit-button" @tap="_boxQuery(val1)">查询</button>
 		</view>
 	</view>
@@ -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 : {}
 			}
 		}
 	}