From de663da475f2ea27b04e945cc80d92e775c1560e Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Wed, 18 Sep 2024 21:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=87=AA=E5=8A=A8=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/collect/splitCreateOrder.js |  8 ++++++
 src/views/collect/DealOrder.vue     | 39 +++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/api/collect/splitCreateOrder.js b/src/api/collect/splitCreateOrder.js
index c8ac93b0..c425e628 100644
--- a/src/api/collect/splitCreateOrder.js
+++ b/src/api/collect/splitCreateOrder.js
@@ -37,6 +37,14 @@ export function finishOrder(query) {
   });
 }
 
+export function vailOrderFinish(query) {
+  return axios({
+    url: "/udiwms/basic/collect/order/vailFinish",
+    method: "post",
+    data: query
+  });
+}
+
 
 export function draftOrder(query) {
   return axios({
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 5fe3e167..c465bfb3 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -379,7 +379,15 @@ import prescribeCodePanel from "./PanelOrderTagCode";
 import PannelOrderBiz from "./PannelOrderBiz";
 import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
 import {enterCodeWeb, batchVailCode, enterCodeBillNo} from "@/api/inout/order";
-import {cancelOrder, draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/collect/splitCreateOrder";
+import {
+  cancelOrder,
+  draftOrder,
+  finishOrder,
+  startSplit,
+  tagCode,
+  updateOrder,
+  vailOrderFinish
+} from "@/api/collect/splitCreateOrder";
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
 import {getCurOrder, getNextOrder, findByBill, findFromCorp} from "@/api/collect/collectOrder";
 import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
@@ -840,9 +848,6 @@ export default {
       if (this.$isBlank(this.filterQuery.code) && this.$isBlank(this.scanCode)) {
         return;
       }
-      // if (this.$isNotBlank(this.scanCode)) {
-      //   this.filterQuery.code = this.scanCode.trim();
-      // }
       let tagQuery = {
         workPlaceCode: this.formData.workPlaceCode,
         fromCorp: this.formData.fromCorp,
@@ -918,7 +923,6 @@ export default {
       });
     },
 
-
     confirmFinishOrder() {
       this.$confirm('是否确定完成此单据?', '提示', {
         confirmButtonText: '确定',
@@ -959,7 +963,6 @@ export default {
       })
     },
 
-
     updateOrder() {
       this.formData.workPlaceCode = this.workplaceId;
       updateOrder(this.formData).then(res => {
@@ -997,7 +1000,6 @@ export default {
       })
     },
 
-
     findCurOrder() {
       let nextQuery = {
         workPlaceCode: this.formData.workPlaceCode,
@@ -1126,6 +1128,29 @@ export default {
     },
 
 
+    vailOrderFinish() {
+      vailOrderFinish(this.formData).then(res => {
+        this.loading = false
+        if (res.code == 20000) {
+          if (res.data) {
+            this.$confirm("单据已赋码或可自动赋码，是否立即完成单据？", '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.finishOrder();
+            }).catch(() => {
+            });
+          }
+        } else {
+
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+
+
     async printMutiCodeResult(vailCodeResultResponses) {
       this.warnResult = "";
       this.errResult = "";