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 1/2] =?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("请选择目标包装规格")
From e9d797c27abdf30e492290723259c772a650587c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 1 Aug 2024 16:43:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?PDA=E9=A2=84=E7=94=9F=E4=BA=A7=E6=8A=A5?=
=?UTF-8?q?=E5=B7=A5=E5=92=8C=E8=A3=85=E9=85=8D=E6=8A=A5=E5=B7=A5=E4=BB=BB?=
=?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E4=B8=AD=EF=BC=8C=E6=89=AB=E6=8F=8F?=
=?UTF-8?q?=E7=AE=B1=E7=A0=81=E8=B7=B3=E8=BD=AC=E5=88=B0=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E5=BC=B9=E9=94=99=EF=BC=8C=E6=9C=AA=E7=9B=B4?=
=?UTF-8?q?=E6=8E=A5=E5=8F=98=E6=88=90=E6=89=AB=E6=8F=8F=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/productReceipt/job/ccProductReceiptDetail.vue | 2 +-
src/pages/productReceipt/job/productReceiptDetail.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/productReceipt/job/ccProductReceiptDetail.vue b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
index 9975a8d2..b3c5e3e6 100644
--- a/src/pages/productReceipt/job/ccProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/ccProductReceiptDetail.vue
@@ -15,7 +15,7 @@
生产线
-
+
{{jobContent.subList[0].productionLineCode}}
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index d2287038..c567f941 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -16,7 +16,7 @@
生产线
-
+
{{jobContent.subList[0].productionLineCode}}