diff --git a/src/views/cees/dormitory/CeesDormitoryInfo.data.ts b/src/views/cees/dormitory/CeesDormitoryInfo.data.ts index 597d25f..9d51aeb 100644 --- a/src/views/cees/dormitory/CeesDormitoryInfo.data.ts +++ b/src/views/cees/dormitory/CeesDormitoryInfo.data.ts @@ -39,7 +39,7 @@ export const columns: BasicColumn[] = [ { title: '宿舍人员信息', align: 'center', - dataIndex: 'dormitorydata', + dataIndex: 'rowUser', width: 300, }, ]; diff --git a/src/views/cees/localTeacher/components/CeesLocalTeacherForm.vue b/src/views/cees/localTeacher/components/CeesLocalTeacherForm.vue index 566cd2a..c4cd010 100644 --- a/src/views/cees/localTeacher/components/CeesLocalTeacherForm.vue +++ b/src/views/cees/localTeacher/components/CeesLocalTeacherForm.vue @@ -1,70 +1,70 @@ \ No newline at end of file + return true; + }); + + let formData = {}; + const queryByIdUrl = '/CEES/ceesLocalTeacher/queryById'; + async function initFormData() { + let params = { id: props.formData.dataId }; + const data = await defHttp.get({ url: queryByIdUrl, params }); + formData = { ...data }; + //设置表单的值 + await setFieldsValue(formData); + //默认是禁用 + await setProps({ disabled: formDisabled.value }); + } + + async function submitForm() { + let data = getFieldsValue(); + let params = Object.assign({}, formData, data); + console.log('表单数据', params); + await saveOrUpdate(params, true); + } + + initFormData(); + + return { + registerForm, + formDisabled, + submitForm, + }; + }, + }); + diff --git a/src/views/cees/localTeacher/components/CeesLocalTeacherModal.vue b/src/views/cees/localTeacher/components/CeesLocalTeacherModal.vue index 5eeecc7..d57f633 100644 --- a/src/views/cees/localTeacher/components/CeesLocalTeacherModal.vue +++ b/src/views/cees/localTeacher/components/CeesLocalTeacherModal.vue @@ -1,66 +1,66 @@ \ No newline at end of file + :deep(.ant-calendar-picker) { + width: 100%; + } + diff --git a/src/views/cees/waiTeacher/CeesWaiTeacher.data.ts b/src/views/cees/waiTeacher/CeesWaiTeacher.data.ts index ff3bf37..8aebffc 100644 --- a/src/views/cees/waiTeacher/CeesWaiTeacher.data.ts +++ b/src/views/cees/waiTeacher/CeesWaiTeacher.data.ts @@ -277,19 +277,13 @@ export const searchFormSchema: FormSchema[] = [ ]; //表单数据 export const formSchema: FormSchema[] = [ - // { - // label: '用户ID', - // field: 'userId', - // component: 'Input', - // dynamicRules: ({ model, schema }) => { - // return [{ required: true, message: '请输入用户ID!' }]; - // }, - // }, { label: '姓名', field: 'userName', component: 'Input', dynamicRules: ({ model, schema }) => { + // 当身份证为7个0时取消验证 + if (model.identityId === '0000000') return []; return [{ required: true, message: '请输入姓名!' }]; }, }, @@ -298,6 +292,8 @@ export const formSchema: FormSchema[] = [ field: 'identityId', component: 'Input', dynamicRules: ({ model, schema }) => { + // 当身份证为7个0时取消验证 + if (model.identityId === '0000000') return []; return [ { required: true, message: '请输入身份证!' }, { @@ -320,7 +316,7 @@ export const formSchema: FormSchema[] = [ label: '年龄', field: 'age', component: 'InputNumber', - dynamicDisabled: true, + dynamicDisabled: false, }, { label: '性别', @@ -332,7 +328,7 @@ export const formSchema: FormSchema[] = [ { label: '女', value: 1 }, ], }, - dynamicDisabled: true, + dynamicDisabled: false, }, { label: '学科', @@ -347,23 +343,18 @@ export const formSchema: FormSchema[] = [ ], }, dynamicRules: ({ model, schema }) => { + // 当身份证为7个0时取消验证 + if (model.identityId === '0000000') return []; return [{ required: true, message: '请选择学科!' }]; }, }, - //{ - // label: '用户专业id', - // field: 'userMajorId', - // component: 'Input', - // dynamicRules: ({ model, schema }) => { - // return [{ required: true, message: '请输入用户专业id!' }]; - // }, - //}, - { label: '手机号', field: 'phone', component: 'Input', dynamicRules: ({ model, schema }) => { + // 当身份证为7个0时取消验证 + if (model.identityId === '0000000') return []; return [{ required: true, message: '请输入手机号!' }]; }, }, @@ -372,6 +363,8 @@ export const formSchema: FormSchema[] = [ field: 'jobTitle', component: 'Input', dynamicRules: ({ model, schema }) => { + // 当身份证为7个0时取消验证 + if (model.identityId === '0000000') return []; return [{ required: true, message: '请输入职称!' }]; }, }, @@ -380,6 +373,8 @@ export const formSchema: FormSchema[] = [ field: 'office', component: 'Input', dynamicRules: ({ model, schema }) => { + // 当身份证为7个0时取消验证 + if (model.identityId === '0000000') return []; return [{ required: true, message: '请输入办公位!' }]; }, }, @@ -388,6 +383,8 @@ export const formSchema: FormSchema[] = [ field: 'workName', component: 'Input', dynamicRules: ({ model, schema }) => { + // 当身份证为7个0时取消验证 + if (model.identityId === '0000000') return []; return [{ required: true, message: '请输入单位名称!' }]; }, }, @@ -404,6 +401,8 @@ export const formSchema: FormSchema[] = [ field: 'pyCard', component: 'Input', dynamicRules: ({ model, schema }) => { + // 当身份证为7个0时取消验证 + if (model.identityId === '0000000') return []; return [{ required: true, message: '请输入银行卡号!' }]; }, },