Commit Graph
1288 Commits
Author SHA1 Message Date
super_liu d18f877baa Merge branch '' of E:\Software\rtpro\Foton\New_Pro\laws-system-front-FOTON with conflicts. 2022-03-31 15:37:12 +08:00
super_liu fa1fe15630 Merge branch 'develop' into FOTON 2022-03-29 20:48:28 +08:00
zhangyichen 685176a17b 修改bug 52207 项目清单,高级查询,产品平台、产品线、项目级别没有对应的字段是不是可以把这个去掉 2022-03-29 15:13:05 +08:00
宋伟佳 296a398be9 征求意见详情列表字段展示 2022-03-29 09:34:24 +08:00
宋伟佳 29e3248958 征求意见流程更改 2022-03-28 16:47:08 +08:00
zhangyichen 01924334dd 修改bug 52195 法规清单-项目清单,发起确认流程,无法发起 2022-03-28 16:09:21 +08:00
zhangyichen 922ffeb0c1 修改bug 52181 标准法规清单--在高级查询内的标准号输入信息,目前外侧的标准号也会自动同步信息 2022-03-28 15:33:19 +08:00
zhangyichen aefa691bca 修改bug 52182 标准法规清单--数据来源选择海外时,高级检索内,圈住的地方改下名字 2022-03-28 14:46:51 +08:00
zhangyichen 1f1b8d78f6 修改bug 52184 法规清单--编辑页面,在该清单存在一个标准的情况下,第一次添加一个标准,下面只显示添加的标准(第一次添加标准不是追加,而是覆盖) 2022-03-28 14:35:09 +08:00
宋伟佳 705ba3c9a8 禅道bug 51741 2022-03-28 13:37:42 +08:00
zhangyichen f28a12a676 修改bug 52185 法规清单--查看页面的高级查询,点完没反应,控制台没看见接口 2022-03-28 11:23:31 +08:00
宋伟佳 88c935f7a1 禅道bug 51958 51993 2022-03-28 11:06:19 +08:00
super_liu 5d2ce8d44b Merge branch 'develop' into FOTON
# Conflicts:
#	src/sysConfig/index.js
2022-03-27 21:06:19 +08:00
宋伟佳 e697cfcca5 禅道bug 2022-03-25 17:40:29 +08:00
super_liu 3194cae951 feat: There is no way the, BUG #52093 2022-03-25 16:29:24 +08:00
super_liu 53efc701d4 feat: There is no way the, 模块结构单元分乘用车和卡车 企标库 2022-03-25 14:28:01 +08:00
super_liu 45bcf79c7d feat: There is no way the, BUG #51988 2022-03-25 13:46:04 +08:00
super_liu 6dd29135df Merge remote-tracking branch 'origin/develop' into develop 2022-03-25 10:56:40 +08:00
super_liu 493abe361a feat: There is no way the, BUG #51951 2022-03-25 10:56:33 +08:00
11528 da4974199e Merge remote-tracking branch 'origin/develop' into develop 2022-03-25 00:51:32 +08:00
11528 282e6990d7 52062.52060.52043.52020 2022-03-25 00:51:26 +08:00
super_liu 95a9ad61c7 Merge branch 'develop' into FOTON 2022-03-24 23:01:40 +08:00
super_liu 48bf100f37 feat: There is no way the, BUG #51946 #51957 2022-03-24 22:59:48 +08:00
super_liu 0e35352af2 feat: There is no way the, bug #51861 2022-03-24 14:52:11 +08:00
super_liu ddcb5bab64 feat: There is no way the, bug #51988 #51984 #51982 2022-03-24 14:23:49 +08:00
11528 466d02e5c8 Merge remote-tracking branch 'origin/develop' into develop 2022-03-24 09:19:47 +08:00
11528 947e59f782 页面UI 2022-03-24 09:19:27 +08:00
super_liu 9aaab9eb3c feat: There is no way the, 删除高级检索重复字段 2022-03-23 17:37:43 +08:00
super_liu d1c07b5727 feat: There is no way the, bug #51959 2022-03-23 17:32:08 +08:00
super_liu 45d09e4310 Merge remote-tracking branch 'origin/develop' into develop 2022-03-23 15:31:49 +08:00
super_liu b348e2d816 feat: There is no way the, bug #51980 2022-03-23 15:31:35 +08:00
宋伟佳 117adca57e 禅道bug 2022-03-23 15:02:24 +08:00
11528 e1d50081eb Merge remote-tracking branch 'origin/develop' into develop 2022-03-23 14:13:25 +08:00
11528 482bf0d15c 权限 2022-03-23 14:13:17 +08:00
super_liu fa818a1d83 feat: There is no way the, bug #51989 2022-03-23 13:36:57 +08:00
11528 95ae8adc6c Merge remote-tracking branch 'origin/develop' into develop 2022-03-22 18:02:54 +08:00
11528 fbe05218ad 权限 2022-03-22 18:02:45 +08:00
super_liu 32e77d8282 feat: There is no way the, #51956 2022-03-22 17:28:21 +08:00
super_liu b3a335b56e feat: There is no way the, #51949 2022-03-22 17:11:04 +08:00
super_liu 19ee81d648 feat: There is no way the, #51975 2022-03-22 16:45:34 +08:00
super_liu 674812e8cd Merge remote-tracking branch 'origin/develop' into develop 2022-03-22 11:00:32 +08:00
super_liu fc658fb3bf feat: There is no way the, 2022-03-22 11:00:19 +08:00
super_liu 8b986683b6 feat: There is no way the, 2022-03-22 10:55:13 +08:00
宋伟佳 3f5309a185 国内标准库年份校验 51992 2022-03-22 09:39:30 +08:00
11528 d889ef6b12 Merge remote-tracking branch 'origin/develop' into develop 2022-03-21 17:02:17 +08:00
11528 a5e70d3305 权限 2022-03-21 17:02:09 +08:00
zhutianqi 899bd30fae Merge remote-tracking branch 'origin/develop' into develop 2022-03-21 16:57:13 +08:00
zhutianqi fda59911c5 commit 2022-03-21 16:56:45 +08:00
宋伟佳 f8ead8a13a 海外库编辑权限 2022-03-21 16:44:17 +08:00
宋伟佳 2392ec3a51 企标计划和工作组模块的权限 2022-03-21 16:06:22 +08:00