From 43d8a09f7e9c86020082db7d90115d6605f8be0e Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 12 Oct 2022 15:12:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warehouse/order.js             | 15 +++++++--------
 src/views/warehouse/addOrder.vue       | 11 +++++------
 src/views/warehouse/ioNewScanOrder.vue | 21 ++++++++++++++++-----
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/api/warehouse/order.js b/src/api/warehouse/order.js
index 9e82f59..55d5d5e 100644
--- a/src/api/warehouse/order.js
+++ b/src/api/warehouse/order.js
@@ -8,14 +8,6 @@ export function deleteCodesTempById(query) {
     });
 }
 
-export function submitOrderWeb(query) {
-    return axios({
-        url: "/warehouse/inout/submitOrderWeb",
-        method: "get",
-        params: query
-    });
-}
-
 export function saveOrderWeb(query) {
     return axios({
         url: "/warehouse/inout/saveOrderWeb",
@@ -213,3 +205,10 @@ export function updateOrderInfo(data) {
     })
 }
 
+export function submitWebScanOrder(data) {
+    return axios({
+        url: "/warehouse/inout/order/submitWebScanOrder",
+        method: "post",
+        data: data
+    })
+}
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 57d35bc..0b04d3a 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -223,7 +223,8 @@ import {
     addOrderWeb,
     deleteCodesTempById,
     submitOrderWeb,
-    updateCodeBindSup
+    updateCodeBindSup,
+    submitWebScanOrder
 } from "../../api/warehouse/order";
 import draggable from "vuedraggable";
 import {parseTime} from "../../filtres/index";
@@ -300,19 +301,17 @@ export default {
         draggable, DialogSelectUnit, selectRlDialog
     },
     methods: {
-        submit(formName) {
+        submit() {
             if (this.total < 1) {
                 this.$message.error('未添加条码');
                 return;
             }
 
             let tQuery = {
-                orderId: this.idQuery.id,
-                action: this.formData.billType,
-                locStorageCode: this.formData.locStorageCode,
+                orderId: this.idQuery.id
             }
 
-            submitOrderWeb(tQuery)
+            submitWebScanOrder(tQuery)
                 .then((response) => {
                     if (response.code === 20000) {
                         this.$message.success("提交成功");
diff --git a/src/views/warehouse/ioNewScanOrder.vue b/src/views/warehouse/ioNewScanOrder.vue
index 853035f..1f4b6c7 100644
--- a/src/views/warehouse/ioNewScanOrder.vue
+++ b/src/views/warehouse/ioNewScanOrder.vue
@@ -50,9 +50,9 @@
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column label="订单号" prop="orderId" show-overflow-tooltip></el-table-column>
+            <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
             <el-table-column label="往来单位" prop="fromCorp"></el-table-column>
             <el-table-column label="业务类型" prop="busName"></el-table-column>
-            <el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
             <el-table-column label="来源" prop="fromType"></el-table-column>
             <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
                 <template slot-scope="scope">
@@ -78,7 +78,7 @@
                     <el-button
                         type="text"
                         size="small"
-                        @click.native.stop="addOrders(scope.row)"
+                        @click.native.stop="submitOrder(scope.row)"
                     >提交
                     </el-button
                     >
@@ -121,7 +121,7 @@
 
 <script>
 import {getBussinessType} from "@/api/basic/bussinessType";
-import {filterOrder, deleteByOrderId} from "@/api/warehouse/order";
+import {filterOrder, deleteByOrderId, submitWebScanOrder} from "@/api/warehouse/order";
 import ioErrorOrder from "@/views/warehouse/ioErrorOrder";
 import addOrder from "@/views/warehouse/addOrder";
 
@@ -210,8 +210,6 @@ export default {
                 actDate: row.actDate
             };
         },
-        change() {
-        },
         addOrders() {
             this.addOrderVisible = true;
             this.formName = "add";
@@ -251,6 +249,19 @@ export default {
                 this.busTypes = res.data.list;
             })
         },
+        submitOrder(row) {
+            let params = {
+                orderId: row.orderId
+            };
+            submitWebScanOrder(params).then((res) => {
+                if (res.code === 20000) {
+                    this.$message.success(res.data.message);
+                    this.getList();
+                } else {
+                    this.$message.error(res.data.message)
+                }
+            })
+        },
     },
     mounted() {
     },