diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
index ea2c98ab9..a3f5994a6 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
@@ -428,7 +428,7 @@ export default {
       localStorage.removeItem('otaIdT')
       this.$router.push({
         path: '/upgradeactivityrecord',
-        query: {}
+        query: { type:2}
       })
     },
     viewProcessClick(row) {
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
index 4367f3867..b08e2102d 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
@@ -140,6 +140,9 @@ export default {
         }
         getAction('/ota/otaBaSjSjmbcl/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
           if(res.code==200){
+            if(res.result==null){
+              res.result={}
+            }
             this.formInline.zsl=res.result.zsl
             this.formInline.vinList=res.result.vinList
             this.formInline.csv=res.result.csv
@@ -148,7 +151,7 @@ export default {
             res.result.scrqjs=res.result.scrqjs == null ? "" : res.result.scrqjs
             this.formInline.dateofproduction.push(res.result.scrqks)
             this.formInline.dateofproduction.push(res.result.scrqjs)
-            this.formInline.id = res.result.vinList
+            this.formInline.id = res.result.id
             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 bf9c32c44..9908fc679 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -130,7 +130,7 @@
                   </a-select>
               </a-form-model-item>
               <a-form-model-item class="itemModel" style="width: 40%;margin-left:-9px">
-                <a-select v-model="form.dllx2" class="box-input" :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="update">
+                <a-select v-model="form.dllx2" class="box-input" :disabled="disabled" :placeholder="$t('PleaseSelect')" @change="update2">
                   <a-select-option v-for="(item, key) in projectNameList2"
                                    :key="key"
                                    :value="item">
@@ -216,8 +216,23 @@ import ImportFile from '@/components/ImportFileData/index'
             this.form.dllx1=undefined
             this.form.dllx2=undefined
             this.form.qymc='安徽江淮汽车集团股份有限公司'
+            // if(this.$route.query.type == 1 && res.result.cxmb == null){
+            //   this.form.cxmb=this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh
+            // }
+         
           }else{
+
             this.form=res.result
+            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){
               this.form.dllx1=undefined
 
@@ -242,6 +257,11 @@ import ImportFile from '@/components/ImportFileData/index'
         if(otaId==null){
           otaId=''
         }
+        // if(this.form.bapc!=null && this.form.bapc!=undefined  && this.form.bapc!=''){
+        //  this.$nextTick(()=>{
+        //   this.$refs.ruleForm.clearValidate('bapc')
+        //  })
+        // }
         this.$refs.ruleForm.validate(valid=>{
           if(valid){
             this.selectListPc.map(item=>{
@@ -256,12 +276,19 @@ import ImportFile from '@/components/ImportFileData/index'
            this.getData()
         }
         })
+          }else{
+           this.form.bapc=undefined
           }
         })
 
     },
       next(){
         this.save()
+        // if(this.form.bapc!=null && this.form.bapc!=undefined && this.form.bapc!=''){
+        //  this.$nextTick(()=>{
+        //   this.$refs.ruleForm.clearValidate('bapc')
+        //  })
+        // }
         this.$refs.ruleForm.validate(valid=>{
           if(valid){
             this.$emit('basicInformationForm')
@@ -289,7 +316,7 @@ import ImportFile from '@/components/ImportFileData/index'
             res.result.forEach(item=>{
               let obj={}
                obj.id=item.id
-               obj.cpdjbh=item.cpdjbh
+               obj.cpdjbh=item.cpdjbh+'-'+item.ggpc+'-'+item.cpxh
                this.selectListMb.push(obj)
             })
           }
@@ -317,13 +344,20 @@ import ImportFile from '@/components/ImportFileData/index'
         getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:'',otaId:item.id}).then(res=>{
           this.form.dllx1=res.result.dllx1 == null?undefined:res.result.dllx1
           this.form.dllx2=res.result.dllx2== null?undefined:res.result.dllx2
-          this.$forceUpdate()
         })
       }
      })
      this.$forceUpdate()
       },
-      update(){
+      update(val){
+        this.$forceUpdate()
+        localStorage.removeItem('otaId')
+       localStorage.removeItem('otaIdT')
+       localStorage.setItem('otaIdT',val)
+
+       this.getData()
+      },
+      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 573c06e46..a66145229 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -331,7 +331,11 @@ import { message } from 'ant-design-vue'
            if(this.$route.query.type == 1 && res.result.cxmb == null){
              this.form.cxmb = this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh
            }else {
-             this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
+            if(this.$route.query.type == 2 && res.result.cxmb == null){
+              this.form.cxmb = this.form.ggpc+'-'+ this.form.cpmc+'-'+this.form.cpxh
+            }else{
+              this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
+            }
            }
            if(res.result.dllx1 == null ){
               res.result.dllx1 = undefined
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
index c3b9810aa..f3278c7d0 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
@@ -385,7 +385,7 @@ export default {
       localStorage.removeItem('otaIdT')
       this.$router.push({
         path: '/vehicleinformation',
-        query: {  type:1}
+        query: {  type:2}
       })
     },
     viewProcessClick(row) {