From fec7909e8552e98c60f3e14efc7d208e109dc4f8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 11:07:41 +0800
Subject: [PATCH] 增加秧苗

---
 src/views/system/user.vue |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index b126312..9dfd586 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -35,13 +35,13 @@
               :type="type"
               :size="size"
               icon="el-icon-edit"
-              :disabled="row.roleId == 1123598816738675201"
+              :disabled="row.roleId == '1123598816738675201' "
               @click="update(row)">编辑</el-button>
             <el-button 
               :type="type"
               :size="size"
               icon="el-icon-delete"
-              :disabled="row.roleId == 1123598816738675201"
+              :disabled="row.roleId == '1123598816738675201' "
               @click="rowDel(row)">删除</el-button>
           </template>
           <template slot="menuLeft">
@@ -866,6 +866,10 @@
           roleId:row.roleId.split(','),
           farmId : row.farmId.split(",")
         }
+        var passwordColumn = this.findObject(this.option.group,"password");
+        var password2Column = this.findObject(this.option.group,"password2")
+        passwordColumn.display = false;
+        password2Column.display = false;
         this.dialogVisible = true
       },
       submitUpdate(row, done, loading){
@@ -1032,11 +1036,17 @@
       },
       beforeOpen(done, type) {
         const column = this.findObject(this.option.group, "farmId");
+        var passwordColumn = this.findObject(this.option.group,"password");
+        var password2Column = this.findObject(this.option.group,"password2")
+        passwordColumn.display = true;
+        password2Column.display = true;
         if(type == "add"&& column.dicData == ""){
+          this.form = {}
           this.initData(website.tenantId)
         }
-        this.form = {}
         if (["edit", "view"].includes(type)) {
+          passwordColumn.display = false;
+          password2Column.display = false;
           getUser(this.form.id).then(res => {
             this.form = res.data.data;
             if(this.form.hasOwnProperty("deptId")){

--
Gitblit v1.9.3