Merge branch 'test' into uat

+export const inputBlurValidate = {
+  data(){
+    return {
+      queryForm: {
+        minWeight: "",
+        maxWeight: "",
+        minNumOfPieces: "",
+        maxNumOfPieces: "",
+      },
+    };
+  },
+  methods: {
+    // 最小件数失焦事件
+    inputBlurMinPieces({ target }) {
+      this.validateNumOfPieces(target.value, "minNumOfPieces");
+    },
+    // 最大件数失焦事件
+    inputBlurMaxPieces({ target }) {
+      this.validateNumOfPieces(target.value, "maxNumOfPieces");
+    },
+    // 最小重量失焦事件
+    inputBlurMinWeight({ target }) {
+      this.validateWeight(target.value, "minWeight");
+    },
+    // 最大重量失焦事件
+    inputBlurMaxWeight({ target }) {
+      this.validateWeight(target.value, "maxWeight");
+    },
+    // 最小申报价值
+    inputBlurMin({ target }, customVal) {
+      this.validateCustomVal(target.value, customVal);
+    },
+    // 最大申报价值
+    inputBlurMax({ target }, customVal) {
+      this.validateCustomVal(target.value, customVal);
+    },
+    // 校验件数方法 【件数可以为空但件数不得为0】只能输入正整数
+    validateNumOfPieces(value, pieces) {
+      if (value.length) {
+        this.queryForm[pieces] = Number(value);
+        let markPieces = false;
+        if (pieces == "minNumOfPieces" || pieces == "maxNumOfPieces") {
+          if (this.queryForm.minNumOfPieces && this.queryForm.maxNumOfPieces) {
+            markPieces = Number(this.queryForm.maxNumOfPieces) < Number(this.queryForm.minNumOfPieces);
+          }
+        }
+        if (/^\d+$/.test(this.queryForm[pieces])) {
+          if (markPieces) {
+            if (this.queryForm.maxNumOfPieces < this.queryForm.minNumOfPieces) {
+              if (Array.isArray(this.$refs.minNumOfPieces)) {
+                this.msgError("最小件数不得大于最大件数");
+              } else {
+                this.$refs.minNumOfPieces.innerHTML = "";
+                this.$refs.minNumOfPieces.innerHTML = "最小件数不得大于最大件数";
+              }
+            } else if (
+              this.queryForm.minNumOfPieces < 1 || this.queryForm.maxNumOfPieces < 1
+            ) {
+              if (Array.isArray(this.$refs.minNumOfPieces)) {
+                this.msgError("最小件数和最大件数不能小于1");
+              } else {
+                this.$refs.minNumOfPieces.innerHTML = "";
+                this.$refs.minNumOfPieces.innerHTML = "最小件数和最大件数不能小于1";
+              }
+            } else {
+              if (!Array.isArray(this.$refs.minNumOfPieces)) {
+                this.$refs.minNumOfPieces.innerHTML = "";
+              }
+            }
+          } else {
+            if (value.length) {
+              if (Number(value) < 1) {
+                if (Array.isArray(this.$refs.minNumOfPieces)) {
+                  this.msgError("件数不得小于1");
+                } else {
+                  this.$refs.minNumOfPieces.innerHTML = "";
+                  this.$refs.minNumOfPieces.innerHTML = "件数不得小于1";
+                }
+              } else {
+                if (!Array.isArray(this.$refs.minNumOfPieces)) {
+                  this.$refs.minNumOfPieces.innerHTML = "";
+                }
+              }
+            }
+          }
+        } else {
+          if (Array.isArray(this.$refs.minNumOfPieces)) {
+            this.msgError("请输入有效件数");
+          } else {
+            this.$refs.minNumOfPieces.innerHTML = "";
+            this.$refs.minNumOfPieces.innerHTML = "请输入有效件数";
+          }
+          return false;
+        }
+      }
+    },
+    // 校验重量方法 【重量可以为空为0 && 最小/大重量的范围0~34KG】允许保留1~5位小数。
+    validateWeight(value, weight) {
+      if (value.length) {
+        this.queryForm[weight] = Number(value);
+        let markWeight = false;
+        if (weight == "minWeight" || weight == "maxWeight") {
+          if (this.queryForm.minWeight && this.queryForm.maxWeight) {
+            markWeight = Number(this.queryForm.maxWeight) < Number(this.queryForm.minWeight);
+          }
+        }
+        if (/^(0|[1-9]\d*)(.\d{1,5})?$/.test(this.queryForm[weight])) {
+          if (this.queryForm[weight] >= 0) {
+            if (markWeight) {
+              if (Array.isArray(this.$refs.minWeight)) {
+                this.msgError("最小重量不得大于最大重量");
+              } else {
+                this.$refs.minWeight.innerHTML = "";
+                this.$refs.minWeight.innerHTML = "最小重量不得大于最大重量";
+              }
+            } else if (this.queryForm[weight] > 34) {
+              if (Array.isArray(this.$refs.minWeight)) {
+                this.msgError("最大重量不能大于34KG");
+              } else {
+                this.$refs.minWeight.innerHTML = "";
+                this.$refs.minWeight.innerHTML = "最大重量不能大于34KG";
+              }
+            } else {
+              if (!Array.isArray(this.$refs.minWeight)) {
+                this.$refs.minWeight.innerHTML = "";
+              }
+            }
+          } else {
+            if (value.length) {
+              if (Number(value) > 34) {
+                if (Array.isArray(this.$refs.minWeight)) {
+                  this.msgError("最大重量不能大于34KG");
+                } else {
+                  this.$refs.minWeight.innerHTML = "";
+                  this.$refs.minWeight.innerHTML = "最大重量不能大于34KG";
+                }
+              } else {
+                if (!Array.isArray(this.$refs.minWeight)) {
+                  this.$refs.minWeight.innerHTML = "";
+                }
+              }
+            }
+          }
+        } else {
+          if (Array.isArray(this.$refs.minWeight)) {
+            this.msgError("请输入正整数，小数保留5位");
+          } else {
+            this.$refs.minWeight.innerHTML = "";
+            this.$refs.minWeight.innerHTML = "请输入正整数，小数保留5位";
+          }
+          return false;
+        }
+      }
+    },
+    // 报价值【申报价值可以为空为0】
+    validateCustomVal(value, customVal) {
+      if (value.length) {
+        this.queryForm[customVal] = Number(value);
+        let coin = {
+          minCNYCustomVal: "minCNYCustomVal",
+          maxCNYCustomVal: "minCNYCustomVal",
+          minSUDCustomVal: "minSUDCustomVal",
+          maxSUDCustomVal: "minSUDCustomVal",
+        };
+        let currency = {
+          minCNYCustomVal: 2000,
+          maxCNYCustomVal: 2000,
+          minSUDCustomVal: 600,
+          maxSUDCustomVal: 600,
+        };
+        let markCoin = false;
+        if (customVal == "minCNYCustomVal" || customVal == "maxCNYCustomVal") {
+          if (this.queryForm.minCNYCustomVal && this.queryForm.maxCNYCustomVal) {
+            markCoin = Number(this.queryForm.maxCNYCustomVal) < Number(this.queryForm.minCNYCustomVal);
+          }
+        } else {
+          if (this.queryForm.minSUDCustomVal && this.queryForm.maxSUDCustomVal) {
+            markCoin = Number(this.queryForm.maxSUDCustomVal) < Number(this.queryForm.minSUDCustomVal);
+          }
+        }
+        if (/^(0|[1-9]\d*)(.\d{1,2})?$/.test(this.queryForm[customVal])) {
+          if (this.queryForm[customVal] >= 0) {
+            if (markCoin) {
+              this.$refs[coin[customVal]].innerHTML = "";
+              this.$refs[coin[customVal]].innerHTML = "最小申报价值不得大于最大申报价值";
+            } else if (this.queryForm[customVal] > currency[customVal]) {
+              this.$refs[coin[customVal]].innerHTML = "";
+              this.$refs[coin[customVal]].innerHTML = `最大申报值不得大于${currency[customVal]}`;
+            } else {
+              this.$refs[coin[customVal]].innerHTML = "";
+            }
+          } else {
+            if (value.length) {
+              if (Number(value) > currency[customVal]) {
+                this.$refs[coin[customVal]].innerHTML = "";
+                this.$refs[coin[customVal]].innerHTML = `最大申报值不得大于${currency[customVal]}`;
+              } else {
+                this.$refs[coin[customVal]].innerHTML = "";
+              }
+            }
+          }
+        } else {
+          this.$refs[coin[customVal]].innerHTML = "";
+          this.$refs[coin[customVal]].innerHTML = "请输入正确申报价值";
+          return false;
+        }
+      }
+    },
+  },
+};

@@ -303,7 +303,7 @@ export default {
         this.shiftKey = false;
       }
     });
-    // this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60;
+    this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60;
   },
   methods: {
     //查询条件

@@ -71,7 +71,11 @@
               align="center"
             >
               <template slot-scope="scope">
-                <el-select v-model="scope.row.fltRoute" placeholder="请选择" size="small">
+                <el-select
+                  v-model="scope.row.fltRoute"
+                  placeholder="请选择"
+                  size="small"
+                >
                   <el-option
                     v-for="item in scope.row.routeList"
                     :key="item.id"
@@ -231,7 +235,7 @@
                     v-model.trim="queryForm.minWeight"
                     clearable
                     placeholder="最小重量"
-                    @blur="inputBlur('minWeight')"
+                    @blur="inputBlurMinWeight($event)"
                   ></el-input>
                   <span ref="minWeight" class="el-form-item__error"></span>
                 </el-col>
@@ -241,7 +245,7 @@
                     v-model.trim="queryForm.maxWeight"
                     clearable
                     placeholder="最大重量"
-                    @blur="inputBlur('maxWeight')"
+                    @blur="inputBlurMaxWeight($event)"
                   ></el-input>
                 </el-col>
               </el-form-item>
@@ -254,7 +258,7 @@
                     v-model.trim="queryForm.minNumOfPieces"
                     clearable
                     placeholder="最少件数"
-                    @blur="inputBlur('minNumOfPieces')"
+                    @blur="inputBlurMinPieces($event)"
                   ></el-input>
                   <span ref="minNumOfPieces" class="el-form-item__error"></span>
                 </el-col>
@@ -264,7 +268,7 @@
                     v-model.trim="queryForm.maxNumOfPieces"
                     clearable
                     placeholder="最多件数"
-                    @blur="inputBlur('maxNumOfPieces')"
+                    @blur="inputBlurMaxPieces($event)"
                   ></el-input>
                 </el-col>
               </el-form-item>
@@ -283,7 +287,7 @@
                     v-model.trim="queryForm.minCNYCustomVal"
                     clearable
                     placeholder="最小申报价值"
-                    @blur="inputBlur('minCNYCustomVal')"
+                    @blur="inputBlurMin($event, 'minCNYCustomVal')"
                   ></el-input>
                   <span
                     ref="minCNYCustomVal"
@@ -296,7 +300,7 @@
                     v-model.trim="queryForm.maxCNYCustomVal"
                     clearable
                     placeholder="最大申报价值"
-                    @blur="inputBlur('maxCNYCustomVal')"
+                    @blur="inputBlurMax($event, 'maxCNYCustomVal')"
                   ></el-input>
                 </el-col>
               </el-form-item>
@@ -308,7 +312,7 @@
                     v-model.trim="queryForm.minSUDCustomVal"
                     clearable
                     placeholder="最小申报价值"
-                    @blur="inputBlur('minSUDCustomVal')"
+                    @blur="inputBlurMin($event, 'minSUDCustomVal')"
                   ></el-input>
                   <span
                     ref="minSUDCustomVal"
@@ -321,7 +325,7 @@
                     v-model.trim="queryForm.maxSUDCustomVal"
                     clearable
                     placeholder="最大申报价值"
-                    @blur="inputBlur('maxSUDCustomVal')"
+                    @blur="inputBlurMax($event, 'maxSUDCustomVal')"
                   ></el-input>
                 </el-col>
               </el-form-item>
@@ -345,6 +349,7 @@ import YlForm from "@/components/YlForm";
 import YlTable from "@/components/YlTable";
 import { formConfig } from "./formConfig";
 import { debounce } from "@/utils";
+import { inputBlurValidate } from "@/utils/mixins";
 import { tableAttr } from "./tableConfig";
 import {
   allDictData, // 获取全部字典
@@ -358,7 +363,7 @@ export default {
     YlForm,
     YlTable,
   },
-  mixins: [indexMixins],
+  mixins: [indexMixins, inputBlurValidate],
   data() {
     return {
       formConfig: formConfig, // 表单配置项
@@ -372,10 +377,10 @@ export default {
         cargoType: [], // 申报类别调用接口获取所有的申报类别
         checkboxCargoType: [], // 已勾选申报类别的数据
         singleName: false, // 单品名
-        minWeight: null,
-        maxWeight: null,
-        minNumOfPieces: null,
-        maxNumOfPieces: null,
+        minWeight: "",
+        maxWeight: "",
+        minNumOfPieces: "",
+        maxNumOfPieces: "",
         minCNYCustomVal: "", //
         maxCNYCustomVal: "", //
         minSUDCustomVal: "", //
@@ -556,45 +561,6 @@ export default {
       this.queryForm.checkboxCargoType = include; //已勾选申报类别的数据
       // console.log(arr, include);
     },
-    // 重量、件数、申报值input失焦事件
-    inputBlur(name) {
-      let coin = {
-        minCNYCustomVal: "CNY",
-        maxCNYCustomVal: "CNY",
-        minSUDCustomVal: "USD",
-        maxSUDCustomVal: "USD",
-      };
-      if (name == "minWeight") {
-        // 最小重量
-        this.validateMaxWeight("maxWeight");
-        this.validateMinWeight(name);
-      }
-      if (name == "maxWeight") {
-        // 最大重量
-        this.validateMinWeight("minWeight");
-        this.validateMaxWeight(name);
-      }
-      if (name == "minNumOfPieces") {
-        // 最小件数
-        this.validateMaxPieces("maxNumOfPieces");
-        this.validateMinPieces(name);
-      }
-      if (name == "maxNumOfPieces") {
-        // 最大件数
-        this.validateMinPieces("minNumOfPieces");
-        this.validateMaxPieces(name);
-      }
-      if (name == "minCNYCustomVal" || name == "minSUDCustomVal") {
-        // 最小申报值（CNY/USD）
-        this.validateMaxCustomVal(coin[name]);
-        this.validateMinCustomVal(coin[name]);
-      }
-      if (name == "maxCNYCustomVal" || name == "maxSUDCustomVal") {
-        // 最大申报值（CNY/USD）
-        this.validateMinCustomVal(coin[name]);
-        this.validateMaxCustomVal(coin[name]);
-      }
-    },
     // 表单提交
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
@@ -602,8 +568,8 @@ export default {
           let parmas = {
             fltInfoList: this.tableData,
             ...this.queryForm,
-          }
-          parmas.singleName = this.queryForm.singleName ? 'Y' : 'N'; // N为单品名，Y为多品名
+          };
+          parmas.singleName = this.queryForm.singleName ? "Y" : "N"; // N为单品名，Y为多品名
           console.log(parmas);
         } else {
           console.log("error submit!!");

@@ -106,7 +106,7 @@ export default {
     }
   },
   mounted() {
-    // this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200;
+    this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200;
   },
   activated() {
     this.getList()

@@ -249,7 +249,7 @@ export default {
     }
   },
   mounted() {
-    // this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200;
+    this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200;
   },
   activated() {
     this.findSourceFlightRules();

@@ -113,7 +113,7 @@ export default {
     }
   },
   mounted() {
-    // this.tableHeight = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300;
+    this.tableHeight = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300;
   },
   methods: {
     //搜索

@@ -502,7 +502,7 @@ export default {
         this.shiftKey = false;
       }
     });
-    // this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
+    this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
   },
   methods: {
     //输入航班号后

@@ -92,7 +92,7 @@ export default {
 
     },
     mounted() {
-        // this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
+        this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
         this.selection(1)
     },
     watch: {

@@ -92,7 +92,7 @@ export default {
 
     },
     mounted() {
-        // this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
+        this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
         this.selection(1)
     },
     watch: {

@@ -73,7 +73,7 @@ export default {
     created() {
     },
     mounted() {
-        // this.tableHeight = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200;
+        this.tableHeight = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200;
         this.selection(1)
     },
     watch: {

@@ -441,7 +441,7 @@ export default {
         this.shiftKey = false;
       }
     });
-    // this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
+    this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
   },
   watch: {
     $route: {
@@ -489,7 +489,7 @@ export default {
       }
     },
     formShow(val, oldVal) {
-      // this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120
+      this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120
     },
   },
   methods: {

@@ -109,7 +109,7 @@ export default {
   //   this.getFlight()
   // },
   mounted() {
-    // this.tableHeight = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350
+    this.tableHeight = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350
     this.getFlight()
   },
   methods: {

@@ -99,7 +99,7 @@ export default {
     created() {
     },
     mounted() {
-        // this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
+        this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
         this.selection(1)
     },
     activated() {

@@ -139,7 +139,7 @@ export default {
         this.selectOptionData()
     },
     mounted() {
-        // this.tableHeight = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150;
+        this.tableHeight = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150;
         this.select(0)
     },
     watch: {

@@ -100,7 +100,7 @@ export default {
     created() {
     },
     mounted() {
-        // this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
+        this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
         this.selection(1)
     },
     activated() {

@@ -3,7 +3,7 @@
         <el-card style="margin-bottom:10px">
             <!-- cardHeader -->
             <div slot="header" class="clearfix">
-                <span style="font-size:16px;font-weight:700">{{ (tableName == '航线' ? '航线' : tableName == 'Site' ? '始发站' :
+                <span style="font-size:16px;font-weight:700">{{ (tableName == '航线' ? '航线' : tableName == 'Site' ? '站点' :
                         tableName ==
                             '虚拟航班' ? '虚拟航班' : tableName.replace(/( |^)[a-z]/g, L => L.toUpperCase())) + "表"
                 }}</span>
@@ -220,7 +220,7 @@ export default {
         // }
     },
     mounted() {
-        // this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270
+        this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270
     },
     filters: {
       // 是否为ET86航线

@@ -86,7 +86,7 @@ export default {
     }
   },
   mounted() {
-    // this.tableHeight = window.innerHeight - this.$refs.selectionRoleForm.$el.offsetHeight - 250
+    this.tableHeight = window.innerHeight - this.$refs.selectionRoleForm.$el.offsetHeight - 250
   },
   activated() {
     this.selectRoleList();

@@ -80,7 +80,7 @@ export default {
     created() {
     },
     mounted() {
-        // this.tableHeight = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250
+        this.tableHeight = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250
         this.selection(1)
     },
     methods: {

@@ -113,7 +113,7 @@ export default {
     }
   },
   mounted() {
-    // this.tableHeight = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250;
+    this.tableHeight = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250;
   },
   activated() {
     this.selectUser();

@@ -64,7 +64,7 @@ export default {
         this.selectLog()
     },
     mounted() {
-        // this.tableHeight = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200
+        this.tableHeight = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200
     },
     methods: {
         selectLog(val) {

@@ -130,7 +130,7 @@ export default {
     this.data = [];
   },
   mounted() {
-    // this.tableHeight = window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
+    this.tableHeight = window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
   },
   methods: {
     //数据查询

@@ -109,7 +109,7 @@ export default {
         this.selectLog();
     },
     mounted() {
-        // this.tableHeight = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240
+        this.tableHeight = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240
     },
     methods: {
         getModule() {