From 017a0f17b5833f6339a14f8bc63e561de32673f0 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 8 Oct 2024 19:48:14 +0800
Subject: [PATCH] =?UTF-8?q?10/8=20=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=961?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/collect/collectOrder.js     |  2 +-
 src/views/collect/IoCreateOrder.vue | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js
index 0d907b6e..e1476a64 100644
--- a/src/api/collect/collectOrder.js
+++ b/src/api/collect/collectOrder.js
@@ -221,7 +221,7 @@ export function errorHandleSubmit(query) {
 export function orderFinish(query) {
   return axios({
     url: "/udiwms/basic/collect/orderFinish/filter",
-    method: "post",
+    method: "get",
     data: query
   });
 }
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 215ca6cb..32b44b80 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -1188,7 +1188,7 @@ export default {
         JSON.parse(JSON.stringify(this.orderFormData))
       );
       tQuery.code = this.codeFormData.code;
-      tQuery.orderType = this.viewType;
+      tQuery.orderType = 2;
       tQuery.splitType = this.splitType;
       this.addCodeSubmit(tQuery);
       this.$refs.inputRef.select();
@@ -1330,7 +1330,7 @@ export default {
             });
           }
         }
-        this.loading = false;
+        // this.loading = false;
       });
     },
 
@@ -1585,6 +1585,7 @@ export default {
             this.$message.success("提交成功");
             this.successCloseData()
             this.result = ""
+            this.$refs.inputRef.focus();
             if (this.closeDialog != undefined) {
               this.closeDialog();
             }
@@ -1659,13 +1660,18 @@ export default {
         return;
       }
       this.saveLoading = true
-
+      if (this.splitType == 'return'){
+        tQuery.inoutType = 2
+      }else {
+        tQuery.inoutType = 1
+      }
       saveOrderWeb(tQuery).then((response) => {
         this.saveLoading = false
         if (response.code === 20000) {
           this.$message.success("保存成功")
           this.successCloseData()
           this.result = ""
+          this.$refs.inputRef.focus();
         } else {
           this.$message.error(response.message);
         }