From 84656c3f0333fbcdd6e545dc61705e2e1a58b1d6 Mon Sep 17 00:00:00 2001 From: yuekuo Date: Tue, 28 Mar 2023 10:58:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A4=A7=E5=B0=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/upgradecompletion.vue | 56 +++++++++++-------- .../otamanagement/upgradeactivity/index.vue | 17 ++++-- .../auxiliaryupgradehavechanged.vue | 22 ++++---- .../informationaboutotherupgradetasks.vue | 9 ++- .../thetargetvehicleofthisupgrade.vue | 6 +- .../components/upgradehavechanged.vue | 26 +++++---- .../components/upgradeimpactassessment.vue | 6 +- .../components/upgradetargetmodel.vue | 5 +- .../components/usernotification.vue | 12 +++- .../components/basicInformation.vue | 10 ++-- .../components/beupgradedonline.vue | 12 ++-- .../components/recordparameters.vue | 16 +++--- .../components/upgradedonline.vue | 20 +++---- 13 files changed, 130 insertions(+), 87 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index 43e14fb72..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,6 +58,7 @@ {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -76,7 +74,7 @@ {{$t('vehicleshavenotcompletedonlineupgrade')}} + type="minus-circle" :disabled="disabled"/>
@@ -87,6 +85,7 @@
@@ -102,6 +101,7 @@ @@ -119,6 +119,7 @@ {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' || formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -140,6 +141,7 @@ @@ -182,7 +184,6 @@ import { mapGetters } from 'vuex' export default { name:"addModel", - props: ['url'], components:{ uploadFile }, @@ -190,6 +191,7 @@ export default { return { visible: false, disabled: false, + showButton:false, formInline: {}, confirmLoading: false, acceptcode:'', @@ -223,6 +225,9 @@ export default { } ], }, + url:{ + addModel:'' + } } }, mounted() { @@ -230,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() { @@ -255,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 - } - }) } }) }, @@ -334,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 9e0b371ed..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')}} - + @@ -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 64ac09ad3..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" > - + - + - + - + - + - + - + @@ -225,9 +225,11 @@ export default { }) }, save(){ - 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')) + postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{ + if(res.code==200){ + this.$message.success(this.$t('SavedSuccessfully')) + this.getData() + } }) }, uploadSuccess(data) { 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 64cd0d4a7..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"/> @@ -164,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(){ 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 93721ad58..fb6045b3d 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -398,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(){ 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 6edfa5d44..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 @@ @@ -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 ea2a96807..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 @@ - + - + - + - + - + - + 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/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue index 23b599f46..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 @@ - + - + - + - + - + - + - + - + - + - +