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 4e0f4171b..2184cb6a0 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 @@ -101,10 +101,13 @@ public class ProjectLawsInventoryEO implements Serializable { /**适用地区*/ @ApiModelProperty(value = "适用地区") - @Dict(dicCode ="region") + //@Dict(dicCode ="region") @Excel(name = "适用地区", width = 15, dicCode = "region") private java.lang.String region; + @TableField(exist = false) + private String region_dictText; + /**对应标准*/ @Excel(name = "对应标准", width = 20) @ApiModelProperty(value = "对应标准") @@ -113,8 +116,10 @@ public class ProjectLawsInventoryEO implements Serializable { /**实施类别*/ @Excel(name = "实施类别", width = 20,dicCode ="implement_type") @ApiModelProperty(value = "实施类别") - @Dict(dicCode ="implement_type") + //@Dict(dicCode ="implement_type") private String implementType; + @TableField(exist = false) + private String implementType_dictText; /**新车型实施日期*/ @Excel(name = "新车型实施日期", width = 20, format = "yyyy-MM-dd") @@ -139,14 +144,18 @@ public class ProjectLawsInventoryEO implements Serializable { /**认证类型*/ @Excel(name = "认证类型", width = 20,dicCode ="attestation_type") @ApiModelProperty(value = "认证类型") - @Dict(dicCode ="attestation_type") + //@Dict(dicCode ="attestation_type") private String attestationType; + @TableField(exist = false) + private String attestationType_dictText; /**认证级别*/ @Excel(name = "认证级别", width = 20,dicCode ="attestation_rank") @ApiModelProperty(value = "认证级别") - @Dict(dicCode ="attestation_rank") + //@Dict(dicCode ="attestation_rank") private String attestationRank; + @TableField(exist = false) + private String attestationRank_dictText; //适用增补件 @Excel(name = "适用增补件", width = 20) @@ -160,8 +169,10 @@ public class ProjectLawsInventoryEO implements Serializable { /**责任领域*/ @Excel(name = "责任领域", width = 20,dicCode ="duty_territory") @ApiModelProperty(value = "责任领域") - @Dict(dicCode ="duty_territory") + //@Dict(dicCode ="duty_territory") private String dutyTerritory; + @TableField(exist = false) + private String dutyTerritory_dictText; /**法规工程师id*/ @ApiModelProperty(value = "法规工程师id") @@ -198,10 +209,12 @@ public class ProjectLawsInventoryEO implements Serializable { /**设计符合性确认-交付物类型*/ @Excel(name = "设计符合性确认-交付物类型", width = 20,dicCode ="deliverable_template") @ApiModelProperty(value = "设计符合性确认-交付物类型") - @Dict(dicCode ="deliverable_template") + //@Dict(dicCode ="deliverable_template") private String designDeliverableType; @TableField(exist = false) private String designDeliverableTypeName; + @TableField(exist = false) + private String designDeliverableType_dictText; /**设计符合性确认-交付物模板*/ @ApiModelProperty(value = "设计符合性确认-交付物模板") @@ -214,8 +227,10 @@ public class ProjectLawsInventoryEO implements Serializable { /**设计符合性确认-发起人角色*/ @ApiModelProperty(value = "设计符合性确认-发起人角色") - @Dict(dicCode ="fa1_qi3_ren2") + //@Dict(dicCode ="fa1_qi3_ren2") private String designInitiator; + @TableField(exist = false) + private String designInitiator_dictText; /**设计符合性确认-发起人id*/ //@TableField(updateStrategy = FieldStrategy.IGNORED) @@ -229,8 +244,10 @@ public class ProjectLawsInventoryEO implements Serializable { /**设计符合性确认-责任人角色*/ @ApiModelProperty(value = "设计符合性确认-责任人角色") - @Dict(dicCode ="ze2_ren4_ren2") + //@Dict(dicCode ="ze2_ren4_ren2") private String designDuty; + @TableField(exist = false) + private String designDuty_dictText; /**设计符合性确认-责任人id*/ @ApiModelProperty(value = "设计符合性确认-责任人id") @@ -259,8 +276,10 @@ public class ProjectLawsInventoryEO implements Serializable { /**prehomo确认-交付物类型*/ @Excel(name = "prehomo确认-交付物类型", width = 20,dicCode ="deliverable_template") @ApiModelProperty(value = "prehomo确认-1") - @Dict(dicCode ="deliverable_template") + ////@Dict(dicCode ="deliverable_template") private String prehomoDeliverableType; + @TableField(exist = false) + private String prehomoDeliverableType_dictText; @TableField(exist = false) private String prehomoDeliverableTypeName; @@ -275,8 +294,10 @@ public class ProjectLawsInventoryEO implements Serializable { /**prehomo确认-发起人角色*/ @ApiModelProperty(value = "prehomo确认-发起人角色") - @Dict(dicCode ="fa1_qi3_ren2") + //@Dict(dicCode ="fa1_qi3_ren2") private String prehomoInitiator; + @TableField(exist = false) + private String prehomoInitiator_dictText; /**prehomo确认-发起人id*/ @ApiModelProperty(value = "prehomo确认-发起人id") @@ -290,8 +311,10 @@ public class ProjectLawsInventoryEO implements Serializable { /**prehomo确认-责任人角色*/ @ApiModelProperty(value = "prehomo确认-责任人角色") - @Dict(dicCode ="ze2_ren4_ren2") + //@Dict(dicCode ="ze2_ren4_ren2") private String prehomoDuty; + @TableField(exist = false) + private String prehomoDuty_dictText; /**prehomo确认-责任人id*/ @ApiModelProperty(value = "prehomo确认-责任人id") @@ -320,8 +343,10 @@ public class ProjectLawsInventoryEO implements Serializable { /**验证符合性确认-交付物类型*/ @Excel(name = "验证符合性确认-交付物类型", width = 20,dicCode ="deliverable_template") @ApiModelProperty(value = "验证符合性确认-交付物类型") - @Dict(dicCode ="deliverable_template") + //@Dict(dicCode ="deliverable_template") private String verifyDeliverableType; + @TableField(exist = false) + private String verifyDeliverableType_dictText; @TableField(exist = false) private String verifyDeliverableTypeName; @@ -336,8 +361,10 @@ public class ProjectLawsInventoryEO implements Serializable { /**验证符合性确认-发起人角色*/ @ApiModelProperty(value = "验证符合性确认-发起人角色") - @Dict(dicCode ="fa1_qi3_ren2") + //@Dict(dicCode ="fa1_qi3_ren2") private String verifyInitiator; + @TableField(exist = false) + private String verifyInitiator_dictText; /**验证符合性确认-发起人id*/ @ApiModelProperty(value = "验证符合性确认-发起人id") @@ -351,8 +378,10 @@ public class ProjectLawsInventoryEO implements Serializable { /**验证符合性确认-责任人角色*/ @ApiModelProperty(value = "验证符合性确认-责任人角色") - @Dict(dicCode ="ze2_ren4_ren2") + //@Dict(dicCode ="ze2_ren4_ren2") private String verifyDuty; + @TableField(exist = false) + private String verifyDuty_dictText; /**验证符合性确认-责任人id*/ @ApiModelProperty(value = "验证符合性确认-责任人id") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 68a77aaf5..e2ca5fee7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -1,13 +1,13 @@ package com.jero.modules.project.enums; public enum ProjectTaskPlanningNameEnum { - LIST_CONFIRMATION("法规清单确认"," Confirmation of regulations list"), - LEGAL_TASK_CONFIRMATION("法规任务确认","Regulatory task confirmation"), - DESIGN_DEADLINE("设计符合性确认","Design Compliance Check"), - PREHOMO_DEADLINE("Pre-Homo确认","Pre-Homo Check"), - ATTESTATION_START_TIME("认证开始","Certification start"), - ATTESTATION_END_TIME("认证结束"," Certification end"), - VERIFY_DEADLINE("验证符合性确认","Verification compliance confirmation deadline"), + LIST_CONFIRMATION("清单确认"," Checklist confirmation"), + LEGAL_TASK_CONFIRMATION("任务确认","Task confirmation"), + DESIGN_DEADLINE("设计符合性","Design compliance"), + PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"), + ATTESTATION_START_TIME("认证开始","Certification begins"), + ATTESTATION_END_TIME("认证结束"," End of certification"), + VERIFY_DEADLINE("验证符合性","Verify compliance"), ; String name; 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 7d8526c02..bdec38953 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 @@ -647,6 +647,166 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl result = super.baseMapper.selectList(projectLawsInventoryEOQueryWrapper); dataDispose(result,currentUser,isProjectRole,projectLawsInventoryEO.getCut()); + long startTime = System.currentTimeMillis(); + dataDictDispose(result,projectLawsInventoryEO.getCut()); + log.debug("处理数据字典消耗时间：" + (System.currentTimeMillis() - startTime)); + return result; + } + + /** + * 数据字典数据处理方法 + * @param result 返回值 + * @param cut 中英文切换 + */ + public void dataDictDispose(List result,String cut){ + if(CollectionUtils.isNotEmpty(result)){ + List sysDictItems = sysDictItemServiceImpl.getBaseMapper().selectItemsAll(); + for (ProjectLawsInventoryEO projectLawsInventoryEO : result) { + //处理适用地区 + String region = projectLawsInventoryEO.getRegion(); + if(StringUtils.isNotEmpty(region)){ + String region_dictText = disposeShowDictItemValue(sysDictItems, region,cut,ProjectInventoryFieldEnum.REGION.getValue()); + projectLawsInventoryEO.setRegion_dictText(region_dictText); + } + + //处理实施类别 + String implementType = projectLawsInventoryEO.getImplementType(); + if(StringUtils.isNotEmpty(implementType)){ + String implementType_dictText = disposeShowDictItemValue(sysDictItems, implementType,cut,ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getValue()); + projectLawsInventoryEO.setImplementType_dictText(implementType_dictText); + } + + //处理认证类型 + String attestationType = projectLawsInventoryEO.getAttestationType(); + if(StringUtils.isNotEmpty(attestationType)){ + String attestationType_dictText = disposeShowDictItemValue(sysDictItems, attestationType,cut,ProjectInventoryFieldEnum.ATTESTATION_TYPE.getValue()); + projectLawsInventoryEO.setAttestationType_dictText(attestationType_dictText); + } + + //处理认证级别 + String attestationRank = projectLawsInventoryEO.getAttestationRank(); + if(StringUtils.isNotEmpty(attestationRank)){ + String attestationRank_dictText = disposeShowDictItemValue(sysDictItems, attestationRank,cut,ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue()); + projectLawsInventoryEO.setAttestationRank_dictText(attestationRank_dictText); + } + + //处理责任领域 + String dutyTerritory = projectLawsInventoryEO.getDutyTerritory(); + if(StringUtils.isNotEmpty(dutyTerritory)){ + String dutyTerritory_dictText = disposeShowDictItemValue(sysDictItems, dutyTerritory,cut,ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); + projectLawsInventoryEO.setDutyTerritory_dictText(dutyTerritory_dictText); + } + + //处理设计符合性确认-交付物类型 + String designDeliverableType = projectLawsInventoryEO.getDesignDeliverableType(); + if(StringUtils.isNotEmpty(designDeliverableType)){ + String designDeliverableType_dictText = disposeShowDictItemValue(sysDictItems, designDeliverableType,cut,ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getValue()); + projectLawsInventoryEO.setDesignDeliverableType_dictText(designDeliverableType_dictText); + } + + //处理设计符合性确认-发起人角色 + String designInitiator = projectLawsInventoryEO.getDesignInitiator(); + if(StringUtils.isNotEmpty(designInitiator)){ + String designInitiator_dictText = disposeShowDictItemValue(sysDictItems, designInitiator,cut,ProjectInventoryFieldEnum.DESIGN_INITIATOR.getValue()); + projectLawsInventoryEO.setDesignInitiator_dictText(designInitiator_dictText); + } + + //处理设计符合性确认-责任人角色 + String designDuty = projectLawsInventoryEO.getDesignDuty(); + if(StringUtils.isNotEmpty(designDuty)){ + String designDuty_dictText = disposeShowDictItemValue(sysDictItems, designDuty,cut,ProjectInventoryFieldEnum.DESIGN_DUTY.getValue()); + projectLawsInventoryEO.setDesignDuty_dictText(designDuty_dictText); + } + + //处理prehomo确认-交付物类型 + String prehomoDeliverableType = projectLawsInventoryEO.getPrehomoDeliverableType(); + if(StringUtils.isNotEmpty(prehomoDeliverableType)){ + String prehomoDeliverableType_dictText = disposeShowDictItemValue(sysDictItems, prehomoDeliverableType,cut,ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getValue()); + projectLawsInventoryEO.setPrehomoDeliverableType_dictText(prehomoDeliverableType_dictText); + } + + //处理prehomo确认-发起人角色 + String prehomoInitiator = projectLawsInventoryEO.getPrehomoInitiator(); + if(StringUtils.isNotEmpty(prehomoInitiator)){ + String prehomoInitiator_dictText = disposeShowDictItemValue(sysDictItems, prehomoInitiator,cut,ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getValue()); + projectLawsInventoryEO.setPrehomoInitiator_dictText(prehomoInitiator_dictText); + } + + //处理prehomo确认-责任人角色 + String prehomoDuty = projectLawsInventoryEO.getPrehomoDuty(); + if(StringUtils.isNotEmpty(prehomoDuty)){ + String prehomoDuty_dictText = disposeShowDictItemValue(sysDictItems, prehomoDuty,cut,ProjectInventoryFieldEnum.PREHOMO_DUTY.getValue()); + projectLawsInventoryEO.setPrehomoDuty_dictText(prehomoDuty_dictText); + } + + //处理验证符合性确认-交付物类型 + String verifyDeliverableType = projectLawsInventoryEO.getVerifyDeliverableType(); + if(StringUtils.isNotEmpty(verifyDeliverableType)){ + String verifyDeliverableType_dictText = disposeShowDictItemValue(sysDictItems, verifyDeliverableType,cut,ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getValue()); + projectLawsInventoryEO.setVerifyDeliverableType_dictText(verifyDeliverableType_dictText); + } + + //处理验证符合性确认-发起人角色 + String verifyInitiator = projectLawsInventoryEO.getVerifyInitiator(); + if(StringUtils.isNotEmpty(verifyInitiator)){ + String verifyInitiator_dictText = disposeShowDictItemValue(sysDictItems, verifyInitiator,cut,ProjectInventoryFieldEnum.VERIFY_INITIATOR.getValue()); + projectLawsInventoryEO.setVerifyInitiator_dictText(verifyInitiator_dictText); + } + + //处理验证符合性确认-责任人角色 + String verifyDuty = projectLawsInventoryEO.getVerifyDuty(); + if(StringUtils.isNotEmpty(verifyDuty)){ + String verifyDuty_dictText = disposeShowDictItemValue(sysDictItems, verifyDuty,cut,ProjectInventoryFieldEnum.VERIFY_DUTY.getValue()); + projectLawsInventoryEO.setVerifyDuty_dictText(verifyDuty_dictText); + } + } + } + } + + /** + * 处理展示数据字典值 + * @param sysDictItems 所有的数据字典项 + * @param fieldValues 字段值 + * @param cut 中英文切换标识 + * @param dicCode 数据字典code码 + * @return + */ + public String disposeShowDictItemValue(List sysDictItems,String fieldValues,String cut,String dicCode){ + String result = ""; + List sysDictItemList = sysDictItems.stream().filter(e -> { + boolean flag = false; + if(StringUtils.equals(e.getDictCode(),dicCode)){ + flag = true; + } + return flag; + }).distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(sysDictItemList)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + result = sysDictItemList.stream().filter(e -> { + boolean flag = false; + List fieldValueStrList = Arrays.asList(fieldValues.split(",")); + for (String fieldValueStr : fieldValueStrList) { + if(StringUtils.equals(fieldValueStr,e.getItemValue())){ + flag = true; + break; + } + } + return flag; + }).map(SysDictItem::getItemText).collect(Collectors.joining(",")); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + result = sysDictItemList.stream().filter(e -> { + boolean flag = false; + List fieldValueStrList = Arrays.asList(fieldValues.split(",")); + for (String fieldValueStr : fieldValueStrList) { + if(StringUtils.equals(fieldValueStr,e.getItemValue())){ + flag = true; + break; + } + } + return flag; + }).map(SysDictItem::getEnName).collect(Collectors.joining(",")); + } + } return result; } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0e901fa6d..41b87f1a5 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -945,5 +945,6 @@ module.exports = { ConfirmQuestion: 'Confirm Question', disableInput: 'Disable input', taskConfirmationDeadline: 'Task Confirmation Deadline', - OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out' + OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', + taskConfirmationResponsiblePerson:'Task confirmation of responsible person', } \ 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 a0b80bb3f..aa9ca6c43 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -951,4 +951,5 @@ module.exports = { OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', disableInput:'禁止输入', taskConfirmationDeadline:'任务确认截止时间', + taskConfirmationResponsiblePerson:'责任人任务确认', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue index 10218429b..81bd4cca4 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue @@ -215,9 +215,13 @@ :title="$t('viewFile')" :width="500" :visible="visible" - @ok="visible=false" @cancel="visible=false" > +

{{ item.fileName }}

diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue index 035bf7a3b..cfbefa921 100644 --- a/jero-web/src/views/processCenter/components/examineInformation.vue +++ b/jero-web/src/views/processCenter/components/examineInformation.vue @@ -16,7 +16,7 @@ - {{$t('agree')}} + {{$t('accept')}} {{$t('disagree')}} diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index 35702349f..68b7dca7e 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -126,7 +126,7 @@ if (this.$route.query.taskDefinitionKey == 'dreqr') { this.titleName = this.$t('engineerReply') } else { - this.titleName = this.$t('confirmationEngineeringInterfacePerson') + this.titleName = this.$t('taskConfirmationResponsiblePerson') } this.queryTaskDetailByTask(function() { _this.queryProjectLawsInventoryInfo() @@ -195,17 +195,17 @@ this.$message.success(this.$t('OperationSuccessful')) if (this.$route.query.taskDefinitionKey == 'zrrjsrw' || this.$route.query.taskDefinitionKey == 'zrrqr') { if (value.flag == 0) { - if (this.queryProject.verifyDeliverableType) { + if (this.queryProject.verifyRemark) { this.startProcessDesign(this.queryBy, 4) } - if (this.queryProject.prehomoDeliverableType) { + if (this.queryProject.prehomoRemark) { this.startProcessDesign(this.queryBy, 3) } - if (this.queryProject.designDeliverableType) { + if (this.queryProject.designRemark) { this.startProcessDesign(this.queryBy, 2) } - if (!this.queryProject.verifyDeliverableType && !this.queryProject.prehomoDeliverableType && - !this.queryProject.designDeliverableType) { + if (!this.queryProject.verifyRemark && !this.queryProject.prehomoRemark && + !this.queryProject.designRemark) { setTimeout(() => { this.loading = false window.close() diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 426453fad..cf0bb743c 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -320,15 +320,18 @@ putAction(this.url.dreSubmit, query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - // this.$router.push({ - // path: '/ProjectDetails', - // query: this.$route.query - // }) - setTimeout(() => { - this.loading = false - window.close() - }, 1000) + this.$router.push({ + path: '/ProjectDetails', + query: { + type:'103', + ...this.$route.query + } + }) + // setTimeout(() => { + // this.loading = false + // window.close() + // }, 1000) } else { this.loading = false this.$message.warning(this.$t('operationFailed')) @@ -347,10 +350,6 @@ if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.edit() - // this.$router.push({ - // path: '/ProjectDetails', - // query: this.$route.query - // }) } else { this.loading = false this.$message.warning(this.$t('operationFailed')) @@ -366,7 +365,13 @@ if (res.success) { setTimeout(() => { this.loading = false - window.close() + this.$router.push({ + path: '/ProjectDetails', + query: { + type:'103', + ...this.$route.query + } + }) }, 1000) } }) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 813e3e071..b8ad627a7 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1319,36 +1319,39 @@ if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'Rejected') && this.dataSource[i].inventoryAffirmStatus == 'Accepted') { if (this.dataSource[i].engineeringInterfacePerson) { - if ((this.dataSource[i].verifyDueDate && this.dataSource[i].verifyDutyId - && this.dataSource[i].verifyInitiatorId && this.dataSource[i].verifyDeliverableType) || - (!this.dataSource[i].verifyDueDate && !this.dataSource[i].verifyDutyId - && !this.dataSource[i].verifyInitiatorId && !this.dataSource[i].verifyDeliverableType)) { - isTrue = true - } else { - isTrue = false - this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification')) - return + if (this.dataSource[i].verifyRemark) { + if (this.dataSource[i].verifyDueDate && this.dataSource[i].verifyDutyId + && this.dataSource[i].verifyInitiatorId) { + isTrue = true + } else { + isTrue = false + this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification')) + return + } } - if ((this.dataSource[i].prehomoDueDate && this.dataSource[i].prehomoDutyId - && this.dataSource[i].prehomoInitiatorId && this.dataSource[i].prehomoDeliverableType) || - (!this.dataSource[i].prehomoDueDate && !this.dataSource[i].prehomoDutyId - && !this.dataSource[i].prehomoInitiatorId && !this.dataSource[i].prehomoDeliverableType)) { - isTrue = true - } else { - isTrue = false - this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo')) - return + + if (this.dataSource[i].prehomoRemark) { + if (this.dataSource[i].prehomoDueDate && this.dataSource[i].prehomoDutyId + && this.dataSource[i].prehomoInitiatorId) { + isTrue = true + } else { + isTrue = false + this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo')) + return + } } - if ((this.dataSource[i].designDueDate && this.dataSource[i].designDutyId - && this.dataSource[i].designInitiatorId && this.dataSource[i].designDeliverableType) || - (!this.dataSource[i].designDueDate && !this.dataSource[i].designDutyId - && !this.dataSource[i].designInitiatorId && !this.dataSource[i].designDeliverableType)) { - isTrue = true - } else { - isTrue = false - this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation')) - return + + if (this.dataSource[i].designRemark) { + if (this.dataSource[i].designDueDate && this.dataSource[i].designDutyId + && this.dataSource[i].designInitiatorId) { + isTrue = true + } else { + isTrue = false + this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation')) + return + } } + } else { isTrue = false this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty')) @@ -1596,7 +1599,7 @@ let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { - window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username)) } else if (fileSuffix == '.docx') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') @@ -1614,7 +1617,7 @@ let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { - window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id+'&userName='+this.userInfo().username)) + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id + '&userName=' + this.userInfo().username)) } else if (fileSuffix == '.docx') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) window.open(url, '_blank') @@ -1622,12 +1625,12 @@ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) window.open(url, '_blank') } else { - downloadFile('/sys/common/downLoadFile', name, { id: id ,userName:this.userInfo().username}) + downloadFile('/sys/common/downLoadFile', name, { id: id, userName: this.userInfo().username }) } }, download(item) { - downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id ,userName:this.userInfo().username}) + downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) }, clickButtonToUpload(item, num) {