Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/mycomponents/job/jobComMainDetailCard.vue

@@ -2,8 +2,8 @@
 	<view class="task_item">
 		<view class="task_text" style="border-top: 1px solid #dedede;padding-top: 20rpx;margin-top: 20rpx;">
 			<!-- 主子表拆分，没有数量了 -->
-			<!-- <itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowPackUnit="false"
-				:objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}"></itemCompareQty> -->
+			<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowPackUnit="false"
+				:objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}"></itemCompareQty>
 			<div class="u-p-l-10">
 				
 				<pack v-if="isShowPack && dataContent.packingNumber!=null" :packingCode="dataContent.packingNumber">

src/pages/count/coms/comCountJobCard.vue

@@ -1,8 +1,10 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
 
-		<jobComMainDetailCard :dataContent="dataContent">
-		</jobComMainDetailCard>
+	<!-- 	<jobComMainDetailCard :dataContent="dataContent">
+		</jobComMainDetailCard> -->
+		<to-location  title="盘点库位" :locationCode="dataContent.toLocationCode||dataContent.locationCode">
+		</to-location>
 		<view class="" style="margin-left: 40rpx; font-size: 32rpx; font-weight: bold;">
 			阶段 : {{getCountStageName(dataContent.stage)}}
 		</view>
@@ -18,10 +20,12 @@
 	} from '@/common/directory.js';
 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
 	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
+	import toLocation from '@/mycomponents/balance/toLocation.vue'
 	export default {
 		components: {
 			jobComMainCard,
-			jobComMainDetailCard
+			jobComMainDetailCard,
+			toLocation
 		},
 		data() {
 			return {};

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: '',
 							})

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: '',
 							})

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,7 +136,16 @@
 											<div class="left-item">
 												<div class="label">包装号</div>
 												<div class="value">${item.packageCode}</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>
@@ -141,6 +154,9 @@
 													<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>`
+							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 () => {
 				// 获取二维码图片临时路径