WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,545 Commits 1 Branch 0 Tags
7e606d48f55edc85d0ae68a5f36da8989097b8f6
Commit Graph
122 Commits
Author SHA1 Message Date
高嵩 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 bb82387ea5 我的消息列表中，去掉发起人字段列 2022-12-30 14:01:00 +08:00
zyx.net a9118dc7b7 viewer角色只有查看功能，查看技术评估结果页面不需要有“发起补充流程”按钮 2022-12-30 11:59:24 +08:00
高嵩 76f958ae74 用户管理 角色配置品牌选择框 2022-12-30 11:23:43 +08:00
zyx.net 46a89d7b4a 参数收集--历史记录中的引号不对称 2022-12-30 10:52:07 +08:00
刘彦泽 61760acdba UI界面变更-开发工具-表头字体背景颜色 2022-12-29 18:25:55 +08:00
zyx.net 05426961e4 人员管理-选择一个人员-点击角色配置-选择角色为品牌管理员，弹框中没有显示品牌选择框 2022-12-29 17:43:42 +08:00
刘彦泽 1043e32d94 UI界面变更-系统管理 2022-12-29 17:14:22 +08:00
刘彦泽 1724b6a898 UI界面变更-日志-个人中心 2022-12-29 16:56:53 +08:00
刘彦泽 59ebc9ee2f UI界面变更-消息中心 2022-12-29 16:40:13 +08:00
zyx.net 40f1fbec1e 引用参数列搜索问题 2022-12-29 15:27:53 +08:00
高嵩 3c8cfab750 Merge remote-tracking branch 'origin/dev_2nd_period_test' into fix_2nd_period 2022-12-29 10:21:36 +08:00
zyx.net b05f2bf3c9 合并代码 2022-12-28 16:12:31 +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
CD ca1fb97fc5 前端品牌回显 + 后端大列表修改权限筛选 2022-12-27 16:11:22 +08:00
zyx.net b76106ebb6 项目库品牌修改 2022-12-27 14:20:19 +08:00
zyx.net fb044bbd88 品牌管理员权限相关问题 2022-12-27 09:54:47 +08:00
高嵩 6529b4ed52 修改优化点 2022-11-22 15:55:26 +08:00
CD 2d40c42d5d 法规技术评估、法规意见收集添加品牌字段，根据viewer角色跟品牌字段进行筛选 2022-11-17 14:37:16 +08:00
zyx.net 196d5a24dc 用户管理 编辑 2022-11-16 14:22:02 +08:00
zyx.net afb50c3fa9 用户管理修改 2022-11-16 11:21:09 +08:00
sunFlower 92618c37b8 修改消息标题展示 
法规预警增加跳转文档库
 2022-11-09 13:50:03 +08:00
787203167 9fd21f787b 合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test' 
Feature dev 20221025 message

查看合并请求 laws-nio/laws-weilai!233
 2022-11-03 14:41:59 +08:00
CD 847d5ec527 1、定时器分页有问题 暂时先改成这样 用于测试 
2、消息全部处理完毕
 2022-11-02 17:02:55 +08:00
sunFlower ca82a088eb 修改禅道已知bug 2022-11-02 15:29:54 +08:00
高嵩 cf6a9fa0cd 合并分支 'dev_third_stage' 到 'dev_2nd_period_test' 
Dev third stage

查看合并请求 laws-nio/laws-weilai!226
 2022-11-02 09:07:54 +08:00
sunFlower 691af95e43 修改禅道已知bug 2022-11-01 14:45:05 +08:00
高嵩 d1cc66ebfa 合并分支 'feature_dev_20221025_message' 到 'dev_2nd_period_test' 
Feature dev 20221025 message

查看合并请求 laws-nio/laws-weilai!220
 2022-10-28 16:35:53 +08:00
sunFlower 91a7cae62a 修改禅道已知bug 2022-10-28 11:54:29 +08:00
高嵩 8fd885a8fa Merge remote-tracking branch 'origin/feature_dev_20221025_message' into dev_2nd_period_test 
# Conflicts:
#	jero-boot/db/蔚来标准sql/dev_third_record.sql
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/processCenter/components/feedbackInformation.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
 2022-10-27 15:21:33 +08:00
sunFlower 35e0310605 修改禅道已知bug 2022-10-26 17:41:28 +08:00
sunFlower 91af6e71c6 修改消息通知 2022-10-25 09:34:31 +08:00
高嵩 867d55793a 菜单管理 表格内容左对齐 2022-09-30 16:11:17 +08:00
范强强 08199886b9 添加消息类型 2022-09-02 11:34:58 +08:00
zyx.net 4174a518ce 我的消息 消息类型认证任务修改认证参数收集 2022-08-23 10:24:02 +08:00
qq787203167 93f19bf51a 修改禅道已知bug 2022-08-18 12:31:29 +08:00
zyx.net 24dc594118 修改禅道bug 2022-08-10 09:56:44 +08:00
qq787203167 2ca19d1120 修改禅道已知bug 2022-07-26 16:45:07 +08:00
zyx.net c2f828377e 用户管理-搜索条件展开收起问题 2022-07-22 17:30:44 +08:00
zyx.net 52e3945af5 用户管理-增加组织机构搜索条件 2022-07-22 15:43:42 +08:00
zyx.net c7dbf58f68 用户管理-增加组织机构搜索条件 2022-07-22 15:30:42 +08:00
zyx.net 6a916e0037 用户管理-查看-手机号码字段修改 2022-07-22 10:48:06 +08:00
qq787203167 0d165293f9 消息详情下载 2022-07-21 17:52:01 +08:00
qq787203167 c5ccf1f28a 修改消息类型 2022-07-19 18:04:37 +08:00
qq787203167 d697908c8c 修改禅道已知bug 2022-07-14 09:35:08 +08:00
qq787203167 d118f62635 修改禅道已知bug 2022-07-11 11:06:55 +08:00
qq787203167 3e78b5c09d 修改禅道已知bug 2022-07-11 09:43:43 +08:00
zer0Black eb01aeb236 消息补充标题 2022-07-09 13:05:51 +08:00
qq787203167 54ed6ab748 修改禅道已知bug 2022-07-09 09:23:15 +08:00
qq787203167 f879261d75 修改禅道已知bug 2022-07-08 18:02:13 +08:00