From e70a42c824ee47f08d64fae4316dd0b1e1976331 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 30 Oct 2023 18:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=8A=A8=E6=80=81=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A4=E8=AF=81=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 21 + .../src/components/tableCollection/index.vue | 2198 +++++++++-------- 2 files changed, 1125 insertions(+), 1094 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index c447b23a5..1eb8a70d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1533,6 +1533,23 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl列表是否显示0否 1是) fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); } + //参数项认证清单-认证类型 + List categoryList = new ArrayList<>(); + if(ModuleEnum.PARAMS_COLLECT_MANIFEST.getValue().equals(flag)){ + List sysDictItemList = sysDictItemService.selectItemsByDictCode("cert_category"); + if(ObjectUtil.isNotEmpty(sysDictItemList)){ + categoryList = sysDictItemList.stream().map(SysDictItem::getItemValue).collect(Collectors.toList()); + } + List onlCgformFieldList = new LinkedList<>(); + for (SysDictItem sysDictItem : sysDictItemList) { + OnlCgformField onlCgformField = new OnlCgformField(); + onlCgformField.setDbFieldTxt(sysDictItem.getItemText()); + onlCgformField.setDbFieldEnName(sysDictItem.getEnName()); + onlCgformField.setDbFieldName(sysDictItem.getItemValue()); + onlCgformFieldList.add(onlCgformField); + } + fieldList.addAll(onlCgformFieldList); + } ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId); List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); List> listConfig = new LinkedList<>(); @@ -1590,6 +1607,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl
+ two-tone-color="#00B3BE"/> {{ item.db_field_txt }} {{ $t('See') }}
@@ -85,7 +85,7 @@ + @collectionForm="collectionForm"/> @@ -169,7 +169,7 @@ @input="handleInput('queryzr')" :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" :type="'select'" - :triggerChange="false" :dictCode="'duty_territory'" /> + :triggerChange="false" :dictCode="'duty_territory'"/> @@ -281,1159 +281,1169 @@