页面状态更新样式修改

@@ -35,7 +35,7 @@
       >
         <div class="userName-wrapper">
           <!-- <img :src="avatar" class="user-avatar" /> -->
-          <span>欢迎！{{userName}}</span>
+          <span><i class="el-icon-user-solid" style="color:#1890ff"></i>欢迎！{{userName}}</span>
         </div>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item @click.native="logout">
@@ -212,6 +212,14 @@ export default {
     .avatar-container {
       text-align: center;
       margin-right: 15px;
+      font-weight: 700;
+      i{
+        display: inline-block;
+        height: 50px;
+        margin-right:5px;
+        font-size: 24px;
+        line-height: 50px;
+      }
       .userName-wrapper {
         position: relative;
         font-size:14px;

@@ -847,12 +847,16 @@ export default {
   },
   created() {
     this.seleData();
+    if(this.$store.state.tagsView.cachedViews.length == 0){
       this.select();
+    }
+  },
+  activated(){
+    this.select();
+  },
+  deactivated(){
+    this.tableData = []
   },
-  // activated(){
-  //   this.seleData();
-  //   this.select();
-  // },
   mounted() {
     window.addEventListener("keydown", (code) => {
       if (code.keyCode === 16 && code.shiftKey) {

@@ -152,9 +152,17 @@ export default {
       loading: false,
     };
   },
+  created() {
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.getList();
+    }
+  },
   activated(){
     this.getList()
   },
+  deactivated(){
+    this.flyList = []
+  },
   methods: {
     getList() {
       this.queryParams.limit = this.limit;

@@ -443,15 +443,16 @@ export default {
   },
   created() {
     this.queryParams.portName = this.$store.state.user.activePortName;
-    this.findSourceFlightRules();
     this.portNameList = this.$store.state.user.portNames;
-    this.form.portName = this.$store.state.user.activePortName;
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.findSourceFlightRules();
+    }
   },
   activated(){
-    this.queryParams.portName = this.$store.state.user.activePortName;
     this.findSourceFlightRules();
-    this.portNameList = this.$store.state.user.portNames;
-    this.form.portName = this.$store.state.user.activePortName;
+  },
+  deactivated(){
+    this.sourceFlightRulesList = []
   },
   watch:{
     open(val,oldVal){
@@ -499,7 +500,7 @@ export default {
       this.title = "添加原航班顺位规则";
       this.form.id = -1;
       this.dayOfWeek = [];
-      // this.form.portName = this.$store.state.user.activePortName;
+      this.form.portName = this.$store.state.user.activePortName;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

@@ -116,9 +116,6 @@
         this.uploadExcel(file);
       },
     },
-    created() {
-
-    },
   };
 </script>
 <style rel="stylesheet/scss" lang="scss">

 <template>
   <div>
-    <el-form class="form-header" :model="queryParams" ref="queryForm" label-position="right" label-width="auto" size="medium">
+    <el-form
+      class="form-header"
+      :model="queryParams"
+      ref="queryForm"
+      label-position="right"
+      label-width="auto"
+      size="medium"
+    >
       <el-row>
         <el-col :span="6">
           <el-form-item label="航班日期从" prop="fltDateStart">
-            <el-date-picker class="formItem" 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="6">
           <el-form-item label="到" prop="fltDateEnd">
-            <el-date-picker class="formItem" 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="6">
           <el-form-item label="航班号" prop="fltNo">
-            <el-input class="formItem" v-model="queryParams.fltNo" placeholder="请输入航班号" clearable />
+            <el-input
+              class="formItem"
+              v-model="queryParams.fltNo"
+              placeholder="请输入航班号"
+              clearable
+            />
           </el-form-item>
         </el-col>
-
         <el-col :span="6">
           <el-form-item label="航班类型" prop="typeId">
-            <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
+              class="formItem"
+              v-model="queryParams.typeId"
+              placeholder="请选择航班类型"
+              clearable
+            >
+              <el-option
+                v-for="dict in selectOption.flightTypelist"
+                :key="dict.id"
+                :label="dict.chineseName"
+                :value="dict.id"
+              />
             </el-select>
           </el-form-item>
         </el-col>
-
         <el-col :span="6">
           <el-form-item label="航班状态" prop="statusId">
-            <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
+              class="formItem"
+              v-model="queryParams.statusId"
+              placeholder="请选择航班状态"
+              clearable
+            >
+              <el-option
+                v-for="dict in selectOption.flightStatuslist"
+                :key="dict.id"
+                :label="dict.chineseName"
+                :value="dict.id"
+              />
             </el-select>
           </el-form-item>
         </el-col>
-
         <el-col :span="6">
           <el-form-item label="航班种类" prop="flightKindId">
-            <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
+              class="formItem"
+              v-model="queryParams.flightKindId"
+              placeholder="请选择航班种类"
+              clearable
+            >
+              <el-option
+                v-for="dict in selectOption.flightKindlist"
+                :key="dict.id"
+                :label="dict.chineseName"
+                :value="dict.id"
+              />
             </el-select>
           </el-form-item>
         </el-col>
-
       </el-row>
-
-        <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"  v-hasPermi="['base:flightInfo:add']">新增</el-button>
-        <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"  v-hasPermi="['base:flightInfo:delete']">删除
+      <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"
+        v-hasPermi="['base:flightInfo:add']"
+        >新增</el-button
+      >
+      <el-button
+        type="danger"
+        icon="el-icon-delete"
+        size="mini"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['base:flightInfo:delete']"
+        >删除
       </el-button>
-        <el-button type="primary" icon="el-icon-circle-check" size="mini" @click="handleFlightStatus('flightStatus10')" v-hasPermi="['base:flightInfo:open']">自动配舱开启</el-button>
-        <el-button type="primary" icon="el-icon-circle-close" size="mini" @click="handleFlightStatus('flightStatus80')" v-hasPermi="['base:flightInfo:close']">自动配舱关闭</el-button>
-
+      <el-button
+        type="primary"
+        icon="el-icon-circle-check"
+        size="mini"
+        @click="handleFlightStatus('flightStatus10')"
+        v-hasPermi="['base:flightInfo:open']"
+        >自动配舱开启</el-button
+      >
+      <el-button
+        type="primary"
+        icon="el-icon-circle-close"
+        size="mini"
+        @click="handleFlightStatus('flightStatus80')"
+        v-hasPermi="['base:flightInfo:close']"
+        >自动配舱关闭</el-button
+      >
+      <!-- <el-button type="primary" icon="el-icon-circle-check" size="mini">自动推送开启</el-button>
+        <el-button type="primary" icon="el-icon-circle-close" size="mini">自动推送关闭</el-button> -->
     </el-form>
-    <!-- <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate">修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple">删除
-        </el-button>
-      </el-col>
-    </el-row> -->
-    <el-table height="550" highlight-current-row border stripe v-loading="loading" :data="findAllFltDatList" size="mini"
-      @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="航班日期" align="center" prop="fltDate" width="120" />
-      <el-table-column label="航班起飞时间" align="center" prop="takeOffTime" width="120" />
-      <el-table-column label="航班号" align="center" prop="fltNo" width="150"/>
-      <el-table-column label="航班路线" align="center" prop="route" width="150" />
-      <el-table-column label="航班类型" align="center" prop="typeName" width="100" />
-      <el-table-column label="航班种类" align="center" prop="flightKindName" width="130" />
-      <el-table-column label="航班状态" align="center" prop="statusName" />
-      <el-table-column label="总重量" align="center" prop="totalWeight" width="130" />
-      <el-table-column label="原始重量（KG）" align="center" prop="originalWeight" width="130" />
-      <el-table-column label="总体积(cm³)" align="center" prop="totalVolume" width="130" />
-      <el-table-column label="是否限制一票一件" align="center" prop="ticketToPiece" width="150"
-        :formatter="ticketToPieceFormat" />
-      <el-table-column label="是否需要预审" align="center" prop="needRequired" width="150" :formatter="needRequiredFormat" />
-      <el-table-column label="额外增重百分比" align="center" prop="extraWeightPercent" width="150" />
-      <el-table-column label="高价百分比" align="center" prop="highPriceWeightPercent" width="150" />
-      <el-table-column label="低价百分比" align="center" prop="lowPriceWeightPercent" width="150" />
-      <el-table-column label="是否开启高地价" align="center" prop="highLowPriceFlg" width="150"
-        :formatter="highLowPriceFlgFormat" />
-      <el-table-column label="已配重量" align="center" prop="alloctedWeight" width="150" />
-      <el-table-column label="已配体积(cm³)" align="center" prop="alloctedVolume" width="150" />
-      <el-table-column label="航班优先级" align="center" prop="priorityName" width="150" />
-      <el-table-column label="配舱优先级" align="center" prop="priorityRuleName" width="150" />
-      <el-table-column label="创建人" align="center" prop="createUserName" width="120" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="155" />
-
-      <!-- <el-table-column label="创建时间" align="center" prop="createTime" width="155">
+    <Tables
+      ref="flightInfoTable"
+      :data="findAllFltDatList"
+      :headerData="tableHeader"
+      :infoData="tableHeader"
+      :totalCount="total"
+      :loading="loading"
+      :limitSize="queryParams.limitSize"
+      :page="queryParams.pageNum"
+      :shiftKey="shiftKey"
+      :infoShow="false"
+      :height="tableHeight"
+      @tableSelect="tableSelect"
+      @tableSelectAll="tableSelectAll"
+      @currentChange="currentChange"
+      @sortChange="sortChange"
+      @sizeChange="sizeChange"
+    >
+      <template>
+        <el-table-column
+          v-if="findAllFltDatList.length > 0"
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          fixed="right"
+        >
           <template slot-scope="scope">
-          <span>{{ renderTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="最后修改人" align="center" prop="lastModifyUserName" width="155" />
-      <!-- <el-table-column label="最后修改时间" align="center" prop="lastModifyTime" width="155">
-        <template slot-scope="scope">
-          <span>{{ renderTime(scope.row.lastModifyTime) }}</span>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="最后修改时间" align="center" prop="lastModifyTime" width="120" />
-
-      <el-table-column v-if="findAllFltDatList.length>0" label="操作" align="center"
-        class-name="small-padding fixed-width" width="130" fixed="right" style="top:0!important">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['base:flightInfo:update']">修改</el-button>
-         <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row,'删除')">
-            删除</el-button> -->
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['base:flightInfo:update']"
+              >修改</el-button
+            >
           </template>
         </el-table-column>
-    </el-table>
-
-    <pagination v-show="total>0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
-      :page.sync="queryParams.pageNum" :limit.sync="queryParams.limitSize" @pagination="findAllFltData" />
-
-
-
-
+      </template>
+    </Tables>
     <!-- 添加或修改对话框 -->
-    <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-position="right" label-width="auto">
+    <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-position="right"
+        label-width="auto"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="航班号" prop="fltNo">
-              <el-input @blur="blurfltNo" :disabled="formdisabled.fltNo" style="width:93%;" v-model="form.fltNo"
-                placeholder="请输入航班号" />
+              <el-input
+                @blur="blurfltNo"
+                :disabled="formdisabled.fltNo"
+                style="width: 93%"
+                v-model="form.fltNo"
+                placeholder="请输入航班号"
+                maxlength="10"
+              />
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="1"> &#12288;</el-col> -->
           <el-col :span="12">
             <el-form-item label="航班日期" prop="fltDate">
-
-              <el-date-picker :disabled="formdisabled.fltDate" clearable size="small" v-model="form.fltDate" type="date"
-                value-format="yyyy-MM-dd" placeholder="选择航班日期">
+              <el-date-picker
+                :disabled="formdisabled.fltDate"
+                clearable
+                size="small"
+                v-model="form.fltDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择航班日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
-
-
+          <!-- <el-col :span="12">
+            <el-form-item label="cutOff时间" prop="cutOffTime">
+              <el-select v-model="form.cutOffTime" clearable placeholder="选择时间" type="string">
+                <el-option
+                  v-for="item in selectOption.cutOffTime"
+                  :key="item"
+                  :label="item"
+                  :value="item">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="航班路线" prop="route">
-              <el-input style="width:93%" v-model="form.route" placeholder="请输入航班路线" />
+              <el-input
+                style="width: 93%"
+                v-model="form.route"
+                placeholder="请输入航班路线"
+              />
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="航班种类" prop="kindId">
               <el-select v-model="form.kindId" placeholder="请选择航班种类">
-                <el-option v-for="item in flightKindlist" :key="item.id" :label="item.chineseName" :value="item.id">
+                <el-option
+                  v-for="item in selectOption.flightKindlist"
+                  :key="item.id"
+                  :label="item.chineseName"
+                  :value="item.id"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -165,137 +259,516 @@
           <el-col :span="12">
             <el-form-item label="航班类型" prop="typeId">
               <el-select v-model="form.typeId" placeholder="请选择航班类型">
-                <el-option v-for="item in flightTypelist" :key="item.id" :label="item.chineseName" :value="item.id">
+                <el-option
+                  v-for="item in selectOption.flightTypelist"
+                  :key="item.id"
+                  :label="item.chineseName"
+                  :value="item.id"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="航班状态" prop="statusId">
-              <el-select :disabled="true" v-model="form.statusId" placeholder="请选择航班状态">
-                <el-option v-for="item in flightStatuslist" :key="item.id" :label="item.chineseName" :value="item.id">
+              <el-select
+                :disabled="true"
+                v-model="form.statusId"
+                placeholder="请选择航班状态"
+              >
+                <el-option
+                  v-for="item in selectOption.flightStatuslist"
+                  :key="item.id"
+                  :label="item.chineseName"
+                  :value="item.id"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="原始重量（KG）" prop="originalWeight">
-              <el-input-number @change="LowHighAvailable" placeholder="请输入原始重量（KG）" style="width:93%"
-                v-model="form.originalWeight"></el-input-number>
+              <el-input-number
+                @change="LowHighAvailable"
+                placeholder="请输入原始重量（KG）"
+                style="width: 93%"
+                v-model="form.originalWeight"
+              ></el-input-number>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="额外增重百分比" prop="extraWeightPercent">
-              <el-input-number @change="LowHighAvailable" placeholder="请输入额外增重百分比" style="width:93%"
-                v-model="form.extraWeightPercent"></el-input-number>
+              <el-input-number
+                @change="LowHighAvailable"
+                placeholder="请输入额外增重百分比"
+                style="width: 93%"
+                v-model="form.extraWeightPercent"
+              ></el-input-number>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="是否开启高低价" prop="highLowPriceFlg">
-              <el-switch @change='LowHighAvailable' v-model="form.highLowPriceFlg" active-color="#13ce66">
+              <el-switch
+                @change="LowHighAvailable"
+                v-model="form.highLowPriceFlg"
+                :active-value="1"
+                :inactive-value="0"
+                active-color="#13ce66"
+              >
               </el-switch>
             </el-form-item>
           </el-col>
-
-          <!-- 是否需要预审，1：预审，0：取消预审 -->
           <el-col :span="12">
             <el-form-item label="是否预审" prop="isNeedRequired">
-              <el-switch :disabled="true" v-model="form.isNeedRequired" active-color="#13ce66">
+              <el-switch
+                :disabled="true"
+                v-model="form.isNeedRequired"
+                :active-value="1"
+                :inactive-value="0"
+                active-color="#13ce66"
+              >
               </el-switch>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="高价百分比" prop="highPriceWeightPercent">
-              <el-input-number :disabled="ishighPriceWeightPercent" @change="LowHighAvailable" placeholder="请输入高价百分比" style="width:93%"
-                v-model="form.highPriceWeightPercent"></el-input-number>
+              <el-input-number
+                :disabled="ishighPriceWeightPercent"
+                @change="LowHighAvailable"
+                placeholder="请输入高价百分比"
+                style="width: 93%"
+                v-model="form.highPriceWeightPercent"
+              ></el-input-number>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="低价百分比" prop="lowPriceWeightPercent">
-              <el-input-number :disabled="true" placeholder="请输入低价百分比" style="width:93%"
-                v-model="form.lowPriceWeightPercent"></el-input-number>
+              <el-input-number
+                :disabled="true"
+                placeholder="请输入低价百分比"
+                style="width: 93%"
+                v-model="form.lowPriceWeightPercent"
+              ></el-input-number>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="高价可配重量" prop="highAvailableWeight">
-
-              <el-input-number :disabled="true" placeholder="请输入高价可配重量" style="width:93%"
-                v-model="form.highAvailableWeight" :precision="2"></el-input-number>
+              <el-input-number
+                :disabled="true"
+                placeholder="请输入高价可配重量"
+                style="width: 93%"
+                v-model="form.highAvailableWeight"
+                :precision="2"
+              ></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="低价可配重量" prop="lowAvailableWeight">
-              <el-input-number :disabled="true" placeholder="请输入低价可配重量" style="width:93%"
-                v-model="form.lowAvailableWeight" :precision="2"></el-input-number>
+              <el-input-number
+                :disabled="true"
+                placeholder="请输入低价可配重量"
+                style="width: 93%"
+                v-model="form.lowAvailableWeight"
+                :precision="2"
+              ></el-input-number>
             </el-form-item>
           </el-col>
-
-
           <el-col :span="12">
             <el-form-item label="高价已配重量" prop="highAllocatedWeight">
-              <el-input-number :disabled="true" placeholder="请输入高价已配重量" style="width:93%"
-                v-model="form.highAllocatedWeight" :precision="2"></el-input-number>
+              <el-input-number
+                :disabled="true"
+                placeholder="请输入高价已配重量"
+                style="width: 93%"
+                v-model="form.highAllocatedWeight"
+                :precision="2"
+              ></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="低价已配重量" prop="lowAllocatedWeight">
-              <el-input-number :disabled="true" placeholder="请输入低价已配重量" style="width:93%"
-                v-model="form.lowAllocatedWeight" :precision="2"></el-input-number>
+              <el-input-number
+                :disabled="true"
+                placeholder="请输入低价已配重量"
+                style="width: 93%"
+                v-model="form.lowAllocatedWeight"
+                :precision="2"
+              ></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="已配总重量" prop="alloctedWeight">
-
-              <el-input-number :disabled="true" placeholder="请输入已配总重量" style="width:93%" v-model="form.alloctedWeight"
-                :precision="2"></el-input-number>
-
+              <el-input-number
+                :disabled="true"
+                placeholder="请输入已配总重量"
+                style="width: 93%"
+                v-model="form.alloctedWeight"
+                :precision="2"
+              ></el-input-number>
             </el-form-item>
           </el-col>
-
-
         </el-row>
-
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-    <el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible" :close-on-click-modal="false" :append-to-body="true">
+    <el-dialog
+      title="未删除成功航班"
+      width="40%"
+      center
+      :visible.sync="dialogTableVisible"
+      :close-on-click-modal="false"
+      :append-to-body="true"
+    >
       <el-table :data="gridData">
-        <el-table-column property="fltNo" label="航班号" width="150"></el-table-column>
-        <el-table-column property="fltDate" label="航班日期" width="200"></el-table-column>
-        <el-table-column property="alloctedWeight" label="已配重量" width="200"></el-table-column>
+        <el-table-column property="fltNo" label="航班号"></el-table-column>
+        <el-table-column property="fltDate" label="航班日期"></el-table-column>
+        <el-table-column
+          property="alloctedWeight"
+          label="已配重量"
+        ></el-table-column>
       </el-table>
     </el-dialog>
   </div>
 </template>
+
 <script>
-  import {
+import {
   delFlight,
   findFltConditionDataApi,
   findAllFltDataApi,
   findFltById,
   saveOrUpdate,
   findFltCommonConf,
-    updateStatusBatch
-
-  } from "@/api/findAllFltData";
-  export default {
+  updateStatusBatch,
+} from "@/api/findAllFltData";
+export default {
   name: "FlightInformationMaintenance",
   data() {
     return {
-        gridData:[],
-        dialogTableVisible: false,
-        //高价百分比是否打开
-        ishighPriceWeightPercent:true,
+      //查询参数
+      queryParams: {
+        limitStart: 0, //当前条数【代表第几条数据 +1开始】
+        pageNum: 1,
+        limitSize: 20, //一页显示多少条数据
+        fltDateStart: undefined, //航班日期开始
+        fltDateEnd: undefined, //航班日期结束
+        typeId: undefined, //航班类型
+        statusId: undefined, //航班状态
+        flightKindId: undefined, //航班种类
+        fltNo: undefined, //航班号，要大写
+      },
+      //表单参数
+      form: {},
+      //表单校验
+      rules: {
+        fltNo: [
+          {
+            required: true,
+            message: "ACCS原航班号不能为空",
+            trigger: "blur",
+          },
+        ],
+        fltDate: [
+          {
+            required: true,
+            message: "航班日期不能为空",
+            trigger: "blur",
+          },
+        ],
+        kindId: [
+          {
+            required: true,
+            message: "航班种类不能为空",
+            trigger: "change",
+          },
+        ],
+        originalWeight: [
+          {
+            required: true,
+            message: "原始重量（KG）不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      //原航班规则数据
+      findAllFltDatList: [],
+      //表头
+      tableHeader: [
+        {
+          type: "selection",
+          name: "",
+          value: "",
+          width: "50",
+          align: "center",
+          sorTable: false,
+          fixed: true,
+          disabled: true,
+        },
+        {
+          type: "index",
+          name: "",
+          value: "",
+          width: "50",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "航班日期",
+          value: "fltDate",
+          width: "100",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "航班起飞时间",
+          value: "takeOffTime",
+          width: "120",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        // {
+        //   type: "",
+        //   name: "cutOff时间",
+        //   value: "cutOffTime",
+        //   width: "110",
+        //   align: "center",
+        //   sorTable: false,
+        //   fixed: false,
+        //   disabled:true
+        // },
+        {
+          type: "",
+          name: "航班号",
+          value: "fltNo",
+          width: "100",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "航班路线",
+          value: "route",
+          width: "140",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "航班类型",
+          value: "typeName",
+          width: "100",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "航班种类",
+          value: "flightKindName",
+          width: "100",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "航班状态",
+          value: "statusName",
+          width: "100",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "总重量",
+          value: "totalWeight",
+          width: "90",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "原始重量（KG）",
+          value: "originalWeight",
+          width: "120",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "总体积(cm³)",
+          value: "totalVolume",
+          width: "100",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "是否限制一票一件",
+          value: "ticketToPiece",
+          width: "140",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "是否需要预审",
+          value: "needRequired",
+          width: "130",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "是否开启高地价",
+          value: "highLowPriceFlg",
+          width: "140",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "额外增重百分比",
+          value: "extraWeightPercent",
+          width: "140",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "高价百分比",
+          value: "highPriceWeightPercent",
+          width: "120",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "低价百分比",
+          value: "lowPriceWeightPercent",
+          width: "120",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "已配重量",
+          value: "alloctedWeight",
+          width: "90",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "已配体积(cm³)",
+          value: "alloctedVolume",
+          width: "120",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "航班优先级",
+          value: "priorityName",
+          width: "100",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "配舱优先级",
+          value: "priorityRuleName",
+          width: "100",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "创建人",
+          value: "createUserName",
+          width: "90",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "创建时间",
+          value: "createTime",
+          width: "100",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "最后修改人",
+          value: "lastModifyUserName",
+          width: "120",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+        {
+          type: "",
+          name: "最后修改时间",
+          value: "lastModifyTime",
+          width: "120",
+          align: "center",
+          sorTable: false,
+          fixed: false,
+          disabled: true,
+        },
+      ],
+      //删除失败数据
+      gridData: [],
       //form属性禁用状态
       formdisabled: {
         //航班号
@@ -309,130 +782,164 @@
         //航班类型
         typeId: false,
         //原始重量
-          originalWeight: false
+        originalWeight: false,
       },
-
+      //下拉框数据
+      selectOption: {
         //航班种类
         flightKindlist: [],
         //航班状态
         flightStatuslist: [],
         //航班类型
         flightTypelist: [],
-        // 选中数组
+        //cutOffTime数据
+        cutOffTime: [
+          "00:00:00",
+          "01:00:00",
+          "02:00:00",
+          "03:00:00",
+          "04:00:00",
+          "05:00:00",
+          "06:00:00",
+          "07:00:00",
+          "08:00:00",
+          "09:00:00",
+          "10:00:00",
+          "11:00:00",
+          "12:00:00",
+          "13:00:00",
+          "14:00:00",
+          "15:00:00",
+          "16:00:00",
+          "17:00:00",
+          "18:00:00",
+          "19:00:00",
+          "20:00:00",
+          "21:00:00",
+          "22:00:00",
+          "23:00:00",
+        ],
+      },
+      //选中数组
       ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
+      //目的航班数据
+      sourceFlightAndFlightDate: [],
+      //高价百分比是否打开
+      ishighPriceWeightPercent: true,
+      //非单个禁用
+      //single: true,
+      //非多个禁用
       multiple: true,
-
-        // 遮罩层
+      //遮罩层
       loading: false,
-        // 遮罩层
+      //遮罩层
       loadingFlightDate: false,
-        // 弹出层标题
+      //删除失败弹框
+      dialogTableVisible: false,
+      //弹出层标题
       title: "",
-        // 总条数
+      //总条数
       total: 0,
-        // 原航班规则数据
-        findAllFltDatList: [],
-        //目的航班数据
-        sourceFlightAndFlightDate: [],
-        statusList: [{
-          'id': 1,
-          'name': '有效'
-        }, {
-          'id': 3,
-          'name': '停用'
-        }],
-        // 新增修改查看规则弹出层
+      //表格高度
+      tableHeight: null,
+      //新增修改查看规则弹出层
       open: false,
-        // 是否显示查看目的航班弹出层
+      //是否显示查看目的航班弹出层
       openFlightDate: false,
-        // 查询参数
-        queryParams: {
-          limitStart: 0, //当前条数【代表第几条数据 +1开始】
-          pageNum: 1,
-          limitSize: 20, //一页显示多少条数据
-          fltDateStart: undefined, //航班日期开始
-          fltDateEnd: undefined, //航班日期结束
-          typeId: undefined, //航班类型
-          statusId: undefined, //航班状态
-          flightKindId: undefined, //航班种类
-          fltNo: undefined //航班号，要大写
-        },
-
-        // 表单参数
-        form: {
-
-
-        },
-        // 表单校验
-        rules: {
-          fltNo: [{
-            required: true,
-            message: "ACCS原航班号不能为空",
-            trigger: "blur"
-          }],
-          fltDate: [{
-            required: true,
-            message: "航班日期不能为空",
-            trigger: "blur"
-          }],
-          kindId: [{
-            required: true,
-            message: "航班种类不能为空",
-            trigger: "change"
-          }],
-          originalWeight: [{
-            required: true,
-            message: "原始重量（KG）不能为空",
-            trigger: "blur"
-          }],
-        }
+      //shift键状态
+      shiftKey: false,
     };
   },
   created() {
     //查询条件数据源
     this.findFltConditionData();
+    if (this.$store.state.tagsView.cachedViews.length == 0) {
+      this.findAllFltData();
+    }
+  },
+  activated() {
     this.findAllFltData();
   },
+  mounted() {
+    window.addEventListener("keydown", (code) => {
+      if (code.keyCode === 16 && code.shiftKey) {
+        this.shiftKey = true;
+      }
+    });
+    window.addEventListener("keyup", (code) => {
+      if (code.keyCode === 16) {
+        this.shiftKey = false;
+      }
+    });
+    this.tableHeight =
+      window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
+  },
   methods: {
     //输入航班号后
     blurfltNo() {
-        if (this.form.fltNo != null && this.form.fltNo != undefined && this.form.fltNo != "") {
+      if (
+        this.form.fltNo != null &&
+        this.form.fltNo != undefined &&
+        this.form.fltNo != ""
+      ) {
         this.form.fltNo = this.form.fltNo.toUpperCase();
-          findFltCommonConf(this.form).then(response => {
+        findFltCommonConf(this.form).then((response) => {
           if (response.code == 200) {
             //额外增重百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置为0，不可编辑
-              if (response.data!=null && response.data.extraWeightPercent != null && response.data.extraWeightPercent != undefined) {
-                this.$set(this.form, "extraWeightPercent", response.data.extraWeightPercent);
+            if (
+              response.data != null &&
+              response.data.extraWeightPercent != null &&
+              response.data.extraWeightPercent != undefined
+            ) {
+              this.$set(
+                this.form,
+                "extraWeightPercent",
+                response.data.extraWeightPercent
+              );
               // this.form.extraWeightPercent=response.data.extraWeightPercent;
             } else {
               this.$set(this.form, "extraWeightPercent", 0);
               //this.form.extraWeightPercent=response.data.extraWeightPercent=0;
             }
             //是否开启高低价：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘是否开启高低价’ 为是，不可编辑
-              if (response.data!=null &&response.data.highLowPriceFlg != null && response.data.highLowPriceFlg != undefined) {
-                this.form.highLowPriceFlg = response.data.highLowPriceFlg === 1 ? true : false;
+            if (
+              response.data != null &&
+              response.data.highLowPriceFlg != null &&
+              response.data.highLowPriceFlg != undefined
+            ) {
+              this.form.highLowPriceFlg = response.data.highLowPriceFlg;
             } else {
-                this.$set(this.form, "highLowPriceFlg", true);
+              this.$set(this.form, "highLowPriceFlg", 1);
               //this.form.highLowPriceFlg = true;
             }
             //是否预审：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘是否预审’ 为否，不可编辑；
-              if (response.data!=null &&response.data.isNeedRequired != null && response.data.isNeedRequired != undefined) {
-                this.form.isNeedRequired = response.data.isNeedRequired === 1 ? true : false;
+            if (
+              response.data != null &&
+              response.data.isNeedRequired != null &&
+              response.data.isNeedRequired != undefined
+            ) {
+              this.form.isNeedRequired = response.data.isNeedRequired;
             } else {
-                this.form.isNeedRequired = false;
+              this.form.isNeedRequired = 0;
             }
             //高/低价百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘高价百分比’60%，‘低价百分比’40%，不可编辑
-              if (response.data!=null &&response.data.highPriceWeightPercent != null && response.data.highPriceWeightPercent !=
-                undefined) {
-                this.form.highPriceWeightPercent = response.data.highPriceWeightPercent;
+            if (
+              response.data != null &&
+              response.data.highPriceWeightPercent != null &&
+              response.data.highPriceWeightPercent != undefined
+            ) {
+              this.form.highPriceWeightPercent =
+                response.data.highPriceWeightPercent;
             } else {
               this.form.highPriceWeightPercent = 60;
             }
-              if (response.data!=null &&response.data.lowPriceWeightPercent != null && response.data.lowPriceWeightPercent != undefined) {
-                this.form.lowPriceWeightPercent = response.data.lowPriceWeightPercent;
+            if (
+              response.data != null &&
+              response.data.lowPriceWeightPercent != null &&
+              response.data.lowPriceWeightPercent != undefined
+            ) {
+              this.form.lowPriceWeightPercent =
+                response.data.lowPriceWeightPercent;
             } else {
               this.form.lowPriceWeightPercent = 40;
             }
@@ -440,94 +947,51 @@
           } else {
             this.msgError(response.msg);
           }
-
         });
-
       }
-
-
-      },
-      // 是否一票一件
-      ticketToPieceFormat(row) {
-        if (row.ticketToPiece === 1) {
-          return '是'
-        } else {
-          return '否'
-        }
-        return row.ticketToPiece;
-      },
-      // 是否需要预审 1 预审 0 取消预审
-      needRequiredFormat(row) {
-        if (row.needRequired === 1) {
-          return '是'
-        } else {
-          return '否'
-        }
-        return row.ticketToPiece;
-      },
-      //是否开启高低价
-      highLowPriceFlgFormat(row) {
-        if (row.highLowPriceFlg === 1) {
-          return '开启'
-        } else {
-          return '未开启'
-        }
-        return row.ticketToPiece;
-      },
-      //时间格式化
-      renderTime(date) {
-        var dateee = new Date(date).toJSON();
-        return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
     },
     //查询条件数据源
     findFltConditionData() {
-        findFltConditionDataApi().then(response => {
+      findFltConditionDataApi().then((response) => {
         if (response.code == 200) {
           //航班种类
-            this.flightKindlist = response.data.flightKind;
+          this.selectOption.flightKindlist = response.data.flightKind;
           //航班类型
-            this.flightTypelist = response.data.flightType;
+          this.selectOption.flightTypelist = response.data.flightType;
           //航班状态
-            this.flightStatuslist = response.data.flightStatus;
-
+          this.selectOption.flightStatuslist = response.data.flightStatus;
         } else {
           this.msgError(response.msg);
         }
-
       });
     },
-
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length != 1
-        this.multiple = !selection.length
-      },
-
     /** 航班信息维护查询*/
     findAllFltData() {
+      this.ids = [];
+      this.multiple = true;
       this.loading = true;
       if (this.queryParams.pageNum > 1) {
-          this.queryParams.limitStart = (this.queryParams.pageNum - 1) * this.queryParams.limitSize
+        this.queryParams.limitStart =
+          (this.queryParams.pageNum - 1) * this.queryParams.limitSize;
       } else {
         this.queryParams.limitStart = 0;
       }
-        if (this.queryParams.fltNo != null && this.queryParams.fltNo != undefined && this.queryParams.fltNo != '') {
+      if (
+        this.queryParams.fltNo != null &&
+        this.queryParams.fltNo != undefined &&
+        this.queryParams.fltNo != ""
+      ) {
         this.queryParams.fltNo = this.queryParams.fltNo.toUpperCase();
       }
-
-        findAllFltDataApi(this.queryParams).then(response => {
+      findAllFltDataApi(this.queryParams).then((response) => {
+        this.loading = false;
         if (response.code == 200) {
-
           this.findAllFltDatList = response.data.list;
           this.total = response.data.totalCount;
-            this.loading = false;
         } else {
           this.msgError(response.msg);
         }
-
       });
-
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -535,11 +999,10 @@
       this.open = true;
       this.title = "添加航班信息";
       this.form.id = null;
-        this.form.statusId = this.flightStatuslist[0].id;
+      this.form.statusId = this.selectOption.flightStatuslist[0].id;
       this.form.alloctedWeight = 0; //已配重量
       this.form.lowAllocatedWeight = 0; //低价已配重量
       this.form.highAllocatedWeight = 0; //高价已配重量
-
       //航班号
       this.formdisabled.fltNo = false;
       //航班日期
@@ -557,61 +1020,96 @@
     LowHighAvailable() {
       //判断是否开启高地价
       if (this.form.highLowPriceFlg) {
-           this.ishighPriceWeightPercent=false;
+        this.ishighPriceWeightPercent = false;
         let Weight = 0;
         //计算实际重量
-          if (this.form.highPriceWeightPercent > 0 || this.form.lowPriceWeightPercent > 0) {
+        if (
+          this.form.highPriceWeightPercent > 0 ||
+          this.form.lowPriceWeightPercent > 0
+        ) {
           Weight = this.Weightall();
         }
         //高价可配
         if (this.form.highPriceWeightPercent >= 0) {
-            this.$set(this.form, "lowPriceWeightPercent", 100-this.form.highPriceWeightPercent);
-            this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
-              .highPriceWeightPercent / 100));
+          this.$set(
+            this.form,
+            "lowPriceWeightPercent",
+            100 - this.form.highPriceWeightPercent
+          );
+          this.$set(
+            this.form,
+            "highAvailableWeight",
+            (Weight - this.form.alloctedWeight) *
+              (this.form.highPriceWeightPercent / 100)
+          );
           // this.form.HighAvailableWeight = Weightall * (this.form.highPriceWeightPercent / 100)
-          }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 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 {
+        } 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.$set(
+            this.form,
+            "lowAvailableWeight",
+            Weight - this.form.alloctedWeight - this.form.highAvailableWeight
+          );
           //this.form.lowAvailableWeight = Weightall - this.form.HighAvailableWeight;
-          }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 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 {
+        } else {
           this.$set(this.form, "lowAvailableWeight", 0);
           // this.form.lowAvailableWeight = 0;
         }
-        }else{
-           this.ishighPriceWeightPercent=true;
+      } else {
+        this.ishighPriceWeightPercent = true;
       }
-
     },
     //计算实际重量
     Weightall() {
       let Weight = 0;
       if (this.form.extraWeightPercent > 0) {
-          Weight = this.form.originalWeight + this.form.originalWeight * (this.form.extraWeightPercent / 100)
-        }else {
+        Weight =
+          this.form.originalWeight +
+          this.form.originalWeight * (this.form.extraWeightPercent / 100);
+      } else {
         Weight = this.form.originalWeight;
       }
       return Weight;
     },
-
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -622,81 +1120,85 @@
       //航班日期
       this.formdisabled.fltDate = true;
       //根据ID查item
-        findFltById(row).then(response => {
+      findFltById(row).then((response) => {
         if (response.code == 200) {
           this.form = response.data;
           //是否开启高地价
-            this.form.highLowPriceFlg = this.form.highLowPriceFlg === 1 ? true : false;
+          // this.form.highLowPriceFlg = this.form.highLowPriceFlg === 1 ? true : false;
           //是否预审
-            this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false;
+          // this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false;
           // 计算高地价可配
           this.LowHighAvailable();
-
         } else {
           this.msgError(response.msg);
         }
-
       });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-       const fIds =this.ids;
-       this.$confirm('是否确认删除所选数据?', "警告", {
+      const fIds = this.ids;
+      this.$confirm("是否确认删除所选数据?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-           type: "warning"
-         }).then(function() {
+        type: "warning",
+      })
+        .then(() => {
           return delFlight(fIds);
-         }).then(response =>  {
+        })
+        .then((response) => {
           this.findAllFltData();
-            if(response.data.length>0){
-              this.gridData=response.data;
-                 this.$confirm(response.msg, '提示', {
-                        confirmButtonText: '查看删除失败航班信息',
-                        cancelButtonText: '取消',
-                        type: 'warning',
-                        center: true
-                      }).then(() => {
-                        this.dialogTableVisible=true;
-                      }).catch(function() { });
-
-            }else{
+          if (response.data.length > 0) {
+            this.gridData = response.data;
+            this.$confirm(response.msg, "提示", {
+              confirmButtonText: "查看删除失败航班信息",
+              cancelButtonText: "取消",
+              type: "warning",
+              center: true,
+            })
+              .then(() => {
+                this.dialogTableVisible = true;
+              })
+              .catch(() => {});
+          } else {
             this.msgSuccess(response.msg);
           }
-         }).catch(function() {});
+        })
+        .catch(() => {});
     },
-
     /** 提交按钮 */
-      submitForm: function() {
-        this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           let formdata = JSON.parse(JSON.stringify(this.form));
-
           //高价百分比和低价百分比和不可以大于100
-            if (this.form.highLowPriceFlg && (formdata.highPriceWeightPercent>100||formdata.highPriceWeightPercent<0)  ) {
+          if (
+            this.form.highLowPriceFlg &&
+            (formdata.highPriceWeightPercent > 100 ||
+              formdata.highPriceWeightPercent < 0)
+          ) {
             this.$message.warning("请正确填写高低价百分比");
             return;
           }
           //已删除的无法修改
           //拿到已删除的id
-            let statusId=0;
-            this.flightStatuslist.map((item) => {
+          let statusId = 0;
+          this.selectOption.flightStatuslist.map((item) => {
             //  this.unitList 是你 select option遍历的集合 e 是选中的id
             if (item.chineseName === "已删除") {
-                statusId=item.id;
+              statusId = item.id;
               return;
             }
-            })
+          });
           if (statusId === formdata.statusId) {
             this.$message.warning("已删除的航班无法修改");
             return;
           }
           //是否开启高地价
-            formdata.highLowPriceFlg = formdata.highLowPriceFlg ? 1 : 0;
+          // formdata.highLowPriceFlg = formdata.highLowPriceFlg ? 1 : 0;
           //是否预审
-            formdata.isNeedRequired = formdata.isNeedRequired ? 1 : 0;
+          // formdata.isNeedRequired = formdata.isNeedRequired ? 1 : 0;
           //处理数据
-            saveOrUpdate(formdata).then(response => {
+          saveOrUpdate(formdata).then((response) => {
             if (response.code === 200) {
               this.msgSuccess("保存成功");
               this.open = false;
@@ -705,22 +1207,20 @@
               this.msgError(response.msg);
             }
           });
-
         }
       });
     },
-      // 表单重置
+    //表单重置
     reset() {
       this.form = {};
       this.resetForm("form");
     },
-      // 取消按钮
+    //取消按钮
     cancel() {
       this.open = false;
       this.findAllFltData();
       this.reset();
     },
-
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
@@ -733,37 +1233,64 @@
       this.findAllFltData();
     },
     //批量开启/关闭航班
-      handleFlightStatus(status){
-        let handle = status == 'flightStatus80' ? '关闭' : '开启'
-        if (this.ids.length == 0){
-          this.msgError('请选择批量' + handle + '的航班')
+    handleFlightStatus(status) {
+      let handle = status == "flightStatus80" ? "关闭" : "开启";
+      if (this.ids.length == 0) {
+        this.msgError("请选择批量" + handle + "的航班");
         return;
       }
       let data = {};
       data.status = status;
       data.updateIds = this.ids;
 
-        updateStatusBatch(data).then(response => {
+      updateStatusBatch(data).then((response) => {
         if (response.code === 200) {
-            this.msgSuccess( handle + "成功");
+          this.msgSuccess(handle + "成功");
           this.findAllFltData();
         } else {
           this.msgError(response.msg);
         }
       });
-      }
-
-    }
-  };
+    },
+    //多选框选中数据
+    tableSelect(val) {
+      this.ids = val.selection.map((item) => item.id);
+      this.multiple = !val.selection.length;
+    },
+    //全选
+    tableSelectAll(val) {
+      this.ids = val.selection.map((item) => item.id);
+      this.multiple = !val.selection.length;
+    },
+    //分页
+    currentChange(val) {
+      this.queryParams.pageNum = val.page;
+      this.findAllFltData();
+    },
+    //排序
+    sortChange(val) {
+      console.log(val);
+    },
+    //每页长度
+    sizeChange(val) {
+      this.queryParams.limitSize = val;
+      this.findAllFltData();
+    },
+  },
+  deactivated() {
+    this.findAllFltDatList = [];
+  },
+};
 </script>
+
 <style>
-  .el-table--striped .el-table__body tr.el-table__row--striped.current-row td,
-  .el-table__body tr.current-row>td {
+.el-table--striped .el-table__body tr.el-table__row--striped.current-row td,
+.el-table__body tr.current-row > td {
   background-color: #a0cfff;
-  }
+}
 
-  .el-table--striped .el-table__body tr.hover-row.el-table__row--striped>td,
-  .el-table__body tr.hover-row>td {
+.el-table--striped .el-table__body tr.hover-row.el-table__row--striped > td,
+.el-table__body tr.hover-row > td {
   background-color: #d9ecff !important;
-  }
+}
 </style>

@@ -768,18 +768,19 @@ export default {
     });
   },
 
-  // activated(){
-  //   findConditionData().then((res) => {
-  //     if (res.code == 200) {
-  //       this.findConditionData = res.data;
-  //     } else {
-  //       this.$message({
-  //         message: "查询条件不存在",
-  //         type: "warning",
-  //       });
-  //     }
-  //   });
-  // },
+  activated() {
+    if(this.$store.state.tagsView.cachedViews.length > 0 ){
+      this.$store.state.tagsView.cachedViews.forEach(item=>{
+        if(item === 'QueryCargo'){
+          this.totalCount>0?this.select():''
+        }
+      })
+    }
+  },
+
+  deactivated(){
+    this.tableData = []
+  },
 
   mounted() {
     window.addEventListener("keydown", (code) => {

@@ -120,6 +120,13 @@ export default {
   updated() {
     this.menuForm = this.menuData;
   },
+  watch:{
+    dialogVisible(val,oldVal){
+      if(val){
+        this.menuForm = this.menuData;
+      }
+    }
+  },
   methods: {
     handleClose() {
       this.$emit("handleClose", false);

@@ -106,7 +106,7 @@ import dictLabels from "@/assets/languages/dictLabels.js";
 import Drawer from "./drawer.vue";
 import { MessageBox } from "element-ui";
 export default {
-  name:"menuConfig",
+  name:"MenuConfig",
   components: {
     Drawer,
   },
@@ -163,6 +163,11 @@ export default {
     };
   },
   created() {
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.menuAll();
+    }
+  },
+  activated(){
     this.menuAll();
   },
   methods: {

@@ -26,6 +26,7 @@
                 v-model.trim="roleForm.name"
                 :disabled="roleFormDisabled"
                 v-if="!roleFormDisabled"
+                clearable
               ></el-input>
               <div v-else>{{ roleData.name }}</div>
             </el-form-item>
@@ -38,6 +39,7 @@
                 placeholder="请输入角色描述"
                 :disabled="roleFormDisabled"
                 v-if="!roleFormDisabled"
+                clearable
               ></el-input>
               <div v-else>{{ roleData.remark }}</div>
             </el-form-item>
@@ -152,9 +154,11 @@ export default {
     roleFormDisabled(){
       this.treeData = this.treeDisabled(this.treeData)
     },
-    drawer(){
+    drawer(val,oldVal){
+      if(val){
         this.roleForm = this.roleData;
       } 
+    }
   },
   methods: {
     //关闭

@@ -7,6 +7,7 @@
             <el-input
               v-model="formData.name"
               placeholder="请输入角色名称"
+              clearable
             ></el-input>
           </el-form-item>
         </el-col>
@@ -18,13 +19,14 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
+              clearable
             >
             </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="状态">
-            <el-select v-model="formData.valid" placeholder="角色状态">
+            <el-select v-model="formData.valid" placeholder="角色状态" clearable>
               <el-option label="开启" value="1"> </el-option>
               <el-option label="关闭" value="1"> </el-option>
             </el-select>
@@ -32,7 +34,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <div style="margin: 0 20px">
+    <div style="margin:20px">
       <el-button
         type="primary"
         icon="el-icon-search"
@@ -52,8 +54,10 @@
       :totalCount="total"
       :limitSize="formData.size"
       :page="formData.page"
+      :pageSizes="[20,30,40,50]"
       :loading="tableLoading"
       height="600"
+       @sizeChange="sizeChange"
       @currentChange="currentChange"
     >
       <template>
@@ -188,6 +192,11 @@ export default {
     };
   },
   created() {
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.selectRoleList();
+    }
+  },
+  activated(){
     this.selectRoleList();
   },
   methods: {
@@ -351,6 +360,10 @@ export default {
       this.formData.page = val.page;
       this.selectRoleList();
     },
+    sizeChange(val){
+      this.formData.size = val;
+      this.selectRoleList()
+    }
   },
 };
 </script>

 <template>
   <div class="userDrawer">
     <el-drawer
-      :data="userData"
       :title="drawerTitle"
       :visible.sync="drawer"
       direction="rtl"
@@ -25,7 +24,8 @@
                 v-model.trim="userForm.loginName"
                 v-if="!userFormDisabled"
                 :disabled="drawerTitle != '新增用户'"
-                size="mini"
+                size="small"
+                clearable
               ></el-input>
               <div v-else>{{ userForm.loginName }}</div>
             </el-form-item>
@@ -37,7 +37,8 @@
                 :disabled="userFormDisabled"
                 v-model.trim="userForm.username"
                 v-if="!userFormDisabled"
-                size="mini"
+                size="small"
+                clearable
               ></el-input>
               <div v-else>{{ userForm.username }}</div>
             </el-form-item>
@@ -61,7 +62,8 @@
                 v-model.trim="userForm.phone"
                 :disabled="userFormDisabled"
                 v-if="!userFormDisabled"
-                size="mini"
+                size="small"
+                clearable
               ></el-input>
               <div v-else>{{ userForm.phone }}</div>
             </el-form-item>
@@ -74,7 +76,8 @@
                 v-model.trim="userForm.email"
                 :disabled="userFormDisabled"
                 v-if="!userFormDisabled"
-                size="mini"
+                size="small"
+                clearable
               ></el-input>
               <div v-else>{{ userForm.email }}</div>
             </el-form-item>
@@ -104,19 +107,11 @@
               label="所属口岸:"
               prop="portName"
             >
-              <!-- <el-checkbox-group v-model="port" :disabled="userFormDisabled">
-                <el-checkbox
-                  v-for="item in portNameList"
-                  :label="item.englishName"
-                  :key="item.id"
-                  >{{ item.englishName }}</el-checkbox
-                >
-              </el-checkbox-group> -->
               <el-select
                 placeholder="不限"
                 v-model="port"
                 :disabled="userFormDisabled"
-                size="mini"
+                size="small"
                 style="width: 100%"
                 multiple
                 clearable
@@ -155,7 +150,8 @@
                 placeholder="备注"
                 :disabled="userFormDisabled"
                 v-if="!userFormDisabled"
-                size="mini"
+                size="small"
+                clearable
               ></el-input>
               <div v-else>{{ userForm.remark }}</div>
             </el-form-item>
@@ -266,9 +262,11 @@ export default {
       getRoleList({ size: null, page: null })
         .then((res) => {
           if (res.code === 200) {
+            res.data.list.map(item=>{
               if(item.valid == 1){
                 this.roleList.push(item)
               }
+            })
           } else {
             this.$message({
               message: res.msg,

@@ -7,6 +7,7 @@
             <el-input
               placeholder="请输入用户名称"
               v-model="formData.username"
+              clearable
             ></el-input>
           </el-form-item>
         </el-col>
@@ -15,12 +16,13 @@
             <el-input
               placeholder="请输入用户名称"
               v-model="formData.phone"
+              clearable
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="状态">
-            <el-select placeholder="用户状态" v-model="formData.isValid">
+            <el-select placeholder="用户状态" v-model="formData.isValid" clearable>
               <el-option label="开启" value="1"> </el-option>
               <el-option label="关闭" value="2"> </el-option>
             </el-select>
@@ -48,7 +50,9 @@
       :totalCount="total"
       :loading="loading"
       :page="formData.page"
+      :pageSizes="[20,30,40,50]"
       height="600"
+      @sizeChange="sizeChange"
       @currentChange="currentChange"
     >
       <template>
@@ -236,6 +240,11 @@ export default {
     };
   },
   created() {
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.selectUser();
+    }
+  },
+  activated(){
     this.selectUser();
   },
   methods: {
@@ -376,6 +385,11 @@ export default {
       this.formData.page = val.page;
       this.selectUser();
     },
+
+    sizeChange(val){
+      this.formData.size = val;
+      this.selectUser()
+    }
   },
 };
 </script>