Merge branch 'et86-black' into uat

Elements-SY
Commit b2d80a8ce0ec1679b3e7c5052b3abbbf04b6bbc3 b2d80a8c 2 parents d87af8a6 c7a6e894
Showing 5 changed files with 49 additions and 31 deletions
src/utils/mixins.js
src/views/allocationConfig/flightAllocConfig/components/RouteInfo.vue
src/views/allocationConfig/flightAllocConfig/flightRouteInfo/index.vue
src/views/allocationConfig/flightAllocConfig/mixins/index.js
src/views/et86Config/et86RuleConfig/edit/index.vue
--- a/src/utils/mixins.js
View file @b2d80a8
+++ b/src/utils/mixins.js
View file @b2d80a8
@@ -241,7 +241,7 @@ export const inputBlurValidate = {
       }
     },
     // 人民币最小申报价值
-    inputCNYBlurMin({ target }, customVal) {
+    inputCNYBlurMin({ target }) {
       // 申报价值最小值和最大值都为空的情况下
       if (
         this.queryForm.minCustomVal == "" &&
@@ -305,7 +305,7 @@ export const inputBlurValidate = {
       }
     },
     // 人民币最大申报价值
-    inputCNYBlurMax({ target }, customVal) {
+    inputCNYBlurMax({ target }) {
       // 申报价值最小值和最大值都为空的情况下
       if (
         this.queryForm.minCustomVal == "" &&
@@ -370,7 +370,7 @@ export const inputBlurValidate = {
       }
     },
     // 美元最小申报价值
-    inputSUDBlurMin({ target }, customVal) {
+    inputSUDBlurMin({ target }) {
       // 申报价值最小值和最大值都为空的情况下
       if (
         this.queryForm.minUsdCustomVal == "" &&
@@ -436,7 +436,7 @@ export const inputBlurValidate = {
       }
     },
     // 美元最大申报价值
-    inputSUDBlurMax({ target }, customVal) {
+    inputSUDBlurMax({ target }) {
       // 申报价值最小值和最大值都为空的情况下
       if (
         this.queryForm.minUsdCustomVal == "" &&
--- a/src/views/allocationConfig/flightAllocConfig/components/RouteInfo.vue
View file @b2d80a8
+++ b/src/views/allocationConfig/flightAllocConfig/components/RouteInfo.vue
View file @b2d80a8
@@ -97,7 +97,6 @@
                             <div class="form-item-error-block">
                               <span
                                 class="el-form-item__error"
-                                v-text="item.locationError"
                               ></span>
                             </div>
                           </el-col>
@@ -145,7 +144,6 @@
                             <div class="form-item-error-block">
                               <span
                                 class="el-form-item__error"
-                                v-text="item.destinationSiteError"
                               ></span>
                             </div>
                           </el-col>
@@ -165,7 +163,6 @@
                             </el-input>
                             <span
                               class="el-form-item__error"
-                              v-text="item.ursaError"
                             ></span>
                           </el-form-item>
                         </el-col>
@@ -183,7 +180,6 @@
                             <div class="form-item-error-block">
                               <span
                                 class="el-form-item__error"
-                                v-text="item.notUrsaError"
                               ></span>
                             </div>
                           </el-form-item>
@@ -468,7 +464,6 @@
   </div>
 </template>
 <script>
-// import { inputBlurValidate } from "@/utils/mixins";
 export default {
   name: "routeInfo",
   props: {
@@ -518,7 +513,6 @@ export default {
       default: false,
     },
   },
-  // mixins: [inputBlurValidate],
   data() {
     return {
       activeNames: [0], // 展开指定项
--- a/src/views/allocationConfig/flightAllocConfig/flightRouteInfo/index.vue
View file @b2d80a8
+++ b/src/views/allocationConfig/flightAllocConfig/flightRouteInfo/index.vue
View file @b2d80a8
@@ -208,7 +208,7 @@ export default {
         }
       }
       if (parmas.minNumOfPieces || parmas.maxNumOfPieces) {
-        if (!/^\d+$/.test(parmas.minNumOfPieces || parmas.maxNumOfPieces)) {
+        if (!/^[1-9]\d*$/.test(parmas.minNumOfPieces || parmas.maxNumOfPieces)) {
           this.msgWarning("请输入有效件数");
           return;
         }
@@ -225,10 +225,7 @@ export default {
           return;
         }
       }
-      /*
+      // 日期级别：航班顺位只取日期级别下的航线优先级顺位
-       日期级别：
-       处理routeSpecifyDateSeq
-      */
       if (item.createTime && this.queryForm.flightDate) {
         let routeSpecifyDate = this.routeSpecifyDateSeq.filter(
           (item) => item.etesRule == "N"
--- a/src/views/allocationConfig/flightAllocConfig/mixins/index.js
View file @b2d80a8
+++ b/src/views/allocationConfig/flightAllocConfig/mixins/index.js
View file @b2d80a8
@@ -708,6 +708,7 @@ export default {
         this.routeList.map((item) => {
           routes.push(item.route);
         });
+        // 与routesStr不同的是，routeSpecifyDateSeq属性值作为传参使用
         routeRuleForm.routeSpecifyDateSeq = routes.join(";");
       }
     },
@@ -939,9 +940,22 @@ export default {
       };
       // this.validateParmas(validateData);
     },
-    // 最少件数失焦事件
+    // 最少件数失焦事件：件数和重量可以拿ET86维度规则设置的校验逻辑使用
     minNumOfPiecesBur({ index, item }) {
       // console.log("minNumOfPiecesBur", index, item);
+      const validateData = {
+        reg: /^[1-9]\d*$/,
+        index: index,
+        ursaMark: false,
+        minNumOfPieces: item.minNumOfPieces,
+        maxNumOfPieces: item.maxNumOfPieces,
+        errorMsgAttr: "pieceError",
+        validateForm: false, // form表单节流阀
+        errorMsg: {
+          invalid: "请输入有效件数",
+          error: "最小件数不得大于最大件数",
+        },
+      };
     },
     // 最多件数失焦事件
     maxNumOfPiecesBur({ index, item }) {
@@ -950,6 +964,19 @@ export default {
     // 最小重量失焦事件
     minWeightBur({ index, item }) {
       // console.log("minWeightBur", index, item);
+      const validateData = {
+        reg: /^(0|[1-9]\d*)(.\d{1,5})?$/,
+        index: index,
+        ursaMark: false,
+        minWeight: item.minWeight,
+        maxWeight: item.maxWeight,
+        errorMsgAttr: "weightError",
+        validateForm: false, // form表单节流阀
+        errorMsg: {
+          invalid: "请输入有效重量，小数保留5位",
+          error: "最小重量不得大于最大重量",
+        },
+      };
     },
     // 最大重量失焦事件
     maxWeightBur({ index, item }) {
--- a/src/views/et86Config/et86RuleConfig/edit/index.vue
View file @b2d80a8
+++ b/src/views/et86Config/et86RuleConfig/edit/index.vue
View file @b2d80a8
@@ -361,7 +361,7 @@
                   <el-input
                     v-model.trim="queryForm.minCustomVal"
                     placeholder="最小申报价值"
-                    @blur="inputCNYBlurMin($event, 'minCNYCustomVal')"
+                    @blur="inputCNYBlurMin($event)"
                     :disabled="!getRouter"
                   ></el-input>
                   <span
@@ -374,7 +374,7 @@
                   <el-input
                     v-model.trim="queryForm.maxCustomVal"
                     placeholder="最大申报价值"
-                    @blur="inputCNYBlurMax($event, 'maxCNYCustomVal')"
+                    @blur="inputCNYBlurMax($event)"
                     :disabled="!getRouter"
                   ></el-input>
                 </el-col>
@@ -387,7 +387,7 @@
                   <el-input
                     v-model.trim="queryForm.minUsdCustomVal"
                     placeholder="最小申报价值"
-                    @blur="inputSUDBlurMin($event, 'minSUDCustomVal')"
+                    @blur="inputSUDBlurMin($event)"
                     :disabled="!getRouter"
                   ></el-input>
                   <span
@@ -400,7 +400,7 @@
                   <el-input
                     v-model.trim="queryForm.maxUsdCustomVal"
                     placeholder="最大申报价值"
-                    @blur="inputSUDBlurMax($event, 'maxSUDCustomVal')"
+                    @blur="inputSUDBlurMax($event)"
                     :disabled="!getRouter"
                   ></el-input>
                 </el-col>
@@ -521,7 +521,6 @@ export default {
       ];
     }
   },
-  mounted() {},
   methods: {
     // ET86新增
     postAdd(params) {
@@ -617,13 +616,14 @@ export default {
     getAllDictData() {
       allDictData()
         .then((res) => {
-          if (res.code != 200) {
+          const { code, data, msg } = res;
-            this.msgError(res.msg);
+          if (code != 200) {
+            this.msgError(msg);
             return;
           }
-          this.cargoType = res.data.cargoType; // 申报类别
+          this.cargoType = data.cargoType; // 申报类别
-          if (res.data.serviceCode.length) {
+          if (data.serviceCode.length) {
-            this.getObj(res.data); // 获取serviceCode字典
+            this.getObj(data); // 获取serviceCode字典
           }
         })
         .catch(() => {});
@@ -635,8 +635,9 @@ export default {
       queryRouteByFltNo(item)
         .then((res) => {
           this.tableAttr.tableLoading = false;
-          if (res.code == 200) {
+          const { code, data, msg } = res;
-            const list = res.data.list;
+          if (code == 200) {
+            const list = data.list;
             if (list.length) {
               let isEtesRoute = list.filter((item) => item.isEtesRoute == "Y"); // 过滤普通航线
               if (isEtesRoute.length == 0) {
@@ -753,9 +754,6 @@ export default {
         this.queryForm.originOfFlightNo
       );
     },
-    /*
-       如果是编辑，那么添加航班顺位时
-    */
     // 表单提交
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
@@ -773,9 +771,11 @@ export default {
             // if (item.hasOwnProperty("statusMark")) {
             //   delete item.id;
             // }
+            // // 航线列表
             if (item.hasOwnProperty("routeList")) {
               delete item.routeList;
             }
+            // 排序字段
             item.priority = ++i;
             return item;
           });