From cc26c514138911efb22f6c0aebf1b6ec2340e04d Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Fri, 31 Mar 2023 16:40:50 +0800
Subject: [PATCH 1/3] 67719

---
 .../components/upgradetargetmodel.vue          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index 14eeebd40..59f30073b 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -232,15 +232,15 @@ export default {
 
             this.form = res.result
             this.form.otaId=''
-            if (this.$route.query.type == 1 && res.result.cxmb == null) {
-              this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
-            } else {
-              if (this.$route.query.type == 2 && res.result.cxmb == null) {
-                this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
-              } else {
-                this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
-              }
-            }
+            // if (this.$route.query.type == 1 && res.result.cxmb == null) {
+            //   this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
+            // } else {
+            //   if (this.$route.query.type == 2 && res.result.cxmb == null) {
+            //     this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
+            //   } else {
+            //     this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
+            //   }
+            // }
 
             if (res.result.dllx1 == null || res.result.dllx1 == "") {
               this.form.dllx1 = undefined

From 9b77214119414f568d73d0c3fdcfb8b1a791b81e Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Fri, 31 Mar 2023 16:52:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vehicleinformation/components/basicInformation.vue        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index 242b5a614..15b86d0c6 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -333,10 +333,10 @@ import { message } from 'ant-design-vue'
             this.form.cdotasj=res.result.cdotasj
             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
+             this.form.cxmb = this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
            }else {
             if(this.$route.query.type == 2 && res.result.cxmb == null){
-              this.form.cxmb = this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh
+              this.form.cxmb = this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
             }else{
               this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
             }

From 37716d988cf170035ff3ef4599fd2bf01a50fa9f Mon Sep 17 00:00:00 2001
From: yuekuo <yuekuo@syxysoft.com>
Date: Fri, 31 Mar 2023 16:59:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=8A=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/upgradeimpactassessment.vue                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
index 6bc25cb36..5c2556420 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -376,8 +376,8 @@ this.$forceUpdate()
         }
         getAction('/ota/otaBaSjSjyxpg/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
            if(res.code==200){
-            if(res.result.zxsj==0){
-              res.result.zxsj=null
+            if(res.result.zxsj==null){
+              res.result.zxsj=undefined
             }
             this.form=res.result==null ? {
         sjmd:'',
@@ -400,7 +400,7 @@ this.$forceUpdate()
       }
        this.form.otaId=otaId
        if(this.form.zxsj==undefined){
-        this.form.zxsj=0
+        this.form.zxsj=undefined
        }
        postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{
         if(res.code==200){