From 6538a3803fe313b8601518c02ef6a2d1b71460cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 14 Jul 2023 10:06:58 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/phoneView/myCollection.vue | 4 +- jero-web/src/views/phoneView/mySubscribe.vue | 2 +- .../src/views/phoneView/preHomoMangement.vue | 43 ++++++++++++++++--- .../src/views/phoneView/recentBrowsing.vue | 2 +- 4 files changed, 41 insertions(+), 10 deletions(-) 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..afbbef3f1 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/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue index 5e685e787..3f1bd5a95 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue @@ -28,6 +28,50 @@ + +
+
+ * + WVTA ID +
+ + + +
+ + + + + +
+
+ * + {{$t('statisticalNodes')}} +
+ + + + + {{ item.key }} + + + + +
+
@@ -44,29 +88,15 @@
+
* - WVTA ID -
- - - -
- - -
-
- * - {{$t('certificationType')}} + {{$t('certificationType')}}
- -
@@ -94,6 +122,9 @@
+ + +
@@ -109,8 +140,6 @@
- -
@@ -127,6 +156,9 @@
+ + +
@@ -136,7 +168,7 @@ + >
- -
@@ -205,6 +235,7 @@ export default { formInline: {}, disabled: false, DeliverableTreeList: [], + firstLevelDutyTerritoryList:[], rules: { serialNumber: [ { @@ -213,6 +244,13 @@ export default { trigger: 'change' } ], + firstLevelDutyTerritory: [ + { + required: true, + message: this.$t('statisticalNodes') + this.$t('areaOfResponsibility'), + trigger: 'change' + } + ], dutyTerritory: [ { required: true, @@ -272,8 +310,18 @@ export default { }, mounted() { this.getDeliverableTree() + this.getFirstLevelDutyTerritory() }, methods: { + getFirstLevelDutyTerritory() { + getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { + if (res.success) { + this.firstLevelDutyTerritoryList = res.result + } else { + this.firstLevelDutyTerritoryList = [] + } + }) + }, handleCancel() { this.visible = false }, @@ -288,6 +336,9 @@ export default { if (this.formInline.deliverableType) { this.formInline.deliverableType = this.formInline.deliverableType.split(',') } + if (this.formInline.firstLevelDutyTerritory) { + this.formInline.firstLevelDutyTerritory = this.formInline.firstLevelDutyTerritory.split(',') + } this.$refs.ruleForm.clearValidate() }) if(data == 1) { From 32ca148b48cbca42b761c7f076b10c1c89fd4d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 14 Jul 2023 15:15:34 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysDictController.java | 27 +++++++++++++ .../system/service/ISysDictItemService.java | 14 +++++++ .../service/impl/SysDictItemServiceImpl.java | 39 +++++++++++++++++-- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 1 - 5 files changed, 77 insertions(+), 6 deletions(-) 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..e2ecd89f7 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 = "字典控制器-获取责任部门列表") + @RequestMapping(value = "/getDutyDepart", method = RequestMethod.GET) + 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 ddStrs) { + Result> result = new Result<>(); + List ls = sysDictItemService.getDutyTeryByDD("duty_territory",ddStrs); + 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/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-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b30c0a9fd..d8f7b200b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1828,7 +1828,7 @@ module.exports = { proportion:'Proportion', projectProgressStatistics:'Project Progress Statistics', GRPSystemProjectProgressStatistics:'GRP system project progress statistics', - statisticalNodes:'Responsible Department', + statisticalNodes:'Duty Department', proportionWithInTheAreaOfResponsibility:'Proportion within the area of responsibility', contentsearch:'Content Search', masterProject:'Master Project', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e62a58bf2..36bb2472e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3833,7 +3833,6 @@ module.exports = { proportion:'占比', projectProgressStatistics:'项目进度统计', GRPSystemProjectProgressStatistics:'GRP系统项目进度统计', - statisticalNodes:'责任部门', proportionWithInTheAreaOfResponsibility:'责任领域内占比', contentsearch:'内容搜索', masterProject:'主项目', From e3844fa40d8c28bd0fffa2a4ca52245e4727a89c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 14 Jul 2023 15:18:40 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/controller/SysDictController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e2ecd89f7..5e54a92cb 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 @@ -872,9 +872,9 @@ public class SysDictController { */ @ApiOperation(value = "字典控制器-根据责任部门获取责任领域", notes = "字典控制器-根据责任部门获取责任领域") @GetMapping(value = "/getDutyTeryByDD") - public Result> getDutyTeryByDD(@RequestParam String ddStrs) { + public Result> getDutyTeryByDD(@RequestParam String DutyDepart) { Result> result = new Result<>(); - List ls = sysDictItemService.getDutyTeryByDD("duty_territory",ddStrs); + List ls = sysDictItemService.getDutyTeryByDD("duty_territory",DutyDepart); result.setSuccess(true); result.setResult(ls); return result; From daebd05f24b40d5c944788c5813c1042fd9d35a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 14 Jul 2023 15:19:12 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/controller/SysDictController.java | 2 +- .../java/com/jero/modules/system/service/ISysDictService.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 5e54a92cb..025a41fc2 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 @@ -857,7 +857,7 @@ public class SysDictController { * 获取责任部门列表Responsible Department */ @ApiOperation(value = "字典控制器-获取责任部门列表", notes = "字典控制器-获取责任部门列表") - @RequestMapping(value = "/getDutyDepart", method = RequestMethod.GET) + @GetMapping(value = "/getDutyDepart", method = RequestMethod.GET) public Result> getDutyDeparts() { Result> result = new Result<>(); List ls = sysDictItemService.getDutyDeparts("duty_territory"); 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); From fdd6beab760675b1c51841a745d6c6e9d1520c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 14 Jul 2023 15:26:53 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/controller/SysDictController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 025a41fc2..629fb950b 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 @@ -857,7 +857,7 @@ public class SysDictController { * 获取责任部门列表Responsible Department */ @ApiOperation(value = "字典控制器-获取责任部门列表", notes = "字典控制器-获取责任部门列表") - @GetMapping(value = "/getDutyDepart", method = RequestMethod.GET) + @GetMapping(value = "/getDutyDepart") public Result> getDutyDeparts() { Result> result = new Result<>(); List ls = sysDictItemService.getDutyDeparts("duty_territory"); From 10f276cdf61a5c3570016cfc74ae242af997fb72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 14 Jul 2023 15:48:07 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/controller/SysDictController.java | 4 ++-- .../modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java | 4 ++++ .../com/jero/modules/dummy/entity/DummyInventoryInfoEO.java | 4 ++++ .../project/entity/ProjectCertificationInventoryEO.java | 3 +++ .../jero/modules/project/entity/ProjectLawsInventoryEO.java | 4 ++++ 5 files changed, 17 insertions(+), 2 deletions(-) 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 629fb950b..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 @@ -872,9 +872,9 @@ public class SysDictController { */ @ApiOperation(value = "字典控制器-根据责任部门获取责任领域", notes = "字典控制器-根据责任部门获取责任领域") @GetMapping(value = "/getDutyTeryByDD") - public Result> getDutyTeryByDD(@RequestParam String DutyDepart) { + public Result> getDutyTeryByDD(@RequestParam String dutyDepart) { Result> result = new Result<>(); - List ls = sysDictItemService.getDutyTeryByDD("duty_territory",DutyDepart); + List ls = sysDictItemService.getDutyTeryByDD("duty_territory",dutyDepart); result.setSuccess(true); result.setResult(ls); return result; 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/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index 5deafa061..7950daead 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -191,6 +191,10 @@ public class DummyInventoryInfoEO implements Serializable { @TableField(exist = false) private java.lang.String dutyTerritoryStr; + /**责任部门*/ + @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/project/entity/ProjectCertificationInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java index ce184bbfd..7f8c25293 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java @@ -106,6 +106,9 @@ public class ProjectCertificationInventoryEO implements Serializable { @TableField(exist = false) private String dutyTerritoryNameEn; + /**责任部门*/ + @ApiModelProperty(value = "责任部门") + private String dutyDepart; /**工程接口人*/ @ApiModelProperty(value = "工程接口人") private String sdt; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 045b3a717..bec053579 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -174,6 +174,10 @@ public class ProjectLawsInventoryEO implements Serializable { @TableField(exist = false) private String dutyTerritory_dictText; + /**责任部门*/ + @ApiModelProperty(value = "责任部门") + private String dutyDepart; + /**法规工程师id*/ @ApiModelProperty(value = "法规工程师id") private String regulationOwnerId; From 1f819e0e2034f97a74752e3b967b02b1793ae55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 14 Jul 2023 16:58:34 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/authDummy/entity/AuthDummyInventoryInfoEO.java | 3 +++ 1 file changed, 3 insertions(+) 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 = "交付物") From d738def82eaa6b2636e440983f90b897a7d17a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 14 Jul 2023 17:08:09 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AuthDummyInventoryInfoEOServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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..eed60a3d2 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 @@ -1644,6 +1644,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Fri, 14 Jul 2023 17:08:54 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E3=80=81=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E3=80=81=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E3=80=81=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/editModel.vue | 68 +- .../certificationList/components/addModel.vue | 123 +++- .../components/listEditModel.vue | 82 ++- .../components/addModel.vue | 69 +- .../components/editModel.vue | 607 ++++++++++-------- 5 files changed, 609 insertions(+), 340 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index e939d9cf8..e66a93320 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -258,13 +258,15 @@ {{$t('statisticalNodes')}}
- + + v-model="formInline.dutyDepart"> {{$t('areaOfResponsibility')}}
- + + + + {{ item.itemText }} + + + + + + + +
@@ -720,7 +738,14 @@ message: this.$t('areaOfResponsibility') + this.$t('cannotEmpty'), trigger: 'change' } - ] + ], + dutyDepart:[ + { + required: true, + message: this.$t('statisticalNodes') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], }, formInline: {}, disabled: false, @@ -728,6 +753,7 @@ CategoryTreeList: [], DeliverableTreeList: [], firstLevelDutyTerritoryList:[], + dutyTerritoryList:[], } }, mounted() { @@ -736,6 +762,23 @@ 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) { @@ -773,7 +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.firstLevelDutyTerritory = this.formInline.firstLevelDutyTerritory ? this.formInline.firstLevelDutyTerritory.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() }) }, @@ -787,7 +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.firstLevelDutyTerritory = this.formInline.firstLevelDutyTerritory ? this.formInline.firstLevelDutyTerritory.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() }) }, @@ -1039,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/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 1e9c7ae83..8ea23ad84 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -163,15 +163,16 @@ :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}
+ v-model="item.dutyDepart"> - + + + + {{ val.itemText }} + + + + + + + + +
@@ -413,13 +430,14 @@ {{$t('statisticalNodes')}}
- + + v-model="formInline.dutyDepart"> {{$t('areaOfResponsibility')}}
- - + + + + {{ item.itemText }} + + + + + + + + + @@ -662,6 +696,7 @@ personnelVisible: false, yearNameDataList: [], firstLevelDutyTerritoryList: [], + dutyTerritoryList: [], rules: { serialNumber: [ { @@ -709,7 +744,7 @@ trigger: 'change' } ], - firstLevelDutyTerritory: [ + dutyDepart: [ { required: true, message: this.$t('statisticalNodes') + this.$t('cannotEmpty'), @@ -787,7 +822,23 @@ } }) }, - + DutyDepartChangeOne(event) { + this.formInline.dutyTerritory = [] + this.formInline = {...this.formInline} + this.getDutyTerritoryOne(event.join(',')) + }, + getDutyTerritoryOne(row) { + let query = { + dutyDepart: row + } + getAction('/sys/dict/getDutyTeryByDD', query).then((res) => { + if (res.success) { + this.dutyTerritoryList = res.result || [] + } else { + this.dutyTerritoryList = [] + } + }) + }, addModel() { this.visible = true this.personnelVisible = true @@ -804,14 +855,18 @@ this.formInline = {} this.visible = true this.personnelVisible = true - value.firstLevelDutyTerritory = value.firstLevelDutyTerritory ? value.firstLevelDutyTerritory.split(',') : [] + value.dutyDepart = value.dutyDepart ? value.dutyDepart.split(',') : [] + value.dutyTerritory = value.dutyTerritory ? value.dutyTerritory.split(',') : [] this.formInline = JSON.parse(JSON.stringify(value)) // if (this.formInline.deliverableType) { // this.formInline.deliverableType = this.formInline.deliverableType.split(',') // } - if (value.dutyTerritory) { - this.queryPersonByProject(value.dutyTerritory) + if (value.dutyDepart && value.dutyDepart.length > 0) { + this.getDutyTerritoryOne(value.dutyDepart.join(',')) + } + if (value.dutyTerritory && value.dutyTerritory.length > 0) { + this.queryPersonByProject(value.dutyTerritory.join(',')) } this.getRegulationNo() this.title = this.$t('edit') @@ -844,6 +899,7 @@ Action = postAction query.dataList.forEach(val => { delete val.engineeringInterfacePersonList + delete val.dutyTerritoryList Object.keys(val).forEach(res => { if (val[res] && val[res] instanceof Array) { val[res] = val[res].join(',') @@ -883,6 +939,24 @@ } }) }, + DutyDepartChange(index) { + this.formInline.dataList[index].dutyTerritory = [] + this.formInline = { ...this.formInline } + this.getDutyTerritory(this.formInline.dataList[index].dutyDepart.join(','),index) + }, + getDutyTerritory(row,index) { + let query = { + dutyDepart: row + } + getAction('/sys/dict/getDutyTeryByDD', query).then((res) => { + if (res.success) { + this.formInline.dataList[index].dutyTerritoryList = res.result || [] + } else { + this.formInline.dataList[index].dutyTerritoryList = [] + } + this.formInline = {...this.formInline} + }) + }, handleInput(value, id, index, array) { if (array) { let content = array.filter(res => { @@ -974,12 +1048,13 @@ }, handleChange(value) { this.formInline.sdt = undefined - this.queryPersonByProject(this.formInline.dutyTerritory) + this.queryPersonByProject(this.formInline.dutyTerritory.join(',')) }, dutyHandleChange(index) { this.formInline.dataList[index].sdt = undefined this.formInline = { ...this.formInline } - this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory, index) + this.handleInput('dataList.' + index + '.dutyTerritory') + this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory.join(','), index) }, queryPersonByProject(row, index) { let query = { diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index e89383015..c8faf16b8 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -103,13 +103,15 @@ {{$t('statisticalNodes')}} - + + v-model="formInline.dutyDepart"> {{$t('areaOfResponsibility')}} - + + + + {{ item.itemText }} + + + + + + + + + @@ -606,7 +625,7 @@ trigger: 'change' } ], - firstLevelDutyTerritory:[ + dutyDepart: [ { required: true, message: this.$t('statisticalNodes') + this.$t('cannotEmpty'), @@ -696,7 +715,7 @@ message: this.$t('typeOfDeliverables') + this.$t('cannotEmpty'), trigger: 'change' } - ], + ] }, formInline: { verifyDeliverableType: [], @@ -719,6 +738,7 @@ DeliverableTreeList: [], userInfoQuery: {}, rejectCauseList: [], + dutyTerritoryList: [] } }, mounted() { @@ -785,6 +805,23 @@ } }) }, + 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 = [] + } + }) + }, dutyTerritoryChange(event) { this.formInline.regulationOwnerId = undefined this.formInline.engineeringInterfacePerson = undefined @@ -792,20 +829,26 @@ this.formInline.designInitiatorId = undefined this.formInline.prehomoInitiatorId = undefined this.formInline.verifyInitiatorId = undefined - this.queryPersonByProject(event) + this.queryPersonByProject(event.join(',')) }, queryPersonByProject(row) { + let dutyTerritory = '' + if (row.dutyTerritory) { + dutyTerritory = row.dutyTerritory.join(',') + } else { + dutyTerritory = row + } let query = { projectId: this.$route.query.id, - dutyTerritory: row.dutyTerritory || row + dutyTerritory: dutyTerritory } getAction(this.url.queryPersonByProject, query).then((res) => { if (res.success) { this.regulatoryEngineerList = res.result.lawEngineerList //法规工程师 this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList //工程接口人 this.certificationEngineerList = res.result.certificationEngineerList //认证工程师 - if (row.dutyTerritory) { + if (row.dutyTerritory && row.dutyTerritory.length > 0) { let _this = this this.getProject(row, res, function() { _this.getData(row, res) @@ -865,9 +908,14 @@ item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : [] item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : [] item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : [] - item.firstLevelDutyTerritory = item.firstLevelDutyTerritory ? item.firstLevelDutyTerritory.split(',') : [] + item.dutyDepart = item.dutyDepart ? item.dutyDepart.split(',') : [] + item.dutyTerritory = item.dutyTerritory ? item.dutyTerritory.split(',') : [] this.getRejectCause(item.id) - if (item.dutyTerritory) { + if (item.dutyDepart && item.dutyDepart.length > 0) { + this.getDutyTerritory(item.dutyDepart.join(',')) + } + console.log(item.dutyTerritory) + if (item.dutyTerritory && item.dutyTerritory.length > 0) { this.queryPersonByProject(item) } else { this.formInline = item @@ -1145,4 +1193,8 @@ 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/virtualAuthenticationList/components/addModel.vue b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue index f53d0b938..afafd88e3 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue @@ -49,13 +49,15 @@ {{$t('statisticalNodes')}} - + + v-model="formInline.dutyDepart"> {{$t('areaOfResponsibility')}} - + + + + {{ item.itemText }} + + + + + + + + + + @@ -242,6 +259,7 @@ disabled: false, formInline: {}, confirmLoading: false, + dutyTerritoryList: [], projectNameList: [], DeliverableTreeList: [], firstLevelDutyTerritoryList: [], @@ -260,7 +278,7 @@ trigger: 'change' } ], - firstLevelDutyTerritory: [ + dutyDepart: [ { required: true, message: this.$t('statisticalNodes') + this.$t('areaOfResponsibility'), @@ -289,6 +307,23 @@ }, methods: { ...mapGetters(['userInfo']), + 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) { @@ -322,12 +357,13 @@ if (valid) { this.formInline.authDummyInventoryBaseId = this.$route.query.id let query = JSON.parse(JSON.stringify(this.formInline)) - query.dataList.forEach(val => { - Object.keys(val).forEach(res => { - if (val[res] && val[res] instanceof Array) { - val[res] = val[res].join(',') + Object.keys(query).forEach(res => { + if (query[res] && query[res] instanceof Array) { + if (res == 'dataList') { + } else { + query[res] = query[res].join(',') } - }) + } }) this.confirmLoading = true postAction(this.url.addModel, query).then((res) => { @@ -509,4 +545,7 @@ ::v-deep .attestationType .ant-form-explain { margin-top: -16px; } + ::v-deep .ant-form-item-with-help { + margin-bottom: 25px; + } \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue index 3f1bd5a95..7e55582a8 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue @@ -49,17 +49,19 @@
- * + * {{$t('statisticalNodes')}}
- + + v-model="formInline.dutyDepart">
* - {{$t('areaOfResponsibility')}} + {{$t('areaOfResponsibility')}}
- + + + + {{ item.itemText }} + + + + + + + + +
@@ -103,7 +122,8 @@ :disabled="disabled" :placeholder="$t('PleaseSelect')+$t('certificationType')" :type="'select'" - :triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/> + :triggerChange="false" + :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/> @@ -118,7 +138,7 @@ v-model="formInline.category" :disabled="disabled" :title="formInline.category" - :placeholder="$t('PleaseEnter')+$t('category')" /> + :placeholder="$t('PleaseEnter')+$t('category')"/> @@ -209,297 +229,332 @@ {{$t('submit')}} - + \ No newline at end of file From 0ceb5e02b7b4d271875639950693e4fe78be1b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 14 Jul 2023 17:35:29 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 17 ++++++++++++++++- .../impl/ProjectLawsInventoryEOServiceImpl.java | 4 ++++ 2 files changed, 20 insertions(+), 1 deletion(-) 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-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 4951e5d44..e7670ea95 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -4425,6 +4425,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Fri, 14 Jul 2023 17:37:13 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AuthDummyInventoryInfoEOServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 eed60a3d2..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 Date: Fri, 14 Jul 2023 17:41:09 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E3=80=81=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E3=80=81=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E3=80=81=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/batSetting.vue | 120 +++++++++++++---- .../components/virtualListDetails.vue | 19 ++- .../components/batSetting.vue | 94 +++++++++++-- .../components/batSetting.vue | 126 ++++++++++++++---- .../components/certificationList/index.vue | 7 + .../components/listOfRegulations.vue | 16 +++ .../components/batSetting.vue | 82 +++++++++++- .../certificationListMaintenance.vue | 7 + 8 files changed, 402 insertions(+), 69 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue index 28dadbb9a..1a2943dcb 100644 --- a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue +++ b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue @@ -44,6 +44,66 @@ + + +
+
+ {{$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) { @@ -210,6 +279,7 @@ edit(data) { this.visible = true this.getSysCategoryTree() + this.getFirstLevelDutyTerritory() this.$nextTick(() => { this.ids = data || [] this.formInline = {} 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/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue index 216718257..12b425c54 100644 --- a/jero-web/src/views/projectManagement/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/batSetting.vue @@ -51,17 +51,60 @@
- {{$t('areaOfResponsibility')}} + {{$t('statisticalNodes')}}
- + + + + {{ item.key }} + + +
+ +
+
+ {{$t('areaOfResponsibility')}} +
+ + + + + {{ item.itemText }} + + + + + + + + + +
+ + +
@@ -91,8 +134,6 @@
- -
@@ -360,18 +401,46 @@ rules: {}, ids: [], code: '', + dutyTerritoryList:[], regulatoryEngineerList: [], - engineeringInterfacePersonList: [] + engineeringInterfacePersonList: [], + firstLevelDutyTerritoryList:[], } }, mounted() { }, 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 = [] + } + }) + }, dutyTerritoryChange(event) { this.formInline.regulationOwnerId = undefined this.formInline.engineeringInterfacePerson = undefined this.formInline = { ...this.formInline } - this.queryPersonByProject(event) + this.queryPersonByProject(event.join(',')) }, queryPersonByProject(row) { let query = { @@ -401,13 +470,14 @@ this.regulatoryEngineerList = [] this.engineeringInterfacePersonList = [] this.getDeliverableTree() + this.getFirstLevelDutyTerritory() this.code = code this.$nextTick(() => { this.ids = data || [] this.formInline = {} if (content && code == '0') { - this.formInline.dutyTerritory = content.dutyTerritory - this.queryPersonByProject(content) + // this.formInline.dutyTerritory = content.dutyTerritory + // this.queryPersonByProject(content) } this.formInline = { ...this.formInline } }) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue index a157413a5..f20a902e3 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue @@ -29,23 +29,6 @@
- -
-
- {{$t('areaOfResponsibility')}} -
- - - -
- - -
@@ -70,6 +53,69 @@
+ + + + +
+
+ {{$t('statisticalNodes')}} +
+ + + + + {{ item.key }} + + + + +
+ + + +
+
+ {{$t('areaOfResponsibility')}} +
+ + + + + {{ item.itemText }} + + + + + + + + + + +
+ + + +
@@ -90,8 +136,6 @@
- -
@@ -111,6 +155,8 @@
+ +
@@ -164,11 +210,13 @@ formInline: {}, rules: {}, ids: [], + firstLevelDutyTerritoryList: [], configurationItemList: [], engineeringInterfacePersonList: [], typeOfDeliverablesList: [], name: '', - DeliverableTreeList: [] + DeliverableTreeList: [], + dutyTerritoryList:[], } }, mounted() { @@ -177,7 +225,32 @@ disabledDate(current) { return current && current < moment().subtract(1, 'day') }, - + 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 = [] + } + }) + }, getDeliverableTree() { getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => { if (res.success) { @@ -187,16 +260,17 @@ } }) }, - edit(data, name,content) { + edit(data, name, content) { this.visible = true this.getDeliverableTree() + this.getFirstLevelDutyTerritory() this.$nextTick(() => { this.ids = data || [] this.formInline = {} this.name = name if (content && name == this.$t('BatchSetting')) { - this.formInline.dutyTerritory = content.dutyTerritory - this.queryPersonByProject(content.dutyTerritory) + // this.formInline.dutyTerritory = content.dutyTerritory + // this.queryPersonByProject(content.dutyTerritory) } this.formInline = { ...this.formInline } }) @@ -231,7 +305,7 @@ } else { url = this.url.setBatch } - if (!query.configItem){ + if (!query.configItem) { query.configItem = undefined } postAction(url, query).then((res) => { @@ -286,7 +360,7 @@ }, handleChange(value) { this.formInline.sdt = undefined - this.queryPersonByProject(this.formInline.dutyTerritory) + this.queryPersonByProject(this.formInline.dutyTerritory.join(',')) }, queryPersonByProject(row) { let query = { diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index e144def4d..0d5eb5cf4 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -739,6 +739,13 @@ sorter: true, scopedSlots: { customRender: 'serialNumber' } }, + { + title: this.$t('statisticalNodes'), + align: 'left', + dataIndex: 'dutyDepart', + width: 100, + ellipsis: true + }, { title: this.$t('areaOfResponsibility'), align: 'left', diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index d90b4bf48..a5077dd18 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -858,6 +858,13 @@ width: 180, sorter: true }, + { + title: this.$t('statisticalNodes'), + align: 'left', + ellipsis: true, + dataIndex: 'dutyDepart', + width: 120 + }, { title: this.$t('areaOfResponsibility'), align: 'left', @@ -1126,6 +1133,15 @@ key: 6, moduleFlag: '法规清单' }, + { + sort: '', + name: this.$t('statisticalNodes'), + headFieldCn: '责任部门', + headFieldEn: 'Duty Department', + field: 'dutyDepart', + key: 8, + moduleFlag: '法规清单' + }, { sort: '', name: this.$t('areaOfResponsibility'), diff --git a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue index 6b86102b9..eec6af2c4 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,43 @@ 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.$nextTick(() => { this.ids = data || [] this.formInline = {} 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', From 2f486343a2621a7f12fe3b5d69d4567762188b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 14 Jul 2023 17:45:29 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/service/impl/DummyInventoryInfoEOServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 5db1e9113..486ba10c1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1360,6 +1360,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Fri, 14 Jul 2023 17:52:52 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E3=80=81=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E3=80=81=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E3=80=81=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/phoneView/preHomoMangement.vue | 8 ++++++++ .../src/views/phoneView/processManagement.vue | 8 ++++++++ .../components/designCompliance.vue | 18 ++++++++++++++---- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/phoneView/preHomoMangement.vue b/jero-web/src/views/phoneView/preHomoMangement.vue index afbbef3f1..7c28dd8f8 100644 --- a/jero-web/src/views/phoneView/preHomoMangement.vue +++ b/jero-web/src/views/phoneView/preHomoMangement.vue @@ -55,6 +55,14 @@ {{$t('cutoffTime')}} {{queryForm.endTime || '--'}}
+
+ {{$t('statisticalNodes')}} + {{queryForm['dutyDepart'] || '--'}} +
+
+ {{$t('areaOfResponsibility')}} + {{queryForm['dutyTerritoryName'] || queryForm['dutyTerritory_dictText'] || '--'}} +
{{$t('typeOfDeliverables')}} {{queryForm.deliverableTypeName || '--'}} diff --git a/jero-web/src/views/phoneView/processManagement.vue b/jero-web/src/views/phoneView/processManagement.vue index 600debeef..851f48643 100644 --- a/jero-web/src/views/phoneView/processManagement.vue +++ b/jero-web/src/views/phoneView/processManagement.vue @@ -45,6 +45,14 @@ {{$t('deliveryDate')}} {{queryProject[queryData.DueDate] || '--'}}
+
+ {{$t('statisticalNodes')}} + {{queryProject['dutyDepart'] || '--'}} +
+
+ {{$t('areaOfResponsibility')}} + {{queryProject['dutyTerritoryName'] || queryProject['dutyTerritory_dictText'] || '--'}} +
{{$t('typeOfDeliverables')}} {{queryProject[queryData.typeOfDeliverables] || '--'}} diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index 3def13ac9..9bf569afd 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -166,10 +166,10 @@ this.visible = false }, referenceDeliverablesClick() { - this.$refs.referenceDeliverablesListRef.transferModel(this.queryData.flowType,JSON.parse(JSON.stringify(this.queryProject))) + this.$refs.referenceDeliverablesListRef.transferModel(this.queryData.flowType, JSON.parse(JSON.stringify(this.queryProject))) }, referenceDeliverablesListForm(data) { - this.$refs.reviewedByThePersonInChargeRef.getData(JSON.parse(JSON.stringify(data))) + this.$refs.reviewedByThePersonInChargeRef.getData(JSON.parse(JSON.stringify(data))) }, confirm(operatorTime) { this.$refs.reviewedByThePersonInChargeRef.submit((res) => { @@ -224,6 +224,14 @@ title: this.$t('deliveryDate'), value: this.queryData.DueDate }, + { + title: this.$t('statisticalNodes'), + value: 'dutyDepart' + }, + { + title: this.$t('areaOfResponsibility'), + value: 'dutyTerritory_dictText' + }, { title: this.$t('typeOfDeliverables'), value: this.queryData.typeOfDeliverables @@ -348,12 +356,14 @@ font-size: 16px; z-index: 20; } + ::v-deep .ant-drawer-header { top: 0; position: sticky; z-index: 20; } - ::v-deep .ant-drawer-header .ant-drawer-title{ - font-weight: bold; + + ::v-deep .ant-drawer-header .ant-drawer-title { + font-weight: bold; } \ No newline at end of file From b52fe6681fb94e0b78dc173bb12824ad8c96febe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 14 Jul 2023 17:55:35 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E3=80=81=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E3=80=81=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E3=80=81=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/batSetting.vue | 1 + .../projectManagement/components/batSetting.vue | 15 ++++++++------- .../certificationList/components/batSetting.vue | 3 ++- .../components/batSetting.vue | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue index 1a2943dcb..83f22632b 100644 --- a/jero-web/src/views/documentTools/virtualList/components/batSetting.vue +++ b/jero-web/src/views/documentTools/virtualList/components/batSetting.vue @@ -278,6 +278,7 @@ }, edit(data) { this.visible = true + this.dutyTerritoryList = [] this.getSysCategoryTree() this.getFirstLevelDutyTerritory() this.$nextTick(() => { diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue index 12b425c54..41b4cde95 100644 --- a/jero-web/src/views/projectManagement/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/batSetting.vue @@ -95,11 +95,11 @@ - - - - - + + + + +
@@ -401,10 +401,10 @@ rules: {}, ids: [], code: '', - dutyTerritoryList:[], + dutyTerritoryList: [], regulatoryEngineerList: [], engineeringInterfacePersonList: [], - firstLevelDutyTerritoryList:[], + firstLevelDutyTerritoryList: [] } }, mounted() { @@ -468,6 +468,7 @@ edit(data, code, content) { this.visible = true this.regulatoryEngineerList = [] + this.dutyTerritoryList = [] this.engineeringInterfacePersonList = [] this.getDeliverableTree() this.getFirstLevelDutyTerritory() diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue index f20a902e3..b8f1ea628 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue @@ -216,7 +216,7 @@ typeOfDeliverablesList: [], name: '', DeliverableTreeList: [], - dutyTerritoryList:[], + dutyTerritoryList: [] } }, mounted() { @@ -267,6 +267,7 @@ this.$nextTick(() => { this.ids = data || [] this.formInline = {} + this.dutyTerritoryList = [] this.name = name if (content && name == this.$t('BatchSetting')) { // this.formInline.dutyTerritory = content.dutyTerritory diff --git a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue index eec6af2c4..064bd0f75 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/batSetting.vue @@ -147,6 +147,7 @@ export default { edit(data) { this.visible = true this.getFirstLevelDutyTerritory() + this.dutyTerritoryList = [] this.$nextTick(() => { this.ids = data || [] this.formInline = {} From 377ea4cc8a2254dd8ca8ed18f9df0c16540463f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 14 Jul 2023 17:58:41 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E3=80=81=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E3=80=81=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E3=80=81=E5=B8=82?= =?UTF-8?q?=E5=9C=BA=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/phoneView/preHomoMangement.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-web/src/views/phoneView/preHomoMangement.vue b/jero-web/src/views/phoneView/preHomoMangement.vue index 7c28dd8f8..965477423 100644 --- a/jero-web/src/views/phoneView/preHomoMangement.vue +++ b/jero-web/src/views/phoneView/preHomoMangement.vue @@ -34,6 +34,10 @@ {{$t('areaOfResponsibility')}} {{queryForm.dutyTerritoryName || '--'}}
+
+ {{$t('engineeringInterfacePerson')}} + {{queryForm.sdtName || '--'}} +
{{$t('certifiedEngineer')}}