Commit Graph
6899 Commits
Author SHA1 Message Date
高嵩 d0384ea4e0 Merge branch 'dev_20231218_PHONE' into 'master'
Dev 20231218 phone

See merge request laws-foton-slrs/foton-laws-system-front!132
2023-12-18 04:21:35 +00:00
高嵩 a1002e9586 Merge branch 'fix_foton_20231213' into 'master'
Fix foton 20231213

See merge request laws-foton-slrs/foton-laws-system-front!131
2023-12-18 04:20:28 +00:00
zyn 0072aa90e4 feature: 配置eslint 2023-12-18 12:20:00 +08:00
zyn 08bce5224f fix: 登录后添加uName字段 2023-12-18 12:19:36 +08:00
高嵩 c137b25ea7 Merge branch 'master' into 'fix_foton_20231213'
Master

See merge request laws-foton-slrs/foton-laws-system-front!130
2023-12-18 02:33:11 +00:00
zyn bf127dadfe style: 格式化代码 2023-12-18 10:09:10 +08:00
zyn bb5a905682 fix(手机端): 不支持手机端提交驳回操作 2023-12-18 10:08:30 +08:00
zyn 1d7cffc859 fix(手机端): 不支持手机端提交驳回操作 2023-12-18 09:58:49 +08:00
zyn 9eb96363ea style: 格式化代码 2023-12-18 09:58:18 +08:00
zyn fb2980b038 style: 格式化代码 2023-12-18 09:49:51 +08:00
zyn 31b7f87b72 fix(手机端-标准入库): 不支持手机端提交驳回操作 2023-12-18 09:49:17 +08:00
高嵩 e68bc03ee7 Merge branch 'dev_20231201_feizhi' into 'master'
Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!129
2023-12-15 09:54:12 +00:00
zyn 259ef7ad32 fix(手机端): 技术标准-驳回提示手机端处理 2023-12-15 17:52:08 +08:00
zyn 21521d49ed style: 修改eslint配置 2023-12-15 17:51:10 +08:00
zyn 1f85731376 fix(体系搜索): 监听窗口改变重新渲染 2023-12-15 17:38:26 +08:00
高嵩 31fe2ba3c8 Merge branch 'dev_20231201_feizhi' into 'master'
Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!128
2023-12-15 09:18:12 +00:00
高嵩 b98ab15162 Merge branch 'dev_20231208_搜索中心' into 'master'
refactor(搜索中心): 重构搜索中心

See merge request laws-foton-slrs/foton-laws-system-front!127
2023-12-15 09:17:45 +00:00
zyn 39e6823e36 feature: eslint增加配置项 2023-12-15 15:15:46 +08:00
zyn 91d25f107f chore(eslint): 使用babel-eslint解析 2023-12-15 11:56:48 +08:00
zyn 221e68134b style: 修改代码格式 2023-12-15 11:41:23 +08:00
zyn 19a18489a8 feature(eslint): 添加规则 2023-12-15 11:39:33 +08:00
zyn 230852b8f2 feature(eslint): 添加规则 2023-12-15 09:59:25 +08:00
zyn 78e7d08029 fix(手机端): 退出到welink待办页 2023-12-14 15:50:00 +08:00
zyn 26d1af11ce feature: 配置eslint 2023-12-14 14:51:54 +08:00
zyn 01bee9fcc8 refactor(登录): 重写登录模块,接入oauth2.0(pc)、welink(mobile) 2023-12-14 10:19:29 +08:00
高嵩 8e41ee7577 Merge branch 'dev_20231201_feizhi' into 'master'
Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!126
2023-12-13 10:36:19 +00:00
wxyclub ea5e6093ab bug: 企标入库,修改企标计划时参数字段修改 2023-12-13 17:41:25 +08:00
zyn 039abb5565 feature: 加载文件接口添加loading 2023-12-13 17:18:23 +08:00
zhoulingpo 9209131eaa 查看人员的表格高度修改 2023-12-13 17:04:55 +08:00
zhoulingpo 0b1ea2f609 增加问题项管控的历史数据的序号 2023-12-13 16:31:11 +08:00
zhoulingpo ee008393d4 增加历史数据的序号 2023-12-13 15:54:56 +08:00
zhoulingpo 8eee3063a7 修改企标计划的新增的代替其表编号的序号以及样式 2023-12-13 14:57:29 +08:00
高嵩 fe70b5b5ce Merge branch 'dev_20231201_feizhi' into 'master'
Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!125
2023-12-13 04:11:58 +00:00
wxyclub 0067909840 feature(企标废止): 抄送 2023-12-13 10:55:09 +08:00
zyn 0bc2474ed9 Merge remote-tracking branch 'origin/dev_20231201_feizhi' into dev_20231201_feizhi 2023-12-13 10:45:16 +08:00
zyn be6e3f1e79 feature(企标废止): 抄送 2023-12-13 10:45:03 +08:00
zhoulingpo 56195550d7 Merge branch 'dev_20231201_feizhi' of http://git.hzwlsoft.com/laws-foton-slrs/foton-laws-system-front into dev_20231201_feizhi 2023-12-13 10:43:26 +08:00
zhoulingpo c800d774e9 修改未符合项整改数据库 2023-12-13 10:43:19 +08:00
高嵩 0e608f018a Merge branch 'dev_20231201_feizhi' into 'master'
Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!124
2023-12-13 02:34:59 +00:00
zyn c5fcb2b410 fix(技术标准): 重新起草-评分 2023-12-13 09:50:23 +08:00
zhoulingpo e6ac4afcd1 修改草稿的序号 2023-12-13 09:43:02 +08:00
zhoulingpo b7edec3b3a Merge branch 'dev_20231201_feizhi' of http://git.hzwlsoft.com/laws-foton-slrs/foton-laws-system-front into dev_20231201_feizhi 2023-12-13 09:39:10 +08:00
zhoulingpo d69084b4ee 修改流程中心的序号 2023-12-13 09:38:59 +08:00
高嵩 e8585e91ee Merge branch 'dev_20231201_feizhi' into 'master'
Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!123
2023-12-12 10:13:30 +00:00
wxyclub 83a367c06e bug: 企标制修订征求意见去掉序号 2023-12-12 18:04:21 +08:00
zhoulingpo 5485490cc4 回显bug 2023-12-12 16:12:40 +08:00
zhoulingpo 91c093a30b 修改标准体系 2023-12-12 15:25:16 +08:00
zhoulingpo dbfdae95c2 Merge remote-tracking branch 'origin/dev_20231201_feizhi' into dev_20231201_feizhi 2023-12-12 15:00:36 +08:00
zhoulingpo 3f2981ac9b 修改标准体系只能选择 2023-12-12 15:00:20 +08:00
zyn e9905b840d fix(政策法规资料): 树状图搜索 2023-12-11 09:57:47 +08:00