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

# Conflicts:
#	src/pages/productReceipt/job/productReceiptDetail.vue

src/mycomponents/print/print.vue

@@ -104,11 +104,12 @@
 				})
 				await getPrintList().then(res=>{
 					this.printList =res.data
+				this.showPrintSelect =true
 					uni.hideLoading()
 				}).catch(error=>{
-					
+					uni.hideLoading()
+					this.showErrorMessage(error)
 				})
-				this.showPrintSelect =true
 				
 			},
 			confirmSelectPrint(e){
@@ -125,11 +126,11 @@
 				await getPrintTemplateList().then(res=>{
 					this.templateList =res.data
 					uni.hideLoading()
-					
+					this.showTemplateSelect =true
 				}).catch(error=>{
-					
+					uni.hideLoading()
+					this.showErrorMessage(error)
 				})
-				this.showTemplateSelect =true
 			},
 			confirmSelectTemplate(e){
 				this.templateCode =e[0].value

src/pages/package/job/overPackageJobDetail.vue

@@ -290,7 +290,14 @@
 			// },
 
 			submit() {
-
+				if(!this.jobContent.printerUuid){
+					this.showErrorMessage("请选择打印机")
+					return;
+				}
+				if(!this.jobContent.modelCode){
+					this.showErrorMessage("请选择打印模板")
+					return;
+				}
 				//目前任务只到一个库位
 				var itemCodes = []
 				let locationCode = this.detailSource[0].toLocationCode

src/pages/package/record/overPackageRecord.vue

@@ -359,6 +359,14 @@
 				}
 			},
 			commit() {
+				if(!this.dataContent.printerUuid){
+					this.showErrorMessage("请选择打印机")
+					return;
+				}
+				if(!this.dataContent.modelCode){
+					this.showErrorMessage("请选择打印模板")
+					return;
+				}
 				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
 					if (!this.toPackUnit || this.toPackUnit == "包装规格") {
 						this.showErrorMessage("请选择目标包装规格")

src/pages/productReceipt/job/ccProductReceiptDetail.vue

@@ -15,7 +15,7 @@
 						</view>
 						<view class="cell_info">
 							<view class="text_lightblue">生产线</view>
-							<view>
+							<view v-if="jobContent&&jobContent.subList&&jobContent.subList[0]">
 								{{jobContent.subList[0].productionLineCode}}
 							</view>
 						</view>