From e3d1ef544dce4b93bdb6cfa22b0b2561a7d3e62d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 6 Apr 2023 10:45:41 +0800
Subject: [PATCH] bug 67719

---
 .../components/upgradetargetmodel.vue             | 15 ++++++++-------
 .../components/basicInformation.vue               | 11 ++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index 93ce4dc43..9d41e58d0 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -234,13 +234,14 @@ export default {
 
             this.form = res.result
             this.form.otaId=''
-            if (this.$route.query.type == 1 && res.result.cxmb == null && !item) {
-              this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
-            } else {
-              if (this.$route.query.type == 2 && res.result.cxmb == null  && !item) {
-                this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
-              } else {
+            if(this.$route.query.type == 1 && res.result.cxmb == null && !item){
+              this.form.cxmb = this.form.babh+'-'+ this.form.bapc+'-'+this.form.cpxh
+            }else {
+              if(this.$route.query.type == 2 && res.result.cxmb == null && !item){
+                // this.form.cxmb =  res.result.cxmb ? res.result.cxmb : this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
                 this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
+              }else{
+                this.form.cxmb = res.result.cxmb ? res.result.cxmb : this.form.babh+'-'+ this.form.bapc+'-'+this.form.cpxh
               }
             }
 
@@ -375,7 +376,7 @@ export default {
       localStorage.removeItem('otaId')
       localStorage.removeItem('otaIdT')
       localStorage.setItem('otaIdT', val)
-      this.getData()
+      this.getData('qiehuan')
     },
     update2() {
       this.$forceUpdate()
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index fe9306ee4..c2e3ff857 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -286,7 +286,7 @@ import { message } from 'ant-design-vue'
        localStorage.removeItem('otaIdT')
        localStorage.setItem('otaIdT',value)
 
-       this.getData()
+       this.getData('qiehuan')
       },
       // 模板下载
       handleModule() {
@@ -337,15 +337,16 @@ import { message } from 'ant-design-vue'
              this.form.cxmb = this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
            }else {
             if(this.$route.query.type == 2 && res.result.cxmb == null && !item){
-              this.form.cxmb = this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
-            }else{
+              // this.form.cxmb =  res.result.cxmb ? res.result.cxmb : this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
               this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
+            }else{
+              this.form.cxmb = res.result.cxmb ? res.result.cxmb : this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
             }
            }
-           if(res.result.dllx1 == '' ){
+           if(res.result.dllx1 == '' || res.result.dllx1 == null){
               res.result.dllx1 = undefined
             }
-            if(res.result.dllx2 == ''){
+            if(res.result.dllx2 == '' || res.result.dllx2 == null){
               res.result.dllx2 = undefined
             }