From 18e2c156de069eaee2f989e09fda061841aae605 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 11 七月 2024 11:35:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/system/user/index.vue |   45 ++++++++++++++++++++++++++++-----------------
 1 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
index 2303278..50f7723 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
@@ -53,7 +53,7 @@
         <el-button icon="el-icon-delete" size="small" type="text" @click.stop="rowDeleteHandler(row)">鍒犻櫎</el-button>
         <el-button size="small" type="text" @click.stop="stopUserHandler(row)">
           <span v-if="row.status === 0" style="color: #fa3434"><i class="el-icon-video-pause"></i> 鍋滅敤</span>
-          <span v-if="row.status === 1" style="color: #55b61d"><i class="el-icon-video-pause"></i> 鍚敤</span>
+          <span v-if="row.status === 1" style="color: #55b61d"><i class="el-icon-video-play"></i> 鍚敤</span>
         </el-button>
       </template>
 
@@ -77,7 +77,6 @@
     <el-dialog
       v-dialogDrag
       v-loading="pwdLoading"
-      :destroy-on-close="true"
       :visible.sync="pwdVisible"
       append-to-body="true"
       class="avue-dialog"
@@ -100,13 +99,12 @@
     </el-dialog>
 
     <!-- 瀵煎叆浜哄憳   -->
-    <upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" title="瀵煎叆浜哄憳" @updata="getTableList"></upload-file>
+    <upload-file ref="upload" :tipList="tipList" :fileType="upFileType" :fileUrl="fileUrl" title="瀵煎叆浜哄憳" @updata="getTableList"></upload-file>
 
     <!-- 鍒嗛厤閮ㄩ棬瀵硅瘽妗�    -->
     <el-dialog
       v-dialogDrag
       v-loading="departLoading"
-      :destroy-on-close="true"
       :visible.sync="departVisible"
       append-to-body="true"
       class="avue-dialog"
@@ -213,7 +211,8 @@
       selectList: [],
       leftRoleData: [],  // 鍒嗛厤瑙掕壊绌挎妗嗗乏渚у垵濮嬫暟鎹�
       rightRoleData: [], // 鍒嗛厤瑙掕壊绌挎妗嗗彸渚у垵濮嬫暟鎹�
-      transferTitle: ['鐜版湁瑙掕壊', '鎷ユ湁瑙掕壊']
+      transferTitle: ['鐜版湁瑙掕壊', '鎷ユ湁瑙掕壊'],
+      tipList:["瀵煎叆妯℃澘涓爣鏄庣孩鑹插瓧浣撶殑涓哄繀杈撻」","閮ㄩ棬鍒椾笂涓嬬骇鍏崇郴蹇呴』鎸夌収鍙嶆枩鏉犻殧寮�(/)"]
     }
   },
   created() {
@@ -387,7 +386,7 @@
     },
 
     // 鏂板
-    rowSaveHandler(row, done) {
+    rowSaveHandler(row, done,loading) {
       if (row.password != row.confirmPassword) {
         this.$message.error('璇锋鏌ヤ袱娆″瘑鐮佹槸鍚﹁緭鍏ヤ竴鑷达紒')
         return this.$refs.userCrud.$refs.dialogForm.$refs.tableForm.allDisabled = false;
@@ -397,11 +396,12 @@
         if (res.data.code === 200) {
           this.$message.success(res.data.obj);
           this.getTableList();
+          done();
         }
       }).catch(err => {
+        loading()
         console.log(err);
       })
-      done()
     },
 
     // 鎿嶄綔鏍忕紪杈�
@@ -417,7 +417,7 @@
     },
 
     // 缂栬緫
-    rowUpdateHandler(row, index, done) {
+    rowUpdateHandler(row, index, done,loading) {
       if (row.password != row.confirmPassword) {
         this.$message.error('璇锋鏌ヤ袱娆″瘑鐮佹槸鍚﹁緭鍏ヤ竴鑷达紒')
         return this.$refs.userCrud.$refs.dialogForm.$refs.tableForm.allDisabled = false;
@@ -427,11 +427,12 @@
         if (res.data.code === 200) {
           this.$message.success(res.data.obj);
           this.getTableList();
+          done()
         }
       }).catch(err => {
+        loading()
         console.log(err);
       });
-      done()
     },
 
     // 鍒犻櫎
@@ -439,14 +440,24 @@
       let params = {
         ids: row.oid
       }
-      deleteUser(params).then(res => {
-        if (res.data.code === 200) {
-          this.$message.success(res.data.obj);
-          this.getTableList();
-        }
-      }).catch(err => {
-        console.log(err);
-      })
+
+      this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎褰撳墠鐨勬垚鍛樺悧锛�', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        deleteUser(params).then(res => {
+          if (res.data.code === 200) {
+            this.$message.success(res.data.obj);
+            this.getTableList();
+          }
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '宸插彇娑堝垹闄�'
+        });
+      });
     },
 
     // 澶氶�夊垹闄�

--
Gitblit v1.9.3