装配收货任务打印

src/pages/pointProductReceipt/index.vue

@@ -12,8 +12,8 @@
 					<view class="value" id="name2">{{item.itemName}}</view>
 				</view>
 				<view class="left-item">
-					<view class="label">物料描述</view>
-					<view class="value">{{item.itemDesc1}}</view>
+					<view class="label">包装名称</view>
+					<view class="value">{{item.packName}}</view>
 				</view>
 				<view class="left-item">
 					<view class="label">包装号</view>
@@ -37,8 +37,8 @@
 					<view class="value">{{item.batch}}</view>
 				</view>
 				<view class="left-item">
-					<view class="label">班次</view>
-					<view class="value">{{item.shiftCode}}</view>
+					<view class="label">物料类型</view>
+					<view class="value">{{item.itemType}}</view>
 				</view>
 				<view class="left-item" >
 					<view class="label">打印时间</view>
@@ -117,20 +117,20 @@
 												<div class="value" id="name2">${item.itemName}</div>
 											</div>
 											<view class="left-item">
-												<view class="label">物料描述</view>
-												<view class="value">{{item.itemDesc1}}</view>
+												<view class="label">包装名称</view>
+												<view class="value">${item.packName}</view>
 											</view>
 											<view class="left-item">
 												<view class="label">包装号</view>
-												<view class="value">{{item.relateNumber}}</view>
+												<view class="value">${item.relateNumber}</view>
 											</view>
 											<view class="left-item">
 												<view class="label">生产线</view>
-												<view class="value">{{item.productionLineCode}}</view>
+												<view class="value">${item.productionLineCode}</view>
 											</view>
 											<view class="left-item">
 												<view class="label">数量</view>
-												<view class="value">{{item.qty}}</view>
+												<view class="value">${item.qty}</view>
 											</view>
 										</div>
 										<div class="right">
@@ -139,15 +139,15 @@
 											</div>
 											<view class="left-item">
 												<view class="label">批次</view>
-												<view class="value">{{item.batch}}</view>
+												<view class="value">${item.batch}</view>
 											</view>
 											<view class="left-item">
-												<view class="label">班次</view>
-												<view class="value">{{item.shiftCode}}</view>
+												<view class="label">物料类型</view>
+												<view class="value">${item.itemType}</view>
 											</view>
 											<view class="left-item">
 												<view class="label">打印时间</view>
-												<view class="value">{{item.printTimes}}</view>
+												<view class="value">${item.printTimes}</view>
 											</view>
 										</div>
 									</div>`

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -70,6 +70,7 @@
 	import {
 		getManagementPrecisions
 	} from '@/common/balance.js';
+	import { getCurrDateTime} from '@/common/basic.js';
 
 	import {
 		getProductReceiptJobDetail,
@@ -377,19 +378,19 @@
 					console.log('打印', res)
 					let pointData = []
 					res.data.forEach(item => {
-						pointData.push({
-							barcodeString: item.barcodeString, //标签
-							itemCode: item.itemCode || '', //物品代码
+						pointData.push({
+							barcodeString: item.barcodeString, //标签
+							itemCode: item.itemCode || '', //物品代码
 							itemName: item.itemName || '', //物品名称
 							packName: item.packName || '', //包装名称
-							itemType: item.itemType || '', //物料类型
-							itemDesc1: item.itemDesc1 || '', //物品描述
-							relateNumber: item.relateNumber || '', //relateNumber包装号
-							batch: item.batch || '', //批次
-							productionLineCode: item.productionLineCode || '', //生产线
-							shiftCode: item.shiftCode || '', //班次
-							qty: item.qty || '', //数量
-							printTimes: item.printTimes || '' //打印时间
+							itemType: item.itemType || '', //物料类型
+							itemDesc1: item.itemDesc1 || '', //物品描述
+							relateNumber: item.relateNumber || '', //relateNumber包装号
+							batch: item.batch || '', //批次
+							productionLineCode: item.productionLineCode || '', //生产线
+							shiftCode: item.shiftCode || '', //班次
+							qty: item.qty || '', //数量
+							printTimes: getCurrDateTime() //打印时间
 						})
 					})
 					console.log('pointData', pointData)