Commit Graph

68 Commits

Author SHA1 Message Date
yuweiqi
19c240d882 [FIX]【保全】分支整理 2020-06-03 09:29:14 +08:00
yuweiqi
cd3db7b6bc Merge branch 'feature/GFRS-218【待确认】保全-受益人变更' into feature/【保全】
# Conflicts:
#	src/api/ebiz/preserve/preserve.js
#	src/config/preserve.js
#	src/router/ebiz/index.js
#	src/views/ebiz/preserve/AutopayAuthorization.vue
#	src/views/ebiz/preserve/HandleResult.vue
#	src/views/ebiz/preserve/ImageUpload.vue
#	src/views/ebiz/preserve/RenewalConfirmation.vue
#	src/views/ebiz/preserve/RenewalInfo.vue
2020-05-19 20:16:31 +08:00
yuweiqi
6d3cde6644 Merge branch 'feature/GFRS-217【待确定】保全-续期账号变更' into feature/【保全】
# Conflicts:
#	src/assets/js/utils/request.js
#	src/config/preserve.js
#	src/config/urlMap.js
2020-05-19 19:25:33 +08:00
yuweiqi
b6aa90298a Merge branch 'feature/GFRS-216【待确定】保全-联系方式变更' into feature/【保全】
# Conflicts:
#	src/config/urlMap.js
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
2020-05-19 19:17:40 +08:00
yuweiqi
2a4a332aae [NEW]【保全-联系方式变更】新增保全详情查询接口 2020-05-06 13:27:34 +08:00
tian.guangyuan
d0451f5699 Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into release/0430 2020-04-30 15:47:41 +08:00
tian.guangyuan
caacb5672c 【fix】 卡单模块增加换卡支付 2020-04-29 14:13:24 +08:00
yuweiqi
48b5977edc Merge branch 'feature/GFRS-247【待确定】卡单产品投保' 2020-04-29 09:22:56 +08:00
yuweiqi
3ba1b6e12a [NEW]【卡单】增加我的订单,接口 2020-04-24 09:59:01 +08:00
tian.guangyuan
ab4959b0de Merge branch 'dev_cardList' into feature/GFRS-247【待确定】卡单产品投保
# Conflicts:
#	src/assets/js/utils/request.js
#	src/config/urlMap.js
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
#	src/views/ebiz/sale/InsuredInfo.vue
2020-04-20 14:29:27 +08:00
tian.guangyuan
d74a9601f0 职业控件优化:
1. 增加常用职业栏
2. 将常用职业栏的数据从后台获取
3. 优化搜索关键词显示词条,显示三级职业
4. 在搜索职业时,将搜索内容标红
2020-04-16 15:43:43 +08:00
yuweiqi
87614584cc [NEW]【保全-续期】增加客户搜索接口 2020-04-15 22:03:34 +08:00
tian.guangyuan
36cf165351 [new] 新增保全-受益人变更功能,页面逻辑基本完成,部分页面因接口问题暂时无法继续开发 2020-04-15 13:06:33 +08:00
tian.guangyuan
3c6972e0ed 【fix】 保全-联系方式变更 , 自测并修复bug 2020-04-14 10:04:48 +08:00
tian.guangyuan
f0abc8b160 Merge branch 'feature/GFRS-217【待确定】保全-续期账号变更' into feature/GFRS-216【待确定】保全-联系方式变更
# Conflicts:
#	src/api/ebiz/preserve/preserve.js
#	src/views/ebiz/preserve/Search.vue
2020-04-10 17:48:03 +08:00
yuweiqi
625b35f9b2 [NEW]保全-公用页面-搜索客户页面 2020-04-09 19:24:07 +08:00
tian.guangyuan
15e0292609 [fix] 完成 联系方式变更协议 页面的数据请求 2020-04-09 18:11:00 +08:00
tian.guangyuan
affcb65f36 [fix] 保全:联系方式变更, E-a-04联系方式变更 页逻辑完成, 正在进行mock开发 2020-04-08 18:07:18 +08:00
yuweiqi
51a804aae3 [NEW]保全-新建保全模块文件夹、页面,引入路由 2020-04-07 15:44:50 +08:00
tian.guangyuan
42ddddadcf Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into release/0407
# Conflicts:
#	src/views/app/Home.vue
2020-04-07 11:10:41 +08:00
tian.guangyuan
1646d0faad Merge branch 'feature/GFRS-715【0402】人力发展-个人中心' into release/0407
# Conflicts:
#	src/assets/js/utils/validator.js
#	src/router/ebiz/index.js
2020-04-07 11:08:42 +08:00
tian.guangyuan
b3393fd375 Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-818【0410】人力发展-DISC性格分析
# Conflicts:
#	src/api/ebiz/manpower/manpower.js
#	src/views/ebiz/manpower/discAnalysis/List.vue
#	src/views/ebiz/manpower/discAnalysis/Share.vue
2020-04-01 17:37:37 +08:00
tian.guangyuan
e2c2933979 [fix] 完成 DISC 问卷 部分 的问卷页和问卷结果页 2020-04-01 17:33:18 +08:00
yuweiqi
42d17251ce [NEW]DISC-列表页、封面页 2020-04-01 17:31:50 +08:00
阳华祥
01e68195ec Merge branch 'nbs' into release/0401
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/config/index.js
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
2020-04-01 15:25:33 +08:00
tian.guangyuan
ec0af28171 人发模块 代码格式化 2020-04-01 10:26:09 +08:00
tian.guangyuan
04e4251b86 【fix】 临时保存,已完成 DISC 部分的结果页面结构,未对接 数据 2020-03-31 18:11:27 +08:00
史旭文
654444fac7 添加埋点 2020-03-17 18:32:35 +08:00
tian.guangyuan
12e74957d7 [fix] 完善 人力发展-培训上岗-增员分享 的微信分享配置参数 2020-03-17 13:44:44 +08:00
tian.guangyuan
5b4e332392 【new】 完成人力发展-个人中心模块接口对接 2020-03-17 13:20:38 +08:00
ding.zhou
d760b13c1c 需求:GFRS-718 电投人脸识别不成功处理
变更:新增处理
变更人:丁洲
2020-03-16 23:19:31 +08:00
tian.guangyuan
da9c2a2a2e Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-717【0402】人力发展-活动量管理
# Conflicts:
#	src/components/ebiz/manpower/TalentPoolItem.vue
#	src/views/ebiz/manpower/ActiveManagement.vue
2020-03-16 18:03:25 +08:00
tian.guangyuan
148e4381d9 [new] 完成 人发系统 - 人才库 - 新增、修改、列表 2020-03-16 17:31:10 +08:00
史旭文
dbcfdcc485 修改完善增员日志功能 2020-03-16 17:29:27 +08:00
史旭文
8705245e40 Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-717【0402】人力发展-活动量管理 2020-03-13 18:56:55 +08:00
史旭文
4204110102 联调统计日志接口 2020-03-13 18:56:44 +08:00
tian.guangyuan
e893a37941 Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-717【0402】人力发展-活动量管理
# Conflicts:
#	src/router/ebiz/manpower.js
2020-03-13 18:30:35 +08:00
tian.guangyuan
36c0f111bc 【new】
开发完成人才库列表
正在开发人才库-新增人才
2020-03-13 18:26:48 +08:00
史旭文
a9f74d2ad8 添加活动量管理页面也功能 2020-03-13 18:16:29 +08:00
tian.guangyuan
ffdf3d5e3c [NEW] 新增文件 : api配置文件、 mock配置文件、表单验证文件 2020-03-12 11:09:57 +08:00
阳华祥
59f2f47f39 GFRS-653【待确定】三月三活动 产品类型二维码修改 --提交人:阳华祥 2020-03-02 16:14:58 +08:00
yuweiqi
fc3a455bf5 [NEW]nbs-客户清单下载功能 2020-02-27 11:58:25 +08:00
阳华祥
34bd68d829 Merge remote-tracking branch 'origin/feature/GFRS-615【待确定】问卷' into release/GFRS-615【待确定】问卷
# Conflicts:
#	src/assets/js/utils/request.js
#	src/views/app/Home.vue
2020-02-26 18:48:56 +08:00
ding.zhou
03721e99fb Merge branch 'feature/GFRS-221_入司审批' into release/20200225
# Conflicts:
#	src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
#	src/views/ebiz/agentEenter/AgentEnterGuarantor.vue
#	src/views/ebiz/agentEenter/EntryProcess.vue
#	src/views/ebiz/agentEenter/SeeCause.vue
2020-02-25 18:49:44 +08:00
阳华祥
92b102b8ba GFRS-615 问卷调查VUE初版代码提交 --提交人:阳华祥 2020-02-23 20:03:01 +08:00
yuweiqi
fb191d175a Merge branch 'feature/GFRS-502_【0206】国富人寿富娃娃两全保险(万能型)' into release/【0210】
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-02-10 17:26:11 +08:00
yuweiqi
95c66caded [NEW]增加入司审批相关请求 2020-02-10 17:12:34 +08:00
lihaoda
042d499ade pdf 2020-02-07 17:38:30 +08:00
yuweiqi
9d6f80f4f0 [FIX]增加调取 获取海报分享图片的方法 2020-01-23 11:48:24 +08:00
lihaoda
f322750262 work 2020-01-22 10:51:06 +08:00