Commit Graph

117 Commits

Author SHA1 Message Date
tian.guangyuan
f3665c21fa Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' into dev 2020-03-23 17:07:30 +08:00
tian.guangyuan
a7bc60978f 【fix】 DC-04-国富人寿 / 缺陷 GFRS-798 【人力发展-活动量管理】目前在人才库/活动日志列表页增加一条数据后,返回活动量管理页面未显示该条数据,需要重新进入该页面后才显示;建议在人才库/活动日志列表页增加一条数据后,返回活动量管理页面刷新一下该页面 2020-03-23 17:07:19 +08:00
yuweiqi
bd0cafe08d Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-20 19:54:16 +08:00
yuweiqi
c149a38e85 [FIX]电投优化-修复导航栏跳转问题 2020-03-20 19:53:37 +08:00
yuweiqi
9d1d2553d5 Merge branch 'feature/GFRS-597【电投页面优化】' into dev
# Conflicts:
#	src/views/ebiz/common/SelectedProduct.vue
2020-03-20 19:42:15 +08:00
yuweiqi
ad4a617f60 [IMP]电投优化-到达签名页后点击导航栏前面的页面弹出提示语 2020-03-20 19:09:59 +08:00
yuweiqi
14ea69d2b3 [FIX]电投优化-流程到达签名页后不允许跳到前面的页面-IndexBar.vue 2020-03-20 17:35:37 +08:00
yuweiqi
5fa6c47e57 Merge branch 'feature/GFRS-597【电投页面优化】' into dev
# Conflicts:
#	src/views/ebiz/sale/NotifyingMessage.vue
2020-03-20 17:16:00 +08:00
yuweiqi
682515de17 [FIX]电投优化-离开附件上传页跳到前面页面时,增加弹窗提醒 2020-03-20 16:58:56 +08:00
yuweiqi
13ba6e32da Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-20 12:13:37 +08:00
yuweiqi
fc53a6df3a [IMP]电投优化-导航栏样式调整 2020-03-19 14:50:55 +08:00
yuweiqi
cc687f78e8 Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-18 19:45:41 +08:00
yuweiqi
936f056a6f [FIX]电投优化-导航栏样式调整、电投告知页面样式调整 2020-03-18 19:44:48 +08:00
yuweiqi
4a993932ad Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-18 17:23:44 +08:00
tian.guangyuan
bcb45bf51f [fix] 修复部分样式问题 , 调整活动日志新增、修改、详情下的呈现 2020-03-18 14:28:27 +08:00
tian.guangyuan
2ad402dcfb [fix] 修复部分样式问题 , 调整活动日志新增、修改、详情下的呈现 2020-03-18 14:26:32 +08:00
tian.guangyuan
fafca9982a Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' into dev 2020-03-18 11:07:21 +08:00
tian.guangyuan
62e0fb901d [fix] 修复 人力资源发展样式 2020-03-18 11:06:47 +08:00
tian.guangyuan
c8fdb4ac78 【FIX】 复人力发展 - 培训上岗 - 增员分享 微信分享 2020-03-17 15:16:57 +08:00
tian.guangyuan
dc0df657bc 【FIX】 复人力发展 - 培训上岗 - 增员分享 微信分享 2020-03-17 15:13:29 +08:00
tian.guangyuan
ae3858a519 【FIX】 复人力发展 - 培训上岗 - 增员分享 微信分享 2020-03-17 14:49:38 +08:00
tian.guangyuan
64435f1903 【FIX】 复人力发展 - 培训上岗 - 增员分享 微信分享 2020-03-17 14:48:18 +08:00
tian.guangyuan
83f8f829f5 Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' into dev 2020-03-17 14:36:08 +08:00
tian.guangyuan
0f0120d4d9 【fix】 修复人力发展 - 培训上岗 - 增员分享 微信风向 2020-03-17 14:35:40 +08:00
tian.guangyuan
d7956f4c07 Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' into dev 2020-03-17 14:16:26 +08:00
tian.guangyuan
b716d01043 [fix] 修复跳转错误 2020-03-17 14:16:08 +08:00
tian.guangyuan
34c54b870c Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' into dev
# Conflicts:
#	src/assets/js/utils/validator.js
#	src/router/ebiz/index.js
2020-03-17 13:56:46 +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
yuweiqi
9b40d3ae4c [FIX]电投优化-受益人页面、添加受益人页面 2020-03-17 12:56:36 +08:00
ding.zhou
c70ecacb45 Merge branch 'feature/GFRS-718【0319】电投添加短信验证码验证身份' into dev
# Conflicts:
#	src/assets/js/business-common.js
#	src/views/ebiz/sale/SignatureConfirmation.vue
2020-03-16 23:24:03 +08:00
ding.zhou
d760b13c1c 需求:GFRS-718 电投人脸识别不成功处理
变更:新增处理
变更人:丁洲
2020-03-16 23:19:31 +08:00
tian.guangyuan
22927aed46 Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-717【0402】人力发展-活动量管理
# Conflicts:
#	src/views/ebiz/manpower/ActiveManagement.vue
2020-03-16 18:26:12 +08:00
史旭文
0e64db5065 修改增员功能可编辑相关功能 2020-03-16 18:04:42 +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
yuweiqi
85cc79f7bd Merge branch 'feature/GFRS-597【电投页面优化】' into dev
# Conflicts:
#	src/views/ebiz/common/SelectedProduct.vue
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
#	src/views/ebiz/sale/InsuredInfo.vue
#	src/views/ebiz/sale/InsuredPerson.vue
2020-03-13 21:15:41 +08:00
yuweiqi
55c92492ae [FIX]电投优化-从导航栏跳转的页面禁止右滑 2020-03-13 20:35:45 +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
yuweiqi
334e642b3c Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-13 15:29:05 +08:00
yuweiqi
39f68e502d [FIX]电投优化-手机端页面跳转问题修复 2020-03-13 15:28:21 +08:00
yuweiqi
3252784d66 Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-13 15:24:30 +08:00
yuweiqi
9b1b5a6542 [FIX]电投优化-打log调试 2020-03-13 15:23:50 +08:00
yuweiqi
bbb3804f5f Merge branch 'feature/GFRS-597【电投页面优化】' into dev
# Conflicts:
#	src/views/ebiz/common/SelectedProduct.vue
#	src/views/ebiz/sale/NotifyingMessage.vue
2020-03-13 14:22:32 +08:00
yuweiqi
e16fd9dbe8 [FIX]电投优化-页面跳转初始页面查询保单信息 2020-03-13 14:11:38 +08:00
阳华祥
376a12fcc6 Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1' into dev 2020-03-13 13:17:05 +08:00
阳华祥
d8b24dffb8 GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1 被保人修改为被保险人 --提交人:阳华祥 2020-03-13 10:09:48 +08:00