Merge branch 'et86-black' into uat

@@ -49,7 +49,7 @@
       :max-height="attrs.maxHeight"
       :empty-text="emptyText"
       v-bind="attrs"
-      v-loading="loadingTable"
+      v-loading="tableLoading"
       :data="tableData"
       @selection-change="selectionChange"
       ref="tableRef"
@@ -118,7 +118,7 @@ export default {
       type: String,
       default: "暂无数据",
     },
-    loadingTable: {
+    tableLoading: {
       type: Boolean,
       default: false,
     },

 <template>
-  <div ref="barEcharts" class="route-info-container">
+  <div ref="barEcharts" class="route-info-container" v-loading="pageLoading">
     <!-- 航线设置规则信息查询条件 -->
     <el-row style="padding: 0 50px">
       <el-col>
@@ -69,6 +69,7 @@ export default {
   mixins: [indexMixins],
   data() {
     return {
+      pageLoading: false,
       loading: false, // 折叠面板
       dragOptions: {
         // 航线优先级拖拽配置

@@ -210,6 +210,7 @@ export default {
     // 【接口调用和数据去重整合】普通级别
     noDateLevelRoute(parmas) {
       return new Promise((resolve, reject) => {
+        this.pageLoading = true;
         findDestinationFltRuleByFlightNo(parmas)
           .then((res) => {
             const { code, data, msg } = res;
@@ -248,12 +249,15 @@ export default {
               mergeNoDateRouteInfo,
             });
           })
-          .catch(() => {});
+          .catch(() => {
+            this.pageLoading = false;
+          });
       });
     },
     // 【接口调用和数据去重整合】日期级别
     dateLevelRoute(parmas) {
       return new Promise((resolve, reject) => {
+        this.pageLoading = true;
         findDestinationFltRuleByFlightNo(parmas)
           .then((res) => {
             const { code, data, msg } = res;
@@ -302,6 +306,7 @@ export default {
     },
     // 根据航班号ID查看航班航线配置详情
     getFindByFlightId(parmas) {
+      this.pageLoading = true;
       findByFlightId(parmas)
         .then((res) => {
           const { code, data, msg } = res;
@@ -348,8 +353,11 @@ export default {
             );
           });
           this.routesInfo = mergeRouteInfo; // 航班航线配置信息列表
+          this.pageLoading = false;
         })
-        .catch(() => {});
+        .catch(() => {
+          this.pageLoading = false;
+        });
     },
     // 拿到【接口调用和数据去重整合】的数据做数据页面显示处理：非日期级别
     noDateLevelData(noDateParmas) {
@@ -375,6 +383,7 @@ export default {
             );
           });
           this.routesInfo = mergeNoDateRouteInfo; // 航班航线配置信息列表
+          this.pageLoading = false;
         }
       );
     },
@@ -411,6 +420,7 @@ export default {
           if (this.$route.query.flightKindName == "Purple Tail") {
             this.showFlightKind(dateDataLists);
           }
+          this.pageLoading = false;
         } else {
           // 当前航线有缺省的航线配置
           // 航班航线有规则配置的
@@ -492,6 +502,7 @@ export default {
             );
           });
           this.routesInfo = result;
+          this.pageLoading = false;
         } else {
           // 日期级别和非日期级别都没有配置信息的时候，
           // 从数据整合的里面取一个对应的航线数据作为回显暂无数据处理。
@@ -505,6 +516,7 @@ export default {
             );
           });
           this.routesInfo = noDateRouteInfo;
+          this.pageLoading = false;
         }
       } else {
         // 日期级别和航班种类为Purple Tail的时候
@@ -575,9 +587,11 @@ export default {
               );
             });
           this.routesInfo = result;
+          this.pageLoading = false;
         } else {
           this.queryForm = this.$route.query; // 获取跳转过来的参数
           this.routesInfo = dateList;
+          this.pageLoading = false;
         }
       }
     },

@@ -2,7 +2,7 @@
   <div class="form-header container">
     <yl-table
       :attrs="tableAttr"
-      :loadingTable="tableAttr.loadingTable"
+      :tableLoading="tableAttr.tableLoading"
       :columns="columns"
       :tableData="tableData"
       :pageConfig="pageConfig"

 export const tableAttr = {
   border: true,
-  loadingTable: false,
+  tableLoading: false,
   isDragSort: false, // 拖拽tableData数据一定要加id字段
   maxHeight: 800,
   btnCofig: {

@@ -14,7 +14,7 @@
     <yl-table
       ref="ylTable"
       :attrs="tableAttr"
-      :loadingTable="tableAttr.loadingTable"
+      :tableLoading="tableAttr.tableLoading"
       :columns="columns"
       :tableData="tableData"
       :pageConfig="pageConfig"
@@ -99,10 +99,10 @@ export default {
         limitSize: size,
         ...this.queryForm,
       };
-      this.tableAttr.loadingTable = true;
+      this.tableAttr.tableLoading = true;
       findHsCodeList(params)
         .then((res) => {
-          this.tableAttr.loadingTable = false;
+          this.tableAttr.tableLoading = false;
           const { code, data } = res;
           if (code == 200) {
             this.tableData = data.list;

 export const tableAttr = {
   border: true,
-  loadingTable: false,
+  tableLoading: false,
   isDragSort: false, // 拖拽tableData数据一定要加id字段
   maxHeight: 0,
   btnCofig: {

 <template>
-  <div class="form-header" v-loading="loading">
+  <div class="form-header" v-loading="pageLoading">
     <el-row style="padding-bottom: 20px">
       <el-col>
         <el-divider content-position="left">ET86配舱航班顺位</el-divider>
@@ -26,7 +26,7 @@
           ref="ylTable"
           emptyText="请添加配舱航班"
           :attrs="tableAttr"
-          :loadingTable="tableAttr.loadingTable"
+          :tableLoading="tableAttr.tableLoading"
           :tableData="tableData"
           :pageConfig="{
             isPagination: false,
@@ -445,7 +445,7 @@ export default {
   mixins: [indexMixins, inputBlurValidate],
   data() {
     return {
-      loading: false,
+      pageLoading: false,
       queryForm: {
         // ET86配舱航班顺位维度
         // 表单参数
@@ -536,10 +536,10 @@ export default {
     },
     // ET86详情
     queryFindEtesRuleById({ id, status, name }) {
-      this.loading = true;
+      this.pageLoading = true;
       findEtesRuleById({ id: id, status: status })
         .then((res) => {
-          this.loading = false;
+          this.pageLoading = false;
           const { code, data, msg } = res;
           if (code == 200) {
             data.list.flightRankDtoList.map((item) => {
@@ -593,7 +593,7 @@ export default {
           }
         })
         .catch(() => {
-          this.loading = false;
+          this.pageLoading = false;
         });
     },
     // ET86编辑
@@ -627,11 +627,11 @@ export default {
     },
     // 航线查询
     getQueryRouteByFltNo(item) {
-      this.tableAttr.loadingTable = true;
+      this.tableAttr.tableLoading = true;
       this.tableData[this.currentIndex].flightRoute;
       queryRouteByFltNo(item)
         .then((res) => {
-          this.tableAttr.loadingTable = false;
+          this.tableAttr.tableLoading = false;
           if (res.code == 200) {
             const list = res.data.list;
             if (list.length) {

 export const tableAttr = {
   border: true,
-  loadingTable: false,
+  tableLoading: false,
   isDragSort: true, // 拖拽tableData数据一定要加id字段
   maxHeight: 300,
   btnCofig: {

@@ -15,7 +15,7 @@
     <yl-table
       ref="ylTable"
       :attrs="tableAttr"
-      :loadingTable="tableAttr.loadingTable"
+      :tableLoading="tableAttr.tableLoading"
       :columns="columns"
       :tableData="tableData"
       :pageConfig="pageConfig"
@@ -110,10 +110,10 @@ export default {
       if (this.queryForm.status == "有效") {
         params.status = "1";
       }
-      this.tableAttr.loadingTable = true;
+      this.tableAttr.tableLoading = true;
       findAllEtesRules(params)
         .then((res) => {
-          this.tableAttr.loadingTable = false;
+          this.tableAttr.tableLoading = false;
           const { code, data } = res;
           if (code == 200) {
             const valid = data.list.filter((item) => item.status == "1"); // 有效

@@ -4,7 +4,7 @@ const state = {
 };
 export const tableAttr = {
   border: true,
-  loadingTable: false,
+  tableLoading: false,
   isDragSort: false, // 拖拽tableData数据一定要加id字段
   maxHeight: 0,
   // defaultSort: { prop: "updateTime", order: "descending" },

@@ -14,7 +14,7 @@
     <yl-table
       ref="ylTable"
       :attrs="tableAttr"
-      :loadingTable="tableAttr.loadingTable"
+      :tableLoading="tableAttr.tableLoading"
       :columns="columns"
       :tableData="tableData"
       :pageConfig="pageConfig"
@@ -101,10 +101,10 @@ export default {
         limitSize: size,
         ...this.queryForm,
       };
-      this.tableAttr.loadingTable = true;
+      this.tableAttr.tableLoading = true;
       findShipmentDescList(params)
         .then((res) => {
-          this.tableAttr.loadingTable = false;
+          this.tableAttr.tableLoading = false;
           const { code, data } = res;
           if (code == 200) {
             this.tableData = data.list;

 export const tableAttr = {
   border: true,
-  loadingTable: false,
+  tableLoading: false,
   isDragSort: false, // 拖拽tableData数据一定要加id字段
   maxHeight: 300,
   btnCofig: {