WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_bug_first_stage' into fix_bug_first_stage

Browse Source
This commit is contained in:
zer0Black
2022-07-01 14:51:15 +08:00
parent b3be2ec395 69a239a897
commit 1e5eb47d97
10 changed files with 277 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+43 -14
View File
@@ -101,10 +101,13 @@ public class ProjectLawsInventoryEO implements Serializable {
/**适用地区*/ /**适用地区*/
@ApiModelProperty(value = "适用地区") @ApiModelProperty(value = "适用地区")
@Dict(dicCode ="region") //@Dict(dicCode ="region")
@Excel(name = "适用地区", width = 15, dicCode = "region") @Excel(name = "适用地区", width = 15, dicCode = "region")
private java.lang.String region; private java.lang.String region;
@TableField(exist = false)
private String region_dictText;
/**对应标准*/ /**对应标准*/
@Excel(name = "对应标准", width = 20) @Excel(name = "对应标准", width = 20)
@ApiModelProperty(value = "对应标准") @ApiModelProperty(value = "对应标准")
@@ -113,8 +116,10 @@ public class ProjectLawsInventoryEO implements Serializable {
/**实施类别*/ /**实施类别*/
@Excel(name = "实施类别", width = 20,dicCode ="implement_type") @Excel(name = "实施类别", width = 20,dicCode ="implement_type")
@ApiModelProperty(value = "实施类别") @ApiModelProperty(value = "实施类别")
@Dict(dicCode ="implement_type") //@Dict(dicCode ="implement_type")
private String implementType; private String implementType;
@TableField(exist = false)
private String implementType_dictText;
/**新车型实施日期*/ /**新车型实施日期*/
@Excel(name = "新车型实施日期", width = 20, format = "yyyy-MM-dd") @Excel(name = "新车型实施日期", width = 20, format = "yyyy-MM-dd")
@@ -139,14 +144,18 @@ public class ProjectLawsInventoryEO implements Serializable {
/**认证类型*/ /**认证类型*/
@Excel(name = "认证类型", width = 20,dicCode ="attestation_type") @Excel(name = "认证类型", width = 20,dicCode ="attestation_type")
@ApiModelProperty(value = "认证类型") @ApiModelProperty(value = "认证类型")
@Dict(dicCode ="attestation_type") //@Dict(dicCode ="attestation_type")
private String attestationType; private String attestationType;
@TableField(exist = false)
private String attestationType_dictText;
/**认证级别*/ /**认证级别*/
@Excel(name = "认证级别", width = 20,dicCode ="attestation_rank") @Excel(name = "认证级别", width = 20,dicCode ="attestation_rank")
@ApiModelProperty(value = "认证级别") @ApiModelProperty(value = "认证级别")
@Dict(dicCode ="attestation_rank") //@Dict(dicCode ="attestation_rank")
private String attestationRank; private String attestationRank;
@TableField(exist = false)
private String attestationRank_dictText;
//适用增补件 //适用增补件
@Excel(name = "适用增补件", width = 20) @Excel(name = "适用增补件", width = 20)
@@ -160,8 +169,10 @@ public class ProjectLawsInventoryEO implements Serializable {
/**责任领域*/ /**责任领域*/
@Excel(name = "责任领域", width = 20,dicCode ="duty_territory") @Excel(name = "责任领域", width = 20,dicCode ="duty_territory")
@ApiModelProperty(value = "责任领域") @ApiModelProperty(value = "责任领域")
@Dict(dicCode ="duty_territory") //@Dict(dicCode ="duty_territory")
private String dutyTerritory; private String dutyTerritory;
@TableField(exist = false)
private String dutyTerritory_dictText;
/**法规工程师id*/ /**法规工程师id*/
@ApiModelProperty(value = "法规工程师id") @ApiModelProperty(value = "法规工程师id")
@@ -198,10 +209,12 @@ public class ProjectLawsInventoryEO implements Serializable {
/**设计符合性确认-交付物类型*/ /**设计符合性确认-交付物类型*/
@Excel(name = "设计符合性确认-交付物类型", width = 20,dicCode ="deliverable_template") @Excel(name = "设计符合性确认-交付物类型", width = 20,dicCode ="deliverable_template")
@ApiModelProperty(value = "设计符合性确认-交付物类型") @ApiModelProperty(value = "设计符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template") //@Dict(dicCode ="deliverable_template")
private String designDeliverableType; private String designDeliverableType;
@TableField(exist = false) @TableField(exist = false)
private String designDeliverableTypeName; private String designDeliverableTypeName;
@TableField(exist = false)
private String designDeliverableType_dictText;
/**设计符合性确认-交付物模板*/ /**设计符合性确认-交付物模板*/
@ApiModelProperty(value = "设计符合性确认-交付物模板") @ApiModelProperty(value = "设计符合性确认-交付物模板")
@@ -214,8 +227,10 @@ public class ProjectLawsInventoryEO implements Serializable {
/**设计符合性确认-发起人角色*/ /**设计符合性确认-发起人角色*/
@ApiModelProperty(value = "设计符合性确认-发起人角色") @ApiModelProperty(value = "设计符合性确认-发起人角色")
@Dict(dicCode ="fa1_qi3_ren2") //@Dict(dicCode ="fa1_qi3_ren2")
private String designInitiator; private String designInitiator;
@TableField(exist = false)
private String designInitiator_dictText;
/**设计符合性确认-发起人id*/ /**设计符合性确认-发起人id*/
//@TableField(updateStrategy = FieldStrategy.IGNORED) //@TableField(updateStrategy = FieldStrategy.IGNORED)
@@ -229,8 +244,10 @@ public class ProjectLawsInventoryEO implements Serializable {
/**设计符合性确认-责任人角色*/ /**设计符合性确认-责任人角色*/
@ApiModelProperty(value = "设计符合性确认-责任人角色") @ApiModelProperty(value = "设计符合性确认-责任人角色")
@Dict(dicCode ="ze2_ren4_ren2") //@Dict(dicCode ="ze2_ren4_ren2")
private String designDuty; private String designDuty;
@TableField(exist = false)
private String designDuty_dictText;
/**设计符合性确认-责任人id*/ /**设计符合性确认-责任人id*/
@ApiModelProperty(value = "设计符合性确认-责任人id") @ApiModelProperty(value = "设计符合性确认-责任人id")
@@ -259,9 +276,11 @@ public class ProjectLawsInventoryEO implements Serializable {
/**prehomo确认-交付物类型*/ /**prehomo确认-交付物类型*/
@Excel(name = "prehomo确认-交付物类型", width = 20,dicCode ="deliverable_template") @Excel(name = "prehomo确认-交付物类型", width = 20,dicCode ="deliverable_template")
@ApiModelProperty(value = "prehomo确认-1") @ApiModelProperty(value = "prehomo确认-1")
@Dict(dicCode ="deliverable_template") ////@Dict(dicCode ="deliverable_template")
private String prehomoDeliverableType; private String prehomoDeliverableType;
@TableField(exist = false) @TableField(exist = false)
private String prehomoDeliverableType_dictText;
@TableField(exist = false)
private String prehomoDeliverableTypeName; private String prehomoDeliverableTypeName;
/**prehomo确认-交付物模板*/ /**prehomo确认-交付物模板*/
@@ -275,8 +294,10 @@ public class ProjectLawsInventoryEO implements Serializable {
/**prehomo确认-发起人角色*/ /**prehomo确认-发起人角色*/
@ApiModelProperty(value = "prehomo确认-发起人角色") @ApiModelProperty(value = "prehomo确认-发起人角色")
@Dict(dicCode ="fa1_qi3_ren2") //@Dict(dicCode ="fa1_qi3_ren2")
private String prehomoInitiator; private String prehomoInitiator;
@TableField(exist = false)
private String prehomoInitiator_dictText;
/**prehomo确认-发起人id*/ /**prehomo确认-发起人id*/
@ApiModelProperty(value = "prehomo确认-发起人id") @ApiModelProperty(value = "prehomo确认-发起人id")
@@ -290,8 +311,10 @@ public class ProjectLawsInventoryEO implements Serializable {
/**prehomo确认-责任人角色*/ /**prehomo确认-责任人角色*/
@ApiModelProperty(value = "prehomo确认-责任人角色") @ApiModelProperty(value = "prehomo确认-责任人角色")
@Dict(dicCode ="ze2_ren4_ren2") //@Dict(dicCode ="ze2_ren4_ren2")
private String prehomoDuty; private String prehomoDuty;
@TableField(exist = false)
private String prehomoDuty_dictText;
/**prehomo确认-责任人id*/ /**prehomo确认-责任人id*/
@ApiModelProperty(value = "prehomo确认-责任人id") @ApiModelProperty(value = "prehomo确认-责任人id")
@@ -320,9 +343,11 @@ public class ProjectLawsInventoryEO implements Serializable {
/**验证符合性确认-交付物类型*/ /**验证符合性确认-交付物类型*/
@Excel(name = "验证符合性确认-交付物类型", width = 20,dicCode ="deliverable_template") @Excel(name = "验证符合性确认-交付物类型", width = 20,dicCode ="deliverable_template")
@ApiModelProperty(value = "验证符合性确认-交付物类型") @ApiModelProperty(value = "验证符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template") //@Dict(dicCode ="deliverable_template")
private String verifyDeliverableType; private String verifyDeliverableType;
@TableField(exist = false) @TableField(exist = false)
private String verifyDeliverableType_dictText;
@TableField(exist = false)
private String verifyDeliverableTypeName; private String verifyDeliverableTypeName;
/**验证符合性确认-交付物模板*/ /**验证符合性确认-交付物模板*/
@@ -336,8 +361,10 @@ public class ProjectLawsInventoryEO implements Serializable {
/**验证符合性确认-发起人角色*/ /**验证符合性确认-发起人角色*/
@ApiModelProperty(value = "验证符合性确认-发起人角色") @ApiModelProperty(value = "验证符合性确认-发起人角色")
@Dict(dicCode ="fa1_qi3_ren2") //@Dict(dicCode ="fa1_qi3_ren2")
private String verifyInitiator; private String verifyInitiator;
@TableField(exist = false)
private String verifyInitiator_dictText;
/**验证符合性确认-发起人id*/ /**验证符合性确认-发起人id*/
@ApiModelProperty(value = "验证符合性确认-发起人id") @ApiModelProperty(value = "验证符合性确认-发起人id")
@@ -351,8 +378,10 @@ public class ProjectLawsInventoryEO implements Serializable {
/**验证符合性确认-责任人角色*/ /**验证符合性确认-责任人角色*/
@ApiModelProperty(value = "验证符合性确认-责任人角色") @ApiModelProperty(value = "验证符合性确认-责任人角色")
@Dict(dicCode ="ze2_ren4_ren2") //@Dict(dicCode ="ze2_ren4_ren2")
private String verifyDuty; private String verifyDuty;
@TableField(exist = false)
private String verifyDuty_dictText;
/**验证符合性确认-责任人id*/ /**验证符合性确认-责任人id*/
@ApiModelProperty(value = "验证符合性确认-责任人id") @ApiModelProperty(value = "验证符合性确认-责任人id")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
+7 -7
View File
@@ -1,13 +1,13 @@
package com.jero.modules.project.enums; package com.jero.modules.project.enums;
public enum ProjectTaskPlanningNameEnum { public enum ProjectTaskPlanningNameEnum {
LIST_CONFIRMATION("法规清单确认"," Confirmation of regulations list"), LIST_CONFIRMATION("清单确认"," Checklist confirmation"),
LEGAL_TASK_CONFIRMATION("法规任务确认","Regulatory task confirmation"), LEGAL_TASK_CONFIRMATION("任务确认","Task confirmation"),
DESIGN_DEADLINE("设计符合性确认","Design Compliance Check"), DESIGN_DEADLINE("设计符合性","Design compliance"),
PREHOMO_DEADLINE("Pre-Homo确认","Pre-Homo Check"), PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"),
ATTESTATION_START_TIME("认证开始","Certification start"), ATTESTATION_START_TIME("认证开始","Certification begins"),
ATTESTATION_END_TIME("认证结束"," Certification end"), ATTESTATION_END_TIME("认证结束"," End of certification"),
VERIFY_DEADLINE("验证符合性确认","Verification compliance confirmation deadline"), VERIFY_DEADLINE("验证符合性","Verify compliance"),
; ;
String name; String name;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+160
View File
@@ -647,6 +647,166 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
List<ProjectLawsInventoryEO> result = super.baseMapper.selectList(projectLawsInventoryEOQueryWrapper); List<ProjectLawsInventoryEO> result = super.baseMapper.selectList(projectLawsInventoryEOQueryWrapper);
dataDispose(result,currentUser,isProjectRole,projectLawsInventoryEO.getCut()); 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<ProjectLawsInventoryEO> result,String cut){
if(CollectionUtils.isNotEmpty(result)){
List<SysDictItem> 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<SysDictItem> sysDictItems,String fieldValues,String cut,String dicCode){
String result = "";
List<SysDictItem> 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<String> 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<String> 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; return result;
} }
jero-web/src/common/lang/en-us.js
+2 -1
View File
@@ -945,5 +945,6 @@ module.exports = {
ConfirmQuestion: 'Confirm Question', ConfirmQuestion: 'Confirm Question',
disableInput: 'Disable input', disableInput: 'Disable input',
taskConfirmationDeadline: 'Task Confirmation Deadline', 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',
} }
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -951,4 +951,5 @@ module.exports = {
OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办',
disableInput:'禁止输入', disableInput:'禁止输入',
taskConfirmationDeadline:'任务确认截止时间', taskConfirmationDeadline:'任务确认截止时间',
taskConfirmationResponsiblePerson:'责任人任务确认',
} }
jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+5 -1
View File
@@ -215,9 +215,13 @@
:title="$t('viewFile')" :title="$t('viewFile')"
:width="500" :width="500"
:visible="visible" :visible="visible"
@ok="visible=false"
@cancel="visible=false" @cancel="visible=false"
> >
<template slot="footer">
<a-button key="back" @click="visible = false">
{{$t('cancel')}}
</a-button>
</template>
<p v-for="(item,index) in fileList" :key="index" <p v-for="(item,index) in fileList" :key="index"
class="fileText" :title="item.fileName" @click="fileClick(item)">{{ item.fileName }}</p> class="fileText" :title="item.fileName" @click="fileClick(item)">{{ item.fileName }}</p>
</a-modal> </a-modal>
jero-web/src/views/processCenter/components/examineInformation.vue
+1 -1
View File
@@ -16,7 +16,7 @@
<a-form-model-item style="margin-left: 36px" class="itemModel" prop="flag"> <a-form-model-item style="margin-left: 36px" class="itemModel" prop="flag">
<a-radio-group style="margin-top: 2px" @change="flagChange" class="box-input" v-model="formInline.flag"> <a-radio-group style="margin-top: 2px" @change="flagChange" class="box-input" v-model="formInline.flag">
<a-radio value="0"> <a-radio value="0">
{{$t('agree')}} {{$t('accept')}}
</a-radio> </a-radio>
<a-radio value="1"> <a-radio value="1">
{{$t('disagree')}} {{$t('disagree')}}
jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+6 -6
View File
@@ -126,7 +126,7 @@
if (this.$route.query.taskDefinitionKey == 'dreqr') { if (this.$route.query.taskDefinitionKey == 'dreqr') {
this.titleName = this.$t('engineerReply') this.titleName = this.$t('engineerReply')
} else { } else {
this.titleName = this.$t('confirmationEngineeringInterfacePerson') this.titleName = this.$t('taskConfirmationResponsiblePerson')
} }
this.queryTaskDetailByTask(function() { this.queryTaskDetailByTask(function() {
_this.queryProjectLawsInventoryInfo() _this.queryProjectLawsInventoryInfo()
@@ -195,17 +195,17 @@
this.$message.success(this.$t('OperationSuccessful')) this.$message.success(this.$t('OperationSuccessful'))
if (this.$route.query.taskDefinitionKey == 'zrrjsrw' || this.$route.query.taskDefinitionKey == 'zrrqr') { if (this.$route.query.taskDefinitionKey == 'zrrjsrw' || this.$route.query.taskDefinitionKey == 'zrrqr') {
if (value.flag == 0) { if (value.flag == 0) {
if (this.queryProject.verifyDeliverableType) { if (this.queryProject.verifyRemark) {
this.startProcessDesign(this.queryBy, 4) this.startProcessDesign(this.queryBy, 4)
} }
if (this.queryProject.prehomoDeliverableType) { if (this.queryProject.prehomoRemark) {
this.startProcessDesign(this.queryBy, 3) this.startProcessDesign(this.queryBy, 3)
} }
if (this.queryProject.designDeliverableType) { if (this.queryProject.designRemark) {
this.startProcessDesign(this.queryBy, 2) this.startProcessDesign(this.queryBy, 2)
} }
if (!this.queryProject.verifyDeliverableType && !this.queryProject.prehomoDeliverableType && if (!this.queryProject.verifyRemark && !this.queryProject.prehomoRemark &&
!this.queryProject.designDeliverableType) { !this.queryProject.designRemark) {
setTimeout(() => { setTimeout(() => {
this.loading = false this.loading = false
window.close() window.close()
jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+18 -13
View File
@@ -320,15 +320,18 @@
putAction(this.url.dreSubmit, query).then((res) => { putAction(this.url.dreSubmit, query).then((res) => {
if (res.success) { if (res.success) {
this.$message.success(this.$t('OperationSuccessful')) 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 { } else {
this.loading = false this.loading = false
this.$message.warning(this.$t('operationFailed')) this.$message.warning(this.$t('operationFailed'))
@@ -347,10 +350,6 @@
if (res.success) { if (res.success) {
this.$message.success(this.$t('OperationSuccessful')) this.$message.success(this.$t('OperationSuccessful'))
this.edit() this.edit()
// this.$router.push({
// path: '/ProjectDetails',
// query: this.$route.query
// })
} else { } else {
this.loading = false this.loading = false
this.$message.warning(this.$t('operationFailed')) this.$message.warning(this.$t('operationFailed'))
@@ -366,7 +365,13 @@
if (res.success) { if (res.success) {
setTimeout(() => { setTimeout(() => {
this.loading = false this.loading = false
window.close() this.$router.push({
path: '/ProjectDetails',
query: {
type:'103',
...this.$route.query
}
})
}, 1000) }, 1000)
} }
}) })
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+15 -12
View File
@@ -1319,36 +1319,39 @@
if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'Rejected') && if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'Rejected') &&
this.dataSource[i].inventoryAffirmStatus == 'Accepted') { this.dataSource[i].inventoryAffirmStatus == 'Accepted') {
if (this.dataSource[i].engineeringInterfacePerson) { if (this.dataSource[i].engineeringInterfacePerson) {
if ((this.dataSource[i].verifyDueDate && this.dataSource[i].verifyDutyId if (this.dataSource[i].verifyRemark) {
&& this.dataSource[i].verifyInitiatorId && this.dataSource[i].verifyDeliverableType) || if (this.dataSource[i].verifyDueDate && this.dataSource[i].verifyDutyId
(!this.dataSource[i].verifyDueDate && !this.dataSource[i].verifyDutyId && this.dataSource[i].verifyInitiatorId) {
&& !this.dataSource[i].verifyInitiatorId && !this.dataSource[i].verifyDeliverableType)) {
isTrue = true isTrue = true
} else { } else {
isTrue = false isTrue = false
this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification')) this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification'))
return 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 if (this.dataSource[i].prehomoRemark) {
&& !this.dataSource[i].prehomoInitiatorId && !this.dataSource[i].prehomoDeliverableType)) { if (this.dataSource[i].prehomoDueDate && this.dataSource[i].prehomoDutyId
&& this.dataSource[i].prehomoInitiatorId) {
isTrue = true isTrue = true
} else { } else {
isTrue = false isTrue = false
this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo')) this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo'))
return 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 if (this.dataSource[i].designRemark) {
&& !this.dataSource[i].designInitiatorId && !this.dataSource[i].designDeliverableType)) { if (this.dataSource[i].designDueDate && this.dataSource[i].designDutyId
&& this.dataSource[i].designInitiatorId) {
isTrue = true isTrue = true
} else { } else {
isTrue = false isTrue = false
this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation')) this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation'))
return return
} }
}
} else { } else {
isTrue = false isTrue = false
this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty')) this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty'))