 高嵩
|
f2a1ac87b3
|
Merge branch 'feature_dev_20230103_KJJY' into dev_2nd_LCYH
# Conflicts:
# jero-boot/db/蔚来标准sql/dev_2nd_period.sql
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
# jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
# jero-web/src/components/CollectionType/index.vue
# jero-web/src/components/CollectionTypeDisabled/index.vue
# jero-web/src/components/tableCollection/index.vue
# jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
|
2023-03-20 10:26:24 +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 |
|
|
wangzhijiang
|
62bdf8a25a
|
参数模板明细-表头排序。
|
2023-02-09 17:15:24 +08:00 |
|
|
刘彦泽
|
003aff1959
|
参数项列表-列宽可拖拽
|
2023-02-09 16:46:29 +08:00 |
|
|
zyx.net
|
ed05c8c023
|
模板详情 责任领域修改
|
2023-02-09 13:51:16 +08:00 |
|
|
zyx.net
|
5e13324ace
|
收集清单 上报库 模板详情 表头排序
|
2023-02-09 11:22:06 +08:00 |
|
|
刘彦泽
|
6bce97b148
|
认证管理-上报库管理-列宽可拖拽
|
2023-02-06 13:51:10 +08:00 |
|
|
范强强
|
f168d73c38
|
修改收集清单的更新参数列数据
|
2023-02-03 14:25:48 +08:00 |
|
|
范强强
|
c6fcaaf773
|
修改收集清单的更新参数列数据
|
2023-02-03 10:21:34 +08:00 |
|
|
刘彦泽
|
7a5a6a976a
|
认证管理-参数模板管理-列宽可拖拽
|
2023-02-02 15:17:49 +08:00 |
|
|
刘彦泽
|
f61c08c2ab
|
认证管理-上报库管理-列宽可拖拽
|
2023-01-31 14:00:18 +08:00 |
|
|
刘彦泽
|
9c9f5f1cf3
|
参数导出模板管理-调整列宽
|
2023-01-13 10:52:00 +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 |
|
|
刘彦泽
|
a7fb5b2ce6
|
UI界面变更-上报库管理-参数项查看页
|
2022-12-30 11:03:49 +08:00 |
|
|
zyx.net
|
e2b4d17ee9
|
参数导出模板管理--适用地区没有表头排序
参数模板管理-表头有两个适用地区
|
2022-12-29 17:16:19 +08:00 |
|
|
刘彦泽
|
bdbe0ebb17
|
UI界面变更-认证管理、
|
2022-12-28 17:49:54 +08:00 |
|
|
刘彦泽
|
c1a32e7ef8
|
UI界面变更-未符合项跟踪-法规符合性看板
|
2022-12-28 17:34:35 +08:00 |
|
|
zyx.net
|
b05f2bf3c9
|
合并代码
|
2022-12-28 16:12:31 +08:00 |
|
|
zyx.net
|
1ce576b6b3
|
参数模板管理适用地区修改
|
2022-12-27 15:28:45 +08:00 |
|
|
zyx.net
|
2879fb9442
|
参数导出模板管理添加适用地区
|
2022-12-27 15:20:51 +08:00 |
|
|
zyx.net
|
850b208aa2
|
参数导出模板添加适用地区;法规清单导出 名称修改
|
2022-12-27 15:06:45 +08:00 |
|
|
zyx.net
|
8c0b7bf0c0
|
参数模板管理;未符合项;参数导出模板管理 表格排序问题
|
2022-12-23 10:59:20 +08:00 |
|
|
zyx.net
|
4f8f1626b6
|
我的收藏;我的订阅 表格排序问题
|
2022-12-22 11:13:39 +08:00 |
|
|
刘彦泽
|
64f41aaab4
|
UI界面变更-图标样式
|
2022-12-20 13:24:19 +08:00 |
|
|
zyx.net
|
9f5436e17e
|
上报库增加备注列，历史记录
|
2022-12-02 11:18:45 +08:00 |
|
|
liyawei
|
27a1ab3231
|
认证-上报库-编号搜索
|
2022-12-01 10:38:40 +08:00 |
|
|
liyawei
|
34992878ce
|
认证-参数模板-编号搜索
|
2022-11-29 13:36:27 +08:00 |
|
|
787203167
|
a26bae373e
|
Merge branch 'dev_2nd_period_test' into 'dev_third_stage'
# Conflicts:
# 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/cuibanModel.vue
|
2022-11-03 14:39:38 +08:00 |
|
|
zyx.net
|
bed54d7869
|
参数项列表新增 控件备选值不能输入！和#
|
2022-11-03 09:52:37 +08:00 |
|
|
sunFlower
|
13308fdb03
|
修改认证参数列表
|
2022-10-20 11:10:41 +08:00 |
|
|
高嵩
|
e6f6b19362
|
修改法规清单的备注和参数的编号名称限制字符
|
2022-09-23 16:54:15 +08:00 |
|
|
高嵩
|
bcae7f63af
|
修改法规清单的备注和参数的编号名称限制字符
|
2022-09-23 14:50:59 +08:00 |
|
|
sunFlower
|
d2b7ff9b95
|
1.认证参数导出时增加文件名称输入
|
2022-09-19 19:26:08 +08:00 |
|
|
sunFlower
|
77f1cdd022
|
1.认证参数导出时增加文件名称输入
|
2022-09-19 14:27:22 +08:00 |
|
|
zyx.net
|
032cd97009
|
上报库删除按钮权限
|
2022-09-13 16:52:31 +08:00 |
|
|
zyx.net
|
96740e313e
|
上报库删除功能
|
2022-09-13 11:37:57 +08:00 |
|
|
范强强
|
29e41a9356
|
修改禅道已知bug
|
2022-09-07 20:05:04 +08:00 |
|
|
zyx.net
|
51497b21de
|
参数导出模板；对外报告管理
列表缩略
|
2022-09-07 15:36:34 +08:00 |
|
|
gaosong
|
bea743190e
|
修改上报库-查看 上间距
|
2022-09-07 14:54:42 +08:00 |
|
|
范强强
|
9563e6e93a
|
修改禅道已知bug
|
2022-08-25 14:46:01 +08:00 |
|
|
zyx.net
|
12d3533663
|
注释选择标题时隐藏认证类别
|
2022-08-25 14:34:41 +08:00 |
|
|
zyx.net
|
e8023f07c7
|
注释选择标题时隐藏认证类别
|
2022-08-25 14:21:55 +08:00 |
|
|
qq787203167
|
b413153c8a
|
修改禅道已知问题
|
2022-08-24 14:29:25 +08:00 |
|
|
zyx.net
|
23fe9aa04a
|
参数导出模板管理 上传附件类型限制
|
2022-08-24 13:34:59 +08:00 |
|
|
zyx.net
|
97f46daa06
|
批量修改状态弹框
|
2022-08-22 16:12:46 +08:00 |
|
|
qq787203167
|
77ba4c2b00
|
修改禅道已知bug
|
2022-08-19 17:42:18 +08:00 |
|
|
zyx.net
|
71edecbc63
|
修改bug
|
2022-08-19 09:20:23 +08:00 |
|
|
zyx.net
|
a3b0130723
|
修改bug
|
2022-08-18 16:44:55 +08:00 |
|
|
zyx.net
|
30275f0267
|
修改bug
|
2022-08-18 16:42:01 +08:00 |
|
|
zyx.net
|
f5b16e8543
|
修改bug
|
2022-08-18 15:38:28 +08:00 |
|