From 424159f81a5493838bae97aa572965797c35f343 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 12 十月 2023 15:36:36 +0800
Subject: [PATCH] 历史导入编码最大流水值不正确问题修复

---
 Source/UBCS-WEB/src/views/system/user.vue |   56 +++++++++++++++++++++++++++-----------------------------
 1 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index c03acfa..80d027e 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -278,6 +278,7 @@
         tip: false,
         searchShow: true,
         searchMenuSpan: 6,
+        columnBtn:false,
         border: true,
         index: true,
         selection: true,
@@ -373,7 +374,7 @@
                   trigger: "click"
                 }],
                 span: 24,
-                value:"211833"
+                value:""
               },
               {
                 label: "鐧诲綍璐﹀彿",
@@ -404,6 +405,7 @@
               {
                 label: '瀵嗙爜',
                 prop: 'password',
+                type: "password",
                 hide: true,
                 editDisplay: false,
                 viewDisplay: false,
@@ -413,6 +415,7 @@
                 label: '纭瀵嗙爜',
                 prop: 'password2',
                 hide: true,
+                type: "password",
                 editDisplay: false,
                 viewDisplay: false,
                 rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
@@ -546,12 +549,7 @@
                 props: {
                   label: "postName",
                   value: "id"
-                },
-                rules: [{
-                  required: true,
-                  message: "璇烽�夋嫨鎵�灞炲矖浣�",
-                  trigger: "click"
-                }],
+                }
               },
             ]
           },
@@ -1032,33 +1030,33 @@
       })
     },
     beforeOpen(done, type) {
-      // console.log(type)
+      //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('璇烽�夋嫨涓�鏉℃墍灞炵鎴�')
+      // 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;

--
Gitblit v1.10.0