diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java index e9c503949..2d41f0066 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java @@ -15,6 +15,7 @@ public enum TemplateInfoEnum2 { CERTIFICATION_MESSAGE7("认证清单-任务提醒，截止日期当天","ctp_AAuDmfXCHc1I"), CERTIFICATION_MESSAGE8("认证清单-任务提醒，已逾期","ctp_AAuDMwOPU71H"), //CERTIFICATION_MESSAGE9("认证清单-责任人分发（转办），第二责任人收到消息","ctp_AAuDM8YP6soc"), + CERTIFICATION_MESSAGE10("认证工程师发起流程，责任人收到消息","ctp_AAuePL6rUK1L"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index cdc9ad495..4d7cbc3ac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -1,16 +1,23 @@ package com.jero.modules.project.enums; public enum ProjectTaskPlanningNameEnum { - LIST_CONFIRMATION("法规清单确认","Regulation List Confirmation"), - LEGAL_TASK_CONFIRMATION("法规任务确认","Regulation Task Confirmation"), - DESIGN_DEADLINE("设计符合性确认","Design Compliance Confirmation"), +// LIST_CONFIRMATION("法规清单确认","Regulation List Confirmation"), +// LEGAL_TASK_CONFIRMATION("法规任务确认","Regulation Task Confirmation"), +// DESIGN_DEADLINE("设计符合性确认","Design Compliance Confirmation"), // PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"), // ATTESTATION_START_TIME("认证开始","Certification begins"), // ATTESTATION_END_TIME("认证结束"," End of certification"), - PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Confirmation"), // name:Pre-Homo value:Pre-Homo - ATTESTATION_START_TIME("认证试验结束","Homo Completion"),// name:认证开始 value:Certification begins +// PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Confirmation"), // name:Pre-Homo value:Pre-Homo +// ATTESTATION_START_TIME("认证试验结束","Homo Completion"),// name:认证开始 value:Certification begins ATTESTATION_END_TIME("认证批准","Homo KO"),// name:认证结束 value:End of certification - VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), +// VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), + + LIST_CONFIRMATION("清单发布","List Publishing"), + LEGAL_TASK_CONFIRMATION("责任确认","Responsibility Confirmation"), + DESIGN_DEADLINE("设计核查","Design Verification"), + PREHOMO_DEADLINE("摸底开始","Get Started"), // name:Pre-Homo value:Pre-Homo + ATTESTATION_START_TIME("认证开始","Certification Start"),// name:认证开始 value:Certification begins + VERIFY_DEADLINE("验证核查","Verification And Verification"), ; String name; String value; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index f19422585..25bc52893 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -1565,6 +1565,15 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN); + String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN"); + String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN"); + + Map> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOList.stream().collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson)); try { List projectCertificationInventoryLogEOList = new ArrayList<>(); // 给责任人分配待办中心的任务 @@ -1600,6 +1609,51 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); + List dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList); + + for (Map.Entry> dataByDutyPersonMap : certifycationInventoryListByDutyPersonMap.entrySet()) { + String dutyPersonUserId = dataByDutyPersonMap.getKey(); + List dutyPersonDataList = dataByDutyPersonMap.getValue(); + if(CollectionUtils.isEmpty(dutyPersonDataList)){ + continue; + } + + Map standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(dutyPersonDataList); + String standName = (String) standNameAndItemName.get("standName"); + String itemName = (String) standNameAndItemName.get("itemName"); + try { + String thirdId = this.sysUserService.getUserThirdIdByUserId(dutyPersonList,dutyPersonUserId); + + if(StringUtils.isNotEmpty(thirdId)){ + // 根据结束时间进行排序，获取最近的时间，发消息时使用。 + this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOList); + Date endTime = projectCertificationInventoryEOList.get(0).getEndTime(); + + JSONObject larkMesJson = new JSONObject(); + larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE10.getValue()); + larkMesJson.put("userIds",thirdId); + + Map templateVariableMap = new HashMap<>(); + templateVariableMap.put("projectNameCn",PRN_CN); + templateVariableMap.put("projectNameEn",PRN_EN); + templateVariableMap.put("standName",standName); + templateVariableMap.put("itemName",itemName); + templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName()); + templateVariableMap.put("endTime",DateUtils.formatDate(endTime)); + templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN); + templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN); + templateVariableMap.put("certificationEngineer",currentUser.getUsername()); + + larkMesJson.put("templateVariableMap",templateVariableMap); + this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson); + } + } catch (Exception e) { + log.error("飞书消息推送失败"); + } + } + }catch (Exception ex){ ex.printStackTrace(); log.error("认证工程师-发起认证清单任务失败：" + ex.getMessage()); @@ -1609,6 +1663,22 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl projectCertificationInventoryEOList) { + Collections.sort(projectCertificationInventoryEOList, new Comparator() { + @Override + public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) { + if(p1.getEndTime() != null && p2.getEndTime() != null){ + return p1.getEndTime().compareTo(p2.getEndTime()); + } + return 1; + } + }); + } + @Override public Result saveBatch(JSONObject json) { if (!json.containsKey("dataList")) { diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 000d312f5..8540ebe86 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1483,7 +1483,9 @@ module.exports = { technicalparameters:'Upgrade Bulletin technical parameters that may change (if any)', architecturetopologydiagram:'System - Electronic Controller Architecture Topology diagram (Attachment includes topology diagram description)', controllerparameter:'Controller parameter', - electroniccontrollername:'Electronic controller name "Hardware"', + electronic:'Electronic controller name', + electronicController:'Electronic controller name (Hardware)', + electroniccontrollername:'Electronic Controller Vehicle Safety Integrity Level (ASIL)', electroniccontrollerproductionenterprises:'Electronic controller production enterprises', electroniccontrollertype:'Electronic controller type', hardwareversioninformation:'Hardware version information', @@ -1685,4 +1687,7 @@ module.exports = { forwardXquantity:'For example, forward X quantity, backward X quantity, right X quantity, etc', upgraderecordnumber:'Upgrade record number', Modelandfunctionrecord:'Model and function record "Announcement" batch', + taskTypeMismatch:'Task Type Mismatch', + taskNodeMismatch:'Task Node Mismatch', + ifNot:'If not, fill in "none" or "not involved"', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 512587443..cec34877c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1585,6 +1585,8 @@ module.exports = { technicalparameters:'升级可能变更的《公告》技术参数(如有)', architecturetopologydiagram:'系统-电子控制器架构拓扑图(附件需含拓扑图介绍)', controllerparameter:'控制器参数', + electronic:'电子控制器名称', + electronicController:'电子控制器名称(硬件)', electroniccontrollername:'电子控制器汽车安全完整性等级(ASIL)', electroniccontrollerproductionenterprises:'电子控制器生产企业', electroniccontrollertype:'电子控制器型号', @@ -1785,6 +1787,7 @@ module.exports = { forwardXquantity:'如前向X数量，后向X数量，右向X数量等', upgraderecordnumber:'升级备案编号', Modelandfunctionrecord:'车型及功能备案《公告》批次', - - + taskTypeMismatch:'任务类型不匹配', + taskNodeMismatch:'任务节点不匹配', + ifNot:'如无，则填写“无”或“不涉及”', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 26d9d7611..d0cf8e1dc 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -1,320 +1,227 @@ - \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index e76e6451d..f59092b64 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -1,118 +1,148 @@ - \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 26d9d7611..e8ae9052e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -1,359 +1,279 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 759991c7c..587a44a6b 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -268,13 +268,15 @@ @click="edit(record)"> {{ $t('edit') }} + + + + + - {{ $t('view') }} - - {{ $t('deleteLib') }} @@ -284,12 +286,12 @@ - - - {{ $t('view') }} - - + + + + + + {{ text }} @@ -301,6 +303,23 @@ {{ text }} + + + + {{$t('viewFile')}} + + -- + + + + {{$t('viewFile')}} + + -- +
{{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }} @@ -358,39 +377,6 @@ - - - - - - {{ $t('See') }} - - - {{ $t('download') }} - - - - + @@ -473,6 +460,7 @@ import fixedPlate from './fixedPlateForm' import resultReportedUpload from './resultReportedUpload' import listOfRegulationsView from './listOfRegulationsView' + import viewFileModel from '@/components/viewFileModel/index' import globalAdvancedQuery from '@/components/globalAdvancedQuery/index' import batchSettingPersonnel from './batchSettingPersonnel' import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage' @@ -496,7 +484,8 @@ fixedPlate, resultReportedUpload, batchSettingPersonnel, - listOfRegulationsView + listOfRegulationsView, + viewFileModel }, mixins: [ResizeColumnProvide, ResizeHeader], data() { @@ -531,92 +520,27 @@ ellipsis: true, width: 180 }, - // { - // title: this.$t('listConfirmationStatus'), - // align: 'left', - // dataIndex: 'inventoryAffirmStatusName', - // width: 240, - // sorter: true, - // ellipsis: true - // }, - // { - // title: this.$t('taskAffirmStatus'), - // align: 'left', - // sorter: true, - // dataIndex: 'taskAffirmStatusName', - // width: 240, - // ellipsis: true - // }, - // { - // title: this.$t('taskReleaseStatus'), - // align: 'center', - // dataIndex: 'taskReleaseStatus' - // }, - // { - // title: this.$t('zoneOfApplication'), - // align: 'left', - // dataIndex: 'region_dictText', - // width: 180, - // ellipsis: true - // }, - // { - // title: this.$t('correspondingStandard'), - // align: 'left', - // dataIndex: 'correspondingStandard', - // width: 180, - // ellipsis: true - // }, - // { - // title: this.$t('implementationCategory'), - // align: 'left', - // dataIndex: 'implementType_dictText', - // width: 180, - // ellipsis: true - // }, - // { - // title: this.$t('ImplementationDate'), - // align: 'left', - // width: 200, - // dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', - // ellipsis: true - // }, - // { - // title: this.$t('vehicleInProductionDate'), - // align: 'left', - // width: 220, - // dataIndex: 'implementTime', - // ellipsis: true - // }, - // { - // title: this.$t('certificationType'), - // align: 'left', - // dataIndex: 'attestationType_dictText', - // width: 180, - // ellipsis: true - // }, - // { - // title: this.$t('certificationLevel'), - // align: 'left', - // dataIndex: 'attestationRank_dictText', - // width: 180, - // sorter: true, - // ellipsis: true - // }, - // { - // title: this.$t('applicableSupplement'), - // align: 'left', - // width: 220, - // dataIndex: 'applicableSupplement', - // ellipsis: true - // }, - // { - // title: 'WVTA ID', - // align: 'left', - // dataIndex: 'wvtaId', - // width: 180, - // sorter: true, - // ellipsis: true - // }, + { + title: this.$t('applicableSupplement'), + align: 'left', + ellipsis: true, + dataIndex: 'applicableSupplement', + width: 180 + }, + { + title: this.$t('certificationType'), + align: 'left', + ellipsis: true, + dataIndex: 'attestationType_dictText', + width: 180 + }, + { + title: this.$t('certificationLevel'), + align: 'left', + ellipsis: true, + dataIndex: 'attestationRank_dictText', + width: 180 + }, { title: this.$t('areaOfResponsibility'), align: 'left', @@ -649,31 +573,16 @@ dataIndex: 'engineeringInterfacePersonName', width: 180 }, - // { - // title: this.$t('remarks'), - // align: 'left', - // dataIndex: 'remark', - // width: 180, - // ellipsis: true - // }, + { + title: this.$t('remarks'), + align: 'left', + dataIndex: 'remark', + width: 180, + ellipsis: true + }, { title: this.$t('confirmationOfDesignConformity'), children: [ - // { - // title: this.$t('Deliverables'), - // dataIndex: 'designDeliverableTemplateName', - // align: 'left', - // width: 180, - // ellipsis: true, - // scopedSlots: { customRender: 'designDeliverableTemplateName' } - // }, - // { - // title: this.$t('Sponsor'), - // dataIndex: 'designInitiatorName', - // align: 'left', - // width: 180, - // ellipsis: true - // }, { title: this.$t('personLiable'), dataIndex: 'designDutyName', @@ -694,6 +603,14 @@ align: 'left', ellipsis: true, width: 140 + }, + { + title: this.$t('deliverableTemplate'), + dataIndex: 'designDeliverableTemplate', + align: 'left', + width: 180, + ellipsis: true, + scopedSlots: { customRender: 'designDeliverableTemplate' } } // { // title: this.$t('descriptionDeliverables'), @@ -704,65 +621,9 @@ // } ] }, - // { - // title: this.$t('PrehomoConfirmation'), - // children: [ - // { - // title: this.$t('Deliverables'), - // dataIndex: 'prehomoDeliverableTemplateName', - // align: 'left', - // width: 180, - // ellipsis: true, - // scopedSlots: { customRender: 'prehomoDeliverableTemplateName' } - // }, - // // { - // // title: this.$t('Sponsor'), - // // dataIndex: 'prehomoInitiatorName', - // // align: 'left', - // // width: 180, - // // ellipsis: true - // // }, - // { - // title: this.$t('personLiable'), - // dataIndex: 'prehomoDutyName', - // align: 'left', - // width: 180, - // ellipsis: true - // }, - // { - // title: this.$t('TaskCutOffTime'), - // dataIndex: 'prehomoDueDate', - // align: 'left', - // width: 140, - // ellipsis: true - // }, - // { - // title: this.$t('descriptionDeliverables'), - // dataIndex: 'prehomoRemark', - // align: 'left', - // width: 220, - // ellipsis: true - // } - // ] - // }, { title: this.$t('verificationAndConformityconfirmation'), children: [ - // { - // title: this.$t('Deliverables'), - // dataIndex: 'verifyDeliverableTemplateName', - // align: 'left', - // width: 180, - // ellipsis: true, - // scopedSlots: { customRender: 'verifyDeliverableTemplateName' } - // }, - // { - // title: this.$t('Sponsor'), - // dataIndex: 'verifyInitiatorName', - // align: 'left', - // width: 180, - // ellipsis: true - // }, { title: this.$t('personLiable'), dataIndex: 'verifyDutyName', @@ -783,6 +644,14 @@ align: 'left', ellipsis: true, width: 180 + }, + { + title: this.$t('deliverableTemplate'), + dataIndex: 'verifyDeliverableTemplate', + align: 'left', + width: 180, + ellipsis: true, + scopedSlots: { customRender: 'verifyDeliverableTemplateName' } } // { // title: this.$t('descriptionDeliverables'), @@ -799,13 +668,6 @@ fixed: 'right', width: 200, scopedSlots: { customRender: 'operation' } - }, - { - title: this.$t('operation'), - align: 'left', - fixed: 'right', - width: 140, - scopedSlots: { customRender: 'operationOne' } } ], columnsAll: [], @@ -911,6 +773,33 @@ key: 3, moduleFlag: '法规清单' }, + { + sort: '', + name: this.$t('applicableSupplement'), + headFieldCn: '适用增补件', + headFieldEn: 'Applicable Supplement', + field: 'applicableSupplement', + key: 4, + moduleFlag: '法规清单' + }, + { + sort: '', + name: this.$t('certificationType'), + headFieldCn: '认证类型', + headFieldEn: 'Certification Type', + field: 'attestationType_dictText', + key: 5, + moduleFlag: '法规清单' + }, + { + sort: '', + name: this.$t('certificationLevel'), + headFieldCn: '认证级别', + headFieldEn: 'Certification Level', + field: 'attestationRank_dictText', + key: 6, + moduleFlag: '法规清单' + }, { sort: '', name: this.$t('areaOfResponsibility'), @@ -938,6 +827,15 @@ key: 18, moduleFlag: '法规清单' }, + { + sort: '', + name: this.$t('remarks'), + headFieldCn: '备注', + headFieldEn: 'Comments', + field: 'remark', + key: 18, + moduleFlag: '法规清单' + }, { sort: '', name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'), @@ -965,7 +863,17 @@ headFieldEn: 'Process Status', field: 'designFlowStatusName', affirmFlag: '1', - key: 23, + key: 24 , + moduleFlag: '法规清单' + }, + { + sort: '', + name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliverableTemplate'), + headFieldCn: '交付物模板', + headFieldEn: 'Deliverable Template', + field: 'designDeliverableTemplate', + affirmFlag: '3', + key: 25, moduleFlag: '法规清单' }, { @@ -998,6 +906,16 @@ key: 34, moduleFlag: '法规清单' }, + { + sort: '', + name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliverableTemplate'), + headFieldCn: '交付物模板', + headFieldEn: 'Deliverable Template', + field: 'verifyDeliverableTemplate', + affirmFlag: '3', + key: 36, + moduleFlag: '法规清单' + }, { sort: '', disabled: true, @@ -1216,23 +1134,15 @@ }, columns() { let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) - console.log(this.isRoleSwitching) - if (!this.isRoleSwitching) { + if (this.roleSwitchingCode == 0 || this.roleSwitchingCode == 1) { + } else { for (var i = 0; i < columnResult.length; i++) { - if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 200) { - columnResult.splice(i, 1) - i-- - } - } - } else if (this.isRoleSwitching) { - for (var i = 0; i < columnResult.length; i++) { - if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 140) { + if (columnResult[i].title === this.$t('operation')) { columnResult.splice(i, 1) i-- } } } - return columnResult } }, @@ -1620,7 +1530,8 @@ 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].verifyFlowStatus == 'List to be released' || + this.dataSource[i].designFlowStatus == 'List to be released') { isTrue = true } else { isTrue = false @@ -1733,6 +1644,15 @@ }).then((res) => { if (res.success) { this.columnsAll = this.column + this.columnsAll.forEach((item) => { + if (item.children) { + item.children.forEach((val) => { + this.checkedList.push(item.dataIndex, val.dataIndex) + }) + } else { + this.checkedList.push(item.dataIndex) + } + }) return if (res.result.length != 0) { this.columnsAll = res.result @@ -2082,7 +2002,7 @@ }) }, - startProcess(value, type,index) { + startProcess(value, type, index) { let query = { type: type, projectLawsInvnetoryList: value, @@ -2092,7 +2012,7 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTaskList.push(this.completeTask(value, res.result,index)) + this.completeTaskList.push(this.completeTask(value, res.result, index)) Promise.all(this.completeTaskList).then((res) => { if (this.requestsNum == res.length) { this.visible = false @@ -2269,7 +2189,7 @@ if (dataList[i].designFlowStatus == 'List to be checked') { if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) { this.requestsNum++ - _this.startProcess(dataList[i], 2,this.requestsNum) + _this.startProcess(dataList[i], 2, this.requestsNum) } } else { _this.detailedWarningList.push( @@ -2278,7 +2198,7 @@ if (dataList[i].verifyFlowStatus == 'List to be checked') { if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) { this.requestsNum++ - _this.startProcess(dataList[i], 2,this.requestsNum) + _this.startProcess(dataList[i], 2, this.requestsNum) } } else { _this.detailedWarningList.push( @@ -2384,27 +2304,6 @@ } }, - pdfPreviewClick(name, id) { - let fileName = name - let index1 = fileName.lastIndexOf('.') - let index2 = fileName.length - let fileSuffix = fileName.substring(index1, index2) - if (fileSuffix == '.pdf') { - window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id + '&userName=' + this.userInfo().username)) - } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) - window.open(url, '_blank') - } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix) - window.open(url, '_blank') - } else if (fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { - let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadImgUrl + '/' + id + fileSuffix) - window.open(url, '_blank') - } else { - downloadFile('/sys/common/downLoadFile', name, { id: id, userName: this.userInfo().username }) - } - }, - download(item) { downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) }, @@ -2465,7 +2364,7 @@ }, resultReportedClick(val) { - if (val.regulationOwnerId == this.userInfo().id) { + if (this.roleSwitchingCode == 1) { this.$refs.resultReportedUploadRef.clickButtonToUploadFile(val) } else { if (val.fileId) { @@ -2483,6 +2382,9 @@ } }) window.open(newUrl.href, '_blank') + }, + viewFileClick(item) { + this.$refs.viewFileModelRef.clickButtonToUpload(item) } } } @@ -2772,6 +2674,11 @@ padding-bottom: 0 !important; overflow: scroll !important; } + + .viewFile { + color: #00B3BE; + cursor: pointer; + } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index c90c0026e..b0ce6b6d0 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -7,7 +7,7 @@ :loading="loading" :pagination="false" :scroll="{x: '100%',y:'calc(100vh - 140px)'}" - rowKey="id" + :rowKey="(record)=>JSON.stringify(record)" :data-source="dataSource" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -46,6 +46,8 @@ />
+ @@ -194,13 +196,25 @@ this.getList() }, methods: { + getData(name) { + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + this.$refs.confirmationdrawer.confirmation(JSON.parse(JSON.stringify(this.selectedRowKeys)), name) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } + }, onSelectChange(value) { this.selectedRowKeys = value - console.log(this.selectedRowKeys) }, - designComplianceList(){ + designComplianceList() { this.getList() }, + + confirmationdrawerList() { + this.selectedRowKeys = [] + this.getList() + }, + RelatedItemsClick(item) { let newUrl = this.$router.resolve({ path: '/ProjectDetails', @@ -318,7 +332,7 @@ flowType: 3, isDisplay: true, id: row.projectLibraryId, - Sponsor: 'prehomoInitiatorName', + Sponsor: 'regulationOwnerName', personLiable: 'prehomoDutyName', typeOfDeliverables: 'prehomoDeliverableTypeName', deliverableTemplate: 'prehomoDeliverableTemplate', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index f7d6c57c8..cf6340b07 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -26,15 +26,16 @@ :url="url" :standardContentQuery="queryProject" /> -
- -
+
+ +
-
+
{ @@ -163,6 +169,7 @@ if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false + this.loading = false this.$emit('designComplianceList') } else { this.loading = false @@ -172,6 +179,7 @@ }, getList(row, title) { this.queryData = row + this.queryData.isDisplay = JSON.parse(this.queryData.isDisplay) this.loading = true this.visible = true this.title = title @@ -289,4 +297,12 @@ background: #fff; border-radius: 0 0 2px 2px; } + + .circulationHistory { + margin-bottom: 436px; + } + + .circulationHistoryOne { + margin-bottom: 30px; + } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 26d9d7611..eb4af51f0 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -42,15 +42,19 @@ @showSizeChange="SizeChange" />
+