Commit Graph
3311 Commits
Author SHA1 Message Date
shenyanpei 64f0385896 入会选择框加可删除 2021-12-24 10:32:37 +08:00
王夏晖 8d4cef7b4e Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!248
2021-12-24 10:28:56 +08:00
shenyanpei 265fb2a83d 参会选择框加可删除 2021-12-24 10:28:13 +08:00
zhutianqi 8378cdc4c0 commit 2021-12-24 10:21:56 +08:00
zhutianqi 34bde6b1ff Merge remote-tracking branch 'origin/develop' into develop 2021-12-24 10:06:42 +08:00
zhutianqi 9e121c4018 commit 2021-12-24 10:06:36 +08:00
yanyizhou ffab41c726 Merge remote-tracking branch 'origin/develop' into develop 2021-12-24 10:03:44 +08:00
yanyizhou 86f62736c7 首页 - 待办任务 - 显示过长优化 2021-12-24 10:03:40 +08:00
shenyanpei 1d78fdb4a9 清单抽屉删除无用代码、未符合项历史数据查询 2021-12-24 09:49:47 +08:00
宋伟佳 1d4be6dba7 手机端样式调整 2021-12-24 09:45:52 +08:00
yanyizhou c5af6abb74 Merge remote-tracking branch 'origin/develop' into develop 2021-12-24 09:39:07 +08:00
yanyizhou cd266ad321 资料中心 - 详情 - 页面展示效果优化 2021-12-24 09:39:01 +08:00
shenyanpei cfec86ba0c 清单抽屉修改确认添加时间空的判断 2021-12-24 09:35:01 +08:00
super_liu 9438f0cf74 feat:new 2021-12-23 21:54:52 +08:00
super_liu 69a15d0214 Merge remote-tracking branch 'origin/FOTON' into FOTON
# Conflicts:
#	src/sysConfig/index.js
2021-12-23 21:52:59 +08:00
super_liu b3c7d44667 Merge branch 'develop' into FOTON
# Conflicts:
#	src/sysConfig/index.js
2021-12-23 21:49:51 +08:00
super_liu b5b9d29410 feat: There is no way the,only 2021-12-23 21:47:36 +08:00
super_liu bbe7d2c930 Merge branch 'develop' into FOTON
# Conflicts:
#	src/sysConfig/index.js
2021-12-23 21:46:48 +08:00
super_liu a9b912f69b feat: There is no way the,only 2021-12-23 21:44:15 +08:00
super_liu 56d4001250 Merge branch 'develop' into FOTON 2021-12-23 18:06:01 +08:00
宋伟佳 bcec759522 commit 2021-12-23 18:00:08 +08:00
zhutianqi 0e12194605 Merge remote-tracking branch 'origin/develop' into develop 2021-12-23 17:58:14 +08:00
zhutianqi 2fcc2b06a3 commit 2021-12-23 17:58:09 +08:00
宋伟佳 89b71d1c45 项目合规评估流程赋值 2021-12-23 17:33:24 +08:00
yanyizhou d19df868db Merge remote-tracking branch 'origin/develop' into develop 2021-12-23 17:27:40 +08:00
yanyizhou 0d3e40276b 法规清单 - 详情 - 查询问题和优化 2021-12-23 17:27:31 +08:00
shenyanpei 800c43ca24 字段修改 2021-12-23 17:24:40 +08:00
shenyanpei d739c31cec 日历页面显示调整、手机端页面调整、未符合项流程带入数据显示调整、未符合项审批历史显示 2021-12-23 17:17:21 +08:00
zhutianqi e9939642ea Merge remote-tracking branch 'origin/develop' into develop 2021-12-23 16:54:00 +08:00
zhutianqi 7a183c3f1d commit 2021-12-23 16:53:55 +08:00
yanyizhou 73315186e2 Merge remote-tracking branch 'origin/develop' into develop 2021-12-23 16:52:27 +08:00
yanyizhou c9b6c39cf7 标准入库 - 第1,4步 - 多选字段没有对齐 2021-12-23 16:52:23 +08:00
宋伟佳 ae60568901 查询清单下的标准 2021-12-23 16:37:10 +08:00
super_liu 25c0a92f97 Merge branch 'develop' into FOTON 2021-12-23 16:36:30 +08:00
yanyizhou 231090a4cd Merge remote-tracking branch 'origin/develop' into develop 2021-12-23 16:23:21 +08:00
yanyizhou ba5559098b 标准入库 - 第一步 - 没有带入点取消再次进去表格会变短 2021-12-23 16:23:15 +08:00
zhutianqi 8166636060 Merge remote-tracking branch 'origin/develop' into develop 2021-12-23 16:14:03 +08:00
zhutianqi fd44398747 commit 2021-12-23 16:13:57 +08:00
yanyizhou b8fa1e8a30 Merge remote-tracking branch 'origin/develop' into develop 2021-12-23 16:00:35 +08:00
yanyizhou 36afb30951 标准入库 - 代替标准号手动查找 - 查询 2021-12-23 16:00:29 +08:00
宋伟佳 4d044f39f1 数据冲突 2021-12-23 15:28:37 +08:00
宋伟佳 08ce3b3395 手机端审批历史公共组件 2021-12-23 15:24:31 +08:00
宋伟佳 37bbbc4108 标准清单发布更新流程bug 2021-12-23 15:15:12 +08:00
宋伟佳 2c2e9a32bb 清单编辑日期问题 2021-12-23 15:02:21 +08:00
王夏晖 372cecc98a Merge branch 'develop' into 'FOTON'
按钮调整

See merge request LAWS/laws-system-front-FOTON!247
2021-12-23 14:55:45 +08:00
shenyanpei 21e70e2d06 按钮调整 2021-12-23 14:55:28 +08:00
王夏晖 45511fa8a0 Merge branch 'develop' into 'FOTON'
Develop

See merge request LAWS/laws-system-front-FOTON!246
2021-12-23 14:38:09 +08:00
shenyanpei b4dd6f4c4c 按钮调整 2021-12-23 14:37:31 +08:00
yanyizhou b27d79227a 资料中心 - 详情 - 行高 2021-12-23 14:27:33 +08:00
yanyizhou c3532cfef4 Merge remote-tracking branch 'origin/develop' into develop 2021-12-23 14:25:24 +08:00