Commit Graph
1704 Commits
Author SHA1 Message Date
liyawei 74d59f8829 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-06 14:34:57 +08:00
liyawei 8ca4478b32 认证-飞书消息-添加task type 2022-07-06 14:34:41 +08:00
wangzhijiang b8ca777f58 法规意见收集添加字段 文档库/标准id 2022-07-06 14:26:32 +08:00
wangzhijiang 809aed2bbb Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-06 14:22:56 +08:00
wangzhijiang 000d46e470 法规意见收集,列表回显技术领域。 2022-07-06 14:22:31 +08:00
liyawei cfdb75eda7 添加sql记录-认证模块 2022-07-06 14:21:34 +08:00
liyawei 569c261fd2 添加sql记录-认证模块 2022-07-06 14:11:41 +08:00
zhn cd7434da1e 预报标题模板 2022-07-06 13:47:16 +08:00
lixuetao af9bd856a3 Merge branch 'dev_third_stage' 2022-07-05 19:49:26 +08:00
lixuetao 4b092fc07c Merge branch 'fix_bug_first_stage'
# Conflicts:
#	jero-web/src/components/CollectionType/index.vue
2022-07-05 19:48:17 +08:00
wangzhijiang eb6ab02004 设计、验证、prehomo流程发起人退回,发消息内容完善。 2022-07-05 18:33:34 +08:00
zhn 38172cb824 虚拟清单修改 2022-07-05 18:15:17 +08:00
wangzhijiang 09551f2434 设计、验证、prehomo删除dre工程师接口完善。 2022-07-05 16:46:45 +08:00
wangzhijiang 76d9490cd0 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-05 16:22:05 +08:00
wangzhijiang 0a0902cba6 设计、prehomo、验证 下发dre,判断是否发过消息。 2022-07-05 16:20:45 +08:00
zhn 39da18419d 法规清单批量设置修改 2022-07-05 16:14:11 +08:00
liyawei d9d1412855 认证-参数项-导入提示语bug55489 2022-07-05 15:54:40 +08:00
lixuetao 7ddac7eb75 Merge branch 'dev_third_stage'
# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
2022-07-05 15:34:57 +08:00
zer0Black 079c7ffb98 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-05 15:10:41 +08:00
zer0Black 6e89cf7dac reply的英文改为replied 2022-07-05 15:10:31 +08:00
wangzhijiang 093b37bb3a 任务确认-发送飞书消息404问题修改。 2022-07-05 14:47:23 +08:00
liyawei 89424f793f 认证-参数项-控件校验 正整数改整数 2022-07-05 14:43:37 +08:00
wangzhijiang 0760302759 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-05 14:23:40 +08:00
wangzhijiang 950bbcb66f 设计、prehomo、验证符合性流程,发起人退回发消息内容完善。 2022-07-05 14:21:58 +08:00
liyawei 2701fbdd31 认证-参数项收集-bug55428 2022-07-05 09:49:01 +08:00
qq787203167 03fa31f73e 删除无用代码 2022-07-05 09:32:19 +08:00
qq787203167 918ce8b8da 修改禅道bug 2022-07-05 09:31:15 +08:00
zhn 05d9d66240 相关人员名单--批量设置 2022-07-04 18:15:52 +08:00
wangzhijiang 8c36f0c2fa 法规-流程历史表-列表查询接口开发。 2022-07-04 18:02:41 +08:00
wangzhijiang 52e8f9d5fb Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-04 17:45:17 +08:00
wangzhijiang 53f97b5d62 批量添加评估结果接口。 2022-07-04 17:44:54 +08:00
zhn fa95bb52f0 相关人员名单--添加搜索条件 2022-07-04 17:39:56 +08:00
liyawei 8fa718fe6a 认证-参数项收集-bug55353 2022-07-04 17:29:13 +08:00
zhn c3dfd0f8da Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-04 17:23:14 +08:00
zhn d6e8963e1d 项目详情--导出 2022-07-04 17:22:55 +08:00
wangzhijiang c353fbc6f6 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-04 17:20:14 +08:00
wangzhijiang 0185003adb 法规清单,展示清单确认状态修改。 2022-07-04 17:20:02 +08:00
wangzhijiang ecbf1abd00 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 2022-07-04 17:01:51 +08:00
wangzhijiang ab1dfcba6c 法规参数收集。 2022-07-04 17:01:26 +08:00
zhn 4db4858535 消息类型 2022-07-04 16:32:41 +08:00
wangzhijiang b63d720da0 任务确认流程-分配dre给dre发消息,内容修改。 2022-07-04 16:00:09 +08:00
liyawei 64fc7d95d8 认证-上报库-导出历史 2022-07-04 15:50:29 +08:00
wangzhijiang 0231ddddd0 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-04 15:48:53 +08:00
wangzhijiang 373afeff46 流程相关-消息类型修改。 2022-07-04 15:47:52 +08:00
liyawei deb243daf9 认证-上报库-导出历史 2022-07-04 15:44:49 +08:00
zhn 8c17bd9b94 虚拟清单发布--发消息判空 2022-07-04 15:20:33 +08:00
wangzhijiang 2bafcd9ae7 Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage 2022-07-04 15:06:31 +08:00
wangzhijiang 2a4f848d7e 设计、prehomo、验证符合性流程,发起人审核退回,给责任人发消息(模板需要提供) 2022-07-04 15:06:15 +08:00
zhn 031536a17d 飞书跳转链接改为View 2022-07-04 15:01:00 +08:00
zhn d440219c45 法规清单--带入相关人员 2022-07-04 14:44:48 +08:00