FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,240 Commits 3 Branches 0 Tags
2ff46a3e512c0c110c0d66181e89fdff38e2782e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王夏晖 8151b4dc93 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!243
 2021-12-22 19:44:04 +08:00
王夏晖 785c918e8f Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!242
 2021-12-22 14:11:34 +08:00
王夏晖 54bfe05e76 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!241
 2021-12-22 11:00:16 +08:00
wangxiahui@91isoft.com ad001cbf72 流程权限更改 2021-12-22 10:59:49 +08:00
王夏晖 728ccb17e8 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!240
 2021-12-21 21:55:42 +08:00
王夏晖 3cf647a714 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!239
 2021-12-21 20:08:31 +08:00
wangxiahui@91isoft.com b89c419c43 截止时间 2021-12-21 17:11:17 +08:00
王夏晖 82043e01d4 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!238
 2021-12-21 14:00:12 +08:00
王夏晖 12a36e7931 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!237
 2021-12-17 14:05:27 +08:00
wangxiahui@91isoft.com 1218e89e57 参会流程第二步修改流程节点名称 2021-12-17 11:26:05 +08:00
wangxiahui@91isoft.com fea97ddc0f 入会流程 2021-12-17 09:10:04 +08:00
wangxiahui@91isoft.com 161364a52b 入会选人和附件上传 2021-12-16 18:05:57 +08:00
wangxiahui@91isoft.com 99b6935f77 修改流程权限 2021-12-16 16:54:45 +08:00
wangxiahui@91isoft.com ac7a308f5e 外部审批意见下方把回执说明改成审批意见 2021-12-16 10:58:23 +08:00
王夏晖 466093cc1a Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!236
 2021-12-16 09:24:32 +08:00
王夏晖 418de65a9f Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!235
 2021-12-15 17:59:57 +08:00
王夏晖 b32715324d Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!234
 2021-12-15 16:32:27 +08:00
wangxiahui@91isoft.com 732a420470 征求意见流程，发起精确查询标准 2021-12-15 16:31:51 +08:00
王夏晖 3330111e74 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!233
 2021-12-15 16:17:22 +08:00
wangxiahui@91isoft.com efc1f349b5 属性配置-企标删除权限 2021-12-15 16:16:45 +08:00
王夏晖 534e09cd5e Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!232
 2021-12-15 15:21:11 +08:00
王夏晖 c5a33c6952 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!231
 2021-12-15 11:33:00 +08:00
王夏晖 b0a2ac57a6 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!229
 2021-12-12 14:36:38 +08:00
王夏晖 48d32e482f Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!228
 2021-12-12 11:08:57 +08:00
王夏晖 95bb971bea Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!227
 2021-12-09 19:35:28 +08:00
王夏晖 3700616bd2 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!226
 2021-12-09 13:32:28 +08:00
wangxiahui@91isoft.com 7be4ed5c2a Merge remote-tracking branch 'origin/develop' into develop 2021-12-08 10:19:39 +08:00
wangxiahui@91isoft.com 89179b71f7 Default Changelist 2021-12-08 10:15:47 +08:00
王夏晖 79066d81f4 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!220
 2021-12-07 20:14:55 +08:00
王夏晖 58e0d26c07 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!219
 2021-12-06 19:53:17 +08:00
王夏晖 582ce4d905 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!218
 2021-12-05 21:11:25 +08:00
wangxiahui@91isoft.com 6b1bde788b 参会流程第五步，审批意见改成回执说明 2021-12-05 14:50:57 +08:00
王夏晖 74a941f5f1 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!217
 2021-12-05 09:53:05 +08:00
wangxiahui@91isoft.com e221dce3e9 未符合项新增，责任工程师ui 2021-12-03 15:31:32 +08:00
王夏晖 82e31dd9af Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!216
 2021-12-02 21:53:38 +08:00
王夏晖 5f87021581 Merge branch 'FOTON' into 'develop' 
# Conflicts:
#   src/pages/processCenter/pages/newProcess/index.vue
 2021-12-02 21:53:23 +08:00
wangxiahui@91isoft.com 2183ab22da 未符合整改样式问题 2021-12-01 10:45:29 +08:00
王夏晖 d38a6770ad Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!213
 2021-11-30 19:06:17 +08:00
王夏晖 5f5ff0a3d8 Merge branch 'develop' into 'FOTON' 
Develop

See merge request LAWS/laws-system-front-FOTON!212
 2021-11-29 23:58:57 +08:00
wangxiahui@91isoft.com ee9c388759 首页样式 2021-11-14 14:43:17 +08:00
wangxiahui@91isoft.com d0b1a80147 标准法规工作组数据表格样式 2021-11-13 15:09:35 +08:00
王夏晖 6034249cf9 Merge branch 'test' into 'develop' 
# Conflicts:
#   src/sysConfig/index.js
 2021-10-27 09:31:47 +08:00
wangxiahui@91isoft.com 73cb52770e 首页log长度 2021-10-18 15:45:48 +08:00
王夏晖 84863120ab Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!183
 2021-10-15 10:54:04 +08:00
王夏晖 cd5a0c61a6 Merge branch 'develop' into 'test' 
项目清单注掉多余权限

See merge request LAWS/laws-system-front-FOTON!182
 2021-10-15 10:49:12 +08:00
wangxiahui@91isoft.com 5bf7aa515b 项目清单注掉多余权限 2021-10-15 10:29:05 +08:00
王夏晖 5213d0ed28 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!181
 2021-10-15 09:29:50 +08:00
王夏晖 6a3660f4b0 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!179
 2021-10-14 15:36:43 +08:00
王夏晖 5b43eb6037 Merge branch 'develop' into 'test' 
项目清单确认流程  注掉多余按钮

See merge request LAWS/laws-system-front-FOTON!178
 2021-10-14 13:42:59 +08:00
wangxiahui@91isoft.com 68e3980645 项目清单确认流程 注掉多余按钮 2021-10-14 10:33:03 +08:00
王夏晖 c0ee166043 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!177
 2021-10-14 09:07:18 +08:00
王夏晖 5ad327884a Update index.js 2021-10-14 09:07:16 +08:00
王夏晖 ca66921d3e Update index.js 2021-10-13 19:33:16 +08:00
王夏晖 b4248bb122 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!176
 2021-10-13 08:59:07 +08:00
王夏晖 ca733aec6c Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!175
 2021-10-12 09:03:50 +08:00
王夏晖 ed35859c8c Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!173
 2021-10-11 17:33:23 +08:00
王夏晖 67d17df055 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!172
 2021-10-11 09:02:24 +08:00
王夏晖 a76781acb5 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!171
 2021-10-09 14:59:12 +08:00
wangxiahui@91isoft.com a861d826f5 解读流程批量填写的bug 2021-10-09 14:53:49 +08:00
wangxiahui@91isoft.com 02daf7ee6d 所有流程的字体样式 2021-10-09 09:38:01 +08:00
王夏晖 5554e47675 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!170
 2021-10-08 10:27:32 +08:00
王夏晖 701a79af0c Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!169
 2021-10-08 09:02:50 +08:00
王夏晖 2a4a1acc46 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!168
 2021-09-30 09:02:07 +08:00
王夏晖 3e29e1c354 Merge branch 'develop' into 'test' 
commit

See merge request LAWS/laws-system-front-FOTON!167
 2021-09-28 15:29:51 +08:00
王夏晖 ace65ede29 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!166
 2021-09-28 10:33:51 +08:00
王夏晖 66077fe597 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!165
 2021-09-28 09:10:07 +08:00
王夏晖 2ff888466f Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!164
 2021-09-27 09:11:12 +08:00
王夏晖 0877a6bcc4 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!163
 2021-09-26 15:48:24 +08:00
wangxiahui@91isoft.com 08893b630a 流程内填写表单的宽度 2021-09-26 11:07:05 +08:00
wangxiahui@91isoft.com a688302db7 征求意见流程-表单宽度问题 2021-09-26 10:16:24 +08:00
王夏晖 6931ea5e89 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!162
 2021-09-26 09:03:28 +08:00
wangxiahui@91isoft.com 58f24945a1 国内标准法规表格缩放 2021-09-24 14:56:56 +08:00
wangxiahui@91isoft.com 6dce1e13bb 机构管理表格缩放 2021-09-24 14:42:13 +08:00
wangxiahui@91isoft.com ae678ca3ab 链接管理调整列宽 2021-09-24 09:51:53 +08:00
王夏晖 730098f884 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!161
 2021-09-24 09:19:51 +08:00
王夏晖 c2991b079d Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!160
 2021-09-23 16:36:15 +08:00
王夏晖 3bce3f2108 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!159
 2021-09-23 16:05:39 +08:00
wangxiahui@91isoft.com 6b6e441cf2 国内外标准表头自适应 2021-09-23 09:43:47 +08:00
王夏晖 478ac8caa6 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!158
 2021-09-23 08:52:37 +08:00
王夏晖 fa7e9ca3b6 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!157
 2021-09-22 14:55:03 +08:00
王夏晖 ed43cd29b0 Merge branch 'develop' into 'test' 
标准入库,经理人审批通过

See merge request LAWS/laws-system-front-FOTON!151
 2021-09-22 10:05:14 +08:00
王夏晖 77cc86d452 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!150
 2021-09-22 09:14:54 +08:00
王夏晖 a42776fdba Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!149
 2021-09-17 17:28:06 +08:00
wangxiahui@91isoft.com 41bd922a15 修改bug 2021-09-17 16:05:10 +08:00
wangxiahui@91isoft.com 78879a6f7f 国内外标准法规、企标库注掉批量删除 2021-09-17 15:32:25 +08:00
王夏晖 a4785b6632 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!148
 2021-09-16 22:14:16 +08:00
王夏晖 7cad97a1dd Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!147
 2021-09-16 20:33:59 +08:00
wangxiahui@91isoft.com f22ef00000 分解单页面字段位置调整 2021-09-16 20:31:52 +08:00
wangxiahui@91isoft.com d55e5076f5 征求意见流程 导出按钮字体错误 2021-09-16 18:00:00 +08:00
王夏晖 1ae0a58145 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!146
 2021-09-16 16:45:42 +08:00
王夏晖 47ff6186f7 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!145
 2021-09-16 15:15:42 +08:00
wangxiahui@91isoft.com bbfb1357b5 Default Changelist 2021-09-16 10:51:18 +08:00
王夏晖 e7e45245b4 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!144
 2021-09-16 10:26:01 +08:00
wangxiahui@91isoft.com bd03d966ab 征求意见流程字段居中 2021-09-16 09:47:03 +08:00
王夏晖 00caead369 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!143
 2021-09-16 09:12:24 +08:00
王夏晖 eb8cb8be9a Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!142
 2021-09-15 17:47:53 +08:00
wangxiahui@91isoft.com 195628f861 入库流程字段排序问题 2021-09-15 17:47:25 +08:00
wangxiahui@91isoft.com a3edd332f6 项目评估流程标准 提交重复 2021-09-15 16:46:27 +08:00
王夏晖 d076d31a4a Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!141
 2021-09-15 15:45:51 +08:00
wangxiahui@91isoft.com 3a7545e3a5 修改最大输入长度 2021-09-15 15:33:38 +08:00