WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,531 Commits 1 Branch 0 Tags
0fe60644a9b8386e8b7743afec47031372b3b2c6
Commit Graph
449 Commits
Author SHA1 Message Date
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
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
zyx.net e4cc5c5f51 认证工程师分配填写人 2022-12-12 13:30:01 +08:00
zyx.net 734d7495ac 认证工程师 强制撤回状态校验 2022-12-08 15:02:11 +08:00
zyx.net 449657bf13 参数收集清单 更新参考列功能 2022-12-07 16:58:56 +08:00
wangzhijiang 4e27c76b78 飞书交互-根据用户账号获取飞书对话框链接接口开发。 
知识分享-增加"联系创建人"按钮，点击后打开飞书联系人对话框。
配置文件整理。
 2022-12-07 16:25:47 +08:00
zyx.net a87fea4114 参数项清单添加引用参数列功能 2022-12-06 14:45:38 +08:00
zyx.net f927f5c637 项目库 删除主项目提示修改 2022-12-06 10:34:45 +08:00
刘彦泽 638cc5b701 修改bug(法规月报新增技术领域补充字段) 2022-12-06 09:42:51 +08:00
刘彦泽 31bcf72d31 UI界面变更 2022-12-02 13:36:24 +08:00
zyx.net 9f5436e17e 上报库增加备注列，历史记录 2022-12-02 11:18:45 +08:00
liyawei 1c20e1c637 认证-参数项收集-编号搜索 2022-11-28 20:37:27 +08:00
zyx.net afb50c3fa9 用户管理修改 2022-11-16 11:21:09 +08:00
刘彦泽 bfe7b3974a 修改中英文翻译 2022-11-10 16:19:49 +08:00
高嵩 3f7ad00c1d Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend' 
# Conflicts:
#   jero-web/src/common/lang/en-us.js
#   jero-web/src/common/lang/zh-cn.js
 2022-11-03 14:32:08 +08:00
zyx.net 079a49ee5d 参数项收集清单导入导出修改 2022-11-03 10:41:44 +08:00
zyx.net c145f18ad1 任务清单增加催办功能 2022-11-02 10:08:41 +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
高嵩 3ba0ae2367 Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' 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/store/modules/user.js
#	jero-web/src/views/processCenter/components/feedbackInformation.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
 2022-10-27 09:49:39 +08:00
sunFlower ad691bd7cd 修改禅道已知bug 2022-10-26 14:59:22 +08:00
sunFlower f223ab39aa 修改禅道已知bug 2022-10-26 09:11:44 +08:00
高嵩 798a3b5161 Merge branch 'dev_2nd_period' into 'feature_dev_20221010_extend' 
# Conflicts:
#   jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
 2022-10-24 10:09:49 +08:00
sunFlower a7f6a476e3 修改认证参数列表 2022-10-20 11:00:01 +08:00
刘彦泽 a0d1decb59 修改中英文翻译 2022-10-19 13:51:39 +08:00
sunFlower 94dad9ec77 对接待办中心 2022-10-18 15:17:03 +08:00
sunFlower 2dd540a03a 对接项目库 2022-10-18 10:01:17 +08:00
sunFlower 22c49f22c3 对接待办中心 2022-10-17 18:01:46 +08:00
sunFlower 2cbfb02ea6 布局项目库变更 2022-10-17 10:59:54 +08:00
zyx.net 396b58f892 待办中心 项目参数任务对接后端 2022-10-17 10:49:18 +08:00
刘彦泽 5b48e3aac5 修改中英文翻译 2022-10-14 15:28:03 +08:00
sunFlower cc976709a5 布局项目库变更 2022-10-14 15:18:01 +08:00
sunFlower 9510b39db1 布局待办中心 2022-10-14 13:58:15 +08:00
sunFlower d118dcaad9 布局待办中心 2022-10-14 11:39:39 +08:00
sunFlower 84c0dca152 布局待办中心 2022-10-14 10:19:54 +08:00
刘彦泽 b988662436 Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage 
# Conflicts:
#	jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
 2022-10-13 10:38:54 +08:00
刘彦泽 772901c74a 修改中英文翻译 2022-10-13 10:36:26 +08:00
sunFlower ae7a9c7a62 修改禅道已知bug 2022-10-12 16:53:14 +08:00
sunFlower dafff274e1 修改禅道已知bug 2022-10-10 17:06:57 +08:00
sunFlower a6dae21469 修改禅道已知bug 2022-10-10 15:47:33 +08:00
sunFlower c906c35566 修改禅道已知bug 2022-10-10 10:22:01 +08:00
sunFlower c1a95d3539 修改禅道已知bug 2022-10-09 17:56:11 +08:00
sunFlower ac49267c7f 修改禅道已知bug 2022-09-30 11:53:50 +08:00
sunFlower 59e828a166 修改三期优化点 2022-09-29 14:10:45 +08:00
sunFlower 2c829d2860 修改三期优化点 2022-09-28 16:52:31 +08:00
sunFlower c19e32410e 1.修改三期优化点 2022-09-27 16:24:32 +08:00
sunFlower c39419061a 1.修改三期优化点 2022-09-27 11:26:55 +08:00