From 56bebe56adaa7df28a4353dfbf461a339cddd8e6 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Tue, 26 Jul 2022 14:14:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=BC=B9=E7=AA=97=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BasicThirdSys.vue       |  2 +-
 src/views/business/stockOrderUpload.vue | 56 +++++++++++++------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/views/basic/BasicThirdSys.vue b/src/views/basic/BasicThirdSys.vue
index 5302d95..f966bd5 100644
--- a/src/views/basic/BasicThirdSys.vue
+++ b/src/views/basic/BasicThirdSys.vue
@@ -235,7 +235,7 @@
                            <div class="itemTag">
                                <span>第三方单据类型:&nbsp;</span>
                            </div>
-                           <el-select style="width: 150%;" v-model="thirdBuyForm.thirdBuyName" placeholder="第三方单据类型">
+                           <el-select style="width: 150%;" v-model="thirdBuyForm.thirdBuyName" placeholder="第三方单据类型" clearable>
                                <el-option
                                    v-for="item in thirdBuyList"
                                    :key="item.name"
diff --git a/src/views/business/stockOrderUpload.vue b/src/views/business/stockOrderUpload.vue
index 9b820f1..2fd88e8 100644
--- a/src/views/business/stockOrderUpload.vue
+++ b/src/views/business/stockOrderUpload.vue
@@ -487,39 +487,41 @@ export default {
                     type: "warning",
                     center: true
                 }).then(() => {
-                    let params = {id: row.id};
-                    submitStockOrderToThirdSys(params).then((res) => {
-                        this.$message({
-                            type: "success",
-                            message: "提交成功！"
-                        })
-                    }).catch((error) => {
-                        this.$message.error("提交失败");
-                    });
+                    this.confirmSubmitOrder(row);
                 }).catch(() => {
-                    this.$message({
-                        type: "info",
-                        message: "已取消"
-                    })
+
                 })
             } else {
-                let params = {id: row.id};
-                submitStockOrderToThirdSys(params).then((res) => {
-                    if (res.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: "提交成功！"
-                        });
-                        this.getList();
-                    } else {
-                        this.$message.error("提交失败");
-                    }
-                }).catch((error) => {
-                    this.$message.error("提交失败");
-                });
+                this.$confirm("确定手动上传单据？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                    center: true
+                }).then(() => {
+                    this.confirmSubmitOrder(row);
+                }).catch(() => {
+
+                })
             }
         }
     },
+
+    confirmSubmitOrder(row) {
+        let params = {id: row.id};
+        submitStockOrderToThirdSys(params).then((res) => {
+            if (res.code == 20000) {
+                this.$message({
+                    type: "success",
+                    message: "提交成功！"
+                });
+                this.getList();
+            } else {
+                this.$message.error(res.message);
+            }
+        }).catch((error) => {
+            this.$message.error("提交失败");
+        });
+    },
     components: {},
     filters: {
         statusFilterType(status) {