diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index bef96f215..13cfba0fb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -315,7 +315,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userIdList, String content, String contentInfo) { + public SysAnnouncement getSysAnnouncement(List userIdList, String content, String contentInfo,String messageType) { SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); sysAnnouncement.setSendTime(new Date()); // sysAnnouncement.setDocumentId((String) dataList.get(0).get("id")); - sysAnnouncement.setMsgCategory(MessageTypeEnum.READ.getValue());//消息类型 + sysAnnouncement.setMsgCategory(messageType);//消息类型 sysAnnouncement.setMsgType(CommonConstant.MSG_TYPE_UESR);//指定用户 sysAnnouncement.setMsgContent(content); sysAnnouncement.setMsgContentInfo(contentInfo); @@ -4740,7 +4740,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl"," "); //封装消息的实体类 - SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo); + SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.READ.getValue()); sysAnnouncementService.saveAnnouncement(sysAnnouncement); bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo); //飞书 @@ -1161,7 +1161,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl userIdList, List thirdIdList) { //站内消息 //封装消息的实体类 - SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo); + SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo,MessageTypeEnum.WARN.getValue()); sysAnnouncementService.saveAnnouncement(sysAnnouncement); bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(userIdList, ","), content); diff --git a/jero-web/src/views/processCenter/components/standardContentList.vue b/jero-web/src/views/processCenter/components/standardContentList.vue index a84e2aae7..6408371cf 100644 --- a/jero-web/src/views/processCenter/components/standardContentList.vue +++ b/jero-web/src/views/processCenter/components/standardContentList.vue @@ -137,36 +137,42 @@ }, mounted() { this.dataSource = [] - this.dataSource.push({ - ProcessType: this.$t('designComplianceReview'), - InitiatorName: this.standardContentListQuery.designInitiatorName, - DutyName: this.standardContentListQuery.designDutyName, - DueDate: this.standardContentListQuery.designDueDate, - DeliverableType: this.standardContentListQuery.designDeliverableTypeName, - DeliverableTemplate: this.standardContentListQuery.designDeliverableTemplate, - DeliverableTemplateName: this.standardContentListQuery.designDeliverableTemplateName, - remark: this.standardContentListQuery.designRemark - }) - this.dataSource.push({ - ProcessType: this.$t('preHomeConfirmation'), - InitiatorName: this.standardContentListQuery.prehomoInitiatorName, - DutyName: this.standardContentListQuery.prehomoDutyName, - DueDate: this.standardContentListQuery.prehomoDueDate, - DeliverableType: this.standardContentListQuery.prehomoDeliverableTypeName, - DeliverableTemplate: this.standardContentListQuery.prehomoDeliverableTemplate, - DeliverableTemplateName: this.standardContentListQuery.prehomoDeliverableTemplateName, - remark: this.standardContentListQuery.prehomoRemark - }) - this.dataSource.push({ - ProcessType: this.$t('verificationComplianceReview'), - InitiatorName: this.standardContentListQuery.verifyInitiatorName, - DutyName: this.standardContentListQuery.verifyDutyName, - DueDate: this.standardContentListQuery.verifyDueDate, - DeliverableType: this.standardContentListQuery.verifyDeliverableTypeName, - DeliverableTemplate: this.standardContentListQuery.verifyDeliverableTemplate, - DeliverableTemplateName: this.standardContentListQuery.verifyDeliverableTemplateName, - remark: this.standardContentListQuery.verifyRemark - }) + if (this.standardContentListQuery.designDeliverableTypeName){ + this.dataSource.push({ + ProcessType: this.$t('designComplianceReview'), + InitiatorName: this.standardContentListQuery.designInitiatorName, + DutyName: this.standardContentListQuery.designDutyName, + DueDate: this.standardContentListQuery.designDueDate, + DeliverableType: this.standardContentListQuery.designDeliverableTypeName, + DeliverableTemplate: this.standardContentListQuery.designDeliverableTemplate, + DeliverableTemplateName: this.standardContentListQuery.designDeliverableTemplateName, + remark: this.standardContentListQuery.designRemark + }) + } + if (this.standardContentListQuery.prehomoDeliverableTypeName){ + this.dataSource.push({ + ProcessType: this.$t('preHomeConfirmation'), + InitiatorName: this.standardContentListQuery.prehomoInitiatorName, + DutyName: this.standardContentListQuery.prehomoDutyName, + DueDate: this.standardContentListQuery.prehomoDueDate, + DeliverableType: this.standardContentListQuery.prehomoDeliverableTypeName, + DeliverableTemplate: this.standardContentListQuery.prehomoDeliverableTemplate, + DeliverableTemplateName: this.standardContentListQuery.prehomoDeliverableTemplateName, + remark: this.standardContentListQuery.prehomoRemark + }) + } + if (this.standardContentListQuery.verifyDeliverableTypeName){ + this.dataSource.push({ + ProcessType: this.$t('verificationComplianceReview'), + InitiatorName: this.standardContentListQuery.verifyInitiatorName, + DutyName: this.standardContentListQuery.verifyDutyName, + DueDate: this.standardContentListQuery.verifyDueDate, + DeliverableType: this.standardContentListQuery.verifyDeliverableTypeName, + DeliverableTemplate: this.standardContentListQuery.verifyDeliverableTemplate, + DeliverableTemplateName: this.standardContentListQuery.verifyDeliverableTemplateName, + remark: this.standardContentListQuery.verifyRemark + }) + } }, methods: { ...mapGetters(['userInfo']), diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 8d548556f..32c90b786 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1355,27 +1355,50 @@ let isTrue = true this.detailedSuccessList = [] this.detailedWarningList = [] + let dataSource = [] for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { - if (this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'Rejected') { - if (this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) { - this.detailedSuccessList.push(this.dataSource[i]) - } else { - this.detailedWarningList.push( < div > { this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>) - // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')) - // isTrue = false - // return - } - } else { - this.detailedWarningList.push( < div > {this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>) - // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')) - // isTrue = false - // return - } + dataSource.push(this.dataSource[i]) } } } + for (let i = 0; i < dataSource.length; i++) { + if (dataSource[i].inventoryAffirmStatus == 'Not started' || dataSource[i].inventoryAffirmStatus == 'Rejected') { + if (dataSource[i].homologationEngineerId && dataSource[i].regulationOwnerId) { + if (dataSource[i].designDeliverableType){ + if (!dataSource[i].designInitiatorId){ + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('designComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>) + continue + } + } + if (dataSource[i].prehomoDeliverableType){ + if (!dataSource[i].prehomoInitiatorId){ + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('preHomeConfirmation')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>) + continue + } + } + if (dataSource[i].verifyDeliverableType){ + if (!dataSource[i].verifyInitiatorId){ + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + ','+this.$t('verificationComplianceReview')+ this.$t('Sponsor')+this.$t('cannotEmpty') } < /div>) + continue + } + } + this.detailedSuccessList.push(dataSource[i]) + + } else { + this.detailedWarningList.push( < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>) + // this.$message.warning(this.dataSource[i].serialNumber + this.$t('TheEngineerAndCertification')) + // isTrue = false + // return + } + } else { + this.detailedWarningList.push( < div > {dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')} < /div>) + // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseSelectinitiatedOrRejected')) + // isTrue = false + // return + } + } if (this.detailedSuccessList && this.detailedSuccessList.length > 0) { this.visible = true this.formInline = {} @@ -1592,31 +1615,35 @@ getRowKeys(value, callBack) { let isTrue = true + let dataSource = [] for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < value.length; j++) { if (this.dataSource[i].id == value[j]) { - if (this.dataSource[i].inventoryAffirmStatus == 'List to confirm') { - if (this.dataSource[i].roleCode == 1 && this.dataSource[i].regulationOwnerSubmitStatus) { - isTrue = false - this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted')) - return - } else if (this.dataSource[i].roleCode == 2 && this.dataSource[i].homologationEngineerSubmitStatus) { - isTrue = false - this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted')) - return - } else if (this.dataSource[i].roleCode == 4 && (this.dataSource[i].homologationEngineerSubmitStatus && this.dataSource[i].regulationOwnerSubmitStatus)) { - isTrue = false - this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted')) - return - } - } else { - isTrue = false - this.$message.warning(this.$t('The') + (i + 1) + this.$t('incorrectsubmitted')) - return - } + dataSource.push(this.dataSource[i]) } } } + for (let i = 0; i < dataSource.length; i++) { + if (dataSource[i].inventoryAffirmStatus == 'List to confirm') { + if (dataSource[i].roleCode == 1 && dataSource[i].regulationOwnerSubmitStatus) { + isTrue = false + this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted')) + return + } else if (dataSource[i].roleCode == 2 && dataSource[i].homologationEngineerSubmitStatus) { + isTrue = false + this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted')) + return + } else if (dataSource[i].roleCode == 4 && (dataSource[i].homologationEngineerSubmitStatus && dataSource[i].regulationOwnerSubmitStatus)) { + isTrue = false + this.$message.warning(this.$t('The') + (i + 1) + this.$t('submitted')) + return + } + } else { + isTrue = false + this.$message.warning(this.$t('The') + (i + 1) + this.$t('incorrectsubmitted')) + return + } + } if (isTrue) { callBack() }