From c32137458e73e2b31e0e584ff1169fc33fc766c6 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 1 Aug 2024 15:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/print/print.vue               | 11 ++++++-----
 src/pages/package/job/overPackageJobDetail.vue |  9 ++++++++-
 src/pages/package/record/overPackageRecord.vue |  8 ++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/mycomponents/print/print.vue b/src/mycomponents/print/print.vue
index 0e7b326c..32c42f3c 100644
--- a/src/mycomponents/print/print.vue
+++ b/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
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 36a9e041..eb4bb261 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/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
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 7286440b..21dd76bb 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/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("请选择目标包装规格")