From 512d6cd5b9bb9f861eb7dcdda141565810d7184d Mon Sep 17 00:00:00 2001 From: wx <645899409@qq.com> Date: Fri, 18 Jul 2025 15:14:18 +0800 Subject: [PATCH] update --- src/views/system/depart/depart.data.ts | 168 +++++++-------- .../HealthUserEmployeeEx.data.ts | 192 +++++++++--------- 2 files changed, 180 insertions(+), 180 deletions(-) diff --git a/src/views/system/depart/depart.data.ts b/src/views/system/depart/depart.data.ts index 4340109..b7900df 100644 --- a/src/views/system/depart/depart.data.ts +++ b/src/views/system/depart/depart.data.ts @@ -92,90 +92,90 @@ export function useBasicFormSchema() { placeholder: '请输入传真', }, }, - { - label: '健康管理员姓名', - field: 'healthManageUserName', - component: 'Input', - }, - { - label: '健康管理员电话', - field: 'healthManageUserMobile', - component: 'Input', - componentProps: () => { - return { - placeholder: '请输入健康管理员电话，多个电话请用英文逗号隔开', - }; - }, - dynamicRules: () => { - return [ - { - validator: checkPhone, - trigger: 'blur', - }, - ]; - }, - }, - { - label: '健康管理员地址', - field: 'healthManageUserAddress', - component: 'Input', - }, - { - label: '职业体检管理员姓名', - field: 'medialManageUserName', - component: 'Input', - show: !isQH(), - }, - { - label: '职业体检管理员电话', - field: 'medialManageUserMobile', - component: 'Input', - show: !isQH(), - componentProps: () => { - return { - placeholder: '请输入体检管理员电话，多个电话请用英文逗号隔开', - }; - }, - dynamicRules: () => { - return [ - { - validator: checkPhone, - trigger: 'blur', - }, - ]; - }, - }, - { - label: '职业体检管理员地址', - field: 'medialManageUserAddress', - component: 'Input', - show: !isQH(), - }, - { - label: '健康监测管理员姓名', - field: 'monitorManageUserName', - component: 'Input', - show: !isQH(), - }, - { - label: '健康监测管理员电话', - field: 'monitorManageUserMobile', - component: 'Input', - componentProps: () => { - return { - placeholder: '请输入健康监测管理员电话，多个电话请用英文逗号隔开', - }; - }, - show: !isQH(), - dynamicRules: () => { - return [ - { - validator: checkPhone, - trigger: 'blur', - }, - ]; - }, - }, + // { + // label: '健康管理员姓名', + // field: 'healthManageUserName', + // component: 'Input', + // }, + // { + // label: '健康管理员电话', + // field: 'healthManageUserMobile', + // component: 'Input', + // componentProps: () => { + // return { + // placeholder: '请输入健康管理员电话，多个电话请用英文逗号隔开', + // }; + // }, + // dynamicRules: () => { + // return [ + // { + // validator: checkPhone, + // trigger: 'blur', + // }, + // ]; + // }, + // }, + // { + // label: '健康管理员地址', + // field: 'healthManageUserAddress', + // component: 'Input', + // }, + // { + // label: '职业体检管理员姓名', + // field: 'medialManageUserName', + // component: 'Input', + // show: !isQH(), + // }, + // { + // label: '职业体检管理员电话', + // field: 'medialManageUserMobile', + // component: 'Input', + // show: !isQH(), + // componentProps: () => { + // return { + // placeholder: '请输入体检管理员电话，多个电话请用英文逗号隔开', + // }; + // }, + // dynamicRules: () => { + // return [ + // { + // validator: checkPhone, + // trigger: 'blur', + // }, + // ]; + // }, + // }, + // { + // label: '职业体检管理员地址', + // field: 'medialManageUserAddress', + // component: 'Input', + // show: !isQH(), + // }, + // { + // label: '健康监测管理员姓名', + // field: 'monitorManageUserName', + // component: 'Input', + // show: !isQH(), + // }, + // { + // label: '健康监测管理员电话', + // field: 'monitorManageUserMobile', + // component: 'Input', + // componentProps: () => { + // return { + // placeholder: '请输入健康监测管理员电话，多个电话请用英文逗号隔开', + // }; + // }, + // show: !isQH(), + // dynamicRules: () => { + // return [ + // { + // validator: checkPhone, + // trigger: 'blur', + // }, + // ]; + // }, + // }, { label: '详细地址', field: 'address', diff --git a/src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeEx.data.ts b/src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeEx.data.ts index 9a2cae7..a52c18d 100644 --- a/src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeEx.data.ts +++ b/src/views/system/user/HealthUserEmployeeEx/HealthUserEmployeeEx.data.ts @@ -120,16 +120,16 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: ['extension', 'empNativeplace'], }, - { - title: '工种', - align: 'center', - dataIndex: ['extension', 'medicalWorkTypeCode_dictText'], - }, - { - title: '用工形式', - align: 'center', - dataIndex: ['extension', 'empType_dictText'], - }, + // { + // title: '工种', + // align: 'center', + // dataIndex: ['extension', 'medicalWorkTypeCode_dictText'], + // }, + // { + // title: '用工形式', + // align: 'center', + // dataIndex: ['extension', 'empType_dictText'], + // }, ]; //查询数据 @@ -388,8 +388,8 @@ export const formSchema: (isUpdate: boolean) => FormSchema[] = (isUpdate) => { // message: '${label}格式有误', // }, // ], - dynamicRules: ({ model, schema }) => - rules.idcard(true).concat(rules.duplicateCheckRuleAndDelFlag('sys_user', 'id_card', 'false', model, schema, false)), + // dynamicRules: ({ model, schema }) => + // rules.idcard(true).concat(rules.duplicateCheckRuleAndDelFlag('sys_user', 'id_card', 'false', model, schema, false)), // dynamicRules: ({ model, schema }) => rules.idcard(true).concat(rules.duplicateCheckRule('sys_user', 'id_card', model, schema, false)), }, @@ -420,15 +420,15 @@ export const formSchema: (isUpdate: boolean) => FormSchema[] = (isUpdate) => { }, }; }, - rules: [ - { - required: true, - }, - { - pattern: /^1[3456789][0-9]{9}$/, - message: '${label}格式有误', - }, - ], + // rules: [ + // { + // required: true, + // }, + // { + // pattern: /^1[3456789][0-9]{9}$/, + // message: '${label}格式有误', + // }, + // ], }, { label: '邮箱', @@ -581,81 +581,81 @@ export const formSchema: (isUpdate: boolean) => FormSchema[] = (isUpdate) => { valueFormat: 'YYYY-MM-DD', }, }, - { - label: '体检形式', - field: 'medicalOnJob', - component: 'JDictSelectTag', - componentProps: { - dictCode: 'medical_on_job', - }, - }, - { - label: '工种', - field: 'medicalWorkTypeCode', - component: 'JDictSelectTag', - componentProps: { - dictCode: 'medical_worktype', - showSearch: true, - }, - }, - { - label: '其他工种', - field: 'medicalWorkTypeOther', - component: 'Input', - ifShow: ({ model }) => { - return model.medicalWorkTypeCode === '0014' || model.medicalWorkTypeCode === '0033' || model.medicalWorkTypeCode === '999999'; - }, - required: ({ model }) => { - return model.medicalWorkTypeCode === '0014' || model.medicalWorkTypeCode === '0033' || model.medicalWorkTypeCode === '999999'; - }, - }, - { - label: '危害因素', - field: 'medicalHazardFactorCode', - component: 'JDictSelectTag', - componentProps: { - dictCode: 'medical_hazard', - showSearch: true, - mode: 'multiple', - }, - }, - { - label: '其他危害', - field: 'medicalHazardFactorOther', - component: 'Input', - ifShow: ({ model }) => { - return model.medicalHazardFactorCode?.join(',').indexOf('0999') > -1; - }, - required: ({ model }) => { - return model.medicalHazardFactorCode?.join(',').indexOf('0999') > -1; - }, - }, - { - label: '接害时间', - field: 'medicalHazardDate', - component: 'DatePicker', - componentProps: { - showTime: false, - valueFormat: 'YYYY-MM-DD', - }, - }, - { - label: '用工形式', - field: 'empType', - component: 'JDictSelectTag', - componentProps: { - dictCode: 'contract', - }, - }, - { - label: '上市员工', - field: 'listedFlag', - component: 'JDictSelectTag', - componentProps: { - type: 'radio', - dictCode: 'sf_10', - }, - }, + // { + // label: '体检形式', + // field: 'medicalOnJob', + // component: 'JDictSelectTag', + // componentProps: { + // dictCode: 'medical_on_job', + // }, + // }, + // { + // label: '工种', + // field: 'medicalWorkTypeCode', + // component: 'JDictSelectTag', + // componentProps: { + // dictCode: 'medical_worktype', + // showSearch: true, + // }, + // }, + // { + // label: '其他工种', + // field: 'medicalWorkTypeOther', + // component: 'Input', + // ifShow: ({ model }) => { + // return model.medicalWorkTypeCode === '0014' || model.medicalWorkTypeCode === '0033' || model.medicalWorkTypeCode === '999999'; + // }, + // required: ({ model }) => { + // return model.medicalWorkTypeCode === '0014' || model.medicalWorkTypeCode === '0033' || model.medicalWorkTypeCode === '999999'; + // }, + // }, + // { + // label: '危害因素', + // field: 'medicalHazardFactorCode', + // component: 'JDictSelectTag', + // componentProps: { + // dictCode: 'medical_hazard', + // showSearch: true, + // mode: 'multiple', + // }, + // }, + // { + // label: '其他危害', + // field: 'medicalHazardFactorOther', + // component: 'Input', + // ifShow: ({ model }) => { + // return model.medicalHazardFactorCode?.join(',').indexOf('0999') > -1; + // }, + // required: ({ model }) => { + // return model.medicalHazardFactorCode?.join(',').indexOf('0999') > -1; + // }, + // }, + // { + // label: '接害时间', + // field: 'medicalHazardDate', + // component: 'DatePicker', + // componentProps: { + // showTime: false, + // valueFormat: 'YYYY-MM-DD', + // }, + // }, + // { + // label: '用工形式', + // field: 'empType', + // component: 'JDictSelectTag', + // componentProps: { + // dictCode: 'contract', + // }, + // }, + // { + // label: '上市员工', + // field: 'listedFlag', + // component: 'JDictSelectTag', + // componentProps: { + // type: 'radio', + // dictCode: 'sf_10', + // }, + // }, { label: '工作地点', field: 'workSpace',