Merge branch 'et86' into 2023-08-14

@@ -161,7 +161,6 @@ export default {
           this.$refs.tableRef.$refs.bodyWrapper.children[0].children[1]
             .children[0].clientHeight;
         this.trHeight = trEl;
-        // console.log(this);
       });
     }, 800),
 

@@ -53,7 +53,7 @@
                   :disabled="scope.row.edit | isEdit"
                   min="-7"
                   max="7"
-                  v-on:keyup.enter="value = value.replace(/^-?[0-9]\d*$/, '')"
+                  v-input-filter
                   clearable
                   placeholder=""
                 />
@@ -417,6 +417,36 @@ export default {
     this.PostFindDestinationFltRuleByFlightNo();
   },
   mounted() {},
+  directives: {
+    "input-filter": {
+      bind: function (el, binding) {
+        el.handler = function (event) {
+          let regExp = /[^0-9a-zA-Z_]/g;
+          let newValue = event.target.value.replace(regExp, "");
+          if (newValue !== event.target.value) {
+            event.target.value = newValue;
+            event.target.dispatchEvent(new Event("input"));
+          }
+        };
+        el.addEventListener("input", el.handler);
+      },
+      unbind: function (el) {
+        el.removeEventListener("input", el.handler);
+      },
+      /*
+         -7 +7
+         0~7
+         或者 空
+         不能输入小数点
+         Math.abs(-7);
+         不能输入和选择未来日期，
+         不能输入和选择历史日期,
+         选择时间范围,
+         只能输入四位正整数，不能够有小数点,
+         只能输入四位正整数保留3位小数,
+      */
+    },
+  },
   filters: {
     isEdit: function (value) {
       switch (value) {
@@ -467,8 +497,8 @@ export default {
             list.map((item) => {
               routeList.push(item);
             });
-            let isEtesRoute = list.filter(item=>item.isEtesRoute == "Y"); // 过滤普通航线
-            if(isEtesRoute.length == 0){
+            let isEtesRoute = list.filter((item) => item.isEtesRoute == "Y"); // 过滤普通航线
+            if (isEtesRoute.length == 0) {
               this.msgError("该航班下的航线均为普通航线");
             }
             this.tableData[this.currentIndex].fltRoute = "";

@@ -33,7 +33,6 @@ export default {
         }
     },
     created() {
-        console.log(this.$route)
         this.tableData = this.$route.query.data
         this.fromRoute = this.$route.query.from
     },

@@ -85,7 +85,7 @@ export default {
       roleFormDisabled: false,
       tableLoading: false,
       total: 0,
-      tableHeight: null
+      tableHeight: 300
     };
   },
   created() {
@@ -94,7 +94,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();

@@ -44,7 +44,7 @@
               v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{
                 scope.row.isValid == 1 ? "停用" : "启用"
               }}</el-button>
-            <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']" style="margin-top: 5px;margin-left: 0;">删除用户
+            <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']">删除用户
             </el-button>
           </template>
         </el-table-column>