From 8e75a78f55d60565eb48b25eafd4eb07939ce2cc Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:05 +0800
Subject: [PATCH] Merge branch 'master' into develop

---
 src/views/mdc/base/modules/shift/ShiftInfo.vue |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/mdc/base/modules/shift/ShiftInfo.vue b/src/views/mdc/base/modules/shift/ShiftInfo.vue
index c5634c4..7d80453 100644
--- a/src/views/mdc/base/modules/shift/ShiftInfo.vue
+++ b/src/views/mdc/base/modules/shift/ShiftInfo.vue
@@ -153,10 +153,18 @@
         var that = this;
         deleteAction(that.url.deleteBatch, {id: record}).then((res) => {
           if (res.success) {
-            that.$message.success(res.message);
+            // that.$message.success(res.message);
+            that.$notification.warning({
+              message:'娑堟伅',
+              description:res.message
+            });
             that.loadData();
           } else {
-            that.$message.warning(res.message);
+            // that.$message.warning(res.message);
+            that.$notification.warning({
+              message:'娑堟伅',
+              description:res.message
+            });
           }
         });
       },
@@ -164,10 +172,18 @@
         let _this = this
         putAction(this.url.changeStatus, { id: id, status: status }).then((res) => {
           if (res.success) {
-            _this.$message.success('鎿嶄綔鎴愬姛锛�')
+            // _this.$message.success('鎿嶄綔鎴愬姛锛�')
+            _this.$notification.warning({
+              message:'娑堟伅',
+              description:"鎿嶄綔鎴愬姛"
+            });
             _this.loadData()
           } else {
-            that.$message.warning('鎿嶄綔澶辫触锛�')
+            // _this.$message.warning('鎿嶄綔澶辫触锛�')
+            _this.$notification.warning({
+              message:'娑堟伅',
+              description:"鎿嶄綔澶辫触"
+            });
           }
         })
       },

--
Gitblit v1.9.3