From 5fb6a22802318375b003c0319287553673878690 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 24 十一月 2023 17:57:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/system/ProductionManager.vue |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/views/system/ProductionManager.vue b/src/views/system/ProductionManager.vue
index a0ac3eb..b60c346 100644
--- a/src/views/system/ProductionManager.vue
+++ b/src/views/system/ProductionManager.vue
@@ -293,7 +293,11 @@
       batchDel: function () {
         console.log(this.checkedKeys)
         if (this.checkedKeys.length <= 0) {
-          this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+          // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
+          this.$notification.warning({
+            message:'娑堟伅',
+            description:"璇烽�夋嫨涓�鏉¤褰�"
+          });
         } else {
           var ids = ''
           for (var a = 0; a < this.checkedKeys.length; a++) {
@@ -306,11 +310,19 @@
             onOk: function () {
               deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
                 if (res.success) {
-                  that.$message.success(res.message)
+                  // that.$message.success(res.message)
+                  that.$notification.warning({
+                    message:'娑堟伅',
+                    description:res.message
+                  });
                   that.loadTree()
                   that.onClearSelected()
                 } else {
-                  that.$message.warning(res.message)
+                  // that.$message.warning(res.message)
+                  that.$notification.warning({
+                    message:'娑堟伅',
+                    description:res.message
+                  });
                 }
               })
             }
@@ -328,7 +340,11 @@
                 that.departTree.push(temp)
               }
             } else {
-              that.$message.warning(res.message)
+              // that.$message.warning(res.message)
+              that.$notification.warning({
+                message:'娑堟伅',
+                description:res.message
+              });
             }
           })
         } else {
@@ -400,16 +416,28 @@
         this.$refs.form.validate(valid => {
           if (valid) {
             if (!this.currSelected.id) {
-              this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂�!')
+              // this.$message.warning('璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂�!')
+              this.$notification.warning({
+                message:'娑堟伅',
+                description:"璇风偣鍑婚�夋嫨瑕佷慨鏀硅溅闂达紒"
+              });
               return
             }
 
             httpAction(this.url.edit, this.currSelected, 'put').then((res) => {
               if (res.success) {
-                this.$message.success('淇濆瓨鎴愬姛!')
+                // this.$message.success('淇濆瓨鎴愬姛!')
+                this.$notification.warning({
+                  message:'娑堟伅',
+                  description:"淇濆瓨鎴愬姛"
+                });
                 this.loadTree()
               } else {
-                this.$message.error(res.message)
+                // this.$message.error(res.message)
+                this.$notification.warning({
+                  message:'娑堟伅',
+                  description:res.message
+                });
               }
             })
           }
@@ -437,7 +465,11 @@
           console.log(this.currSelected)
           let key = this.currSelected.key
           if (!key) {
-            this.$message.warning('璇峰厛鐐瑰嚮閫変腑涓婄骇杞﹂棿锛�')
+            // this.$message.warning('璇峰厛鐐瑰嚮閫変腑涓婄骇杞﹂棿锛�')
+            this.$notification.warning({
+              message:'娑堟伅',
+              description:"璇峰厛鐐瑰嚮閫変腑涓婄骇杞﹂棿锛�"
+            });
             return false
           }
           this.$refs.departModal.add(this.selectedKeys)
@@ -457,7 +489,11 @@
               if (resp.success) {
                 //鍒犻櫎鎴愬姛鍚庯紝鍘婚櫎宸查�変腑涓殑鏁版嵁
                 that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1);
-                that.$message.success('鍒犻櫎鎴愬姛!')
+                // that.$message.success('鍒犻櫎鎴愬姛!')
+                that.$notification.success({
+                  message:'娑堟伅',
+                  description:"鍒犻櫎鎴愬姛"
+                });
                 that.loadTree()
                 //鍒犻櫎鍚庡悓姝ユ竻绌哄彸渚у熀鏈俊鎭唴瀹�
                 // let orgCode=that.model.orgCode;
@@ -465,7 +501,11 @@
                   that.onClearSelected()
                 // }
               } else {
-                that.$message.warning('鍒犻櫎澶辫触!')
+                // that.$message.warning('鍒犻櫎澶辫触!')
+                that.$notification.warning({
+                  message:'娑堟伅',
+                  description:"鍒犻櫎澶辫触"
+                });
               }
             })
           }

--
Gitblit v1.9.3