From 030b04b451f33626b6f16121aa7b7e39d147f69b Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 1 Jul 2024 14:18:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=9A=E5=88=B6=E9=80=A0?=
 =?UTF-8?q?=E4=BB=B6=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/job/overPackageJobDetail.vue      |  1 +
 .../package/record/overPackageRecord.vue      |  1 +
 src/pages/point/index.vue                     | 60 +++++++++++++------
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 2141be16..68c2ffac 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -345,6 +345,7 @@
 								supplierCode: item.supplierCode, // 供应商
 								qty: item.qty, // 数量
 								printTimes:getCurrDateTime(), // 打印时间
+								productionLineCode:item.productionLineCode,//生产线
 								barcodeString: item.barcodeString, // 标签信息
 								barcodeBase64: '',
 							})
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index a535f606..6a4e7d4f 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -368,6 +368,7 @@
 								supplierCode: item.supplierCode, // 供应商
 								qty: item.qty, // 数量
 								printTimes:getCurrDateTime(), // 打印时间
+								productionLineCode:item.productionLineCode,//生产线
 								barcodeString: item.barcodeString, // 标签信息
 								barcodeBase64: '',
 							})
diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue
index e3ec36b4..60a16c58 100644
--- a/src/pages/point/index.vue
+++ b/src/pages/point/index.vue
@@ -19,11 +19,15 @@
 					<view class="label">包装号</view>
 					<view class="value">{{item.packageCode}}</view>
 				</view>
-				<view class="left-item">
+				<view class="left-item" v-if="item.productionLineCode&&item.productionLineCode.length>0">
+					<view class="label">生产线</view>
+					<view class="value">{{item.productionLineCode}}</view>
+				</view>
+				<view class="left-item" v-if="!(item.productionLineCode&&item.productionLineCode.length>0)">
 					<view class="label">父包装号</view>
 					<view class="value">{{item.parentNumber}}</view>
 				</view>
-				<view class="left-item">
+				<view class="left-item" v-if="!(item.productionLineCode&&item.productionLineCode.length>0)">
 					<view class="label">ASN</view>
 					<view class="value">{{item.asnNumber}}</view>
 				</view>
@@ -45,7 +49,7 @@
 					<view class="label">物料类型</view>
 					<view class="value">{{item.itemType}}</view>
 				</view>
-				<view class="left-item">
+				<view class="left-item" v-if="!(item.productionLineCode&&item.productionLineCode.length>0)">
 					<view class="label">供应商</view>
 					<view class="value">{{item.supplierCode}}</view>
 				</view>
@@ -132,15 +136,27 @@
 											<div class="left-item">
 												<div class="label">包装号</div>
 												<div class="value">${item.packageCode}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">父包装号</div>
-												<div class="value">${item.parentNumber}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">ASN</div>
-												<div class="value">${item.asnNumber}</div>
-											</div>
+											</div>`
+							if(item.productionLineCode&&item.productionLineCode.length>0){
+								str += 	`
+												<div class="left-item">
+													<div class="label">生产线</div>
+													<div class="value">${item.productionLineCode}</div>
+												</div>
+										`
+							}else{
+								str += 	`
+												<div class="left-item">
+													<div class="label">父包装号</div>
+													<div class="value">${item.parentNumber}</div>
+												</div>
+												<div class="left-item">
+													<div class="label">ASN</div>
+													<div class="value">${item.asnNumber}</div>
+												</div>
+									`
+							}											
+							str += 	`
 											<div class="left-item">
 												<div class="label">数量</div>
 												<div class="value bold-font">${item.qty}</div>
@@ -157,11 +173,17 @@
 											<div class="left-item">
 												<div class="label">物料类型</div>
 												<div class="value">${item.itemType}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">供应商</div>
-												<div class="value">${item.supplierCode}</div>
-											</div>
+											</div>`
+							if(!(item.productionLineCode&&item.productionLineCode.length>0)){
+								str += 	`
+												<div class="left-item">
+													<div class="label">供应商</div>
+													<div class="value">${item.supplierCode}</div>
+												</div>
+										`
+							}
+							str += 	`
+											
 											<div class="left-item">
 												<div class="label">打印时间</div>
 												<div class="value">${item.printTimes}</div>
@@ -184,6 +206,7 @@
 		},
 		async onShow() {
 			// 获取数据
+			// 大哥：后端添加了 制造标签 生产线 ，可根据 生产线是否有值 来判断打印的是制造标签
 			// this.data = [{
 			// 	itemCode:'065.051-01M', // 物品代码
 			// 	itemName: 'PCCLARNATEA1225BLACK9999', // 物品名称
@@ -197,7 +220,8 @@
 			// 	qty: '100', // 数量
 			// 	printTimes:'2019-09-09 09:09:00', // 打印时间
 			// 	barcodeString: 'HMQ;V1.0;Dwork1-line1;F;R2024-04-03T08:28:41;B20240403;PPN0403-000005;I399.960-12;Q5.000000;UEA;',
-			// 	barcodeBase64: ''
+			// 	barcodeBase64: '',
+			// 	productionLineCode:''//生产线
 			// }]
 			this.$nextTick(async () => {
 				// 获取二维码图片临时路径