预审导入导出页面更新

jinhui.wang
Commit 2cc2217644d84ba16415b657714c1e2432179aab 2cc22176 1 parent 8c452b80
Showing 2 changed files with 36 additions and 38 deletions
src/views/basicInformation/caExportPreQualification/index.vue
src/views/basicInformation/caPreReviewImport/index.vue
--- a/src/views/basicInformation/caExportPreQualification/index.vue
View file @2cc2217
+++ b/src/views/basicInformation/caExportPreQualification/index.vue
View file @2cc2217
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" :inline="true" label-width="90px">
+    <el-form class="form-header" :model="queryParams" label-position="right" label-width="auto" size="medium">
       <el-row>
-        <el-col :span="8">
+        <el-col :span="6">
-          <el-form-item label="航班号:">
-            <el-input
-              type="textarea"
-              v-model="fltNo"
-              clearable
-              size="small"
-              class="formItem"
-              placeholder="AC001;AC002"
-            >
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="航班日期从" prop="fltDateStart">
             <el-date-picker
               value-format="yyyy-MM-dd"
+              class="formItem"
               v-model="queryParams.fltDateStart"
               type="date"
               placeholder="选择日期"
@@ -26,10 +14,11 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="到" prop="fltDateEnd">
             <el-date-picker
               value-format="yyyy-MM-dd"
+              class="formItem"
               v-model="queryParams.fltDateEnd"
               type="date"
               placeholder="选择日期"
@@ -37,21 +26,32 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-      </el-row>
+        <el-col :span="6">
-      <el-row>
+          <el-form-item label="航班号">
-        <el-col :span="8">
+            <el-input
-          <el-form-item label="运单号:">
+              type="textarea"
+              v-model="fltNo"
+              clearable
+              class="formItem"
+              placeholder="AC001;AC002"
+              rows="1"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="运单号">
             <el-input
-              size="small"
               clearable
               type="textarea"
               v-model="queryParams.waybillNo"
               class="formItem"
-              placeholder="xxxx;xxxx"
+              placeholder="请输入运单号（回车间隔）"
+              rows="1"
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="站点">
             <el-input
               type="textarea"
@@ -59,26 +59,24 @@
               class="formItem"
               placeholder="PVG;PEK"
               clearable
-              size="small"
+              rows="1"
             >
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
-          <el-form-item label="URSA:">
+          <el-form-item label="URSA">
             <el-input
               clearable
-              size="small"
               type="textarea"
               v-model="ursa"
               class="formItem"
               placeholder="S_;P_;E2"
+              rows="1"
             >
             </el-input>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="24">
           <el-switch
             v-model="queryParams.reExport"
@@ -89,8 +87,7 @@
           </el-switch>
         </el-col>
       </el-row>
-      <br />
+      <div style="margin-top:25px">
-      <el-form-item style="margin-top: 33px">
          <el-button
         type="primary"
         icon="el-icon-search"
@@ -109,7 +106,8 @@
           downLoadingTip.downloading ? downLoadingTip.tip : "导出"
         }}</el-button
       >
-      </el-form-item>
+      </div>
+     
     </el-form>
     <el-table
@@ -302,8 +300,4 @@ export default {
   font-size: 14px;
   margin-right: 40px;
 }
-.formItem {
-  width: 100%;
-  max-width: 300px;
-}
 </style>
--- a/src/views/basicInformation/caPreReviewImport/index.vue
View file @2cc2217
+++ b/src/views/basicInformation/caPreReviewImport/index.vue
View file @2cc2217
@@ -15,7 +15,7 @@
     <div style="font-size: 12px; font-weight: 700">
       提示：<span style="color: #0000ff">以下为所提交的数据或出错信息</span>
     </div>
-    <el-table ref="filterTable" :data="tableData" style="width: 100%; margin-top: 20px" size="small" border>
+    <el-table ref="filterTable" :data="tableData" v-loading="loading" style="width: 100%; margin-top: 20px" size="small" border>
       <el-table-column label="行号" prop="line" fixed width="50" align="center">
       </el-table-column>
       <el-table-column label="错误信息" prop="errorMessage" fixed width="300">
@@ -46,6 +46,8 @@
   export default {
     data() {
       return {
+        // 遮罩层
+        loading: false,
         flightType: [],
         form: {
           type: "",
@@ -80,7 +82,9 @@
         //上传excel
         const file = option.file;
         console.log(option);
+        this.loading=true;
         importcaPreReview(file, this.form.type).then((res) => {
+           this.loading=false;
           if (res.code != 200) {
             if (res.code == 603) {
               this.$alert(res.msg, "提示", {
@@ -92,7 +96,7 @@
               this.tableData = res.data;
             }
           } else {
-            this.$message.success("导入成功");
+            this.$message.success(res.msg);
             this.tableData = res.data;
           }
         });