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 d4e9f4589..fce9cc117 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 @@ -142,4 +142,11 @@ public class AuthDummyInventoryInfoEO implements Serializable { @TableField(exist = false) @Excel(name = "交付物模板", width = 20) private String deliverableTemplateName; + + @TableField(exist = false) + private String orderByField; + + // 1顺序 2倒序 + @TableField(exist = false) + private String orderBy; } 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 b0132be73..6ccf3ec38 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 @@ -587,11 +587,43 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); + + String orderByField = authDummyInventoryInfoEO.getOrderByField(); + String orderBy = authDummyInventoryInfoEO.getOrderBy(); + // 如果排序字段不为空 + if(org.apache.commons.lang.StringUtils.isNotEmpty(orderByField)){ +// if (StringUtils.equals(orderBy,"2")) { +// orderBy = " DESC"; +// }else { +// orderBy = " ASC"; +// } + // 转换字段 + orderByField = convertOrderByField(orderByField); + queryWrapper.orderBy(true, "1".equals(orderBy)?true:false, orderByField); + }else { + queryWrapper.orderByDesc("create_time"); + } + List authDummyInventoryInfoEOList = this.list(queryWrapper); return authDummyInventoryInfoEOList; } + private String convertOrderByField(String orderByField) { + if(StringUtils.isEmpty(orderByField)){ + return null; + } + switch (orderByField) { + case "category" : return "category"; + case "inspectionItem" : return"inspection_item"; + case "configItem" : return"config_item"; + case "wvtaId" : return"wvta_id"; + case "serialNumber" : return "serial_number"; + case "dutyTerritory" : return "duty_territory"; + case "deliverableType" : return "deliverable_type"; + default: return null; + } + } + @Override public Result copyInfoByIds(String ids, String cut) { String resultMsg = ""; @@ -885,6 +917,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl queryLawEngineerByProjectId(@RequestParam Map params){ + List> regulatoryEngineerMapList = projectRelatedPersonnelService.queryLawEngineerByProjectId(params); + return Result.OK(regulatoryEngineerMapList); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml index 961232976..1bb3befd2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml @@ -45,7 +45,19 @@ prp.project_id=#{projectId} - AND prp.duty_territory=#{dutyTerritory} + AND ( + prp.duty_territory=#{dutyTerritory} + or prp.duty_territory in + + #{item} + + + ) AND prp.law_engineer like concat(concat('%',#{lawEngineer}),'%') diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index 29f18ec42..bb91c7abd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -94,4 +94,11 @@ public interface IProjectRelatedPersonnelService extends IService queryCertificationEngineer(String projectId); void setBatch(ProjectRelatedPersonnel projectRelatedPersonnel); + + /** + * 根据项目库id，查询相关人员名单中的法规工程师 + * @param params + * @return + */ + List> queryLawEngineerByProjectId(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 1fa83a183..fa094a093 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -248,6 +248,25 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl detailQueryWrap = new QueryWrapper<>(); + List idList = Arrays.asList(projectCertificationInventoryEO.getId().split(",")); + detailQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,idList); + detailQueryWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue()); + detailQueryWrap.lambda().eq(ProcessInfoDetailEO::getStatus,TaskStatusEnum.NOT_DONE.getValue()); + List taskDefinitionKeyList = new ArrayList<>(); + taskDefinitionKeyList.add(CertificationFlowNodeEnum.ZRRJSRW.getKey()); + taskDefinitionKeyList.add(CertificationFlowNodeEnum.ZRRTJRW.getKey()); + detailQueryWrap.lambda().in(ProcessInfoDetailEO::getTaskDefinitionKey,taskDefinitionKeyList); + + List processInfoDetailEOList = this.processInfoDetailEOService.list(detailQueryWrap); + if(CollectionUtils.isNotEmpty(processInfoDetailEOList)){ + processInfoDetailEOList.forEach(detail -> { + detail.setUserId(projectCertificationInventoryEO.getDutyPerson()); + }); + this.processInfoDetailEOService.updateBatchById(processInfoDetailEOList); + } } } @@ -348,13 +367,16 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl { + return StringUtils.isNotBlank(all); + }).distinct().collect(Collectors.toList()); + /** for(String all : allList){ if(all.equals("")){ allList.remove(all); } } - + */ //遍历所有人alllist中是否包含责任人,如果包含，不用操作。 //-------如果不包含,再去判断当前用户的角色是studio、法规还是认证 for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){ @@ -497,6 +519,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl flowStatusList = new ArrayList<>(); + /*List flowStatusList = new ArrayList<>(); flowStatusList.add(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); flowStatusList.add(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue()); @@ -1367,7 +1390,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl> queryLawEngineerByProjectId(Map params) { + List> resultList = new ArrayList<>(); + String projectLibraryId = (String) params.get("projectLibraryId"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + List prpEoList = this.list(queryWrapper.eq("project_id", projectLibraryId)); + if(CollectionUtils.isNotEmpty(prpEoList)){ + String lawEngineerIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getLawEngineer())) + .map(ProjectRelatedPersonnel::getLawEngineer).collect(Collectors.joining(",")); + List lawEngineerList = this.sysUserService.querySysUserListByIdList(Arrays.asList(lawEngineerIds.split(","))); + if(CollectionUtils.isNotEmpty(lawEngineerList)){ + for (SysUser lawEngineer : lawEngineerList) { + Map certificationEngineerMap = new HashMap<>(); + certificationEngineerMap.put("id",lawEngineer.getId()); + certificationEngineerMap.put("userName",lawEngineer.getUsername()); + resultList.add(certificationEngineerMap); + } + } + } + return resultList; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java index 8c21a7240..daf973c67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java @@ -10,9 +10,9 @@ public enum DesignComplianceFlowNodeKeyEnum { FQLC("发起流程","Initiate the process","fqlc"), ZRRQR("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认 DEZRRQR("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认 - ZRRTJJFW("设计符合性确认","Design compliance confirmation","zrrtjjfw"),// "责任人提交交付物" - DEZRRTJJFW("设计符合性确认","Design compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 - FGGCSSH("设计符合性审查","Design compliance review","fggcssh"), // 法规工程师审核 + ZRRTJJFW("符合性确认","Compliance confirmation","zrrtjjfw"),// "责任人提交交付物" + DEZRRTJJFW("符合性确认","Compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 + FGGCSSH("符合性审查","Compliance review","fggcssh"), // 法规工程师审核 ; String cnName; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java index 7c301023b..45149aa74 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java @@ -10,9 +10,9 @@ public enum VerifyComplianceFlowNodeKeyEnum { FQLC("发起流程","Initiate the process","fqlc"), ZRRQR("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认 DEZRRQR("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认 - ZRRTJJFW("验证符合性确认","Verify compliance confirmation","zrrtjjfw"),// "责任人提交交付物" - DEZRRTJJFW("验证符合性确认","Verify compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 - FGGCSSH("验证符合性审查","Verify compliance review","fggcssh"), // 法规工程师审核 + ZRRTJJFW("符合性确认","Compliance confirmation","zrrtjjfw"),// "责任人提交交付物" + DEZRRTJJFW("符合性确认","Compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物 + FGGCSSH("符合性审查","Compliance review","fggcssh"), // 法规工程师审核 ; String cnName; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java index 3e03084eb..369aa2614 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java @@ -10,9 +10,9 @@ import org.apache.commons.lang3.StringUtils; public enum FlowTypeEnum { RWQRLC("1","任务确认流程","RWQRLC","任务确认流程","rwqrlc","清单任务确认","List task Confirmation"), - SJFHXSHLC("2","设计符合性审查流程","SJFHXSHLC","设计符合性审查流程","sjfhxlc","设计符合性确认","Design conformance verification"), + SJFHXSHLC("2","设计符合性审查流程","SJFHXSHLC","设计符合性审查流程","sjfhxlc","设计符合性流程","Design Compliance Process"), PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc","Pre-Homo确认","The Pre - Homo confirmation"), - YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc","验证符合性确认","Verify conformance confirmation"), + YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc","验证符合性流程","Verify Compliance Process"), FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc","法规意见收集","Collection of Legislative Comments"), FGJSPG("6","法规技术评估流程","FGJSPG","法规技术评估流程","fgjspglc","法规技术评估","Regulatory and technical assessment"), QDQR("10","清单确认","QDQR","清单确认流程","qdqr","法规清单发布","Release of regulatory list"), diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f5db35940..2a1b39394 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1761,4 +1761,9 @@ module.exports = { reviewAndReturn:'Review and return', marketRegulationListDetails:'Market Regulation List Details', marketRegulationList:'Market Regulation List', + onlyDataWithTheCurrentCanBeManipulated:'Only data with the current user as the responsible person can be manipulated', + andTheAndTaskPendingConfirmation:'And the process status is Result Pending Submission, Review Returned, and Task Pending Confirmation', + andProcessStatusIsTaskPendingConfirmation:'And the process status is Task Pending Confirmation', + andPendingSubmissionReviewReturned:'And the process status is result pending submission, review returned', + deliverablesFor:'Deliverables for', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e16d3e20b..063dcca1e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1863,4 +1863,9 @@ module.exports = { electroniccontrollerparameter:'电子控制器参数', marketRegulationListDetails:'市场法规清单详情', marketRegulationList:'市场法规清单', + onlyDataWithTheCurrentCanBeManipulated:'仅能操作责任人为当前用户的数据', + andTheAndTaskPendingConfirmation:'并且流程状态为结果待提交、审查退回、任务待确认', + andProcessStatusIsTaskPendingConfirmation:'并且流程状态为任务待确认', + andPendingSubmissionReviewReturned:'并且流程状态为结果待提交、审查退回', + deliverablesFor:'的交付结果', } \ 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 4f0017e66..4e43c1213 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -1594,7 +1594,7 @@ font-weight: 400; color: #6F7385; display: inline-block; - width: 100px; + width: 130px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; diff --git a/jero-web/src/views/processCenter/ProcessMapping.vue b/jero-web/src/views/processCenter/ProcessMapping.vue index 3a879812b..d06cad9b3 100644 --- a/jero-web/src/views/processCenter/ProcessMapping.vue +++ b/jero-web/src/views/processCenter/ProcessMapping.vue @@ -19,6 +19,7 @@ actUrl: 'http://localhost:17210/bat-wkflow/modeler.html?modelId='//本地 // actUrl: 'http://10.255.35.25:8082/modeler.html?modelId=' //正式 // actUrl: 'http://10.255.128.148:8888/modeler.html?modelId=' //测试 + // actUrl: 'http://39.98.140.126:8085/bat-wkflow/modeler.html?modelId=' //39环境测试 } }, created() { diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 4d29599b1..1047d0d34 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -569,7 +569,7 @@ type: 'date', value: 'endTime', text: this.$t('closingDate') - }, + } ], disabled: false, queryParamQuery: {}, @@ -626,7 +626,7 @@ width: 180, ellipsis: true, fixed: 'left', - sorter: true, + sorter: true }, { title: this.$t('inspectionItems'), @@ -766,7 +766,7 @@ toDoIds: [], toDoNotConditions: [], userInfoQuery: {}, - DeliverableTreeList:[], + DeliverableTreeList: [] } }, mounted() { @@ -826,7 +826,7 @@ type: 'treeChoice', value: 'deliverableType', text: this.$t('typeOfDeliverables'), - tree:this.DeliverableTreeList + tree: this.DeliverableTreeList }) } else { this.DeliverableTreeList = [] @@ -1456,7 +1456,7 @@ let notConditionsOne = [] let data = '' let dataOne = '' - let detailedWarningList= [] + let detailedWarningList = [] if (this.roleSwitchingCode == 20) { for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) { @@ -1480,14 +1480,14 @@ } if (notConditions && notConditions.length > 0) { data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusSubmittedCanBeSelected') - detailedWarningList.push(
{data}
) + detailedWarningList.push( < div > { data } < /div>) } - if (notConditionsOne && notConditionsOne.length > 0){ - dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、')+'"'+this.$t('operationWithoutPermission') - detailedWarningList.push(
{dataOne}
) + if (notConditionsOne && notConditionsOne.length > 0) { + dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、') + '"' + this.$t('operationWithoutPermission') + detailedWarningList.push( < div > { dataOne } < /div>) } if (ids && ids.length > 0) { - this.$refs.referenceDeliverablesListRef.transferModel(ids,detailedWarningList) + this.$refs.referenceDeliverablesListRef.transferModel(ids, detailedWarningList) } else { this.failedMessageOne(detailedWarningList) } @@ -1542,7 +1542,7 @@ } this.toDoData = '' if (this.toDoNotConditions && this.toDoNotConditions.length > 0) { - this.toDoData = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + this.toDoNotConditions.join('、') + '"' + this.$t('data') + this.toDoData = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andTheAndTaskPendingConfirmation') } if (this.toDoIds && this.toDoIds.length > 0) { this.$refs.SelectedByRef.getPush() @@ -1714,7 +1714,8 @@ } let data = '' if (notConditions && notConditions.length > 0) { - data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data') + // data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data') + data = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andProcessStatusIsTaskPendingConfirmation') } if (ids && ids.length > 0) { this.submitTask(value, prompt, ids, notConditions, data) @@ -1728,6 +1729,15 @@ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let ids = [] let notConditions = [] + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (this.selectedRowKeysList[i].valueType == 'text' || this.selectedRowKeysList[i].valueType == 'select' || + this.selectedRowKeysList[i].valueType == 'file') { + if (!this.selectedRowKeysList[i].deliveryResult) { + this.$message.warning(this.$t('inspectionItems')+'"'+this.selectedRowKeysList[i].inspectionItem+'"'+this.$t('deliverablesFor')+this.$t('cannotEmpty')) + return + } + } + } if (this.roleSwitchingCode == 20) { this.submitClickJC(value, prompt) return @@ -1769,7 +1779,8 @@ } let data = '' if (notConditions && notConditions.length > 0) { - data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data') + // data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data') + data = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andPendingSubmissionReviewReturned') } if (ids && ids.length > 0) { this.submitTask(value, prompt, ids, notConditions, data) @@ -1855,7 +1866,7 @@ } }) window.open(newUrl.href, '_blank') - }, + } } } @@ -2205,7 +2216,8 @@ color: #00B3BE; cursor: pointer; } - .operator-text-title:last-child{ + + .operator-text-title:last-child { margin-bottom: 0; } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 3f8dd365c..b0f1da992 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -347,22 +347,22 @@ :title="text">{{text}} - - - - - - - - - - - - - -
- {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }} -
+ + + + + + + + + + + + + +
+ {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }} +
@@ -1127,12 +1127,6 @@ text: this.$t('areaOfResponsibility'), dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 }, - { - type: 'Personnel', - value: 'regulationOwnerId', - valueName: 'regulationOwnerIdName', - text: this.$t('regulatoryEngineer') - }, { type: 'Personnel', value: 'engineeringInterfacePerson', @@ -1318,6 +1312,7 @@ mounted() { this.JLoading = true this.getHeader() + this.queryLawEngineerByProjectId() this.getRoleByUserId(() => { this.getAndUserId() }) @@ -1366,7 +1361,32 @@ handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus }, + queryLawEngineerByProjectId() { + let query = { + projectLibraryId: this.$route.query.id + } + getAction('/project/projectRelatedPersonnel/queryLawEngineerByProjectId', query).then((res) => { + if (res.success) { + let regulatoryEngineer = { + value: 'regulationOwnerId', + text: this.$t('regulatoryEngineer'), + options:[], + } + if (res.result && res.result.length > 0){ + res.result.forEach(val=>{ + regulatoryEngineer.options.push({ + value: val.id, + key: val.id, + label: val.userName + }) + }) + } + this.fieldList.push(regulatoryEngineer) + } else { + } + }) + }, //流程状态点击事件 designFlowStatusClick(row, name) { let query = {} @@ -1474,7 +1494,11 @@ getAction(this.url.AndUserId, query).then((res) => { if (res.success) { // this.isDisplay = true - this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode + if (this.$route.query.roleOpen && this.$route.query.roleOpen == 'fggcs'){ + this.formInlineRoleSwitching.roleSwitchingCode = '1' + }else{ + this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode + } this.AndUserId = res.result.id if (this.formInlineRoleSwitching.roleSwitchingCode) { if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) { @@ -2081,7 +2105,7 @@ projectLibraryId: this.$route.query.id, orderBy: this.orderBy, orderByField: this.orderByField, - roleCode: roleCode, + roleCode: roleCode // pageNo: this.pageNo, // pageSize: this.pageSize } @@ -3029,15 +3053,17 @@ } ::v-deep .page .ant-select-selection__rendered { - height: 32px!important; - line-height: 32px!important; + height: 32px !important; + line-height: 32px !important; } - ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){ + + ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']) { text-align: left; - padding-left: 16px!important; + padding-left: 16px !important; } - .operator-text-title:last-child{ - margin-bottom: 0; + + .operator-text-title:last-child { + margin-bottom: 0; }