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

src/mycomponents/job/jobTop.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="task_top">
-		<view class="uni-flex space-between u-col-center align-center" >
+		<view class="uni-flex space-between u-col-center align-center" style="margin-bottom: 10rpx;">
 			<job-number :number="dataContent.number"></job-number>
 			<job-status :jobStatus="dataContent.status"></job-status>
 		</view>

src/mycomponents/qty/recommendQtyEdit.vue

@@ -62,6 +62,7 @@
 	import uom from '@/mycomponents/qty/uom.vue'
 	import stdUom from '@/mycomponents/qty/stdUom.vue'
 	import packUnit from '@/mycomponents/qty/packUnit.vue'
+import { nextTick } from 'vue';
 	export default {
 		components: {
 			uom,
@@ -136,8 +137,12 @@
 				this.recommendQty = Number(recommendQty);
 				this.labelQty = Number(labelQty);
 				this.allQty = Number(handleQty)
+				// this.dataContent = item
+				// console.log(333,this.allQty)
+				// console.log(222,this.dataContent.packQty)
 				setTimeout(res => {
 					this.$refs.popup.open('bottom')
+					this.stdCount = Math.ceil(this.allQty / this.dataContent.packQty);
 				}, 500)
 			},
 			openRecordEditPopup(labelQty) {

src/pages/issue/job/issueDetail.vue

@@ -203,6 +203,7 @@
 							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.detailSource, that.subList)
+							that.jobContent.detailToLocationCode = res.data.subList[0].toLocationCode
 
 
 							//任务中已经扫描，模拟扫描赋值

src/pages/package/job/overPackageJobDetail.vue

@@ -42,7 +42,7 @@
 							打印设置
 						</view>
 					</template>
-					<print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
+					<!-- <print ref="printService" @printCode="printCode" @templateCode="templateCode"></print> -->
 				</uni-collapse-item>
 			</uni-collapse>
 		</div>
@@ -106,7 +106,7 @@
 	import comScanPackagePack from '@/pages/package/coms/comScanPackagePack.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
 	import workStation from '@/mycomponents/workStation/workStation.vue'
-	import print from '@/mycomponents/print/print.vue'
+	// import print from '@/mycomponents/print/print.vue'
 
 	export default {
 		name: 'issueDetail',
@@ -117,7 +117,7 @@
 			comScanPackagePack,
 			jobTop,
 			workStation,
-			print
+			// print
 		},
 		data() {
 			return {
@@ -129,8 +129,8 @@
 				scanOptions: [],
 				jobStatus: "",
 
-				printDeafult: {}, //默认打印机
+				// printDeafult: {}, //默认打印机
-				templateDeafult: {} //默认的模板
+				// templateDeafult: {} //默认的模板
 			};
 		},
 
@@ -229,18 +229,18 @@
 							that.jobStatus = res.data.status
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.detailSource, that.subList)
-							this.$nextTick(() => {
+							// this.$nextTick(() => {
-								if (uni.getStorageSync('overPackageJobDetailPointParams')) {
+							// 	if (uni.getStorageSync('overPackageJobDetailPointParams')) {
-									const overPackageJobDetailPointParams = uni.getStorageSync(
+							// 		const overPackageJobDetailPointParams = uni.getStorageSync(
-										'overPackageJobDetailPointParams')
+							// 			'overPackageJobDetailPointParams')
-									this.jobContent.printerUuid = overPackageJobDetailPointParams
+							// 		this.jobContent.printerUuid = overPackageJobDetailPointParams
-										.printDeafult.value;
+							// 			.printDeafult.value;
-									this.jobContent.modelCode = overPackageJobDetailPointParams
+							// 		this.jobContent.modelCode = overPackageJobDetailPointParams
-										.templateDeafult.value;
+							// 			.templateDeafult.value;
-									this.$refs.printService.setDefaultData(overPackageJobDetailPointParams
+							// 		this.$refs.printService.setDefaultData(overPackageJobDetailPointParams
-										.printDeafult, overPackageJobDetailPointParams.templateDeafult)
+							// 			.printDeafult, overPackageJobDetailPointParams.templateDeafult)
-								}
+							// 	}
-							})
+							// })
 							setTimeout(r => {
 								that.resizeCollapse();
 							}, 100)
@@ -290,14 +290,14 @@
 			// },
 
 			submit() {
-				if(!this.jobContent.printerUuid){
+				// if(!this.jobContent.printerUuid){
-					this.showErrorMessage("请选择打印机")
+				// 	this.showErrorMessage("请选择打印机")
-					return;
+				// 	return;
-				}
+				// }
-				if(!this.jobContent.modelCode){
+				// if(!this.jobContent.modelCode){
-					this.showErrorMessage("请选择打印模板")
+				// 	this.showErrorMessage("请选择打印模板")
-					return;
+				// 	return;
-				}
+				// }
 				//目前任务只到一个库位
 				var itemCodes = []
 				let locationCode = this.detailSource[0].toLocationCode
@@ -364,52 +364,41 @@
 				console.log(params);
 				overPageSubmit(params).then(res => {
 					uni.hideLoading()
-					if (res.data == '打印任务已发送，等待打印机处理！') {
+					// if (res.data == '打印任务已发送，等待打印机处理！') {
-						this.showCommitSuccessMessage(res.data)
-						const overPackageJobDetailPointParams = {
-							printDeafult: this.printDeafult,
-							templateDeafult: this.templateDeafult,
-						}
-						uni.setStorageSync('overPackageJobDetailPointParams', overPackageJobDetailPointParams)
-					} else {
-						this.showErrorMessage(res.data)
-					}
-					// if(res.data){
 					// 	this.showCommitSuccessMessage(res.data)
 					// 	const overPackageJobDetailPointParams = {
-					// 		printDeafult:this.printDeafult,
+					// 		printDeafult: this.printDeafult,
-					// 		templateDeafult:this.templateDeafult,
+					// 		templateDeafult: this.templateDeafult,
-					// 	}
-					// 	uni.setStorageSync('overPackageJobDetailPointParams',overPackageJobDetailPointParams)
-
-					// }else{
-					// 	this.showErrorMessage("提交失败[" + res.msg + "]")
 					// 	}
-					// if (res.data) {
+					// 	uni.setStorageSync('overPackageJobDetailPointParams', overPackageJobDetailPointParams)
-					// 	let list = [];
-					// 	res.data.forEach(item => {
-					// 		list.push({
-					// 			itemCode: item.itemCode, // 物品代码
-					// 			itemName: item.itemName, // 物品名称
-					// 			packName: item.packName, // 包装名称
-					// 			packageCode: item.number, // 包装号
-					// 			batch: item.batch, //批次
-					// 			parentNumber: item.parentNumber, //父包装号
-					// 			itemType: item.itemType, //物料类型
-					// 			asnNumber: item.asnNumber, //ASN
-					// 			supplierCode: item.supplierCode, // 供应商
-					// 			qty: item.qty, // 数量
-					// 			printTimes: getCurrDateTime(), // 打印时间
-					// 			productionLineCode: item.productionLineCode, //生产线
-					// 			barcodeString: item.barcodeString, // 标签信息
-					// 			barcodeBase64: '',
-					// 		})
-					// 	})
-					// 	this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", list)
-
 					// } else {
-					// 	this.showErrorMessage("提交失败[" + res.msg + "]")
+					// 	this.showErrorMessage(res.data)
 					// }
+					if (res.data) {
+						let list = [];
+						res.data.forEach(item => {
+							list.push({
+								itemCode: item.itemCode, // 物品代码
+								itemName: item.itemName, // 物品名称
+								packName: item.packName, // 包装名称
+								packageCode: item.number, // 包装号
+								batch: item.batch, //批次
+								parentNumber: item.parentNumber, //父包装号
+								itemType: item.itemType, //物料类型
+								asnNumber: item.asnNumber, //ASN
+								supplierCode: item.supplierCode, // 供应商
+								qty: item.qty, // 数量
+								printTimes: getCurrDateTime(), // 打印时间
+								productionLineCode: item.productionLineCode, //生产线
+								barcodeString: item.barcodeString, // 标签信息
+								barcodeBase64: '',
+							})
+						})
+						this.showCommitSuccessMessage("提交成功<br>生成翻包记录<br>", list)
+
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
 				}).catch(error => {
 					uni.hideLoading()
 					this.showErrorMessage(error)
@@ -498,14 +487,14 @@
 				this.jobContent.creator = creator;
 				return this.jobContent;
 			},
-			printCode(e) {
+			// printCode(e) {
-				this.jobContent.printerUuid = e.value;
+			// 	this.jobContent.printerUuid = e.value;
-				this.printDeafult = e
+			// 	this.printDeafult = e
-			},
+			// },
-			templateCode(e) {
+			// templateCode(e) {
-				this.jobContent.modelCode = e.value;
+			// 	this.jobContent.modelCode = e.value;
-				this.templateDeafult = e
+			// 	this.templateDeafult = e
-			},
+			// },
 			cancel() {
 				let that = this;
 				this.$refs.comMessage.showQuestionMessage('是否要清空已扫描的物料和目标库位信息?', res => {

src/pages/package/record/overPackageRecord.vue

@@ -5,7 +5,7 @@
 			<com-blank-view @goScan='getBusinessType' v-if="detailSource.length==0"></com-blank-view>
 		</view>
 		
-		<print ref="printService" @printCode="printCode"  @templateCode="templateCode"></print>
+		<!-- <print ref="printService" @printCode="printCode"  @templateCode="templateCode"></print> -->
 		<view class="page-wraper" v-if="detailSource.length>0">
 			<view class="cen_card" style="background-color: #fff; margin:10px 0px 0px 10px;">
 				<view class="cell_box uni-flex uni-row">
@@ -112,7 +112,7 @@
 	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
 	import packUnit from '@/mycomponents/qty/packUnit.vue'
 	import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue'
-	import print from '@/mycomponents/print/print.vue'
+	// import print from '@/mycomponents/print/print.vue'
 
 	import {
 		getCurrDateTime
@@ -131,7 +131,7 @@
 			recordComDetailCard,
 			packUnit,
 			winComScanBalance,
-			print
+			// print
 		},
 		onLoad(option){
 			uni.setNavigationBarTitle({
@@ -160,22 +160,21 @@
 				itemCode: "",
 				resultData: {},
 				
-				printDeafult:{},//默认打印机
+				// printDeafult:{},//默认打印机
-				templateDeafult:{}//默认的模板
+				// templateDeafult:{}//默认的模板
 			};
 		},
 		onLoad() {
 			this.getBusinessType();
 			
-			this.$nextTick(()=>{
+			// this.$nextTick(()=>{
-				if(uni.getStorageSync('overPackageRecordPointParams')){
+			// 	if(uni.getStorageSync('overPackageRecordPointParams')){
-					const overPackageRecordPointParams = uni.getStorageSync('overPackageRecordPointParams')
+			// 		const overPackageRecordPointParams = uni.getStorageSync('overPackageRecordPointParams')
-					this.dataContent.printerUuid = overPackageRecordPointParams.printDeafult.value;
+			// 		this.dataContent.printerUuid = overPackageRecordPointParams.printDeafult.value;
-					this.dataContent.modelCode = overPackageRecordPointParams.templateDeafult.value;
+			// 		this.dataContent.modelCode = overPackageRecordPointParams.templateDeafult.value;
-					this.$refs.printService.setDefaultData(overPackageRecordPointParams.printDeafult,overPackageRecordPointParams.templateDeafult)	
+			// 		this.$refs.printService.setDefaultData(overPackageRecordPointParams.printDeafult,overPackageRecordPointParams.templateDeafult)	
-				}
+			// 	}
-				
+			// })
-			})
 		},
 		//返回首页
 		onNavigationBarButtonTap(e) {
@@ -359,14 +358,14 @@
 				}
 			},
 			commit() {
-				if(!this.dataContent.printerUuid){
+				// if(!this.dataContent.printerUuid){
-					this.showErrorMessage("请选择打印机")
+				// 	this.showErrorMessage("请选择打印机")
-					return;
+				// 	return;
-				}
+				// }
-				if(!this.dataContent.modelCode){
+				// if(!this.dataContent.modelCode){
-					this.showErrorMessage("请选择打印模板")
+				// 	this.showErrorMessage("请选择打印模板")
-					return;
+				// 	return;
-				}
+				// }
 				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
 					if (!this.toPackUnit || this.toPackUnit == "包装规格") {
 						this.showErrorMessage("请选择目标包装规格")
@@ -412,41 +411,41 @@
 				overPackageRecordSubmit(params).then(res => {
 					uni.hideLoading()
 					
-					if (res.data == '打印任务已发送，等待打印机处理！') {
+					// if (res.data == '打印任务已发送，等待打印机处理！') {
-						this.showCommitSuccessMessage(res.data)
+					// 	this.showCommitSuccessMessage(res.data)
-						const overPackageRecordPointParams = {
+					// 	const overPackageRecordPointParams = {
-							printDeafult:this.printDeafult,
+					// 		printDeafult:this.printDeafult,
-							templateDeafult:this.templateDeafult,
+					// 		templateDeafult:this.templateDeafult,
-						}
-						uni.setStorageSync('overPackageRecordPointParams',overPackageRecordPointParams)
-						this.detailSource = []
-					}else {
-						this.showErrorMessage(res.data)
-					}
-					// if (res.data) {
-					// 	// let list = []
-					// 	// res.data.forEach(item => {
-					// 	// 	list.push({
-					// 	// 		itemCode: item.itemCode, // 物品代码
-					// 	// 		itemName: item.itemName, // 物品名称
-					// 	// 		packName: item.packName, // 包装名称
-					// 	// 		packageCode: item.toPackingNumber, // 包装号
-					// 	// 		batch: item.toBatch, //批次
-					// 	// 		parentNumber: item.parentNumber, //父包装号
-					// 	// 		itemType: item.itemType, //物料类型
-					// 	// 		asnNumber: item.asnNumber, //ASN
-					// 	// 		supplierCode: item.supplierCode, // 供应商
-					// 	// 		qty: item.qty, // 数量
-					// 	// 		printTimes: getCurrDateTime(), // 打印时间
-					// 	// 		productionLineCode: item.productionLineCode, //生产线
-					// 	// 		barcodeString: item.barcodeString, // 标签信息
-					// 	// 		barcodeBase64: '',
-					// 	// 	})
-					// 	// })
-					// 	this.showCommitSuccessMessage(res.msg)
-					// } else {
-					// 	this.showErrorMessage("提交失败[" + res.msg + "]")
 					// 	}
+					// 	uni.setStorageSync('overPackageRecordPointParams',overPackageRecordPointParams)
+					// 	this.detailSource = []
+					// }else {
+					// 	this.showErrorMessage(res.data)
+					// }
+					if (res.data) {
+						let list = []
+						res.data.forEach(item => {
+							list.push({
+								itemCode: item.itemCode, // 物品代码
+								itemName: item.itemName, // 物品名称
+								packName: item.packName, // 包装名称
+								packageCode: item.toPackingNumber, // 包装号
+								batch: item.toBatch, //批次
+								parentNumber: item.parentNumber, //父包装号
+								itemType: item.itemType, //物料类型
+								asnNumber: item.asnNumber, //ASN
+								supplierCode: item.supplierCode, // 供应商
+								qty: item.qty, // 数量
+								printTimes: getCurrDateTime(), // 打印时间
+								productionLineCode: item.productionLineCode, //生产线
+								barcodeString: item.barcodeString, // 标签信息
+								barcodeBase64: '',
+							})
+						})
+						this.showCommitSuccessMessage(res.msg)
+					} else {
+						this.showErrorMessage("提交失败[" + res.msg + "]")
+					}
 				}).catch(error => {
 					uni.hideLoading()
 					this.showErrorMessage(error)
@@ -487,14 +486,14 @@
 				this.dataContent.creator = creator;
 				return this.dataContent;
 			},
-			printCode(e){
+			// printCode(e){
-				this.dataContent.printerUuid = e.value;
+			// 	this.dataContent.printerUuid = e.value;
-				this.printDeafult = e
+			// 	this.printDeafult = e
-			},
+			// },
-			templateCode(e){
+			// templateCode(e){
-				this.dataContent.modelCode = e.value;
+			// 	this.dataContent.modelCode = e.value;
-				this.templateDeafult = e
+			// 	this.templateDeafult = e
-			},
+			// },
 			showMessage(message) {
 				this.$refs.comMessage.showMessage(message, res => {
 					if (res) {}

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -38,7 +38,18 @@
 				</view>
 			</scroll-view>
 		</view>
-
+<!-- <div style="background: white;" v-if="operation=='receipt'" >
+			<uni-collapse>
+				<uni-collapse-item>
+					<template v-slot:title>
+						<view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx;">
+							打印设置
+						</view>
+					</template>
+					<print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
+				</uni-collapse-item>
+			</uni-collapse>
+		</div> -->
 		<view class="page-footer">
 			<view style="background-color:ghostwhite; width: 100%; ">
 				<view v-if="operation=='receipt'" class="uni-flex u-col-center space-between padding_10">
@@ -106,6 +117,7 @@
 	import locationCompare from '@/mycomponents/location/locationCompare.vue'
 	import comReceiptDetailCard from '@/pages/purchaseReceipt/coms/comReceiptDetailCard.vue'
 	import jobTopAsn from '@/mycomponents/job/jobTopAsn.vue'
+	// import print from '@/mycomponents/print/print.vue'
 	import {
 		productDismantleJobClose
 	} from '@/api/request2.js';
@@ -121,7 +133,8 @@
 			winScanPack,
 			comReceiptDetailCard,
 			locationCompare,
-			jobTopAsn
+			jobTopAsn,
+			// print
 		},
 		data() {
 			return {
@@ -145,6 +158,10 @@
 				switchCode: "",
 				isCheckLocation: 'purchaseReceiptLocationCodeValidate', //校验收货库位
 				reasonText: "",
+				
+				
+				// printDeafult: {}, //默认打印机
+				// templateDeafult: {} //默认的模板
 			};
 		},
 
@@ -247,11 +264,22 @@
 								that.toLocationCode = that.jobToLocationCode;
 							}
 							that.isAllReceived = false;
+							// if (uni.getStorageSync('purchaseReceiptDetailPointParams')) {
+							// 	const purchaseReceiptDetailPointParams = uni.getStorageSync(
+							// 		'purchaseReceiptDetailPointParams')
+							// 	this.jobContent.printerUuid = purchaseReceiptDetailPointParams
+							// 		.printDeafult.value;
+							// 	this.jobContent.modelCode = purchaseReceiptDetailPointParams
+							// 		.templateDeafult.value;
+							// 	this.$refs.printService.setDefaultData(purchaseReceiptDetailPointParams
+							// 		.printDeafult, purchaseReceiptDetailPointParams.templateDeafult)
+							// }
 							//如果箱码扫描自动扫描，ASN不自动扫描
 							if (this.scanMessage) {
 								this.$refs.scanPopup.simulateScan(this.scanMessage);
 							}
 							
+
 						} else {
 							that.showMessage('列表数据为0');
 						}
@@ -495,6 +523,16 @@
 
 									this.showCommitSuccessMessage("提交成功<br>生成采购收货记录<br>" + res.data.number)
 								} else {
+									// if (res.data == '打印任务已发送，等待打印机处理！') {
+									// 	this.showCommitSuccessMessage(res.data)
+									// 	const purchaseReceiptDetailPointParams = {
+									// 		printDeafult: this.printDeafult,
+									// 		templateDeafult: this.templateDeafult,
+									// 	}
+									// 	uni.setStorageSync('purchaseReceiptDetailPointParams', purchaseReceiptDetailPointParams)
+									// } else {
+									// 	this.showErrorMessage(res.data)
+									// }
 									uni.showLoading({
 										title: "提交成功,将跳转到打印页面",
 										mask: true
@@ -593,7 +631,14 @@
 				this.jobContent.creator = creator;
 				return this.jobContent;
 			},
-
+// printCode(e) {
+// 				this.jobContent.printerUuid = e.value;
+// 				this.printDeafult = e
+// 			},
+// 			templateCode(e) {
+// 				this.jobContent.modelCode = e.value;
+// 				this.templateDeafult = e
+// 			},
 			checkLocation() {
 				var isPass = true;
 				if (this.toLocationCode == "" || this.toLocationCode == null) {