FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,439 Commits 3 Branches 0 Tags
bd2e9afba238ced9bba09d4415e025e20a1cc40e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
wangxiahui@91isoft.com e221dce3e9 未符合项新增，责任工程师ui 2021-12-03 15:31:32 +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
王夏晖 cb3bfc8638 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!140
 2021-09-15 13:30:45 +08:00
wangxiahui@91isoft.com 3a79b49893 标准比对列表内容过长三个点显示 2021-09-15 10:07:06 +08:00
wangxiahui@91isoft.com 1c3edcb312 Default Changelist 2021-09-15 10:02:35 +08:00
王夏晖 62bd2d0c3f Merge branch 'develop' into 'test' 
Default Changelist

See merge request LAWS/laws-system-front-FOTON!139
 2021-09-14 15:20:41 +08:00
wangxiahui@91isoft.com fa504ff0fa Default Changelist 2021-09-14 15:19:07 +08:00
王夏晖 e9f88a4dcd Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!138
 2021-09-14 14:59:27 +08:00
王夏晖 152f1b2157 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!137
 2021-09-14 14:27:30 +08:00
王夏晖 ff326e7853 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!136
 2021-09-13 14:00:11 +08:00
王夏晖 872311675c Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!135
 2021-09-09 19:23:27 +08:00
王夏晖 5ddfa9d991 Merge branch 'develop' into 'test' 
Develop

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

See merge request LAWS/laws-system-front-FOTON!133
 2021-09-09 14:28:51 +08:00
王夏晖 7f53c7d308 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!132
 2021-09-08 21:06:33 +08:00
王夏晖 e0c584e210 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!131
 2021-09-08 19:02:27 +08:00
王夏晖 8e5d59d5f6 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!130
 2021-09-07 17:08:04 +08:00
王夏晖 e1ef35e076 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!129
 2021-09-07 10:17:45 +08:00
王夏晖 7dfeea6c50 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!128
 2021-09-06 13:48:10 +08:00
王夏晖 ae6c24b23f Merge branch 'develop' into 'test' 
feat: There is no way the

See merge request LAWS/laws-system-front-FOTON!127
 2021-09-06 10:36:43 +08:00
王夏晖 f0729c0946 Merge branch 'develop' into 'test' 
commit

See merge request LAWS/laws-system-front-FOTON!126
 2021-09-06 10:02:30 +08:00
王夏晖 7a21e5bd43 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!125
 2021-09-06 09:12:05 +08:00
王夏晖 2b492e2e66 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!124
 2021-09-04 11:34:02 +08:00
王夏晖 41b798c02e Merge branch 'develop' into 'test' 
Develop

See merge request !119
 2021-09-03 08:13:41 +00:00
wangxiahui@91isoft.com 93a0ca58c1 海外标准法规必填项 2021-09-03 16:09:25 +08:00
王夏晖 2ad071bf50 Merge branch 'develop' into 'test' 
企业标准库列表样式

See merge request !118
 2021-09-03 03:33:16 +00:00
王夏晖 c0946c8aa3 Merge branch 'develop' into 'test' 
Develop

See merge request !117
 2021-09-03 02:42:14 +00:00
wangxiahui@91isoft.com c0cdb86200 改样式 2021-09-03 10:39:48 +08:00
wangxiahui@91isoft.com 47da0d589e 修改字段 2021-09-03 10:12:50 +08:00
王夏晖 2800ace636 Merge branch 'develop' into 'test' 
Develop

See merge request !116
 2021-09-03 01:11:52 +00:00
王夏晖 8378ece942 Merge branch 'develop' into 'test' 
Develop

See merge request !115
 2021-09-02 01:06:40 +00:00
王夏晖 29335c3506 Merge branch 'develop' into 'test' 
Develop

See merge request !114
 2021-09-01 08:23:43 +00:00
王夏晖 33fd2d7f32 Merge branch 'develop' into 'test' 
标准预警初步修改~

See merge request !113
 2021-09-01 01:11:39 +00:00
王夏晖 5bcb99828b Merge branch 'develop' into 'test' 
Develop

See merge request !112
 2021-08-31 08:23:14 +00:00
王夏晖 99e83526af Merge branch 'develop' into 'test' 
Develop

See merge request !111
 2021-08-31 01:06:25 +00:00
王夏晖 997dde4de9 Merge branch 'develop' into 'test' 
Develop

See merge request !110
 2021-08-30 09:44:44 +00:00
王夏晖 55ccd5183c Merge branch 'develop' into 'test' 
Develop

See merge request !109
 2021-08-30 07:45:37 +00:00