diff --git a/attendance-performance-manager-ui/admin/src/assets/mixins/formdialog.js b/attendance-performance-manager-ui/admin/src/assets/mixins/formdialog.js index bffbfe3256b764d3b249a4f5fb8260398860f18e..b09d5f63fe2e48d5b36da49e780944fd32317933 100644 --- a/attendance-performance-manager-ui/admin/src/assets/mixins/formdialog.js +++ b/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; }, // 娓叉煋鍚庣疆澶勭悊 diff --git a/attendance-performance-manager-ui/admin/src/views/system/user/dialogshow.vue b/attendance-performance-manager-ui/admin/src/views/system/user/dialogshow.vue index 4c0176367ba509d55125e7f284dbed4a179f5352..0c394866c33f878e00d66806e56b3b9e528ca505 100644 --- a/attendance-performance-manager-ui/admin/src/views/system/user/dialogshow.vue +++ b/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> - -