diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index 3e3cb5a99..289f60ec9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -377,8 +377,8 @@ public class ProjectLawsInventoryEOController extends JeroController change(@RequestParam Map params) { + @PostMapping(value = "/change") + public Result change(@RequestBody JSONObject params) { return this.projectLawsInventoryEOService.change(params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index bd9170331..d339bf66d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -105,9 +105,10 @@ public class InventoryAffirmJob implements Job { //如果清单确认结束日期是当前日期 if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()))){ if(StringUtils.isEmpty(projectLawsInventoryEO.getSendMsgFlag())){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()) && StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())){ currentDaysUserIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); - }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){ + } + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId()) && StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())){ currentDaysUserIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); } projectLawsInventoryEO.setSendMsgFlag(SendMsgFlagEnum.FALSE.getValue()); @@ -118,9 +119,10 @@ public class InventoryAffirmJob implements Job { //如果清单确认结束时间是当前系统时间后三天 if(StringUtils.equals(threeDaysStr,sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()))){ if(StringUtils.isEmpty(projectLawsInventoryEO.getSendMsgCurrentFlag())){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()) && StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())){ threeDaysUserIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); - }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){ + } + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId()) && StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())){ threeDaysUserIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); } projectLawsInventoryEO.setSendMsgCurrentFlag(SendMsgFlagEnum.FALSE.getValue()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 675dda5e0..fde39e439 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -122,7 +122,7 @@ public interface IProjectLawsInventoryEOService extends IService list, LoginUser currentUser, int isProjectRole, String cut); - Result change(Map parmas); + Result change(JSONObject parmas); /** * 下载pdf报告 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 15c79a89f..91fbcc37e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1290,6 +1290,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl() .lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); + // studio信息 + SysUser studioUserInfo = this.sysUserMapper.selectOne( + new QueryWrapper().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) + ); + QueryWrapper projectNameInfoEOQueryWrapper = new QueryWrapper<>(); projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); @@ -1354,7 +1359,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) - ); - //只要有一个人拒绝，就改为拒绝。 if(StringUtils.equals(operatorResult, OperatorResultEnum.REJECTED.getValue())){ inventoryAffirmStatus = InventoryAffirmStatusEnum.REJECTED.getValue(); @@ -1493,7 +1494,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl() .lambda().eq(ProjectLibraryBase::getId, projectLibraryId)); + ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne( + new QueryWrapper().lambda().eq(ProjectLawsInventoryEO::getId, id) + ); SysUser studioUserInfo = this.sysUserMapper.selectOne( new QueryWrapper().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer()) @@ -2112,6 +2116,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())){ String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id userIdList.add(prehomoDutyId); @@ -2212,7 +2233,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())){ String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id userIdList.add(verifyDutyId); @@ -2225,7 +2252,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String designInitiatorId = jsonObject.getString("designInitiatorId"); //设计符合性发起人id userIdList.add(designInitiatorId); @@ -2238,7 +2270,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id userIdList.add(prehomoInitiatorId); @@ -2251,7 +2288,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){ String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id userIdList.add(verifyInitiatorId); @@ -2264,7 +2306,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); }else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){ String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id userIdList.add(designDutyId); @@ -2277,7 +2324,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getDesignInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())){ String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id userIdList.add(prehomoDutyId); @@ -2290,7 +2342,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getPrehomoInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())){ String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id userIdList.add(verifyDutyId); @@ -2303,7 +2360,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().lambda().eq(SysUser::getId, projectLawsInventoryEO.getVerifyInitiatorId()) + ); + initiatorLark = initiatorLarkInfo.getUsername(); } if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){ @@ -2311,15 +2373,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl" + " View details" + ""; + String href = ""; + if(StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())) + { + hrefFeishu = backUrl + + JumpLinkEnum.TASK_AFFIRM_LINK.getLink(); + href = "" + " View details" + ""; + }else if(StringUtils.equals(msgType,MsgTypeEnum.DESIGN_START_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_START_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.VERIFY_START_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue()) + ||StringUtils.equals(msgType,MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())) + { + hrefFeishu = backUrl + + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + + projectLibraryBase.getId() + + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType() + + "&projectName=" + projectNameInfoEO.getProjectName() + "-" + + projectYearNameInfoEO.getYearName() + + projectLibraryBase.getTargetMarket(); + href = "" + " View details" + ""; + } + String contentInfo = msgContentEN + " " + href; Map sendMessageMap = new HashMap<>(); sendMessageMap.put("hrefFeishu",hrefFeishu); @@ -4087,8 +4182,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl change(Map parmas) { - String ids = parmas.get("ids").toString(); + public Result change(JSONObject parmas) { + String ids = parmas.getString("ids"); if(StringUtils.isNotEmpty(ids)){ List idList = Arrays.asList(ids.split(",")); String projectLawsInventoryIds = ids; @@ -4102,6 +4197,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskInventoryQueryWrapper = new QueryWrapper<>(); @@ -4178,7 +4280,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); + JSONObject params = new JSONObject(); params.put("projectLawsInventoryIds",projectLawsInventoryIds); params.put("pIds",pIds); //根据流程实例id 、 法规清单id 删除相关流程。 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java index 47eecc5bc..a7e556d3e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java @@ -155,13 +155,13 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl queryOneWrapper = new QueryWrapper<>(); + queryOneWrapper.lambda().eq(SysUser::getId,initiatorId); + SysUser sysUser = this.sysUserService.getBaseMapper().selectOne(queryOneWrapper); + initiator = sysUser.getUsername(); + } + feishuMsgVo.setInitiator(initiator); //发送消息 SendMessageUtils.sendMessage(msgTitle, msgContentEN,userIdList,projectLibraryBaseInfo.getId(),sendMessageMap, feishuMsgVo, messageTypeEnum,MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()); } @@ -351,13 +362,30 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl queryOneWrapper = new QueryWrapper<>(); + queryOneWrapper.lambda().eq(SysUser::getId,initiatorId); + SysUser sysUser = this.sysUserService.getBaseMapper().selectOne(queryOneWrapper); + initiator = sysUser.getUsername(); + } + feishuMsgVo.setInitiator(initiator); MessageTypeEnum messageTypeEnum = null; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index b39663dc2..f3abd5757 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -54,8 +54,10 @@ public class workFlowController { jsonObject.put("loginUserId", currentUser.getId()); jsonObject.put("loginUserName", currentUser.getUsername()); if(StringUtils.equals(type,FlowTypeEnum.RWQRLC.getValue())){ - jsonObject.put("id", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); //流程定义id - return this.activiti_define_start(jsonObject); + /*jsonObject.put("id", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); //流程定义id + return this.activiti_define_start(jsonObject);*/ + jsonObject.put("processDefinitionKey", FlowTypeEnum.RWQRLC.getProcessDefinitionKey()); + return this.startTaskToConfirmProcess(jsonObject); }else if(StringUtils.equals(type,FlowTypeEnum.SJFHXSHLC.getValue())){ jsonObject.put("id", FlowTypeEnum.SJFHXSHLC.getProcessDefinitionKey()); initConditionAssessmentEO(jsonObject); @@ -203,4 +205,13 @@ public class workFlowController { public Result startLawsTechnologyEvaluationProcess(@RequestBody JSONObject jsonObject){ return workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject); } + + /** + * 启动流程-任务确认流程 + * @param jsonObject + * @return + */ + public Result startTaskToConfirmProcess(@RequestBody JSONObject jsonObject){ + return workFlowFeignClient.startTaskToConfirmProcess(jsonObject); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index 1c48c7d24..401da0f62 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -84,8 +84,8 @@ public interface WorkFlowFeignClient { * @param params * @return */ - @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByProjectLawsInventoryIds",method = RequestMethod.GET) - Result deleteProcessInstanceByProjectLawsInventoryIds(@RequestParam Map params); + @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByProjectLawsInventoryIds",method = RequestMethod.POST,headers = {"content-type=application/json"}) + Result deleteProcessInstanceByProjectLawsInventoryIds(String params); /** * 流程实例明细列表 @@ -146,6 +146,14 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/startLawsTechnologyEvaluationProcess",method = RequestMethod.POST,headers = {"content-type=application/json"}) Result startLawsTechnologyEvaluationProcess(String jsonObject); + /** + * 启动流程-任务确认流程 + * @param jsonObject + * @return + */ + @RequestMapping(value = "/bat-wkflow/startTaskToConfirmProcess",method = RequestMethod.POST,headers = {"content-type=application/json"}) + Result startTaskToConfirmProcess(String jsonObject); + @RequestMapping(value = "/bat-wkflow/task/completeLawsTechnologyEvaluationTaskByPids",method = RequestMethod.GET) Result completeLawsTechnologyEvaluationTaskByPids(@RequestParam("actiProcInstIds") String actiProcInstIds); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java index 78da46005..707089e60 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java @@ -101,8 +101,8 @@ public class WorkFlowFeignClientImpl{ * @param params * @return */ - public Result deleteProcessInstanceByProjectLawsInventoryIds(@RequestParam Map params){ - return workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params); + public Result deleteProcessInstanceByProjectLawsInventoryIds(@RequestBody JSONObject params){ + return workFlowFeignClient.deleteProcessInstanceByProjectLawsInventoryIds(params.toString()); } /** @@ -167,4 +167,14 @@ public class WorkFlowFeignClientImpl{ Result stringWrapper = workFlowFeignClient.startLawsTechnologyEvaluationProcess(jsonObject.toString()); return Result.OK(stringWrapper.getResult()); } + + /** + * 启动流程-任务确认流程 + * @param jsonObject + * @return + */ + public Result startTaskToConfirmProcess(@RequestBody net.sf.json.JSONObject jsonObject){ + Result stringWrapper = workFlowFeignClient.startTaskToConfirmProcess(jsonObject.toString()); + return Result.OK(stringWrapper.getResult()); + } } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 6a69c579a..dbf4800e9 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -212,7 +212,7 @@ ((record.roleCode == 1 && !record.regulationOwnerSubmitStatus) || (record.roleCode == 2 && !record.homologationEngineerSubmitStatus) || (record.roleCode == 4 && !record.regulationOwnerSubmitStatus && !record.homologationEngineerSubmitStatus))) - || record.roleCode == 0" + || (record.roleCode == 0 && record.taskAffirmStatus != 'List to confirm')" @click="edit(record)"> {{ $t('edit') }} @@ -1080,7 +1080,7 @@ ...this.queryParam, ids: selectedRowKeys.join(','), ...this.queryParamQuery, - roleCode:roleCodeIndex, + roleCode: roleCodeIndex, projectLibraryId: this.$route.query.id } downloadFile(this.url.exportData, this.$route.query.projectName + this.$t('listOfRegulations') + '.zip', query, this.Deselect) @@ -1211,7 +1211,7 @@ content: _this.$t('NoteConfirmTheChange'), onOk() { let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - getAction('/project/projectLawsInventoryEO/change', { + postAction('/project/projectLawsInventoryEO/change', { ids: idList.join(','), projectLibraryId: _this.$route.query.id }).then((res) => { @@ -1629,30 +1629,42 @@ this.detailedWarningList = [] }) } else { - for (let i = 0; i < this.TaskSuccessList.length; i++) { - ((i) => { - this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate - Object.keys(this.TaskSuccessList[i]).forEach(res => { - if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) { - this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“') - this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘') - } - }) - setTimeout(() => { - this.confirmLoading = true - this.startProcess(this.TaskSuccessList[i], (i + 1)) - }, 500) - })(i) + // for (let i = 0; i < this.TaskSuccessList.length; i++) { + // ((i) => { + // this.TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate + // Object.keys(this.TaskSuccessList[i]).forEach(res => { + // if (this.TaskSuccessList[i][res] && this.TaskSuccessList[i][res] instanceof String) { + // this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\"/g, '“') + // this.TaskSuccessList[i][res] = this.TaskSuccessList[i][res].replace(/\'/g, '‘') + // } + // }) + // setTimeout(() => { + // this.confirmLoading = true + // this.startProcess(this.TaskSuccessList[i], (i + 1)) + // }, 500) + // })(i) + // } + let TaskSuccessList = JSON.parse(JSON.stringify(this.TaskSuccessList)) + for (let i = 0; i < TaskSuccessList.length; i++) { + TaskSuccessList[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate + Object.keys(TaskSuccessList[i]).forEach(res => { + if (TaskSuccessList[i][res] && TaskSuccessList[i][res] instanceof String) { + TaskSuccessList[i][res] = TaskSuccessList[i][res].replace(/\"/g, '“') + TaskSuccessList[i][res] = TaskSuccessList[i][res].replace(/\'/g, '‘') + } + }) } + this.confirmLoading = true + this.startProcess(TaskSuccessList) } } }) }, - startProcess(value, index) { + startProcess(value) { let query = { type: 1, - msg: JSON.stringify(value).replace(/\"/g, '\''), + projectLawsInvnetoryList: value, projectNameId: this.$route.query.projectNameId, projectName: this.$route.query.projectName, projectLawsInventoryId: value.id, @@ -1660,7 +1672,24 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTask(value, res.result, index) + this.visible = false + this.selectedRowKeys = [] + this.$message.success(this.$t('OperationSuccessful')) + this.confirmLoading = false + this.getList() + let that = this + if (this.TaskWarningList.length > 0) { + this.$warning({ + content: ( + < div > + { that.TaskWarningList } + < /div> + ) + }) + } + // this.completeTask(value, res.result, index) + } else { + this.$message.warning(this.$t('operationFailed')) } }) },