From 972baafd2664f5392d5b6cccb36ca259cbc36fa3 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 18 Aug 2023 15:31:43 +0800
Subject: [PATCH] =?UTF-8?q?OTA=E5=AF=B9=E6=8E=A5=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   3 +
 jero-web/src/common/lang/zh-cn.js             |   3 +
 .../src/components/dict/JDictSelectTag.vue    |   1 +
 .../components/applyforrematch.vue            |   5 +
 .../components/batSetting.vue                 |   5 +
 .../otaAuthentication/components/detil.vue    | 645 +++++++++++++-----
 .../components/vdrDetial.vue                  | 268 ++++++++
 .../otamanagement/otaAuthentication/index.vue | 196 +++---
 8 files changed, 855 insertions(+), 271 deletions(-)
 create mode 100644 jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 4c66fa8b5..0fe6b72b5 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1939,4 +1939,7 @@ module.exports = {
   issuenotice:'Issue notice',
   applyforrematch:'Apply for rematch',
   notificationsent:'Is a notification sent?',
+  VDRDetails:'VDR Details',
+  applicationprojectversion:'Application project version',
+  selectlocked:'You can select only the data whose matching status is locked',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index c40c93f4b..469fdcf69 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3895,4 +3895,7 @@ module.exports = {
   issuenotice:'下发通知',
   applyforrematch:'申请重新匹配',
   notificationsent:'是否下发通知？',
+  VDRDetails:'VDR详情',
+  applicationprojectversion:'应用项目版本',
+  selectlocked:'只能选择匹配状态为锁定的数据',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue
index 4386292d3..29fc1fc27 100644
--- a/jero-web/src/components/dict/JDictSelectTag.vue
+++ b/jero-web/src/components/dict/JDictSelectTag.vue
@@ -11,6 +11,7 @@
   <a-select v-else-if="tagType=='select'" allowClear :getPopupContainer="getPopupContainer"
             show-search
             optionFilterProp="label"
+            :autoClearSearchValue="false"
             :placeholder="placeholder" :disabled="disabled" :value="getValueSting" @change="handleInput">
     <!--    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
     <a-select-option v-for="(item, key) in dictOptionsValue"
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/applyforrematch.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/applyforrematch.vue
index 152319db9..1d3d09d70 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/applyforrematch.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/applyforrematch.vue
@@ -23,6 +23,11 @@
                 class="box-input propbox"
                 style="width: 90%"
                 v-model='formInline.projectVersion'
+                showSearch
+                optionFilterProp="label"
+                :autoClearSearchValue="false"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                allowClear
                 :placeholder="$t('PleaseSelect')+$t('projectVersion')">
                 <!--    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
                 <a-select-option v-for="(item, key) in projectVersionList"
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue
index b2ed17ab1..53fcf82d5 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/batSetting.vue
@@ -23,6 +23,11 @@
                 class="box-input propbox"
                 style="width: 90%"
                 v-model='formInline.projectVersion'
+                showSearch
+                optionFilterProp="label"
+                :autoClearSearchValue="false"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                allowClear
                 :placeholder="$t('PleaseSelect')+$t('projectVersion')">
                 <!--    <a-select-option :value="null">{{$t('pleaseSelect')}}</a-select-option>-->
                 <a-select-option v-for="(item, key) in projectVersionList"
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index 49ac97222..3321cc5ee 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -33,7 +33,7 @@
                        v-model="queryParam.influencestatute"></a-input>
             </div>
           </a-col>
-          <template v-if="toggleSearchStatus && vehicleType== 'all'">
+          <template v-if="toggleSearchStatus && vehicleTypeCode== '全部'">
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('vehicleType')">
@@ -44,14 +44,15 @@
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           allowClear
                           showSearch
-                          optionFilterProp="children"
+                          optionFilterProp="label"
                           :autoClearSearchValue="false"
                           v-model="queryParam.vehicleType">
                   <a-select-option v-for="(item, key) in vehicleTypeList"
+                                   :label='item'
                                    :key="key"
-                                   :value="item.value">
-                  <span style="display: inline-block;width: 100%" :title=" item.name">
-                    {{ item.name }}
+                                   :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
                   </span>
                   </a-select-option>
                 </a-select>
@@ -60,7 +61,7 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="24">
-              <a @click="handleToggleSearch" v-if="vehicleType== 'all'">
+              <a @click="handleToggleSearch" v-if="vehicleTypeCode == '全部'">
                 {{ !toggleSearchStatus ? $t('open') : $t('away') }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
@@ -82,18 +83,18 @@
           <a-select :placeholder="$t('PleaseSelect')"
                     class="box-input"
                     :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                    allowClear
                     showSearch
-                    optionFilterProp="children"
+                    optionFilterProp="label"
                     :autoClearSearchValue="false"
                     @change='handChange'
-                    v-model="vehicleType">
-            <a-select-option value="all">{{$t('whole')}}</a-select-option>
-            <a-select-option v-for="(item, key) in vehicleTypeList"
+                    v-model="vehicleTypeCode">
+<!--            <a-select-option value="all">{{$t('whole')}}</a-select-option>-->
+            <a-select-option v-for="(item, key) in typeList"
+                             :label='item'
                              :key="key"
-                             :value="item.value">
-                  <span style="display: inline-block;width: 100%" :title=" item.name">
-                    {{ item.name }}
+                             :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
                   </span>
             </a-select-option>
           </a-select>
@@ -101,95 +102,62 @@
       </div>
     </div>
 <!--    全部导出-->
-    <div v-if="vehicleType== 'all'" class="table-operator" style='margin-bottom: 19px;text-align: left;margin-top: 20px;'>
-      <div class="operator-text" @click="handleExportManage"
+    <div class="table-operator" style='margin-bottom: 19px;text-align: left;margin-top: 20px;'>
+      <div v-if="vehicleTypeCode == '全部'" class="operator-text" @click="handleExportManage('all')"
            v-has="'otadetail:export'">
         <a-icon type="export" :rotate="-90" />
         {{ $t('export') }}
       </div>
 <!--      全部下发通知-->
-      <div class="operator-text" @click="issuenotice"
+      <div v-if="vehicleTypeCode == '全部'" class="operator-text" @click="issuenotice"
            v-has="'otadetail:Issuenotice'">
         <a-icon type="sound" />
         {{ $t('issuenotice') }}
       </div>
-      <!--        列表设置-->
-      <!--      v-if="!this.$route.query.it"-->
-      <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmClassName"
-                    placement="bottomRight" >
-        <template slot="title" id="popconfirmmize">
-          <div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 211px">
-            <a-checkbox
-              style="margin-bottom: 22px;"
-              v-if="customizeList && customizeList.length"
-              v-model="checkAll"
-              :indeterminate="indeterminate"
-              @change="onCheckAllChange"
-            >{{ $t('selectAll') }}
-            </a-checkbox>
-            <a-checkbox-group @change="Change" v-model="checkedList" class="customize-text">
-              <a-checkbox class="customize-text-title" :disabled="item.disabled" v-for="(item, key) in customizeList"
-                          :key="key" :value="item.field">{{ item.db_field_txt }}
-              </a-checkbox>
-            </a-checkbox-group>
-            <div class="drawer-bootom-button">
-              <a-button @click="cancel" style="margin-right: 16px">{{ $t('cancel') }}</a-button>
-              <a-button @click="handleSubmitcustomize" type="primary" :loading="confirmLoading">{{ $t('determine') }}
-              </a-button>
-            </div>
-          </div>
-        </template>
-        <div class="operator-text" style="position: relative" @click="getcustomize">
-          <a-icon type="setting"/>
-          {{ $t('customize') }}
-        </div>
-      </a-popconfirm>
-    </div>
-<!--    studio导出-->
-    <div v-else class="table-operator" style='margin-bottom: 19px;text-align: left;margin-top: 20px;'>
-      <div class="operator-text" @click="handleExportManage"
+      <!--    studio导出-->
+      <div v-if="vehicleTypeCode != '全部'"  class="operator-text" @click="handleExportManage('studio')"
            v-has="'otad:export'">
         <a-icon type="export" :rotate="-90"/>
         {{ $t('export') }}
       </div>
-<!--      studio批量设置-->
-      <div class="operator-text" @click="BatchSetting"
+      <!--      studio批量设置-->
+      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="BatchSetting"
            v-has="'otad:batchsetting'">
         <a-icon type="setting"  />
         {{ $t('BatchSetting') }}
       </div>
-<!--      studio申请重新匹配-->
-      <div class="operator-text" @click="applyforrematch"
+      <!--      studio申请重新匹配-->
+      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="applyforrematch"
            v-has="'otad:rematch'">
         <a-icon type="rollback" />
         {{ $t('applyforrematch') }}
       </div>
-<!--      studio保存-->
-      <div class="operator-text" @click="preservation"
+      <!--      studio保存-->
+      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="preservation"
            v-has="'otad:save'">
         <a-icon type="check-circle" />
         {{ $t('preservation') }}
       </div>
-<!--      studio提交-->
-      <div class="operator-text" @click="submit"
+      <!--      studio提交-->
+      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="submit"
            v-has="'otad-submit'">
         <a-icon type="check-circle" />
         {{ $t('submit') }}
       </div>
-<!--      manger导出-->
-      <div class="operator-text" @click="handleExportManage"
+      <!--      manger导出-->
+      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="handleExportManage('manger')"
            v-has="'otaman:export'">
         <a-icon type="export" :rotate="-90"/>
         {{ $t('export') }}
       </div>
-<!--      manger确认-->
-      <div class="operator-text" @click="confirm"
+      <!--      manger确认-->
+      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="confirm"
            v-has="'otaman:confirm'">
         <a-icon type="check-circle" />
         {{ $t('confirm') }}
       </div>
-<!--      manger退回-->
-      <div class="operator-text" @click="sendBack"
+      <!--      manger退回-->
+      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="sendBack"
            v-has="'otaman:return'">
         <a-icon type="rollback" />
         {{ $t('sendBack') }}
@@ -199,18 +167,18 @@
       <a-popconfirm :visible="customizevisible" overlayClassName="popconfirmClassName"
                     placement="bottomRight" >
         <template slot="title" id="popconfirmmize">
-          <div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 211px">
+          <div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 216px">
             <a-checkbox
               style="margin-bottom: 22px;"
-              v-if="customizeList && customizeList.length"
+              v-if="cuList && cuList.length"
               v-model="checkAll"
               :indeterminate="indeterminate"
               @change="onCheckAllChange"
             >{{ $t('selectAll') }}
             </a-checkbox>
             <a-checkbox-group @change="Change" v-model="checkedList" class="customize-text">
-              <a-checkbox class="customize-text-title" :disabled="item.disabled" v-for="(item, key) in customizeList"
-                          :key="key" :value="item.field">{{ item.db_field_txt }}
+              <a-checkbox class="customize-text-title" :disabled="item.disabled" v-for="(item, key) in cuList"
+                          :key="key" :value="item.field">{{ item.name }}
               </a-checkbox>
             </a-checkbox-group>
             <div class="drawer-bootom-button">
@@ -226,18 +194,21 @@
         </div>
       </a-popconfirm>
     </div>
-    <div>
-      <a-table ref="table" size="middle" :components="drag(columns, 'columns')" :loading="loading" :pagination="false"
+      <a-table ref="table" size="middle" :components="drag(columnsAll, 'columnsAll')" :loading="loading" :pagination="false"
                :scroll="{ x: '100%', y: 'calc(100vh - 140px)' }" rowKey="id" :data-source="dataSource"
-               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="vehicleType== 'all' ? columns : columnstype">
+               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columnsAll">
         <!--        历史记录-->
         <template slot="operation" slot-scope="text, record">
           <a-button class="action-dict" @click="UpdateLog(record)">{{$t('historicalrecord')}}</a-button>
         </template>
-<!--        编辑-->
+<!--        备注编辑-->
         <template slot="remarks" slot-scope="text, record">
           <span @click="getremark(record)">{{text}}</span>
         </template>
+<!--        Vdr详情-->
+        <template slot="vdr" slot-scope="text, record">
+          <span @click="getcdr(record)">{{text}}</span>
+        </template>
       </a-table>
       <div class="page" v-if="dataSource && dataSource.length > 0">
         <a-pagination :show-total="total => $t('total') + ` ${total} ` + $t('strip')" show-quick-jumper show-size-changer
@@ -249,6 +220,7 @@
     <applyforrematch :url="url" @getList="getList" ref="applyforrematchRef"/>
     <rejectReason :url="url" @getList="getList" ref="rejectReasonRef"/>
     <remark @remarkForm='remarkForm' ref="remarkRef"/>
+    <vdrDetial @vdrDetial='vdrDetial' ref="vdrDetialRef"/>
     <!--    历史记录-->
     <a-modal
       :title="$t('historicalrecord')"
@@ -309,6 +281,7 @@ import applyforrematch from './applyforrematch'
 import rejectReason from './rejectReason'
 import historyTable from './historyTable.vue'
 import remark from './remark.vue'
+import vdrDetial from './vdrDetial.vue'
 
 export default {
   name: 'index',
@@ -319,6 +292,7 @@ export default {
     rejectReason,
     historyTable,
     remark,
+    vdrDetial,
   },
   mixins: [ResizeHeader, ResizeColumnProvide],
   data() {
@@ -331,17 +305,19 @@ export default {
         importZipUrl: '/ota/otaBaCxList/importData',//导入
       },
       number:'',
-      vehicleType:'all',
+      vehicleTypeCode:'全部',
       visible: false,
       loading: false,
       toggleSearchStatus: false,
       customizevisible: false,
+      confirmLoading: false,
+      indeterminate: false,
+      checkAll: false,
       dataSource: [],
       selectedRowKeys: [],
       selectedRowKeysRecord: [],
       // checkedList: ['nio_number', 'params_name', 'operation'],
       checkedList: [],
-      customizeList:[],
       serialNumber: '',
       total: 0,
       pageSize: 10,
@@ -352,10 +328,13 @@ export default {
       softwareversionList: [],
       softwareplatform: [],
       vehicleTypeList: [],
+      typeList: [],
+      columnsAll: [],
       marketList: [],
       queryParam: {},
       formInline: {},
       dataSourcehistory: [],
+      cuList :[],
       columnshistory: [
         {
           title: this.$t('OperationDetails'),
@@ -382,18 +361,261 @@ export default {
           }
         ]
       },
+      customizeList: [
+        {
+          sort: '1',
+          name: 'VDR',
+          headFieldCn: 'VDR',
+          headFieldEn: 'VDR',
+          field: 'vdr',
+          key: 1,
+          moduleFlag: '全车型',
+          status: 1
+        },
+        {
+          sort: '2',
+          name: this.$t('theme'),
+          headFieldCn: '主题',
+          headFieldEn: 'theme',
+          field: 'summary',
+          key: 2,
+          moduleFlag: '全车型',
+          status: 2
+        },
+        {
+          sort: '',
+          name: this.$t('vdrste'),
+          headFieldCn: 'VDR状态',
+          headFieldEn: 'VDR status',
+          field: 'status',
+          key: 3,
+          moduleFlag: '全车型'
+        },
+        {
+          sort: '',
+          name: this.$t('authenticationimpact'),
+          headFieldCn: '认证影响',
+          headFieldEn: 'Authentication impact',
+          field: 'homologationImpact',
+          key: 4,
+          moduleFlag:'全车型'
+        },
+        {
+          sort: '',
+          name: this.$t('impactstatement'),
+          headFieldCn: '影响描述',
+          headFieldEn: 'Impact statement',
+          field: 'homologation',
+          key: 5,
+          moduleFlag: '全车型'
+        },
+        {
+          sort: '',
+          name: this.$t('influencestatute') + '-CN',
+          headFieldCn: '影响法规-CN',
+          headFieldEn: 'Influence statute-CN',
+          field: 'impactCnHomo',
+          key: 6,
+          moduleFlag: '全车型'
+        },
+        {
+          sort: '',
+          name: this.$t('influencestatute') + '-EU',
+          headFieldCn: '影响法规-EU',
+          headFieldEn: 'Influence statute-EU',
+          field: 'impactEuHomo',
+          key: 7,
+          moduleFlag: '全车型'
+        },
+        {
+          sort: '',
+          name: this.$t('statisticalNodes'),
+          headFieldCn: '责任部门',
+          headFieldEn: 'Duty Department',
+          field: 'masterDomain',
+          key: 8,
+          moduleFlag: '全车型'
+        },
+        {
+          sort: '',
+          name: this.$t('vehicleType'),
+          headFieldCn: '适用车型',
+          headFieldEn: 'Vehicle Type',
+          field: 'appliedVehicleProject',
+          key: 9,
+          moduleFlag: '全车型'
+        }
+      ],
+      customizeSeList: [
+        {
+          sort: '1',
+          name: 'VDR',
+          headFieldCn: 'VDR',
+          headFieldEn: 'VDR',
+          field: 'vdr',
+          key: 1,
+          moduleFlag: '分车型',
+          status: 1
+        },
+        {
+          sort: '2',
+          name: this.$t('theme'),
+          headFieldCn: '主题',
+          headFieldEn: 'theme',
+          field: 'summary',
+          key: 2,
+          moduleFlag: '分车型',
+          status: 2
+        },
+        {
+          sort: '',
+          name: this.$t('vdrste'),
+          headFieldCn: 'VDR状态',
+          headFieldEn: 'VDR status',
+          field: 'status',
+          key: 3,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('authenticationimpact'),
+          headFieldCn: '认证影响',
+          headFieldEn: 'Authentication impact',
+          field: 'homologationImpact',
+          key: 4,
+          moduleFlag:'分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('impactstatement'),
+          headFieldCn: '影响描述',
+          headFieldEn: 'Impact statement',
+          field: 'homologation',
+          key: 5,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('influencestatute') + '-CN',
+          headFieldCn: '影响法规-CN',
+          headFieldEn: 'Influence statute-CN',
+          field: 'impactCnHomo',
+          key: 6,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('influencestatute') + '-EU',
+          headFieldCn: '影响法规-EU',
+          headFieldEn: 'Influence statute-EU',
+          field: 'impactEuHomo',
+          key: 7,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('statisticalNodes'),
+          headFieldCn: '责任部门',
+          headFieldEn: 'Duty Department',
+          field: 'masterDomain',
+          key: 8,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: 'R&H Studio',
+          headFieldCn: 'R&H Studio',
+          headFieldEn: 'R&H Studio',
+          field: 'studio',
+          key: 9,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('projectVersion'),
+          headFieldCn: '项目版本',
+          headFieldEn: 'Project Version',
+          field: 'projectVersionName',
+          key: 10,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('certificationStartOne'),
+          headFieldCn: '认证开始',
+          headFieldEn: 'Homo Starts',
+          field: 'attestationStartTime',
+          key: 11,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('certificationdeclaration'),
+          headFieldCn: '认证申报',
+          headFieldEn: 'Certification declaration',
+          field: 'certificationSubmission',
+          key: 12,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('certificationEnd'),
+          headFieldCn: '认证批准',
+          headFieldEn: 'Homo Approved',
+          field: 'attestationEndTime',
+          key: 13,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('CertificationProgress'),
+          headFieldCn: '认证进度',
+          headFieldEn: 'Homologation Progress',
+          field: 'attestationSchedule',
+          key: 14,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('matchingstate'),
+          headFieldCn: '匹配状态',
+          headFieldEn: 'Matching state',
+          field: 'matchStatus',
+          key: 15,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('remarks'),
+          headFieldCn: '备注',
+          headFieldEn: 'remarks',
+          field: 'remark',
+          key: 16,
+          moduleFlag: '分车型'
+        },
+        {
+          sort: '',
+          name: this.$t('operation'),
+          headFieldCn: '操作',
+          headFieldEn: 'operation',
+          field: 'operation',
+          key: 17,
+          moduleFlag: '分车型'
+        },
+      ],
       columns: [
         {
           title: 'VDR',
           align: 'left',
-          dataIndex: 'cpdjbh',
+          dataIndex: 'vdr',
           ellipsis: true,
-          width: 170
+          width: 170,
+          scopedSlots: { customRender: 'vdr' }
         },
         {
           title: this.$t('theme'),
           align: 'left',
-          dataIndex: 'ggpc',
+          dataIndex: 'summary',
           ellipsis: true,
           width: 170
         },
@@ -402,63 +624,63 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'cpsb'
+          dataIndex: 'status'
         },
         {
           title: this.$t('authenticationimpact'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'vehicleType'
+          dataIndex: 'homologationImpact'
         },
         {
           title: this.$t('impactdescription'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'impactdescription'
+          dataIndex: 'homologation'
         },
         {
           title: this.$t('influencestatute') + '-CN',
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'influencestatuteCN'
+          dataIndex: 'impactCnHomo'
         },
         {
           title: this.$t('influencestatute') + '-EU',
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'influencestatuteEN'
+          dataIndex: 'impactEuHomo'
         },
         {
           title: this.$t('statisticalNodes'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'statisticalNodes'
+          dataIndex: 'masterDomain'
         },
         {
           title: this.$t('vehicleType'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'vehicleType'
+          dataIndex: 'appliedVehicleProject'
         },
       ],
       columnstype: [
         {
           title: 'VDR',
           align: 'left',
-          dataIndex: 'cpdjbh',
+          dataIndex: 'vdr',
           ellipsis: true,
           width: 170
         },
         {
           title: this.$t('theme'),
           align: 'left',
-          dataIndex: 'ggpc',
+          dataIndex: 'summary',
           ellipsis: true,
           width: 170
         },
@@ -467,98 +689,98 @@ export default {
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'cpsb'
+          dataIndex: 'status'
         },
         {
           title: this.$t('authenticationimpact'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'authenticationimpact'
+          dataIndex: 'homologationImpact'
         },
         {
           title: this.$t('impactstatement'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'impactstatement'
+          dataIndex: 'homologation'
         },
         {
           title: this.$t('influencestatute') + '-CN',
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'influencestatuteCN'
+          dataIndex: 'impactCnHomo'
         },
         {
           title: this.$t('influencestatute') + '-EU',
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'influencestatuteEN'
+          dataIndex: 'impactEuHomo'
         },
         {
           title: this.$t('statisticalNodes'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'statisticalNodes'
+          dataIndex: 'masterDomain'
         },
         {
           title: 'R&H Studio',
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'Studio'
+          dataIndex: 'studio'
         },
         {
           title: this.$t('projectVersion'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'projectVersion'
+          dataIndex: 'projectVersionName'
         },
         {
           title: this.$t('certificationStartOne'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'certificationStartOne'
+          dataIndex: 'attestationStartTime'
         },
         {
           title: this.$t('certificationdeclaration'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'certificationdeclaration'
+          dataIndex: 'certificationSubmission'
         },
         {
           title: this.$t('certificationEnd'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'certificationEnd'
+          dataIndex: 'attestationEndTime'
         },
         {
           title: this.$t('CertificationProgress'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'CertificationProgress'
+          dataIndex: 'attestationSchedule'
         },
         {
           title: this.$t('matchingstate'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'matchingstate'
+          dataIndex: 'matchStatus'
         },
         {
           title: this.$t('remarks'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'remarks',
+          dataIndex: 'remark',
           scopedSlots: { customRender: 'remarks' }
         },
         {
@@ -573,12 +795,42 @@ export default {
       administrators: false
     }
   },
+  watch:{
+    // 监听车型变化
+    vehicleTypeCode(){
+      console.log(this.customizeSeList)
+      console.log(this.customizeList)
+      if(this.vehicleTypeCode !== '全部'){
+        this.cuList = this.customizeSeList
+        this.$forceUpdate()
+      }else{
+        this.cuList = this.customizeList
+        this.$forceUpdate()
+      }
+    }
+  },
   mounted() {
-    this.getList()
+    getAction('/ota/otaManageApplyEO/getCarList', {}).then((res) => {
+      if (res.success) {
+        this.typeList = res.result
+      } else {
+      }
+    })
+    this.cuList = this.customizeList
+    this.getSelectData()
+    this.getHeader()
     this.administrators = false
   },
   methods: {
     ...mapGetters(['userInfo']),
+    getSelectData(){
+      getAction('/ota/otaManageApplyEO/getPullDownList', {}).then((res) => {
+        if (res.success) {
+          this.vehicleTypeList = res.result.carSet
+        } else {
+        }
+      })
+    },
     handleToggleSearch() {
       this.toggleSearchStatus = !this.toggleSearchStatus
     },
@@ -615,7 +867,8 @@ export default {
         ...queryParam
       }
       this.loading = true
-      getAction('/ota/otaBaCxList/page', query).then((res) => {
+      let url = this.vehicleTypeCode == '全部'?'/ota/otaManageApplyEO/getOtaPage':'/ota/otaManageApplyEO/getOtaCarPage'
+      getAction(url, query).then((res) => {
         if (res.success) {
           if (res.result.list.current > 1 && res.result.list.records.length == 0) {
             this.pageNo = 1
@@ -653,25 +906,33 @@ export default {
       })
     },
     handChange(val){
-      this.vehicleType = val
+      this.vehicleTypeCode = val
+      this.getHeader()
       this.$forceUpdate()
     },
     //导出
-    handleExportManage() {
-      if (JSON.stringify(this.parameter) == '{}') {
-        this.parameter.info_id = this.infoId
-        this.parameter.menu_id = this.menuId
-      }
+    handleExportManage(code) {
       // console.log('menuId',this.menuId)
-      let dateName = moment(new Date()).format('YYYY-MM-DD HH-mm-ss')
-      let name = this.$route.query.infoNumber + ' ' + dateName + '.zip'
+      let dateName = moment(new Date()).format('YYYYMMDD')
+      let name = ''
+      switch (code){
+        case 'all':
+          name = this.softwareversion;
+          break;
+        case 'studio':
+          name = this.softwareversion;
+          break;
+        case 'manger':
+          name = this.softwareversion;
+          break;
+      }
+      let exportName = name + ' ' + dateName + '.xlsx'
       let query = {
         exportName: this.$route.query.infoNumber + ' ' + dateName,
         idList: this.selectedRowKeys.join(','),
-        parameter: this.parameter
       }
 
-      downloadFile('split/sarFileSplitItems/exportSplitInfoZip', name, query, this.selectClear)
+      downloadFile('split/sarFileSplitItems/exportSplitInfoZip', exportName, query, this.selectClear)
     },
     // 下发通知
     issuenotice(){
@@ -707,6 +968,7 @@ export default {
     applyforrematch(){
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
         let content = []
+        console.log(this.selectedRowKeysRecord)
         this.$refs.applyforrematchRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)))
       } else {
         this.$message.warning(this.$t('selectLeastOne'))
@@ -789,6 +1051,12 @@ export default {
     // 备注编辑
     getremark(item){
       this.$refs.remarkRef.edit(JSON.parse(JSON.stringify(item)))
+    },
+    getcdr(item){
+      this.$refs.vdrDetialRef.addModel(JSON.parse(JSON.stringify(item)))
+    },
+    vdrDetial(){
+
     },
     remarkForm(data,val){
       console.log(data)
@@ -805,44 +1073,12 @@ export default {
     cancel() {
       this.customizevisible = false
     },
-    getcustomizeList(item){
-      let params = {
-        paramsManifestId: this.$route.query.id,
-        flag: '8'
-      }
-      getAction('report/detail/getHeader', params).then((res) => {
-        if (res.success) {
-          let List = []
-          let sList = []
-          res.result.forEach((item,index) => {
-            if(!item.type){
-              if(item.headFieldCn == '操作'){
-                item.field = 'operation'
-                item.disabled = true
-              }else if(item.headFieldCn == 'NIO编号' || item.headFieldCn == '参数名称'){
-                item.disabled = true
-              }
-              List.push(item)
-            }
-            if(item.type) {
-              sList.push(item)
-            }
-          })
-          this.customizeList = List
-          this.statuList = sList
-        }
-      })
-      if(item){
-        console.log(item)
-        this.checkedList = item
-      }
-    },
     Change() {
       this.selectedValue = this.checkedList
     },
     onCheckAllChange(e) {
-      let selectedValue = ['nio_number', 'params_name', 'operation']
-      this.checkedList = e.target.checked ? this.customizeList.map(item => item.field) : selectedValue
+      // let selectedValue = ['nio_number', 'params_name', 'operation']
+      this.checkedList = e.target.checked ? this.cuList.map(item => item.field) : selectedValue
       this.selectedValue = this.checkedList
       this.indeterminate = false
     },
@@ -852,17 +1088,15 @@ export default {
         return array.indexOf(item) === index
       })
       uniqueArray.forEach(item => {
-        this.customizeList.forEach((val, index) => {
+        this.cuList.forEach((val, index) => {
           if (item == val.field) {
-            // val.sort = index + 1
-            val.dbFieldName = val.db_field_name
-            val.dbFieldTxt = val.db_field_txt
+            val.sort = index + 1
             list.push(val)
           }
         })
       })
       this.confirmLoading = true
-      let headCustomEOList = JSON.parse(JSON.stringify(list)).concat(this.statuList)
+      let headCustomEOList = JSON.parse(JSON.stringify(list))
       let query = {
         headCustomEOList: headCustomEOList
       }
@@ -881,31 +1115,42 @@ export default {
     },
     getHeader() {
       getAction('head/headCustomEO/list', {
-        moduleFlag: 'ota'
+        moduleFlag: this.vehicleTypeCode == '全部'?'全车型':'分车型'
       }).then((res) => {
         if (res.success) {
           if(res.result && res.result.length > 0){
             this.columnsAll = res.result
           }else{
-            this.columnsAll = this.columns
+            this.columnsAll = this.vehicleTypeCode == '全部'?this.columns:this.columnstype
           }
-          for (let j = 0; j < this.columnsAll.length; j++) {
-            for (let i = 0; i < this.column.length; i++) {
-                if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) {
-                  this.columnsAll[j] = this.column[i]
+          if(this.vehicleTypeCode == '全部'){
+            for (let j = 0; j < this.columnsAll.length; j++) {
+              for (let i = 0; i < this.columns.length; i++) {
+                if (this.columns[i].dataIndex == this.columnsAll[j].dataIndex) {
+                  this.columnsAll[j] = this.columns[i]
                 }
+              }
+            }
+          }else{
+            for (let j = 0; j < this.columnsAll.length; j++) {
+              for (let i = 0; i < this.columnstype.length; i++) {
+                if (this.columnstype[i].dataIndex == this.columnsAll[j].dataIndex) {
+                  this.columnsAll[j] = this.columnstype[i]
+                }
+              }
             }
           }
-          if(this.vehicleType != 'all'){
-            this.columnsAll.push({
-              title: this.$t('operation'),
-              align: 'left',
-              fixed: 'right',
-              width: 120,
-              scopedSlots: { customRender: 'operation' }
-            })
-          }
-
+          console.log(this.columnsAll)
+          this.columnsAll.forEach((item) => {
+            if (item.children) {
+              item.children.forEach((val) => {
+                this.checkedList.push(item.dataIndex, val.dataIndex)
+              })
+            } else {
+              this.checkedList.push(item.dataIndex)
+            }
+          })
+          this.getList()
           this.loading = false
           this.JLoading = false
         } else {
@@ -990,6 +1235,20 @@ export default {
   margin-right: 4px;
 }
 
+.customize-text {
+  /*height: 1533px;*/
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.customize-text-title {
+  margin-left: 0;
+  font-size: 14px;
+  font-weight: 400;
+  color: #040B29;
+  margin-bottom: 22px;
+}
 ::v-deep .ant-table-row:first-child {
   background: #fff !important;
   opacity: 0.9;
@@ -1002,10 +1261,54 @@ export default {
 ::v-deep .ant-table-placeholder {
   margin-top: 8px !important;
 }
-::v-deep .popconfirmClassName .ant-popover-buttons{
+/deep/.popconfirmClassName {
+  z-index: 999;
+  width: 264px
+}
+
+.popconfirmClassName .ant-popover-buttons {
   display: none !important;
 }
-::v-deep .popconfirmClassName .anticon-exclamation-circle {
+
+.popconfirmClassName .anticon-exclamation-circle {
   display: none !important;
 }
+::v-deep .ant-table-fixed-header .ant-table-body-inner {
+  overflow: visible;
+}
+popconfirmmize {
+  z-index: 999;
+}
+
+::v-deep .popconfirmmize .ant-popover-buttons {
+  display: none !important;
+}
+
+.popconfirmmize .anticon-exclamation-circle {
+  display: none !important;
+}
+
+.popconfirmmize .ant-popover-message {
+  padding: 4px 0 36px !important;
+}
+/deep/ .ant-popover-buttons {
+  display: none !important;
+}
+</style>
+<style lang='less'>
+.popconfirmClassName .ant-popover-message-title {
+  margin-bottom: 50px;
+}
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index: 100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue
new file mode 100644
index 000000000..36e8f28b3
--- /dev/null
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue
@@ -0,0 +1,268 @@
+<!--VDR详情-->
+<template>
+  <div>
+    <a-drawer
+      :title="$t('VDRDetails')"
+      :maskClosable="false"
+      :width="800"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <a-spin :spinning="confirmLoading">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class='detail-box'>
+              <span class='detail-text'>{{'VDR'}}</span>
+              <span class="title-text-text" :title="form.VDR">
+                {{form.VDR}}</span>
+            </div>
+
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class='detail-box'>
+              <span class='detail-text'>{{$t('theme')}}</span>
+              <span class="title-text-text" :title="form.theme">
+                {{form.theme}}</span>
+            </div>
+
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class='detail-box'>
+              <span class='detail-text'>{{$t('authenticationimpact')}}</span>
+              <span class="title-text-text" :title="form.authenticationimpact">
+                {{form.authenticationimpact}}</span>
+            </div>
+
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class='detail-box'>
+              <span class='detail-text'>{{$t('influencestatute') + '-CN'}}</span>
+              <span class="title-text-text" :title="form.influencestatuteCn">
+                {{form.influencestatuteCn}}</span>
+            </div>
+
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class='detail-box'>
+              <span class='detail-text'>{{$t('influencestatute') + '-EU'}}</span>
+              <span class="title-text-text" :title="form.influencestatuteEu">
+                {{form.influencestatuteEu}}</span>
+            </div>
+
+          </a-col>
+        </a-row>
+        <div style='margin-bottom: 10px;'>{{$t('applicationprojectversion')}}</div>
+        <div v-for='(item,index) in vdrList' :key='index'>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class='detail-box'>
+                <span class='detail-text'>{{item.title}}</span>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class='detail-box'>
+                <span class='detail-text'>{{$t('certificationStartOne')}}</span>
+                <span class="title-text-text" :title="item.certificationStartOne">
+                {{item.certificationStartOne}}</span>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class='detail-box'>
+                <span class='detail-text'>{{$t('certificationdeclaration')}}</span>
+                <span class="title-text-text" :title="item.certificationdeclaration">
+                {{item.certificationdeclaration}}</span>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class='detail-box'>
+                <span class='detail-text'>{{$t('certificationEnd')}}</span>
+                <span class="title-text-text" :title="item.certificationEnd">
+                {{item.certificationEnd}}</span>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class='detail-box'>
+                <span class='detail-text'>{{$t('CertificationProgress')}}</span>
+                <span class="title-text-text" :title="item.CertificationProgress">
+                {{item.CertificationProgress}}</span>
+              </div>
+            </a-col>
+          </a-row>
+        </div>
+
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: 8px" @click="handleCancel">{{$t('close')}}</a-button>
+<!--        <a-button type="primary" @click="handleSubmit" :loading="confirmLoading">{{$t('submit')}}</a-button>-->
+      </div>
+    </a-drawer>
+    <uploadFile ref="uploadFile" :acceptcode="acceptcode" @uploadSuccess="uploadSuccess"/>
+  </div>
+
+</template>
+
+<script>
+import { getAction, postAction } from '@/api/manage'
+import uploadFile from '@/components/uploadFile/file'
+import { mapGetters } from 'vuex'
+
+export default {
+  name:"addModel",
+  components:{
+    uploadFile
+  },
+  data() {
+    return {
+      visible: false,
+      disabled: false,
+      showButton:false,
+      confirmLoading: false,
+      acceptcode:'',
+      projectNameList: [],
+      DeliverableTreeList: [],
+      form:{
+        VDR:'',
+        theme:'',
+        authenticationimpact:'',
+        influencestatuteCn:'',
+        influencestatuteEu:'',
+      },
+      vdrList:[
+        {
+          title:'CN-1',
+          certificationStartOne:'2022-06-14',
+          certificationdeclaration:'2022-06-14',
+          certificationEnd:'2022-06-14',
+          CertificationProgress:'2022-06-14',
+        },
+        {
+          title:'CN-2',
+          certificationStartOne:'2022-06-14',
+          certificationdeclaration:'2022-06-14',
+          certificationEnd:'2022-06-14',
+          CertificationProgress:'2022-06-14',
+        },
+      ],
+      url:{
+        addModel:''
+      },
+      record:{}
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    ...mapGetters(['userInfo']),
+    addModel(record) {
+      this.record=record
+      this.visible = true
+      this.confirmLoading = false
+      console.log('555',record);
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    /** 上传文件的回调 */
+    uploadSuccess(data) {
+      let attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push(item.id || data.name)
+        })
+      }
+      /** 赋值给当前对应的表单文件 */
+      this.formInline[this.uploadName] = attIdList.join(',')
+      this.formInline = { ...this.formInline }
+    },
+    isEdit(){
+      this.disabled=false
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  /*align-items: center;*/
+}
+.detail-box{
+  width: 100%;
+  margin-bottom: 20px;
+}
+.detail-text{
+  display: inline-block;
+  width: 95px;
+}
+.title-text {
+  width: 250px;
+  text-align: right;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 42px;
+  line-height: 48px;
+}
+
+.box-input {
+  display: inline-block;
+  height: 38px;
+  width: 100%;
+}
+
+.itemModel {
+  width: calc(100% - 130px);
+  display: inline-block;
+  margin-top: 2px;
+  min-height: 40px;
+  margin-bottom: 24px;
+}
+
+.Required {
+  color: red;
+  margin-right: 4px;
+}
+
+.header-text {
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  z-index: 100;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.icon-text {
+  font-size: 16px;
+  margin-right: 4px;
+}
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/otaAuthentication/index.vue b/jero-web/src/views/otamanagement/otaAuthentication/index.vue
index dafac7c75..7eab3c368 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/index.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/index.vue
@@ -14,43 +14,44 @@
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         allowClear
                         showSearch
-                        optionFilterProp="children"
+                        optionFilterProp="label"
                         :autoClearSearchValue="false"
-                        v-model="queryParam.softwareplatform">
+                        v-model="queryParam.plannedBpLaunchBatch">
                 <a-select-option v-for="(item, key) in softwareversionList"
+                                 :label='item'
                                  :key="key"
-                                 :value="item.value">
-                  <span style="display: inline-block;width: 100%" :title=" item.name">
-                    {{ item.name }}
+                                 :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
                   </span>
                 </a-select-option>
               </a-select>
             </div>
           </a-col>
 
-          <a-col :md="6" :sm="8">
-            <div class="box-title-text">
-              <div class="title-text" :title="$t('softwareplatform')">
-                <span>{{ $t('softwareplatform') }}</span>
-              </div>
-              <a-select :placeholder="$t('PleaseSelect')+$t('softwareplatform')"
-                        class="box-input"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        allowClear
-                        showSearch
-                        optionFilterProp="children"
-                        :autoClearSearchValue="false"
-                        v-model="queryParam.softwareplatform">
-                <a-select-option v-for="(item, key) in softwareplatformList"
-                                 :key="key"
-                                 :value="item.value">
-                  <span style="display: inline-block;width: 100%" :title=" item.name">
-                    {{ item.name }}
-                  </span>
-                </a-select-option>
-              </a-select>
-            </div>
-          </a-col>
+<!--          <a-col :md="6" :sm="8">-->
+<!--            <div class="box-title-text">-->
+<!--              <div class="title-text" :title="$t('softwareplatform')">-->
+<!--                <span>{{ $t('softwareplatform') }}</span>-->
+<!--              </div>-->
+<!--              <a-select :placeholder="$t('PleaseSelect')+$t('softwareplatform')"-->
+<!--                        class="box-input"-->
+<!--                        :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                        allowClear-->
+<!--                        showSearch-->
+<!--                        optionFilterProp="children"-->
+<!--                        :autoClearSearchValue="false"-->
+<!--                        v-model="queryParam.softwareplatform">-->
+<!--                <a-select-option v-for="(item, key) in softwareplatformList"-->
+<!--                                 :key="key"-->
+<!--                                 :value="item.value">-->
+<!--                  <span style="display: inline-block;width: 100%" :title=" item.name">-->
+<!--                    {{ item.name }}-->
+<!--                  </span>-->
+<!--                </a-select-option>-->
+<!--              </a-select>-->
+<!--            </div>-->
+<!--          </a-col>-->
 
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
@@ -62,43 +63,46 @@
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         allowClear
                         showSearch
-                        optionFilterProp="children"
+                        optionFilterProp="label"
                         :autoClearSearchValue="false"
-                        v-model="queryParam.vehicleType">
+                        v-model="queryParam.appliedVehicleProject">
                 <a-select-option v-for="(item, key) in vehicleTypeList"
+                                 :label='item'
                                  :key="key"
-                                 :value="item.value">
-                  <span style="display: inline-block;width: 100%" :title=" item.name">
-                    {{ item.name }}
+                                 :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
+                </a-select-option>
+              </a-select>
+            </div>
+          </a-col>
+
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('market')">
+                <span>{{ $t('market') }}</span>
+              </div>
+              <a-select :placeholder="$t('PleaseSelect')+$t('market')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        showSearch
+                        optionFilterProp="label"
+                        :autoClearSearchValue="false"
+                        v-model="queryParam.market">
+                <a-select-option v-for="(item, key) in marketList"
+                                 :label='item'
+                                 :key="key"
+                                 :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
                   </span>
                 </a-select-option>
               </a-select>
             </div>
           </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
-              <div class="box-title-text">
-                <div class="title-text" :title="$t('market')">
-                  <span>{{ $t('market') }}</span>
-                </div>
-                <a-select :placeholder="$t('PleaseSelect')+$t('market')"
-                          class="box-input"
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          allowClear
-                          showSearch
-                          optionFilterProp="children"
-                          :autoClearSearchValue="false"
-                          v-model="queryParam.market">
-                  <a-select-option v-for="(item, key) in marketList"
-                                   :key="key"
-                                   :value="item.value">
-                  <span style="display: inline-block;width: 100%" :title=" item.name">
-                    {{ item.name }}
-                  </span>
-                  </a-select-option>
-                </a-select>
-              </div>
-            </a-col>
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('softwarereleasetime')">
@@ -108,7 +112,7 @@
                   class="box-input"
                   @change="onChange"
                   style='margin-left: -1px'
-                  v-model="queryParam.softwarereleasetime"
+                  v-model="queryParam.releaseName"
                   :disabled="false"/>
               </div>
             </a-col>
@@ -189,7 +193,8 @@ export default {
       softwareplatformList: [],
       vehicleTypeList: [],
       marketList: [],
-      queryParam: {},
+      queryParam: {
+      },
       formInline: {},
       rules: {
         whetherTobring: [
@@ -204,37 +209,37 @@ export default {
         {
           title: this.$t('softwareversion'),
           align: 'left',
-          dataIndex: 'cpdjbh',
-          ellipsis: true,
-          width: 170
-        },
-        {
-          title: this.$t('softwareplatform'),
-          align: 'left',
-          dataIndex: 'ggpc',
+          dataIndex: 'plannedBpLaunchBatch',
           ellipsis: true,
           width: 170
         },
+        // {
+        //   title: this.$t('softwareplatform'),
+        //   align: 'left',
+        //   dataIndex: 'ggpc',
+        //   ellipsis: true,
+        //   width: 170
+        // },
         {
           title: this.$t('market'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'cpsb'
+          dataIndex: 'market'
         },
         {
           title: this.$t('vehicleType'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'vehicleType'
+          dataIndex: 'appliedVehicleProject'
         },
         {
           title: this.$t('softwarereleasetime'),
           align: 'left',
           width: 170,
           ellipsis: true,
-          dataIndex: 'cpmc'
+          dataIndex: 'releaseName'
         },
         {
           title: this.$t('operation'),
@@ -249,11 +254,22 @@ export default {
     }
   },
   mounted() {
+    this.getSelectData()
     this.getList()
     this.administrators = false
   },
   methods: {
     ...mapGetters(['userInfo']),
+    getSelectData(){
+      getAction('/ota/otaManageApplyEO/getPullDownList', {}).then((res) => {
+        if (res.success) {
+          this.softwareversionList = res.result.plannedBpLaunchBatchList
+          this.vehicleTypeList = res.result.carSet
+          this.marketList = res.result.marketSet
+        } else {
+        }
+      })
+    },
     handleToggleSearch() {
       this.toggleSearchStatus = !this.toggleSearchStatus
     },
@@ -290,16 +306,15 @@ export default {
         ...queryParam
       }
       this.loading = true
-      getAction('/ota/otaBaCxList/page', query).then((res) => {
+      getAction('/ota/otaManageApplyEO/getOtaPage', query).then((res) => {
         if (res.success) {
-          if (res.result.list.current > 1 && res.result.list.records.length == 0) {
+          if (res.result.current > 1 && res.result.records.length == 0) {
             this.pageNo = 1
             this.getList()
             return
           }
-          this.dataSource = res.result.list.records || []
-          this.number = res.result.pjspzq
-          this.total = res.result.list.total
+          this.dataSource = res.result.records || []
+          this.total = res.result.total
           this.loading = false
         } else {
           this.loading = false
@@ -310,32 +325,11 @@ export default {
       this.selectedRowKeys = value
       this.selectedRowKeysRecord = record
     },
-    // 删除
-    deleteData(val) {
-      let _this = this
-      this.$confirm({
-        content: _this.$t('ConfirmDelete'),
-        onOk() {
-          deleteAction('ota/otaBaCxList/delete', { id: val.id }).then((res) => {
-            if (res.success) {
-              _this.$message.success(_this.$t('OperationSuccessful'))
-              _this.getList()
-            } else {
-              _this.$message.warning(res.message)
-            }
-          })
-        }
-      })
-    },
     //导出
     handleExportManage() {
-      if (JSON.stringify(this.parameter) == '{}') {
-        this.parameter.info_id = this.infoId
-        this.parameter.menu_id = this.menuId
-      }
       // console.log('menuId',this.menuId)
-      let dateName = moment(new Date()).format('YYYY-MM-DD HH-mm-ss')
-      let name = this.$route.query.infoNumber + ' ' + dateName + '.zip'
+      let dateName = moment(new Date()).format('YYYYMMDD')
+      let name = 'OTA' + this.$t('softwareversion') + ' ' + dateName + '.xlsx'
       let query = {
         exportName: this.$route.query.infoNumber + ' ' + dateName,
         idList: this.selectedRowKeys.join(','),
@@ -352,12 +346,14 @@ export default {
       })
     },
     onChange(value, dateString) {
-      if (this.queryParams.softwarereleasetime && this.queryParams.softwarereleasetime.length > 0) {
+      if (this.queryParam.releaseName && this.queryParam.releaseName.length > 0) {
         let dateOne = moment(dateString[0]).format('YYYY-MM-DD')
         let dateTwo = moment(dateString[1]).format('YYYY-MM-DD')
-        this.queryParams.softwarereleasetime = [dateOne, dateTwo]
+        this.queryParam.softwareIssueTimeStart = dateOne
+        this.queryParam.softwareIssueTimeEnd = dateTwo
+
       } else {
-        this.queryParams.softwarereleasetime = []
+        this.queryParam.releaseName = []
         // this.queryParamOne[item + '_name'] = []
       }
     },