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

2023-03-31 09:10:31 +08:00
parent b5780eceee 97882d56c7
commit 7112dc7057
66 changed files with 1796 additions and 872 deletions
@@ -291,7 +291,7 @@ export default {
              this.confirmLoading = false
              this.bussLogList()
            } else {
-              this.$message.warning(this.$t('operationFailed'))
+              this.$message.warning(res.message)
              this.confirmLoading = false
            }
          })
@@ -428,7 +428,7 @@ export default {
      localStorage.removeItem('otaIdT')
      this.$router.push({
        path: '/upgradeactivityrecord',
-        query: {}
+        query: { type:2}
      })
    },
    viewProcessClick(row) {
@@ -53,15 +53,16 @@
      </span>
    </a-table>
    <div>
-      <a-button type="primary" @click="clickButtonToUpload(fileList)">
-        {{ (fileList === 'null' || fileList === '' ||
-        fileList == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
-        }}
-      </a-button>
-      <div style='margin-top: 20px'>
-        <p>{{$t('note')}}</p>
-        <p>&nbsp;&nbsp;&nbsp;&nbsp;{{$t('format')}}</p>
-      </div>
+<!--      上传附件-->
+<!--      <a-button type="primary" @click="clickButtonToUpload(fileList)">-->
+<!--        {{ (fileList === 'null' || fileList === '' ||-->
+<!--        fileList == null) ? $t('uploadattachment') : $t('viewUploadedFiles')-->
+<!--        }}-->
+<!--      </a-button>-->
+<!--      <div style='margin-top: 20px'>-->
+<!--        <p>{{$t('note')}}</p>-->
+<!--        <p>&nbsp;&nbsp;&nbsp;&nbsp;{{$t('format')}}</p>-->
+<!--      </div>-->
    </div>
    <div class="bootom-button">
      <a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
@@ -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()

          }
@@ -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">
@@ -168,7 +168,8 @@ import ImportFile from '@/components/ImportFileData/index'
        confirmLoading: false,
        disabled: false,
        form:{
-          qymc:'安徽江淮汽车集团股份有限公司'
+          qymc:'安徽江淮汽车集团股份有限公司',
+          bapc:undefined
        },
        url: {
          exportData: '/ota/otaBaSjSjmbcx/exportData',
@@ -216,8 +217,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 +258,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 +277,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 +317,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)
            })
          }
@@ -309,21 +337,33 @@ import ImportFile from '@/components/ImportFileData/index'

      },
      changeId(value,option){
-     this.selectListPc.map(item=>{
-       if(item.id==value){
-        this.form.cpsb = item.cpsb
-        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.$forceUpdate()
-        })
-      }
-     })
+        
+          this.$nextTick(()=>{
+            this.form={...this.form}
+            this.$refs.ruleForm.validateField('bapc')
+          })
+        this.selectListPc.map(item=>{
+        if(item.id==value){
+          this.form.cpsb = item.cpsb
+          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.$forceUpdate()
      },
-      update(){
+      update(val){
+        this.$forceUpdate()
+        localStorage.removeItem('otaId')
+       localStorage.removeItem('otaIdT')
+       localStorage.setItem('otaIdT',val)
+
+       this.getData()
+      },
+      update2(){
        this.$forceUpdate()
      }
    }
@@ -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
@@ -385,7 +385,7 @@ export default {
      localStorage.removeItem('otaIdT')
      this.$router.push({
        path: '/vehicleinformation',
-        query: {  type:1}
+        query: {  type:2}
      })
    },
    viewProcessClick(row) {