From b9b1e459b76a9aea89cafc54c5346c86c90f5d02 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 1 Aug 2024 19:57:41 +0800
Subject: [PATCH] bug

---
 pages/SecondPhase/slitting/ZjContainer.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pages/SecondPhase/slitting/ZjContainer.vue b/pages/SecondPhase/slitting/ZjContainer.vue
index a8d91db..5eb2c7c 100644
--- a/pages/SecondPhase/slitting/ZjContainer.vue
+++ b/pages/SecondPhase/slitting/ZjContainer.vue
@@ -37,7 +37,7 @@
 								<td>{{e.paper_tube_description}}</td>
 								<td>{{e.paper_weight}}</td>
 								<td>{{e.box_weight}}</td>
-								<td>{{e.package_box_sn}}</td>
+								<td>{{e.box_type}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -162,7 +162,7 @@
 			async _queryContainerNameBySaleOrder (e) {
 				let res = await queryContainerNameBySaleOrder(e)
 				if (res.content.length) {
-					if (res.content[0].paper_tube_description === '') {
+					if (res.content[0].paper_tube_description === null || res.content[0].paper_tube_description === '') {
 						uni.showToast({
 							title: '未查询到该子卷规格信息，请检查子卷的分切计划信息！',
 							icon: 'none',
@@ -172,7 +172,7 @@
 					}
 					if (this.dataList.length >= 1 && res.content[0].paper_tube_description !== this.current.paper_tube_description) {
 						uni.showToast({
-							title: `扫描的规格为：${res.content[0].paper_tube_description}，与上一个子卷规格不一致，请检查！`,
+							title: `扫描的规格为：${res.content[0].paper_tube_description}，与列表中的子卷规格不一致，请检查！`,
 							icon: 'none',
 							duration: 5000
 						})
@@ -180,15 +180,15 @@
 					}
 					if (this.dataList.length >= 1 && res.content[0].sale_order_name !== this.current.sale_order_name) {
 						uni.showToast({
-							title: `扫描的订单号为：${res.content[0].sale_order_name}，上一个订单号不一致，请检查！`,
+							title: `当前扫描的订单号为：${res.content[0].sale_order_name}，与列表中的订单号不一致，请检查！`,
 							icon: 'none',
 							duration: 5000
 						})
 						return
 					}
-					if (this.dataList.length >= 1 && res.content[0].status !== '99') {
+					if (res.content[0].status !== '99') {
 						uni.showToast({
-							title: `该子卷已分配，请检查！`,
+							title: `该子卷状态为已分配木箱规格，请检查！`,
 							icon: 'none'
 						})
 						return
@@ -213,6 +213,9 @@
 				this.dataList.splice(i, 1)
 			},
 			toSure () {
+				if (!this.dataList.length) {
+					return
+				}
 				let code = ''
 				for (let i = 0; i < this.dataList.length; i++) {
 					if (this.dataList[i].box_type !== '') {
@@ -257,7 +260,7 @@
 				}
 			},
 			popSure () {
-				if (this.dataList.length > this.pkObj.num) {
+				if (this.dataList.length > Number(this.pkObj.num)) {
 					uni.showToast({
 						title: '子卷数量超过木箱的最大装卷数！',
 						icon: 'none',