From 49057481e3872c7953d4f7c20f83223ba2155750 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 12 Sep 2022 17:06:33 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=9B=9E?=
 =?UTF-8?q?=E9=80=80=E5=8D=95=E6=8D=AE=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                             |  4 ++--
 src/api/warehouse/stockOrder.js                | 10 +++++++++-
 src/views/basic/basicCompanyProductsImport.vue |  5 +++++
 src/views/warehouse/stockOrderDelSearch.vue    | 11 +++++++----
 src/views/warehouse/stockOrderSearch.vue       | 15 +++++++++------
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/public/config.json b/public/config.json
index f987e7a..a919abd 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
 {
-    "BASE_URL": "http://192.168.0.109:9906",
-    "SERVER_IP": "http://192.168.0.109:9906",
+    "BASE_URL": "http://127.0.0.1:9906",
+    "SERVER_IP": "http://127.0.0.1:9906",
     "hosp_name": "福建省XX市医院"
 }
 
diff --git a/src/api/warehouse/stockOrder.js b/src/api/warehouse/stockOrder.js
index f773c86..ef729c7 100644
--- a/src/api/warehouse/stockOrder.js
+++ b/src/api/warehouse/stockOrder.js
@@ -289,7 +289,15 @@ export function findOrderByStockOrder(query) {
 
 export function rollbackOrder(params) {
     return axios({
-        url: "/udiwms/stock/order/rollback",
+        url: "/udiwms/stock/order/received/rollback",
+        method: "get",
+        params: params
+    });
+}
+
+export function rollUnReceivebackOrder(params) {
+    return axios({
+        url: "/udiwms/stock/order/unReceive/rollbacks",
         method: "get",
         params: params
     });
diff --git a/src/views/basic/basicCompanyProductsImport.vue b/src/views/basic/basicCompanyProductsImport.vue
index 6c527f7..2c08a2f 100644
--- a/src/views/basic/basicCompanyProductsImport.vue
+++ b/src/views/basic/basicCompanyProductsImport.vue
@@ -723,6 +723,11 @@ export default {
 
         selectExport() {
             var selectData = this.multipleSelection;
+
+            if (selectData == null || selectData.length == 0) {
+                this.$message.warning("请先选入产品！");
+                return;
+            }
             selectData.forEach((obj) => {
                 this.filterQuery.rlIds.push(obj.id);
             });
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 04cc6d2..a71ce92 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -143,7 +143,7 @@
                             type="text"
                             size="small"
                             @click.native="rollback(scope.row)"
-                        >回退
+                        >撤回
                         </el-button>
 
                     </template>
@@ -908,7 +908,7 @@ export default {
             });
         },
         rollback(row) {
-            this.$confirm('此操作将回退单据, 是否继续?', '提示', {
+            this.$confirm('此操作将撤回单据到未验收, 是否继续?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
@@ -916,11 +916,14 @@ export default {
                 let param = {billNo: row.billNo};
                 rollbackOrder(param).then((res) => {
                     if (res.code === 20000) {
-                        this.$message.success("回退成功");
+                        this.$message.success("撤回成功");
+                        this.getList();
+                    } else {
+                        this.$message.error(res.message);
                     }
                 })
             }).catch(() => {
-                this.$message.info('回退失败');
+                // this.$message.info('回退失败');
             });
         }
     },
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 7c4fb65..8568876 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -137,7 +137,7 @@
                             type="text"
                             size="small"
                             @click.native="rollback(scope.row)"
-                        >回退
+                        >撤回
                         </el-button>
 
                     </template>
@@ -467,7 +467,7 @@ import {
     deleteStockOrderById, deleteStockOrderDetailById,
     copyStockOrderDetail,
     uploadStockOrderDetail,
-    updateStockOrderDetail, updateStatus, rollbackOrder
+    updateStockOrderDetail, updateStatus, rollbackOrder, rollUnReceivebackOrder
 } from "../../api/warehouse/stockOrder";
 import stockOrderDistribution from "./stockOrderDistribution";
 import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
@@ -1044,19 +1044,22 @@ export default {
                 });
         },
         rollback(row) {
-            this.$confirm('此操作将回退单据, 是否继续?', '提示', {
+            this.$confirm('此操作将撤回单据到等待校验, 是否继续?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
                 let param = {billNo: row.billNo};
-                rollbackOrder(param).then((res) => {
+                rollUnReceivebackOrder(param).then((res) => {
                     if (res.code === 20000) {
-                        this.$message.success("回退成功");
+                        this.$message.success("撤回成功");
+                        this.getList();
+                    } else {
+                        this.$message.error(res.message);
                     }
                 })
             }).catch(() => {
-                this.$message.info('回退失败');
+                // this.$message.info('回退失败');
             });
         }
     }