diff --git a/src/utils/dict.js b/src/utils/dict.js index 5d8e5f0..158770b 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -98,6 +98,8 @@ export const DICT_TYPE = { DICT_CUS_INFO_STATUS : 'cus_info_status', //推广渠道 PROMOTION_CHANNEL : 'promotion_channel', + //用户类型 + SYSTEM_USER_TYPE : 'system_user_type', // ------- carMain模块 ------- //车辆性质 diff --git a/src/views/company/promotion/form/PromotionData.vue b/src/views/company/promotion/form/PromotionData.vue index 293ab10..77e43a0 100644 --- a/src/views/company/promotion/form/PromotionData.vue +++ b/src/views/company/promotion/form/PromotionData.vue @@ -62,7 +62,7 @@ 推广人角色 - + @@ -90,7 +90,7 @@ export default { promotionChannel: null, uniqueCode: null, registerTime: null, - identity: null + userType: null }, } }, @@ -115,7 +115,7 @@ export default { promotionChannel: null, uniqueCode: null, registerTime: null, - identity: null + userType: null } this.resetForm('formRef') }, diff --git a/src/views/company/promotion/index.vue b/src/views/company/promotion/index.vue index 65393c5..9f6ff22 100644 --- a/src/views/company/promotion/index.vue +++ b/src/views/company/promotion/index.vue @@ -5,14 +5,14 @@ - - - - - - - - + + + @@ -54,9 +54,9 @@ - + @@ -107,7 +107,7 @@ export default { newUserName: null, registerTimeArray: null, uniqueCode: null, - identity: null + userType: null }, // 显示搜索条件 showSearch: true, diff --git a/src/views/company/staff/form/StaffForm.vue b/src/views/company/staff/form/StaffForm.vue index 0a9c953..5ea6868 100644 --- a/src/views/company/staff/form/StaffForm.vue +++ b/src/views/company/staff/form/StaffForm.vue @@ -65,13 +65,11 @@ - - @@ -206,23 +204,6 @@ export default { trigger: 'blur' } ], - sex: [{required: true, message: "性别不能为空", trigger: 'blur'}], - address: [{required: true, message: "家庭住址不能为空", trigger: 'blur'}], - workYear: [{required: true, message: "工龄不能为空", trigger: 'blur'}], - joinedYear: [{required: true, message: "司龄不能为空", trigger: 'blur'}], - education: [{required: true, message: "学历不能为空", trigger: 'blur'}], - loginAccount: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }, { - min: 4, - max: 16, - message: '登录账号长度在4到16个字符', - trigger: 'blur' - }], - password: [{ required: true, message: '登录密码不能为空', trigger: 'blur' }, { - min: 4, - max: 16, - message: '登录密码长度在4到16个字符', - trigger: 'blur' - }], workDate: [{ required: true, message: '工作日期不能为空', trigger: 'blur' }], joinedDate: [{ required: true, message: '入职日期不能为空', trigger: 'blur' }] },