货物查询更新，样式更新，通用方法更新

@@ -46,6 +46,7 @@
       :total="totalCount"
       :page-size.sync="limitSize"
       background
+      layout="prev, pager, next, jumper, ->, total, slot"
       class="tablePagination"
       @next-click="nextClick"
       @prev-click="prevClick"
@@ -182,6 +183,8 @@ export default {
       //   width: "",
       //   align: "center",
       //   sorTable: false,
+      //   fixed:false,
+      //   formatter:{}
       // },
     };
   },
@@ -249,6 +252,9 @@ export default {
     SelectChange(selection) {
       this.$emit("SelectChange", selection);
     },
+    clearTable(){
+      this.$refs.tables.clearSelection()
+    },
     itemChange(val) {},
     // checkChange(val) {
     //   console.log(val);

@@ -19,6 +19,7 @@
         :item="child"
         :base-path="resolvePath(child.path)"
         class="nest-menu"
+        :title="child.meta.title"
       />
     </el-submenu>
   </div>

@@ -5,7 +5,7 @@ const mimeMap = {
   xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
   zip: 'application/zip'
 }
-// const  baseUrl = 'https://imacuat.zmd.apac.fedex.com/IMAC2' //uat服务器
+// const  baseUrl = 'https://imacuat.zmd.apac.fedex.com/iMAC' //uat服务器
 const baseUrl = 'http://47.103.140.98:7001/IMAC2' //阿里云服务器
 // const baseUrl = 'http://192.168.1.133:7001/IMAC2' //测试服务器
 

@@ -26,7 +26,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="配载航班号:">
-            <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002"></el-input>
+            <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" rows="1"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -54,7 +54,8 @@
               type="textarea"
               v-model="formData.waybillNo"
               class="formItem"
-              placeholder="xxxx;xxxx"
+              placeholder="请输入运单号（回车间隔）"
+              rows="1"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -102,6 +103,7 @@
               v-model="ursa"
               class="formItem"
               placeholder="S_;P_;E2"
+              rows="1"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -112,6 +114,7 @@
               v-model="siteName"
               class="formItem"
               placeholder="PVG;PEK"
+              rows="1"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -210,91 +213,6 @@
             </el-collapse-item>
         </el-collapse>
         </el-col>
-        <!-- <el-col :span="6">
-          <el-form-item label="预配航班日期:">
-            <el-date-picker
-              class="formItem"
-              v-model="prepalyFlightTime"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :value-format="valueFormat"
-            >
-            </el-date-picker>
-          </el-form-item>
-        </el-col> -->
-        <!-- <el-col :span="6">
-          <el-form-item label="数据源:">
-            <el-select
-              placeholder="不限"
-              v-model="formData.dataSources"
-              class="formItem"
-              clearable
-            >
-              <el-option label="人工导入" value="1"> </el-option>
-              <el-option label="系统导入" value="2"> </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col> -->
-        <!-- <el-col :span="6">
-          <el-form-item label="是否大货:">
-            <el-select
-              placeholder="不限"
-              v-model="formData.big"
-              class="formItem"
-              clearable
-            >
-              <el-option label="是" value="1"> </el-option>
-              <el-option label="否" value="0"> </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col> -->
-        <!-- <el-col :span="6">
-          <el-form-item label="配置航班类型:">
-            <el-select
-              placeholder="不限"
-              v-model="formData.kindToAllocFlightId"
-              class="formItem"
-              clearable
-            >
-              <el-option
-                v-for="item in findConditionData.configureFlightType"
-                :label="item.chineseName"
-                :value="item.id"
-                :key="item.id"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col> -->
-        <!-- <el-col :span="6">
-          <el-form-item label="历史货物状态:">
-            <el-select
-              placeholder="不限"
-              v-model="formData.historyAllocaCargoTypeId"
-              class="formItem"
-              clearable
-            >
-              <el-option
-                v-for="item in findConditionData.cargoStatusHistory"
-                :label="item.chineseName"
-                :value="item.id"
-                :key="item.id"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col> -->
-         <!-- <el-col :span="6">
-          <el-form-item label="航班序列单号:">
-            <el-input
-              type="text"
-              v-model="formData.mawbCode"
-              class="formItem"
-            ></el-input>
-          </el-form-item>
-        </el-col> -->
       </el-row>
       <div style="paddingLeft: 10px;marginTop:20px">
         <el-button
@@ -314,6 +232,7 @@
         <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(1)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
           >{{downLoadingTip.downloading?downLoadingTip.tip:"导出全部查询结果"}}</el-button
         >
+        <el-progress class="progress" :stroke-width="12" :show-text="true" :percentage="progress" :status="progress == 100?'success':'warning'"></el-progress>
         <div class="tips">
           <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
           <span>总件数:{{ allQty }}</span>
@@ -363,7 +282,7 @@
 
 <script>
 import { findConditionData, findCargoData } from "@/api/cargoSelect";
-import { cargoXlsx } from "@/utils/zipdownload";
+import { downLoadXlsx } from "@/utils/zipdownload";
 
 export default {
   name:"queryCargo",
@@ -461,6 +380,7 @@ export default {
       createDate: [],
       limitStart: 0,
       limitSize: 100, //无限制-1
+      progress:0,
       selecetALL:false,
     };
   },
@@ -654,6 +574,7 @@ export default {
     },
     // 导出表格
     xlse(page) {
+      this.progress = 0;
       this.downLoadingTip.downloading = true;
       let cargoXlse = {title:"货物导出表",cargoConditionDto:{}};
       if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){
@@ -693,21 +614,23 @@ export default {
       if (page == 0) {
         this.downLoadingTip.tip = "正在导出本页结果集"
         cargoXlse.cargoConditionDto.limitStart = this.limitStart;
-        cargoXlsx("/cargo/excel",cargoXlse).then(()=>{
+        downLoadXlsx("/cargo/excel",cargoXlse,"货物查询表").then(()=>{
           this.downLoadingTip.downloading = false;
           this.downLoadingTip.tip = ""
+          this.progress = 100;
         }).catch(()=>{
           this.downLoadingTip.downloading = false;
           this.downLoadingTip.tip = ""
         })
       } else {
-        if(this.totalCount < 100000){
+        if(this.totalCount < 80000){
           this.downLoadingTip.tip = "正在导出全部结果集"
           cargoXlse.cargoConditionDto.limitStart = 0;
           cargoXlse.cargoConditionDto.limitSize = -1;
-          cargoXlsx("/cargo/excel",cargoXlse).then(()=>{
+          downLoadXlsx("/cargo/excel",cargoXlse,"货物查询表").then(()=>{
             this.downLoadingTip.downloading = false;
             this.downLoadingTip.tip = ""
+            this.progress = 100;
           }).catch(()=>{
             this.downLoadingTip.downloading = false;
             this.downLoadingTip.tip = ""
@@ -739,6 +662,7 @@ export default {
         return this.formData.fltNo;
       },
       set: function (val) {
+        val = val.replace(/；/g,";");
         this.formData.fltNo = val.toUpperCase();
       },
     },
@@ -747,6 +671,7 @@ export default {
         return this.formData.siteName;
       },
       set: function (val) {
+        val = val.replace(/；/g,";");
         this.formData.siteName = val.toUpperCase();
       },
     },
@@ -755,6 +680,7 @@ export default {
         return this.formData.ursa;
       },
       set: function (val) {
+        val = val.replace(/；/g,";");
         this.formData.ursa = val.toUpperCase();
       },
     },
@@ -763,6 +689,7 @@ export default {
         return this.formData.cargoPlaneNo;
       },
       set: function (val) {
+        val = val.replace(/；/g,";");
         this.formData.cargoPlaneNo = val.toUpperCase();
       },
     }
@@ -777,4 +704,9 @@ export default {
   font-size: 14px;
   margin-right: 40px;
 }
+.progress{
+  width:200px;
+  display: inline-block;
+  margin:0 0 0 20px;
+}
 </style>
\ No newline at end of file