From 44e3a1dc930e434c3a30c752aa1a6efd229df9ce Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:07:14 +0800 Subject: [PATCH 01/12] =?UTF-8?q?bug=2067206=20=E9=99=84=E4=BB=B6=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 3 +- .../components/upgradecompletion.vue | 13 +++- .../otamanagement/upgradeactivity/index.vue | 2 +- .../auxiliaryupgradehavechanged.vue | 50 ++++++++++------ .../thetargetvehicleofthisupgrade.vue | 31 ++++++++-- .../components/upgradeimpactassessment.vue | 59 ++++++------------- .../components/usernotification.vue | 2 +- .../components/upgradedonline.vue | 6 +- .../vehicleregistration/index.vue | 2 +- 10 files changed, 97 insertions(+), 72 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8f052bcd8..4cd0f7d50 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', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index afb84484e..2bfb28112 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1821,7 +1821,8 @@ 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:'设计符合性退回原因', diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index c3bed400a..43e14fb72 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -66,6 +66,7 @@ formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} +

{{$t('notecsv')}}

@@ -123,6 +124,7 @@ formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} +

{{$t('format')}}

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

{{$t('format')}}

 @@ -167,7 +170,7 @@ {{$t('submit')}} - + @@ -189,6 +192,7 @@ export default { disabled: false, formInline: {}, confirmLoading: false, + acceptcode:'', projectNameList: [], DeliverableTreeList: [], rules: { @@ -302,6 +306,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 diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 1900bb800..9e0b371ed 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -288,7 +288,7 @@ export default { align: 'left', ellipsis: true, width: 170, - dataIndex: 'cjsj' + dataIndex: 'createTime' }, { title: this.$t('remarks'), diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index c664a3c94..64ac09ad3 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -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,39 @@ 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=>{ + postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res=>{ console.log(res); this.$message.success(this.$t('SavedSuccessfully')) }) }, + 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 +269,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/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 3b8a3e96a..64cd0d4a7 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -72,15 +72,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 +139,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 +153,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] @@ -188,6 +190,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/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index ef5679a0d..482073698 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -146,7 +146,7 @@ {{$t('last')}} {{$t('next')}} - + @@ -331,7 +331,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 +339,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') @@ -411,20 +400,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/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 65f16e1cb..6edfa5d44 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -170,7 +170,7 @@ {{$t('last')}} {{$t('next')}} - + diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 1b0838b3e..23b599f46 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -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'), From 6af09bd7b71f416d581001969c4244b7a6423157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 28 Mar 2023 10:09:39 +0800 Subject: [PATCH 02/12] =?UTF-8?q?studio=E5=B1=95=E7=A4=BA=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E9=A9=B3=E5=9B=9E=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 3 ++- .../projectManagement/components/listEditModel.vue | 12 ++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 4cd0f7d50..70c72fe15 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1726,4 +1726,5 @@ 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', } \ 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 2bfb28112..f00638ad6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1825,7 +1825,8 @@ module.exports = { notecsv:'注:支持CSV格式，大小20M以内', theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置', - reasonForReturnOfDesignCompliance:'设计符合性退回原因', + reasonForReturnOfDesignCompliance:'设计符合性确认退回原因', notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n', notethree:'\n提供证明材料\n', + verifyComplianceConfirmReturnReason:'验证符合性确认退回原因', } \ No newline at end of file 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')}}
-
From 6366e5a0454b949a04aa04a5931e07b9ff6567ff Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Tue, 28 Mar 2023 10:10:21 +0800 Subject: [PATCH 03/12] =?UTF-8?q?67129=20studio=E7=BC=96=E8=BE=91=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=BA=93=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88?= =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=AD=A5=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B5=81=E7=A8=8B=E5=BE=85=E5=8A=9E=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectLibraryBaseServiceImpl.java | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) 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删除 * From 3ec32f42a55750d9c40521953e50194879d8f3e9 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:13:42 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=BD=B1=E5=93=8D=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradeimpactassessment.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 482073698..93721ad58 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')}}
From 13cf2379377a8e94c02f5f68fe022a26b0fbe7d0 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:16:02 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8-?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgradeactivity/components/maintenance.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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, From 188b3f2026c25732a8332c8ebb19c6ce6d38e60d Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:24:28 +0800 Subject: [PATCH 06/12] bug 67183 --- .../vehicleinformation/components/basicInformation.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 8d130bb6f..ea2a96807 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -89,7 +89,7 @@ :max-length="500" :disabled="disabled" class="box-input" - :placeholder="$t('PleaseSelect')" + :placeholder="$t('pleaseEnter')" v-model="form.ggpc"> @@ -105,7 +105,7 @@ :max-length="500" :disabled="disabled" class="box-input" - :placeholder="$t('PleaseSelect')" + :placeholder="$t('pleaseEnter')" v-model="form.cpsb"> @@ -121,7 +121,7 @@ :max-length="500" :disabled="disabled" class="box-input" - :placeholder="$t('PleaseSelect')" + :placeholder="$t('pleaseEnter')" v-model="form.cpmc"> @@ -138,7 +138,7 @@ :max-length="500" :disabled="disabled" class="box-input" - :placeholder="$t('PleaseSelect')" + :placeholder="$t('pleaseEnter')" v-model="form.cpxh"> From 155ddde11f7146c7f8bf0b30e446bc7e5de25170 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Mar 2023 10:30:01 +0800 Subject: [PATCH 07/12] bug 67198 --- .../vehicleinformation/components/safetyPrecautions.vue | 2 +- .../vehicleinformation/components/upgradeRequirements.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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) From ea2d7aa166a061b772a33f192c4a97e5c9ac7546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 28 Mar 2023 10:33:14 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E7=BB=B4=E6=8A=A4=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationListMaintenance.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 @@