From c89223e74b0a00094639c24bd16c7f3995632f5c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 12 七月 2024 15:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/system/user/index.vue |    9 ++++-----
 1 files changed, 4 insertions(+), 5 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 94dba49..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
@@ -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() {
@@ -397,7 +396,7 @@
         if (res.data.code === 200) {
           this.$message.success(res.data.obj);
           this.getTableList();
-          done()
+          done();
         }
       }).catch(err => {
         loading()

--
Gitblit v1.9.3