From 0697e895f4e0792fd55e02ccba7f33637a1cc8ad Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 9 Sep 2024 14:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=8F=90=E4=BA=A4=E6=98=AF?=
=?UTF-8?q?=E5=90=A6=E5=AE=8C=E5=85=A8=E8=B5=8B=E7=A0=81=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/collect/DealOrder.vue | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 77f59660..f3c541dd 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -773,22 +773,21 @@ export default {
if (res.code == 20000) {
this.resetWork()
} else if (res.code == 502) {
- // this.$confirm(res.message, '提示', {
- // confirmButtonText: '确定',
- // cancelButtonText: '取消',
- // type: 'warning'
- // }).then(() => {
- // this.formData.confirmFinish = true;
- // // this.finishOrder();
- // }).catch(() => {
- // });
-
+ this.$confirm(res.message, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.formData.confirmFinish = true;
+ this.finishOrder();
+ }).catch(() => {
+ });
+ } else if (res.code == 503) {
this.$alert('该单据未全部赋码无法完成,请检查后重试', '提示', {
confirmButtonText: '确定',
callback: action => {
}
});
-
} else {
this.$message.error(res.message)
}