From 815c6be8d063ca1ec89079722d265585f7d3602c Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 13 十月 2023 11:05:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/system/user.vue |   61 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 212e197..39bac5b 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -209,6 +209,7 @@
       }
     };
     return {
+      tenantId:'',
       form: {},
       seoptions: [],
       sevalue:"",
@@ -277,6 +278,7 @@
         tip: false,
         searchShow: true,
         searchMenuSpan: 6,
+        columnBtn:false,
         border: true,
         index: true,
         selection: true,
@@ -344,7 +346,7 @@
               required: true,
               message: "璇烽�夋嫨鐢ㄦ埛骞冲彴",
               trigger: "blur"
-            }]
+            }],
           },
         ],
         group: [
@@ -372,7 +374,7 @@
                   trigger: "click"
                 }],
                 span: 24,
-                // value:'986926'
+                value:""
               },
               {
                 label: "鐧诲綍璐﹀彿",
@@ -391,6 +393,7 @@
                   label: "dictValue",
                   value: "dictKey"
                 },
+                value:'1',
                 dataType: "number",
                 slot: true,
                 prop: "userType",
@@ -403,6 +406,7 @@
               {
                 label: '瀵嗙爜',
                 prop: 'password',
+                type: "password",
                 hide: true,
                 editDisplay: false,
                 viewDisplay: false,
@@ -412,6 +416,7 @@
                 label: '纭瀵嗙爜',
                 prop: 'password2',
                 hide: true,
+                type: "password",
                 editDisplay: false,
                 viewDisplay: false,
                 rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
@@ -694,6 +699,7 @@
     'form.tenantId'() {
       if (this.form.tenantId !== '' && this.initFlag) {
         this.initData(this.form.tenantId);
+        console.log('this.form.tenantId',this.form.tenantId)
       }
     },
     'excelForm.isCovered'() {
@@ -809,6 +815,8 @@
       });
     },
     nodeClick(data) {
+      console.log(data)
+      console.log(this.form.tenantId)
       this.treeDeptId = data.id;
       this.page.currentPage = 1;
       this.onLoad(this.page);
@@ -1028,29 +1036,33 @@
       })
     },
     beforeOpen(done, type) {
-      console.log(type)
-      if(this.treeDeptId){
-        if (["edit", "view"].includes(type)) {
-          getUser(this.form.id).then(res => {
-            this.form = res.data.data;
-            if (this.form.hasOwnProperty("deptId")) {
-              this.form.deptId = this.form.deptId.split(",");
-            }
-            if (this.form.hasOwnProperty("roleId")) {
-              this.form.roleId = this.form.roleId.split(",");
-            }
-            if (this.form.hasOwnProperty("postId")) {
-              this.form.postId = this.form.postId.split(",");
-            }
-          });
-        }
-        const prop = this.findObject(this.option.group, 'tenantId');
-        console.log('1',prop)
-        this.initFlag = true;
-        done();
-      }else {
-        this.$message.warning('璇烽�夋嫨涓�鏉℃墍灞炵鎴�')
+      //console.log(type)
+      // console.log('this.tenantId',this.tenantId)
+      // const column = this.findObject(this.option.group,'tenantId');
+      // column.value=this.tenantId;
+      // console.log('column',column)
+      // if(this.treeDeptId){
+      if (["edit", "view"].includes(type)) {
+        getUser(this.form.id).then(res => {
+          this.form = res.data.data;
+          if (this.form.hasOwnProperty("deptId")) {
+            this.form.deptId = this.form.deptId.split(",");
+          }
+          if (this.form.hasOwnProperty("roleId")) {
+            this.form.roleId = this.form.roleId.split(",");
+          }
+          if (this.form.hasOwnProperty("postId")) {
+            this.form.postId = this.form.postId.split(",");
+          }
+        });
       }
+      const prop = this.findObject(this.option.group, 'tenantId');
+      //console.log('1',prop)
+      this.initFlag = true;
+      done();
+      // }else {
+      //   this.$message.warning('璇烽�夋嫨涓�鏉℃墍灞炵鎴�')
+      // }
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
@@ -1068,6 +1080,7 @@
         this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
+        this.tenantId=data.records[0].tenantId
         this.selectionClear();
       });
     },

--
Gitblit v1.9.3