bug修复

  let ductLabels = {
     "cargoRulesStatus":{
-        "1":"自动",
-        "2":"手动"
+        "1":"手动",
+        "2":"自动"
     }
 }
 

@@ -80,6 +80,7 @@
 	color:#6379bb;
 	border-bottom:1px solid #ddd;
 	margin:8px 10px 25px 10px;
+	padding-top:15px;
 	padding-bottom:5px;
 	.formItem {
 		width: 100%;

@@ -30,8 +30,8 @@
         :fixed="item.fixed"
         :show-overflow-tooltip="showOverflowTooltip"
         :sortable="item.sorTable"
-        header-align="center"
         :formatter="formatter"
+        header-align="center"
         :slotHeader="slotHeader"
         :key="index"
       >
@@ -188,7 +188,6 @@ export default {
     this.newHeader = this.headerData;
   },
   mounted() {
-    
   },
   methods: {
     nextClick() {
@@ -218,7 +217,11 @@ export default {
             this.selectTable.push(this.data[i]);
           }
         } else if (selection.includes(this.data[row.index])) {
-          for (i = this.start + 1; i <= end; i++) {
+          if(!selection.includes(this.data[this.start])){
+            this.$refs.tables.toggleRowSelection(this.data[this.start], true);
+            this.selectTable.push(this.data[this.start]);
+          }
+          for (i = this.start+1; i <= this.start+sum; i++) {
             this.$refs.tables.toggleRowSelection(this.data[i], true);
             this.selectTable.push(this.data[i]);
           }
@@ -254,7 +257,9 @@ export default {
       this.selectTable = []
       this.$refs.tables.clearSelection()
     },
-    // itemChange(val) {},
+    itemChange(val) {
+      console.log(val)
+    },
     // checkChange(val) {
     //   console.log(val);
     // },

@@ -67,7 +67,7 @@
 
 <script>
 import { allocationFlight } from "@/api/cargoSelect";
-import { MessageBox } from 'element-ui'
+import { MessageBox } from "element-ui";
 export default {
   props: {
     dialogVisible: {
@@ -82,10 +82,10 @@ export default {
   data() {
     return {
       formData: {
-        ids:[], 
+        ids: [],
         fltNo: undefined,
-        fltDate:undefined,
-        overweight:false
+        fltDate: undefined,
+        overweight: false,
       },
       cargoHeader: [
         { name: "口岸代码", value: "portName" },
@@ -96,101 +96,101 @@ export default {
         { name: "URSA", value: "ursa" },
         { name: "实际重量", value: "actualWeight" },
         { name: "件数", value: "qty" },
+        { name: "ACCS原航班号", value: "fltNoAccs" },
+        { name: "ACCS原航班日期", value: "fltDateAccs" },
         { name: "品名描述", value: "nameDescription" },
         { name: "是否自动", value: "cargoRulesStatus" },
         { name: "创建人", value: "createUserName" },
         { name: "创建时间", value: "createTime" },
       ],
-      fltHeader: [
-        { name: "航班日期", value: "fltDate" },
-        { name: "航班号", value: "fltNo" },
-        { name: "航班路线", value: "route" },
-        { name: "航班类型", value: "typeName" },
-        { name: "总重量", value: "totalWeight" },
-        { name: "额外增重百分比", value: "extraWeightPercent" },
-        { name: "已配重量", value: "alloctedWeight" },
-        { name: "配舱优先级", value: "priorityRuleName" },
-        { name: "是否开启高地价", value: "highLowPriceFlg" },
-        { name: "航班起飞时间", value: "takeOffTime" },
-        { name: "创建人", value: "createUserName" },
-        { name: "创建时间", value: "createTime" },
-      ],
-      rules:{
-          fltNo: [{
+      rules: {
+        fltNo: [
+          {
             required: true,
             message: "航班号不能为空",
-            trigger: "blur"
-          }],
-          fltDate: [{
+            trigger: "blur",
+          },
+        ],
+        fltDate: [
+          {
             required: true,
             message: "航班日期不能为空",
-            trigger: "change"
-          }],
-      }
+            trigger: "change",
+          },
+        ],
+      },
     };
   },
   methods: {
-    cleaerForm(){
-      this.formData={
-        ids:[], 
+    cleaerForm() {
+      this.formData = {
+        ids: [],
         fltNo: undefined,
-        fltDate:undefined,
-        overweight:false
-      }
+        fltDate: undefined,
+        overweight: false,
+      };
     },
     //确定配舱
     submit() {
       let arr = [];
-      this.tableData.forEach(item => {
-        arr.push(item.id)
+      this.tableData.forEach((item) => {
+        arr.push(item.id);
       });
       this.formData.ids = arr;
-      if(this.formData.fltNo && this.formData.fltDate){
-        allocationFlight(this.formData).then(res=>{//code 200 配舱成功 601 重量已满需要确认 其余code直接输出msg
-          if(res.code === 200){
+      if (this.formData.fltNo && this.formData.fltDate) {
+        allocationFlight(this.formData).then((res) => {
+          //code 200 配舱成功 601 重量已满需要确认 其余code直接输出msg
+          if (res.code === 200) {
             this.$message({
               message: "货物配舱成功",
               type: "success",
             });
-          }else if(res.code === 202){
-            MessageBox.confirm('航班配重已满，是否继续配舱？', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-              }
-            ).then(() => {
-              this.formData.overweight = true;//确定继续overweight变为true再次请求接口
-              allocationFlight(this.formData).then(res=>{
-                if(res.code === 200){
-                  this.$message({
-                    message: "货物配舱成功",
-                    type: "success",
-                  });
-                }else{
-                  this.$message({
-                    message: res.msg,
-                    type: "warning",
-                  });
-                }
+            this.cleaerForm();
+            this.$emit("dialogBeforeClose", { close: false, reload: true });
+          } else if (res.code === 202) {
+            MessageBox.confirm(res.msg, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            })
+              .then(() => {
+                this.formData.overweight = true; //确定继续overweight变为true再次请求接口
+                allocationFlight(this.formData).then((res) => {
+                  if (res.code === 200) {
+                    this.$message({
+                      message: "货物配舱成功",
+                      type: "success",
+                    });
+                  } else {
+                    this.$message({
+                      message: res.msg,
+                      type: "warning",
+                    });
+                  }
+                });
+                this.cleaerForm();
+                this.$emit("dialogBeforeClose", { close: false, reload: true });
               })
-              this.cleaerForm()
-              this.$emit("dialogBeforeClose", {close:false,reload:true});
-            }).catch(() => {//取消 取消当前配舱
-               this.$message({
+              .catch(() => {
+                //取消 取消当前配舱
+                this.$message({
                   message: "配舱已取消",
                   type: "success",
                 });
-                this.cleaerForm()  
-                this.$emit("dialogBeforeClose", {close:false,reload:false});       
-            });
-          }else{
+                this.cleaerForm();
+                this.$emit("dialogBeforeClose", {
+                  close: false,
+                  reload: false,
+                });
+              });
+          } else {
             this.$message({
               message: res.msg,
               type: "warning",
             });
           }
-        })
-      }else{
+        });
+      } else {
         this.$message({
           message: "航班号或航班日期不能为空",
           type: "warning",
@@ -198,8 +198,8 @@ export default {
       }
     },
     dialogBeforeClose() {
-      this.cleaerForm()
-      this.$emit("dialogBeforeClose", {close:false,reload:false});
+      this.cleaerForm();
+      this.$emit("dialogBeforeClose", { close: false, reload: false });
     },
   },
   computed: {

 <template>
-  <div style="margin: 40px" class="app-container">
+  <div>
     <el-form
       :inline="true"
       :model="queryParams"
-      class="demo-form-inline"
-      size="small"
+      class="form-header"
+      size="medium"
+      label-position="right"
+      label-width="auto"
     >
       <el-form-item label="航班号">
         <el-input
@@ -28,16 +30,18 @@
           >查询</el-button
         >
       </el-form-item>
+      <div>
+        <el-button
+          style="margin-bottom: 20px"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="$router.push({ name: 'flightAllocConfigAdd', params: { handle: 'add' } })"
+          >添加</el-button
+        >
+      </div>
     </el-form>
-    <el-button
-      style="margin-bottom: 20px"
-      type="primary"
-      icon="el-icon-plus"
-      size="mini"
-      @click="$router.push({ name: 'flightAllocConfigAdd', params: { handle: 'add' } })"
-      >添加</el-button
-    >
-    <el-table :data="flyList" v-loading="loading" size="small">
+    <el-table :data="flyList" v-loading="loading" size="small" highlight-current-row border stripe>
       <el-table-column
         prop="purposeOfFlightNo"
         label="航班号"
@@ -208,9 +212,13 @@ export default {
         .then(function () {
           return enableOrDisable(id, status);
         })
-        .then(() => {
-          this.getList();
-          this.msgSuccess(tip + "成功");
+        .then((res) => {
+          if (res.code != 200){
+            this.msgError(res.msg);
+          }else {
+            this.getList();
+            this.msgSuccess(tip + "成功");
+          }
         })
         .catch(function () {});
     },

@@ -62,16 +62,16 @@
                 form.minNumOfPieces == 0
                   ? (form.minNumOfPieces = undefined)
                   : form.minNumOfPieces
-              " :precision="0" :controls="false" style="width: 100%"></el-input-number>
+              " :precision="0" :controls="false" style="width: 100%" :min="1"></el-input-number>
           </el-col>
           <el-col style="text-align: center" :span="1">-</el-col>
           <el-col :span="3">
             <!-- <el-input v-model="form.maxNumOfPieces"></el-input> -->
             <el-input-number v-model="
                 form.maxNumOfPieces == 0
-                  ? (form.maxNumOfPieces = undefined)
+                  ? form.maxNumOfPieces=undefined
                   : form.maxNumOfPieces
-              " :precision="0" :controls="false" style="width: 100%" :min="form.minNumOfPieces + 1"></el-input-number>
+              " :precision="0" :controls="false" style="width: 100%" :min="form.minNumOfPieces"></el-input-number>
           </el-col>
         </el-form-item>
 
@@ -82,7 +82,7 @@
                 form.minWeight == 0
                   ? (form.minWeight = undefined)
                   : form.minWeight
-              " :precision="2" :controls="false" style="width: 100%"></el-input-number>
+              " :precision="2" :controls="false" style="width: 100%" :min="0.01"></el-input-number>
           </el-col>
           <el-col :span="1" style="text-align: center"><span>Kg</span></el-col>
           <el-col style="text-align: center" :span="1">-</el-col>
@@ -92,7 +92,7 @@
                 form.maxWeight == 0
                   ? (form.maxWeight = undefined)
                   : form.maxWeight
-              " :precision="2" :controls="false" style="width: 100%" :min="form.minWeight + 0.01"></el-input-number>
+              " :precision="2" :controls="false" style="width: 100%" :min="form.minWeight"></el-input-number>
           </el-col>
           <el-col :span="1" style="text-align: center"><span>Kg</span></el-col>
         </el-form-item>
@@ -398,10 +398,10 @@
                 info.subCategory.split(";") :
                 [];
               this.form = info;
-              if (info.location != null || info.location == "") {
-                this.isLocation = "1";
-              } else {
+              if (info.notLocation != null || info.notLocation == "") {
                 this.isLocation = "2";
+              } else {
+                this.isLocation = "1";
               }
               this.isNeedRequired = info.isNeedRequired;
             }
@@ -435,10 +435,10 @@
                 info.subCategory.split(";") :
                 [];
               this.form = info;
-              if (info.location != null || info.location == "") {
-                this.isLocation = "1";
-              } else {
+              if (info.notLocation != null || info.notLocation == "") {
                 this.isLocation = "2";
+              } else {
+                this.isLocation = "1";
               }
               let isNeedRequired = response.data.isNeedRequired;
               this.form.isNeedRequired = isNeedRequired;

 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true">
+  <div>
+    <el-form class="form-header" :model="queryParams" ref="queryForm" size="medium" :inline="true" label-position="right" label-width="auto">
 
       <el-form-item label="原航班">
-        <el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable class="formItem"></el-input>
+        <el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable></el-input>
         <!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> -->
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable>
           <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
         </el-select>
 
@@ -30,15 +30,13 @@
       </el-form-item>
       <br />
       <el-form-item>
-        <el-col :span="1.5">
-          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">添加规则</el-button>
-        </el-col>
-        &#12288; <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">添加规则</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
 
-    <el-table v-loading="loading" :data="sourceFlightRulesList">
+    <el-table v-loading="loading" height="550" :data="sourceFlightRulesList" highlight-current-row border stripe>
       <el-table-column type="index" label="序号" align="center">
         <template slot-scope="scope">{{ scope.$index + 1 }}</template>
       </el-table-column>
@@ -92,7 +90,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
         <el-row>
           <el-col :span="10">
             <el-form-item label="原航班" prop="sourceFlightNo">
@@ -219,7 +217,7 @@
         rules: {
           sourceFlightNo: [{
             required: true,
-            message: "原航班号不能为空",
+            message: "ACCS原航班号不能为空",
             trigger: "blur"
           }],
           flightRank: [{
@@ -361,7 +359,7 @@
         //校验原航班号非空
         if (this.queryParams.sourceFlightNo === null || this.queryParams.sourceFlightNo === undefined || this
           .queryParams.sourceFlightNo.trim() === '') {
-          this.$message.warning("原航班号为空");
+          this.$message.warning("ACCS原航班号为空");
           return
         }
         //校验原日期非空

 <template>
-  <div class="app-container">
+  <div>
     <el-form class="form-header" :model="queryParams" label-position="right" label-width="auto" size="medium">
       <el-row>
         <el-col :span="6">

 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="90px">
+  <div>
+    <el-form class="form-header" :model="queryParams" ref="queryForm" label-position="right" label-width="auto" size="medium">
       <el-row>
-        <el-col :span="8">
-
+        <el-col :span="6">
           <el-form-item label="航班日期从" prop="fltDateStart">
-            <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.fltDateStart" type="date" placeholder="选择日期">
+            <el-date-picker class="formItem" value-format="yyyy-MM-dd" v-model="queryParams.fltDateStart" type="date" placeholder="选择日期">
             </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" v-model="queryParams.fltDateEnd" type="date" placeholder="选择日期">
+            <el-date-picker class="formItem" value-format="yyyy-MM-dd" v-model="queryParams.fltDateEnd" type="date" placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="航班号" prop="fltNo">
-            <el-input v-model="queryParams.fltNo" placeholder="请输入航班号" clearable size="small" />
+            <el-input class="formItem" v-model="queryParams.fltNo" placeholder="请输入航班号" clearable />
           </el-form-item>
         </el-col>
 
-      </el-row>
-      <el-row>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="航班类型" prop="typeId">
-            <el-select v-model="queryParams.typeId" placeholder="请选择航班类型" clearable size="small">
+            <el-select class="formItem" v-model="queryParams.typeId" placeholder="请选择航班类型" clearable>
               <el-option v-for="dict in flightTypelist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
             </el-select>
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="航班状态" prop="statusId">
-            <el-select v-model="queryParams.statusId" placeholder="请选择航班状态" clearable size="small">
+            <el-select class="formItem" v-model="queryParams.statusId" placeholder="请选择航班状态" clearable>
               <el-option v-for="dict in flightStatuslist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
             </el-select>
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="航班种类" prop="flightKindId">
-            <el-select v-model="queryParams.flightKindId" placeholder="请选择航班种类" clearable size="small">
+            <el-select class="formItem" v-model="queryParams.flightKindId" placeholder="请选择航班种类" clearable>
               <el-option v-for="dict in flightKindlist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
             </el-select>
           </el-form-item>
@@ -51,14 +48,11 @@
 
       </el-row>
 
-      <br />
-      <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-        <el-button type="primary" icon="el-icon-circle-check" size="mini" @click="handleFlightStatus('flightStatus10')">航班开启</el-button>
-        <el-button type="primary" icon="el-icon-circle-close" size="mini" @click="handleFlightStatus('flightStatus80')">航班关闭</el-button>
-      </el-form-item>
+        <el-button type="primary" icon="el-icon-circle-check" size="mini" @click="handleFlightStatus('flightStatus10')">自动配舱开启</el-button>
+        <el-button type="primary" icon="el-icon-circle-close" size="mini" @click="handleFlightStatus('flightStatus80')">自动配舱关闭</el-button>
     </el-form>
     <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -132,7 +126,7 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true">
-      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
         <el-row>
           <el-col :span="12">
             <el-form-item label="航班号" prop="fltNo">
@@ -547,7 +541,6 @@
       },
       //计算高地价可配
       LowHighAvailable() {
-
         //判断是否开启高地价
          if (this.form.highLowPriceFlg) {
            this.ishighPriceWeightPercent=false;
@@ -562,21 +555,33 @@
             this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
               .highPriceWeightPercent / 100));
             // this.form.HighAvailableWeight = Weightall * (this.form.highPriceWeightPercent / 100)
-          } else {
+          }else if(this.title == "修改航班信息" && this.form.highPriceWeightPercent > 0){
+            if(this.form.highAvailableWeight){
+              this.$set(this.form, 'highAvailableWeight', this.form.highAvailableWeight)
+            }else{
+              this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
+              .highPriceWeightPercent / 100));
+            }
+          }else {
             this.$set(this.form, "highAvailableWeight", 0);
             // this.form.HighAvailableWeight = 0;
           }
           //低价可配
           if (this.form.lowPriceWeightPercent > 0) {
-
             this.$set(this.form, "lowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form
               .highAvailableWeight);
             //this.form.lowAvailableWeight = Weightall - this.form.HighAvailableWeight;
-          } else {
+          }else if(this.title == "修改航班信息" && this.form.lowPriceWeightPercent > 0){
+            if(this.form.lowAvailableWeight){
+              this.$set(this.form, 'lowAvailableWeight', this.form.lowAvailableWeight)
+            }else{
+              this.$set(this.form, "lowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form
+              .highAvailableWeight);
+            }
+          }else {
             this.$set(this.form, "lowAvailableWeight", 0);
             // this.form.lowAvailableWeight = 0;
           }
-
         }else{
            this.ishighPriceWeightPercent=true;
         }
@@ -587,7 +592,7 @@
         let Weight = 0;
         if (this.form.extraWeightPercent > 0) {
           Weight = this.form.originalWeight + this.form.originalWeight * (this.form.extraWeightPercent / 100)
-        } else {
+        }else {
           Weight = this.form.originalWeight;
         }
         return Weight;