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

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

Browse Source
This commit is contained in:
高嵩
2023-04-13 17:05:39 +08:00
parent 9676e6f721 b0f7c713fb
commit ea2c0bde02
19 changed files with 1069 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+310
View File
@@ -550,6 +550,316 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
});
}
}
// 标题 title
if("title".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1Title = StringUtils.isNotEmpty(e1.getTitle()) ? e1.getTitle() : "";
String e2Title = StringUtils.isNotEmpty(e2.getTitle()) ? e2.getTitle() : "";
return comparator.compare(e1Title,e2Title);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1Title = StringUtils.isNotEmpty(e1.getTitle()) ? e1.getTitle() : "";
String e2Title = StringUtils.isNotEmpty(e2.getTitle()) ? e2.getTitle() : "";
return comparator.compare(e2Title,e1Title);
});
}
}
// 子标题 subtitle
if("subtitle".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1Subtitle = StringUtils.isNotEmpty(e1.getSubtitle()) ? e1.getSubtitle() : "";
String e2Subtitle = StringUtils.isNotEmpty(e2.getSubtitle()) ? e2.getSubtitle() : "";
return comparator.compare(e1Subtitle,e2Subtitle);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1Subtitle = StringUtils.isNotEmpty(e1.getSubtitle()) ? e1.getSubtitle() : "";
String e2Subtitle = StringUtils.isNotEmpty(e2.getSubtitle()) ? e2.getSubtitle() : "";
return comparator.compare(e2Subtitle,e1Subtitle);
});
}
}
// 适用地区 region_dictText
if("region_dictText".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1Region = StringUtils.isNotEmpty(e1.getRegion()) ? e1.getRegion() : "";
String e2Region = StringUtils.isNotEmpty(e2.getRegion()) ? e2.getRegion() : "";
return comparator.compare(e1Region,e2Region);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1Region = StringUtils.isNotEmpty(e1.getRegion()) ? e1.getRegion() : "";
String e2Region = StringUtils.isNotEmpty(e2.getRegion()) ? e2.getRegion() : "";
return comparator.compare(e2Region,e1Region);
});
}
}
// 对应标准 correspondingStandard
if("correspondingStandard".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1correspondingStandard = StringUtils.isNotEmpty(e1.getCorrespondingStandard()) ? e1.getCorrespondingStandard() : "";
String e2correspondingStandard = StringUtils.isNotEmpty(e2.getCorrespondingStandard()) ? e2.getCorrespondingStandard() : "";
return comparator.compare(e1correspondingStandard,e2correspondingStandard);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1correspondingStandard = StringUtils.isNotEmpty(e1.getCorrespondingStandard()) ? e1.getCorrespondingStandard() : "";
String e2correspondingStandard = StringUtils.isNotEmpty(e2.getCorrespondingStandard()) ? e2.getCorrespondingStandard() : "";
return comparator.compare(e2correspondingStandard,e1correspondingStandard);
});
}
}
// 实施类别 implementType_dictText
if("implementType_dictText".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1ImplementType_dictText = StringUtils.isNotEmpty(e1.getImplementType_dictText()) ? e1.getImplementType_dictText() : "";
String e2ImplementType_dictText = StringUtils.isNotEmpty(e2.getImplementType_dictText()) ? e2.getImplementType_dictText() : "";
return comparator.compare(e1ImplementType_dictText,e2ImplementType_dictText);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1ImplementType_dictText = StringUtils.isNotEmpty(e1.getImplementType_dictText()) ? e1.getImplementType_dictText() : "";
String e2ImplementType_dictText = StringUtils.isNotEmpty(e2.getImplementType_dictText()) ? e2.getImplementType_dictText() : "";
return comparator.compare(e2ImplementType_dictText,e1ImplementType_dictText);
});
}
}
// 新车实施日期 xin1Che1Xing2Shi2Shi1Ri4Qi1String
if("xin1Che1Xing2Shi2Shi1Ri4Qi1String".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
if(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null && e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null){
String e1xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
String e2xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
return comparator.compare(e1xin1Che1Xing2Shi2Shi1Ri4Qi,e2xin1Che1Xing2Shi2Shi1Ri4Qi);
}
return 0;
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
if(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null && e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null){
String e1xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e1.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
String e2xin1Che1Xing2Shi2Shi1Ri4Qi = DateUtils.formatDate(e2.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
return comparator.compare(e2xin1Che1Xing2Shi2Shi1Ri4Qi,e1xin1Che1Xing2Shi2Shi1Ri4Qi);
}
return 0;
});
}
}
// 在产车实施日期 implementTimeString
if("implementTimeString".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
if(e1.getImplementTime() != null && e2.getImplementTime() != null){
String e1ImplementTime = DateUtils.formatDate(e1.getImplementTime());
String e2ImplementTime = DateUtils.formatDate(e2.getImplementTime());
return comparator.compare(e1ImplementTime,e2ImplementTime);
}
return 0;
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
if(e1.getImplementTime() != null && e2.getImplementTime() != null){
String e1ImplementTime = DateUtils.formatDate(e1.getImplementTime());
String e2ImplementTime = DateUtils.formatDate(e2.getImplementTime());
return comparator.compare(e2ImplementTime,e1ImplementTime);
}
return 0;
});
}
}
// 认证类型 attestationType_dictText
if("attestationType_dictText".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1AttestationType_dictText = StringUtils.isNotEmpty(e1.getAttestationType_dictText()) ? e1.getAttestationType_dictText() : "";
String e2AttestationType_dictText = StringUtils.isNotEmpty(e2.getAttestationType_dictText()) ? e2.getAttestationType_dictText() : "";
return comparator.compare(e1AttestationType_dictText,e2AttestationType_dictText);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1AttestationType_dictText = StringUtils.isNotEmpty(e1.getAttestationType_dictText()) ? e1.getAttestationType_dictText() : "";
String e2AttestationType_dictText = StringUtils.isNotEmpty(e2.getAttestationType_dictText()) ? e2.getAttestationType_dictText() : "";
return comparator.compare(e2AttestationType_dictText,e1AttestationType_dictText);
});
}
}
// 认证级别 attestationRank
if("attestationRank".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1AttestationRank_dictText = StringUtils.isNotEmpty(e1.getAttestationRank_dictText()) ? e1.getAttestationRank_dictText() : "";
String e2AttestationRank_dictText = StringUtils.isNotEmpty(e2.getAttestationRank_dictText()) ? e2.getAttestationRank_dictText() : "";
return comparator.compare(e1AttestationRank_dictText,e2AttestationRank_dictText);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1AttestationRank_dictText = StringUtils.isNotEmpty(e1.getAttestationRank_dictText()) ? e1.getAttestationRank_dictText() : "";
String e2AttestationRank_dictText = StringUtils.isNotEmpty(e2.getAttestationRank_dictText()) ? e2.getAttestationRank_dictText() : "";
return comparator.compare(e2AttestationRank_dictText,e1AttestationRank_dictText);
});
}
}
// 适用增补件 applicableSupplement
if("applicableSupplement".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1ApplicableSupplement = StringUtils.isNotEmpty(e1.getApplicableSupplement()) ? e1.getApplicableSupplement() : "";
String e2ApplicableSupplement = StringUtils.isNotEmpty(e2.getApplicableSupplement()) ? e2.getApplicableSupplement() : "";
return comparator.compare(e1ApplicableSupplement,e2ApplicableSupplement);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1ApplicableSupplement = StringUtils.isNotEmpty(e1.getApplicableSupplement()) ? e1.getApplicableSupplement() : "";
String e2ApplicableSupplement = StringUtils.isNotEmpty(e2.getApplicableSupplement()) ? e2.getApplicableSupplement() : "";
return comparator.compare(e2ApplicableSupplement,e1ApplicableSupplement);
});
}
}
// 法规工程师 regulationOwnerName
/*if("regulationOwnerName".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
if(e1.getApplicableSupplement() != null && e2.getApplicableSupplement() != null){
return comparator.compare(e1.getApplicableSupplement(),e2.getApplicableSupplement());
}
return 0;
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
if(e1.getApplicableSupplement() != null && e2.getApplicableSupplement() != null){
return comparator.compare(e2.getApplicableSupplement(),e1.getApplicableSupplement());
}
return 0;
});
}
}*/
// homologationEngineerName 认证工程师
// engineeringInterfacePersonName 工程接口人
// 备注 remark
if("remark".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1Remark = StringUtils.isNotEmpty(e1.getRemark()) ? e1.getRemark() : "";
String e2Remark = StringUtils.isNotEmpty(e2.getRemark()) ? e2.getRemark() : "";
return comparator.compare(e1Remark,e2Remark);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1Remark = StringUtils.isNotEmpty(e1.getRemark()) ? e1.getRemark() : "";
String e2Remark = StringUtils.isNotEmpty(e2.getRemark()) ? e2.getRemark() : "";
return comparator.compare(e2Remark,e1Remark);
});
}
}
// 设计符合性 交付物 designDeliverableTemplateName
if("designDeliverableTemplateName".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1DesignDeliverableTemplateName = StringUtils.isNotEmpty(e1.getDesignDeliverableTemplateName()) ? e1.getDesignDeliverableTemplateName() : "";
String e2DesignDeliverableTemplateName = StringUtils.isNotEmpty(e2.getDesignDeliverableTemplateName()) ? e2.getDesignDeliverableTemplateName() : "";
return comparator.compare(e1DesignDeliverableTemplateName,e2DesignDeliverableTemplateName);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1DesignDeliverableTemplateName = StringUtils.isNotEmpty(e1.getDesignDeliverableTemplateName()) ? e1.getDesignDeliverableTemplateName() : "";
String e2DesignDeliverableTemplateName = StringUtils.isNotEmpty(e2.getDesignDeliverableTemplateName()) ? e2.getDesignDeliverableTemplateName() : "";
return comparator.compare(e2DesignDeliverableTemplateName,e1DesignDeliverableTemplateName);
});
}
}
// 设计符合性 责任人 designDuty_dictText
if("designDuty_dictText".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1DesignDuty_dictText = StringUtils.isNotEmpty(e1.getDesignDuty_dictText()) ? e1.getDesignDuty_dictText() : "";
String e2DesignDuty_dictText = StringUtils.isNotEmpty(e2.getDesignDuty_dictText()) ? e2.getDesignDuty_dictText() : "";
return comparator.compare(e1DesignDuty_dictText,e2DesignDuty_dictText);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1DesignDuty_dictText = StringUtils.isNotEmpty(e1.getDesignDuty_dictText()) ? e1.getDesignDuty_dictText() : "";
String e2DesignDuty_dictText = StringUtils.isNotEmpty(e2.getDesignDuty_dictText()) ? e2.getDesignDuty_dictText() : "";
return comparator.compare(e2DesignDuty_dictText,e1DesignDuty_dictText);
});
}
}
// 设计符合性 交付物说明 designRemark
if("designRemark".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1DesignRemark = StringUtils.isNotEmpty(e1.getDesignRemark()) ? e1.getDesignRemark() : "";
String e2DesignRemark = StringUtils.isNotEmpty(e2.getDesignRemark()) ? e2.getDesignRemark() : "";
return comparator.compare(e1DesignRemark,e2DesignRemark);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1DesignRemark = StringUtils.isNotEmpty(e1.getDesignRemark()) ? e1.getDesignRemark() : "";
String e2DesignRemark = StringUtils.isNotEmpty(e2.getDesignRemark()) ? e2.getDesignRemark() : "";
return comparator.compare(e2DesignRemark,e1DesignRemark);
});
}
}
// 验证符合性 交付物 verifyDeliverableTemplateName
if("verifyDeliverableTemplateName".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1VerifyDeliverableTemplateName = StringUtils.isNotEmpty(e1.getVerifyDeliverableTemplateName()) ? e1.getVerifyDeliverableTemplateName() : "";
String e2VerifyDeliverableTemplateName = StringUtils.isNotEmpty(e2.getVerifyDeliverableTemplateName()) ? e2.getVerifyDeliverableTemplateName() : "";
return comparator.compare(e1VerifyDeliverableTemplateName,e2VerifyDeliverableTemplateName);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1VerifyDeliverableTemplateName = StringUtils.isNotEmpty(e1.getVerifyDeliverableTemplateName()) ? e1.getVerifyDeliverableTemplateName() : "";
String e2VerifyDeliverableTemplateName = StringUtils.isNotEmpty(e2.getVerifyDeliverableTemplateName()) ? e2.getVerifyDeliverableTemplateName() : "";
return comparator.compare(e2VerifyDeliverableTemplateName,e1VerifyDeliverableTemplateName);
});
}
}
// 验证符合性 责任人 verifyDuty_dictText
if("verifyDuty_dictText".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1VerifyDuty_dictText = StringUtils.isNotEmpty(e1.getVerifyDuty_dictText()) ? e1.getVerifyDuty_dictText() : "";
String e2VerifyDuty_dictText = StringUtils.isNotEmpty(e2.getVerifyDuty_dictText()) ? e2.getVerifyDuty_dictText() : "";
return comparator.compare(e1VerifyDuty_dictText,e2VerifyDuty_dictText);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1VerifyDuty_dictText = StringUtils.isNotEmpty(e1.getVerifyDuty_dictText()) ? e1.getVerifyDuty_dictText() : "";
String e2VerifyDuty_dictText = StringUtils.isNotEmpty(e2.getVerifyDuty_dictText()) ? e2.getVerifyDuty_dictText() : "";
return comparator.compare(e2VerifyDuty_dictText,e1VerifyDuty_dictText);
});
}
}
// 设计符合性 交付物说明 verifyRemark
if("verifyRemark".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1, e2)->{
String e1VerifyRemark = StringUtils.isNotEmpty(e1.getVerifyRemark()) ? e1.getVerifyRemark() : "";
String e2VerifyRemark = StringUtils.isNotEmpty(e2.getVerifyRemark()) ? e2.getVerifyRemark() : "";
return comparator.compare(e1VerifyRemark,e2VerifyRemark);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(dummyInventoryInfoEOList,(e1,e2)->{
String e1VerifyRemark = StringUtils.isNotEmpty(e1.getVerifyRemark()) ? e1.getVerifyRemark() : "";
String e2VerifyRemark = StringUtils.isNotEmpty(e2.getVerifyRemark()) ? e2.getVerifyRemark() : "";
return comparator.compare(e2VerifyRemark,e1VerifyRemark);
});
}
}
//适用范围
if("shi4Yong4Fan4Wei2".equals(orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
+7
View File
@@ -512,4 +512,11 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
public Result<?> updateFlowStatusBatch(@RequestBody JSONObject json) {
return this.projectLawsInventoryEOService.updateFlowStatusBatch(json);
}
@AutoLog(value = "项目库-法规清单表-引用交付物")
@ApiOperation(value="项目库-法规清单表-引用交付物", notes="项目库-法规清单表-引用交付物")
@PostMapping(value = "/citeDeliverable")
public Result<?> citeDeliverable(@RequestBody JSONObject json) {
return this.projectLawsInventoryEOService.citeDeliverable(json);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java
+2
View File
@@ -81,6 +81,8 @@ public enum OperatorTypeEnum {
LAWS_INVENTORY_ENGINEERING_INTERFACE_PERSON_EXPEDITING("法规清单-工程接口人催办","lawsInventoryEngineeringInterfacePersonExpediting"),
LAWS_INVENTORY_DESIGN_UPDATE_FLOW_STATUS("法规清单-更新设计符合性流程状态","lawsInventoryDesignUpdateFlowStatus"),
LAWS_INVENTORY_VERIFY_UPDATE_FLOW_STATUS("法规清单-更新验证符合性流程状态","lawsInventoryVerifyUpdateFlowStatus"),
LAWS_INVENTORY_DESIGN_CITE_DELIVERABLE("法规清单-设计-引用交付物","lawsInventoryDesignCiteDeliverable"),
LAWS_INVENTORY_VERIFY_CITE_DELIVERABLE("法规清单-验证-引用交付物","lawsInventoryVerifyCiteDeliverable"),
/**
* 待办中心-将法规工程师的法规清单确认待办任务转为已办
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
+2
View File
@@ -251,4 +251,6 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
* @return
*/
Result<?> updateFlowStatusBatch(JSONObject json);
Result<?> citeDeliverable(JSONObject json);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+108
View File
@@ -11897,4 +11897,112 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
return new Result<>().success("批量更新状态成功！");
}
@Override
public Result<?> citeDeliverable(JSONObject json) {
String cut = json.getString("cut");
String operateType = json.getString("operateType");
String flowType = "";
if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_CITE_DELIVERABLE.getValue())){
flowType = FlowTypeEnum.SJFHXSHLC.getValue();
}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_CITE_DELIVERABLE.getValue())){
flowType = FlowTypeEnum.YZFHXSCLC.getValue();
}
String resultMsg = "";
ProcessHistoryEO citePhEo = null;
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
resultMsg = "引用交付物成功！";
}else {
resultMsg = "Successfully referenced deliverables!";
}
String serialNumber = json.getString("serialNumber");
String dutyTerritory = json.getString("dutyTerritory");
String citeProjectLibraryId = json.getString("citeProjectLibraryId");
if(StringUtils.isEmpty(citeProjectLibraryId)){
throw new JeroBootException("请选择引用的项目！");
}
// 符合性流程已完成的状态
List<String> complianceFlowStatusList = new ArrayList<>();
complianceFlowStatusList.add(ComplianceFlowStatusEnum.CONFORMITY.getValue());
complianceFlowStatusList.add(ComplianceFlowStatusEnum.INCONFORMITY.getValue());
complianceFlowStatusList.add(ComplianceFlowStatusEnum.TO_TRACK.getValue());
complianceFlowStatusList.add(ComplianceFlowStatusEnum.UNINVOLVED.getValue());
QueryWrapper<ProjectLawsInventoryEO> citePliQueryWrap = new QueryWrapper<>();
citePliQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,citeProjectLibraryId);
if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){
citePliQueryWrap.lambda().in(ProjectLawsInventoryEO::getDesignFlowStatus,complianceFlowStatusList);
} else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
citePliQueryWrap.lambda().in(ProjectLawsInventoryEO::getVerifyFlowStatus,complianceFlowStatusList);
}
List<ProjectLawsInventoryEO> citePliEoList = this.list(citePliQueryWrap);
if(CollectionUtils.isNotEmpty(citePliEoList)){
List<ProjectLawsInventoryEO> citePliEoListTemp = citePliEoList.stream().filter(citePliEo -> {
boolean serialNumberFlag = (StringUtils.equals(serialNumber,citePliEo.getSerialNumber()));
boolean dutyTerritoryFlag = Arrays.equals(dutyTerritory.split(","), citePliEo.getDutyTerritory().split(","));
boolean deliverableTypeFlag = false;
if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_DESIGN_CITE_DELIVERABLE.getValue())){
String designDeliverableType = json.getString("designDeliverableType");
deliverableTypeFlag = Arrays.equals(designDeliverableType.split(","), citePliEo.getDesignDeliverableType().split(","));
}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_VERIFY_CITE_DELIVERABLE.getValue())){
String verifyDeliverableType = json.getString("verifyDeliverableType");
deliverableTypeFlag = Arrays.equals(verifyDeliverableType.split(","), citePliEo.getVerifyDeliverableType().split(","));
}
return serialNumberFlag && dutyTerritoryFlag && deliverableTypeFlag;
}).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(citePliEoListTemp)){
ProjectLawsInventoryEO citePliEo = citePliEoListTemp.get(0);
String citePliEoId = citePliEo.getId();
QueryWrapper<ProcessInfoEO> citePiQueryWrap = new QueryWrapper<>();
citePiQueryWrap.lambda().eq(ProcessInfoEO::getProjectLawsInventoryId,citePliEoId);
citePiQueryWrap.lambda().eq(ProcessInfoEO::getFlowType,flowType);
citePiQueryWrap.orderByDesc("create_time");
List<ProcessInfoEO> citePiEoList = this.processInfoEOService.list(citePiQueryWrap);
if(CollectionUtils.isNotEmpty(citePiEoList)){
ProcessInfoEO citePiEo = citePiEoList.get(0);
String citePiEoActiProcInstId = citePiEo.getActiProcInstId();
List<String> taskDefinitionKeyList = new ArrayList<>();
if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){
taskDefinitionKeyList.add(DesignComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue());
taskDefinitionKeyList.add(DesignComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue());
} else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
taskDefinitionKeyList.add(VerifyComplianceFlowNodeKeyEnum.ZRRTJJFW.getValue());
taskDefinitionKeyList.add(VerifyComplianceFlowNodeKeyEnum.DEZRRTJJFW.getValue());
}
QueryWrapper<ProcessHistoryEO> citePhQueryWrap = new QueryWrapper<>();
citePhQueryWrap.lambda().eq(ProcessHistoryEO::getActiProcInstId,citePiEoActiProcInstId);
citePhQueryWrap.lambda().in(ProcessHistoryEO::getTaskDefinitionKey,taskDefinitionKeyList);
citePhQueryWrap.orderByDesc("create_time");
List<ProcessHistoryEO> citePhEoList = this.processHistoryEOService.list(citePhQueryWrap);
if (CollectionUtils.isNotEmpty(citePhEoList)) {
citePhEo = citePhEoList.get(0);
}
}
}
if(ObjectUtils.isEmpty(citePhEo)){
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
resultMsg = "所选引用项目中，没有匹配到数据，请重新选择！";
}else {
resultMsg = "There is no matching data in the selected reference project. Please reselect!";
}
}
}else {
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
resultMsg = "所选引用项目中流程完成数据为空，请重新选择！";
}else {
resultMsg = "The process completion data in the selected reference project is empty, please reselect!";
}
}
return Result.OK(resultMsg,citePhEo);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+19 -6
View File
@@ -19,9 +19,10 @@
<sql id="BaseQuerySql">
<where>
<if test="params.querySource == '2'">
and project_name is not null
</if>
and temp.project_name is not null
<!--<if test="params.querySource == '2'">
and temp.project_name is not null
</if>-->
<if test="params.projectName != null and params.projectName !=''">
and (
temp.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
@@ -112,7 +113,10 @@
order by temp.create_time desc
</select>
<select id="queryProjectProcessTodoTaskListList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
select temp.* from (
select
temp.*,
(case temp.flow_type when '10' THEN '1' when '21' THEN '2' when '2' THEN '3' when '4' THEN '4' END) as "flowTypeShowOrderBy"
from (
SELECT
pi.id,
pi.project_library_id,
@@ -244,7 +248,15 @@
</foreach>
)temp
<include refid="BaseQuerySql"/>
order by temp.end_time ASC,temp.project_name ASC,standard_info ASC,temp.flow_type ASC
order by
temp.end_time IS NULL,
temp.end_time,
temp.project_name IS NULL,
temp.project_name,
standard_info IS NULL,
standard_info,
flowTypeShowOrderBy
ASC
</select>
<select id="queryLawsAssessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
select temp.* from (
@@ -267,7 +279,8 @@
pi.prc_name,
pi.create_by,
pi.acti_proc_inst_id,
pi.create_time
pi.create_time,
"project_name" as project_name
FROM
process_info pi
LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id
jero-web/src/common/lang/en-us.js
+3 -1
View File
@@ -1696,7 +1696,7 @@ module.exports = {
taskNodeMismatch:'Task Node Mismatch',
ifNot:'If not, fill in "none" or "not involved"',
designComplianceProcess:'Design Compliance Process',
validationComplianceProcess:'Validation Compliance Process',
validationComplianceProcess:'Verify Compliance Process',
onlyDataInTheReminderProcessBanBeProcessed:'Only data in the reminder process can be processed',
expeditionProcess:'Expedition Process',
addfunction:'Add function',
@@ -1779,4 +1779,6 @@ module.exports = {
batchComplianceConfirmation:'Batch compliance confirmation',
onlyDataWithApprovedCanCeSelected:'Only data with a process status of result pending review or approved can be selected',
deadlineForResponsibilityConfirmation:'Deadline for Responsibility Confirmation',
checkRegulatoryCompletedBefore: "Check the implementation of regulatory requirements before product design freezes. Task delivery requirements will first be input and confirmed with the engineering team in G1, and compliance confirmation and review will be completed before G3.",
checkVerificationResultsBeforeMP:'Check the verification results required by regulations before mass production of the product. Task delivery requirements will first be input and confirmed with the engineering team in G1, and compliance confirmation and review will be completed before MP.',
}
jero-web/src/common/lang/zh-cn.js
+496 -493
View File
File diff suppressed because it is too large Load Diff
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+18 -1
View File
@@ -441,6 +441,7 @@
dataIndex: 'title',
width: 180,
fixed: 'left',
sorter: true,
scopedSlots: { customRender: 'titleName' }
},
{
@@ -448,6 +449,7 @@
align: 'left',
dataIndex: 'subtitle',
ellipsis: true,
sorter: true,
width: 180
},
{
@@ -455,6 +457,7 @@
align: 'left',
dataIndex: 'region_dictText',
width: 180,
sorter: true,
ellipsis: true
},
{
@@ -462,6 +465,7 @@
align: 'left',
dataIndex: 'correspondingStandard',
width: 180,
sorter: true,
ellipsis: true
},
{
@@ -469,6 +473,7 @@
align: 'left',
dataIndex: 'implementType_dictText',
width: 180,
sorter: true,
ellipsis: true
},
{
@@ -477,6 +482,7 @@
width: 200,
dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1String',
scopedSlots: { customRender: 'titleName' },
sorter: true,
ellipsis: true
},
{
@@ -485,6 +491,7 @@
width: 220,
dataIndex: 'implementTimeString',
scopedSlots: { customRender: 'titleName' },
sorter: true,
ellipsis: true
},
{
@@ -492,6 +499,7 @@
align: 'left',
dataIndex: 'attestationType_dictText',
width: 180,
sorter: true,
ellipsis: true
},
{
@@ -507,6 +515,7 @@
align: 'left',
width: 220,
dataIndex: 'applicableSupplement',
sorter: true,
ellipsis: true
},
{
@@ -554,6 +563,7 @@
align: 'left',
dataIndex: 'remark',
width: 180,
sorter: true,
ellipsis: true
},
{
@@ -565,6 +575,7 @@
align: 'left',
width: 180,
ellipsis: true,
sorter: true,
scopedSlots: { customRender: 'designDeliverableTemplateName' }
},
{
@@ -587,6 +598,7 @@
dataIndex: 'designDuty_dictText',
align: 'left',
width: 180,
sorter: true,
ellipsis: true
},
// {
@@ -601,6 +613,7 @@
dataIndex: 'designRemark',
align: 'left',
width: 220,
sorter: true,
ellipsis: true
}
]
@@ -614,6 +627,7 @@
align: 'left',
width: 180,
ellipsis: true,
sorter: true,
scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
},
{
@@ -629,6 +643,7 @@
dataIndex: 'verifyDuty_dictText',
align: 'left',
width: 180,
sorter: true,
ellipsis: true
},
// {
@@ -643,6 +658,7 @@
dataIndex: 'verifyRemark',
align: 'left',
width: 220,
sorter: true,
ellipsis: true
}
]
@@ -1457,7 +1473,7 @@
</script>
<style lang="less" scoped>
@import '~@assets/less/common.less';
@import'~@assets/less/common.less';
.doc-detail {
background: #fff;
@@ -1694,6 +1710,7 @@
::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){
text-align: left;
padding-left: 16px!important;
border-right: 1px solid #e8e8e8;
}
</style>
<style lang="less">
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+10 -1
View File
@@ -1175,6 +1175,7 @@
// 认证工程师 退回 权限
// 仅仅状态为 已提交 可以退回
homoJurisdictionReturn() {
console.log(this.selectedRowKeysValue)
// 认证工程师 已提交
if (this.currentPersonRole == 'homo') {
this.NotSelectedRowKeysValue = []
@@ -1228,6 +1229,7 @@
}
})
}
console.log(flag)
return flag
}
},
@@ -2131,6 +2133,7 @@
returnDataJurisdiction() {
// 退回的状态权限
let homoJurisdictionReturn = this.homoJurisdictionReturn()
console.log(homoJurisdictionReturn,'homoJurisdictionReturn')
if (homoJurisdictionReturn == 1) {
this.returnData()
} else if (homoJurisdictionReturn == 0) {
@@ -2142,7 +2145,13 @@
returnData() {
// todo 退回没有选择数据
let _array = []
this.selectedRowKeysValue = this.selectedRowKeysValue.filter(item => item.state == '已提交' || item.state == 'Submitted')
if (this.currentPersonRole == 'homo') {
this.selectedRowKeysValue = this.selectedRowKeysValue.filter(item => item.state == '已提交' || item.state == 'Submitted')
} else if (this.currentPersonRole == 'sdt') {
this.selectedRowKeysValue = this.selectedRowKeysValue.filter(item => item.state == '待工程接口人处理' || item.state == '填写人退回' || item.state == 'To be processed by eng. interface' || item.state == 'Rejected by the applicant')
} else if (this.currentPersonRole == 'dre') {
this.selectedRowKeysValue = this.selectedRowKeysValue.filter(item => item.state == '待填写' || item.state == '认证工程师退回' || item.state == 'To be filled' || item.state == 'Rejected by homo engineer')
}
this.selectedRowKeysValue.forEach((item, index) => {
_array.push(item.id)
})
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+1
View File
@@ -3213,6 +3213,7 @@
::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']) {
text-align: left;
padding-left: 16px !important;
border-right: 1px solid #e8e8e8;
}
.operator-text-title:last-child {
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+4 -3
View File
@@ -24,9 +24,10 @@
<span :title="text">{{text}}</span>
</span>
<span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
<!-- @click="standardInformationClick(record)" -->
<span v-if="text && text != '--'" :title="text">
{{text}}
</a>
</span>
<span v-else>--</span>
</span>
</a-table>
@@ -79,7 +80,7 @@
width: 300
},
{
title: this.$t('taskType'),
title: this.$t('ProcessType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+1
View File
@@ -58,6 +58,7 @@
</span>
<span slot="approvalFile" slot-scope="text,result">
<span class="viewFile"
:title="$t('viewFile')"
@click="viewFileClick(result.approvalFile)"
v-if="result.approvalFile">
{{$t('viewFile')}}
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+6 -5
View File
@@ -26,9 +26,10 @@
<span :title="text">{{text}}</span>
</span>
<span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
<!-- @click="standardInformationClick(record)"-->
<span v-if="text && text != '--'" :title="text">
{{text}}
</a>
</span>
<span v-else>--</span>
</span>
<span slot="taskStatus" slot-scope="text,record">
@@ -91,7 +92,7 @@
width: 300
},
{
title: this.$t('taskType'),
title: this.$t('ProcessType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
@@ -268,7 +269,7 @@
targetMarket: row.targetMarket,
studioEngineer: row.studioEngineer,
type: '102',
roleOpen:'1',
roleOpen: '1'
}
})
window.open(newUrl.href, '_blank')
@@ -281,7 +282,7 @@
projectNameId: row.projectNameId,
targetMarket: row.targetMarket,
studioEngineer: row.studioEngineer,
type: '106',
type: '106'
}
})
window.open(newUrl.href, '_blank')
jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+47 -24
View File
@@ -11,9 +11,14 @@
style="height: 100%;overflow: auto;margin-bottom: 436px;">
<JLoading :loading="loading">{{textLoading}}</JLoading>
<!-- <a-button style="float: right" @click="referenceDeliverablesClick"-->
<!-- v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"-->
<!-- type="primary">{{$t('referenceDeliverables')}}</a-button>-->
<a-button style="float: right;" @click="referenceDeliverablesClick"
v-if="this.queryData.isDisplay && (queryData.TaskKey == 'zrrtjjfw' || queryData.TaskKey == 'dezrrtjjfw')"
type="primary">{{$t('referenceDeliverables')}}
</a-button>
<a-icon v-if="this.queryData.isDisplay"
class="questionClass"
:title="queryData.flowType == '2' ? this.$t('checkRegulatoryCompletedBefore') : this.$t('checkVerificationResultsBeforeMP')"
type="question-circle"/>
<projectInformation
v-if="isDisplay"
:title="$t('basicInformation')"
@@ -29,7 +34,7 @@
:url="url"
:standardContentQuery="queryProject"
/>
<!-- :class="{'circulationHistory':this.queryData.isDisplay,'circulationHistoryOne':!this.queryData.isDisplay}"-->
<!-- :class="{'circulationHistory':this.queryData.isDisplay,'circulationHistoryOne':!this.queryData.isDisplay}"-->
<div>
<circulationHistory
v-if="isDisplay"
@@ -38,8 +43,8 @@
/>
</div>
<!--:class="{'drawer-review':isDrawerClass,
'drawer-review-One':!isDrawerClass}"-->
<!--:class="{'drawer-review':isDrawerClass,
'drawer-review-One':!isDrawerClass}"-->
<div v-if="this.queryData.isDisplay" class="drawer-review">
<reviewedByThePersonInCharge
v-if="isDisplay"
@@ -48,15 +53,15 @@
:queryBy="queryBy"
:queryPersonInCharge="queryPersonInCharge"/>
</div>
<div class="drawer-bootom-button">
<footerProcess
v-if="isDisplay"
:is-cancel="isCancel"
:is-confirm="isConfirm"
@cancel="handleCancel"
@confirm="confirm"
/>
</div>
<div class="drawer-bootom-button">
<footerProcess
v-if="isDisplay"
:is-cancel="isCancel"
:is-confirm="isConfirm"
@cancel="handleCancel"
@confirm="confirm"
/>
</div>
</a-drawer>
<referenceDeliverablesList ref="referenceDeliverablesListRef"
@referenceDeliverablesListForm="referenceDeliverablesListForm"/>
@@ -102,7 +107,7 @@
{
title: this.$t('entryName'),
value: 'projectName',
projectVersion:'projectVersion',
projectVersion: 'projectVersion'
},
{
title: this.$t('regulationNo'),
@@ -160,11 +165,11 @@
handleCancel() {
this.visible = false
},
referenceDeliverablesClick(){
this.$refs.referenceDeliverablesListRef.transferModel()
referenceDeliverablesClick() {
this.$refs.referenceDeliverablesListRef.transferModel(this.queryData.flowType,JSON.parse(JSON.stringify(this.queryProject)))
},
referenceDeliverablesListForm(){
referenceDeliverablesListForm(data) {
this.$refs.reviewedByThePersonInChargeRef.getData(JSON.parse(JSON.stringify(data)))
},
confirm(operatorTime) {
this.$refs.reviewedByThePersonInChargeRef.submit((res) => {
@@ -281,9 +286,9 @@
getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => {
if (res.success) {
this.queryProject = res.result[0] || {}
if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr'){
this.queryProject.endTime = this.queryData.endTime
}
// if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr') {
// this.queryProject.endTime = this.queryData.endTime
// }
this.loading = false
this.isDisplay = true
} else {
@@ -315,7 +320,8 @@
.drawer-review {
margin-bottom: 30px;
}
.drawer-review-One{
.drawer-review-One {
position: absolute;
bottom: 40px;
z-index: 1001;
@@ -326,6 +332,7 @@
background: #fff;
border-radius: 0 0 2px 2px;
}
.circulationHistory {
margin-bottom: 436px;
}
@@ -333,4 +340,20 @@
.circulationHistoryOne {
margin-bottom: 30px;
}
.questionClass {
position: absolute;
top: 20px;
right: 70px;
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;
}
</style>
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+4 -3
View File
@@ -26,9 +26,10 @@
</span>
</span>
<span slot="standardInformation" slot-scope="text,record">
<a @click="standardInformationClick(record)" v-if="text && text != '--'" :title="text">
<!-- @click="standardInformationClick(record)"-->
<span v-if="text && text != '--'" :title="text">
{{text}}
</a>
</span>
<span v-else>--</span>
</span>
</a-table>
@@ -84,7 +85,7 @@
width: 300
},
{
title: this.$t('taskType'),
title: this.$t('ProcessType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
jero-web/src/views/toDoCenter/projectRegulationTasks/components/referenceDeliverablesList.vue
+23 -21
View File
@@ -97,17 +97,21 @@
pageSize: 10,
total: 0,
ids: '',
detailedWarningList: []
detailedWarningList: [],
queryProject: {},
type: ''
}
},
mounted() {
},
methods: {
transferModel(ids) {
transferModel(type, queryProject) {
this.visible = true
this.queryParam = {}
this.selectedRowKeys = []
this.type = type
this.queryProject = queryProject
this.replacePage()
},
searchQuery() {
@@ -154,31 +158,29 @@
handleSubmit() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
if (selectedRowKeys.join(',') == this.$route.query.id) {
this.$message.warning(this.$t('theDeliverablesCannotReferencedPleaseReselect'))
return
}
this.confirmLoading = true
postAction('/project/projectCertificationInventoryEO/citeDeliverable', {
projectCertificationInventoryIds: this.ids,
projectLibraryId: this.$route.query.id,
let query = {
serialNumber: this.queryProject.serialNumber,
dutyTerritory: this.queryProject.dutyTerritory,
citeProjectLibraryId: selectedRowKeys.join(',')
}).then((res) => {
}
if (this.type == '2') {
query.operateType = 'lawsInventoryDesignCiteDeliverable'
query.designDeliverableType = this.queryProject.designDeliverableType
} else if (this.type == '4') {
query.operateType = 'lawsInventoryVerifyCiteDeliverable'
query.verifyDeliverableType = this.queryProject.verifyDeliverableType
}
postAction('/project/projectLawsInventoryEO/citeDeliverable', query).then((res) => {
if (res.success) {
this.confirmLoading = false
if (res.result) {
this.$message.warning(res.result)
} else {
this.$message.success(this.$t('OperationSuccessful'))
}
this.$message.success(res.message)
this.visible = false
this.$emit('referenceDeliverablesListForm')
} else {
if (res.result) {
this.$message.warning(res.result)
} else {
this.$message.warning(this.$t('operationFailed'))
if (res.result){
this.$emit('referenceDeliverablesListForm',res.result)
}
} else {
this.$message.warning(res.message)
this.confirmLoading = false
}
})
jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+6
View File
@@ -180,6 +180,12 @@
}
},
methods: {
getData(data) {
this.formInline.disposeResult = data.operatorResult
this.formInline.approvalOpinion = data.approvalOpinion
this.formInline.approvalFile = data.approvalFile
this.formInline = { ...this.formInline }
},
submit(callBack) {
this.$refs.ruleForm.validate(valid => {
if (valid) {
jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+2 -2
View File
@@ -133,7 +133,7 @@
value: '10'
},
{
name: this.$t('designConformanceVerification'),
name: this.$t('designComplianceProcess'),
value: '2'
},
{
@@ -141,7 +141,7 @@
value: '21'
},
{
name: this.$t('verifyConformanceConfirmation'),
name: this.$t('validationComplianceProcess'),
value: '4'
}
],