From 1336a2f7fdf472df79821388797bf58c4c45744d Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 21 Aug 2023 17:50:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E8=BD=A6=E5=9E=8B=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=20=E5=88=86=E8=BD=A6=E5=9E=8B=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otaAuthentication/components/detil.vue    | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
index f68cf91fe..9f43d4846 100644
--- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
+++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue
@@ -103,55 +103,55 @@
     </div>
 <!--    全部导出-->
     <div class="table-operator" style='margin-bottom: 19px;text-align: left;margin-top: 20px;'>
-      <div v-if="vehicleTypeCode === '全部'" class="operator-text" @click="handleExportManage('all')"
+      <div v-show="vehicleTypeCode === '全部'" class="operator-text" @click="handleExportManage('all')"
            v-has="'otadetail:export'">
         <a-icon type="export" :rotate="-90" />
         {{ $t('export') }}
       </div>
 <!--      全部下发通知-->
-      <div v-if="vehicleTypeCode === '全部'" class="operator-text" @click="issuenotice"
+      <div v-show="vehicleTypeCode === '全部'" class="operator-text" @click="issuenotice"
            v-has="'otadetail:Issuenotice'">
         <a-icon type="sound" />
         {{ $t('issuenotice') }}
       </div>
       <!--    studio导出-->
-      <div v-if="vehicleTypeCode !== '全部'"  class="operator-text" @click="handleExportManage('studio')"
+      <div v-show="vehicleTypeCode !== '全部'"  class="operator-text" @click="handleExportManage('studio')"
            v-has="'otad:export'">
         <a-icon type="export" :rotate="-90"/>
         {{ $t('export') }}
       </div>
       <!--      studio批量设置-->
-      <div v-if="vehicleTypeCode !== '全部'" class="operator-text" @click="BatchSetting"
+      <div v-show="vehicleTypeCode !== '全部'" class="operator-text" @click="BatchSetting"
            v-has="'otad:batchsetting'">
         <a-icon type="setting"  />
         {{ $t('BatchSetting') }}
       </div>
       <!--      studio申请重新匹配-->
-      <div v-if="vehicleTypeCode !== '全部'" class="operator-text" @click="applyforrematch"
+      <div v-show="vehicleTypeCode !== '全部'" class="operator-text" @click="applyforrematch"
            v-has="'otad:rematch'">
         <a-icon type="rollback" />
         {{ $t('applyforrematch') }}
       </div>
       <!--      studio保存-->
-      <div v-if="vehicleTypeCode !== '全部'" class="operator-text" @click="preservation"
+      <div v-show="vehicleTypeCode !== '全部'" class="operator-text" @click="preservation"
            v-has="'otad:save'">
         <a-icon type="check-circle" />
         {{ $t('preservation') }}
       </div>
       <!--      studio提交-->
-      <div v-if="vehicleTypeCode !== '全部'" class="operator-text" @click="submit"
+      <div v-show="vehicleTypeCode !== '全部'" class="operator-text" @click="submit"
            v-has="'otad-submit'">
         <a-icon type="check-circle" />
         {{ $t('submit') }}
       </div>
       <!--      manger确认-->
-      <div v-if="vehicleTypeCode !== '全部'" class="operator-text" @click="confirm"
+      <div v-show="vehicleTypeCode !== '全部'" class="operator-text" @click="confirm"
            v-has="'otaman:confirm'">
         <a-icon type="check-circle" />
         {{ $t('confirm') }}
       </div>
       <!--      manger退回-->
-      <div v-if="vehicleTypeCode !== '全部'" class="operator-text" @click="sendBack"
+      <div v-show="vehicleTypeCode !== '全部'" class="operator-text" @click="sendBack"
            v-has="'otaman:return'">
         <a-icon type="rollback" />
         {{ $t('sendBack') }}
@@ -1019,11 +1019,15 @@ export default {
           url = 'ota/otaManageApplyEO/oneCarExportXls'
           break;
       }
-      let exportName = name + ' ' + dateName + '.xlsx'
+      this.queryParam.appliedVehicleProject = this.vehicleTypeCode == '全部'?this.queryParam.appliedVehicleProject:this.vehicleTypeCode
+      this.queryParam.plannedBpLaunchBatch = this.$route.query.plannedBpLaunchBatch
+      let exportName = this.$route.query.plannedBpLaunchBatch + dateName + '.xlsx'
       let query = {
         exportName: exportName,
         selections: this.selectedRowKeys.join(','),
-        ...this.queryParam
+        ...this.queryParam,
+        orderBy: this.orderBy,
+        orderByField: this.orderByField,
       }
 
       downloadFile(url, exportName, query, this.selectClear)