From 4829cbe8f9e602ae803ffa36cfa63020726130bb Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 17 May 2022 17:16:14 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89=E7=94=B1?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=88=A4=E6=96=AD=E8=BF=87=E6=BB=A4=202.?=
 =?UTF-8?q?=E5=B7=B2=E6=A0=B8=E5=AF=B9=E5=8D=95=E6=8D=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/busLocalType.js              |  7 ++++
 src/views/basic/BasicThirdSys.vue          | 17 ++------
 src/views/business/stockOrderDelSearch.vue | 48 ++++++++++++++++++----
 3 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/src/api/basic/busLocalType.js b/src/api/basic/busLocalType.js
index 58a89fe..48f3dde 100644
--- a/src/api/basic/busLocalType.js
+++ b/src/api/basic/busLocalType.js
@@ -66,3 +66,10 @@ export function updateLocalBusType(query) {
     });
 }
 
+export function filterForThirdSys() {
+    return axios({
+        url: "/udiwms/localBusType/filterForThirdSys",
+        method: "get",
+        param: null
+    })
+}
diff --git a/src/views/basic/BasicThirdSys.vue b/src/views/basic/BasicThirdSys.vue
index 9043efb..0fb4fc7 100644
--- a/src/views/basic/BasicThirdSys.vue
+++ b/src/views/basic/BasicThirdSys.vue
@@ -246,7 +246,7 @@ import {
 
 import modifyDialog from "./BasicThirdSysModify";
 import modifyDetailDialog from "./BasicThirdSysDetailModify";
-import {getLocalBusType} from "../../api/basic/busLocalType";
+import {filterForThirdSys} from "../../api/basic/busLocalType";
 
 export default {
     data() {
@@ -440,19 +440,10 @@ export default {
                 }
             })
         },
-        addBussinessType(){
+        addBussinessType() {
             this.bussinessTypeFormVisible = true;
-            getLocalBusType().then((res) => {
-                this.bussinessTypeList = res.data.list;
-                this.busTypeList.forEach((item) => {
-                    for (let i = 0; i < this.bussinessTypeList.length; i++) {
-                        if (item.code === this.bussinessTypeList[i].action) {
-                            this.bussinessTypeList.splice(i, 1);
-                            i--;
-                            break;
-                        }
-                    }
-                })
+            filterForThirdSys().then((res) => {
+                this.bussinessTypeList = res.data;
             })
         },
         addBussinessTypeData() {
diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue
index 54c5ff9..411ef71 100644
--- a/src/views/business/stockOrderDelSearch.vue
+++ b/src/views/business/stockOrderDelSearch.vue
@@ -142,14 +142,22 @@
 
             <!--                           v-if="haveDistributionVisible"-->
 
-            <div v-if="scope.row.enableSupplementOrder">
+          <div v-if="scope.row.enableSupplementOrder">
               <el-button
                   type="text"
                   size="small"
                   @click.native="supplementOrder(scope.row)">
-                平衡补单
+                  平衡补单
+              </el-button>
+          </div>
+
+              <el-button
+                  v-if="scope.row.submitFlag"
+                  type="text"
+                  size="small"
+                  @click.native="submitOrder(scope.row)">
+                  提交
               </el-button>
-            </div>
 
           </template>
         </el-table-column>
@@ -849,21 +857,47 @@ export default {
         type: 'warning',
         center: true,
       }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '补单成功!'
-        });
         //补单
         let orderQuery = {
           billNo: row.billNo
         }
         supplementOrder(orderQuery);
+          this.$message({
+              type: 'success',
+              message: '补单成功!'
+          });
       }).catch(() => {
         this.$message({
           type: 'info',
           message: '取消补单'
         });
       });
+    },
+    submitOrder(row){
+        console.log(row.exportStatus)
+        if (row.exportStatus == 1) {
+            this.$confirm("单据已经提交，是否重复提交？","提示",{
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+                center: true
+            }).then(() => {
+                this.$message({
+                    type: "success",
+                    message: "提交成功！"
+                })
+            }).catch(() => {
+                this.$message({
+                    type: "info",
+                    message: "已取消"
+                })
+            })
+        } else {
+            this.$message({
+                type: "success",
+                message: "提交成功！"
+            })
+        }
     }
   },
   components: {