diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 3acdcb933..02073653e 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -666,4 +666,19 @@ INSERT INTO `sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `co -- 认证清单表 交付物字段扩大 2023-06-21 未同步生产环境 ALTER TABLE `project_certification_inventory` - MODIFY COLUMN `deliverable` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物' AFTER `duty_territory`; \ No newline at end of file + MODIFY COLUMN `deliverable` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物' AFTER `duty_territory`; + +-- 法规清单 添加责任部门 2023-07-14 未同步生产环境 +ALTER TABLE `auth_dummy_inventory_info` + ADD COLUMN `duty_depart` varchar(255) NULL AFTER `attestation_type`; + +ALTER TABLE `dummy_inventory_info` + ADD COLUMN `duty_depart` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任部门' AFTER `buss_document_library_id`; + +ALTER TABLE `project_laws_inventory` + ADD COLUMN `duty_depart` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任部门' AFTER `process_end_time`; + +ALTER TABLE `project_certification_inventory` + ADD COLUMN `duty_depart` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任部门' AFTER `attestation_type`; + + diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index 4fc57b1c4..a657fdee3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -253,7 +253,9 @@ public class OSSFileServiceImpl extends ServiceImpl impl String[] fileTypeArr = {".doc", ".DOC", ".txt", ".TXT", ".docx", ".DOCX", ".xls", ".XLS", ".xlsx", ".XLSX", ".pdf", ".PDF", ".png", ".PNG", ".jfif", ".JFIF", ".pjpeg", ".PJPEG", ".jpeg", ".JPEG", ".pjp", ".PJP", - ".jpg", ".JPG", ".swf", ".SWF", ".bmp", ".BMP", ".rar", ".RAR", ".zip", ".ZIP", ".ppt", ".PPT", ".pptx", ".PPTX", ".csv", ".CSV", ".gif", ".GIF"}; + ".jpg", ".JPG", ".swf", ".SWF", ".bmp", ".BMP", ".rar", ".RAR", ".zip", + ".ZIP", ".ppt", ".PPT", ".pptx", ".PPTX", ".csv", ".CSV", ".gif", ".GIF", + ".msg", ".MSG"}; boolean flag = true; for (String fileTypeTemp : fileTypeArr) { if (fileTypeTemp.equalsIgnoreCase(fileType)) { @@ -262,9 +264,9 @@ public class OSSFileServiceImpl extends ServiceImpl impl } if (flag) { if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/gif/静态图片类型的文件。请重新选择文件!"); + throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/msg/gif/静态图片类型的文件。请重新选择文件!"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/gif/Static image type file. Please re select the file!"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/msg/gif/Static image type file. Please re select the file!"); } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 9e744b85d..3090433dd 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -853,4 +853,31 @@ public class SysDictController { return result; } + /** + * 获取责任部门列表Responsible Department + */ + @ApiOperation(value = "字典控制器-获取责任部门列表", notes = "字典控制器-获取责任部门列表") + @GetMapping(value = "/getDutyDepart") + public Result> getDutyDeparts() { + Result> result = new Result<>(); + List ls = sysDictItemService.getDutyDeparts("duty_territory"); + result.setSuccess(true); + result.setResult(ls); + return result; + } + + /** + * 根据责任部门获取责任领域 + * @return + */ + @ApiOperation(value = "字典控制器-根据责任部门获取责任领域", notes = "字典控制器-根据责任部门获取责任领域") + @GetMapping(value = "/getDutyTeryByDD") + public Result> getDutyTeryByDD(@RequestParam String dutyDepart) { + Result> result = new Result<>(); + List ls = sysDictItemService.getDutyTeryByDD("duty_territory",dutyDepart); + result.setSuccess(true); + result.setResult(ls); + return result; + } + } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java index 4487a3877..5a5ce37b2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java @@ -1,5 +1,6 @@ package com.jero.modules.system.service; +import com.jero.common.system.vo.DictModel; import com.jero.modules.system.entity.SysDictItem; import com.baomidou.mybatisplus.extension.service.IService; @@ -19,6 +20,19 @@ public interface ISysDictItemService extends IService { public List selectItemsByDictCode(String dictCode); + /** + * 获取责任部门,去重 + * @param code + * @return + */ + public List getDutyDeparts(String code); + + /** + * 根据责任部门获取责任领域 + * @param ddStrs + * @return + */ + public List getDutyTeryByDD(String code,String ddStrs); /** * 查询所有数据字典信息 * @return diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java index a73c187ec..ee29a9f72 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java @@ -23,6 +23,7 @@ public interface ISysDictService extends IService { public List queryDictItemsByCode(String code); + public Map> queryAllDictItems(); public Map> queryAllDictItemsByCut(String cut); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java index f0a7f27b6..09e1f1a81 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java @@ -2,8 +2,10 @@ package com.jero.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.vo.DictModel; import com.jero.modules.enums.DictCodeEnum; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.mapper.SysDictItemMapper; @@ -11,12 +13,10 @@ import com.jero.modules.system.service.ISysDictItemService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -44,6 +44,37 @@ public class SysDictItemServiceImpl extends ServiceImpl getDutyDeparts(String code) { + List ddList = this.selectItemsByDictCode(code); + Map ddMap = new HashMap<>(); + for (SysDictItem dd: ddList) { + if(!ddMap.containsKey(dd.getStatNode())){ + ddMap.put(dd.getStatNode(),dd); + } + } + List res = (List) ddMap.values(); + Collections.sort(res, Comparator.comparingInt(SysDictItem::getSortOrder)); + return res; + } + + @Override + public List getDutyTeryByDD(String code, String ddStrs) { + List res = new ArrayList<>(); + List ddList = this.selectItemsByDictCode(code); + List list = new ArrayList<>(); + if (StringUtils.isNotEmpty(ddStrs)) { + list = Arrays.asList(ddStrs.split(",")); + } + for (SysDictItem dd : ddList) { + if (list.contains(dd.getStatNode())) { + res.add(dd); + } + } + Collections.sort(res, Comparator.comparingInt(SysDictItem::getSortOrder)); + return res; + } + /** * 查询所有数据字典信息 * @return diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java index 69cd8bdf5..f627832be 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java @@ -103,6 +103,9 @@ public class AuthDummyInventoryInfoEO implements Serializable { @TableField(exist = false) private String dutyTerritoryNameEn; + /**责任部门*/ + @ApiModelProperty(value = "责任部门") + private String dutyDepart; /**交付物*/ // @Excel(name = "交付物", width = 15) @ApiModelProperty(value = "交付物") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java index cd6089938..938c7565b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java @@ -101,6 +101,10 @@ public class AuthDummyInventoryInfoEOEn implements Serializable { @TableField(exist = false) private String dutyTerritoryNameEn; + /**责任部门*/ + @ApiModelProperty(value = "责任部门") + private String dutyDepart; + /**交付物*/ // @Excel(name = "Deliverables", width = 15) @ApiModelProperty(value = "交付物") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 4d59bc41e..6ddfe2164 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -710,6 +710,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl processInfoDetailEOQueryWrapper = new QueryWrapper<>(); @@ -3622,12 +3644,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl + + +
+
+ {{$t('statisticalNodes')}} +
+ + + + + {{ item.key }} + + + + +
+
+ +
+
+ {{$t('areaOfResponsibility')}} +
+ + + + + {{ item.itemText }} + + + + + + + + + + + + + +
+
+
@@ -63,26 +123,6 @@
- -
-
- {{$t('areaOfResponsibility')}} -
- - - - - - - - -
-
-
-
@@ -97,6 +137,8 @@
+ +
@@ -112,8 +154,6 @@
- -
@@ -135,6 +175,9 @@
+ + +
@@ -152,8 +195,6 @@
- -
@@ -191,13 +232,41 @@ formInline: {}, rules: {}, ids: [], - CategoryTreeList: [] + CategoryTreeList: [], + firstLevelDutyTerritoryList: [], + dutyTerritoryList: [] } }, mounted() { this.getSysCategoryTree() }, methods: { + getFirstLevelDutyTerritory() { + getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { + if (res.success) { + this.firstLevelDutyTerritoryList = res.result + } else { + this.firstLevelDutyTerritoryList = [] + } + }) + }, + DutyDepartChange(event) { + this.formInline.dutyTerritory = [] + this.formInline = { ...this.formInline } + this.getDutyTerritory(event.join(',')) + }, + getDutyTerritory(row) { + let query = { + dutyDepart: row + } + getAction('/sys/dict/getDutyTeryByDD', query).then((res) => { + if (res.success) { + this.dutyTerritoryList = res.result || [] + } else { + this.dutyTerritoryList = [] + } + }) + }, getSysCategoryTree() { getAction(this.url.getSysCategoryTree, {}).then((res) => { if (res.success) { @@ -209,7 +278,9 @@ }, edit(data) { this.visible = true + this.dutyTerritoryList = [] this.getSysCategoryTree() + this.getFirstLevelDutyTerritory() this.$nextTick(() => { this.ids = data || [] this.formInline = {} diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 86c3f38e6..e66a93320 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -250,6 +250,68 @@
+ + +
+
+ * + {{$t('statisticalNodes')}} +
+ + + + + {{ item.key }} + + + + +
+
+ +
+
+ * + {{$t('areaOfResponsibility')}} +
+ + + + + {{ item.itemText }} + + + + + + + + + +
+
+
@@ -273,22 +335,7 @@
- -
-
- * - {{$t('areaOfResponsibility')}} -
- - - -
-
+
@@ -691,20 +738,56 @@ message: this.$t('areaOfResponsibility') + this.$t('cannotEmpty'), trigger: 'change' } - ] + ], + dutyDepart:[ + { + required: true, + message: this.$t('statisticalNodes') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], }, formInline: {}, disabled: false, title: '', CategoryTreeList: [], - DeliverableTreeList: [] + DeliverableTreeList: [], + firstLevelDutyTerritoryList:[], + dutyTerritoryList:[], } }, mounted() { this.getSysCategoryTree() this.getDeliverableTree() + this.getFirstLevelDutyTerritory() }, methods: { + DutyDepartChange(event) { + this.formInline.dutyTerritory = [] + this.formInline = {...this.formInline} + this.getDutyTerritory(event.join(',')) + }, + getDutyTerritory(row) { + let query = { + dutyDepart: row + } + getAction('/sys/dict/getDutyTeryByDD', query).then((res) => { + if (res.success) { + this.dutyTerritoryList = res.result || [] + } else { + this.dutyTerritoryList = [] + } + }) + }, + getFirstLevelDutyTerritory() { + getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { + if (res.success) { + this.firstLevelDutyTerritoryList = res.result + } else { + this.firstLevelDutyTerritoryList = [] + } + }) + }, getSysCategoryTree() { getAction(this.url.getSysCategoryTree, {}).then((res) => { if (res.success) { @@ -733,6 +816,8 @@ this.formInline.designDeliverableType = this.formInline.designDeliverableType ? this.formInline.designDeliverableType.split(',') : [] this.formInline.prehomoDeliverableType = this.formInline.prehomoDeliverableType ? this.formInline.prehomoDeliverableType.split(',') : [] this.formInline.verifyDeliverableType = this.formInline.verifyDeliverableType ? this.formInline.verifyDeliverableType.split(',') : [] + this.formInline.dutyDepart = this.formInline.dutyDepart ? this.formInline.dutyDepart.split(',') : [] + this.formInline.dutyTerritory = this.formInline.dutyTerritory ? this.formInline.dutyTerritory.split(',') : [] this.$refs.ruleForm.clearValidate() }) }, @@ -746,6 +831,8 @@ this.formInline.designDeliverableType = this.formInline.designDeliverableType ? this.formInline.designDeliverableType.split(',') : [] this.formInline.prehomoDeliverableType = this.formInline.prehomoDeliverableType ? this.formInline.prehomoDeliverableType.split(',') : [] this.formInline.verifyDeliverableType = this.formInline.verifyDeliverableType ? this.formInline.verifyDeliverableType.split(',') : [] + this.formInline.dutyDepart = this.formInline.dutyDepart ? this.formInline.dutyDepart.split(',') : [] + this.formInline.dutyTerritory = this.formInline.dutyTerritory ? this.formInline.dutyTerritory.split(',') : [] this.$refs.ruleForm.clearValidate() }) }, @@ -997,4 +1084,7 @@ background: #fff; border-radius: 0 0 2px 2px; } + ::v-deep .ant-form-item-with-help { + margin-bottom: 25px; + } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 8caae84e1..cf8046bb1 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -556,6 +556,13 @@ sorter: true, ellipsis: true }, + { + title: this.$t('statisticalNodes'), + align: 'left', + ellipsis: true, + dataIndex: 'dutyDepart', + width: 110 + }, { title: this.$t('areaOfResponsibility'), align: 'left', @@ -822,15 +829,25 @@ key: 14, moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, + { + sort: '', + name: this.$t('statisticalNodes'), + headFieldCn: '责任部门', + headFieldEn: 'Duty Department', + field: 'dutyDepart', + key: 15, + moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' + }, { sort: '', name: this.$t('areaOfResponsibility'), headFieldCn: '责任领域', headFieldEn: 'Responsible Field', field: 'dutyTerritory_dictText', - key: 15, + key: 16, moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单' }, + // { // sort: '', // name: this.$t('regulatoryEngineer'), diff --git a/jero-web/src/views/phoneView/myCollection.vue b/jero-web/src/views/phoneView/myCollection.vue index 633b65a35..b3b9b3ca9 100644 --- a/jero-web/src/views/phoneView/myCollection.vue +++ b/jero-web/src/views/phoneView/myCollection.vue @@ -53,7 +53,7 @@ -
+
{{item.title}}
@@ -273,7 +273,7 @@ } .content-text-button { - font-size: 0.42rem; + font-size: 0.37rem; font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; color: #595E72; diff --git a/jero-web/src/views/phoneView/mySubscribe.vue b/jero-web/src/views/phoneView/mySubscribe.vue index 382d5e23e..e1436fa73 100644 --- a/jero-web/src/views/phoneView/mySubscribe.vue +++ b/jero-web/src/views/phoneView/mySubscribe.vue @@ -176,7 +176,7 @@ } .content-text-button { - font-size: 0.42rem; + font-size: 0.37rem; font-family: PingFang SC-Regular, PingFang SC; font-weight: 400; color: #595E72; diff --git a/jero-web/src/views/phoneView/preHomoMangement.vue b/jero-web/src/views/phoneView/preHomoMangement.vue index f8f1d5821..965477423 100644 --- a/jero-web/src/views/phoneView/preHomoMangement.vue +++ b/jero-web/src/views/phoneView/preHomoMangement.vue @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue index 6b86102b9..064bd0f75 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue @@ -10,17 +10,57 @@ > + +
+
+ {{$t('statisticalNodes')}} +
+ + + + + {{ item.key }} + + + + +
+
{{$t('areaOfResponsibility')}}
- + + + + {{ item.itemText }} + + + + + + + + @@ -29,6 +69,9 @@
+ +
+
@@ -67,14 +110,44 @@ export default { rules: {}, ids: [], DeliverableTreeList: [], + firstLevelDutyTerritoryList:[], + dutyTerritoryList:[], } }, mounted() { this.getDeliverableTree() }, methods: { + getFirstLevelDutyTerritory() { + getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { + if (res.success) { + this.firstLevelDutyTerritoryList = res.result + } else { + this.firstLevelDutyTerritoryList = [] + } + }) + }, + DutyDepartChange(event) { + this.formInline.dutyTerritory = [] + this.formInline = { ...this.formInline } + this.getDutyTerritory(event.join(',')) + }, + getDutyTerritory(row) { + let query = { + dutyDepart: row + } + getAction('/sys/dict/getDutyTeryByDD', query).then((res) => { + if (res.success) { + this.dutyTerritoryList = res.result || [] + } else { + this.dutyTerritoryList = [] + } + }) + }, edit(data) { this.visible = true + this.getFirstLevelDutyTerritory() + this.dutyTerritoryList = [] this.$nextTick(() => { this.ids = data || [] this.formInline = {} diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue index 5e685e787..7e55582a8 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue @@ -28,24 +28,6 @@
- -
-
- * - {{$t('areaOfResponsibility')}} -
- - - -
-
- -
@@ -61,24 +43,90 @@
+ + +
* - {{$t('certificationType')}} + {{$t('statisticalNodes')}} +
+ + + + + {{ item.key }} + + + + +
+
+ +
+
+ * + {{$t('areaOfResponsibility')}} +
+ + + + + {{ item.itemText }} + + + + + + + + + + +
+
+ +
+ + +
+
+ * + {{$t('certificationType')}}
+ :triggerChange="false" + :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>
-
-
@@ -90,10 +138,13 @@ v-model="formInline.category" :disabled="disabled" :title="formInline.category" - :placeholder="$t('PleaseEnter')+$t('category')" /> + :placeholder="$t('PleaseEnter')+$t('category')"/>
+ + +
@@ -109,8 +160,6 @@
- -
@@ -127,6 +176,9 @@
+ + +
@@ -136,7 +188,7 @@ + >
- -
@@ -179,276 +229,332 @@ {{$t('submit')}}
- +
\ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 7144a6cfe..e647ce260 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -373,6 +373,13 @@ ellipsis: true, scopedSlots: { customRender: 'serialNumber' } }, + { + title: this.$t('statisticalNodes'), + align: 'left', + dataIndex: 'dutyDepart', + width: 100, + ellipsis: true + }, { title: this.$t('areaOfResponsibility'), align: 'left',