From 25b727a5dc28f3c2d225c5e017da58f35c6b84b3 Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期二, 26 九月 2023 19:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'

---
 src/views/warehouseManage/warehouse/AddDialog.vue |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/warehouseManage/warehouse/AddDialog.vue b/src/views/warehouseManage/warehouse/AddDialog.vue
index 662ca4c..11e26d7 100644
--- a/src/views/warehouseManage/warehouse/AddDialog.vue
+++ b/src/views/warehouseManage/warehouse/AddDialog.vue
@@ -15,7 +15,9 @@
             <span>鎵撳嵃</span>
           </span>
           <span class="btn" style="margin-left: 15px">
-            <el-button plain size="mini" style="margin-left: 15px" @click="deleteClick">鍒犻櫎</el-button>
+            <i class="el-icon-s-tools"></i>
+            <span>鍔ㄤ綔</span>
+            <!-- <el-button plain size="mini" style="margin-left: 15px" @click="deleteClick">鍒犻櫎</el-button> -->
           </span>
           <el-button v-if="showEdit" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
         </div>
@@ -180,9 +182,11 @@
       deleteWarehouse({ id: data.id }).then((res) => {
         if (res.code === 200) {
           this.editConfig.visible = false;
-          this.$message.success("鍒櫎鎴愬姛");
+          this.$message.success("鍒櫎鎴愬姛!");
           this.$emit("refresh");
-        }
+        }else {
+                    this.$message.warning(res.msg?res.msg:"鍒櫎澶辫触!")
+                }
       });
     },
     // 缂栬緫
@@ -215,16 +219,20 @@
               addWarehouse(params).then((res) => {
                 if (res.code === 200) {
                   this.editConfig.visible = false;
-                  this.$message.success("娣诲姞鎴愬姛");
+                  this.$message.success("娣诲姞鎴愬姛!");
                   this.$emit('refresh')
+                }else {
+                    this.$message.warning(res.msg?res.msg:"娣诲姞澶辫触!")
                 }
               });
             } else {
               updateWarehouse(params).then((res) => {
                 if (res.code === 200) {
                   this.editConfig.visible = false;
-                  this.$message.success("缂栬緫鎴愬姛");
+                  this.$message.success("缂栬緫鎴愬姛!");
                   this.$emit('refresh')
+                }else {
+                    this.$message.warning(res.msg?res.msg:"缂栬緫澶辫触!")
                 }
               });
             }

--
Gitblit v1.8.0