FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,311 Commits 3 Branches 0 Tags
7f53c7d3082d74f17838d1435ad2c1505f25c79f
Commit Graph
1311 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王夏晖 7f53c7d308 Merge branch 'develop' into 'test' 
Develop

See merge request LAWS/laws-system-front-FOTON!132
 2021-09-08 21:06:33 +08:00
super_liu 326b80e4bf Merge remote-tracking branch 'origin/develop' into develop 2021-09-08 20:45:30 +08:00
super_liu d306a21e51 feat: There is no way the 2021-09-08 20:45:03 +08:00
yanyizhou aa56df874b Merge remote-tracking branch 'origin/develop' into develop 2021-09-08 20:35:01 +08:00
yanyizhou 60e590d84b 清单下的标准的字段回显异常 2021-09-08 20:34:46 +08:00
zhaokaiyao@91isoft.com 66a941bd0d Merge remote-tracking branch 'origin/develop' into develop 2021-09-08 20:05:24 +08:00
zhaokaiyao@91isoft.com 7b048117f3 海外标准号+类别 暂时使用 2021-09-08 20:05:17 +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
宋伟佳 6ce3d151f1 commit 2021-09-08 18:32:05 +08:00
zhutianqi 29a3a93317 Merge remote-tracking branch 'origin/develop' into develop 2021-09-08 17:57:10 +08:00
zhutianqi 6f7bab556c commit 2021-09-08 17:57:03 +08:00
宋伟佳 17d53c2877 commit 2021-09-08 17:47:42 +08:00
zhaokaiyao@91isoft.com 7f76a8314a Merge remote-tracking branch 'origin/develop' into develop 2021-09-08 17:27:54 +08:00
zhaokaiyao@91isoft.com 987f442c64 国内外详情->文本状态->叹号 2021-09-08 17:27:47 +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
super_liu e7153cc847 feat: There is no way the #47887 2021-09-07 15:33:59 +08:00
super_liu 53b8c2657e feat: There is no way the #47918 2021-09-07 15:17:29 +08:00
super_liu 747192fdf4 Merge remote-tracking branch 'origin/develop' into develop 2021-09-07 15:02:16 +08:00
super_liu 2de6d3bd5a feat: There is no way the #47605 2021-09-07 15:01:49 +08:00
zhaokaiyao@91isoft.com b13961e1d8 Merge remote-tracking branch 'origin/develop' into develop 2021-09-07 14:29:30 +08:00
zhaokaiyao@91isoft.com 303836eac5 企标编号字体颜色 2021-09-07 14:27:42 +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
Mr.Z 904514ddb5 岗位管理新增查询功能以及分页功能 2021-09-07 09:24:40 +08:00
yanyizhou b030104b1d Merge remote-tracking branch 'origin/develop' into develop 2021-09-07 09:16:45 +08:00
yanyizhou 2b1203c138 机构管理--加筛选条件：姓名和邮箱，加了分页 2021-09-07 09:16:34 +08:00
super_liu a964172858 feat: There is no way the #47632 2021-09-06 17:52:34 +08:00
super_liu 93927223f7 feat: There is no way the #47605 2021-09-06 17:02:06 +08:00
super_liu 5e7231d622 feat: There is no way the 2021-09-06 16:24:08 +08:00
super_liu 1dce213e29 feat: There is no way the #47669 2021-09-06 16:19:19 +08:00
super_liu 3d50da740d feat: There is no way the #47603 2021-09-06 15:58:41 +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
zhutianqi c9e0ae673a commit 2021-09-06 11:11:30 +08:00
zhutianqi 7b390d4c89 Merge remote-tracking branch 'origin/develop' into develop 2021-09-06 11:03:39 +08:00
zhutianqi 3d50aac0b6 commit 2021-09-06 11:03:33 +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
super_liu 5ba6fef029 feat: There is no way the 2021-09-06 10:10:29 +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
zhutianqi 552dac0787 commit 2021-09-06 09:31:02 +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
zhaokaiyao@91isoft.com 168d5da192 复审日期转换为字符串的格式 2021-09-04 16:39:21 +08:00
zhaokaiyao@91isoft.com ce88c8cf9e 文本状态一直提示不能为空 2021-09-04 15:26:37 +08:00
zhaokaiyao@91isoft.com 19215f3897 企标实施日期 2021-09-04 14:35:22 +08:00
zhaokaiyao@91isoft.com 6e28b2f3c5 Merge remote-tracking branch 'origin/develop' into develop 2021-09-04 14:33:48 +08:00
zhaokaiyao@91isoft.com 6d3c0449dc 海外标准->编辑页->文本状态可编辑 2021-09-04 14:33:44 +08:00
宋伟佳 69436a7ea1 Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop 2021-09-04 14:20:58 +08:00
宋伟佳 c4d7fdaeb9 项目清单确认流程数据显示 2021-09-04 14:20:53 +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
yanyizhou b3875f85a9 企业标准库--编辑页面的代替企标编号的手动查找页面,1.文本状态没回显，标准状态改成文本状态 {2.数据来源只能是企业标准--(已改)} 2021-09-04 10:07:00 +08:00
yanyizhou abdef11637 Merge remote-tracking branch 'origin/develop' into develop 2021-09-03 20:32:07 +08:00
yanyizhou 8efe4c5a81 国内外标准法规--编辑页面的手动查找查找的标准的文本状态显示不对，且把标准状态改成文本状态 2021-09-03 20:31:57 +08:00