代码更新

@@ -50,6 +50,7 @@
     <el-pagination
       :total="totalCount"
       :page-size.sync="limitSize"
+      :current-page.sync="pageNum"
       background
       layout="prev, pager, next, jumper, ->, total, slot"
       class="tablePagination"
@@ -201,6 +202,11 @@ export default {
   created() {
     this.newHeader = this.headerData;
   },
+  watch:{
+    page(){
+      this.pageNum = this.page;
+    }
+  },
   mounted() {},
   methods: {
     nextClick() {

@@ -142,32 +142,35 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="重量区间">
-            <el-col :span="11"
-              ><el-input-number
-                class="formItem"
-                size="mini"
-                v-model="formData.minWeight"
-                :controls="false"
-                :min="0"
-                :precision="2"
-              ></el-input-number
-            ></el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11"
-              ><el-input-number
-                class="formItem"
-                size="mini"
-                v-model="formData.maxWeight"
-                :controls="false"
-                :min="formData.minWeight"
-                :precision="2"
-              ></el-input-number
-            ></el-col>
+              <el-row>
+                <el-col :span="11"
+                ><el-input-number
+                  class="formItem"
+                  size="mini"
+                  v-model="formData.minWeight"
+                  :controls="false"
+                  :min="0"
+                  :precision="2"
+                ></el-input-number
+              ></el-col>
+              <el-col class="line" :span="2">-</el-col>
+              <el-col :span="11"
+                ><el-input-number
+                  class="formItem"
+                  size="mini"
+                  v-model="formData.maxWeight"
+                  :controls="false"
+                  :min="formData.minWeight"
+                  :precision="2"
+                ></el-input-number
+              ></el-col>
+            </el-row>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="件数区间">
-            <el-col :span="11"
+            <el-row>
+              <el-col :span="11"
               ><el-input-number
                 class="formItem"
                 size="mini"
@@ -186,6 +189,7 @@
                 :min="formData.minNumber"
               ></el-input-number
             ></el-col>
+            </el-row>
           </el-form-item>
         </el-col>
         <!-- <el-col :span="6">
@@ -270,7 +274,7 @@
           icon="el-icon-search"
           size="mini"
           :loading="loading"
-          @click="select"
+          @click="select(0)"
           >查询</el-button
         >
         <el-button
@@ -314,6 +318,7 @@
       :loading="loading"
       :limitSize="size"
       :limitStart="formData.limitStart"
+      :page="page"
       :shiftKey="shiftKey"
       height="350"
       @tableSelect="tableSelect"
@@ -793,9 +798,13 @@ export default {
     };
   },
   created() {
-    this.seleData()
+    this.seleData();
     this.select();
   },
+  // activated(){
+  //   this.seleData();
+  //   this.select();
+  // },
   mounted() {
     window.addEventListener("keydown", (code) => {
       if (code.keyCode === 16 && code.shiftKey) {
@@ -852,9 +861,13 @@ export default {
         .catch(() => {});
     },
     //查询
-    select() {
+    async select(val) {
       this.loading = true;
       this.dataInfo();
+      if(val === 0){
+        this.page = 1;
+        this.formData.page = 1;
+      }
       findCargoAllocationData(this.formData)
         .then((res) => {
           this.loading = false;
@@ -999,9 +1012,9 @@ export default {
         }
       });
       data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
-      if (val.order != "ascending") {
+      if (val.order == "descending") {
         this.tableData = nullData.concat(data);
-      } else {
+      } else{
         this.tableData = data.concat(nullData);
       }
       this.tableData.forEach((item, index = 0) => {

@@ -59,7 +59,7 @@
       </el-form>
       <div slot="footer">
         <el-button @click="dialogBeforeClose">取 消</el-button>
-        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button type="primary" @click="submit" :loading="loading">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -119,6 +119,7 @@ export default {
           },
         ],
       },
+      loading:false,
     };
   },
   methods: {
@@ -132,6 +133,7 @@ export default {
     },
     //确定配舱
     submit() {
+      this.loading= true;
       let arr = [];
       this.tableData.forEach((item) => {
         arr.push(item.id);
@@ -146,6 +148,7 @@ export default {
               type: "success",
             });
             this.cleaerForm();
+            this.loading = false;
             this.$emit("dialogBeforeClose", { close: false, reload: true });
           } else if (res.code === 202) {
             MessageBox.confirm(res.msg, "提示", {
@@ -169,6 +172,7 @@ export default {
                   }
                 });
                 this.cleaerForm();
+                this.loading = false;
                 this.$emit("dialogBeforeClose", { close: false, reload: true });
               })
               .catch(() => {
@@ -178,19 +182,24 @@ export default {
                   type: "success",
                 });
                 this.cleaerForm();
+                this.loading = false;
                 this.$emit("dialogBeforeClose", {
                   close: false,
-                  reload: false,
+                  reload: true,
                 });
               });
           } else {
+            this.loading = false;
             this.$message({
               message: res.msg,
               type: "warning",
             });
           }
+        }).catch(()=>{
+          this.loading = false;
         });
       } else {
+        this.loading = false;
         this.$message({
           message: "航班号或航班日期不能为空",
           type: "warning",
@@ -199,7 +208,7 @@ export default {
     },
     dialogBeforeClose() {
       this.cleaerForm();
-      this.$emit("dialogBeforeClose", { close: false, reload: false });
+      this.$emit("dialogBeforeClose", { close: false, reload: true });
     },
   },
   computed: {

@@ -561,7 +561,9 @@ export default {
             this.isNeedRequired = info.isNeedRequired;
           }
           this.loading = false;
-        });
+        }).catch(()=>{
+            this.loading = false;
+          })
       } else {
         //货物信息
         findByFlightId(id).then((response) => {
@@ -600,7 +602,9 @@ export default {
               this.isNeedRequired = isNeedRequired;
             }
             this.loading = false;
-          });
+          }).catch(()=>{
+            this.loading = false;
+          })
         }
       }
     } else {

@@ -115,7 +115,7 @@
           </el-col>
 
           <el-col :span="24" style="margin-bottom: 5%;">
-            <span style="color: #ff4949;margin-left: 10%;">提示:配载航班之同请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br />
+            <span style="color: #ff4949;margin-left: 10%;">提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br />
             <span style="color: #ff4949;margin-left: 10%;">提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1;CZ433-1</span>
           </el-col>
           <el-col :span="24">

@@ -70,12 +70,12 @@
         </el-button>
       </el-col>
     </el-row> -->
-    <el-table max-height="550" highlight-current-row border stripe v-loading="loading" :data="findAllFltDatList" size="mini"
+    <el-table height="550" highlight-current-row border stripe v-loading="loading" :data="findAllFltDatList" size="mini"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="航班日期" align="center" prop="fltDate" width="120" />
       <el-table-column label="航班起飞时间" align="center" prop="takeOffTime" width="120" />
-      <el-table-column label="航班号" align="center" prop="fltNo" />
+      <el-table-column label="航班号" align="center" prop="fltNo" width="150"/>
       <el-table-column label="航班路线" align="center" prop="route" width="150" />
       <el-table-column label="航班类型" align="center" prop="typeName" width="100" />
       <el-table-column label="航班种类" align="center" prop="flightKindName" width="130" />
@@ -268,7 +268,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible">
+    <el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible" :close-on-click-modal="false" :append-to-body="true">
       <el-table :data="gridData">
         <el-table-column property="fltNo" label="航班号" width="150"></el-table-column>
         <el-table-column property="fltDate" label="航班日期" width="200"></el-table-column>
@@ -564,7 +564,7 @@
             Weight = this.Weightall();
           }
           //高价可配
-          if (this.form.highPriceWeightPercent > 0) {
+          if (this.form.highPriceWeightPercent >= 0) {
             this.$set(this.form, "lowPriceWeightPercent", 100-this.form.highPriceWeightPercent);
             this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
               .highPriceWeightPercent / 100));

@@ -213,7 +213,7 @@
           icon="el-icon-search"
           size="small"
           :loading="tableLoading"
-          @click="select"
+          @click="select(0)"
           >查询</el-button
         >
         <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
@@ -239,6 +239,7 @@
       :loading="tableLoading"
       :limitSize="limitSize"
       :limitStart="limitStart"
+      :page="page"
       :shiftKey="shiftKey"
       height="550"
       @tableSelect="tableSelect"
@@ -709,7 +710,7 @@ export default {
     };
   },
   created() {
-    //查询条件
+    // 查询条件
     findConditionData().then((res) => {
       if (res.code == 200) {
         this.findConditionData = res.data;
@@ -722,6 +723,19 @@ export default {
     });
   },
 
+  // activated(){
+  //   findConditionData().then((res) => {
+  //     if (res.code == 200) {
+  //       this.findConditionData = res.data;
+  //     } else {
+  //       this.$message({
+  //         message: "查询条件不存在",
+  //         type: "warning",
+  //       });
+  //     }
+  //   });
+  // },
+
   mounted() {
     window.addEventListener("keydown", (code) => {
       if (code.keyCode === 16 && code.shiftKey) {
@@ -740,12 +754,17 @@ export default {
       this.$refs.cargoForm.resetFields();
     },
     //查询
-    select() {
+    select(val) {
       this.tableData = [];
       this.allWeight = 0;
       this.allQty = 0;
       this.tableLoading = true;
       this.dataInfo();
+      if(val === 0){
+        this.formData.limitStart = 1;
+        this.limitStart = 1;
+        this.page = 1;
+      }
       findCargoData(this.formData).then((res) => {
           if (res.code == 200) {
             this.tableData = res.data.list;