Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue

@@ -114,7 +114,7 @@ export default {
     return {
       confirmLoading: false,
       disabled: false,
-      formInline:{},
+      formInline:{zsl:""},
       url: {
         exportData: '/ota/otaBaSjSjmbcl/exportData',
         importZipUrl: '/ota/otaBaSjSjmbcl/importData?otaId=' + localStorage.getItem('otaId'),//导入

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue

@@ -234,17 +234,17 @@ import ImportFile from '@/components/ImportFileData/index'
             }
            }
            
-            if(res.result.dllx1==null){
+            if(res.result.dllx1==null ||res.result.dllx1==""){
               this.form.dllx1=undefined
 
             }
-            if(res.result.dllx2==null){
+            if(res.result.dllx2==null ||res.result.dllx2==""){
               this.form.dllx2=undefined
             }
-            if(res.result.cxmb==null){
+            if(res.result.cxmb==null||res.result.cxmb==""){
               this.form.cxmb=undefined
             }
-            if(res.result.bapc==null){
+            if(res.result.bapc==null||res.result.bapc==""){
               this.form.bapc=undefined
             }
             this.$forceUpdate()
@@ -348,8 +348,8 @@ import ImportFile from '@/components/ImportFileData/index'
           this.form.cpmc = item.cpmc
           this.form.cpxh = item.cpxh
           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.form.dllx1=res.result.dllx1 == null|| res.result.dllx1=="" ?undefined:res.result.dllx1
+            this.form.dllx2=res.result.dllx2== null|| res.result.dllx2==""?undefined:res.result.dllx2
           })
         }
       })
@@ -360,7 +360,6 @@ import ImportFile from '@/components/ImportFileData/index'
         localStorage.removeItem('otaId')
        localStorage.removeItem('otaIdT')
        localStorage.setItem('otaIdT',val)
-
        this.getData()
       },
       update2(){