Commit Graph

6420 Commits

Author SHA1 Message Date
mengxiaolong
17264249f8 Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev
# Conflicts:
#	src/views/ebiz/proposal/ChooseInsuredPerson.vue
#	src/views/ebiz/proposal/InsuredPerson.vue
2020-10-29 16:59:24 +08:00
mengxiaolong
7043904b6c JSON拼写问题修改 2020-10-29 16:54:46 +08:00
mengxiaolong
5736a446ba Merge branch 'feature/50号文展业改动' into dev 2020-10-29 16:20:03 +08:00
mengxiaolong
038a762954 广西放置首位 2020-10-29 16:19:46 +08:00
mengxiaolong
679119dcd2 Merge branch 'hotfix/AES加密报错' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-10-29 15:10:32 +08:00
mengxiaolong
fda720768c JSON对象拼写错误bug修改 2020-10-29 15:08:55 +08:00
mengxiaolong
11cc70acd5 Merge branch 'feature/建议书回退功能' into dev
# Conflicts:
#	src/views/ebiz/proposal/InsuredPerson.vue
2020-10-29 14:57:47 +08:00
mengxiaolong
121c89a246 修改saleInsuredPersonInfo加密报错 2020-10-29 14:56:47 +08:00
mengxiaolong
fce18c3e03 Merge branch 'feature/建议书回退功能' into dev
# Conflicts:
#	src/views/ebiz/common/MainRiskList.vue
2020-10-29 14:32:31 +08:00
mengxiaolong
8c4981b38e 对比dev代码 2020-10-29 14:30:47 +08:00
mengxiaolong
704995783e Merge branch 'feature/建议书回退功能' into dev
# Conflicts:
#	src/views/ebiz/proposal/InsuredPerson.vue
2020-10-29 14:21:46 +08:00
mengxiaolong
c35ff7e7e8 恢复被冲突掉的代码 2020-10-29 14:21:00 +08:00
mengxiaolong
eee5b0effd Merge branch 'feature/建议书回退功能' into dev 2020-10-29 14:19:00 +08:00
mengxiaolong
fdaa618423 对比dev代码 2020-10-29 14:18:37 +08:00
mengxiaolong
fc0fb40fbe Merge branch 'feature/入司优化' into dev
# Conflicts:
#	src/views/ebiz/agentEenter/approve/RecordList.vue
2020-10-29 14:03:10 +08:00
mengxiaolong
92a9d5cadf 执业证添加成功提示 2020-10-29 14:02:03 +08:00
mengxiaolong
108fb54045 Merge branch 'feature/建议书回退功能' into dev
# Conflicts:
#	src/components/ebiz/proposal/BreadcrumbNavigator.vue
#	src/views/ebiz/proposal/ChooseInsuredPerson.vue
2020-10-29 13:59:42 +08:00
mengxiaolong
f016ef0eea 建议书回退优化 2020-10-29 13:58:15 +08:00
mengxiaolong
4aa6b804ba Merge branch 'feature/建议书回退功能' into dev
# Conflicts:
#	src/views/ebiz/proposal/ChooseInsuredPerson.vue
2020-10-29 13:27:08 +08:00
mengxiaolong
a2b78d6866 对比dev修改代码 2020-10-29 13:21:40 +08:00
mengxiaolong
559211fe6e Merge branch 'feature/入司优化' into dev 2020-10-29 11:41:40 +08:00
mengxiaolong
6d77abd189 PDF回显 2020-10-29 11:41:27 +08:00
mengxiaolong
72a419f579 Merge branch 'feature/入司优化' into dev 2020-10-29 11:30:56 +08:00
mengxiaolong
f8b3a974f5 执业证添加成功提示 2020-10-29 11:30:43 +08:00
mengxiaolong
034fef1d25 Merge branch 'feature/入司优化' into dev 2020-10-29 11:14:06 +08:00
mengxiaolong
71de0a1de7 历史审批节点信息显示 2020-10-29 11:11:51 +08:00
mengxiaolong
7824390053 Merge branch 'feature/入司优化' into dev
# Conflicts:
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
2020-10-29 10:56:41 +08:00
mengxiaolong
054ce508e5 入司代码优化 2020-10-29 10:47:06 +08:00
yang.huaxiang
d15a61b9b9 Merge remote-tracking branch 'origin/dev' into dev 2020-10-29 10:35:02 +08:00
yang.huaxiang
8c5737e8f3 Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev 2020-10-29 10:34:08 +08:00
yang.huaxiang
406e21c4d4 隐私政策非登录处理 --提交人:阳华祥 2020-10-29 10:33:44 +08:00
mengxiaolong
b41edd8e2d Merge branch 'feature/入司优化' into dev 2020-10-28 18:55:44 +08:00
mengxiaolong
f72879644d 执业证值转换 2020-10-28 18:55:29 +08:00
mengxiaolong
a5585c2947 Merge branch 'feature/入司优化' into dev 2020-10-28 18:50:40 +08:00
mengxiaolong
583cdd8bf9 资格证维护按钮 2020-10-28 18:50:24 +08:00
mengxiaolong
c89f5743a6 Merge branch 'feature/入司优化' into dev 2020-10-28 18:41:13 +08:00
mengxiaolong
a060f3d682 执业证字段值修改 2020-10-28 18:40:59 +08:00
mengxiaolong
292798449f Merge branch 'feature/入司优化' into dev 2020-10-28 18:31:44 +08:00
mengxiaolong
be049804da 转换appntNode 2020-10-28 18:31:24 +08:00
mengxiaolong
ce681cc64f Merge branch 'feature/入司优化' into dev 2020-10-28 18:29:11 +08:00
mengxiaolong
e70adb5155 appntNode修改 2020-10-28 18:28:49 +08:00
yang.huaxiang
f65a4990e6 Merge branch 'feature/GFRS-1989【待确定】客户核验流程优化' into dev
# Conflicts:
#	src/assets/js/utils/needCacheKey.js
2020-10-28 17:54:39 +08:00
yang.huaxiang
9b5bab8b4a GFRS-1989【待确定】客户核验流程优化: rid 状态查询 --提交人:阳华祥 2020-10-28 17:52:44 +08:00
yang.huaxiang
0d58614183 Merge branch 'hotfix/问题件影像类型错误处理' into dev 2020-10-28 16:56:51 +08:00
yang.huaxiang
35e6603624 理赔影像问题件业务类型处理处理 --提交人:阳华祥 2020-10-28 16:53:56 +08:00
mengxiaolong
c849fa98c7 Merge branch 'feature/50号文展业改动' into dev 2020-10-28 16:09:55 +08:00
mengxiaolong
d2eea0ebbd 回显省市区undefined处理 2020-10-28 16:09:40 +08:00
mengxiaolong
c4953199ee Merge branch 'feature/50号文展业改动' into dev 2020-10-28 15:38:06 +08:00
mengxiaolong
c6b2b5afcf 受益人字段修改 2020-10-28 15:37:50 +08:00
mengxiaolong
db720d7afa Merge branch 'feature/50号文展业改动' into dev 2020-10-28 14:56:43 +08:00