Commit Graph
208 Commits
Author SHA1 Message Date
zyx.net 12d84e2d90 UAT修改 2023-06-09 15:19:17 +08:00
高嵩 e37b4d5dd2 修改管理员可以导出参数列表 2023-05-31 14:57:53 +08:00
范强强 9d32a3c6f2 修改UAT提出的问题 2023-05-09 11:31:50 +08:00
zyx.net a0054f9d70 角色切换修改 责任领域改为认证类别 状态下拉框修改 2023-04-24 10:24:52 +08:00
zyx.net e4d784f79a 放开列表设置权限 表头缩窄 2023-04-18 15:28:20 +08:00
zhn fc660da9e9 飞书消息-认证参数收集 2023-04-13 17:19:05 +08:00
zyx.net 1b48353efa 参数收集清单退回逻辑修改 2023-04-13 11:12:44 +08:00
zyx.net f72f03ac6c 参数收集自定义表头修改 2023-04-07 16:32:24 +08:00
zyx.net 4417b03641 参数收集自定义表头合并配置列 2023-04-06 16:35:46 +08:00
zyx.net 62ee6c395c 参数收集自定义表头 2023-04-06 16:04:16 +08:00
zyx.net a24233cb76 参数收集自定义表头 2023-04-06 13:52:45 +08:00
范强强 1e73e2650a 修改认证清单-studio和认证工程师点击更多,底部空白较大 2023-04-04 10:29:44 +08:00
zyx.net c30cb597f3 上报库参数收集自定义表头 2023-04-03 15:46:09 +08:00
刘彦泽 6a38495b8f 全局高级搜索位置调整 2023-03-29 10:05:35 +08:00
高嵩 e115fc742e Merge branch 'master' into dev_2nd_LCYH
# Conflicts:
#	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/document/service/impl/BussDocumentLibraryEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
2023-03-24 16:56:38 +08:00
高嵩 f2a1ac87b3 Merge branch 'feature_dev_20230103_KJJY' into dev_2nd_LCYH
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
#	jero-web/src/components/CollectionType/index.vue
#	jero-web/src/components/CollectionTypeDisabled/index.vue
#	jero-web/src/components/tableCollection/index.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
2023-03-20 10:26:24 +08:00
范强强 66f8eb0235 参数收集清单-批量更新截止时间接口 2023-03-01 15:06:39 +08:00
高嵩 97334963cf 合并分支 'dev_2nd_20230213' 到 'master'
Dev 2nd 20230213

查看合并请求 laws-nio/laws-weilai!294
2023-02-27 18:11:03 +08:00
wangzhijiang 12ec9b71ba uat-58、61修改 2023-02-20 14:58:29 +08:00
高嵩 3e8401a979 合并分支 'fix_2nd_20230103' 到 'master'
参数收集清单 定时器问题

查看合并请求 laws-nio/laws-weilai!292
2023-02-17 17:20:44 +08:00
zyx.net 0df387106e 参数收集清单 定时器问题 2023-02-16 16:03:14 +08:00
高嵩 4505f05c8b 法规清单和参数收集清单责任领域搜索条件放到外面 2023-02-13 15:08:29 +08:00
范强强 b182f01d49 修改收集清单的更新参数列数据 2023-02-02 11:41:34 +08:00
sunFlower 7e606d48f5 修改参数收集增加数据 2023-02-01 16:12:21 +08:00
sunFlower 53c16e9bf0 修改参数收集增加数据 2023-02-01 11:11:52 +08:00
sunFlower 068f6d2929 修改参数收集增加数据 2023-02-01 10:32:20 +08:00
sunFlower 74498f2ed3 修改参数收集增加数据 2023-01-31 17:37:53 +08:00
sunFlower b7254cc1e3 修改参数收集增加数据 2023-01-31 16:04:39 +08:00
sunFlower 05bd11ae93 修改参数收集增加数据 2023-01-31 15:14:01 +08:00
sunFlower 1c6325fc68 修改参数收集增加数据 2023-01-31 14:59:44 +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
刘彦泽 5fd0c14c11 UI界面变更-项目参数任务 2022-12-29 16:16:04 +08:00
wangzhijiang 83b805edaa 参数收集清单
1.同步上报库
2.认证工程师、工程接口人、填写人 退回
3.认证工程师、工程接口人 强制撤回
4.工程接口人分配填写人
5.填写人提交
操作增加历史log
2022-12-27 17:46:24 +08:00
刘彦泽 64f41aaab4 UI界面变更-图标样式 2022-12-20 13:24:19 +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
zyx.net 1f54406206 认证工程师 强制撤回修改接口 2022-12-08 14:25:48 +08:00
zyx.net 449657bf13 参数收集清单 更新参考列功能 2022-12-07 16:58:56 +08:00
zyx.net 67c01e8485 参考列禁用 2022-12-07 15:53:43 +08:00
zyx.net a87fea4114 参数项清单添加引用参数列功能 2022-12-06 14:45:38 +08:00
刘彦泽 31bcf72d31 UI界面变更 2022-12-02 13:36:24 +08:00
liyawei 1c20e1c637 认证-参数项收集-编号搜索 2022-11-28 20:37:27 +08:00
liyawei cf54c4271b 认证-参数清单-参数导出改为同步 2022-11-24 11:31:53 +08:00
zyx.net ccc0cb5512 修改认证 2022-11-16 16:06:59 +08:00
787203167 0058770d36 Merge branch 'dev_2nd_period_test' into 'feature_dev_20221008_TODO'
# Conflicts:
#   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/ParamsManifestEOMapper.xml
2022-11-03 14:41:16 +08:00