diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue index b958d5506..fc745c5b1 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/components/upgradecompletion.vue @@ -227,7 +227,8 @@ export default { }, url:{ addModel:'' - } + }, + record:{} } }, mounted() { @@ -235,10 +236,12 @@ export default { }, methods: { ...mapGetters(['userInfo']), - addModel(flag) { - if(flag=='1') - this.disabled=true - this.showButton=true + addModel(record,flag) { + if(flag=='1'){ + this.disabled=true + this.showButton=true + } + this.record=record this.visible = true this.formInline = {} this.formInline.dataList = [{}] @@ -274,7 +277,7 @@ export default { // } // }) this.visible = false - this.$emit('addModelList') + this.$emit('addModelList',this.record) } }) }, diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 29687dedb..4f004085a 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -143,9 +143,9 @@ @click="maintenanceClick(record)">{{$t('maintenance')}} {{$t('endUpgrade')}} + @click="endUpgrade(record , '0')" v-if="!record.onShow">{{$t('endUpgrade')}} {{$t('upgradecompletion')}} + @click="endUpgrade(record , '1')" v-if="record.onShow">{{$t('upgradecompletion')}} {{$t('export')}} { if(res.code == 200){ this.form=res.result ==null?{}:res.result + } }) }, diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index eb1efe22e..c70335a05 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -320,7 +320,8 @@ import { message } from 'ant-design-vue' this.form.cpmc=res.result.cpmc this.form.cpxh=res.result.cpxh this.form.txzd=res.result.txzd - this.form.cdotasj=res.result.cdotasj + this.form.txzd=res.result.txzd + this.form.id=res.result.id if(this.$route.query.type == 1 && res.result.cxmb == null){ this.form.cxmb = this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh }else {