WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,637 Commits 1 Branch 0 Tags
db2259d2854f05de72e111f5b652b92d696d8628
Commit Graph
679 Commits
Author SHA1 Message Date
高嵩 db2259d285 合并分支 'feature_dev_20230105_ZDYBT' 到 'master' 
Feature dev 20230105 zdybt

查看合并请求 laws-nio/laws-weilai!286
 2023-02-11 22:13:17 +08:00
高嵩 78332f7c90 Merge remote-tracking branch 'origin/master' 2023-02-11 22:11:49 +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
高嵩 4424ee1540 合并分支 'feature_dev_20221129_UI' 到 'master' 
Feature dev 20221129 ui

查看合并请求 laws-nio/laws-weilai!283
 2023-02-11 21:51:40 +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
高嵩 da302e52f8 Merge remote-tracking branch 'origin/fix_2nd_20230103' 
# Conflicts:
#	jero-web/src/views/projectManagement/components/listAddModel.vue
 2023-01-12 21:09:27 +08:00
高嵩 8e94c26f09 Merge remote-tracking branch 'origin/fix_2nd_20230103' into fix_2nd_20230103 2023-01-12 18:41:56 +08:00
高嵩 c57ec9ff59 修改UI 2023-01-12 18:41:45 +08:00
zyx.net aae6064df3 添加清单UI修改 2023-01-12 18:22:36 +08:00
zyx.net 4431d63afc 调取 高级搜索 顺序调整 2023-01-12 17:09:42 +08:00
zyx.net 78fe3d9913 调取功能增加高级搜索 2023-01-12 16:36:30 +08:00
zyx.net be9fddb19a 清单模板显示除任务信息外的全部字段 2023-01-12 15:13:38 +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 1d5501b82d 法规清单调取需可以全选 2023-01-12 10:12:01 +08:00
刘彦泽 332872f076 任务清单-系统表格高度 2023-01-10 09:59:35 +08:00
zyx.net 1ed4250bc0 法规清单表头高度修改 2023-01-09 17:55:44 +08:00
zyx.net 8038fa4d7a 自定义表头 2023-01-09 15:57:58 +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 43af0f8c23 法规清单 自定义表头数据转换json 2023-01-06 17:28:29 +08:00
zyx.net 5d312c2d95 法规清单 自定义表头 2023-01-06 17:09:34 +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