bug修复

jinhui.wang
Commit 98269bd122b744a8b3b23b8181de3f839181f247 98269bd1 1 parent bb4d7c3a
Showing 5 changed files with 29 additions and 10 deletions
src/components/Table/index.vue
src/views/allocationConfig/cargoAllocation/info.vue
src/views/allocationConfig/flightAllocConfig/info.vue
src/views/allocationConfig/flightRandConfig/index.vue
src/views/basicInformation/flightInformationMaintenance/index.vue
--- a/src/components/Table/index.vue
View file @98269bd
+++ b/src/components/Table/index.vue
View file @98269bd
@@ -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,7 +202,11 @@ export default {
   created() {
     this.newHeader = this.headerData;
   },
-  mounted() {},
+  watch:{
+    page(){
+      this.pageNum = this.page;
+    }
+  },
   methods: {
     nextClick() {
       this.$emit("currentChange", {
--- a/src/views/allocationConfig/cargoAllocation/info.vue
View file @98269bd
+++ b/src/views/allocationConfig/cargoAllocation/info.vue
View file @98269bd
@@ -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: {
--- a/src/views/allocationConfig/flightAllocConfig/info.vue
View file @98269bd
+++ b/src/views/allocationConfig/flightAllocConfig/info.vue
View file @98269bd
@@ -557,7 +557,9 @@ export default {
             this.isNeedRequired = info.isNeedRequired;
           }
           this.loading = false;
-        });
+        }).catch(()=>{
+            this.loading = false;
+          })
       } else {
         //货物信息
         findByFlightId(id).then((response) => {
@@ -596,7 +598,9 @@ export default {
               this.isNeedRequired = isNeedRequired;
             }
             this.loading = false;
-          });
+          }).catch(()=>{
+            this.loading = false;
+          })
         }
       }
     } else {
--- a/src/views/allocationConfig/flightRandConfig/index.vue
View file @98269bd
+++ b/src/views/allocationConfig/flightRandConfig/index.vue
View file @98269bd
@@ -278,7 +278,7 @@
           <el-col :span="24" style="margin-bottom: 5%">
             <span style="color:#ff4949; margin-left: 10%"
-              >提示:配载航班之同请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span
+              >提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span
             ><br />
             <span style="color:#ff4949; margin-left: 10%"
               >提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1;CZ433-1</span
--- a/src/views/basicInformation/flightInformationMaintenance/index.vue
View file @98269bd
+++ b/src/views/basicInformation/flightInformationMaintenance/index.vue
View file @98269bd
@@ -155,7 +155,7 @@
       </el-col>
     </el-row> -->
     <el-table
-      max-height="550"
+      height="550"
       highlight-current-row
       border
       stripe
@@ -177,7 +177,7 @@
         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="航班类型"
@@ -573,6 +573,7 @@
       width="40%"
       center
       :visible.sync="dialogTableVisible"
+      :close-on-click-modal="false" :append-to-body="true"
     >
       <el-table :data="gridData">
         <el-table-column
@@ -922,7 +923,7 @@ export default {
           Weight = this.Weightall();
         }
         //高价可配
-        if (this.form.highPriceWeightPercent > 0) {
+        if (this.form.highPriceWeightPercent >= 0) {
           this.$set(
             this.form,
             "lowPriceWeightPercent",