Browse Source

feat: 上传/下载优化

zhanghonggang 5 months ago
parent
commit
330e12d5d5
1 changed files with 21 additions and 14 deletions
  1. 21 14
      src/views/flight/global-ticket/index.vue

+ 21 - 14
src/views/flight/global-ticket/index.vue

@@ -118,7 +118,7 @@
               @click="handleUpload"
               v-hasPermi="['global-ticket:queryTask:upload']"
             >
-              上传表格
+              导入查询任务
             </el-button>
           </el-col>
           <el-col :span="1.5">
@@ -130,7 +130,7 @@
               @click="handleDownload"
               v-hasPermi="['global-ticket:queryTask:download']"
             >
-              下载模板
+              下载任务模板
             </el-button>
           </el-col>
         </el-row>
@@ -170,6 +170,16 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column
+            label="自定义舱位顺序"
+            align="center"
+            key="cabinList"
+            prop="cabinList"
+            :show-overflow-tooltip="true">
+            <template #default="scope">
+              {{ scope.row.cabinList ? scope.row.cabinList.join(',') : '' }}
+            </template>
+          </el-table-column>
+          <el-table-column
             label="起飞日期"
             align="center"
             key="depTime"
@@ -478,7 +488,7 @@
         :limit="1"
         accept=".xlsx, .xls"
         :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :action="upload.url"
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
@@ -488,10 +498,6 @@
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
-          <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" />
-            是否更新已经存在的用户数据
-          </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
           <el-link
             type="primary"
@@ -517,15 +523,13 @@ import {
   getTaskChartData,
   updateTaskRate,
 } from "@/api/flight/global-tickt/flightquery";
-import { addTaskForm } from "./createQueryTask.vue";
 import FlightLineChart from "../FlightLineChart";
 import { getToken } from "@/utils/auth";
 
 export default {
   name: "GlobalTicket",
   components: {
-    FlightLineChart,
-    addTaskForm: addTaskForm,
+    FlightLineChart
   },
   props: [],
   data() {
@@ -637,7 +641,7 @@ export default {
         {
           label: "否",
           value: 0,
-        },
+        }
       ],
       shippingRules: [
         {
@@ -647,7 +651,7 @@ export default {
         {
           label: "自定义舱位",
           value: false,
-        },
+        }
       ],
       taskStatus: [
         {
@@ -705,7 +709,7 @@ export default {
         depTime: null,
         taskRate: null,
         isShare: 0,
-        useRealCabin: 0,
+        useRealCabin: true,
       },
       createQueryTaskDataRules: {
         depAirport: [
@@ -783,11 +787,13 @@ export default {
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;
+      this.$modal.loading("正在导入查询任务,请稍候...");
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
       this.upload.open = false;
       this.upload.isUploading = false;
+      this.$modal.closeLoading();
       this.$refs.upload.clearFiles();
       this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
@@ -863,6 +869,7 @@ export default {
       this.createQueryTaskData = {
         taskRate: 300,
         isShare: 0,
+        useRealCabin: true
       };
       this.open = true;
       this.title = "创建航班查询任务";
@@ -877,7 +884,7 @@ export default {
       this.download(
         "/flight/downloadTemplate",
         {},
-        `航班查询任务${new Date().getTime()}.xlsx`
+        `航班查询任务模板.xlsx`
       );
     },
     // 提交上传文件