Merge branch 'bug-user' into ldx

src/views/system/user/index.vue

 <template>
   <div class="app-container">
-    <el-row :gutter="20" class="client-fix-height container">
+    <el-row :gutter="20"
+      class="client-fix-height container">
       <!--部门数据-->
       <category-tree :options="deptOptions"
         :defaultProps="{ label: 'label', children: 'children' }"
@@ -301,9 +302,9 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds"
-                multiple
+            <el-form-item label="岗位"
+              prop="postId">
+              <el-select v-model="form.postId"
                 placeholder="请选择">
                 <el-option v-for="item in postOptions"
                   :key="item.postId"
@@ -314,9 +315,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
-              <el-select v-model="form.roleIds"
-                multiple
+            <el-form-item label="角色"
+              prop="roleId">
+              <el-select v-model="form.roleId"
                 placeholder="请选择">
                 <el-option v-for="item in roleOptions"
                   :key="item.roleId"
@@ -457,7 +458,9 @@
       nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
       password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
       email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
-      phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+      phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
+      postId: [{ required: true, message: "请选择岗位", trigger: "change" }],
+      roleId: [{ required: true, message: "请选择角色", trigger: "change" }],
     }
   });
 
@@ -648,8 +651,8 @@
       sex: undefined,
       status: "0",
       remark: undefined,
-      postIds: [],
-      roleIds: []
+      postId: undefined,
+      roleId: undefined
     };
     proxy.resetForm("userRef");
   };
@@ -680,8 +683,6 @@
       form.value = response.data;
       postOptions.value = response.posts;
       roleOptions.value = response.roles;
-      form.value.postIds = response.postIds;
-      form.value.roleIds = response.roleIds;
       open.value = true;
       title.value = "修改用户";
       form.password = "";
@@ -690,8 +691,6 @@
 
   /** 提交按钮 */
   function submitForm() {
-    const obj = roleOptions.value.find(o => o.roleId == form.value.roleIds[0])
-    form.value.roleName = obj.roleName
     proxy.$refs["userRef"].validate(valid => {
       if (valid) {
         if (form.value.userId != undefined) {