FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,246 Commits 3 Branches 0 Tags
d68d6913a4f0230a74ff54b7d8d2e55d3439c53f
Commit Graph
2246 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Superman_Main d68d6913a4 feat:FOTON release 2021-11-28 09:29:40 +08:00
Superman_Main c3d3c99949 Merge branch 'develop' into FOTON 2021-11-27 22:58:06 +08:00
Superman_Main 463d35ad14 Merge remote-tracking branch 'origin/develop' into develop 2021-11-27 22:57:52 +08:00
yanyizhou 131fb1382e 署名人多选完善 2021-11-27 22:53:15 +08:00
Superman_Main 117d7c5fa8 Merge branch 'develop' into FOTON 2021-11-27 22:51:58 +08:00
Superman_Main fa3ef91ae4 feat:FOTON release 2021-11-27 22:51:45 +08:00
Superman_Main 7ca91b9b9a Merge branch 'develop' into FOTON 2021-11-27 22:35:06 +08:00
Superman_Main 50e0eacd22 feat:FOTON release 2021-11-27 22:28:15 +08:00
yanyizhou 367a60295b Merge remote-tracking branch 'origin/develop' into develop 2021-11-27 22:20:40 +08:00
yanyizhou 8dcadd415e 流程多选日期和署名人多选 2021-11-27 22:20:33 +08:00
Superman_Main 801d9c5423 feat:FOTON release 2021-11-27 21:20:01 +08:00
Superman_Main 22dbc35ecf Merge branch 'develop' into FOTON 
# Conflicts:
#	public/static/onlyOffice/onlinePreview.html
 2021-11-27 21:18:34 +08:00
Superman_Main 32e3544b06 feat:FOTON release 2021-11-27 21:17:33 +08:00
Superman_Main 6ac8a631e5 feat:FOTON release 2021-11-27 21:15:58 +08:00
Superman_Main 4920fa45e0 feat:FOTON release 2021-11-27 20:38:02 +08:00
Superman_Main d463767fcc Merge branch 'develop' into FOTON 2021-11-27 20:36:00 +08:00
Superman_Main 0f8ceb62de Merge remote-tracking branch 'origin/develop' into develop 2021-11-27 20:35:25 +08:00
Superman_Main 7aeefe5ccd Merge remote-tracking branch 'origin/develop' into develop 2021-11-27 20:34:15 +08:00
Superman_Main fa4f1a37ba feat: There is no way the, online preview 2021-11-27 20:33:55 +08:00
宋伟佳 9ed1437bf5 commit 2021-11-27 19:03:10 +08:00
yanyizhou 1fd3a6e558 现在所有的日期都能选多个时间，想选几个选几个，满意了吧（象鸣） 2021-11-27 13:50:52 +08:00
yanyizhou 8413c73d4e 我司署名人改成公司下所有员工，支持多选 2021-11-27 11:50:55 +08:00
yanyizhou 806a78bd61 Merge remote-tracking branch 'origin/develop' into develop 2021-11-27 11:34:22 +08:00
yanyizhou a9663b2a3b 代码格式化，没有做任何改动，现在的代码看着太乱了 2021-11-27 11:34:17 +08:00
zhaokaiyao@91isoft.com d0a90e642f Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 20:11:18 +08:00
zhaokaiyao@91isoft.com da94221d15 模块单元结构 2021-11-26 20:10:56 +08:00
yanyizhou 87814496cc 国内海外企标的操作只有收藏，删除和编辑单拎出来 2021-11-26 18:00:54 +08:00
yanyizhou d5d59cac1f Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 16:45:57 +08:00
yanyizhou 0f6c3229a5 三大库详情的收藏按钮 2021-11-26 16:45:51 +08:00
宋伟佳 57d5237f98 commit 2021-11-26 16:33:30 +08:00
zhaokaiyao@91isoft.com 83685a3fd0 模块单元结构 2021-11-26 16:32:38 +08:00
宋伟佳 7c1f913851 合规评估 2021-11-26 16:29:15 +08:00
宋伟佳 3236a0b8fc commit 2021-11-26 15:58:21 +08:00
宋伟佳 1e69ab4faf 标准合规评估带入标准 2021-11-26 15:15:57 +08:00
zhutianqi 9c05c6fd5d Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 14:54:12 +08:00
zhutianqi c3414f0687 commit 2021-11-26 14:54:06 +08:00
zhaokaiyao@91isoft.com 2176ef673a Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 14:53:46 +08:00
zhaokaiyao@91isoft.com 5463166666 流程vpps查找添加 :type="'truck'" 2021-11-26 14:53:39 +08:00
shenyanpei 15c3a460f0 工作组数据统计修改 2021-11-26 14:47:16 +08:00
shenyanpei 997e25565f 工作组数据统计修改 2021-11-26 14:29:18 +08:00
Superman_Main 25636b5129 Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 10:48:31 +08:00
Superman_Main 2b87adf1ee feat:FOTON release 2021-11-26 10:48:18 +08:00
yanyizhou 784261d742 Merge remote-tracking branch 'origin/develop' into develop 2021-11-26 10:40:12 +08:00
yanyizhou 3280b73396 预警底下的留白去掉 2021-11-26 10:40:06 +08:00
shenyanpei 5ddab141a3 修改新增编辑样式 2021-11-26 10:23:04 +08:00
Superman_Main 3557110552 feat:FOTON release 2021-11-26 09:12:56 +08:00
Superman_Main 048b94056d Merge branch 'develop' into FOTON 
# Conflicts:
#	package-lock.json
#	src/components/navMenu/index.vue
 2021-11-26 09:02:37 +08:00
zhaokaiyao@91isoft.com b87502f4b6 Merge remote-tracking branch 'origin/develop' into develop 2021-11-25 18:05:57 +08:00
zhaokaiyao@91isoft.com 5c9154ee1c vpps查找select组件 2021-11-25 18:05:51 +08:00
zhutianqi 515a814454 Merge remote-tracking branch 'origin/develop' into develop 2021-11-25 17:55:54 +08:00