Commit Graph
631 Commits
Author SHA1 Message Date
super_liu 6a489613c2 Merge remote-tracking branch 'origin/develop' into develop 2022-01-04 15:42:31 +08:00
super_liu ed7eb3e0a1 feat: There is no way the, 2022-01-04 15:42:13 +08:00
yuezhihang 866224fd95 工作组显示状态和流程联动 2022-01-04 13:56:59 +08:00
王夏晖 217def1be8 Merge branch 'develop' into 'FOTON'
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!88
2021-12-31 16:13:22 +08:00
yuezhihang 82fb2cb733 解读流程改名字 2021-12-31 16:08:44 +08:00
yuezhihang 5cba7463f1 征求意见bug修复!!! 2021-12-31 15:18:39 +08:00
王夏晖 2e47c39f61 Merge branch 'develop' into 'FOTON'
调研流程bug修复

See merge request foton-wkflow-group/foton-wkflow-rest!87
2021-12-30 19:33:54 +08:00
yuezhihang 9679f27a4f 调研流程bug修复 2021-12-30 19:33:30 +08:00
王夏晖 06776dc52c Merge branch 'develop' into 'FOTON'
征求意见bug修复

See merge request foton-wkflow-group/foton-wkflow-rest!86
2021-12-30 19:32:23 +08:00
yuezhihang 87f95ef6ee 征求意见bug修复 2021-12-30 18:30:46 +08:00
王夏晖 dd6398b702 Merge branch 'develop' into 'FOTON'
调研流程bug修复

See merge request foton-wkflow-group/foton-wkflow-rest!85
2021-12-30 17:17:12 +08:00
yuezhihang 970f4468a9 调研流程bug修复 2021-12-30 17:15:35 +08:00
王夏晖 2e3eacaa3d Merge branch 'develop' into 'FOTON'
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!84
2021-12-30 14:39:25 +08:00
super_liu 8a718ff5b5 Merge remote-tracking branch 'origin/develop' into develop 2021-12-30 14:01:48 +08:00
super_liu 9af93b357e feat: There is no way the,buss node 7 reject and prcName update 2021-12-30 13:58:06 +08:00
yuezhihang 29d5dfdaea 解读流程bug修复 2021-12-30 10:59:09 +08:00
super_liu 13fe5ff97b Merge branch 'develop' into FOTON 2021-12-29 21:52:05 +08:00
yuezhihang 50e1d94dbf 企标制修订计划立项 2021-12-29 20:25:58 +08:00
yuezhihang a6a87dc3f3 解读流程 可能存在的bug 已写日志:::!!!! 2021-12-29 20:16:50 +08:00
yuezhihang 1c0985438c 上传调研结果步骤 保存审批意见去除 2021-12-29 17:30:20 +08:00
yuezhihang 841951b8a5 解读流程未走完出现完成时间bug修复 2021-12-29 17:21:00 +08:00
yuezhihang b953b9ee2b 企标制修订计划管控---最新的 立项 取消 合并 修改 2021-12-29 16:07:15 +08:00
王夏晖 24d7b2cd85 Merge branch 'develop' into 'FOTON'
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!83
2021-12-29 11:31:12 +08:00
yuezhihang 26f45780b7 解决项目评估 分发问题 2021-12-29 11:30:35 +08:00
yuezhihang 316b7ce8d2 解读流程入库数据消失问题 修复 2021-12-29 10:43:17 +08:00
super_liu 00c89052f5 Merge branch 'develop' into FOTON 2021-12-29 05:09:56 +08:00
yuezhihang 9c9ba499ab 项目评估驳回无数据问题修复 2021-12-28 20:03:10 +08:00
yuezhihang 13b1df2fbd Merge remote-tracking branch 'origin/develop' into develop 2021-12-28 17:07:05 +08:00
yuezhihang 3f2a033f79 项目维度--项目评估bug修复 2021-12-28 17:06:53 +08:00
王夏晖 31af989350 Merge branch 'develop' into 'FOTON'
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!82
2021-12-28 16:31:45 +08:00
super_liu 4029f2c243 Merge remote-tracking branch 'origin/develop' into develop 2021-12-28 15:39:17 +08:00
super_liu 60790f8c1d feat: There is no way the,buss product 2021-12-28 15:38:26 +08:00
yuezhihang 2f66177b85 项目维度第二步驳回 流程完成时间 未显示bug修复 2021-12-28 13:34:58 +08:00
yuezhihang 42bc160df9 征求意见单节点变成多实例 优化项 优化完成 2021-12-28 10:09:53 +08:00
super_liu 9823805404 Merge branch 'develop' into FOTON 2021-12-28 03:35:14 +08:00
yuezhihang 3a92f44a66 Merge remote-tracking branch 'origin/develop' into develop 2021-12-27 21:19:53 +08:00
yuezhihang c5edf90dc7 调研 2021-12-27 21:19:46 +08:00
super_liu 5a48edc6d8 Merge remote-tracking branch 'origin/develop' into develop 2021-12-27 21:13:55 +08:00
super_liu bade21c7b9 feat: There is no way the,buss2 2021-12-27 21:13:36 +08:00
yuezhihang 959a87edbd 会签走错问题处理 2021-12-27 20:00:35 +08:00
yuezhihang 092098ee93 Merge remote-tracking branch 'origin/develop' into develop 2021-12-27 19:30:31 +08:00
yuezhihang 3284dcd1a9 调研流程重复的部门对接人和部长 相同情况下需要合并为一条待办 2021-12-27 19:30:25 +08:00
王夏晖 6542669fde Merge branch 'develop' into 'FOTON'
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!81
2021-12-27 18:54:49 +08:00
super_liu 8b8a515f52 Merge remote-tracking branch 'origin/develop' into develop 2021-12-27 17:44:56 +08:00
super_liu 8d430df609 feat: There is no way the,buss 2021-12-27 17:44:37 +08:00
yuezhihang e1139715a7 Merge remote-tracking branch 'origin/develop' into develop 2021-12-27 17:09:40 +08:00
yuezhihang 040f70b98a 标准维度---项目清单确认修复 2021-12-27 17:09:34 +08:00
王夏晖 6cf258cfa3 Merge branch 'develop' into 'FOTON'
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!80
2021-12-27 16:15:19 +08:00
super_liu 819eea2282 Merge remote-tracking branch 'origin/develop' into develop 2021-12-27 15:11:32 +08:00
super_liu 9ee81e8b7e feat: There is no way the,buss 2021-12-27 15:11:10 +08:00