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

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -1026,7 +1026,7 @@
   }
 
   .TextInformation-box-box-text {
-    width: calc(25% - 20px);
+    width: calc(50% - 20px);
     margin-right: 20px;
     height: 36px;
     float: left;

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

@@ -187,6 +187,7 @@ export default {
       projectNameList2: [],
       selectListPc: [],
       selectListMb: [],
+      flag:'',
       rules: {
         babh: [
           { required: true, message: this.$t('upgraderecordnumber') + this.$t('cannotEmpty'), trigger: 'blur' }
@@ -277,9 +278,11 @@ export default {
           this.form.otaId = otaId
           postAction('/ota/otaBaSjSjmbcx/add', { otaId: otaId, ...this.form }).then(res => {
             if (res.code == 200) {
+              this.flag = 1
               localStorage.setItem('otaId', res.result.otaId)
               this.$message.success(this.$t('SavedSuccessfully'))
               this.getData()
+
             }
           })
         } else {
@@ -295,11 +298,17 @@ export default {
       //   this.$refs.ruleForm.clearValidate('bapc')
       //  })
       // }
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
+      // this.$refs.ruleForm.validate(valid => {
+      //   if (valid) {
+      setTimeout(()=>{
+        console.log(this.flag)
+        if(this.flag == 1){
           this.$emit('basicInformationForm')
         }
-      })
+      },1000)
+
+      //   }
+      // })
 
 
     },
@@ -343,9 +352,8 @@ export default {
 
     },
     changeId(value, option) {
-      debugger
       this.$nextTick(() => {
-        this.form = { ...this.form }
+        // this.form = { ...this.form }
         this.$refs.ruleForm.validateField('bapc')
       })
       this.selectListPc.map(item => {

jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue

@@ -305,7 +305,7 @@ import { message } from 'ant-design-vue'
                if(item.cpxh==null){
                 item.cpxh=''
                }
-               obj.value=item.ggpc+'-'+item.cpmc+'-'+item.cpxh
+               obj.value=item.cpdjbh+'-'+item.ggpc+'-'+item.cpxh
                this.selectList.push(obj)
             })
            }

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -258,6 +258,7 @@
         ref="table"
         class="customizetable"
         :loading="loading"
+        :components="drag(columns,'columnsAll')"
         :pagination="false"
         :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
         rowKey="id"
@@ -489,12 +490,14 @@
   import SelectedBy from '@/components/SelectedBy/index'
   import referenceDeliverablesList from './components/referenceDeliverablesList'
   import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
   import moment from 'moment'
   import { mapGetters } from 'vuex'
 
   export default {
     name: 'index',
     props: ['isDisplayNum'],
+    mixins: [ResizeColumnProvide, ResizeHeader],
     components: {
       globalAdvancedQuery,
       ImportFile,