From ff903e324aa23e62d6db11743e3c8ea02a6601a3 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 28 Mar 2023 09:20:58 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/beupgradedonline.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index 41ffbf0b9..ab3182be3 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 @@ - + - + From 4495ffbaa1cc31301de6167da0a14691cd78eb71 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 28 Mar 2023 09:32:02 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/basicInformation.vue | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 82ae11e47..897b043fa 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')}}
@@ -416,9 +409,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 +468,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 From 88d73ae906836fb5f0338144da6a43e0ab89120b Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 28 Mar 2023 09:45:01 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E5=AD=98?= =?UTF-8?q?=E6=94=BEid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/otamanagement/upgradeactivity/index.vue | 1 + .../vehicleinformation/components/basicInformation.vue | 1 + .../vehicleinformation/components/beupgradedonline.vue | 5 ++++- .../otamanagement/vehicleinformation/components/other.vue | 7 +++++-- .../vehicleinformation/components/recordparameters.vue | 7 +++++-- .../vehicleinformation/components/safetyPrecautions.vue | 5 ++++- .../vehicleinformation/components/upgradeRequirements.vue | 7 +++++-- .../vehicleinformation/components/upgradedonline.vue | 7 +++++-- 8 files changed, 30 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index e144bf3b1..1900bb800 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -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/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 897b043fa..8d130bb6f 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -364,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() } }) } diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue index ab3182be3..0ac3c4c48 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue @@ -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..1b0838b3e 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue @@ -457,8 +457,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() + } + }) } } From f53db1f6bce84ab993cae38807be1035cfdc5143 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 09:46:37 +0800 Subject: [PATCH 4/8] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8=E5=A4=87=E6=A1=88-?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=BD=B1=E5=93=8D=E8=AF=84=E4=BC=B0-?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../components/upgradeimpactassessment.vue | 19 ++++++++++++++----- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c838f6ab1..8f052bcd8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1723,4 +1723,6 @@ module.exports = { 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', } \ 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..afb84484e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1825,4 +1825,6 @@ module.exports = { theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起', dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置', reasonForReturnOfDesignCompliance:'设计符合性退回原因', + notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n', + notethree:'\n提供证明材料\n', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index d78323297..ef5679a0d 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')}}
@@ -464,7 +468,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 +546,9 @@ this.$forceUpdate() height: 50px; margin-top: 8px; } +.spanone{ + white-space: pre-wrap; + padding: 0 45px; + display: flex; +} \ No newline at end of file From 149d47a73bbe987d6a6c28ae5824b48e3dae7d0a 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 09:49:54 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=B0=83=E5=8F=96-=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=AD=E5=B7=B2=E7=BB=8F=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/index.vue | 12 ++++++------ .../components/listOfRegulations.vue | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) 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 @@ @@ -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 8/8] =?UTF-8?q?studio=E5=B1=95=E7=A4=BA=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E9=A9=B3=E5=9B=9E=E5=8E=9F=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')}}
-