WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,949 Commits 1 Branch 0 Tags
152f138b7b829749367d2f8ff249f881c2cc60c4
Commit Graph
204 Commits
Author SHA1 Message Date
范强强 152f138b7b 修改法规清单 2023-03-17 15:25:00 +08:00
范强强 321d57e101 修改法规清单 2023-03-17 14:45:26 +08:00
范强强 69bdc91008 修改项目库详情 2023-03-17 10:23:23 +08:00
zyx.net de3fcf580b 修改法规清单-修改按钮权限；修改批量设置 2023-03-09 17:55:06 +08:00
zyx.net ac0df8917f 法规清单修改 2023-03-08 17:43:55 +08:00
范强强 9ba26093c4 对接认证清单角色切换 2023-03-07 17:58:29 +08:00
范强强 0e44bb7b41 对接认证清单角色切换 2023-03-07 11:56:08 +08:00
高嵩 b2d7f5b3a6 法规清单自定义表头修改 2023-02-22 10:13:49 +08:00
高嵩 beaf0c8d1b Merge remote-tracking branch 'origin/dev_2nd_20230213' into dev_2nd_20230213 
# Conflicts:
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
 2023-02-14 14:08:42 +08:00
高嵩 733a7d0c2a 自定义表头修改 2023-02-14 14:06:03 +08:00
刘彦泽 eba8909eaa 项目详情-表头间距 2023-02-14 13:38:45 +08:00
高嵩 7fab5980a7 自定义表头修改 2023-02-14 10:45:53 +08:00
高嵩 971def33fb 用户管理编辑提交报错问题 2023-02-14 09:26:18 +08:00
范强强 aad5aa283a 修改法规清单不显示按钮的问题 2023-02-13 21:43:22 +08:00
高嵩 4505f05c8b 法规清单和参数收集清单责任领域搜索条件放到外面 2023-02-13 15:08:29 +08:00
高嵩 25370a0857 修改表头拖拽 2023-02-13 10:50:41 +08:00
高嵩 8c3f610b04 Merge remote-tracking branch 'origin/feature_dev_20230109_BTTZ' into dev_2nd_20230213 
# Conflicts:
#	jero-web/src/mixins/header.js
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/customizeList.vue
 2023-02-13 09:51:53 +08:00
高嵩 db2259d285 合并分支 'feature_dev_20230105_ZDYBT' 到 'master' 
Feature dev 20230105 zdybt

查看合并请求 laws-nio/laws-weilai!286
 2023-02-11 22:13:17 +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
刘彦泽 350a3febc7 bug-法规清单-任务清单-减少列表下部空白和操作列宽度 2023-02-09 14:40:37 +08:00
zyx.net 6bbe9b2fd7 虚拟清单自定义表头 2023-02-03 11:23:43 +08:00
zyx.net e5a2b3df4a 自定义表头 2023-02-02 13:56:36 +08:00
zyx.net 03644065da 法规清单自定义表头 2023-02-01 16:48:32 +08:00
zyx.net 2553d595c6 修改自定义表头样式 2023-02-01 14:04:42 +08:00
高嵩 c57ec9ff59 修改UI 2023-01-12 18:41:45 +08:00
zyx.net 14f92624e6 法规清单列表上方搜索添加责任领域 2023-01-12 10:29:24 +08:00
zyx.net 5328d18ba4 法规清单列表上方搜索添加责任领域 2023-01-12 10:28:16 +08:00
zyx.net 1ed4250bc0 法规清单表头高度修改 2023-01-09 17:55:44 +08:00
zyx.net 8038fa4d7a 自定义表头 2023-01-09 15:57:58 +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
CD 93b12b94ee viewer权限显示补充 2022-12-30 10:13:20 +08:00
刘彦泽 c4cdb277b9 UI界面变更-法规清单 2022-12-30 09:58:55 +08:00
zyx.net b05f2bf3c9 合并代码 2022-12-28 16:12:31 +08:00
刘彦泽 e618da8108 UI界面变更-项目库-表单宽度-表格内容左对齐 2022-12-28 15:49:05 +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
zyx.net 850b208aa2 参数导出模板添加适用地区;法规清单导出 名称修改 2022-12-27 15:06:45 +08:00
zyx.net 8c0b7bf0c0 参数模板管理;未符合项;参数导出模板管理 表格排序问题 2022-12-23 10:59:20 +08:00
刘彦泽 72fa5d26cb UI界面变更-项目详情-法规清单 2022-12-21 09:24:35 +08:00
zyx.net 87ee7e6df0 任务清单;法规清单 表格排序问题 2022-12-16 17:01:15 +08:00
zyx.net dc8c72b70b 法规清单调取功能 2022-12-13 10:05:26 +08:00
sunFlower 1944cd5122 修改法规清单的拖动 2022-11-29 10:06:27 +08:00
CD b702a32c9e viewer根据责任领域筛选任务清单 2022-11-18 17:13:34 +08:00
CD d9b3f32594 法规清单列表 viewer查看权限 2022-11-18 10:13:53 +08:00
sunFlower 03de688e71 修改 2022-11-08 21:34:37 +08:00
sunFlower 923e099599 修改禅道已知bug 2022-11-01 15:36:11 +08:00
sunFlower ab92a4dcca 对接待办中心 2022-10-19 09:40:53 +08:00
sunFlower 1ec0784eb6 修改禅道已知bug 2022-10-09 20:49:04 +08:00
sunFlower 04aceb518b 1.修改三期优化点(图片预览) 2022-09-21 15:53:33 +08:00