diff --git a/src/enums/index.ts b/src/enums/index.ts index 8495ffd..c74af8c 100644 --- a/src/enums/index.ts +++ b/src/enums/index.ts @@ -54,10 +54,19 @@ export const conversitionMap: Record = { [ConverSuccessEnum.YES]: '是', [ConverSuccessEnum.NO]: '否' } +export enum SexEnum { + MALE = 1, + FEMALE = 2 +} +export const sexMap: Record = { + [SexEnum.MALE]: '男', + [SexEnum.FEMALE]: '女' +} const keys: Record = { conversionMap: conversionMap, - ClueSourceMap: ClueSourceMap + ClueSourceMap: ClueSourceMap, + sexMap: sexMap } const generateConverOptions = (key: string) => { const mapKey = keys[key] @@ -70,3 +79,4 @@ const generateConverOptions = (key: string) => { } export const conversionOptions = generateConverOptions('conversionMap') export const clueSourceOptions = generateConverOptions('ClueSourceMap') +export const sexOptions = generateConverOptions('sexMap') diff --git a/src/utils/validate.ts b/src/utils/validate.ts index 0bbc56a..e994dd4 100644 --- a/src/utils/validate.ts +++ b/src/utils/validate.ts @@ -236,13 +236,21 @@ export function validateGoodsTime(args: any) { } /**身份证号 */ export function validateIdCard(rule: any, value: any, callback: any) { - if (value === '') { - callback(new Error('请输入身份证号')) - } else if (!idCardReg.test(value)) { - callback(new Error('身份证号格式有误')) + console.log(value) + if (value) { + if (!idCardReg.test(value)) { + callback(new Error('身份证号格式有误')) + } } else { callback() } + // if (value === '') { + // callback(new Error('请输入身份证号')) + // } else if (!idCardReg.test(value)) { + // callback(new Error('身份证号格式有误')) + // } else { + // callback() + // } } /**服务类别 */ export function validateGoodsIds(rule: any, value: any, callback: any) { diff --git a/src/views/customer/components/customer-dialog.vue b/src/views/customer/components/customer-dialog.vue index 4f30892..adba27c 100644 --- a/src/views/customer/components/customer-dialog.vue +++ b/src/views/customer/components/customer-dialog.vue @@ -1,14 +1,14 @@