Commit Graph
664 Commits
Author SHA1 Message Date
刘彦泽 ac3f685467 项目管理-项目库-项目详情-任务清单-列宽可拖拽 2023-02-07 17:10:04 +08:00
zyn 930525cbd8 拖拽-设置最小列宽 2023-02-07 15:45:38 +08:00
zyn d407bc7f4a 信息中心(拖拽) 2023-02-06 16:26:28 +08:00
zyx.net db636ead95 项目详情 时间非必填 时间为空外面页面不展示 2023-01-13 11:38:48 +08:00
zyx.net 5d7ff5d238 未符合项 流程任务链接应在流程类型处 2023-01-13 10:47:19 +08:00
刘彦泽 7398accaf1 项目库-可伸缩列 2023-01-12 16:54:05 +08:00
高嵩 6442b4d255 合并分支 'feature_dev_20221129_UI' 到 'feature_dev_20230109_BTTZ'
Feature dev 20221129 ui

查看合并请求 laws-nio/laws-weilai!277
2023-01-11 11:01:12 +08:00
刘彦泽 332872f076 任务清单-系统表格高度 2023-01-10 09:59:35 +08:00
高嵩 8574bb3849 合并分支 'feature_dev_20221129_UI' 到 'master'
Feature dev 20221129 ui

查看合并请求 laws-nio/laws-weilai!274
2023-01-07 08:19:05 +08:00
zyx.net 0fe60644a9 用户管理 责任领域添加全选功能 2023-01-06 09:53:33 +08:00
刘彦泽 970c2b8fca UI界面变更-法规清单-评论-按钮 2023-01-06 09:53:18 +08:00
刘彦泽 c28f9128a3 UI界面变更-项目详情-法规清单-添加表单样式 2023-01-05 14:47:38 +08:00
zyx.net e7fcfb8903 参数批次传参修改 2023-01-04 17:58:05 +08:00
zyx.net 0369369ec4 认证参数收集清单-高级搜索传参方式修改 2023-01-04 14:41:45 +08:00
高嵩 b0b8f36e92 Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period
# Conflicts:
#	jero-web/src/components/tableCollection/index1.vue
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/index.vue
2022-12-30 15:53:39 +08:00
刘彦泽 4545f9fc44 UI界面变更-项目库-项目详情-相关人员名单 2022-12-30 14:32:05 +08:00
zyx.net a9118dc7b7 viewer角色只有查看功能,查看技术评估结果页面不需要有“发起补充流程”按钮 2022-12-30 11:59:24 +08:00
zyx.net ca3b38a9f2 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-30 10:53:19 +08:00
zyx.net 46a89d7b4a 参数收集--历史记录中的引号不对称 2022-12-30 10:52:07 +08:00
CD 93b12b94ee viewer权限显示补充 2022-12-30 10:13:20 +08:00
刘彦泽 6111aff6b7 UI界面变更-项目详情-任务清单 2022-12-30 10:07:30 +08:00
刘彦泽 c4cdb277b9 UI界面变更-法规清单 2022-12-30 09:58:55 +08:00
刘彦泽 5fd0c14c11 UI界面变更-项目参数任务 2022-12-29 16:16:04 +08:00
高嵩 3c8cfab750 Merge remote-tracking branch 'origin/dev_2nd_period_test' into fix_2nd_period 2022-12-29 10:21:36 +08:00
wangzhijiang 5f9d133c69 Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period 2022-12-28 17:19:22 +08:00
wangzhijiang 21a2dccbe7 参数清单-增加未收集状态,对应禅道BUG编号 64312 2022-12-28 17:19:03 +08:00
zyx.net b05f2bf3c9 合并代码 2022-12-28 16:12:31 +08:00
刘彦泽 e618da8108 UI界面变更-项目库-表单宽度-表格内容左对齐 2022-12-28 15:49:05 +08:00
zyx.net 469265a730 参数收集清单删除增加未收集状态情况 2022-12-28 14:41:04 +08:00
高嵩 f4d1b8676a Merge remote-tracking branch 'origin/feature_dev_20221125_YW' into fix_2nd_period
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
2022-12-28 09:58:11 +08:00
高嵩 4633d465f3 Merge branch 'dev_2nd_period_test' into fix_2nd_period
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/projectManagement/components/TaskList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
2022-12-28 09:53:38 +08:00
wangzhijiang 83b805edaa 参数收集清单
1.同步上报库
2.认证工程师、工程接口人、填写人 退回
3.认证工程师、工程接口人 强制撤回
4.工程接口人分配填写人
5.填写人提交
操作增加历史log
2022-12-27 17:46:24 +08:00
CD ca1fb97fc5 前端品牌回显 + 后端大列表修改权限筛选 2022-12-27 16:11:22 +08:00
zyx.net 850b208aa2 参数导出模板添加适用地区;法规清单导出 名称修改 2022-12-27 15:06:45 +08:00
zyx.net b76106ebb6 项目库品牌修改 2022-12-27 14:20:19 +08:00
zyx.net fb044bbd88 品牌管理员权限相关问题 2022-12-27 09:54:47 +08:00
zyx.net 8c0b7bf0c0 参数模板管理;未符合项;参数导出模板管理 表格排序问题 2022-12-23 10:59:20 +08:00
zyx.net 41a066f7b6 任务清单;法规清单;认证参数列表 表格排序问题 2022-12-22 10:18:43 +08:00
刘彦泽 72fa5d26cb UI界面变更-项目详情-法规清单 2022-12-21 09:24:35 +08:00
刘彦泽 64f41aaab4 UI界面变更-图标样式 2022-12-20 13:24:19 +08:00
zyx.net 87ee7e6df0 任务清单;法规清单 表格排序问题 2022-12-16 17:01:15 +08:00
zyx.net c5aa8649aa 法规清单调取功能 2022-12-13 11:55:42 +08:00
zyx.net c6f51e74ae 法规清单调取功能 2022-12-13 11:24:15 +08:00
zyx.net 2ee72e7437 法规清单调取功能 2022-12-13 10:47:55 +08:00
zyx.net dc8c72b70b 法规清单调取功能 2022-12-13 10:05:26 +08:00
wangzhijiang e0f22e765e 认证工程师-分配填写人开发。
上报库导出明细,带历史Log
2022-12-12 16:56:51 +08:00
zyx.net e4cc5c5f51 认证工程师分配填写人 2022-12-12 13:30:01 +08:00
liyawei 793b637ac1 Merge remote-tracking branch 'origin/feature_dev_20221125_YW' into feature_dev_20221125_YW 2022-12-08 16:51:04 +08:00
liyawei aaeb47a27a 认证-参数项收集-bug修改 2022-12-08 16:43:58 +08:00
zyx.net 734d7495ac 认证工程师 强制撤回状态校验 2022-12-08 15:02:11 +08:00