Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/assets/mixins/formdialog.js

@@ -16,6 +16,15 @@ export default {
           },
         ];
       }
+
+      data.entity.userType
+        ? (data.entity.userType = Number(data.entity.userType))
+        : "";
+      data.entity.roleIds
+        ? (data.entity.roleIds = data.entity.roleIds.map((v) => String(v)))
+        : "";
+      console.log(data);
+      this.$forceUpdate(data);
       return data;
     },
     // 渲染后置处理

attendance-performance-manager-ui/admin/src/views/system/user/dialogshow.vue

@@ -46,8 +46,14 @@
           v-model="form.mobile"
           :maxLength="11"
         />
-         <Field label="用户类型" prop="userType" v-model="form.userType" :enumData='dict.userType' type='select' />
-<!--        <Field label="用户状态" prop="status" v-model="form.status" :enumData='dict.status' type='select' />-->
+        <Field
+          label="用户类型"
+          prop="userType"
+          v-model="form.userType"
+          :enumData="dict.userType"
+          type="select"
+        />
+        <!--        <Field label="用户状态" prop="status" v-model="form.status" :enumData='dict.status' type='select' />-->
         <Field
           label="角色分配"
           :span="24"
@@ -86,14 +92,14 @@ export default {
       title: "用户",
       // 是否显示弹出层
       open: false,
-      toString: ["status", "userType"],
+      toString: ["status"],
       toArrays: ["roleIds"],
       // 表单校验
       rules: {
         loginName: [
           { required: true, message: "请输入英文的用户名", trigger: "blur" },
           {
-            validator: function (rule, value, callback) {
+            validator: function(rule, value, callback) {
               //  校验英文的正则
               if (/[A-Za-z0-9]$/.test(value) == false) {
                 callback(new Error("请输入英文"));
@@ -145,15 +151,19 @@ export default {
     },
     /**获取数据后弹框 */
     afterRender(data) {
+      // data.entity.userType = Number(data.entity.userType);
+      // data.entity.roleIds = data.entity.roleIds.map((v) => String(v));
+      // console.log(data);
+      // this.$forceUpdate(data);
       this.open = true;
     },
 
     beforeSubmit(data) {
-      data.roleIds = data.roleIds
-        .filter((item) => {
-          return item !== "";
-        })
-        .join(",");
+      // data.roleIds = data.roleIds
+      //   .filter((item) => {
+      //     return item !== "";
+      //   })
+      //   .join(",");
       return data;
     },
     afterSubmit(data) {
@@ -162,7 +172,7 @@ export default {
     },
     // 表单重置
     reset() {
-      this.form = {roleIds:""};
+      this.form = {};
       this.resetForm("form");
     },
 
@@ -193,5 +203,3 @@ export default {
   },
 };
 </script>
-
-