diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js index 78f785edc..a7997fe6d 100644 --- a/src/assets/js/utils/data-dictionary.js +++ b/src/assets/js/utils/data-dictionary.js @@ -219,13 +219,7 @@ export default { text: '港澳台居民居住证' } ], - //出生证明 - // birthType: [ - // { - // id: 1, - // text: '身份证' - // } - // ], + //投保人/被保人关系 relationToAppnt: [ { @@ -748,5 +742,110 @@ export default { id: '1', text: '已签收' } - ] + ], + // 民族 + nationType: [ + { id: '01', text: '汉族' }, + { id: '02', text: '蒙古族' }, + { id: '03', text: '回族' }, + { id: '04', text: '藏族' }, + { id: '05', text: '维吾尔族' }, + { id: '06', text: '苗族' }, + { id: '07', text: '彝族' }, + { id: '08', text: '壮族' }, + { id: '09', text: '布依族' }, + { id: '10', text: '朝鲜族' }, + { id: '11', text: '满族' }, + { id: '12', text: '侗族' }, + { id: '13', text: '瑶族' }, + { id: '14', text: '白族' }, + { id: '15', text: '土家族' }, + { id: '16', text: '哈尼族' }, + { id: '17', text: '哈萨克族' }, + { id: '18', text: '傣族' }, + { id: '19', text: '黎族' }, + { id: '20', text: '傈僳族' }, + { id: '21', text: '佤族' }, + { id: '22', text: '畲族' }, + { id: '23', text: '高山族' }, + { id: '24', text: '拉祜族' }, + { id: '25', text: '水族' }, + { id: '26', text: '东乡族' }, + { id: '27', text: '纳西族' }, + { id: '28', text: '景颇族' }, + { id: '代码', text: '民族' }, + { id: '29', text: '柯尔克孜族' }, + { id: '30', text: '土族' }, + { id: '31', text: '达斡尔族' }, + { id: '32', text: '仫佬族' }, + { id: '33', text: '羌族' }, + { id: '34', text: '布朗族' }, + { id: '35', text: '撒拉族' }, + { id: '36', text: '毛难族' }, + { id: '37', text: '仡佬族' }, + { id: '38', text: '锡伯族' }, + { id: '39', text: '阿昌族' }, + { id: '40', text: '普米族' }, + { id: '41', text: '塔吉克族' }, + { id: '42', text: '怒族' }, + { id: '43', text: '乌孜别克族' }, + { id: '44', text: '俄罗斯族' }, + { id: '45', text: '鄂温克族' }, + { id: '46', text: '崩龙族' }, + { id: '47', text: '保安族' }, + { id: '48', text: '裕固族' }, + { id: '49', text: '京族' }, + { id: '50', text: '塔塔尔族' }, + { id: '51', text: '独龙族' }, + { id: '52', text: '鄂伦春族' }, + { id: '53', text: '赫哲族' }, + { id: '54', text: '门巴族' }, + { id: '55', text: '珞巴族' }, + { id: '56', text: '基诺族' }, + { id: '97', text: '其他' }, + { id: '98', text: '外国血统' } + ], + //政治面貌 + politicsStatus: [ + { id: '01', text: '中共党员' }, + { id: '02', text: '中共预备党员' }, + { id: '04', text: '民革党员' }, + { id: '05', text: '民盟盟员' }, + { id: '06', text: '民建会员' }, + { id: '07', text: '民进会员' }, + { id: '08', text: '农工党党员' }, + { id: '09', text: '致公党党员' }, + { id: '10', text: '九三学社社员' }, + { id: '11', text: '台盟盟员' }, + { id: '12', text: '无党派人士' } + ], + rsIdType: [ + { + id: 1, + text: '居民身份证' + }, + { + id: 2, + text: '户口本' + }, + + { + id: 5, + text: '港澳居民来往内地通行证' + }, + { + id: 6, + text: '台湾居民来往大陆通行证' + }, + { + id: 8, + text: '外国人永久居留身份证' + }, + { + id: 9, + text: '港澳台居民居住证' + } + ], + // 健康状况 + healthCondition: [] } diff --git a/src/config/index.js b/src/config/index.js index 615f53353..81c16968b 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -5,8 +5,7 @@ * */ -let apiDomain, imgDomain, assetsUrl, mainUrl, - payUrl // 保融支付的收银台服务地址 +let apiDomain, imgDomain, assetsUrl, mainUrl, payUrl // 保融支付的收银台服务地址 // 可以多个接口域名,按需添加 console.log('环境:', process.env.VUE_APP_FLAG) @@ -18,7 +17,7 @@ switch (process.env.VUE_APP_FLAG) { // 静态服务资源 assetsUrl = 'http://139.199.50.151:8000/app/' - mainUrl = 'http://47.96.143.111' + mainUrl = 'http://139.199.50.151' payUrl = 'http://10.10.100.84:7003/s3-modules-gateway/embed/gateway.action' break case 'staging': @@ -36,7 +35,7 @@ switch (process.env.VUE_APP_FLAG) { // 静态服务资源 // assetsUrl = 'http://211.159.248.138:7001/' // 上生产前 assetsUrl = 'https://iagentsales-sr.e-guofu.com:8443/' - mainUrl = 'http://47.96.143.111' + mainUrl = 'https://iagentsales.e-guofu.com' payUrl = 'https://uns3.e-guofu.com/s3-modules-gateway/embed/gateway.action' break } diff --git a/src/router/ebiz/Department.js b/src/router/ebiz/Department.js index 9859f0797..46b87d64a 100644 --- a/src/router/ebiz/Department.js +++ b/src/router/ebiz/Department.js @@ -1 +1,32 @@ -export default [] +const DepartInfo = () => import('@/views/ebiz/Department/DepartInfo') +const DepartInfoOne = () => import('@/views/ebiz/Department/DepartInfoOne') +const DepartInfoTwo = () => import('@/views/ebiz/Department/DepartInfoTwo') +export default [ + { + path: '/Department/DepartInfo', + name: 'DepartmentInformation', + component: DepartInfo, + meta: { + title: '入司基本信息' + }, + redirect: '/Department/DepartInfo/one', + children: [ + { + path: 'one', + name: 'DepartInfoOne', + component: DepartInfoOne, + meta: { + title: '入司基本信息one' + } + }, + { + path: 'Two', + name: 'DepartInfoTwo', + component: DepartInfoTwo, + meta: { + title: '入司基本信息' + } + } + ] + } +] diff --git a/src/router/ebiz/index.js b/src/router/ebiz/index.js index af02b8eee..7f8a7be5f 100644 --- a/src/router/ebiz/index.js +++ b/src/router/ebiz/index.js @@ -4,7 +4,6 @@ import sale from './sale' import customer from './customer' import my from './my' import serve from './serve' - import common from './common' import product from './product' import Department from './Department' diff --git a/src/views/ebiz/Department/DepartInfo.vue b/src/views/ebiz/Department/DepartInfo.vue new file mode 100644 index 000000000..be502894c --- /dev/null +++ b/src/views/ebiz/Department/DepartInfo.vue @@ -0,0 +1,23 @@ + + + diff --git a/src/views/ebiz/Department/DepartInfoOne.vue b/src/views/ebiz/Department/DepartInfoOne.vue new file mode 100644 index 000000000..a202fc1c5 --- /dev/null +++ b/src/views/ebiz/Department/DepartInfoOne.vue @@ -0,0 +1,323 @@ + + + diff --git a/src/views/ebiz/Department/DepartInfoTwo.vue b/src/views/ebiz/Department/DepartInfoTwo.vue new file mode 100644 index 000000000..ba61153d2 --- /dev/null +++ b/src/views/ebiz/Department/DepartInfoTwo.vue @@ -0,0 +1,51 @@ + + + diff --git a/src/views/ebiz/Department/js/verification.js b/src/views/ebiz/Department/js/verification.js new file mode 100644 index 000000000..b42c40b4b --- /dev/null +++ b/src/views/ebiz/Department/js/verification.js @@ -0,0 +1,52 @@ +import changeFifteenToEighteen from '@/assets/js/utils/changeFifteenToEighteen' +import idNoCheck from '@/assets/js/utils/idNoCheck' +import utilsAge from '@/assets/js/utils/age' + +//身份证带出出生日期,性别,年龄 +export function idToData(idNo) { + //非空 + if (!idNo.trim()) { + return { + text: '证件号码不能为空' + } + } + + // 证件号码规则校验 + if (!idNoCheck.isIdno(idNo)) { + return { + text: '您填写的证件号码有误' + } + } + + //如果是15位身份证号先转为18位 + if (idNo.length == 15) { + idNo = changeFifteenToEighteen(idNo) + } + let birthday = getBirthById(idNo) + let age = utilsAge.getAge(birthday, new Date()) + let sex = getSexById(idNo) + return { + birthday, + age, + sex + } +} + +function getBirthById(idNo) { + // 获取生日 + var year = idNo.substr(6, 4) + var month = idNo.substr(10, 2) + var day = idNo.substr(12, 2) + return year + '-' + month + '-' + day +} + +function getSexById(idNo) { + // 获取性别 + if (idNo.charAt(16) >= '0' && idNo.charAt(16) <= '9') { + if (parseInt(idNo.charAt(16)) % 2 == 0) { + return '1' + } else { + return '0' + } + } +} diff --git a/src/views/ebiz/sale/InsuredInfo.vue b/src/views/ebiz/sale/InsuredInfo.vue index e730f5589..8836e7c34 100644 --- a/src/views/ebiz/sale/InsuredInfo.vue +++ b/src/views/ebiz/sale/InsuredInfo.vue @@ -497,6 +497,7 @@ export default { }, //弹框选择 toSelect(pickerType, valueKey) { + console.log(valueKey) //pickerType 1、国家地区 2、证件类型 3、文化程度 4、有无社保(弃用) 5、税收居民身份 6、婚姻状况 7、在职情况 8、收入来源 ;[this.popupShow, this.pickerType] = [true, pickerType] if (valueKey) this.valueKey = valueKey diff --git a/src/views/ebiz/sale/test.vue b/src/views/ebiz/sale/test.vue index 75416d344..3eb4c7fce 100644 --- a/src/views/ebiz/sale/test.vue +++ b/src/views/ebiz/sale/test.vue @@ -21,7 +21,7 @@ 人脸识别
-
+
{{ value }}
@@ -379,3 +379,8 @@ export default { // } } +