hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-22 09:26:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,316 Commits 232 Branches 17 Tags
a43e98b935cb51a12a1ced33d11f39981f97435c
Commit Graph

6316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tian.guangyuan
daa4e7713f Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' into dev 2020-03-18 13:48:33 +08:00
tian.guangyuan
6b15be94f7 [fix] 修复 热力资源管理-人才库-人才库列表-新增按钮 样式 2020-03-18 13:48:13 +08:00
yuweiqi
7571919748 Merge branch 'hotfix/bug_自助入司基本信息填写-从业年限必填校验' into dev 2020-03-18 12:56:08 +08:00
yuweiqi
bc26648a8d [FIX]自助入司-入司基本信息填写-从业年限必填校验 2020-03-18 12:55:44 +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
阳华祥
2771a85e8b Merge branch 'feature/GFRS-718【0319】电投添加短信验证码验证身份' into dev 2020-03-18 10:56:46 +08:00
阳华祥
61062c2dc6 GFRS-718【0319】电投添加短信验证码验证身份 飞签次数处理、短信发送提示语修改 --提交人：阳华祥 2020-03-18 10:55:56 +08:00
阳华祥
f87c748717 Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险（2020版）_1' into dev 2020-03-18 10:24:46 +08:00
阳华祥
be02ad5f85 GFRS-729【0326】国富人寿国富民安重大疾病保险（2020版）_1 GFRS-758“保单详情”分享至微信好友后，链接标题未赋值 --提交人：阳华祥 2020-03-18 10:23:06 +08:00
史旭文
654444fac7 添加埋点 2020-03-17 18:32:35 +08:00
阳华祥
edb954d2f4 Merge branch 'feature/GFRS-456【0312】首页改版' into release/0317-首页改版 2020-03-17 17:44:01 +08:00
tian.guangyuan
891800c31b Merge branch 'feature/GFRS-716【0402】人力发展-增员工具' into dev 2020-03-17 17:43:08 +08:00
tian.guangyuan
9e12253fe7 Merge branch 'feature/GFRS-716【0402】人力发展-增员工具' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-716【0402】人力发展-增员工具 2020-03-17 17:42:33 +08:00
史旭文
ed19fb794f 修改传参格式 2020-03-17 17:36:54 +08:00
tian.guangyuan
c59458a58d Merge branch 'feature/GFRS-716【0402】人力发展-增员工具' into dev 2020-03-17 17:27:47 +08:00
tian.guangyuan
5c629d6a38 配置 增员工具，产品信息的路由跳转 2020-03-17 17:27:36 +08:00
tian.guangyuan
0e016f52f9 Merge branch 'feature/GFRS-716【0402】人力发展-增员工具' into dev 2020-03-17 17:12:46 +08:00
tian.guangyuan
438cb5b33d Merge branch 'feature/GFRS-716【0402】人力发展-增员工具' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-716【0402】人力发展-增员工具 
# Conflicts:
#	src/views/ebiz/manpower/IncreaseStaffTools.vue
 2020-03-17 16:49:07 +08:00
tian.guangyuan
d7884975bc [fix] 统一 人才库 和 活动日志 样式 2020-03-17 16:29:05 +08:00
史旭文
9757c6323b 添加增员工具功能 2020-03-17 16:16:05 +08:00
tian.guangyuan
2a791038c5 Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' into dev 2020-03-17 15:17:08 +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
648381414a 【FIX】 复人力发展 - 培训上岗 - 增员分享 微信分享 2020-03-17 14:53:38 +08:00
tian.guangyuan
104682f4cb Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' into dev 2020-03-17 14:49:56 +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
c847eb29bd Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-03-17 14:03:17 +08:00
阳华祥
c14a0c4716 Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险（2020版）_1' into dev 2020-03-17 13:58:34 +08:00
阳华祥
1c591c8e41 GFRS-729【0326】国富人寿国富民安重大疾病保险（2020版）_1 建议书分享问题处理 --提交人：阳华祥 2020-03-17 13:58:07 +08:00
tian.guangyuan
714e199d1a Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-03-17 13:57:16 +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
d36eccd0de 【fix】 添加限制， 在修改人才库记录是，不允许修改‘是否同业’属性 2020-03-17 13:47:42 +08:00
tian.guangyuan
cd930b419a Merge branch 'feature/GFRS-715【0402】人力发展-个人中心' into feature/GFRS-717【0402】人力发展-活动量管理 2020-03-17 13:45:01 +08:00
tian.guangyuan
12e74957d7 [fix] 完善 人力发展-培训上岗-增员分享 的微信分享配置参数 2020-03-17 13:44:44 +08:00
阳华祥
c2d5bbd774 Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险（2020版）_1' into dev 2020-03-17 13:24:06 +08:00
阳华祥
9c5eaee837 GFRS-729【0326】国富人寿国富民安重大疾病保险（2020版）_1 建议书分享问题处理 --提交人：阳华祥 2020-03-17 13:22:49 +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
阳华祥
a03f7c3060 Merge branch 'feature/GFRS-718【0319】电投添加短信验证码验证身份' into dev 2020-03-17 10:58:14 +08:00
阳华祥
dcdaddfd11 GFRS-718【0319】电投添加短信验证码验证身份 识别失败次数处理、页面黑框显示 --提交人：阳华祥 2020-03-17 10:57:29 +08:00
史旭文
912a3aa30a 删除多余方法 2020-03-17 10:18:41 +08:00
yuweiqi
d85d847fd7 Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-17 10:17:55 +08:00
yuweiqi
745ee88845 [FIX]电投列表返回首页跳转bug--拦截原生返回事件 2020-03-17 10:17:16 +08:00
yuweiqi
ea5b07dbba Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-17 09:50:43 +08:00