Merge branch 'feature/v1/plb' of http://git.nyinhong.com/PeiZhen-Java/peizhen-vue into feature_lyj

src/views/system/user/index.vue

@@ -105,7 +105,8 @@
               size="mini"
               size="mini"
               @click="handleAdd"
               @click="handleAdd"
               v-hasPermi="['system:user:add']"
               v-hasPermi="['system:user:add']"
-            >新增</el-button>
+              >新增</el-button
+            >
           </el-col>
           </el-col>
           <!-- <el-col :span="1.5">
           <!-- <el-col :span="1.5">
             <el-button
             <el-button
@@ -284,8 +285,8 @@
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
+          <el-col :span="24">
+            <el-form-item label="用户名" prop="nickName">
               <el-input
               <el-input
                 v-model="form.nickName"
                 v-model="form.nickName"
                 placeholder="请输入用户昵称"
                 placeholder="请输入用户昵称"
@@ -293,7 +294,16 @@
               />
               />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
+            <el-form-item label="名称" prop="userName">
+              <el-input
+                v-model="form.userName"
+                placeholder="请输入名称"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
             <el-form-item label="归属部门" prop="deptId">
               <treeselect
               <treeselect
                 v-model="form.deptId"
                 v-model="form.deptId"
@@ -302,10 +312,62 @@
                 placeholder="请选择归属部门"
                 placeholder="请选择归属部门"
               />
               />
             </el-form-item>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         </el-row>
         <el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
+            <el-form-item label="密码" prop="password">
+              <el-input
+                v-model="form.password"
+                placeholder="请输入密码"
+                type="password"
+                maxlength="20"
+                show-password
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="确认密码" prop="password">
+              <el-input
+                v-model="form.password"
+                placeholder="请输入确认密码"
+                type="password"
+                maxlength="20"
+                show-password
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="角色">
+              <el-select
+                v-model="form.roleIds"
+                multiple
+                placeholder="请选择角色"
+              >
+                <el-option
+                  v-for="item in roleOptions"
+                  :key="item.roleId"
+                  :label="item.roleName"
+                  :value="item.roleId"
+                  :disabled="item.status == 1"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <template v-if="title === '修改'">
+            <el-col :span="24">
+              <el-form-item label="创建时间" prop="">
+                <el-input disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="更新时间" prop="">
+                <el-input disabled />
+              </el-form-item>
+            </el-col>
+          </template>
+
+          <!-- <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
             <el-form-item label="手机号码" prop="phonenumber">
               <el-input
               <el-input
                 v-model="form.phonenumber"
                 v-model="form.phonenumber"
@@ -322,9 +384,9 @@
                 maxlength="50"
                 maxlength="50"
               />
               />
             </el-form-item>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item
             <el-form-item
               v-if="form.userId == undefined"
               v-if="form.userId == undefined"
@@ -426,7 +488,7 @@
               ></el-input>
               ></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-        </el-row>
+        </el-row> -->
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -727,7 +789,8 @@ export default {
         this.postOptions = response.data.posts;
         this.postOptions = response.data.posts;
         this.roleOptions = response.data.roles;
         this.roleOptions = response.data.roles;
         this.open = true;
         this.open = true;
-        this.title = "添加用户";
+        // this.title = "添加用户";
+        this.title = "新增";
         this.form.password = this.initPassword;
         this.form.password = this.initPassword;
       });
       });
     },
     },
@@ -742,7 +805,8 @@ export default {
         this.$set(this.form, "postIds", response.data.postIds);
         this.$set(this.form, "postIds", response.data.postIds);
         this.$set(this.form, "roleIds", response.data.roleIds);
         this.$set(this.form, "roleIds", response.data.roleIds);
         this.open = true;
         this.open = true;
-        this.title = "修改用户";
+        // this.title = "修改用户";
+        this.title = "修改";
         this.form.password = "";
         this.form.password = "";
       });
       });
     },
     },