diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 2dcf32327..275729a9d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -33,8 +33,11 @@ import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; +import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; +import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.top.entity.TopProjectEO; import com.jero.modules.top.service.ITopProjectEOService; +import com.jero.modules.wkflow.enums.FlowTypeEnum; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -147,6 +150,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); + QueryWrapper pciQueryWrap = new QueryWrapper<>(); + pciQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getProjectLibraryId, projectLibraryBase.getId()); + List pciEOList = this.projectCertificationInventoryEOService.list(pciQueryWrap); + + if(CollectionUtils.isNotEmpty(pciEOList)){ + // 清单待校核的数据 + List pciToBeCheckedList = pciEOList.stream().filter(pci -> { + boolean flag = false; + if(StringUtils.equals(pci.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + // 如果该项目下清单待校核的数据不为空，给这些认证工程师分配待办任务。 + if(CollectionUtils.isNotEmpty(pciToBeCheckedList)){ + // 删除待办中心（是这个项目库的 pre-Homo流程的待办任务， 认证工程师接受任务节点的数据） + QueryWrapper pidRemoveWrap = new QueryWrapper<>(); + pidRemoveWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId, projectLibraryBase.getId()); + pidRemoveWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey()); + pidRemoveWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue()); + this.processInfoDetailEOService.remove(pidRemoveWrap); + + // 给认证工程师分配任务 + List processInfoDetailEOList = new ArrayList<>(); + for (String userId : certificationEngineerIdList) { + ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); + processInfoDetailEO.setUserId(userId); + processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSJSRW.getKey()); + processInfoDetailEO.setCreateTime(new Date()); + processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue()); + processInfoDetailEO.setProcessInfoId(projectLibraryBase.getId()); + processInfoDetailEO.setActiProcInstId(projectLibraryBase.getId()); + processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue()); + processInfoDetailEOList.add(processInfoDetailEO); + } + this.processInfoDetailEOService.saveBatch(processInfoDetailEOList); + } + + // 结果待提交的数据 + List pciToBeReviewEDList = pciEOList.stream().filter(pci -> { + boolean flag = false; + if(StringUtils.equals(pci.getFlowStatus(),CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_REVIEWED.getValue())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(pciToBeReviewEDList)){ + // 删除待办中心（是这个项目库的 pre-Homo流程的待办任务， 认证工程师审查 任务节点的数据） + QueryWrapper pidRemoveWrap = new QueryWrapper<>(); + pidRemoveWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId, projectLibraryBase.getId()); + pidRemoveWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSSC.getKey()); + pidRemoveWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue()); + this.processInfoDetailEOService.remove(pidRemoveWrap); + + // 给认证工程师分配任务 + List processInfoDetailEOList = new ArrayList<>(); + for (String userId : certificationEngineerIdList) { + ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); + processInfoDetailEO.setUserId(userId); + processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSSC.getKey()); + processInfoDetailEO.setCreateTime(new Date()); + processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue()); + processInfoDetailEO.setProcessInfoId(projectLibraryBase.getId()); + processInfoDetailEO.setActiProcInstId(projectLibraryBase.getId()); + processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue()); + processInfoDetailEOList.add(processInfoDetailEO); + } + this.processInfoDetailEOService.saveBatch(processInfoDetailEOList); + } + } + } + } + /** * 通过id删除 * diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8f052bcd8..68eb6e659 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1717,6 +1717,7 @@ module.exports = { complianceReporting:'Compliance Reporting', youCanOnlySelectStatusClearSubmit:'You can only select data with a process status of Clear to Submit', note:'Note: The attachment includes the list of test items and test report. Test standard or technical specification', + notecsv:'Note: CSV format is supported. The value is within 20M', format:'It supports doc/docx/pdf format and is less than 50M in size', cantTransferToYourself:"Can't transfer to yourself", theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate', @@ -1725,4 +1726,8 @@ module.exports = { noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10', notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n', notethree:'Provide supporting materials', + verifyComplianceConfirmReturnReason:'Verify compliance Confirm return reason', + theDeliverablesCannotReferencedPleaseReselect:'The deliverables of this project cannot be referenced, please reselect', + regulationListModuleMaintenance:'Regulation list module maintenance', + regulationListModule:'Regulation list module', } \ 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 afb84484e..80aea7039 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1821,10 +1821,15 @@ module.exports = { note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范', format:'支持doc/docx/pdf格式,大小50M以内', cantTransferToYourself:"不能转办给自己", - noteone:'注:支持CSV格式，大小20M以内，数量1-10个', + noteone:'注:支持CSV格式，大小20M以内，数量1-20个', + notecsv:'注:支持CSV格式，大小20M以内', theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置', - reasonForReturnOfDesignCompliance:'设计符合性退回原因', + reasonForReturnOfDesignCompliance:'设计符合性确认退回原因', notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n', notethree:'\n提供证明材料\n', + verifyComplianceConfirmReturnReason:'验证符合性确认退回原因', + theDeliverablesCannotReferencedPleaseReselect:'不能引用本项目的交付物，请重新选择', + regulationListModuleMaintenance:'法规清单模块维护', + regulationListModule:'法规清单模块', } \ No newline at end of file diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index f56d53f73..457ab1346 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -133,7 +133,7 @@ // } // } // } - this.$message.destroy() + // this.$message.destroy() }, remove() { this.fileTypeSatus = true @@ -153,7 +153,7 @@ }) if (status === 'error') { this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(`${info.file.name}` + this.$t('FileUploadFailed')) } else if (status === 'removed') { this.myfileList = info.fileList @@ -167,7 +167,7 @@ }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() this.$message.success(`${info.file.name}` + this.$t('DeletedSuccessfully')) } } else if (status === 'done') { @@ -184,7 +184,7 @@ } }) this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(this.$t('UploadMost')) return } @@ -197,7 +197,7 @@ }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() if (file.response.success) { this.$message.success(`${info.file.name}` + this.$t('FileUploadedSuccessfully')) } diff --git a/jero-web/src/components/uploadFileChange/file.vue b/jero-web/src/components/uploadFileChange/file.vue index f12def90c..97384c92d 100644 --- a/jero-web/src/components/uploadFileChange/file.vue +++ b/jero-web/src/components/uploadFileChange/file.vue @@ -109,7 +109,7 @@ // this.fileTypeSatus = false; // } // } - this.$message.destroy() + // this.$message.destroy() }, remove() { this.fileTypeSatus = true @@ -133,7 +133,7 @@ }) if (status === 'error') { this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(`${info.file.name}` + this.$t('FileUploadFailed')) } else if (status === 'removed') { this.myfileList = info.fileList @@ -147,7 +147,7 @@ }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() this.$message.success(`${info.file.name}` + this.$t('DeletedSuccessfully')) } } else if (status === 'done') { @@ -164,7 +164,7 @@ } }) this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(this.$t('UploadMost')) return } @@ -177,7 +177,7 @@ }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() if (file.response.success) { this.$message.success(`${info.file.name}` + this.$t('FileUploadedSuccessfully')) } diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue index a8f328bc0..6c4fb3600 100644 --- a/jero-web/src/components/uploadFileChangeDown/file.vue +++ b/jero-web/src/components/uploadFileChangeDown/file.vue @@ -135,7 +135,7 @@ import { mapGetters } from 'vuex' // this.fileTypeSatus = false; // } // } - this.$message.destroy() + // this.$message.destroy() }, remove() { this.fileTypeSatus = true @@ -159,7 +159,7 @@ import { mapGetters } from 'vuex' }) if (status === 'error') { this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(`${info.file.name}` + this.$t('FileUploadFailed')) } else if (status === 'removed') { this.myfileList = info.fileList @@ -173,7 +173,7 @@ import { mapGetters } from 'vuex' }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() this.$message.success(`${info.file.name}` + this.$t('DeletedSuccessfully')) } } else if (status === 'done') { @@ -190,7 +190,7 @@ import { mapGetters } from 'vuex' } }) this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(this.$t('UploadMost')) return } @@ -203,7 +203,7 @@ import { mapGetters } from 'vuex' }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() if (file.response.success) { this.$message.success(`${info.file.name}` + this.$t('FileUploadedSuccessfully')) } diff --git a/jero-web/src/components/uploadFileOta/file.vue b/jero-web/src/components/uploadFileOta/file.vue index d61721059..eee02201e 100644 --- a/jero-web/src/components/uploadFileOta/file.vue +++ b/jero-web/src/components/uploadFileOta/file.vue @@ -132,7 +132,7 @@ // this.fileTypeSatus = false; // } // } - this.$message.destroy() + // this.$message.destroy() }, remove() { this.fileTypeSatus = true @@ -152,7 +152,7 @@ }) if (status === 'error') { this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(`${info.file.name}` + this.$t('FileUploadFailed')) } else if (status === 'removed') { this.myfileList = info.fileList @@ -166,7 +166,7 @@ }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() this.$message.success(`${info.file.name}` + this.$t('DeletedSuccessfully')) } } else if (status === 'done') { @@ -183,7 +183,7 @@ } }) this.$emit('uploadSuccess', this.fileList) - this.$message.destroy() + // this.$message.destroy() this.$message.error(this.$t('UploadMost')) return } @@ -196,7 +196,7 @@ }) this.$emit('uploadSuccess', this.fileList) if (this.myfileList.length > 0) { - this.$message.destroy() + // this.$message.destroy() if (file.response.success) { this.$message.success(`${info.file.name}` + this.$t('FileUploadedSuccessfully')) } diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 624da74c4..c3715d10a 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -6,7 +6,7 @@ - {{isTrue ? $t('maintainVirtualList'):$t('virtualListDetails')}} + {{isTrue ? $t('regulationListModuleMaintenance'):$t('regulationListModuleMaintenance')}}
@@ -23,8 +23,8 @@
- - {{$t('VirtualListName')}} + + {{$t('regulationListModule')}} {{$route.query.name}} diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue index 0993686b4..d02319143 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue @@ -20,6 +20,7 @@
@@ -77,7 +78,7 @@ export default { visible: false, confirmLoading: false, formInline: { - bazt:'', + bazt:undefined, batjsj:'', bz:'', }, @@ -196,6 +197,12 @@ export default { } }) }, + selectchange(value){ + this.$nextTick(() => { + this.formInline = { ...this.formInline } + this.$refs.ruleForm.validateField('bazt') + }) + }, handleCancel() { this.formInline = { bazt:undefined, diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index c3bed400a..b958d5506 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -13,13 +13,13 @@ - +
{{$t('implementedupgrade')}}
- + {{$t('yes')}} @@ -27,16 +27,13 @@ {{$t('not')}} - - - - - - - +
+ + 编辑 + @@ -61,11 +58,13 @@
{{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} +

{{$t('notecsv')}}
@@ -75,7 +74,7 @@ {{$t('vehicleshavenotcompletedonlineupgrade')}} + type="minus-circle" :disabled="disabled"/>
@@ -86,6 +85,7 @@
@@ -101,6 +101,7 @@ @@ -118,11 +119,13 @@ {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} +

{{$t('format')}}

 @@ -138,6 +141,7 @@ @@ -151,11 +155,12 @@ + @click="clickButtonToUpload('VINcodelist1')"> {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} +

{{$t('format')}}

 @@ -167,7 +172,7 @@ {{$t('submit')}} - + @@ -179,7 +184,6 @@ import { mapGetters } from 'vuex' export default { name:"addModel", - props: ['url'], components:{ uploadFile }, @@ -187,8 +191,10 @@ export default { return { visible: false, disabled: false, + showButton:false, formInline: {}, confirmLoading: false, + acceptcode:'', projectNameList: [], DeliverableTreeList: [], rules: { @@ -219,6 +225,9 @@ export default { } ], }, + url:{ + addModel:'' + } } }, mounted() { @@ -226,14 +235,17 @@ export default { }, methods: { ...mapGetters(['userInfo']), - addModel() { + addModel(flag) { + if(flag=='1') + this.disabled=true + this.showButton=true this.visible = true this.formInline = {} this.formInline.dataList = [{}] this.$nextTick(() => { this.formInline = { ...this.formInline } this.$refs.ruleForm.clearValidate() - this.$refs.codeNumber.number() + // this.$refs.codeNumber.number() }) }, handleCancel() { @@ -251,17 +263,18 @@ export default { this.formInline.authDummyInventoryBaseId = this.$route.query.id let query = JSON.parse(JSON.stringify(this.formInline)) this.confirmLoading = true - postAction(this.url.addModel, query).then((res) => { - if (res.success) { - this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + // postAction(this.url.addModel, query).then((res) => { + // if (res.success) { + // this.confirmLoading = false + // this.$message.success(this.$t('OperationSuccessful')) + + // } else { + // this.$message.warning(res.message) + // this.confirmLoading = false + // } + // }) this.visible = false this.$emit('addModelList') - } else { - this.$message.warning(res.message) - this.confirmLoading = false - } - }) } }) }, @@ -302,6 +315,11 @@ export default { }) }, clickButtonToUpload(item) { + if(item == 'VINcodelist'){ + this.acceptcode = 'csv' + }else { + this.acceptcode = 'doc,docx,pdf' + } this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = item @@ -325,6 +343,9 @@ export default { this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } }, + isEdit(){ + this.disabled=false + } } } diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 1900bb800..29687dedb 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -141,8 +141,11 @@ @click="detailclick(record)">{{$t('See')}} {{$t('maintenance')}} + {{$t('endUpgrade')}} + @click="endUpgrade(record , '0')" v-if="!onShow">{{$t('endUpgrade')}} + {{$t('upgradecompletion')}} {{$t('export')}} - + @@ -288,7 +291,7 @@ export default { align: 'left', ellipsis: true, width: 170, - dataIndex: 'cjsj' + dataIndex: 'createTime' }, { title: this.$t('remarks'), @@ -306,7 +309,8 @@ export default { } ], userInfoQuery: {}, - administrators: false + administrators: false, + onShow:false } }, mounted() { @@ -440,8 +444,8 @@ export default { downloadFile(this.url.exportData, text + '.xls', query, this.Deselect) }, // 结束升级 - endUpgrade(){ - this.$refs.upgradecompletionRef.addModel() + endUpgrade(record,flag){ + this.$refs.upgradecompletionRef.addModel(flag) }, // 查看 detailclick(){ @@ -464,6 +468,9 @@ export default { handleModule(){ downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {}) }, + addModelList(){ + this.onShow=true + } } } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index c664a3c94..95dddff3b 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -23,25 +23,25 @@ style="margin-bottom: 20px" > - + - + - + - + - + - + - + @@ -53,7 +53,11 @@
- {{$t('uploadattachment')}} + + {{ (fileList === 'null' || fileList === '' || + fileList == null) ? $t('uploadattachment') : $t('viewUploadedFiles') + }} +

{{$t('note')}}

    {{$t('format')}}

@@ -64,7 +68,7 @@ {{$t('last')}} {{$t('next')}}
- +
@@ -86,6 +90,7 @@ export default { } ], + fileList:'', loading: false, disable:false, columns: [ @@ -216,14 +221,41 @@ export default { } getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{ this.dataSource =res.result.list == null ? {} : res.result.list + this.fileList = res.result.fj }) }, save(){ postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ - console.log(res); - this.$message.success(this.$t('SavedSuccessfully')) + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, + uploadSuccess(data) { + let attIdList = [] + if (data && data.length > 0) { + data.map(item => { + attIdList.push(item.id || data.name) + }) + } + this.$forceUpdate() + // /** 赋值给当前对应的表单文件 */ + this.fileList = attIdList.join(',') + // this.fileList.certifyingmaterials = this.$t('viewFile') + }, + clickButtonToUpload(current) { + this.$refs.uploadFile.perentHandleFunc() + this.$refs.uploadFile.visible = true + this.uploadName = current + getAction('sys/common/getFileInfos', { id: current }).then((res) => { + if (res.success) { + this.$refs.uploadFile.perentHandleFunc(res.result) + } else { + this.$refs.uploadFile.perentHandleFunc() + } + }) + }, last(){ this.save() this.$emit('beupgradedonlineup') @@ -239,20 +271,6 @@ export default { deleteData(record){ this.dataSource.splice(this.dataSource.indexOf(record),1) }, - uploadSuccess(data) { - let attIdList = [] - if (data && data.length > 0) { - data.map(item => { - attIdList.push({ - id:item.id, - fileName:item.fileName - }) - }) - } - /** 赋值给当前对应的表单文件 */ - this.fileList.uploadName = attIdList - this.fileList.certifyingmaterials = this.$t('viewFile') - }, } } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue index bd736b171..b538c61fc 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue @@ -12,7 +12,8 @@ + v-model.trim="queryParam.rwmc" + :max-length="500"> @@ -108,8 +109,10 @@ export default { } this.queryParam.otaId = otaId postAction('/ota/otaBaSjQtsjxx/add' ,this.queryParam).then(res=>{ - this.$message.success(this.$t('SavedSuccessfully')) - console.log(res); + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 3b8a3e96a..0519e66a3 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -54,7 +54,8 @@ + :rows="4" + :max-length="500"/> @@ -72,15 +73,15 @@ - + - {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || - formInline.VINcodelist == null) ? $t('VINcodeupload') : $t('viewUploadedFiles') + @click="clickButtonToUpload('csv')"> + {{ (formInline.csv === 'null' || formInline.csv === '' || + formInline.csv == null) ? $t('VINcodeupload') : $t('viewUploadedFiles') }}

{{$t('noteone')}}

- + @@ -139,6 +140,7 @@ export default { if(res.code==200){ this.formInline.zsl=res.result.zsl this.formInline.vinList=res.result.vinList + this.formInline.csv=res.result.csv this.formInline.dateofproduction=[] this.formInline.dateofproduction.push(res.result.scrqks) this.formInline.dateofproduction.push(res.result.scrqjs) @@ -152,6 +154,7 @@ export default { let obj={} obj.otaId=localStorage.getItem('otaId') obj.zsl = this.formInline.zsl + obj.csv = this.formInline.csv if(this.formInline.dateofproduction){ obj.scrqks = this.formInline.dateofproduction[0] obj.scrqjs = this.formInline.dateofproduction[1] @@ -162,7 +165,10 @@ export default { obj.vinList = this.formInline.vinList postAction('/ota/otaBaSjSjmbcl/add',obj).then(res=>{ + if(res.code==200){ this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, next(){ @@ -188,6 +194,25 @@ export default { } }) }, + /** 上传文件的回调 */ + uploadSuccess(data) { + // console.log(data) + let attIdList = [] + if(data && data.length>0){ + data.map(item => { + attIdList.push(item.id || data.name) + }) + /** 赋值给当前对应的表单文件 */ + this.formInline.csv = attIdList.join(',') + this.formInline = { ...this.formInline } + // console.log('form',this.formInline) + }else{ + this.formInline.csv = '' + this.formInline = { ...this.formInline } + // console.log('form',this.formInline) + + } + }, } } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 4715ff8ba..8199c7a35 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -23,39 +23,39 @@ style="margin-bottom: 20px" > - + - + - + - + - + - + - + - + - + - + - + @@ -290,8 +290,10 @@ export default { }, save(){ postAction('/ota/otaBaSjSjxtbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ - console.log(res); + if(res.code==200){ this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, last(){ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index ef5679a0d..fb6045b3d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -63,7 +63,12 @@ - {{$t('uploadattachment')}} + + {{ (form.bgfj === 'null' || form.bgfj === '' || + form.bgfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') + }} + {{$t('notetwo')}} {{$t('format')}} @@ -135,7 +140,12 @@
- {{$t('uploadattachment')}} + + {{ (form.clfj === 'null' || form.clfj === '' || + form.clfj == null) ? $t('uploadattachment') : $t('viewUploadedFiles') + }} + {{$t('notethree')}} {{$t('format')}}
@@ -146,7 +156,7 @@ {{$t('last')}} {{$t('next')}} - + @@ -331,7 +341,7 @@ this.$forceUpdate() this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = item - getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => { + getAction('sys/common/getFileInfos', { id: this.form[item] }).then((res) => { if (res.success) { this.$refs.uploadFile.perentHandleFunc(res.result) } else { @@ -339,33 +349,22 @@ this.$forceUpdate() } }) }, - getList() { - let queryParam = JSON.parse(JSON.stringify(this.queryParam)) - Object.keys(queryParam).forEach(val => { - if (queryParam[val] instanceof Array) { - queryParam[val] = queryParam[val].join(',') - } - }) - let query = { - pageNo: this.pageNo, - pageSize: this.pageSize, - ...queryParam + uploadSuccess(data) { + let attIdList = [] + if(data && data.length>0){ + data.map(item => { + attIdList.push(item.id || data.name) + }) + /** 赋值给当前对应的表单文件 */ + this.form[this.uploadName] = attIdList.join(',') + this.form = { ...this.form } + // console.log('form',this.formInline) + }else{ + this.form[this.uploadName] = '' + this.form = { ...this.form } + // console.log('form',this.formInline) + } - this.loading = true - getAction(this.url.list, query).then((res) => { - if (res.success) { - if (res.result.current > 1 && res.result.records.length == 0) { - this.pageNo = 1 - this.getList() - return - } - this.dataSource = res.result.records || [] - this.total = res.result.total - this.loading = false - } else { - this.loading = false - } - }) }, getData(){ let otaIdT=localStorage.getItem('otaIdT') @@ -399,8 +398,10 @@ this.$forceUpdate() } this.form.otaId=otaId postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{ - this.$message.success(this.$t('SavedSuccessfully')) - console.log(res); + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, last(){ @@ -411,20 +412,6 @@ this.$forceUpdate() this.save() this.$emit('safetyPrecautionsdown') }, - uploadSuccess(data) { - let attIdList = [] - if (data && data.length > 0) { - data.map(item => { - attIdList.push({ - id:item.id, - fileName:item.fileName - }) - }) - } - /** 赋值给当前对应的表单文件 */ - this.fileList.uploadName = attIdList - this.fileList.certifyingmaterials = this.$t('viewFile') - }, } } diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index bee003e7b..12e8c538c 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -207,8 +207,11 @@ import ImportFile from '@/components/ImportFileData/index' otaId='' } postAction('/ota/otaBaSjSjmbcx/add',{otaId:otaId,...this.form}).then(res=>{ - this.$message.success(this.$t('SavedSuccessfully')) + if(res.code==200){ localStorage.setItem('otaId', res.result.otaId) + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, next(){ diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 65f16e1cb..d0274ca19 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -22,6 +22,7 @@ @@ -35,6 +36,7 @@ @@ -48,6 +50,7 @@ @@ -61,6 +64,7 @@ @@ -74,6 +78,7 @@ @@ -87,6 +92,7 @@ @@ -170,7 +176,7 @@ {{$t('last')}} {{$t('next')}} - + @@ -252,8 +258,10 @@ export default { } this.formInline.otaId = otaId postAction('/ota/otaBaSjGgnrfs/add' ,this.formInline).then(res=>{ - this.$message.success(this.$t('SavedSuccessfully')) - console.log(res); + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 8d130bb6f..eb1efe22e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -35,7 +35,7 @@ @@ -102,10 +102,10 @@ @@ -118,10 +118,10 @@ @@ -135,10 +135,10 @@ diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 0ac3c4c48..a5ee70c8c 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -59,23 +59,23 @@ - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index f4c4133b4..4e307f165 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -218,7 +218,7 @@
{{$t('fillincontent')}} - +
@@ -234,7 +234,7 @@ style="margin-bottom: 20px" > - + @@ -244,22 +244,22 @@ - + - + - + - + - + - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 1619acb2d..7d63c299b 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -207,7 +207,7 @@ import ImportFile from '@/components/ImportFileData/index' this.dataSource[2].info= res.result.sjsbcs this.dataSource[3].info= res.result.xxaqjz if(res.result.zmclList){ - console.log(this.dataSource[0].certifyingmaterials = this.$t('viewFile')) + this.dataSource[0].certifyingmaterials = this.$t('viewFile') } this.fileList.uploadName = res.result.zmclList this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index e8986b7e6..3e17a247a 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -229,7 +229,7 @@ export default { this.dataSource[8].relevantverification=Number(res.result.sjgg) this.dataSource[9].relevantverification=Number(res.result.sjzt) if(res.result.zmclList){ - console.log(this.dataSource[0].certifyingmaterials = this.$t('viewFile')) + this.dataSource[0].certifyingmaterials = this.$t('viewFile') } this.fileList.uploadName = res.result.zmclList this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 1b0838b3e..42f9581cf 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -43,37 +43,37 @@ - + - + - + - + - + - + - + - + - + - + @@ -311,6 +311,7 @@ import uploadFileOta from '@/components/uploadFileOta/file' if(otaIdT==null){ otaIdT='' } + let randomNum = Math.floor(Math.random()*99999999999+1) getAction('/ota/otaBaCxKsjxtmccs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{ if(res.code==200){ if(res.result.list.length==0){ @@ -341,8 +342,9 @@ import uploadFileOta from '@/components/uploadFileOta/file' }, ] }else{ - res.result.list.forEach(item =>{ - item.sfksj =Number(item.sfksj) + res.result.list.forEach((item,index) =>{ + item.sfksj = Number(item.sfksj) + item.key = randomNum + index }) this.dataSource=res.result.list this.fileList = res.result.fj diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue index 9ddc8ef68..2764a0ad4 100644 --- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue +++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue @@ -256,7 +256,7 @@ export default { align: 'left', ellipsis: true, width: 170, - dataIndex: 'cjsj' + dataIndex: 'createTime' }, { title: this.$t('remarks'), diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue index 4098e6e3b..4a299abd8 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue @@ -96,16 +96,18 @@ pageNo: 1, pageSize: 10, total: 0, - ids: '' + ids: '', + detailedWarningList: [] } }, mounted() { }, methods: { - transferModel(ids) { + transferModel(ids, detailedWarningList) { this.visible = true this.queryParam = {} + this.detailedWarningList = detailedWarningList this.selectedRowKeys = [] this.ids = ids.join(',') this.replacePage() @@ -154,10 +156,20 @@ handleCancel() { this.visible = false }, + failedMessageOne(data) { + let detailedWarningList = data + this.$warning({ + content: ( < div > { detailedWarningList } < /div>) + }) + }, handleSubmit() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.confirmLoading = true let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) + if (selectedRowKeys.join(',') == this.$route.query.id) { + this.$message.warning(this.$t('theDeliverablesCannotReferencedPleaseReselect')) + return + } + this.confirmLoading = true postAction('/project/projectCertificationInventoryEO/citeDeliverable', { projectCertificationInventoryIds: this.ids, projectLibraryId: this.$route.query.id, @@ -173,6 +185,9 @@ this.visible = false this.selectedRowKeys = [] this.$emit('referenceDeliverablesListForm') + if (this.detailedWarningList && this.detailedWarningList.length > 0) { + this.failedMessageOne(this.detailedWarningList) + } } else { if (res.result) { this.$message.warning(res.result) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 4eac491a2..48626c18f 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -78,7 +78,8 @@ -
+
{{ $t('preservation') }}
@@ -687,7 +688,7 @@ title: this.$t('DeliverablesResult'), align: 'left', dataIndex: 'deliveryResult', - width: 180, + width: 210, ellipsis: true, scopedSlots: { customRender: 'DeliverablesResult' } }, @@ -1406,17 +1407,45 @@ referenceDeliverablesClick() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let isTrue - for (let i = 0; i < this.selectedRowKeysList.length; i++) { - if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { - isTrue = true - } else { - isTrue = false - this.$message.warning(this.$t('youCanOnlySelectStatusClearSubmit')) - return + let ids = [] + let notConditions = [] + let notConditionsOne = [] + let data = '' + let dataOne = '' + let detailedWarningList= [] + if (this.roleSwitchingCode == 20) { + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) { + if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { + ids.push(this.selectedRowKeysList[i].id) + } else { + notConditions.push(this.selectedRowKeysList[i].inspectionItem) + } + } else { + notConditionsOne.push(this.selectedRowKeysList[i].inspectionItem) + } + } + } else { + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { + ids.push(this.selectedRowKeysList[i].id) + } else { + notConditions.push(this.selectedRowKeysList[i].inspectionItem) + } } } - if (isTrue) { - this.$refs.referenceDeliverablesListRef.transferModel(JSON.parse(JSON.stringify(this.selectedRowKeys))) + if (notConditions && notConditions.length > 0) { + data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusSubmittedCanBeSelected') + detailedWarningList.push(
{data}
) + } + if (notConditionsOne && notConditionsOne.length > 0){ + dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、')+'"'+this.$t('operationWithoutPermission') + detailedWarningList.push(
{dataOne}
) + } + if (ids && ids.length > 0) { + this.$refs.referenceDeliverablesListRef.transferModel(ids,detailedWarningList) + } else { + this.failedMessageOne(detailedWarningList) } } else { this.$message.warning(this.$t('selectLeastOne')) @@ -1738,7 +1767,12 @@ content: ( < div > { detailedWarningList } < /div>) }) }, - + failedMessageOne(data) { + let detailedWarningList = data + this.$warning({ + content: ( < div > { detailedWarningList } < /div>) + }) + }, submitTask(value, prompt, ids, notConditions, data) { let _this = this this.$confirm({ diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 3367d51f6..9a4a571c8 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -782,11 +782,11 @@
-
- {{$t('listConfirmationRejectionReason')}} +
+ {{$t('reasonForReturnOfDesignCompliance')}}
-
@@ -827,11 +827,11 @@
-
- {{$t('taskConfirmationRejectionReason')}} +
+ {{$t('verifyComplianceConfirmReturnReason')}}
-
diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 5b4fc7b9e..bf4f2b8dc 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -310,14 +310,14 @@ title: this.$t('configurationItem'), align: 'left', dataIndex: 'configItem', - width: 150, + width: 200, ellipsis: true }, { title: 'WVTA ID', align: 'left', dataIndex: 'wvtaId', - width: 150, + width: 200, ellipsis: true }, { @@ -338,14 +338,14 @@ title: this.$t('typeOfDeliverables'), align: 'left', dataIndex: 'deliverableTypeName', - width: 200, + width: 330, ellipsis: true }, { title: this.$t('operation'), align: 'left', fixed: 'right', - width: 200, + width: 250, scopedSlots: { customRender: 'operation' } } ], @@ -544,7 +544,7 @@