diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java index 1cdd57027..63696717d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxAqcsServiceImpl.java @@ -239,45 +239,47 @@ public class OtaBaCxAqcsServiceImpl extends ServiceImpl attList = JSONArray.parseArray(attStr, AttachmentEO.class); - if (ObjectUtils.isNotEmpty(attList)) { - for (AttachmentEO aeo : attList) { - List ossFileList = ossFileService.getFileInfos(aeo.getId()); - for (OSSFile ossFile : ossFileList) { - String filePath = ossFile.getUrl(); - boolean b = CosBootUtil.doesObjectExist(filePath); - if (b) { - InputStream download = CosBootUtil.download(filePath); - ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download); - sb.append(ossFile.getFileName()).append(","); + StringBuilder sb = new StringBuilder(); + String attStr = aqcs.getZmcl(); + List attList = JSONArray.parseArray(attStr, AttachmentEO.class); + if (ObjectUtils.isNotEmpty(attList)) { + for (AttachmentEO aeo : attList) { + List ossFileList = ossFileService.getFileInfos(aeo.getId()); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download); + sb.append(ossFile.getFileName()).append(","); + } } } } + cell.setCellValue(sb.toString()); } - cell.setCellValue(sb.toString()); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java index 282f53525..34087c8b7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxJbxxServiceImpl.java @@ -239,45 +239,47 @@ public class OtaBaCxJbxxServiceImpl extends ServiceImpl sjmkList = OtaBaCxSjmkService.queryByOtaId(otaId); - int startRow = 63; - for (OtaBaCxSjmk sjmk : sjmkList) { - row = s.getRow(startRow); - cell = row.createCell(0); - cell.setCellValue(sjmk.getBjmc()); - cell = row.createCell(1); - cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(sjmk.getPzqk())); - cell = row.createCell(2); - cell.setCellValue(sjmk.getKzqmc()); - cell = row.createCell(3); - cell.setCellValue(sjmk.getYjggxh()); - cell = row.createCell(4); - cell.setCellValue(sjmk.getYjscqy()); - cell = row.createCell(5); - cell.setCellValue(sjmk.getRjbb()); - cell = row.createCell(6); - cell.setCellValue(sjmk.getRjkfqy()); - cell = row.createCell(7); - cell.setCellValue(sjmk.getBzwz()); - startRow++; + List sjmkList = OtaBaCxSjmkService.queryByOtaId(otaId); + int startRow = 63; + for (OtaBaCxSjmk sjmk : sjmkList) { + row = s.getRow(startRow); + cell = row.createCell(0); + cell.setCellValue(sjmk.getBjmc()); + cell = row.createCell(1); + cell.setCellValue(ImportFileUtil.getCellValueYesOrNo(sjmk.getPzqk())); + cell = row.createCell(2); + cell.setCellValue(sjmk.getKzqmc()); + cell = row.createCell(3); + cell.setCellValue(sjmk.getYjggxh()); + cell = row.createCell(4); + cell.setCellValue(sjmk.getYjscqy()); + cell = row.createCell(5); + cell.setCellValue(sjmk.getRjbb()); + cell = row.createCell(6); + cell.setCellValue(sjmk.getRjkfqy()); + cell = row.createCell(7); + cell.setCellValue(sjmk.getBzwz()); + startRow++; + } } - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java index f4f3d2c04..843ec4da0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxKsjxtmccsServiceImpl.java @@ -365,6 +365,9 @@ public class OtaBaCxKsjxtmccsServiceImpl extends ServiceImpl attList = JSONArray.parseArray(attStr, AttachmentEO.class); - if (ObjectUtils.isNotEmpty(attList)) { - for (AttachmentEO aeo : attList) { - List ossFileList = ossFileService.getFileInfos(aeo.getId()); - for (OSSFile ossFile : ossFileList) { - String filePath = ossFile.getUrl(); - boolean b = CosBootUtil.doesObjectExist(filePath); - if (b) { - InputStream download = CosBootUtil.download(filePath); - ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download); - sb.append(ossFile.getFileName()).append(","); + row = s.getRow(2); + cell = row.getCell(3); + StringBuilder sb = new StringBuilder(); + String attStr = otaBaCxZxsjyq.getZmcl(); + List attList = JSONArray.parseArray(attStr, AttachmentEO.class); + if (ObjectUtils.isNotEmpty(attList)) { + for (AttachmentEO aeo : attList) { + List ossFileList = ossFileService.getFileInfos(aeo.getId()); + for (OSSFile ossFile : ossFileList) { + String filePath = ossFile.getUrl(); + boolean b = CosBootUtil.doesObjectExist(filePath); + if (b) { + InputStream download = CosBootUtil.download(filePath); + ImportFileUtil.writeToLocal(attFile.getCanonicalPath() + "/" + ossFile.getFileName(), download); + sb.append(ossFile.getFileName()).append(","); + } } } } + cell.setCellValue(sb.toString()); } - cell.setCellValue(sb.toString()); } } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c838f6ab1..70c72fe15 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1717,10 +1717,14 @@ 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', dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset', reasonForReturnOfDesignCompliance:'Reason for return of design compliance', 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 e7f0d6b48..f00638ad6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1821,8 +1821,12 @@ 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:'验证符合性确认退回原因', } \ No newline at end of file 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 e144bf3b1..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'), @@ -450,6 +450,7 @@ export default { // 维护 maintenanceClick(row){ this.$refs.maintenanceRef.edit(row) + console.log(row); }, // 数据维护 maintenanceallClick(){ 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 d78323297..482073698 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -62,8 +62,10 @@ - - {{$t('uploadattachment')}} + + {{$t('uploadattachment')}} + {{$t('notetwo')}} + {{$t('format')}}
@@ -110,7 +112,7 @@ - + {{ $t('yes') }} {{ $t('not') }} @@ -133,7 +135,9 @@
- {{$t('uploadattachment')}} + {{$t('uploadattachment')}} + {{$t('notethree')}} + {{$t('format')}}
@@ -142,7 +146,7 @@ {{$t('last')}} {{$t('next')}} - + @@ -327,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 { @@ -335,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') @@ -407,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') - }, } } @@ -464,7 +443,7 @@ this.$forceUpdate() } ::v-deep .ant-layout-content { min-height: 60px; - line-height: 50px; + line-height: 20px; } //::v-deep > .ant-layout { // margin-bottom: 48px; @@ -542,4 +521,9 @@ this.$forceUpdate() height: 50px; margin-top: 8px; } +.spanone{ + white-space: pre-wrap; + padding: 0 45px; + display: flex; +} \ No newline at end of file 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/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 82ae11e47..8d130bb6f 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -150,13 +150,6 @@ {{$t('Vehicledynamictype')}} -
-
- {{$t('communicationTerminal')}} +
+ {{$t('communicationTerminal')}}
-
+
{{$t('otaUpgradeManagementSystem')}}
@@ -371,6 +364,7 @@ import { message } from 'ant-design-vue' if(res.code == 200){ localStorage.setItem('otaId', res.result.otaId) this.$message.success(this.$t('SavedSuccessfully')) + this.getData() } }) } @@ -416,9 +410,9 @@ import { message } from 'ant-design-vue' font-weight: 500; font-size: 14px; margin-right: 16px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + // overflow: hidden; + // text-overflow: ellipsis; + // white-space: nowrap; height: 42px; line-height: 42px; margin-top: 3px; @@ -475,4 +469,13 @@ import { message } from 'ant-design-vue' color: red; margin-right: 3px; } +.plus{ + margin-top: 5px; + line-height: 1.4 !important; + } + .plus2{ + width: 134px; + margin-top: 5px; + line-height: 1.4 !important; + } \ 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 41ffbf0b9..0ac3c4c48 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -75,10 +75,10 @@ - + - + @@ -362,8 +362,11 @@ import ImportFile from '@/components/ImportFileData/index' }, save(){ postAction('/ota/otaBaCxKsjjsmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).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/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue index fec52fa31..ec37b9bc7 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue @@ -70,8 +70,11 @@ export default { if (valid) { this.flag = 1 postAction('/ota/otaBaCxQt/add',{otaId:localStorage.getItem('otaId'),...this.queryParam}).then(res=>{ - console.log(res); - this.$message.success(this.$t('SavedSuccessfully')) + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } + }) } else { return false; diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue index 077f9fd9d..f4c4133b4 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue @@ -944,8 +944,11 @@ export default { cs:arr, kzq:this.dataSourceList }).then( res => { - console.log(res); - this.$message.success(this.$t('SavedSuccessfully')) + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } + }) }, diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue index 2690dc4a0..1619acb2d 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue @@ -249,8 +249,11 @@ import ImportFile from '@/components/ImportFileData/index' obj.xxaqjz = this.dataSource[3].info obj.zmclList = this.fileList.uploadName postAction('/ota/otaBaCxAqcs/add',obj).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/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 5dbb6bc44..e8986b7e6 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -295,8 +295,11 @@ export default { obj.sjzt = this.dataSource[9].relevantverification obj.zmclList = this.fileList.uploadName postAction('/ota/otaBaCxZxsjyq/add', obj).then(res => { - console.log(res); - this.$message.success(this.$t('SavedSuccessfully')) + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } + }) }, last() { diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 5f4f216e0..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 @@ -457,8 +459,11 @@ import uploadFileOta from '@/components/uploadFileOta/file' }, save(){ postAction('/ota/otaBaCxKsjxtmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res => { - console.log(res); - this.$message.success(this.$t('SavedSuccessfully')) + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } + }) } } 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/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index cf788bfe9..4eac491a2 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -78,7 +78,7 @@
-
+
{{ $t('preservation') }}
@@ -333,7 +333,7 @@ -
- {{$t('listConfirmationRejectionReason')}} +
+ {{$t('reasonForReturnOfDesignCompliance')}}
-
@@ -827,11 +827,11 @@
-
- {{$t('taskConfirmationRejectionReason')}} +
+ {{$t('verifyComplianceConfirmReturnReason')}}
-
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 7ab49a743..5c3de7460 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -146,7 +146,7 @@