Commit Graph
548 Commits
Author SHA1 Message Date
范强强 d1f5398016 修改法规清单 2023-03-20 10:26:45 +08:00
高嵩 77f0210811 Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH 2023-03-20 09:14:24 +08:00
高嵩 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
刘彦泽 f5800dbc57 中英文重复 2023-03-16 16:18:46 +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
范强强 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
刘彦泽 bea4b63e12 文档库-分阶段实施详情 2023-02-24 14:22:44 +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
高嵩 b43cc4a60f Merge branch 'feature_dev_20230105_ZDYBT'
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_2nd_period.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/projectManagement/components/customizeList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
2023-02-11 22:10:12 +08:00
高嵩 666bcc10ff 撤销 "Merge branch 'feature_20221014_noLogo' into 'master'"
这将还原提交 0fc81dd9fa
2023-02-03 15:19:11 +08:00
高嵩 0fc81dd9fa Merge branch 'feature_20221014_noLogo' into 'master'
# Conflicts:
#   jero-web/src/views/projectManagement/components/TaskList.vue
2023-02-03 10:30:13 +08:00
zyx.net bb9714da8a 知识分享联系创建人改为联系作者 2023-01-12 09:57:14 +08:00
zyx.net 5d312c2d95 法规清单 自定义表头 2023-01-06 17:09:34 +08:00
zyx.net 0fe60644a9 用户管理 责任领域添加全选功能 2023-01-06 09:53:33 +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