 高嵩
|
8667d76838
|
Merge branch 'feature_dev_20230222_FJDSS' into dev_2nd_LCYH
# Conflicts:
# jero-boot/db/蔚来标准sql/dev_2nd_period.sql
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
|
2023-03-20 09:13:21 +08:00 |
|
|
刘彦泽
|
992a45ba55
|
bug
|
2023-03-20 09:03:35 +08:00 |
|
|
zyx.net
|
e528dd438d
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
# Conflicts:
# jero-web/src/common/lang/en-us.js
# jero-web/src/common/lang/zh-cn.js
|
2023-03-17 17:59:47 +08:00 |
|
|
zyx.net
|
631e9993ff
|
ota中英文翻译
|
2023-03-17 17:57:40 +08:00 |
|
|
范强强
|
57d8bbd147
|
修改法规清单
|
2023-03-17 17:23:17 +08:00 |
|
|
范强强
|
321d57e101
|
修改法规清单
|
2023-03-17 14:45:26 +08:00 |
|
|
刘彦泽
|
a7457e3c1c
|
待办中心-项目法规任务
|
2023-03-17 11:40:31 +08:00 |
|
|
高嵩
|
9eb84ced51
|
修改UAT问题 项目状态看板排序和搜索跳转等
|
2023-03-16 17:40:04 +08:00 |
|
|
刘彦泽
|
b2c39254b7
|
待办中心-项目法规任务-办理抽屉
|
2023-03-16 16:17:02 +08:00 |
|
|
范强强
|
ce7090277c
|
修改项目库详情
|
2023-03-16 10:45:21 +08:00 |
|
|
zyx.net
|
39b363446a
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
# Conflicts:
# jero-web/src/common/lang/en-us.js
# jero-web/src/common/lang/zh-cn.js
|
2023-03-16 09:17:15 +08:00 |
|
|
zyx.net
|
85e6f6460c
|
OTA管理中英文翻译
|
2023-03-16 09:16:12 +08:00 |
|
|
高嵩
|
d17ae70ca2
|
问题标签改为分类 新增标签改为新增分类
|
2023-03-15 11:27:08 +08:00 |
|
|
范强强
|
81e27e8785
|
对接认证清单引用交付物
|
2023-03-15 09:48:35 +08:00 |
|
|
范强强
|
ee39d9ca8f
|
对接认证清单引用交付物
|
2023-03-14 17:33:46 +08:00 |
|
|
范强强
|
0e6a8a3632
|
对接认证清单引用交付物
|
2023-03-14 16:43:23 +08:00 |
|
|
范强强
|
e077af041a
|
对接认证清单引用交付物
|
2023-03-14 09:35:55 +08:00 |
|
|
刘彦泽
|
780d6996f0
|
文档工具-虚拟认证清单-模板下载名称a
|
2023-03-13 15:17:43 +08:00 |
|
|
zyx.net
|
bed9482353
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
# Conflicts:
# jero-web/src/common/lang/en-us.js
# jero-web/src/common/lang/zh-cn.js
|
2023-03-09 17:55:55 +08:00 |
|
|
zyx.net
|
de3fcf580b
|
修改法规清单-修改按钮权限；修改批量设置
|
2023-03-09 17:55:06 +08:00 |
|
|
范强强
|
efdd04d5d9
|
对接认证清单
|
2023-03-09 16:45:43 +08:00 |
|
|
范强强
|
6048f0ec82
|
对接认证清单
|
2023-03-09 15:44:03 +08:00 |
|
|
zyx.net
|
439d10e1c6
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
# Conflicts:
# jero-web/src/common/lang/en-us.js
# jero-web/src/common/lang/zh-cn.js
|
2023-03-09 15:36:57 +08:00 |
|
|
zyx.net
|
64be4e542d
|
修改法规清单 待办中心跳转
|
2023-03-09 15:35:07 +08:00 |
|
|
范强强
|
b367fb1ce8
|
对接认证清单
|
2023-03-09 15:08:29 +08:00 |
|
|
范强强
|
db27a37831
|
对接认证清单
|
2023-03-09 11:18:20 +08:00 |
|
|
范强强
|
5cf550a796
|
对接认证清单
|
2023-03-09 09:20:44 +08:00 |
|
|
zyx.net
|
b7d10bc957
|
Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
# Conflicts:
# jero-web/src/common/lang/en-us.js
# jero-web/src/common/lang/zh-cn.js
|
2023-03-08 17:45:08 +08:00 |
|
|
zyx.net
|
ac0df8917f
|
法规清单修改
|
2023-03-08 17:43:55 +08:00 |
|
|
范强强
|
5a8565b585
|
对接认证清单
|
2023-03-08 16:40:38 +08:00 |
|
|
范强强
|
74b39431a5
|
对接认证清单
|
2023-03-08 15:16:51 +08:00 |
|
|
刘彦泽
|
73d551bc6d
|
文档工具-虚拟认证清单详情
|
2023-03-08 15:05:18 +08:00 |
|
|
范强强
|
9ba26093c4
|
对接认证清单角色切换
|
2023-03-07 17:58:29 +08:00 |
|
|
范强强
|
0e44bb7b41
|
对接认证清单角色切换
|
2023-03-07 11:56:08 +08:00 |
|
|
范强强
|
e0a76d942e
|
对接认证清单增删改查
|
2023-03-06 11:46:52 +08:00 |
|
|
范强强
|
45c3372a31
|
添加认证清单
|
2023-03-03 17:58:03 +08:00 |
|
|
范强强
|
2e5e8a710a
|
添加认证清单
|
2023-03-03 15:07:01 +08:00 |
|
|
刘彦泽
|
a552d8b0ce
|
文档工具-虚拟认证清单-增删改查
|
2023-03-03 11:52:58 +08:00 |
|
|
范强强
|
66f8eb0235
|
参数收集清单-批量更新截止时间接口
|
2023-03-01 15:06:39 +08:00 |
|
|
刘彦泽
|
bea4b63e12
|
文档库-分阶段实施详情
|
2023-02-24 14:22:44 +08:00 |
|
|
高嵩
|
e475b4e336
|
修改参数模版控件类型
|
2023-02-23 21:09:25 +08:00 |
|
|
高嵩
|
d1748f29c5
|
1.高级搜索 日期类型控件修改
2.法规预警搜索条件修改
|
2023-02-17 16:07:11 +08:00 |
|
|
高嵩
|
161bf6e87a
|
自定义表头修改为列表设置
用户管理修改
|
2023-02-14 10:08:18 +08:00 |
|
|
高嵩
|
25e05dca21
|
知识分享 修改联系作者
|
2023-02-13 14:52:43 +08:00 |
|
|
zyx.net
|
5d312c2d95
|
法规清单 自定义表头
|
2023-01-06 17:09:34 +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 |
|
|
zyx.net
|
a34e928b0e
|
没有开始收集的参数清单时，提示信息不准确
|
2022-12-29 17:36:46 +08:00 |
|
|
zyx.net
|
469265a730
|
参数收集清单删除增加未收集状态情况
|
2022-12-28 14:41:04 +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 |
|
|
高嵩
|
e6af832e7f
|
Merge branch 'fix_2nd_period'
# Conflicts:
# jero-boot/db/蔚来标准sql/dev_2nd_period.sql
|
2022-12-16 17:55:57 +08:00 |
|