From f7321158178d0a347190c3009da9d1d038fb1da1 Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Tue, 28 Mar 2023 11:29:47 +0800
Subject: [PATCH] =?UTF-8?q?id=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/upgradecompletion.vue              | 15 +++++++++------
 .../views/otamanagement/upgradeactivity/index.vue | 12 ++++++------
 .../components/upgradetargetmodel.vue             |  1 +
 .../components/basicInformation.vue               |  3 ++-
 4 files changed, 18 insertions(+), 13 deletions(-)

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')}}</a>
  
           <a class="text-operation"
-             @click="endUpgrade(record , '0')" v-if="!onShow">{{$t('endUpgrade')}}</a>
+             @click="endUpgrade(record , '0')" v-if="!record.onShow">{{$t('endUpgrade')}}</a>
              <a class="text-operation"
-             @click="endUpgrade(record , '1')" v-if="onShow">{{$t('upgradecompletion')}}</a>
+             @click="endUpgrade(record , '1')" v-if="record.onShow">{{$t('upgradecompletion')}}</a>
           <a class="text-operation"
              @click="handleExport(record)">{{$t('export')}}</a>
           <a class="text-operation"
@@ -310,7 +310,6 @@ export default {
       ],
       userInfoQuery: {},
       administrators: false,
-      onShow:false
     }
   },
   mounted() {
@@ -445,7 +444,7 @@ export default {
     },
     // 结束升级
     endUpgrade(record,flag){
-      this.$refs.upgradecompletionRef.addModel(flag)
+      this.$refs.upgradecompletionRef.addModel(record,flag)
     },
     // 查看
     detailclick(){
@@ -468,8 +467,9 @@ export default {
     handleModule(){
       downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {})
     },
-    addModelList(){
-      this.onShow=true
+    addModelList(record){
+      record.onShow=true
+      this.$forceUpdate()
     }
   }
 }
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index 12e8c538c..fb73175b7 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -198,6 +198,7 @@ import ImportFile from '@/components/ImportFileData/index'
         getAction('/ota/otaBaSjSjmbcx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
          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 {