代码修改

根据对接文档修改客户管理的新增 修改基本信息关于新市民字段

src/App.vue

@@ -26,6 +26,8 @@ export default {
       reload: this.reload
     }
   },
+  mounted(){
+  },
   methods: {
     reload() {
       this.isRouterAlive = false

src/api/YB_APP/index.js

@@ -0,0 +1,166 @@
+import request from '@/assets/js/utils/request'
+import getUrl from '@/assets/js/utils/get-url'
+
+export function homeConfigYB(data) {
+  return request({
+    url: getUrl('/customer/agent/homeConfigYB', 1,3),
+    method: 'get',
+    data
+  })
+}
+
+export function mineConfigYB(data) {
+  return request({
+    url: getUrl('/app/mineConfigYB', 1,3),
+    method: 'get',
+    data
+  })
+}
+
+export function getPremRankList(data) {
+  return request({
+    url: getUrl('/sale/premRank/getPremRankList ', 1,3),
+    method: 'post',
+    data
+  })
+}
+
+export function timelyContYB(data) {
+  return request({
+    url: getUrl('/sale/timelyCont/timelyContYB ', 1,3),
+    method: 'get',
+    data
+  })
+}
+
+export function getPersonPremYB(data) {
+  return request({
+    url: getUrl('/data/congratulationTopYB/getPersonPremYB', 1,3),
+    method: 'post',
+    data
+  })
+}
+
+export function getDeptPremYB(data) {
+  return request({
+    url: getUrl('/data/congratulationTopYB/getDeptPremYB', 1,3),
+    method: 'post',
+    data
+  })
+}
+
+// 保单查询接口
+export function YBpolicyListAgent(data) {
+  return request({
+    url: getUrl('/sale/policy/YBpolicyListAgent', 1,3),
+    method: 'post',
+    data
+  })
+}
+// 保单详情接口
+export function YBpolicyDetail(data) {
+  return request({
+    url: getUrl('/sale/policy/YBpolicyDetail', 1,3),
+    method: 'post',
+    data
+  })
+}
+
+export function getPremByAgentCode(data) {
+  return request({
+    url: getUrl('/data/performanceYB/getPremByAgentCode', 1,3),
+    method: 'post',
+    data
+  })
+}
+
+export function getIndexByAgentCode(data) {
+  return request({
+    url: getUrl('/data/performanceYB/getIndexByAgentCode', 1,3),
+    method: 'post',
+    data
+  })
+}
+
+export function getBankNetDataYB(data) {
+  return request({
+    url: getUrl('/data/performanceYB/getBankNetDataYB', 1,3),
+    method: 'post',
+    data
+  })
+}
+
+export function getChannelPerformanceYB(data) {
+  return request({
+    url: getUrl('/data/performanceYB/getChannelPerformanceYB', 1,3),
+    method: 'post',
+    data
+  })
+}
+
+export function getBankNetPerformanceYB(data) {
+  return request({
+    url: getUrl('/data/performanceYB/getBankNetPerformanceYB', 1,3),
+    method: 'post',
+    data
+  })
+}
+
+// 暂时数据接口
+export function getAgentInfoByAgentCode(data) {
+  return request({
+    url: getUrl('/agent/agent/getAgentInfoByAgentCode', 1,3),
+    method: 'post',
+    data
+  })
+}
+
+// 查询续期列表
+export function getYBRenewalsList(data) {
+  return request({
+    url: getUrl('/renewal/renewal/getYBRenewalsList', 1,3),
+    method: 'post',
+    data
+  })
+}
+// 查询续期详情
+export function getYBRenewalInfo(data) {
+  return request({
+    url: getUrl('/renewal/renewal/getYBRenewalInfo', 1,3),
+    method: 'post',
+    data
+  })
+}
+
+// 保全申请进度列表
+export function getSaveAllList(data) {
+  return request({
+    url: getUrl('/renewal/preservation/getSaveAllList', 1,3),
+    method: 'post',
+    data
+  })
+}
+// 保全申请进度详情
+export function ybSaveAllDetail(data) {
+  return request({
+    url: getUrl('/renewal/preservation/ybSaveAllDetail', 1,3),
+    method: 'post',
+    data
+  })
+}
+// 保全现金价值列表
+export function ybSaveManyList(data) {
+  return request({
+    url: getUrl('/renewal/preservation/ybSaveManyList', 1,3),
+    method: 'post',
+    data
+  })
+}
+// 保全现金价值详情
+export function ybSaveManyDetail(data) {
+  return request({
+    url: getUrl('/renewal/preservation/ybSaveManyDetail', 1,3),
+    method: 'post',
+    data
+  })
+} 

src/api/ebiz/agentEenter/agentEenter.js

@@ -99,6 +99,15 @@ export function agentAddApproval(data) {
   });
 }
 
+//入司增员审批
+export function auditCheck(data) {
+  return request({
+    url: getUrl('/agent/examineApprove/auditCheck', 1),
+    method: 'post',
+    data
+  });
+}
+
 // 入司撤销申请
 export function revoke(data) {
   return request({

src/api/ebiz/cardList/cardList.js

@@ -148,6 +148,15 @@ export function cardOrderDetail(data) {
   })
 }
 
+////验证惠桂保是否续保单优惠方案
+export function selectPreferentialScheme(data) {
+  return request({
+    url: getUrl('/sale/card/selectPreferentialScheme', 1),
+    method: 'post',
+    data
+  })
+}
+
 //删除
 // {
 // 	"id": "23271" //被保险人insuredId

src/api/ebiz/proposal/proposal.js

@@ -91,3 +91,28 @@ export function getSharingToken(data = {}) {
     data
   })
 }
+
+// 获取试算记录详情
+export function getTrialRecordInfo(data = {}) {
+  return request({
+    url: getUrl('/proposal/trialRecord/getTrialRecordInfo', 1),
+    method: 'post',
+    data
+  })
+}
+// 试算记录保存更新
+export function saveOrUpdateTrialRecordInfo(data = {}) {
+  return request({
+    url: getUrl('/proposal/trialRecord/saveOrUpdateTrialRecordInfo', 1),
+    method: 'post',
+    data
+  })
+}
+// 建议书拷贝功能
+export function proposalCopy(data = {}) {
+  return request({
+    url: getUrl('/proposal/proposal/copy', 1),
+    method: 'post',
+    data
+  })
+}

src/api/ebiz/sale/sale.js

@@ -1,6 +1,7 @@
 import request from '@/assets/js/utils/request'
 import request1 from '@/assets/js/utils/request1'
 import getUrl from '@/assets/js/utils/get-url'
+import store from '@/store'
 // 保费计算
 export function saveOrUpdateOrderInfo(data) {
   return request({
@@ -9,6 +10,14 @@ export function saveOrUpdateOrderInfo(data) {
     data
   })
 }
+// 核保试算
+export function orderTrial(data) {
+  return request({
+    url: getUrl('/sale/orderTrial/trial', 1),
+    method: 'post',
+    data
+  })
+}
 //人核转线上支付判断是否可进行支付操作
 export function payFlag(data) {
   return request({
@@ -91,6 +100,15 @@ export function uploadImg(data) {
     data
   })
 }
+
+// 上传图片
+export function uploadImg2(data) {
+  return request1({
+    url: getUrl('/uploadImage?imgType='+store.getters.getUploadImgType+'&orderNo='+store.getters.getUploadImgOrderNo, 1, 2),
+    method: 'post',
+    data
+  })
+}
 /*
 // 人脸识别
 export function recognition(data) {

src/assets/js/business-common.js

@@ -438,11 +438,11 @@ export default {
     }
   },
   /**
-        @desc：只能输入整数
-        @param
-            value 操作数值
-            max 最大值
-    **/
+   @desc：只能输入整数
+   @param
+       value 操作数值
+   max 最大值
+   **/
   intOnly(value, max = Infinity, min = 0) {
     if (value) {
       let regular0 = /^0{1,}$/
@@ -480,8 +480,8 @@ export default {
     var json = {}
     for (var i = 0, len = query.length; i < len; i++) {
       var key = query[i].split('=')[0],
-        index = query[i].indexOf('='),
-        value = query[i].substr(index + 1)
+          index = query[i].indexOf('='),
+          value = query[i].substr(index + 1)
       json[key] = value
     }
 
@@ -533,7 +533,7 @@ export default {
       appntDTO = res.orderDTO.appntDTO
       insuredDTO = res.orderDTO.insuredDTOs[0]
     }
-    let age = utilsAge.getAge(appntDTO.birthday, new Date())
+    let age = appntDTO.birthday?utilsAge.getAge(appntDTO.birthday, new Date()):appntDTO.age
     CacheUtils.setLocItem('saleInsuredInfo',
         JSON.stringify({
           workcompany: appntDTO.workcompany,
@@ -559,14 +559,17 @@ export default {
     )
 
     if (insuredDTO) {
-      let insuredPersonAge = utilsAge.getAge(insuredDTO.birthday, new Date())
+      let insuredPersonAge = insuredDTO.insuredAge ? insuredDTO.insuredAge : insuredDTO.age
+      if(insuredDTO.birthday){
+        insuredPersonAge = utilsAge.getAge(insuredDTO.birthday, new Date())
+      }
       CacheUtils.setLocItem('saleInsuredPersonInfo',
           JSON.stringify({
             birthday: insuredDTO.birthday,
             name: insuredDTO.name,
             sex: insuredDTO.sex,
             idType: insuredDTO.idType,
-            age: insuredPersonAge,
+            insuredAge: insuredPersonAge,
             // marriage: insuredDTO.marriage,
             relationToAppnt: insuredDTO.relationToAppnt,
             medical: insuredDTO.medical,

src/assets/js/utils/areaNew.js

@@ -3,152 +3,132 @@ export default {
     450000: '广西壮族自治区'
   },
   city_list: {
-    450100: '南宁市',
-    450200: '柳州市',
-    450300: '桂林市',
-    450400: '梧州市',
-    450500: '北海市',
-    450600: '防城港市',
-    450700: '钦州市',
-    450800: '贵港市',
-    450900: '玉林市',
-    451000: '百色市',
-    451100: '贺州市',
-    451200: '河池市',
-    451300: '来宾市',
-    451400: '崇左市'
+    450100:'南宁市',
+    450200:'柳州市',
+    450300:'桂林市',
+    450400:'梧州市',
+    450500:'北海市',
+    450600:'防城港市',
+    450700:'钦州市',
+    450800:'贵港市',
+    450900:'玉林市',
+    451000:'百色市',
+    451100:'贺州市',
+    451200:'河池市',
+    451300:'来宾市',
+    451400:'崇左市'
   },
   county_list: {
-    450102: '兴宁区',
-    450103: '青秀区',
-    450105: '江南区',
-    450107: '西乡塘区',
-    450108: '良庆区',
-    450109: '邕宁区',
-    450110: '武鸣区',
-    450122: '武鸣县',
-    450123: '隆安县',
-    450124: '马山县',
-    450125: '上林县',
-    450126: '宾阳县',
-    450127: '横县',
-    450201: '市辖区',
-    450202: '城中区',
-    450203: '鱼峰区',
-    450204: '柳南区',
-    450205: '柳北区',
-    450206: '柳江区',
-    450221: '柳江县',
-    450222: '柳城县',
-    450223: '鹿寨县',
-    450224: '融安县',
-    450225: '融水苗族自治县',
-    450226: '三江侗族自治县',
-    450301: '市辖区',
-    450302: '秀峰区',
-    450303: '叠彩区',
-    450304: '象山区',
-    450305: '七星区',
-    450311: '雁山区',
-    450312: '临桂区',
-    450321: '阳朔县',
-    450322: '临桂县',
-    450323: '灵川县',
-    450324: '全州县',
-    450325: '兴安县',
-    450326: '永福县',
-    450327: '灌阳县',
-    450328: '龙胜各族自治县',
-    450329: '资源县',
-    450330: '平乐县',
-    450331: '荔蒲县',
-    450332: '恭城瑶族自治县',
-    450381: '荔浦市',
-    450401: '市辖区',
-    450403: '万秀区',
-    450404: '蝶山区',
-    450405: '长洲区',
-    450406: '龙圩区',
-    450421: '苍梧县',
-    450422: '藤县',
-    450423: '蒙山县',
-    450481: '岑溪市',
-    450501: '市辖区',
-    450502: '海城区',
-    450503: '银海区',
-    450512: '铁山港区',
-    450521: '合浦县',
-    450601: '市辖区',
-    450602: '港口区',
-    450603: '防城区',
-    450621: '上思县',
-    450681: '东兴市',
-    450701: '市辖区',
-    450702: '钦南区',
-    450703: '钦北区',
-    450721: '灵山县',
-    450722: '浦北县',
-    450801: '市辖区',
-    450802: '港北区',
-    450803: '港南区',
-    450804: '覃塘区',
-    450821: '平南县',
-    450881: '桂平市',
-    450901: '市辖区',
-    450902: '玉州区',
-    450903: '福绵区',
-    450921: '容县',
-    450922: '陆川县',
-    450923: '博白县',
-    450924: '兴业县',
-    450981: '北流市',
-    451001: '市辖区',
-    451002: '右江区',
-    451021: '田阳县',
-    451022: '田东县',
-    451023: '平果县',
-    451024: '德保县',
-    451026: '那坡县',
-    451027: '凌云县',
-    451028: '乐业县',
-    451029: '田林县',
-    451030: '西林县',
-    451031: '隆林各族自治县',
-    451081: '靖西市',
-    451082: '平果市',
-    451101: '市辖区',
-    451102: '八步区',
-    451103: '平桂区',
-    451121: '昭平县',
-    451122: '钟山县',
-    451123: '富川瑶族自治县',
-    451201: '市辖区',
-    451202: '金城江区',
-    451203: '宜州区',
-    451221: '南丹县',
-    451222: '天峨县',
-    451223: '凤山县',
-    451224: '东兰县',
-    451225: '罗城仫佬族自治县',
-    451226: '环江毛南族自治县',
-    451227: '巴马瑶族自治县',
-    451228: '都安瑶族自治县',
-    451229: '大化瑶族自治县',
-    451281: '宜州市',
-    451301: '市辖区',
-    451302: '兴宾区',
-    451321: '忻城县',
-    451322: '象州县',
-    451323: '武宣县',
-    451324: '金秀瑶族自治县',
-    451381: '合山市',
-    451401: '市辖区',
-    451402: '江州区',
-    451421: '扶绥县',
-    451422: '宁明县',
-    451423: '龙州县',
-    451424: '大新县',
-    451425: '天等县',
-    451481: '凭祥市'
+    450102:'兴宁区',
+    450103:'青秀区',
+    450105:'江南区',
+    450107:'西乡塘区',
+    450108:'良庆区',
+    450109:'邕宁区',
+    450110:'武鸣区',
+    450123:'隆安县',
+    450124:'马山县',
+    450125:'上林县',
+    450126:'宾阳县',
+    450181:'横州市',
+    450202:'城中区',
+    450203:'鱼峰区',
+    450204:'柳南区',
+    450205:'柳北区',
+    450206:'柳江区',
+    450222:'柳城县',
+    450223:'鹿寨县',
+    450224:'融安县',
+    450225:'融水苗族自治县',
+    450226:'三江侗族自治县',
+    450302:'秀峰区',
+    450303:'叠彩区',
+    450304:'象山区',
+    450305:'七星区',
+    450311:'雁山区',
+    450312:'临桂区',
+    450321:'阳朔县',
+    450323:'灵川县',
+    450324:'全州县',
+    450325:'兴安县',
+    450326:'永福县',
+    450327:'灌阳县',
+    450328:'龙胜各族自治县',
+    450329:'资源县',
+    450330:'平乐县',
+    450332:'恭城瑶族自治县',
+    450381:'荔浦市',
+    450403:'万秀区',
+    450405:'长洲区',
+    450406:'龙圩区',
+    450421:'苍梧县',
+    450422:'藤县',
+    450423:'蒙山县',
+    450481:'岑溪市',
+    450502:'海城区',
+    450503:'银海区',
+    450512:'铁山港区',
+    450521:'合浦县',
+    450602:'港口区',
+    450603:'防城区',
+    450621:'上思县',
+    450681:'东兴市',
+    450702:'钦南区',
+    450703:'钦北区',
+    450721:'灵山县',
+    450722:'浦北县',
+    450802:'港北区',
+    450803:'港南区',
+    450804:'覃塘区',
+    450821:'平南县',
+    450881:'桂平市',
+    450902:'玉州区',
+    450903:'福绵区',
+    450921:'容县',
+    450922:'陆川县',
+    450923:'博白县',
+    450924:'兴业县',
+    450981:'北流市',
+    451002:'右江区',
+    451003:'田阳区',
+    451022:'田东县',
+    451024:'德保县',
+    451026:'那坡县',
+    451027:'凌云县',
+    451028:'乐业县',
+    451029:'田林县',
+    451030:'西林县',
+    451031:'隆林各族自治县',
+    451081:'靖西市',
+    451082:'平果市',
+    451102:'八步区',
+    451103:'平桂区',
+    451121:'昭平县',
+    451122:'钟山县',
+    451123:'富川瑶族自治县',
+    451202:'金城江区',
+    451203:'宜州区',
+    451221:'南丹县',
+    451222:'天峨县',
+    451223:'凤山县',
+    451224:'东兰县',
+    451225:'罗城仫佬族自治县',
+    451226:'环江毛南族自治县',
+    451227:'巴马瑶族自治县',
+    451228:'都安瑶族自治县',
+    451229:'大化瑶族自治县',
+    451302:'兴宾区',
+    451321:'忻城县',
+    451322:'象州县',
+    451323:'武宣县',
+    451324:'金秀瑶族自治县',
+    451381:'合山市',
+    451402:'江州区',
+    451421:'扶绥县',
+    451422:'宁明县',
+    451423:'龙州县',
+    451424:'大新县',
+    451425:'天等县',
+    451481:'凭祥市'
   }
 }

src/assets/js/utils/areaNew01.js

@@ -0,0 +1,134 @@
+export default {
+  province_list: {
+    450000: '广西壮族自治区'
+  },
+  city_list: {
+    450100:'南宁市',
+    450200:'柳州市',
+    450300:'桂林市',
+    450400:'梧州市',
+    450500:'北海市',
+    450600:'防城港市',
+    450700:'钦州市',
+    450800:'贵港市',
+    450900:'玉林市',
+    451000:'百色市',
+    451100:'贺州市',
+    451200:'河池市',
+    451300:'来宾市',
+    451400:'崇左市'
+  },
+  county_list: {
+    450102:'兴宁区',
+      450103:'青秀区',
+      450105:'江南区',
+      450107:'西乡塘区',
+      450108:'良庆区',
+      450109:'邕宁区',
+      450110:'武鸣区',
+      450123:'隆安县',
+      450124:'马山县',
+      450125:'上林县',
+      450126:'宾阳县',
+      450181:'横州市',
+      450202:'城中区',
+      450203:'鱼峰区',
+      450204:'柳南区',
+      450205:'柳北区',
+      450206:'柳江区',
+      450222:'柳城县',
+      450223:'鹿寨县',
+      450224:'融安县',
+      450225:'融水苗族自治县',
+      450226:'三江侗族自治县',
+      450302:'秀峰区',
+      450303:'叠彩区',
+      450304:'象山区',
+      450305:'七星区',
+      450311:'雁山区',
+      450312:'临桂区',
+      450321:'阳朔县',
+      450323:'灵川县',
+      450324:'全州县',
+      450325:'兴安县',
+      450326:'永福县',
+      450327:'灌阳县',
+      450328:'龙胜各族自治县',
+      450329:'资源县',
+      450330:'平乐县',
+      450332:'恭城瑶族自治县',
+      450381:'荔浦市',
+      450403:'万秀区',
+      450405:'长洲区',
+      450406:'龙圩区',
+      450421:'苍梧县',
+      450422:'藤县',
+      450423:'蒙山县',
+      450481:'岑溪市',
+      450502:'海城区',
+      450503:'银海区',
+      450512:'铁山港区',
+      450521:'合浦县',
+      450602:'港口区',
+      450603:'防城区',
+      450621:'上思县',
+      450681:'东兴市',
+      450702:'钦南区',
+      450703:'钦北区',
+      450721:'灵山县',
+      450722:'浦北县',
+      450802:'港北区',
+      450803:'港南区',
+      450804:'覃塘区',
+      450821:'平南县',
+      450881:'桂平市',
+      450902:'玉州区',
+      450903:'福绵区',
+      450921:'容县',
+      450922:'陆川县',
+      450923:'博白县',
+      450924:'兴业县',
+      450981:'北流市',
+      451002:'右江区',
+      451003:'田阳区',
+      451022:'田东县',
+      451024:'德保县',
+      451026:'那坡县',
+      451027:'凌云县',
+      451028:'乐业县',
+      451029:'田林县',
+      451030:'西林县',
+      451031:'隆林各族自治县',
+      451081:'靖西市',
+      451082:'平果市',
+      451102:'八步区',
+      451103:'平桂区',
+      451121:'昭平县',
+      451122:'钟山县',
+      451123:'富川瑶族自治县',
+      451202:'金城江区',
+      451203:'宜州区',
+      451221:'南丹县',
+      451222:'天峨县',
+      451223:'凤山县',
+      451224:'东兰县',
+      451225:'罗城仫佬族自治县',
+      451226:'环江毛南族自治县',
+      451227:'巴马瑶族自治县',
+      451228:'都安瑶族自治县',
+      451229:'大化瑶族自治县',
+      451302:'兴宾区',
+      451321:'忻城县',
+      451322:'象州县',
+      451323:'武宣县',
+      451324:'金秀瑶族自治县',
+      451381:'合山市',
+      451402:'江州区',
+      451421:'扶绥县',
+      451422:'宁明县',
+      451423:'龙州县',
+      451424:'大新县',
+      451425:'天等县',
+      451481:'凭祥市'
+  }
+}

src/assets/js/utils/areaNewForSale.js

@@ -4,255 +4,229 @@ export default {
     520000: '贵州省'
   },
   city_list: {
-    450100: '南宁市',
-    450200: '柳州市',
-    450300: '桂林市',
-    450400: '梧州市',
-    450500: '北海市',
-    450600: '防城港市',
-    450700: '钦州市',
-    450800: '贵港市',
-    450900: '玉林市',
-    451000: '百色市',
-    451100: '贺州市',
-    451200: '河池市',
-    451300: '来宾市',
-    451400: '崇左市',
-    520100: '贵阳市',
-    520200: '六盘水市',
-    520300: '遵义市',
-    520400: '安顺市',
-    520500: '毕节市',
-    522200: '铜仁地区',
-    522300: '黔西南布依族苗族自治州',
-    522400: '毕节地区',
-    522600: '黔东南苗族侗族自治州',
-    522700: '黔南布依族苗族自治州'
+    450100:'南宁市',
+    450200:'柳州市',
+    450300:'桂林市',
+    450400:'梧州市',
+    450500:'北海市',
+    450600:'防城港市',
+    450700:'钦州市',
+    450800:'贵港市',
+    450900:'玉林市',
+    451000:'百色市',
+    451100:'贺州市',
+    451200:'河池市',
+    451300:'来宾市',
+    451400:'崇左市',
+    520100:'贵阳市',
+    520200:'六盘水市',
+    520300:'遵义市',
+    520400:'安顺市',
+    520500:'毕节市',
+    520600:'铜仁市',
+    522300:'黔西南布依族苗族自治州',
+    522600:'黔东南苗族侗族自治州',
+    522700:'黔南布依族苗族自治州'
   },
   county_list: {
-    450101: '市辖区',
-    450102: '兴宁区',
-    450103: '青秀区',
-    450105: '江南区',
-    450107: '西乡塘区',
-    450108: '良庆区',
-    450109: '邕宁区',
-    450110: '武鸣区',
-    450122: '武鸣县',
-    450123: '隆安县',
-    450124: '马山县',
-    450125: '上林县',
-    450126: '宾阳县',
-    450127: '横县',
-    450201: '市辖区',
-    450202: '城中区',
-    450203: '鱼峰区',
-    450204: '柳南区',
-    450205: '柳北区',
-    450206: '柳江区',
-    450221: '柳江县',
-    450222: '柳城县',
-    450223: '鹿寨县',
-    450224: '融安县',
-    450225: '融水苗族自治县',
-    450226: '三江侗族自治县',
-    450301: '市辖区',
-    450302: '秀峰区',
-    450303: '叠彩区',
-    450304: '象山区',
-    450305: '七星区',
-    450311: '雁山区',
-    450312: '临桂区',
-    450321: '阳朔县',
-    450322: '临桂县',
-    450323: '灵川县',
-    450324: '全州县',
-    450325: '兴安县',
-    450326: '永福县',
-    450327: '灌阳县',
-    450328: '龙胜各族自治县',
-    450329: '资源县',
-    450330: '平乐县',
-    450331: '荔蒲县',
-    450332: '恭城瑶族自治县',
-    450381: '荔浦市',
-    450401: '市辖区',
-    450403: '万秀区',
-    450404: '蝶山区',
-    450405: '长洲区',
-    450406: '龙圩区',
-    450421: '苍梧县',
-    450422: '藤县',
-    450423: '蒙山县',
-    450481: '岑溪市',
-    450501: '市辖区',
-    450502: '海城区',
-    450503: '银海区',
-    450512: '铁山港区',
-    450521: '合浦县',
-    450601: '市辖区',
-    450602: '港口区',
-    450603: '防城区',
-    450621: '上思县',
-    450681: '东兴市',
-    450701: '市辖区',
-    450702: '钦南区',
-    450703: '钦北区',
-    450721: '灵山县',
-    450722: '浦北县',
-    450801: '市辖区',
-    450802: '港北区',
-    450803: '港南区',
-    450804: '覃塘区',
-    450821: '平南县',
-    450881: '桂平市',
-    450901: '市辖区',
-    450902: '玉州区',
-    450903: '福绵区',
-    450921: '容县',
-    450922: '陆川县',
-    450923: '博白县',
-    450924: '兴业县',
-    450981: '北流市',
-    451001: '市辖区',
-    451002: '右江区',
-    451021: '田阳县',
-    451022: '田东县',
-    451023: '平果县',
-    451024: '德保县',
-    451026: '那坡县',
-    451027: '凌云县',
-    451028: '乐业县',
-    451029: '田林县',
-    451030: '西林县',
-    451031: '隆林各族自治县',
-    451081: '靖西市',
-    451082: '平果市',
-    451101: '市辖区',
-    451102: '八步区',
-    451103: '平桂区',
-    451121: '昭平县',
-    451122: '钟山县',
-    451123: '富川瑶族自治县',
-    451201: '市辖区',
-    451202: '金城江区',
-    451203: '宜州区',
-    451221: '南丹县',
-    451222: '天峨县',
-    451223: '凤山县',
-    451224: '东兰县',
-    451225: '罗城仫佬族自治县',
-    451226: '环江毛南族自治县',
-    451227: '巴马瑶族自治县',
-    451228: '都安瑶族自治县',
-    451229: '大化瑶族自治县',
-    451281: '宜州市',
-    451301: '市辖区',
-    451302: '兴宾区',
-    451321: '忻城县',
-    451322: '象州县',
-    451323: '武宣县',
-    451324: '金秀瑶族自治县',
-    451381: '合山市',
-    451401: '市辖区',
-    451402: '江州区',
-    451421: '扶绥县',
-    451422: '宁明县',
-    451423: '龙州县',
-    451424: '大新县',
-    451425: '天等县',
-    451481: '凭祥市',
-    520101: '市辖区',
-    520102: '南明区',
-    520103: '云岩区',
-    520111: '花溪区',
-    520112: '乌当区',
-    520114: '观山湖区',
-    520113: '白云区',
-    520121: '开阳县',
-    520122: '息烽县',
-    520123: '修文县',
-    520181: '清镇市',
-    520201: '钟山区',
-    520203: '六枝特区',
-    520221: '水城县',
-    520222: '盘州市',
-    520301: '市辖区',
-    520302: '红花岗区',
-    520303: '汇川区',
-    520321: '遵义县',
-    520322: '桐梓县',
-    520323: '绥阳县',
-    520324: '正安县',
-    520325: '道真仡佬族苗族自治县',
-    520326: '务川仡佬族苗族自治县',
-    520327: '凤冈县',
-    520328: '湄潭县',
-    520329: '余庆县',
-    520330: '习水县',
-    520381: '赤水市',
-    520382: '仁怀市',
-    520401: '市辖区',
-    520402: '西秀区',
-    520421: '平坝区',
-    520422: '普定县',
-    520423: '镇宁布依族苗族自治县',
-    520424: '关岭布依族苗族自治县',
-    520425: '紫云苗族布依族自治县',
-    520524: '织金县',
-    522201: '铜仁市',
-    522222: '江口县',
-    522223: '玉屏侗族自治县',
-    522224: '石阡县',
-    522225: '思南县',
-    522226: '印江土家族苗族自治县',
-    522227: '德江县',
-    522228: '沿河土家族自治县',
-    522229: '松桃苗族自治县',
-    522230: '万山特区',
-    522301: '兴义市',
-    522322: '兴仁市',
-    522323: '普安县',
-    522324: '睛隆县',
-    522325: '贞丰县',
-    522326: '望谟县',
-    522327: '册亨县',
-    522328: '安龙县',
-    522401: '毕节市',
-    522422: '大方县',
-    522423: '黔西市',
-    522424: '金沙县',
-    522425: '织金县',
-    522426: '纳雍县',
-    522427: '威宁彝族回族苗族自治县',
-    522428: '赫章县',
-    522601: '凯里市',
-    522622: '黄平县',
-    522623: '施秉县',
-    522624: '三穗县',
-    522625: '镇远县',
-    522626: '岑巩县',
-    522627: '天柱县',
-    522628: '锦屏县',
-    522629: '剑河县',
-    522630: '台江县',
-    522631: '黎平县',
-    522632: '榕江县',
-    522633: '从江县',
-    522634: '雷山县',
-    522635: '麻江县',
-    522636: '丹寨县',
-    522701: '都匀市',
-    522702: '福泉市',
-    522722: '荔波县',
-    522723: '贵定县',
-    522725: '瓮安县',
-    522726: '独山县',
-    522727: '平塘县',
-    522728: '罗甸县',
-    522729: '长顺县',
-    522730: '龙里县',
-    522731: '惠水县',
-    522732: '三都水族自治县'
+    450102:'兴宁区',
+    450103:'青秀区',
+    450105:'江南区',
+    450107:'西乡塘区',
+    450108:'良庆区',
+    450109:'邕宁区',
+    450110:'武鸣区',
+    450123:'隆安县',
+    450124:'马山县',
+    450125:'上林县',
+    450126:'宾阳县',
+    450181:'横州市',
+    450202:'城中区',
+    450203:'鱼峰区',
+    450204:'柳南区',
+    450205:'柳北区',
+    450206:'柳江区',
+    450222:'柳城县',
+    450223:'鹿寨县',
+    450224:'融安县',
+    450225:'融水苗族自治县',
+    450226:'三江侗族自治县',
+    450302:'秀峰区',
+    450303:'叠彩区',
+    450304:'象山区',
+    450305:'七星区',
+    450311:'雁山区',
+    450312:'临桂区',
+    450321:'阳朔县',
+    450323:'灵川县',
+    450324:'全州县',
+    450325:'兴安县',
+    450326:'永福县',
+    450327:'灌阳县',
+    450328:'龙胜各族自治县',
+    450329:'资源县',
+    450330:'平乐县',
+    450332:'恭城瑶族自治县',
+    450381:'荔浦市',
+    450403:'万秀区',
+    450405:'长洲区',
+    450406:'龙圩区',
+    450421:'苍梧县',
+    450422:'藤县',
+    450423:'蒙山县',
+    450481:'岑溪市',
+    450502:'海城区',
+    450503:'银海区',
+    450512:'铁山港区',
+    450521:'合浦县',
+    450602:'港口区',
+    450603:'防城区',
+    450621:'上思县',
+    450681:'东兴市',
+    450702:'钦南区',
+    450703:'钦北区',
+    450721:'灵山县',
+    450722:'浦北县',
+    450802:'港北区',
+    450803:'港南区',
+    450804:'覃塘区',
+    450821:'平南县',
+    450881:'桂平市',
+    450902:'玉州区',
+    450903:'福绵区',
+    450921:'容县',
+    450922:'陆川县',
+    450923:'博白县',
+    450924:'兴业县',
+    450981:'北流市',
+    451002:'右江区',
+    451003:'田阳区',
+    451022:'田东县',
+    451024:'德保县',
+    451026:'那坡县',
+    451027:'凌云县',
+    451028:'乐业县',
+    451029:'田林县',
+    451030:'西林县',
+    451031:'隆林各族自治县',
+    451081:'靖西市',
+    451082:'平果市',
+    451102:'八步区',
+    451103:'平桂区',
+    451121:'昭平县',
+    451122:'钟山县',
+    451123:'富川瑶族自治县',
+    451202:'金城江区',
+    451203:'宜州区',
+    451221:'南丹县',
+    451222:'天峨县',
+    451223:'凤山县',
+    451224:'东兰县',
+    451225:'罗城仫佬族自治县',
+    451226:'环江毛南族自治县',
+    451227:'巴马瑶族自治县',
+    451228:'都安瑶族自治县',
+    451229:'大化瑶族自治县',
+    451302:'兴宾区',
+    451321:'忻城县',
+    451322:'象州县',
+    451323:'武宣县',
+    451324:'金秀瑶族自治县',
+    451381:'合山市',
+    451402:'江州区',
+    451421:'扶绥县',
+    451422:'宁明县',
+    451423:'龙州县',
+    451424:'大新县',
+    451425:'天等县',
+    451481:'凭祥市',
+    520102:'南明区',
+    520103:'云岩区',
+    520111:'花溪区',
+    520112:'乌当区',
+    520113:'白云区',
+    520115:'观山湖区',
+    520121:'开阳县',
+    520122:'息烽县',
+    520123:'修文县',
+    520181:'清镇市',
+    520201:'钟山区',
+    520203:'六枝特区',
+    520204:'水城区',
+    520281:'盘州市',
+    520302:'红花岗区',
+    520303:'汇川区',
+    520304:'播州区',
+    520322:'桐梓县',
+    520323:'绥阳县',
+    520324:'正安县',
+    520325:'道真仡佬族苗族自治县',
+    520326:'务川仡佬族苗族自治县',
+    520327:'凤冈县',
+    520328:'湄潭县',
+    520329:'余庆县',
+    520330:'习水县',
+    520381:'赤水市',
+    520382:'仁怀市',
+    520402:'西秀区',
+    520403:'平坝区',
+    520422:'普定县',
+    520423:'镇宁布依族苗族自治县',
+    520424:'关岭布依族苗族自治县',
+    520425:'紫云苗族布依族自治县',
+    520502:'七星关区',
+    520521:'大方县',
+    520523:'金沙县',
+    520524:'织金县',
+    520525:'纳雍县',
+    520526:'威宁彝族回族苗族自治县',
+    520527:'赫章县',
+    520581:'黔西市',
+    520602:'碧江区',
+    520603:'万山区',
+    520621:'江口县',
+    520622:'玉屏侗族自治县',
+    520623:'石阡县',
+    520624:'思南县',
+    520625:'印江土家族苗族自治县',
+    520626:'德江县',
+    520627:'沿河土家族自治县',
+    520628:'松桃苗族自治县',
+    522301:'兴义市',
+    522302:'兴仁市',
+    522323:'普安县',
+    522324:'晴隆县',
+    522325:'贞丰县',
+    522326:'望谟县',
+    522327:'册亨县',
+    522328:'安龙县',
+    522601:'凯里市',
+    522622:'黄平县',
+    522623:'施秉县',
+    522624:'三穗县',
+    522625:'镇远县',
+    522626:'岑巩县',
+    522627:'天柱县',
+    522628:'锦屏县',
+    522629:'剑河县',
+    522630:'台江县',
+    522631:'黎平县',
+    522632:'榕江县',
+    522633:'从江县',
+    522634:'雷山县',
+    522635:'麻江县',
+    522636:'丹寨县',
+    522701:'都匀市',
+    522702:'福泉市',
+    522722:'荔波县',
+    522723:'贵定县',
+    522725:'瓮安县',
+    522726:'独山县',
+    522727:'平塘县',
+    522728:'罗甸县',
+    522729:'长顺县',
+    522730:'龙里县',
+    522731:'惠水县',
+    522732:'三都水族自治县'
   }
 }

src/assets/js/utils/areaNewForSale01.js

@@ -0,0 +1,258 @@
+export default {
+  province_list: {
+    450000: '广西壮族自治区',
+    520000: '贵州省'
+  },
+  city_list: {
+    450100: '南宁市',
+    450200: '柳州市',
+    450300: '桂林市',
+    450400: '梧州市',
+    450500: '北海市',
+    450600: '防城港市',
+    450700: '钦州市',
+    450800: '贵港市',
+    450900: '玉林市',
+    451000: '百色市',
+    451100: '贺州市',
+    451200: '河池市',
+    451300: '来宾市',
+    451400: '崇左市',
+    520100: '贵阳市',
+    520200: '六盘水市',
+    520300: '遵义市',
+    520400: '安顺市',
+    520500: '毕节市',
+    522200: '铜仁地区',
+    522300: '黔西南布依族苗族自治州',
+    522400: '毕节地区',
+    522600: '黔东南苗族侗族自治州',
+    522700: '黔南布依族苗族自治州'
+  },
+  county_list: {
+    450101: '市辖区',
+    450102: '兴宁区',
+    450103: '青秀区',
+    450105: '江南区',
+    450107: '西乡塘区',
+    450108: '良庆区',
+    450109: '邕宁区',
+    450110: '武鸣区',
+    450122: '武鸣县',
+    450123: '隆安县',
+    450124: '马山县',
+    450125: '上林县',
+    450126: '宾阳县',
+    450127: '横县',
+    450201: '市辖区',
+    450202: '城中区',
+    450203: '鱼峰区',
+    450204: '柳南区',
+    450205: '柳北区',
+    450206: '柳江区',
+    450221: '柳江县',
+    450222: '柳城县',
+    450223: '鹿寨县',
+    450224: '融安县',
+    450225: '融水苗族自治县',
+    450226: '三江侗族自治县',
+    450301: '市辖区',
+    450302: '秀峰区',
+    450303: '叠彩区',
+    450304: '象山区',
+    450305: '七星区',
+    450311: '雁山区',
+    450312: '临桂区',
+    450321: '阳朔县',
+    450322: '临桂县',
+    450323: '灵川县',
+    450324: '全州县',
+    450325: '兴安县',
+    450326: '永福县',
+    450327: '灌阳县',
+    450328: '龙胜各族自治县',
+    450329: '资源县',
+    450330: '平乐县',
+    450331: '荔蒲县',
+    450332: '恭城瑶族自治县',
+    450381: '荔浦市',
+    450401: '市辖区',
+    450403: '万秀区',
+    450404: '蝶山区',
+    450405: '长洲区',
+    450406: '龙圩区',
+    450421: '苍梧县',
+    450422: '藤县',
+    450423: '蒙山县',
+    450481: '岑溪市',
+    450501: '市辖区',
+    450502: '海城区',
+    450503: '银海区',
+    450512: '铁山港区',
+    450521: '合浦县',
+    450601: '市辖区',
+    450602: '港口区',
+    450603: '防城区',
+    450621: '上思县',
+    450681: '东兴市',
+    450701: '市辖区',
+    450702: '钦南区',
+    450703: '钦北区',
+    450721: '灵山县',
+    450722: '浦北县',
+    450801: '市辖区',
+    450802: '港北区',
+    450803: '港南区',
+    450804: '覃塘区',
+    450821: '平南县',
+    450881: '桂平市',
+    450901: '市辖区',
+    450902: '玉州区',
+    450903: '福绵区',
+    450921: '容县',
+    450922: '陆川县',
+    450923: '博白县',
+    450924: '兴业县',
+    450981: '北流市',
+    451001: '市辖区',
+    451002: '右江区',
+    451021: '田阳县',
+    451022: '田东县',
+    451023: '平果县',
+    451024: '德保县',
+    451026: '那坡县',
+    451027: '凌云县',
+    451028: '乐业县',
+    451029: '田林县',
+    451030: '西林县',
+    451031: '隆林各族自治县',
+    451081: '靖西市',
+    451082: '平果市',
+    451101: '市辖区',
+    451102: '八步区',
+    451103: '平桂区',
+    451121: '昭平县',
+    451122: '钟山县',
+    451123: '富川瑶族自治县',
+    451201: '市辖区',
+    451202: '金城江区',
+    451203: '宜州区',
+    451221: '南丹县',
+    451222: '天峨县',
+    451223: '凤山县',
+    451224: '东兰县',
+    451225: '罗城仫佬族自治县',
+    451226: '环江毛南族自治县',
+    451227: '巴马瑶族自治县',
+    451228: '都安瑶族自治县',
+    451229: '大化瑶族自治县',
+    451281: '宜州市',
+    451301: '市辖区',
+    451302: '兴宾区',
+    451321: '忻城县',
+    451322: '象州县',
+    451323: '武宣县',
+    451324: '金秀瑶族自治县',
+    451381: '合山市',
+    451401: '市辖区',
+    451402: '江州区',
+    451421: '扶绥县',
+    451422: '宁明县',
+    451423: '龙州县',
+    451424: '大新县',
+    451425: '天等县',
+    451481: '凭祥市',
+    520101: '市辖区',
+    520102: '南明区',
+    520103: '云岩区',
+    520111: '花溪区',
+    520112: '乌当区',
+    520114: '观山湖区',
+    520113: '白云区',
+    520121: '开阳县',
+    520122: '息烽县',
+    520123: '修文县',
+    520181: '清镇市',
+    520201: '钟山区',
+    520203: '六枝特区',
+    520221: '水城县',
+    520222: '盘州市',
+    520301: '市辖区',
+    520302: '红花岗区',
+    520303: '汇川区',
+    520321: '遵义县',
+    520322: '桐梓县',
+    520323: '绥阳县',
+    520324: '正安县',
+    520325: '道真仡佬族苗族自治县',
+    520326: '务川仡佬族苗族自治县',
+    520327: '凤冈县',
+    520328: '湄潭县',
+    520329: '余庆县',
+    520330: '习水县',
+    520381: '赤水市',
+    520382: '仁怀市',
+    520401: '市辖区',
+    520402: '西秀区',
+    520421: '平坝区',
+    520422: '普定县',
+    520423: '镇宁布依族苗族自治县',
+    520424: '关岭布依族苗族自治县',
+    520425: '紫云苗族布依族自治县',
+    520524: '织金县',
+    522201: '铜仁市',
+    522222: '江口县',
+    522223: '玉屏侗族自治县',
+    522224: '石阡县',
+    522225: '思南县',
+    522226: '印江土家族苗族自治县',
+    522227: '德江县',
+    522228: '沿河土家族自治县',
+    522229: '松桃苗族自治县',
+    522230: '万山特区',
+    522301: '兴义市',
+    522322: '兴仁市',
+    522323: '普安县',
+    522324: '睛隆县',
+    522325: '贞丰县',
+    522326: '望谟县',
+    522327: '册亨县',
+    522328: '安龙县',
+    522401: '毕节市',
+    522422: '大方县',
+    522423: '黔西市',
+    522424: '金沙县',
+    522425: '织金县',
+    522426: '纳雍县',
+    522427: '威宁彝族回族苗族自治县',
+    522428: '赫章县',
+    522601: '凯里市',
+    522622: '黄平县',
+    522623: '施秉县',
+    522624: '三穗县',
+    522625: '镇远县',
+    522626: '岑巩县',
+    522627: '天柱县',
+    522628: '锦屏县',
+    522629: '剑河县',
+    522630: '台江县',
+    522631: '黎平县',
+    522632: '榕江县',
+    522633: '从江县',
+    522634: '雷山县',
+    522635: '麻江县',
+    522636: '丹寨县',
+    522701: '都匀市',
+    522702: '福泉市',
+    522722: '荔波县',
+    522723: '贵定县',
+    522725: '瓮安县',
+    522726: '独山县',
+    522727: '平塘县',
+    522728: '罗甸县',
+    522729: '长顺县',
+    522730: '龙里县',
+    522731: '惠水县',
+    522732: '三都水族自治县'
+  }
+}

src/assets/js/utils/countCredentialValidity.js

@@ -0,0 +1,88 @@
+import utilsAge from '@/assets/js/utils/age'
+export default {
+  //计算身份证起始日期
+  getStartDate: function(birthday, endDate) {
+    let startDate = '' //证件起始日期
+    let startage = ''
+    let endage = utilsAge.getAge(birthday, new Date(endDate))
+
+    /**
+     * @Author: LiuXiaoFeng
+     * @Description: 未满16周岁的公民申领的居民身份证有效期为5年
+     * @Date: 2023/7/4
+     **/
+    if (endage - 5 < 16) {
+      return startDate = String(Number(endDate.slice(0,4)) - 5) + endDate.slice(4,11)
+    }
+    /**
+     * @Author: LiuXiaoFeng
+     * @Description: 年满16周岁至25周岁的公民申领的居民身份证有效期为10年
+     * @Date: 2023/7/4
+     **/
+    else if (endage - 5 >= 16 && endage - 10 <= 25) {
+      startDate = String(Number(endDate.slice(0,4)) - 10) + endDate.slice(4,11)
+      startage = utilsAge.getAge(birthday, new Date(startDate))
+      if(startage >= 16 && startage <= 25){
+        return startDate
+      }
+    }
+    /**
+     * @Author: LiuXiaoFeng
+     * @Description: 年满26周岁至45周岁的公民申领的居民身份证有效期为20年
+     * @Date: 2023/7/4
+     **/
+    else if(endage - 10 >= 26 && endage - 20 <= 45) {
+      startDate = String(Number(endDate.slice(0,4)) - 20) + endDate.slice(4,11)
+      startage = utilsAge.getAge(birthday, new Date(startDate))
+      if(startage >= 26 && startage <= 45){
+        return startDate
+      }
+    }
+    /**
+     * @Author: LiuXiaoFeng
+     * @Description: 年满46周岁的公民申领居民身份证有效期为长期
+     * @Date: 2023/7/4
+     **/
+    else if (endage - 20 >= 46) {
+      return startDate
+    }
+  },
+
+  //计算身份证截止日期
+  getEndDate: function(birthday, startDate) {
+    let endDate = '' //证件截止日期
+    let startage = utilsAge.getAge(birthday, new Date(startDate))
+    /**
+     * @Author: LiuXiaoFeng
+     * @Description: 未满16周岁的公民申领的居民身份证有效期为5年
+     * @Date: 2023/7/4
+     **/
+    if (startage < 16) {
+      return endDate = String(Number(startDate.slice(0, 4)) + 5) + startDate.slice(4, 11)
+    }
+    /**
+     * @Author: LiuXiaoFeng
+     * @Description: 年满16周岁至25周岁的公民申领的居民身份证有效期为10年
+     * @Date: 2023/7/4
+     **/
+    else if (startage >= 16 && startage <= 25) {
+      return endDate = String(Number(startDate.slice(0, 4)) + 10) + startDate.slice(4, 11)
+    }
+    /**
+     * @Author: LiuXiaoFeng
+     * @Description: 年满26周岁至45周岁的公民申领的居民身份证有效期为20年
+     * @Date: 2023/7/4
+     **/
+    else if (startage >= 26 && startage <= 45) {
+      return endDate = String(Number(startDate.slice(0, 4)) + 20) + startDate.slice(4, 11)
+    }
+    /**
+     * @Author: LiuXiaoFeng
+     * @Description: 年满46周岁的公民申领居民身份证有效期为长期
+     * @Date: 2023/7/4
+     **/
+    else if (startage > 65) {
+      return endDate
+    }
+  }
+}

src/assets/js/utils/data-dictionary.js

@@ -965,10 +965,10 @@ export default {
       id: 2,
       text: '户口本'
     },
-    {
-      id: 3,
-      text: '出生证'
-    },
+    // {
+    //   id: 3,
+    //   text: '出生证'
+    // },
     {
       id: 4,
       text: '外国人护照'
@@ -1059,6 +1059,36 @@ export default {
       text: '户口本'
     }
   ],
+  // 新市民身份
+  isNewPeopleFlag: [
+    {
+      id: 1,
+      text: '是'
+    },
+    {
+      id: 0,
+      text: '否'
+    }
+  ],
+  // 新市民类型 创业、就业、子女上学、投奔子女
+  npType: [
+    {
+      id: 1,
+      text: '创业'
+    },
+    {
+      id: 2,
+      text: '就业'
+    },
+    {
+      id: 3,
+      text: '子女上学'
+    },
+    {
+      id: 4,
+      text: '投奔子女'
+    }
+  ],
   //出生证明
   birthType: [
     {
@@ -2199,6 +2229,11 @@ export default {
       name: '国富人寿附加两全保险',
       code: 'GFRS_A0011'
     },
+    {
+      shortName: '重疾险',
+      name: '国富人寿八桂无忧重大疾病保险（E款）',
+      code: 'GFRS_M0060'
+    },
     {
       shortName: '年金险',
       name: '国富人寿鑫享金生养老年金保险',
@@ -2208,11 +2243,11 @@ export default {
   // 职级
   applGrade: [
     { id: 'A101', text: '客户专员' },
-    { id: 'A102', text: '客户经理' },
+    // { id: 'A102', text: '客户经理' },
     { id: 'A201', text: '业务主任' },
-    { id: 'A202', text: '高级业务主任' },
+    // { id: 'A202', text: '高级业务主任' },
     { id: 'A301', text: '营业部经理' },
-    { id: 'A302', text: '高级营业部经理' },
+    // { id: 'A302', text: '高级营业部经理' },
     { id: 'A401', text: '业务总监' }
   ],
   // e起陪访: 陪访类型枚举
@@ -3716,6 +3751,122 @@ export default {
     {
       code: 'HighSpeedTrainAccidentDeathOrTotalDisabilityInsurance',
       label: '元'
+    },
+    {
+      code: "AppntCriticalDiseaseExemptionPremiumC",
+      label: "元"
+    },
+    {
+      code: "AppntModerateOrMinorDiseaseExemptionPremiumC",
+      label: "元"
+    },
+    {
+      code: "AppntDeathOrTotalDiseaseExemptionPremiumC",
+      label: "元"
+    },
+    {
+      code: "InsuredCriticalDiseaseExemptionPremiumC",
+      label: "元"
+    },
+    {
+      code: "InsuredModerateOrMinorDiseaseExemptionPremiumC",
+      label: "元"
+    },
+    {
+      code: "InsuredDeathOrTotalDiseaseExemptionPremiumC",
+      label: "元"
+    },
+    {
+      code: "transport_G",
+      label: "元"
+    },
+    {
+      code: "transport_H",
+      label: "元"
+    },
+    {
+      code: "transport_J",
+      label: "元"
+    },
+    {
+      code: "firstMajorDiseaseInsurance",
+      label: "元"
+    },
+    {
+      code: "EffectiveInsuranceAmount",
+      label: "元"
+    },
+    {
+      code: "oldMajorDiseaseInsurance",
+      label: "元"
+    },
+    {
+      code: "GFRS_A0013__cashValue",
+      label: "元"
+    },
+    {
+      code: "GFRS_M0073__cashValue",
+      label: "元"
+    },
+    {
+      code: "specMajorDiseaseInsurance",
+      label: "元"
+    },
+    {
+      code: "expireSurvivalInsurance",
+      label: "元"
+    },
+    {
+      code: "currentBonus_L",
+      label: "元"
+    },
+    {
+      code: "currentBonus_M",
+      label: "元"
+    },
+    {
+      code: "riskAC_L",
+      label: "元"
+    },
+    {
+      code: "riskAC_M",
+      label: "元"
+    },
+    {
+      code: "CardiovascularCerebrovascularDiseasesInsurance",
+      label: "元"
+    },
+    {
+      code: "childrenSpecificDiseaseInsurance",
+      label: "元"
+    },
+    {
+      code: "maleSpecificDiseaseInsurance",
+      label: "元"
+    },
+    {
+      code: "femaleSpecificDiseaseInsurance",
+      label: "元"
+    },
+    {
+      code: "supplementarySpecificDiseaseInsurance",
+      label: "元"
+    },
+    {
+      code: "deductible",
+      label: "元"
+    },
+    {
+      code: "deductible",
+      label: "免赔额"
+    },
+    {
+      code: "accidentalDeductible",
+      label: "元"
+    },
+    {
+      code: "accidentalLimit",
+      label: "%"
     }
   ],
   // 卡单与短期险重新投保选择职业类别时，两个模块职业类型数据的排序不同，创建这个数据字典，用于在选择职业类别时，作为一个参数传入组件，

src/assets/js/utils/get-url.js

@@ -9,6 +9,8 @@ export default function getUrl(url, api = 1, domainType = 1) {
     domain = config.apiDomain
   } else if (domainType == 2) {
     domain = config.imgDomain
+  } else if (domainType == 3) {
+    domain = config.YB_APP
   }
 
   return api === 0 ? urlMap[url] : domain + url

src/assets/js/utils/getAfterDate.js

@@ -14,7 +14,41 @@ export default {
     let currentTime = new Date().getTime()
     return new Date(Number(currentTime) + 1000 * 60 * 60 * 24 * days)
   },
-  isLeapYear: function(year) {
+
+    getAfterDateTime(timeStr,type) {
+        let now = new Date(timeStr);
+        let year = now.getFullYear() + 1; //得到年份
+        let month = (now.getMonth() + 1).toString().padStart(2, "0"); //得到月份
+        let day = (now.getDate() - 1).toString().padStart(2, "0"); //得到日期
+
+        if (month == '01' && day == '00') {
+            year = now.getFullYear(); //得到年份
+            month = '12';
+            day = '31'
+        } else if (day == '00') {
+            year = now.getFullYear() + 1; //得到年份
+            month = (now.getMonth()).toString().padStart(2, "0"); //得到月份;
+            if (month == '01' || month == '03' || month == '05' || month == '07' || month == '08' || month == '10' || month == '12') {//大月
+                day = '31'
+            } else if (month == '04' || month == '06' || month == '09' || month == '11') {//小月
+                day = '30'
+            } else if (year % 4 == 0 && year % 100 != 0 || year % 400 == 0) {//瑞年
+                day = '29'
+            } else {//平年
+                day = '28'
+            }
+        } else {
+            year = now.getFullYear() + 1; //得到年份
+            month = (now.getMonth() + 1).toString().padStart(2, "0"); //得到月份
+            day = (now.getDate() - 1).toString().padStart(2, "0"); //得到日期
+        }
+        if (type == 1) {
+            return `${year}年${month}月${day}日`;
+        } else if(type == 2) {
+            return `${year}-${month}-${day}`;
+        }
+    },
+    isLeapYear: function(year) {
     var cond1 = year % 4 == 0 //条件1：年份必须要能被4整除
     var cond2 = year % 100 != 0 //条件2：年份不能是整百数
     var cond3 = year % 400 == 0 //条件3：年份是400的倍数

src/assets/js/utils/jump.js

@@ -2,7 +2,12 @@
 export default function jump(options) {
   // eslint-disable
   if (window.WebViewJavascriptBridge && options.flag) {
-    if (options.flag == 'h5' || options.flag == 'service' || options.flag == 'home' || options.flag == 'mine') {
+    if (options.flag == 'h5' || 
+        options.flag == 'service' || 
+        options.flag == 'home' || 
+        options.flag == 'mine' || 
+        options.flag == 'message' || 
+        options.flag == 'setting' ) {
       EWebBridge.webCallAppInJs('bridge', {
         flag: options.flag,
         extra: options.extra

src/assets/js/utils/permission.js

@@ -5,12 +5,14 @@ import CacheUtils from '@/assets/js/utils/cacheUtils'
 // import 'nprogress/nprogress.css' // Progress 进度条样式
 export function permission() {
   router.beforeEach((to, from, next) => {
-    // NProgress.start()
     //修改title
     const title = to.meta && to.meta.title
     if (title) {
       document.title = title
     }
+    if(from.path == '/sale/signatureConfirmation' && to.path == '/sale/attachmentManagement'){
+      window.location.href = window.location.origin + '#' + from.path + '?orderNo=' + from.query.orderNo
+    }
     //判断是否登录
     let token = CacheUtils.getLocItem('token')
     if (!token) {

src/assets/js/utils/request.js

@@ -158,27 +158,27 @@ service.interceptors.request.use(
       })
     }
     let masterKey
-    if(configApp.API_VERSION == 'v3'){
+    if (configApp.API_VERSION == 'v3') {
       // 生成本次请求随机密钥
       if (!window.localStorage.getItem('masterKey')) {
         masterKey = randomString();
-        window.localStorage.setItem('masterKey',masterKey)
+        window.localStorage.setItem('masterKey', masterKey)
       } else {
         masterKey = window.localStorage.getItem('masterKey')
       }
     }
-     // token 不存在初始化处理
-     let token = CacheUtils.getLocItem('token')
+    // token 不存在初始化处理
+    let token = CacheUtils.getLocItem('token')
     /**
      * 请求拦截处理(待添加 判断走统一网关处理)
      */
     // console.log(config)
-    if (config.url && /api\/$/.test(config.url.split(configApp.API_VERSION)[0]) &&  (configApp.API_VERSION == 'v2' || configApp.API_VERSION == 'v3')) {
+    if (config.url && /api\/$/.test(config.url.split(configApp.API_VERSION)[0]) && (configApp.API_VERSION == 'v2' || configApp.API_VERSION == 'v3')) {
       if (!config.data || config.data == null) {
         config.data = {}
       }
       if (!!config.data && config.data != null) {
-        if(configApp.API_VERSION == 'v3'){
+        if (configApp.API_VERSION == 'v3') {
           // console.log('随机密钥：' + masterKey);
           // RSA加密随机密钥
           let ak = RSAEncrypt(masterKey, publicKey);
@@ -189,18 +189,18 @@ service.interceptors.request.use(
           // 验证数据完整性MD5
           // 数据完整性MD5需要进行二次AES加密
           config.headers['signature'] = SHA256(AESEncrypt(data, masterKey)).toString();
-          if(config.method == 'get'){
+          if (config.method == 'get') {
             config.headers['ak'] = ak
             config.headers['data'] = data
           }
           config.data = { ak, data };
           // console.log(config.data);
-          if(AESDecrypt(config.data.data, masterKey)){
+          if (AESDecrypt(config.data.data, masterKey)) {
             // console.log(JSON.parse(AESDecrypt(config.data.data, masterKey)));
-          }else{
+          } else {
             // console.log(AESDecrypt(config.data.data, masterKey));
           }
-        }else if(configApp.API_VERSION == 'v2'){
+        } else if (configApp.API_VERSION == 'v2') {
           config.headers['signature'] = MD5(timeStr + CacheUtils.getLocItem('token'))
           let encrypt = AESEncryptV2(JSON.stringify(config.data), configApp.REQ_PWD)
           config.data = { data: encrypt }
@@ -214,17 +214,24 @@ service.interceptors.request.use(
       const target = BusinessCommon.device()
       // 安卓or苹果(非浏览器)
       if (!target.isWeixin && target.mobile) {
+        // console.log(to.meta.name, 'to.meta.name');
         // eslint-disable-next-line no-undef
         let u = navigator.userAgent;
         let isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;   //判断是否是 android终端
-        if(isAndroid){
+        if (isAndroid) {
           // setTimeout(() => {
-            console.log(window.Android.getToken(),'Android获取token')
+          if (window.location.hash !== '#/my/privacyPolicy') {
+            console.log(window.Android.getToken(), 'Android获取token')
             CacheUtils.setLocItem('token', window.Android.getToken())
+          }
           // }, 1000)
-        }else{
-          const res = await EWebBridge.webCallAppInJs('getToken')
-          CacheUtils.setLocItem('token', JSON.parse(res).token)
+        } else {
+          // const res = await EWebBridge.webCallAppInJs('getToken')
+          // CacheUtils.setLocItem('token', JSON.parse(res).token)
+          if (window.location.hash !== '#/my/privacyPolicy') {
+            const res = await EWebBridge.webCallAppInJs('getToken')
+            CacheUtils.setLocItem('token', JSON.parse(res).token)
+          }
         }
       }
     }
@@ -246,14 +253,14 @@ service.interceptors.response.use(
   response => {
     let res = response.data
     if (
-       (configApp.API_VERSION == 'v2' || configApp.API_VERSION == 'v3') &&
+      (configApp.API_VERSION == 'v2' || configApp.API_VERSION == 'v3') &&
       response.config.url &&
       response.headers['content-type'].match(/application\/json/) &&
       /api\/$/.test(response.config.url.split(configApp.API_VERSION)[0])
     ) {
       if (res.response) {
-        if(configApp.API_VERSION == 'v3'){
-           // 正常情況返回必有response 节点
+        if (configApp.API_VERSION == 'v3') {
+          // 正常情況返回必有response 节点
           // 返回结果的随机密钥
           let masterKey;
           if (!window.localStorage.getItem('masterKey')) {
@@ -266,11 +273,11 @@ service.interceptors.response.use(
           // console.log(JSON.parse(AESDecrypt(response.data.response, masterKey)))
           // 使用随机密钥解密返回结果data
           res = JSON.parse(AESDecrypt(res.response, masterKey))
-        }else if(configApp.API_VERSION == 'v2'){
+        } else if (configApp.API_VERSION == 'v2') {
           // 使用固定密钥解密返回结果data
           res = JSON.parse(AESDecryptV2(res.response, configApp.REQ_PWD))
           // console.log(res,'JSON.parse(AESDecrypt(res.response, configApp.REQ_PWD))')
-        } 
+        }
       }
     }
 
@@ -280,7 +287,7 @@ service.interceptors.response.use(
       if (res.code == 10001 || res.code == 10002) {
         var ua = window.navigator.userAgent.toLowerCase();
         //通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信
-        if(ua.match(/MicroMessenger/i) == 'micromessenger'){
+        if (ua.match(/MicroMessenger/i) == 'micromessenger') {
           Dialog.alert({
             title: '提示',
             confirmButtonText: '退出',
@@ -288,7 +295,7 @@ service.interceptors.response.use(
           }).then(() => {
             window.close();
             WeixinJSBridge.call('closeWindow');
-          }); 
+          });
         } else {
           //在app
           Dialog.confirm({
@@ -300,7 +307,7 @@ service.interceptors.response.use(
               flag: 'login'
             })
           })
-        }      
+        }
       } else {
         //Toast.fail(res.msg)
       }

src/assets/js/utils/warterMark.js

@@ -0,0 +1,55 @@
+// warterMark.js
+'use strict'
+
+let watermark = {}
+
+let setWatermark = (str, str1) => {
+  let id = '1.23452384164.123412415'
+
+  if (document.getElementById(id) !== null) {
+    document.body.removeChild(document.getElementById(id))
+  }
+
+  let can = document.createElement('canvas')// 创建一个画布
+  can.width = 180 // 设置宽度
+  can.height = 150 // 高度
+
+  let cans = can.getContext('2d')
+  cans.rotate(-25 * Math.PI / 180) // 水印旋转角度    0 水平
+  cans.font = '14px Vedana'  // 字体大小
+  cans.fillStyle = '#000' // 水印的颜色
+  cans.textAlign = 'left' // 设置文本内容的当前对齐方式
+  cans.textBaseline = 'Middle' // 设置在绘制文本时使用的当前文本基线
+  cans.globalAlpha = 0.1 // 透明度
+  // 在画布上绘制填色的文本（输出的文本，开始绘制文本的X坐标位置，开始绘制文本的Y坐标位置）
+  cans.fillText(str, can.width / 100, can.height / 1) 
+  cans.fillText(str1, can.width / 3, can.height / 2.5) // 根据需求可添加多行水印，在方法中添加str1
+
+  let div = document.createElement('div')
+  div.id = id
+  div.style.pointerEvents = 'none'
+  div.style.top = '100px'
+  div.style.left = '-20px'
+  div.style.position = 'fixed'
+  div.style.zIndex = '100000'
+  div.style.width = document.documentElement.clientWidth + 'px'
+  div.style.height = document.documentElement.clientHeight + 'px'
+  div.style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat'
+  document.body.appendChild(div)
+  return id
+}
+
+// 该方法只允许调用一次
+watermark.set = (str,str1) => {
+  let id = setWatermark(str,str1)
+  setInterval(() => {
+    if (document.getElementById(id) === null) {
+      id = setWatermark(str,str1)
+    }
+  }, 500)
+  window.onresize = () => {
+    setWatermark(str,str1)
+  }
+}
+
+export default watermark

src/components/ebiz/customer/CustomerPicker.vue

@@ -102,8 +102,8 @@ export default {
   },
   methods: {
     onChange(value) {
-      let regExp = /\s+/
-      value = value.replace(regExp, '')
+      // let regExp = /\s+/
+      // value = value.replace(regExp, '')
       this.name = value
       this.$emit('input', value)
     },

src/components/ebiz/occipation/data/occupation.js

@@ -568,6 +568,18 @@ let occupationList = [
             lifeGrade: '2',
             healthGrade: '1'
           },
+          {
+            code: '2022312',
+            name: '园林绿化工程技术人员（一般道路）',
+            lifeGrade: '4',
+            healthGrade: '4'
+          },
+          {
+            code: '2022313',
+            name: '园林绿化工程技术人员（高速公路）',
+            lifeGrade: '5',
+            healthGrade: '5'
+          },
           { code: '2022401', name: '水资源勘测工程技术人员', lifeGrade: '3', healthGrade: '1' },
           {
             code: '2022402',
@@ -2818,6 +2830,18 @@ let occupationList = [
             lifeGrade: '2',
             healthGrade: '1'
           },
+          {
+            code: '4070202',
+            name: '保安员',
+            lifeGrade: '3',
+            healthGrade: '3'
+          },
+          {
+            code: '4070203',
+            name: '水电维修人员',
+            lifeGrade: '3',
+            healthGrade: '3'
+          },
           { code: '4070301', name: '工业及饮用水净化处理人员', lifeGrade: '2', healthGrade: '1' },
           {
             code: '4070302',
@@ -2875,6 +2899,7 @@ let occupationList = [
             healthGrade: '2'
           },
           { code: '4070317', name: '液化气送货员', lifeGrade: '4', healthGrade: '2' },
+          { code: '4070318', name: '煤气管线装修（高空作业）', lifeGrade: '5', healthGrade: '5' },
           {
             code: '4070401',
             name: '美容师',
@@ -2987,6 +3012,8 @@ let occupationList = [
             healthGrade: '1'
           },
           { code: '4071305', name: '高楼外部清洁工、烟囱清洁工', lifeGrade: '5', healthGrade: '2' },
+          { code: '4071306', name: '垃圾清运工（城市道路，不含城市快速路）', lifeGrade: '4', healthGrade: '4' },
+          { code: '4071307', name: '垃圾清运工（高速公路、国道、省道、城市快速路等）', lifeGrade: '5', healthGrade: '5' },
           {
             code: '4071401',
             name: '殡仪服务员',
@@ -3127,6 +3154,8 @@ let occupationList = [
             healthGrade: '1'
           },
           { code: '4071534', name: '电商店主（网店管理）', lifeGrade: '3', healthGrade: '1' },
+          { code: '4071535', name: '其他销售人员（非危险品）', lifeGrade: '2', healthGrade: '2' },
+          { code: '4071536', name: '其他销售人员（危险品）', lifeGrade: '4', healthGrade: '4' },
           {
             code: '4071601',
             name: '负责人',
@@ -3147,7 +3176,9 @@ let occupationList = [
             lifeGrade: '2',
             healthGrade: '1'
           },
-          { code: '4071702', name: '售货商', lifeGrade: '3', healthGrade: '1' }
+          { code: '4071702', name: '售货商', lifeGrade: '3', healthGrade: '1' },
+          { code: '4071801', name: '中央空调安装人员（5米以下高空作业）', lifeGrade: '4', healthGrade: '4' },
+          { code: '4071802', name: '一般空调安装人员（5米以上高空作业）', lifeGrade: '6', healthGrade: '6' }
         ]
       },
       {
@@ -3252,7 +3283,10 @@ let occupationList = [
             lifeGrade: '1',
             healthGrade: '1'
           },
-          { code: '4990029', name: '快递投送人员', lifeGrade: '4', healthGrade: '1' }
+          { code: '4990029', name: '快递投送人员', lifeGrade: '4', healthGrade: '1' },
+          { code: '4990030', name: '外卖配送员', lifeGrade: '5', healthGrade: '5' },
+          { code: '4990031', name: '一般货物搬运人员', lifeGrade: '4', healthGrade: '4' },
+          { code: '4990032', name: '特殊货物搬运人员（重型、大型、危险品等货物搬运）', lifeGrade: '6', healthGrade: '6' },
         ]
       }
     ]
@@ -7216,6 +7250,24 @@ let occupationList = [
             lifeGrade: '4',
             healthGrade: '1'
           },
+          {
+            code: '6231008',
+            name: '电梯、升降机修理及维护工人(高空作业)',
+            lifeGrade: '7',
+            healthGrade: '7'
+          },
+          {
+            code: '6231009',
+            name: '弱电工程安装人员',
+            lifeGrade: '3',
+            healthGrade: '3'
+          },
+          {
+            code: '6231010',
+            name: '弱电工程安装人员（五米以上高空作业）',
+            lifeGrade: '5',
+            healthGrade: '5'
+          },
           { code: '6239901', name: '中小型施工机械操作工', lifeGrade: '4', healthGrade: '1' },
           {
             code: '6239902',
@@ -7264,7 +7316,19 @@ let occupationList = [
             name: '工地推车工',
             lifeGrade: '4',
             healthGrade: '1'
-          }
+          },
+          {
+            code: '6239915',
+            name: '钢结构安装工',
+            lifeGrade: '5',
+            healthGrade: '5'
+          },
+          {
+            code: '6239916',
+            name: '工地杂工',
+            lifeGrade: '4',
+            healthGrade: '4'
+          },
         ]
       },
       {
@@ -7475,6 +7539,7 @@ let occupationList = [
             healthGrade: '1'
           },
           { code: '6240505', name: '索道运输机械操作工', lifeGrade: '3', healthGrade: '1' },
+          { code: '6240506', name: '信号工', lifeGrade: '4', healthGrade: '4' },
           {
             code: '6249901',
             name: '电梯、升降机操作员(不含矿场使用者)',