YT-348采购收货记录和PDA提交任务后的打印检验指引单功能去掉YT-356pda盘点任务，没有包装量的，应显示0，现显示NaN

src/mycomponents/qty/countQtyEdit.vue

@@ -28,7 +28,7 @@
 							<view class="uni-flex uni-row space-between padding title u-col-center">
 								<text>标包量 : </text>
 								<view class="uni-flex u-col-center uni-row">
-									<text>{{Number(dataContent.packQty)}}</text>
+									<text>{{Number(dataContent.packQty) || 0}}</text>
 									<uom :uom="dataContent.uom"></uom>
 								</view>
 							</view>

src/pages/pointPutawayJob/index.vue

@@ -274,7 +274,6 @@
 						})
 						this.newHtmlContent1 = this.newHtmlContent1.replace(
 							"mainBody", str); //替换物品代码
-						console.log(333, this.newHtmlContent1)
 					});
 					// #endif
 				})
@@ -292,7 +291,6 @@
 				} else {
 					this.showTableSubList = this.data.sublist
 				}
-				// console.log(233,this.showTableSubList)
 			},
 			getTableInspectDTOList() {
 				if (this.data1.inspectDTOList.length > this.pageSize1) {
@@ -307,7 +305,6 @@
 				} else {
 					this.showTableInspectDTOList = this.data1.inspectDTOList
 				}
-				console.log(233, this.showTableInspectDTOList)
 			},
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message, res => {
@@ -348,7 +345,11 @@
 					this.getTableSubList()
 				})
 			}
-			// 获取采购收货指引单
+			
+			if (this.data.ids && !this.number) {
+					this.tabIndex = 2
+			}
+			// 获取采购收货检验指引单
 			if (this.number) {
 				await queryInspectionFreeFlag({
 						number: this.number
@@ -359,7 +360,6 @@
 						if (this.data1 && this.data1.inspectDTOList && this.data1.inspectDTOList.length == 0&&this.data.ids) {
 							this.tabIndex = 2
 						}
-						console.log(88,this.data1.inspectDTOList)
 						this.getTableInspectDTOList()
 					})
 					.catch(error => {

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -166,6 +166,7 @@
 				scanMessage: '',
 				status: '',
 				switchCode: "",
+				switchCode1: "",
 				isCheckLocation: 'purchaseReceiptLocationCodeValidate', //校验收货库位
 				reasonText: "",
 
@@ -181,9 +182,8 @@
 			this.scanMessage = option.scanMessage;
 			this.operation = option.operation;
 			this.status = option.status;
-			this.switchCode = "purchasereceiptPrintPDA" //pda打印
+			this.switchCode = "purchasereceiptPrintPDA" //采购收货PDA打印开关
-
+			this.switchCode1 = "EnableQms" //根据开关中是否启用QMS去判断，如果为TRUE显示检验指引单，如果为FALSE不显示检验指引单
-
 		},
 
 		onShow() {
@@ -458,7 +458,6 @@
 			},
 
 			commit() {
-				this.scanCount = getScanCount(this.subList);
 				if (this.scanCount == 0) {
 					this.showErrorMessage("扫描数为0,请先扫描")
 					return;
@@ -531,6 +530,7 @@
 					itemCodes.push(item.itemCode)
 				})
 				
+				
 				//获取管理模式，封装参数
 				getManagementPrecisions(itemCodes, this.toLocationCode, res => {
 					if (res.success) {
@@ -539,14 +539,16 @@
 						let that = this
 						purchaseReceiptJobSubmit(params).then(res => {
 							if (res.data) {
-								let isCheckPrint = getSwitchInfoByCode(this.switchCode)
+								let isCheckPrint = getSwitchInfoByCode(this.switchCode)//是否显示上架指引单
-								if (!isCheckPrint) {
+								let isCheckPrint1 = getSwitchInfoByCode(this.switchCode1)//是否显示采购收货检验指引单
+								if (isCheckPrint1 && !isCheckPrint) {
 									uni.hideLoading()
-
 									// this.showCommitSuccessMessage("提交成功\n生成采购收货记录\n" + res.data.number)
 									uni.redirectTo({
 										url: '/pages/pointPutawayJob/index?number=' + that.jobContent.number
 									})
+								}else if(!isCheckPrint1 && !isCheckPrint){
+									 this.showCommitSuccessMessage("提交成功\n生成采购收货记录\n" + res.data.number)
 								}else {
 									// if (res.data == '打印任务已发送，等待打印机处理！') {
 									// 	this.showCommitSuccessMessage(res.data)
@@ -603,12 +605,20 @@
 														',')
 												}
 												uni.hideLoading()
+												if(!isCheckPrint1 && isCheckPrint){
+													uni.redirectTo({
+														url: '/pages/pointPutawayJob/index?data=' +
+															encodeURIComponent(JSON.stringify(dataParams))
+													})
+												}else if(isCheckPrint1 && isCheckPrint){
 													uni.redirectTo({
 														url: '/pages/pointPutawayJob/index?number=' + that.jobContent.number +
 															'&data=' +
 															encodeURIComponent(JSON.stringify(dataParams))
 													})
 												}
+												
+											}
 										})
 									}, 2000)
 

src/pages/putaway/job/putawayJob.vue

@@ -56,9 +56,7 @@
 	import putawayJobListPopup from '@/pages/putaway/coms/putawayJobListPopup.vue'
 	import putawayInfoPopup from '@/pages/putaway/coms/putawayInfoPopup.vue'
 	import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
-	import {
+
-		Exception
-	} from 'sass';
 
 	export default {
 		name: 'Putaway',