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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java

@@ -495,4 +495,12 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String verifyFlowStatus;
     @TableField(exist = false)
     private String verifyFlowStatusName;
+
+    /**验证符合性确认-流程实例id*/
+    @TableField(exist = false)
+    private String verifyPId;
+
+    /**设计符合性确认-流程实例id*/
+    @TableField(exist = false)
+    private String designPId;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java

@@ -12,6 +12,10 @@ public enum ComplianceFlowStatusEnum {
     TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"),
     RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"),
     RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"),
+    CONFORMITY("符合","Compliance","Compliance"),
+    INCONFORMITY("不符合","Non-Compliance","Non-Compliance"),
+    TO_TRACK("待追踪","To be tracked","To be tracked"),
+    UNINVOLVED("不涉及","NA","NA")
     ;
 
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java

@@ -9,6 +9,7 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.feishu.vo.FeishuMsgVo;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.vo.ProjectTaskUrgVo;
+import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysRole;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
@@ -182,4 +183,13 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	 * @return
 	 */
 	Result<?> regulationOwnerReturned(JSONObject json);
+
+	/**
+	 * 根据id获取交付物类型展示名称
+	 * @param projectLawsInventoryId
+	 * @param cut
+	 * @param flowType
+	 * @return
+	 */
+	String getDeliverableTypeNameById(String projectLawsInventoryId, String cut, String flowType,List<ProjectLawsInventoryEO> projectLawsInventoryEOList,List<SysCategory> categoryList);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -5727,9 +5727,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getInventoryAffirmDueDate,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getTaskAffirmDueDate,null);
+			updateWrapper.set(ProjectLawsInventoryEO::getDesignFlowStatus,ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+			updateWrapper.set(ProjectLawsInventoryEO::getVerifyFlowStatus,ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
 			super.update(projectLawsInventoryEO, updateWrapper);
 
-			QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
+			QueryWrapper<ProcessInfoEO> processInfoQueryWrap = new QueryWrapper<>();
+			processInfoQueryWrap.lambda().in(ProcessInfoEO::getProjectLawsInventoryId,idList);
+			List<ProcessInfoEO> processInfoEOList = this.processInfoEOService.list(processInfoQueryWrap);
+			List<String> actiProcInstIdList = processInfoEOList.stream().filter(processInfo -> {
+				boolean flag = false;
+				if (StringUtils.equals(processInfo.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue()) || StringUtils.equals(processInfo.getFlowType(), FlowTypeEnum.YZFHXSCLC.getValue())) {
+					flag = true;
+				}
+				return flag;
+			}).map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList());
+
+			pIds = actiProcInstIdList.stream().map(String::valueOf).collect(Collectors.joining(","));
+
+			/*QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
 			taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,idList);
 			List<ProjectTaskInventoryEO> projectTaskInventoryList = this.projectTaskInventoryEOService.getBaseMapper().selectList(taskInventoryQueryWrapper);
 
@@ -5767,13 +5782,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
 				projectTaskInventoryEOList.add(projectTaskInventoryEO);
 			});
-			/*idList.forEach(id -> {
+//			idList.forEach(id -> {
-				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
+//				ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
-				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
+//				String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
-				projectTaskInventoryEO.setId(projectTaskInventoryId);
+//				projectTaskInventoryEO.setId(projectTaskInventoryId);
-				projectTaskInventoryEO.setProjectLawsInventoryId(id);
+//				projectTaskInventoryEO.setProjectLawsInventoryId(id);
-				projectTaskInventoryEOList.add(projectTaskInventoryEO);
+//				projectTaskInventoryEOList.add(projectTaskInventoryEO);
-			});*/
+//			});
 			//项目任务清单数据初始化。
 			this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList);
 			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
@@ -5807,7 +5822,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//删除当前项目状态表
 			QueryWrapper<ConditionAssessmentEO> deleteConditionAssessmentWrapper = new QueryWrapper<>();
 			deleteConditionAssessmentWrapper.lambda().in(ConditionAssessmentEO::getProjectLawsInventoryId,idList);
-			this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);
+			this.conditionAssessmentEOService.remove(deleteConditionAssessmentWrapper);*/
 
 			JSONObject params = new JSONObject();
 			params.put("projectLawsInventoryIds",projectLawsInventoryIds);
@@ -5818,6 +5833,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//清除流程中心对应的数据
 			params.put("ids",ids);
 			this.processInfoEOService.change(params);
+			
+			// 删除流程历史数据
+			this.processHistoryEOService.deleteBiActiProcInstIdList(actiProcInstIdList);
 		}
 		return Result.OK("变更成功！");
 	}
@@ -10059,5 +10077,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		return Result.OK("退回成功！");
 	}
 
+	@Override
+	public String getDeliverableTypeNameById(String projectLawsInventoryId, String cut, String flowType,List<ProjectLawsInventoryEO> projectLawsInventoryEOList,List<SysCategory> categoryList) {
+		String result = "";
+
+		for (ProjectLawsInventoryEO lawsInventory : projectLawsInventoryEOList) {
+			if(StringUtils.equals(projectLawsInventoryId,lawsInventory.getId())){
+				if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){
+					List<String> designDeliverableTypeList = Arrays.asList(lawsInventory.getDesignDeliverableType().split(","));
+					result = this.getTreeName(cut, categoryList, designDeliverableTypeList);
+				}else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){
+					lawsInventory.getVerifyDeliverableType();
+					List<String> verifyDeliverableTypeList = Arrays.asList(lawsInventory.getVerifyDeliverableType().split(","));
+					result = this.getTreeName(cut, categoryList, verifyDeliverableTypeList);
+				}
+			}
+		}
+		return result;
+	}
+
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java

@@ -0,0 +1,65 @@
+package com.jero.modules.todoCenter.enums;
+
+import com.jero.common.constant.enums.CutEnum;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 待办中心-设计符合性流程节点key枚举类
+ */
+public enum DesignComplianceFlowNodeKeyEnum {
+    fqlc("发起流程","Initiate the process","fqlc"),
+    zrrqr("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认
+    dezrrqr("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认
+    zrrtjjfw("设计符合性确认","Design compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
+    dezrrtjjfw("设计符合性确认","Design compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
+    fggcssh("设计符合性审查","Design compliance review","fggcssh"), // 法规工程师审核
+    ;
+
+    String cnName;
+    String enName;
+    String value;
+
+    private DesignComplianceFlowNodeKeyEnum(String cnName, String enName, String value) {
+        this.cnName = cnName;
+        this.enName = enName;
+        this.value = value;
+    }
+
+    public String getCnName() {
+        return cnName;
+    }
+
+    public void setCnName(String cnName) {
+        this.cnName = cnName;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static String getTextByValue(String value,String cut) {
+        DesignComplianceFlowNodeKeyEnum[] values = values();
+        for (DesignComplianceFlowNodeKeyEnum todoCenterStatusEnum : values) {
+            if (todoCenterStatusEnum.value.equals(value)) {
+                if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                    return todoCenterStatusEnum.cnName;
+                }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                    return todoCenterStatusEnum.enName;
+                }
+            }
+        }
+        return null;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java

@@ -0,0 +1,65 @@
+package com.jero.modules.todoCenter.enums;
+
+import com.jero.common.constant.enums.CutEnum;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 待办中心-验证符合性流程节点key枚举类
+ */
+public enum VerifyComplianceFlowNodeKeyEnum {
+    fqlc("发起流程","Initiate the process","fqlc"),
+    zrrqr("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认
+    dezrrqr("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认
+    zrrtjjfw("验证符合性确认","Verify compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
+    dezrrtjjfw("验证符合性确认","Verify compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
+    fggcssh("验证符合性审查","Verify compliance review","fggcssh"), // 法规工程师审核
+    ;
+
+    String cnName;
+    String enName;
+    String value;
+
+    private VerifyComplianceFlowNodeKeyEnum(String cnName, String enName, String value) {
+        this.cnName = cnName;
+        this.enName = enName;
+        this.value = value;
+    }
+
+    public String getCnName() {
+        return cnName;
+    }
+
+    public void setCnName(String cnName) {
+        this.cnName = cnName;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public static String getTextByValue(String value,String cut) {
+        VerifyComplianceFlowNodeKeyEnum[] values = values();
+        for (VerifyComplianceFlowNodeKeyEnum todoCenterStatusEnum : values) {
+            if (todoCenterStatusEnum.value.equals(value)) {
+                if(StringUtils.equals(cut, CutEnum.CN.getValue())){
+                    return todoCenterStatusEnum.cnName;
+                }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                    return todoCenterStatusEnum.enName;
+                }
+            }
+        }
+        return null;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java

@@ -24,13 +24,17 @@ import com.jero.modules.project.service.IProjectLawsInventoryEOService;
 import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
 import com.jero.modules.project.service.IProjectTaskInventoryEOService;
+import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
+import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
 import com.jero.modules.todoCenter.entity.ProcessInfoEO;
+import com.jero.modules.todoCenter.enums.DesignComplianceFlowNodeKeyEnum;
 import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
+import com.jero.modules.todoCenter.enums.VerifyComplianceFlowNodeKeyEnum;
 import com.jero.modules.todoCenter.mapper.ProcessInfoEOMapper;
 import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
 import com.jero.modules.todoCenter.service.IProcessInfoEOService;
@@ -86,6 +90,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 	private ILawsTechnologyEvaluationFlowDetailEOService lawsTechnologyEvaluationFlowDetailEOService;
 	@Autowired
 	private ISysDictService sysDictService;
+	@Autowired
+	private SysCategoryServiceImpl sysCategoryService;
 
 	/**
 	 * 保存
@@ -590,6 +596,29 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 			List<SysUser> createByUserList = this.sysUserService.querySysUserListByIdList(createByUserIdList);
 			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
+			List<String> projectLawsInventoryIdList = datas.stream().filter(data -> {
+				boolean flag = false;
+				if (StringUtils.isNotEmpty(data.getProjectLawsInventoryId())) {
+					flag = true;
+				}
+				return flag;
+			}).map(ProcessInfoVO::getProjectLawsInventoryId).collect(Collectors.toList());
+
+			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
+			if(CollectionUtils.isNotEmpty(projectLawsInventoryIdList)){
+				QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
+				lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList);
+				projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrapper);
+			}
+			List<SysCategory> categoryList = sysCategoryService.list();
+			for (ProcessInfoVO data : datas) {
+				// 处理展示的交付物类型信息
+				if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
+					String projectLawsInventoryId = data.getProjectLawsInventoryId();
+					String deliverableTypeName = this.projectLawsInventoryEOService.getDeliverableTypeNameById(projectLawsInventoryId,cut,data.getFlowType(),projectLawsInventoryEOList,categoryList);
+					data.setDeliverableTypeName(deliverableTypeName);
+				}
+			}
 			datas.forEach(data -> {
 				// 设置发起人的名称
 				if(CollectionUtils.isNotEmpty(createByUserList) && StringUtils.isNotEmpty(data.getCreateBy())){
@@ -620,6 +649,13 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 						data.setTaskId(currentUserProcessInfoDetailInfos.get(0).getTaskId());
 						// 设置taskDefinitionKey
 						data.setTaskDefinitionKey(currentUserProcessInfoDetailInfos.get(0).getTaskDefinitionKey());
+						String taskDefinitionKeyName = "";
+						if (StringUtils.equals(data.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())) {
+							taskDefinitionKeyName = DesignComplianceFlowNodeKeyEnum.getTextByValue(currentUserProcessInfoDetailInfos.get(0).getTaskDefinitionKey(),cut);
+						}else if(StringUtils.equals(data.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
+							taskDefinitionKeyName = VerifyComplianceFlowNodeKeyEnum.getTextByValue(currentUserProcessInfoDetailInfos.get(0).getTaskDefinitionKey(),cut);
+						}
+						data.setTaskDefinitionKeyName(taskDefinitionKeyName);
 					}
 				}
 			});

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java

@@ -92,6 +92,8 @@ public class ProcessInfoVO implements Serializable {
     private String taskId;
     /**任务节点定义key*/
     private String taskDefinitionKey;
+    /**任务节点定义key展示名称*/
+    private String taskDefinitionKeyName;
     /**项目名称id*/
     private String projectNameId;
     /**目标市场*/
@@ -111,4 +113,7 @@ public class ProcessInfoVO implements Serializable {
     private String projectVersion;
     /**主项目id parent_id**/
     private String parentId;
+
+    /**交付物类型展示名称**/
+    private String deliverableTypeName;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java

@@ -68,4 +68,6 @@ public interface IProcessHistoryEOService extends IService<ProcessHistoryEO> {
 	 * @return
 	 */
     Result<?> processCall(JSONObject jsonObject);
+
+	void deleteBiActiProcInstIdList(List<String> actiProcInstIdList);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java

@@ -182,4 +182,14 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl<ProcessHistoryEOMap
 		}
 		return new Result<>().success("调用成功！");
 	}
+
+	@Override
+	public void deleteBiActiProcInstIdList(List<String> actiProcInstIdList) {
+		if(CollectionUtils.isNotEmpty(actiProcInstIdList)){
+			QueryWrapper<ProcessHistoryEO> removeWrap = new QueryWrapper<>();
+			removeWrap.lambda().in(ProcessHistoryEO::getActiProcInstId,actiProcInstIdList);
+			this.remove(removeWrap);
+
+		}
+	}
 }

jero-web/src/views/projectManagement/components/listEditModel.vue

@@ -31,7 +31,6 @@
               </div>
               <a-form-model-item class="itemModel" prop="title">
                 <a-input class="box-input"
-                         :disabled="formInline.roleCodeIndex == 0 ? false : true"
                          v-model="formInline.title"
                          :placeholder="$t('PleaseEnter')+$t('title')"/>
               </a-form-model-item>
@@ -46,7 +45,6 @@
               </div>
               <a-form-model-item class="itemModel" prop="subtitle">
                 <a-input class="box-input"
-                         :disabled="formInline.roleCodeIndex == 0 ? false : true"
                          v-model="formInline.subtitle"
                          :placeholder="$t('PleaseEnter')+$t('subtitle')"/>
               </a-form-model-item>
@@ -60,7 +58,6 @@
               </div>
               <a-form-model-item class="itemModel" prop="applicableSupplement">
                 <a-input class="box-input"
-                         :disabled="formInline.roleCodeIndex == 0 ? false : true"
                          v-model="formInline.applicableSupplement"
                          :placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
               </a-form-model-item>
@@ -158,8 +155,6 @@
               </div>
               <a-form-model-item class="itemModel-multi" prop="attestationType">
                 <j-multi-select-tag class="box-input" v-model="formInline.attestationType"
-                                    :disabled="formInline.roleCodeIndex == 0 ||
-                                    (formInline.roleCodeIndex == 4 && formInline.homologationEngineerId == userInfoQuery.id) ? false : true"
                                     :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                     :type="'select'"
                                     :triggerChange="false" :dictCode="'attestation_type'"/>
@@ -169,14 +164,12 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="Required">*</span>
                 <span class="title-text-text"
                       :title="$t('certificationLevel')">{{$t('certificationLevel')}}</span>
               </div>
               <a-form-model-item class="itemModel-multi" prop="attestationRank">
                 <j-multi-select-tag class="box-input" v-model="formInline.attestationRank"
-                                    :disabled="formInline.roleCodeIndex == 0 ||
-                                    (formInline.roleCodeIndex == 4 && formInline.homologationEngineerId == userInfoQuery.id) ? false : true"
                                     :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
                                     :type="'select'"
                                     :triggerChange="false" :dictCode="'attestation_rank'"/>
@@ -202,7 +195,7 @@
               </a-form-model-item>
             </div>
           </a-col>
-          <a-col :span="12" v-if="formInline.roleCodeIndex == 0">
+          <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
@@ -211,9 +204,9 @@
               <a-form-model-item class="itemModel" :prop="'regulationOwnerId'">
                 <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
                           class="box-input"
+                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
-                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
                           v-model="formInline.regulationOwnerId">
                   <a-select-option v-for="(item, key) in regulatoryEngineerList"
                                    :key="key"
@@ -227,7 +220,7 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0">
+        <a-row :gutter="24">
 <!--          <a-col :span="12">-->
 <!--            <div class="box-title-text">-->
 <!--              <div class="title-text">-->
@@ -255,7 +248,7 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
@@ -263,7 +256,6 @@
                           class="box-input"
                           allowClear
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
                           v-model="formInline.engineeringInterfacePerson">
                   <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
                                    :key="key"
@@ -312,18 +304,10 @@
                     </div>
                   </a-col>
                 </a-row>
-        <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
+        <div class="header-text">
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
           &nbsp;{{$t('confirmationOfDesignConformity')}}
         </div>
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        <a-row :gutter="24">
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -424,11 +408,7 @@
 <!--            </div>-->
 <!--          </a-col>-->
 <!--        </a-row>-->
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        <a-row :gutter="24">
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -472,11 +452,7 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        <a-row :gutter="24">
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.designInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
@@ -657,18 +633,10 @@
 <!--            </div>-->
 <!--          </a-col>-->
 <!--        </a-row>-->
-        <div class="header-text" v-if="formInline.roleCodeIndex == 0 ||
+        <div class="header-text">
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
           &nbsp;{{$t('verificationAndConformityconfirmation')}}
         </div>
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        <a-row :gutter="24">
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-        formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-         formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -753,11 +721,7 @@
 <!--        formInline.regulationOwnerId == userInfoQuery.id)">-->
 <!--          -->
 <!--        </a-row>-->
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        <a-row :gutter="24">
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -802,11 +766,7 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24" v-if="formInline.roleCodeIndex == 0 ||
+        <a-row :gutter="24">
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.homologationEngineerId &&
-         formInline.homologationEngineerId == userInfoQuery.id) ||
-        (formInline.roleCodeIndex == 4 && formInline.verifyInitiatorId == formInline.regulationOwnerId &&
-        formInline.regulationOwnerId == userInfoQuery.id)">
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -264,11 +264,7 @@
       >
         <span slot="operation" slot-scope="text,record">
               <a class="text-operation"
-                 v-if="(record.inventoryAffirmStatus == 'List to confirm' &&
+                 v-if="roleSwitchingCode == 0 || roleSwitchingCode == 1"
-                  ((record.roleCode == 1 && !record.regulationOwnerSubmitStatus) ||
-                  (record.roleCode == 2 && !record.homologationEngineerSubmitStatus) ||
-                  (record.roleCode == 4 && !record.regulationOwnerSubmitStatus && !record.homologationEngineerSubmitStatus)))
-                  || (record.roleCode == 0 && record.taskAffirmStatus != 'List to confirm')"
                  @click="edit(record)">
                 {{ $t('edit') }}
               </a>
@@ -459,6 +455,7 @@
       </a-form-model>
     </a-modal>
     <JLoading :loading="JLoading">{{ $t('dataLoading') }}</JLoading>
+    <JLoading :loading="JTextLoading">{{ $t('Submitting') }}</JLoading>
     <resultReportedUpload @resultReportedUploadForm="addModelList" ref="resultReportedUploadRef"/>
     <listOfRegulationsView ref="listOfRegulationsViewRef"/>
     <batchSettingPersonnel :url="url" ref="batchSettingPersonnelRef" @batchSettingPersonnelForm="addModelList"/>
@@ -1179,7 +1176,10 @@
         selectedRowKeysList: [],
         rowKeysWarningList: [],
         rolecode: false,
-        dataWarningList: []
+        dataWarningList: [],
+        completeTaskList: [],
+        requestsNum: 0,
+        JTextLoading: false
       }
     },
 
@@ -2082,7 +2082,7 @@
         })
       },
 
-      startProcess(value,type) {
+      startProcess(value, type,index) {
         let query = {
           type: type,
           projectLawsInvnetoryList: value,
@@ -2092,11 +2092,20 @@
         }
         postAction('/workFlow/startProcess', query).then((res) => {
           if (res.success) {
-            // this.visible = false
+            this.completeTaskList.push(this.completeTask(value, res.result,index))
-            // this.selectedRowKeys = []
+            Promise.all(this.completeTaskList).then((res) => {
-            // this.$message.success(this.$t('OperationSuccessful'))
+              if (this.requestsNum == res.length) {
-            // this.confirmLoading = false
+                this.visible = false
-            this.completeTask(value, res.result)
+                this.selectedRowKeys = []
+                this.$message.success(this.$t('OperationSuccessful'))
+                this.confirmLoading = false
+                this.JTextLoading = false
+                this.getList()
+              }
+            }).catch((error) => {
+              this.JTextLoading = false
+              this.$message.warning(error.message)
+            })
           } else {
             this.$message.warning(this.$t('operationFailed'))
           }
@@ -2119,14 +2128,9 @@
           }
           postAction('/workFlow/completeTask', query).then((res) => {
             if (res.success) {
-              // this.visible = false
-              // this.selectedRowKeys = []
-              // this.$message.success(this.$t('OperationSuccessful'))
-              // this.confirmLoading = false
-              // this.getList()
               resolve(res)
             } else {
-              this.$message.warning(this.$t('operationFailed'))
+              reject(res)
             }
           })
         })
@@ -2180,6 +2184,7 @@
         let designList = []
         let verifyList = []
         let detailedWarningList = []
+        this.completeTaskList = []
         this.detailedWarningList = this.dataWarningList || []
         let _this = this
         _this.$destroyAll()
@@ -2225,15 +2230,21 @@
           })
           return
         }
-        this.$confirm({
+        if (num == 1) {
-          content: _this.$t('confirmLaunchTask'),
+          this.$confirm({
-          onOk() {
+            content: _this.$t('confirmLaunchTask'),
-            _this.submitAdmin(dataList)
+            onOk() {
-          }
+              _this.submitAdmin(dataList)
-        })
+            }
+          })
+        } else {
+          _this.submitAdmin(dataList)
+        }
       },
       submitAdmin(dataList) {
         let _this = this
+        this.requestsNum = 0
+        this.JTextLoading = true
         for (let i = 0; i < dataList.length; i++) {
           if (dataList[i].designDeliverableType) {
             if (!dataList[i].designDutyId) {
@@ -2255,18 +2266,29 @@
               < div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForVerifyingEmpty') } < /div>)
             }
           }
-          if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) {
+          if (dataList[i].designFlowStatus == 'List to be checked') {
-            _this.startProcess(dataList[i], 2)
+            if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) {
-            Promise.all(_this.completeTask()).then((res) => {
+              this.requestsNum++
-              console.log(res)
+              _this.startProcess(dataList[i], 2,this.requestsNum)
-            }).catch(error => {
+            }
-              console.log('error', error)
+          } else {
-            })
+            _this.detailedWarningList.push(
+            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
           }
-          if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
+          if (dataList[i].verifyFlowStatus == 'List to be checked') {
-            _this.startProcess(dataList[i], 2)
+            if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
+              this.requestsNum++
+              _this.startProcess(dataList[i], 2,this.requestsNum)
+            }
+          } else {
+            _this.detailedWarningList.push(
+            < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
           }
         }
+        if (this.requestsNum == 0) {
+          _this.promptInformation(_this.detailedWarningList)
+          this.JTextLoading = false
+        }
       },
       handleOkComment() {
         this.$refs.ruleFormComment.validate(valid => {