From 35274dad5905667b1a027f01a924d08fd7941f3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Wed, 16 Apr 2025 13:52:39 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E8=A7=A6=E6=91=B8=E5=B1=8F=E5=A4=96?=
 =?UTF-8?q?=E7=AE=B1=E6=A0=87=E7=AD=BE=E5=86=85=E6=A0=87=E7=AD=BE=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=8Ctitle?=
 =?UTF-8?q?=EF=BC=8Ccontent=EF=BC=8Clabel=E5=8A=9F=E8=83=BD=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/produceManagement/checkLabel/step1.vue  | 16 +++++++-------
 pages/produceManagement/checkLabel2/step1.vue | 21 ++++++++++++-------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/pages/produceManagement/checkLabel/step1.vue b/pages/produceManagement/checkLabel/step1.vue
index 8ce70ed..79a2c14 100644
--- a/pages/produceManagement/checkLabel/step1.vue
+++ b/pages/produceManagement/checkLabel/step1.vue
@@ -149,7 +149,7 @@ export default {
 				let res = await CheckBoxInspectionLabel(parmas);
 				if (res.code === 200 && res.data === '合格') {
 					this.packageLabel.label = _value;
-					this.packageLabel.title = _value;
+					this.packageLabel.content = _value;
 				} else {
 					this.dialog.content = '外箱标签校验异常:' + res.data;
 					this.dialog.type = 'warn';
@@ -179,7 +179,7 @@ export default {
 				let res = await CheckFirstInspectionLabel(parmas);
 				if (res.code === 200 && res.data === '合格') {
 					this.firstPartsLabel.label = _value;
-					this.firstPartsLabel.title = _value;
+					this.firstPartsLabel.content = _value;
 				} else {
 					this.dialog.content = '首标签校验异常:' + res.data;
 					this.dialog.type = 'warn';
@@ -209,7 +209,7 @@ export default {
 				let res = await CheckEndInspectionLabel(parmas);
 				if (res.code === 200 && res.data === '合格') {
 					this.endPartsLabel.label = _value;
-					this.endPartsLabel.title = _value;
+					this.endPartsLabel.content = _value;
 				} else {
 					this.dialog.content = '末标签校验异常:' + res.data;
 					this.dialog.type = 'warn';
@@ -225,7 +225,7 @@ export default {
 			GetFirstInspectionLabel({ workorder }).then((res) => {
 				if (res.code === 200 && res.data) {
 					this.firstPartsLabel.label = res.data;
-					this.firstPartsLabel.title = res.data;
+					this.firstPartsLabel.content = res.data;
 				}
 			});
 		},
@@ -233,7 +233,7 @@ export default {
 			GetEndInspectionLabel({ workorder }).then((res) => {
 				if (res.code === 200 && res.data) {
 					this.endPartsLabel.label = res.data;
-					this.endPartsLabel.title = res.data;
+					this.endPartsLabel.content = res.data;
 				}
 			});
 		},
@@ -244,17 +244,17 @@ export default {
 		confirmDelete() {
 			if (this.deleteIndex === 0) {
 				this.packageLabel.label = '';
-				this.packageLabel.title = '';
+				this.packageLabel.content = '';
 				this.deleteIndex = -1;
 			}
 			if (this.deleteIndex === 1) {
 				this.firstPartsLabel.label = '';
-				this.firstPartsLabel.title = '';
+				this.firstPartsLabel.content = '';
 				this.deleteIndex = -1;
 			}
 			if (this.deleteIndex === 2) {
 				this.endPartsLabel.label = '';
-				this.endPartsLabel.title = '';
+				this.endPartsLabel.content = '';
 				this.deleteIndex = -1;
 			}
 			this.$refs.deleteDialogRef.close();
diff --git a/pages/produceManagement/checkLabel2/step1.vue b/pages/produceManagement/checkLabel2/step1.vue
index 82748fa..7e7ddba 100644
--- a/pages/produceManagement/checkLabel2/step1.vue
+++ b/pages/produceManagement/checkLabel2/step1.vue
@@ -87,7 +87,7 @@
 
 <script>
 // 工单相关报工基础Api
-import { CheckBoxInspectionLabel2,GetFirstInspectionLabel2, GetEndInspectionLabel2, CheckFirstInspectionLabel2, CheckEndInspectionLabel2 } from '@/api/workorder/index.js';
+import { CheckBoxInspectionLabel2, GetFirstInspectionLabel2, GetEndInspectionLabel2, CheckFirstInspectionLabel2, CheckEndInspectionLabel2 } from '@/api/workorder/index.js';
 export default {
 	props: {
 		formData: {
@@ -144,10 +144,10 @@ export default {
 				}
 				let parmas = {
 					workorder: this.formData.fkWorkorder,
-					first_label: _value
+					box_label: _value
 				};
 				let res = await CheckBoxInspectionLabel2(parmas);
-				if (res.code === 200 && res.data) {
+				if (res.code === 200 && res.data === '合格') {
 					this.packageLabel.label = _value;
 					this.packageLabel.content = _value;
 				} else {
@@ -224,14 +224,16 @@ export default {
 		getFirstLabel(workorder) {
 			GetFirstInspectionLabel2({ workorder }).then((res) => {
 				if (res.code === 200 && res.data) {
-					this.firstPartsLabel = res.data;
+					this.firstPartsLabel.label = res.data;
+					this.firstPartsLabel.content = res.data;
 				}
 			});
 		},
 		getEndLabel(workorder) {
 			GetEndInspectionLabel2({ workorder }).then((res) => {
 				if (res.code === 200 && res.data) {
-					this.endPartsLabel = res.data;
+					this.endPartsLabel.label = res.data;
+					this.endPartsLabel.content = res.data;
 				}
 			});
 		},
@@ -241,15 +243,18 @@ export default {
 		},
 		confirmDelete() {
 			if (this.deleteIndex === 0) {
-				this.firstPartsLabel = {};
+				this.packageLabel.label = '';
+				this.packageLabel.content = '';
 				this.deleteIndex = 0;
 			}
 			if (this.deleteIndex === 1) {
-				this.firstPartsLabel = {};
+				this.firstPartsLabel.label = '';
+				this.firstPartsLabel.content = '';
 				this.deleteIndex = 0;
 			}
 			if (this.deleteIndex === 2) {
-				this.endPartsLabel = {};
+				this.endPartsLabel.label = '';
+				this.endPartsLabel.content = '';
 				this.deleteIndex = 0;
 			}
 			this.$refs.deleteDialogRef.close();