Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

src/views/system/user/index.vue

@@ -280,6 +280,16 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="用户类型" prop="userType">
+              <el-select v-model="form.userType" placeholder="请选择用户类型">
+                <el-option
+                  v-for="dict in dict.type.sys_user_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
@@ -349,7 +359,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex'],
+  dicts: ['sys_normal_disable', 'sys_user_sex','sys_user_type'],
   components: { Treeselect },
   data() {
     return {
@@ -436,6 +446,9 @@ export default {
           { required: true, message: "用户密码不能为空", trigger: "blur" },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
         ],
+        userType: [
+          { required: true, message: "用户类型不能为空", trigger:"" }
+        ],
         email: [
           {
             type: "email",
@@ -522,6 +535,7 @@ export default {
         sex: undefined,
         status: "0",
         remark: undefined,
+        userType:undefined,
         postIds: [],
         roleIds: []
       };