Merge remote-tracking branch 'origin/uat' into dev

 import request from '@/utils/request'
 import request from '@/utils/request'
 import { praseStrEmpty } from "@/utils/FedEx";
 import { praseStrEmpty } from "@/utils/FedEx";
 
 
+// // 修改用户
+// export function updateUser(data) {
+//   return request({
+//     url: '/system/user',
+//     method: 'put',
+//     data: data
+//   })
+// }
+
+// // 导出用户
+// export function exportUser(query) {
+//   return request({
+//     url: '/system/user/export',
+//     method: 'get',
+//     params: query
+//   })
+// }
+
+// // 用户密码重置
+// export function resetUserPwd(userId, password) {
+//   const data = {
+//     userId,
+//     password
+//   }
+//   return request({
+//     url: '/system/user/resetPwd',
+//     method: 'put',
+//     data: data
+//   })
+// }
+
+// // 用户状态修改
+// export function changeUserStatus(userId, status) {
+//   const data = {
+//     userId,
+//     status
+//   }
+//   return request({
+//     url: '/system/user/changeStatus',
+//     method: 'put',
+//     data: data
+//   })
+// }
+
+// // 查询用户个人信息
+// export function getUserProfile() {
+//   return request({
+//     url: '/system/user/profile',
+//     method: 'get'
+//   })
+// }
+
+// // 修改用户个人信息
+// export function updateUserProfile(data) {
+//   return request({
+//     url: '/system/user/profile',
+//     method: 'put',
+//     data: data
+//   })
+// }
+
+// // 用户密码重置
+// export function updateUserPwd(oldPassword, newPassword) {
+//   const data = {
+//     oldPassword,
+//     newPassword
+//   }
+//   return request({
+//     url: '/system/user/profile/updatePwd',
+//     method: 'put',
+//     params: data
+//   })
+// }
+
+// // 用户头像上传
+// export function uploadAvatar(data) {
+//   return request({
+//     url: '/system/user/profile/avatar',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+// // 下载用户导入模板
+// export function importTemplate() {
+//   return request({
+//     url: '/system/user/importTemplate',
+//     method: 'get'
+//   })
+// }
+
 // 查询用户列表
 // 查询用户列表
-export function listUser(query) {
+export function listUser(data) {
   return request({
   return request({
-    url: '/system/user/list',
-    method: 'get',
-    params: query
+    url: '/sysUser/getUserList',
+    method: 'post',
+    data: data
   })
   })
 }
 }
 
 
 // 查询用户详细
 // 查询用户详细
-export function getUser(userId) {
+export function detailUser(userId) {
   return request({
   return request({
-    url: '/system/user/' + praseStrEmpty(userId),
+    url: '/sysUser/detailUser?id=' + praseStrEmpty(userId),
     method: 'get'
     method: 'get'
   })
   })
 }
 }
 
 
 // 新增用户
 // 新增用户
-export function addUser(data) {
+export function addOrUpdateUser(data) {
   return request({
   return request({
-    url: '/system/user',
+    url: '/sysUser/addOrUpdateUser',
     method: 'post',
     method: 'post',
     data: data
     data: data
   })
   })
 }
 }
 
 
-// 修改用户
-export function updateUser(data) {
+// 修改用户状态
+export function updateUserStatus(data) {
   return request({
   return request({
-    url: '/system/user',
-    method: 'put',
+    url: '/sysUser/updateUserStatus',
+    method: 'post',
     data: data
     data: data
   })
   })
 }
 }
 
 
-// 删除用户
-export function delUser(userId) {
+//菜单信息
+export function getAllAuth() {
   return request({
   return request({
-    url: '/system/user/' + userId,
-    method: 'delete'
+    url: '/sysMenu/getAllAuth',
+    method: 'get'
   })
   })
 }
 }
 
 
-// 导出用户
-export function exportUser(query) {
+//菜单开启关闭
+export function updateStatus(data) {
   return request({
   return request({
-    url: '/system/user/export',
-    method: 'get',
-    params: query
+    url: '/sysMenu/updateStatus',
+    method: 'post',
+    data: data
   })
   })
 }
 }
 
 
-// 用户密码重置
-export function resetUserPwd(userId, password) {
-  const data = {
-    userId,
-    password
-  }
+//角色列表
+export function getRoleList(data) {
   return request({
   return request({
-    url: '/system/user/resetPwd',
-    method: 'put',
+    url: '/role/getRoleList',
+    method: 'post',
     data: data
     data: data
   })
   })
 }
 }
 
 
-// 用户状态修改
-export function changeUserStatus(userId, status) {
-  const data = {
-    userId,
-    status
-  }
+//角色详情
+export function detailRole(id) {
   return request({
   return request({
-    url: '/system/user/changeStatus',
-    method: 'put',
-    data: data
+    url: '/role/detailRole?id=' + id,
+    method: 'get',
   })
   })
 }
 }
 
 
-// 查询用户个人信息
-export function getUserProfile() {
+//新增修改角色
+export function addOrUpdateRole(data) {
   return request({
   return request({
-    url: '/system/user/profile',
-    method: 'get'
+    url: '/role/addOrUpdateRole',
+    method: 'post',
+    data: data
   })
   })
 }
 }
 
 
-// 修改用户个人信息
-export function updateUserProfile(data) {
+//角色状态修改
+export function updateRoleStatus(data) {
   return request({
   return request({
-    url: '/system/user/profile',
-    method: 'put',
+    url: '/role/updateRoleStatus',
+    method: 'post',
     data: data
     data: data
   })
   })
 }
 }
 
 
-// 用户密码重置
-export function updateUserPwd(oldPassword, newPassword) {
-  const data = {
-    oldPassword,
-    newPassword
-  }
+//口岸列表
+export function portNameList() {
   return request({
   return request({
-    url: '/system/user/profile/updatePwd',
-    method: 'put',
-    params: data
+    url: '/dictionary/port',
+    method: 'get',
   })
   })
 }
 }
 
 
-// 用户头像上传
-export function uploadAvatar(data) {
+//口岸变更
+export function changeCurrentPort(data) {
   return request({
   return request({
-    url: '/system/user/profile/avatar',
+    url: '/sysUser/changeCurrentPort',
     method: 'post',
     method: 'post',
     data: data
     data: data
   })
   })
 }
 }
\ No newline at end of file
-
-// 下载用户导入模板
-export function importTemplate() {
-  return request({
-    url: '/system/user/importTemplate',
-    method: 'get'
-  })
-}

 let ductLabels = {
 let ductLabels = {
-    "cargoRulesStatus":{
-        "1":"手动",
-        "2":"自动"
+    "cargoRulesStatus": {
+        "1": "手动",
+        "2": "自动"
+    },
+    "menuType": {
+        "M": "菜单",
+        "C": "菜单",
+        "B": "按钮"
+    },
+    "status": {
+        "1": "启用",
+        "2": "停用",
+    },
+    "valid": {
+        "1": "启用",
+        "2": "关闭",
+    },
+    "isValid": {
+        "1": "启用",
+        "2": "关闭",
+    },
+    "ticketToPiece": {
+        "1": "是",
+        "0": "否",
+    },
+    "needRequired": {
+        "1": "是",
+        "0": "否",
+    },
+    "highLowPriceFlg": {
+        "1": "启用",
+        "0": "未开启",
     }
     }
+
 }
 }
 
 
 export default ductLabels;
 export default ductLabels;
\ No newline at end of file

 <template>
 <template>
-  <div class="Tables">
+  <div class="w-table" :class="{ 'w-table_moving': dragState.dragging }">
     <el-table
     <el-table
       :ref="tableName"
       :ref="tableName"
       :data="data"
       :data="data"
-      :headerData="headerData"
       :border="border"
       :border="border"
       :stripe="stripe"
       :stripe="stripe"
       :size="size"
       :size="size"
@@ -25,24 +24,33 @@
       @select-change="SelectChange"
       @select-change="SelectChange"
     >
     >
       <el-table-column
       <el-table-column
-        v-for="(item, index) in headerData"
-        :column-key="item.value"
+        v-for="(item, index) in newHeader"
         :type="item.type"
         :type="item.type"
         :prop="item.value"
         :prop="item.value"
         :label="item.name"
         :label="item.name"
         :width="item.width"
         :width="item.width"
         :align="item.align"
         :align="item.align"
         :fixed="item.fixed"
         :fixed="item.fixed"
+        :column-key="index.toString()"
         :show-overflow-tooltip="showOverflowTooltip"
         :show-overflow-tooltip="showOverflowTooltip"
         :sortable="item.sorTable"
         :sortable="item.sorTable"
         :formatter="formatter"
         :formatter="formatter"
         header-align="center"
         header-align="center"
         :sort-orders="['descending', 'ascending', null]"
         :sort-orders="['descending', 'ascending', null]"
         :slotHeader="slotHeader"
         :slotHeader="slotHeader"
+        :render-header="renderHeader"
         :key="index"
         :key="index"
+        v-if="item.disabled"
       >
       >
-        <!-- <template v-if="item.slot" slot-scope="">
-          <Item :dom="item.slot" @change="itemChange"></Item>
+        <!-- <template slot-scope="scope">
+          <exSlot
+            v-if="item.render"
+            :render="item.render"
+            :row="scope.row"
+            :index="scope.$index"
+            :column="item"
+          ></exSlot>
+          <span v-else>{{ scope.row[item.value] || "" }}</span>
         </template> -->
         </template> -->
       </el-table-column>
       </el-table-column>
       <slot></slot>
       <slot></slot>
@@ -52,41 +60,87 @@
       :page-size.sync="limitSize"
       :page-size.sync="limitSize"
       :current-page.sync="pageNum"
       :current-page.sync="pageNum"
       background
       background
-      layout="prev, pager, next, jumper, ->, total, slot"
+      layout="prev, pager, next, jumper, ->, sizes, total"
       class="tablePagination"
       class="tablePagination"
+      @size-change="sizeChange"
       @next-click="nextClick"
       @next-click="nextClick"
       @prev-click="prevClick"
       @prev-click="prevClick"
       @current-change="currentChange"
       @current-change="currentChange"
     >
     >
     </el-pagination>
     </el-pagination>
-    <!-- <infoTable
-      v-bind="$attrs"
-      @checkChange="checkChange"
-      @top="top"
-      @bottom="bottom"
-    ></infoTable> -->
+    <div class="tableInfo" v-if="infoShow">
+      <ul class="tableList" v-show="show">
+        <el-checkbox-group v-model="checkDisabled">
+          <li
+            class="flexList"
+            v-for="(item, index) in newHeader"
+            :key="index"
+            v-if="!item.type"
+            :title="item.name"
+          >
+            <div>
+              <el-checkbox
+                :label="item.name"
+                @change="newHeader[index].disabled = !item.disabled"
+                >{{ item.name }}</el-checkbox
+              >
+            </div>
+          </li>
+        </el-checkbox-group>
+      </ul>
+      <el-button
+        type="primary"
+        icon="el-icon-edit"
+        size="medium"
+        circle
+        @click="show = !show"
+      ></el-button>
+    </div>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
-// import infoTable from "./info.vue";
-import Item from "./item.vue";
+let exSlot = {
+  fucntional: true,
+  props: {
+    row: Object,
+    render: Function,
+    index: [Number, String],
+    column: {
+      type: Object,
+      default: null,
+    },
+  },
+  render: (h, data) => {
+    console.log(data);
+    if (data) {
+      const params = {
+        row: data.props.row,
+        index: data.props.index,
+      };
+      if (data.props.column) params.column = data.props.column;
+      return data.props.render(h, params);
+    }
+  },
+};
 import dictLabels from "../../assets/languages/dictLabels.js";
 import dictLabels from "../../assets/languages/dictLabels.js";
 import { scrollTo } from "@/utils/scroll-to";
 import { scrollTo } from "@/utils/scroll-to";
 export default {
 export default {
   name: "Table",
   name: "Table",
   components: {
   components: {
-    // infoTable,
-    Item,
+    exSlot,
   },
   },
   props: {
   props: {
+    //dom名称
     tableName: { type: String, default: "tables" },
     tableName: { type: String, default: "tables" },
+    //表格数据
     data: {
     data: {
       type: Array,
       type: Array,
       default() {
       default() {
         return [];
         return [];
       },
       },
     },
     },
+    //表头数据
     headerData: {
     headerData: {
       type: Array,
       type: Array,
       default: null,
       default: null,
@@ -104,7 +158,7 @@ export default {
       default: "mini",
       default: "mini",
     },
     },
     height: {
     height: {
-      type: String,
+      type: [String,Number],
       default: "400",
       default: "400",
     },
     },
     fit: {
     fit: {
@@ -143,18 +197,26 @@ export default {
       type: Boolean,
       type: Boolean,
       default: true,
       default: true,
     },
     },
+    //shift键状态
     shiftKey: {
     shiftKey: {
       type: Boolean,
       type: Boolean,
       default: false,
       default: false,
     },
     },
+    //页数
     page: {
     page: {
       type: Number,
       type: Number,
       default: 1,
       default: 1,
     },
     },
+    // pageSizes:{
+    //   type:Array,
+    //   default:[10, 20, 30, 40, 50, 100]
+    // },
+    //每页长度
     limitSize: {
     limitSize: {
       type: Number,
       type: Number,
       default: 20,
       default: 20,
     },
     },
+    //开始位置
     limitStart: {
     limitStart: {
       type: Number,
       type: Number,
       default: 0,
       default: 0,
@@ -167,6 +229,7 @@ export default {
       type: Number,
       type: Number,
       default: 20,
       default: 20,
     },
     },
+    //总数量
     totalCount: {
     totalCount: {
       type: Number,
       type: Number,
       default: 0,
       default: 0,
@@ -179,35 +242,65 @@ export default {
       type: Boolean,
       type: Boolean,
       default: false,
       default: false,
     },
     },
+    infoShow:{
+      type:Boolean,
+      default:false,
+    }
   },
   },
   inheritAttrs: false,
   inheritAttrs: false,
   data() {
   data() {
     return {
     return {
-      newHeader: [],
+      newHeader: this.headerData,
       selectTable: [],
       selectTable: [],
+      checkDisabled: [],
       pageNum: 1,
       pageNum: 1,
       start: -1,
       start: -1,
+      show: false,
+      dragState: {
+        start: -9, // 起始元素的 index
+        end: -9, // 移动鼠标时所覆盖的元素 index
+        dragging: false, // 是否正在拖动
+        direction: undefined, // 拖动方向
+      },
+      //表头数据格式
       // {
       // {
-      //   type: "selection",
+      //   type: "",
       //   name: "",
       //   name: "",
       //   value: "",
       //   value: "",
-      //   slot: null,
       //   width: "",
       //   width: "",
       //   align: "center",
       //   align: "center",
       //   sorTable: false,
       //   sorTable: false,
       //   fixed:false,
       //   fixed:false,
+      //   disabled:true,
       // },
       // },
     };
     };
   },
   },
   created() {
   created() {
-    this.newHeader = this.headerData;
+    this.newHeader.map((item) => {
+      this.checkDisabled.push(item.name);
+    });
   },
   },
-  watch:{
-    page(){
+  watch: {
+    page() {
       this.pageNum = this.page;
       this.pageNum = this.page;
-    }
+    },
+    data() {
+      this.data.forEach((item, index) => {
+        item.index = index;
+      });
+      this.$nextTick(()=>{
+        this.$refs.tables.doLayout()
+      })
+    },
+    headerData(val, oldVal) {
+      this.newHeader = val;
+    },
   },
   },
   methods: {
   methods: {
+    sizeChange(val){
+      this.$emit("sizeChange",val)
+    },
+    //下一页
     nextClick() {
     nextClick() {
       this.$emit("currentChange", {
       this.$emit("currentChange", {
         page: this.pageNum + 1,
         page: this.pageNum + 1,
@@ -215,6 +308,7 @@ export default {
       });
       });
       scrollTo(0, 800);
       scrollTo(0, 800);
     },
     },
+    //上一页
     prevClick() {
     prevClick() {
       this.$emit("currentChange", {
       this.$emit("currentChange", {
         page: this.pageNum - 1,
         page: this.pageNum - 1,
@@ -222,13 +316,15 @@ export default {
       });
       });
       scrollTo(0, 800);
       scrollTo(0, 800);
     },
     },
+    //某页
     currentChange(val) {
     currentChange(val) {
       this.$emit("currentChange", {
       this.$emit("currentChange", {
         page: val,
         page: val,
-        start: val > 1 ? (val-1) * this.limitSize + 1 : val,
+        start: val > 1 ? (val - 1) * this.limitSize + 1 : val,
       });
       });
       scrollTo(0, 800);
       scrollTo(0, 800);
     },
     },
+    //表格多选，shift连续选择
     tableSelect(selection, row) {
     tableSelect(selection, row) {
       let end = row.index;
       let end = row.index;
       if (this.shiftKey) {
       if (this.shiftKey) {
@@ -276,18 +372,23 @@ export default {
       selection = this.selectTable.sort(this.compare("index", "ascending"));
       selection = this.selectTable.sort(this.compare("index", "ascending"));
       this.$emit("tableSelect", { selection, row });
       this.$emit("tableSelect", { selection, row });
     },
     },
+    //表格全选
     tableSelectAll(selection) {
     tableSelectAll(selection) {
       this.selectTable = selection;
       this.selectTable = selection;
       this.$emit("tableSelectAll", selection);
       this.$emit("tableSelectAll", selection);
     },
     },
+    //多选框改变
     SelectChange(selection) {
     SelectChange(selection) {
       this.$emit("SelectChange", selection);
       this.$emit("SelectChange", selection);
     },
     },
+    //表格选择清空
     clearTable() {
     clearTable() {
       this.selectTable = [];
       this.selectTable = [];
       this.$refs.tables.clearSelection();
       this.$refs.tables.clearSelection();
     },
     },
+    //排序
     sortChange({ column, prop, order }) {
     sortChange({ column, prop, order }) {
+      this.selectTable = [];
       this.$emit("sortChange", { prop: prop, order: order });
       this.$emit("sortChange", { prop: prop, order: order });
     },
     },
     compare(propertyName, sort) {
     compare(propertyName, sort) {
@@ -306,26 +407,218 @@ export default {
         }
         }
       };
       };
     },
     },
+    //自定义表头
+    renderHeader(createElement, { column }) {
+      return createElement(
+        "div",
+        {
+          class: ["thead-cell"],
+          // on: {
+          //   mousedown: ($event) => {
+          //     this.handleMouseDown($event, column);
+          //   },
+          //   mousemove: ($event) => {
+          //     this.handleMouseMove($event, column);
+          //   },
+          // },
+        },
+        [
+          // 添加 <a> 用于显示表头 label
+          createElement("a", column.label),
+          // 添加一个空标签用于显示拖动动画
+          createElement("span", {
+            class: ["virtual"],
+          }),
+        ]
+      );
+    },
+
+    // 按下鼠标开始拖动
+    // handleMouseDown(e, column) {
+    //   this.dragState.dragging = true;
+    //   this.dragState.start = parseInt(column.columnKey);
+    //   // 给拖动时的虚拟容器添加宽高
+    //   let table = document.getElementsByClassName("w-table")[0];
+    //   let virtual = document.getElementsByClassName("virtual");
+    //   for (let item of virtual) {
+    //     item.style.height = table.clientHeight - 1 + "px";
+    //     item.style.width = item.parentElement.parentElement.clientWidth + "px";
+    //   }
+    //   document.addEventListener("mouseup", this.handleMouseUp);
+    // },
+
+    // 鼠标放开结束拖动
+    // handleMouseUp() {
+    //   this.dragColumn(this.dragState);
+    //   // 初始化拖动状态
+    //   this.dragState = {
+    //     start: -9,
+    //     end: -9,
+    //     dragging: false,
+    //     direction: undefined,
+    //   };
+    //   document.removeEventListener("mouseup", this.handleMouseUp);
+    // },
+
+    // 拖动中
+    // handleMouseMove(e, column) {
+    //   if (this.dragState.dragging) {
+    //     let index = parseInt(column.columnKey); // 记录起始列
+    //     if (index - this.dragState.start !== 0) {
+    //       this.dragState.direction =
+    //         index - this.dragState.start < 0 ? "left" : "right"; // 判断拖动方向
+    //       this.dragState.end = parseInt(column.columnKey);
+    //     } else {
+    //       this.dragState.direction = undefined;
+    //     }
+    //   } else {
+    //     return false;
+    //   }
+    // },
+
+    // 拖动易位
+    // dragColumn({ start, end, direction }) {
+    //   let tempData = [];
+    //   let left = direction === "left";
+    //   let min = left ? end : start - 1;
+    //   let max = left ? start + 1 : end;
+    //   for (let i = 0; i < this.newHeader.length; i++) {
+    //     if (i === end) {
+    //       tempData.push(this.newHeader[start]);
+    //     } else if (i > min && i < max) {
+    //       tempData.push(this.newHeader[left ? i - 1 : i + 1]);
+    //     } else {
+    //       tempData.push(this.newHeader[i]);
+    //     }
+    //   }
+    //   this.newHeader = tempData;
+    // },
+    // headerCellClassName({ column, columnIndex }) {
+    //   let active =
+    //     columnIndex - 1 === this.dragState.end
+    //       ? `darg_active_${this.dragState.direction}`
+    //       : "";
+    //   let start = columnIndex - 1 === this.dragState.start ? `darg_start` : "";
+    //   return `${active} ${start}`;
+    // },
+
+    // cellClassName({ column, columnIndex }) {
+    //   return columnIndex - 1 === this.dragState.start ? `darg_start` : "";
+    // },
+    //数据格式化
     formatter(row, column, cellValue, index) {
     formatter(row, column, cellValue, index) {
       if (dictLabels[column.property]) {
       if (dictLabels[column.property]) {
         if (dictLabels[column.property][cellValue]) {
         if (dictLabels[column.property][cellValue]) {
           return dictLabels[column.property][cellValue];
           return dictLabels[column.property][cellValue];
         }
         }
       }
       }
+      if (column.property == "roleNames") {
+        return cellValue.toString();
+      }
       return cellValue;
       return cellValue;
     },
     },
   },
   },
 };
 };
 </script>
 </script>
 
 
-<style>
-.Tables {
-  width: 100%;
-  margin-top: 20px;
-}
+<style lang="scss">
 .tablePagination {
 .tablePagination {
   margin-top: 40px;
   margin-top: 40px;
   text-align: right;
   text-align: right;
 }
 }
+.w-table {
+    height:100%;
+  　.el-table .darg_start {
+    background-color: #f3f3f3;
+  }
+  .el-table th {
+    padding: 0;
+    .virtual {
+      position: absolute;
+      display: block;
+      width: 0;
+      height: 0;
+      top: 0px;
+      left: 0px;
+      background: none;
+      border: none;
+    }
+    &.darg_active_left {
+      .virtual {
+        border-left: 2px dotted #666;
+        z-index: 99;
+      }
+    }
+    &.darg_active_right {
+      .virtual {
+        border-right: 2px dotted #666;
+        z-index: 99;
+      }
+    }
+  }
+  .thead-cell {
+    padding: 0;
+    display: inline-flex;
+    flex-direction: column;
+    align-items: left;
+    cursor: pointer;
+    overflow: initial;
+    &:before {
+      content: "";
+      position: absolute;
+      top: 0;
+      left: 0;
+      bottom: 0;
+      right: 0;
+    }
+  }
+  &.w-table_moving {
+    .el-table th .thead-cell {
+      cursor: move !important;
+    }
+    .el-table__fixed {
+      cursor: not-allowed;
+    }
+  }
+}
+.tableInfo {
+  position: fixed;
+  right: 30px;
+  bottom: 100px;
+  z-index: 99999999;
+}
+.tableList {
+  width: 200px;
+  max-height: 500px;
+  padding: 5px;
+  margin: 0;
+  position: absolute;
+  bottom: 35px;
+  right: 0px;
+  border: 1px solid #ccc;
+  border-radius: 3%;
+  background: #fff;
+  overflow-y: scroll;
+}
+.tableList::-webkit-scrollbar {
+  width: 4px;
+  height: 4px;
+}
+.tableList::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  background: rgba(0, 0, 0, 0.2);
+}
+.tableList::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  border-radius: 0;
+  background: rgba(0, 0, 0, 0.2);
+}
+.flexList {
+  width: 100%;
+  display: flex;
+  height: 20px;
+  line-height: 20px;
+}
 </style>
 </style>
 
 

-<template>
-  <div class="tableInfo">
-    <el-dropdown trigger="click" :hide-on-click="false">
-      <el-button
-        type="primary"
-        icon="el-icon-edit"
-        size="medium"
-        circle
-      ></el-button>
-      <el-dropdown-menu slot="dropdown">
-        <el-checkbox-group v-model="checkList">
-          <el-dropdown-item
-            v-for="(item, index) in infoData"
-            :key="index"
-            v-if="!item.type"
-            class="dropItem"
-          >
-            <el-checkbox
-              :label="item.name"
-              :checked="true"
-              @change="checkChange"
-            ></el-checkbox>
-            <span class="itemRight">
-              <i class="el-icon-caret-top" @click.stop="top(index)"></i>
-              <i class="el-icon-caret-bottom" @click.stop="bottom(index)"></i>
-            </span>
-          </el-dropdown-item>
-        </el-checkbox-group>
-      </el-dropdown-menu>
-    </el-dropdown>
-  </div>
-</template>
-
-<script>
-export default {
-  props: { infoData: { type: Array, default: null } },
-  inheritAttrs: false,
-  data() {
-    return {
-      checkList: [],
-    };
-  },
-  methods: {
-    checkChange(val) {
-      this.$emit("checkChange", { type: val });
-    },
-    top(val) {
-      this.$emit("top", val);
-    },
-    bottom(val) {
-      this.$emit("bottom", val);
-    },
-  },
-  created() {},
-};
-</script>
-
-<style scope lang="scss">
-.itemRight {
-  display: -webkit-inline-box;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  height: 34px;
-  width: 24px;
-  vertical-align: middle;
-  cursor: pointer;
-  overflow: initial;
-  position: relative;
-  .el-icon-caret-bottom,
-  .el-icon-caret-top {
-    width: 0;
-    height: 0;
-    border: solid 5px transparent;
-    position: absolute;
-    left: 10px;
-  }
-  .el-icon-caret-bottom {
-    bottom: 12px;
-  }
-  .el-icon-caret-top {
-    top: 5px;
-  }
-}
-.dropItem {
-  display: flex;
-  justify-content: space-between;
-}
-</style>
-
-<style>
-.tableInfo {
-  position: fixed;
-  right: 30px;
-  bottom: 40px;
-  z-index: 99999999;
-}
-</style>
\ No newline at end of file

-<script>
-export default {
-  name: "Item",
-  inheritAttrs: false,
-  props: {
-    dom: {
-      type: Object,
-      default: null,
-    },
-  },
-  render() {
-    let newDom = [];
-    newDom.push(this.dom);
-    return newDom;
-  },
-  methods: {
-      change(val){
-          this.$emit('change',val)
-      }
-  },
-};
-</script>

@@ -3,9 +3,9 @@
  * Copyright (c) 2019 FedEx
  * Copyright (c) 2019 FedEx
  */
  */
  
  
-import store from '@/store'
+  import store from '@/store'
 
 
-export default {
+  export default {
     inserted(el, binding, vnode) {
     inserted(el, binding, vnode) {
       const { value } = binding
       const { value } = binding
       const all_permission = "*:*:*";
       const all_permission = "*:*:*";
@@ -24,5 +24,23 @@ export default {
       } else {
       } else {
         throw new Error(`请设置操作权限标签值`)
         throw new Error(`请设置操作权限标签值`)
       }
       }
+    },
+  
+    //路由权限处理
+    routerPer(router){
+      const permissions = store.getters && store.getters.permissions
+      let newRouter = [];
+      router.forEach(item => {
+        permissions.forEach(per=>{
+          if(item.meta.permissions == per){
+            newRouter.push(item)
+          }
+        })
+        if(item.children && item.children.length){
+          item.children =  this.routerPer(item.children)
         }
         }
-}
+      });
+      return newRouter
+    }
+  }
+  
\ No newline at end of file

@@ -6,7 +6,6 @@
       class="hamburger-container"
       class="hamburger-container"
       @toggleClick="toggleSideBar"
       @toggleClick="toggleSideBar"
     />
     />
-
     <breadcrumb
     <breadcrumb
       id="breadcrumb-container"
       id="breadcrumb-container"
       class="breadcrumb-container"
       class="breadcrumb-container"
@@ -16,31 +15,43 @@
 
 
     <div class="right-menu">
     <div class="right-menu">
       <template v-if="device !== 'mobile'"> </template>
       <template v-if="device !== 'mobile'"> </template>
-
+      <el-select
+        v-model="portName"
+        size="mini"
+        style="width: 120px; top: -17px; right: 7px"
+        placeholder="选择口岸"
+      >
+        <el-option
+          v-for="item in portNameList"
+          :label="item"
+          :value="item"
+          :key="item"
+        >
+        </el-option>
+      </el-select>
       <el-dropdown
       <el-dropdown
         class="avatar-container right-menu-item hover-effect"
         class="avatar-container right-menu-item hover-effect"
         trigger="click"
         trigger="click"
       >
       >
-        <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+        <div class="userName-wrapper">
+          <!-- <img :src="avatar" class="user-avatar" /> -->
+          <span><i class="el-icon-user-solid" style="color:#1890ff"></i>欢迎！{{userName}}</span>
         </div>
         </div>
         <el-dropdown-menu slot="dropdown">
         <el-dropdown-menu slot="dropdown">
-          <router-link to="/user/profile">
-          </router-link>
           <el-dropdown-item @click.native="logout">
           <el-dropdown-item @click.native="logout">
             <span>退出登录</span>
             <span>退出登录</span>
           </el-dropdown-item>
           </el-dropdown-item>
         </el-dropdown-menu>
         </el-dropdown-menu>
       </el-dropdown>
       </el-dropdown>
-      <el-select
+      <!-- <el-select
         v-model="locale"
         v-model="locale"
         size="mini"
         size="mini"
         @change="local"
         @change="local"
-        style="width: 75px;top:-17px;right:7px"
+        style="width: 75px; top: -17px; right: 7px"
       >
       >
         <el-option label="中文" value="zh"> </el-option>
         <el-option label="中文" value="zh"> </el-option>
         <el-option label="英文" value="en"> </el-option>
         <el-option label="英文" value="en"> </el-option>
-      </el-select>
+      </el-select> -->
     </div>
     </div>
     <Profile :drawer="drawer" @drawerHandleClose="drawerHandleClose"></Profile>
     <Profile :drawer="drawer" @drawerHandleClose="drawerHandleClose"></Profile>
   </div>
   </div>
@@ -51,21 +62,25 @@ import { mapGetters } from "vuex";
 import Breadcrumb from "@/components/Breadcrumb";
 import Breadcrumb from "@/components/Breadcrumb";
 import TopNav from "@/components/TopNav";
 import TopNav from "@/components/TopNav";
 import Hamburger from "@/components/Hamburger";
 import Hamburger from "@/components/Hamburger";
-import Profile from "@/views/systemConfig/userConfig/profile/index";
+import { removeToken } from '@/utils/auth'
 
 
 export default {
 export default {
   components: {
   components: {
     Breadcrumb,
     Breadcrumb,
     TopNav,
     TopNav,
     Hamburger,
     Hamburger,
-    Profile,
   },
   },
   data() {
   data() {
     return {
     return {
-      drawer: false,
+      userName:"",
+      portNameList: [],
       locale: "zh",
       locale: "zh",
     };
     };
   },
   },
+  created() {
+    this.portNameList = this.$store.state.user.portNames;
+    this.userName = this.$store.state.user.name;
+  },
   computed: {
   computed: {
     ...mapGetters(["sidebar", "avatar", "device"]),
     ...mapGetters(["sidebar", "avatar", "device"]),
     setting: {
     setting: {
@@ -84,6 +99,43 @@ export default {
         return this.$store.state.settings.topNav;
         return this.$store.state.settings.topNav;
       },
       },
     },
     },
+    //切换口岸
+    portName: {
+      get() {
+        return this.$store.state.user.activePortName;
+      },
+      set(val) {
+        this.$store
+          .dispatch("changePort", val)
+          .then((res) => {
+            if (res.code === 200) {
+              this.$store.dispatch('tagsView/delAllCachedViews')
+              this.$store.dispatch('tagsView/delAllVisitedViews')
+              // location.reload();
+              if(this.$route.path != '/index'){
+                this.$router.push('/index')
+              }
+            } else {
+              this.$confirm(res.msg, "提示", {
+                type: "warning",
+              }).then(()=>{
+                // location.reload();
+                if(this.$route.path != '/index'){
+                  this.$router.push('/index')
+                }
+              }).catch(()=>{
+                // location.reload();
+                if(this.$route.path != '/index'){
+                  this.$router.push('/index')
+                }
+              });
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      },
+    },
   },
   },
   methods: {
   methods: {
     toggleSideBar() {
     toggleSideBar() {
@@ -96,14 +148,11 @@ export default {
         type: "warning",
         type: "warning",
       }).then(() => {
       }).then(() => {
         this.$store.dispatch("LogOut").then(() => {
         this.$store.dispatch("LogOut").then(() => {
-          location.href = "/index";
-          // window.location.href = "https://test.secure.fedex.com/logout";//wsso系统跳转
+          removeToken()
+          window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout/";//wsso系统跳转
         });
         });
       });
       });
     },
     },
-    drawerHandleClose(val) {
-      this.drawer = val;
-    },
     local(val) {
     local(val) {
       this.$i18n.locale = val; //此处val为 zh 或者 en
       this.$i18n.locale = val; //此处val为 zh 或者 en
     },
     },
@@ -174,12 +223,19 @@ export default {
     }
     }
 
 
     .avatar-container {
     .avatar-container {
+      text-align: center;
       margin-right: 15px;
       margin-right: 15px;
-
-      .avatar-wrapper {
-        margin-top: 5px;
+      font-weight: 700;
+      i{
+        display: inline-block;
+        height: 50px;
+        margin-right:5px;
+        font-size: 24px;
+        line-height: 50px;
+      }
+      .userName-wrapper {
         position: relative;
         position: relative;
-
+        font-size:14px;
         .user-avatar {
         .user-avatar {
           cursor: pointer;
           cursor: pointer;
           width: 40px;
           width: 40px;

 import router from './router'
 import router from './router'
 import store from './store'
 import store from './store'
 import { Message } from 'element-ui'
 import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth'
+import { getToken, setToken, removeToken } from '@/utils/auth'
 
 
 
 
 const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
 const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
@@ -21,9 +21,10 @@ router.beforeEach((to, from, next) => {
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
           })
           })
         }).catch(err => {
         }).catch(err => {
-          store.dispatch('LogOut').then(() => {
           Message.error(err)
           Message.error(err)
-            next({ path: '/' })
+          store.dispatch('LogOut').then(() => {
+            // next({ path: '/' })
+            window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout/";//wsso系统跳转
           })
           })
         })
         })
       } else {
       } else {
@@ -31,13 +32,22 @@ router.beforeEach((to, from, next) => {
       }
       }
     }
     }
   } else {
   } else {
+    removeToken()
     // 没有token
     // 没有token
+    //wsso登录时对后端重定向带来的token进行记录
+    let token = location.search.split("token=")[1]
+    if (token != undefined && token != '' && token != null) {
+      setToken(token)
+      next({ path: '/' })
+    } else {
       if (whiteList.indexOf(to.path) !== -1) {
       if (whiteList.indexOf(to.path) !== -1) {
         // 在免登录白名单，直接进入
         // 在免登录白名单，直接进入
         next()
         next()
       } else {
       } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+        window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout/";//wsso系统跳转
+      }
     }
     }
+
   }
   }
 })
 })
 
 

@@ -42,5 +42,5 @@ module.exports = {
     /**
     /**
    * 版本号
    * 版本号
    */
    */
-     version:'version：1.0.5'
+     version:'version：1.1.0'
 }
 }

@@ -7,12 +7,15 @@ const getters = {
   token: state => state.user.token,
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
   name: state => state.user.name,
+  activePortName: state => state.user.activePortName,
+  portName: state => state.user.portName,
   introduction: state => state.user.introduction,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,
   permissions: state => state.user.permissions,
   permission_routes: state => state.permission.routes,
   permission_routes: state => state.permission.routes,
-  topbarRouters:state => state.permission.topbarRouters,
-  defaultRoutes:state => state.permission.defaultRoutes,
-  sidebarRouters:state => state.permission.sidebarRouters,
+  topbarRouters: state => state.permission.topbarRouters,
+  defaultRoutes: state => state.permission.defaultRoutes,
+  sidebarRouters: state => state.permission.sidebarRouters,
+  filghtAllData: state => state.permission.filghtAllData,
 }
 }
 export default getters
 export default getters

@@ -2,14 +2,15 @@ import { constantRoutes } from '@/router'
 import { getRouters } from '@/api/menu'
 import { getRouters } from '@/api/menu'
 import Layout from '@/layout/index'
 import Layout from '@/layout/index'
 import ParentView from '@/components/ParentView';
 import ParentView from '@/components/ParentView';
-
+import hasPermi from '../../directive/permission/hasPermi';
 const permission = {
 const permission = {
   state: {
   state: {
     routes: [],
     routes: [],
     addRoutes: [],
     addRoutes: [],
     defaultRoutes: [],
     defaultRoutes: [],
     topbarRouters: [],
     topbarRouters: [],
-    sidebarRouters: []
+    sidebarRouters: [],
+    filghtAllData: {}
   },
   },
   mutations: {
   mutations: {
     SET_ROUTES: (state, routes) => {
     SET_ROUTES: (state, routes) => {
@@ -23,13 +24,20 @@ const permission = {
       // 顶部导航菜单默认添加统计报表栏指向首页
       // 顶部导航菜单默认添加统计报表栏指向首页
       const index = [{
       const index = [{
         path: 'index',
         path: 'index',
-        meta: { title: '统计报表', icon: 'dashboard'}
+        meta: { title: '首页', icon: 'home' }
       }]
       }]
       state.topbarRouters = routes.concat(index);
       state.topbarRouters = routes.concat(index);
     },
     },
     SET_SIDEBAR_ROUTERS: (state, routes) => {
     SET_SIDEBAR_ROUTERS: (state, routes) => {
       state.sidebarRouters = routes
       state.sidebarRouters = routes
     },
     },
+    SET_FILGHTALL: (state, data) => {
+      let name = data.name;
+      state.filghtAllData[name] = data.data;
+    },
+    REMOVE_FILGHTALL: (state, name) => {
+      delete state.filghtAllData[name]
+    }
   },
   },
   actions: {
   actions: {
     // 生成路由
     // 生成路由
@@ -37,6 +45,7 @@ const permission = {
       return new Promise(resolve => {
       return new Promise(resolve => {
         // 向后端请求路由数据
         // 向后端请求路由数据
         getRouters().then(res => {
         getRouters().then(res => {
+          res.data = hasPermi.routerPer(res.data);
           const sdata = JSON.parse(JSON.stringify(res.data))
           const sdata = JSON.parse(JSON.stringify(res.data))
           const rdata = JSON.parse(JSON.stringify(res.data))
           const rdata = JSON.parse(JSON.stringify(res.data))
           const sidebarRoutes = filterAsyncRouter(sdata)
           const sidebarRoutes = filterAsyncRouter(sdata)

 import { login, logout, getInfo } from '@/api/login'
 import { login, logout, getInfo } from '@/api/login'
+import { changeCurrentPort } from "@/api/system/user.js";
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { getToken, setToken, removeToken } from '@/utils/auth'
+import { Message } from 'element-ui'
 
 
 const user = {
 const user = {
   state: {
   state: {
     token: getToken(),
     token: getToken(),
     name: '',
     name: '',
     avatar: '',
     avatar: '',
+    activePortName: '',
+    portNames:[],
     roles: [],
     roles: [],
     permissions: []
     permissions: []
   },
   },
@@ -20,6 +24,13 @@ const user = {
     SET_AVATAR: (state, avatar) => {
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
       state.avatar = avatar
     },
     },
+    SET_ACTIVEPORTNAME: (state, activePortName) => {
+      state.activePortName = activePortName
+      sessionStorage.setItem('portName', activePortName)
+    },
+    SET_PORTNAMES:(state,portNames)=>{
+      state.portNames = portNames
+    },
     SET_ROLES: (state, roles) => {
     SET_ROLES: (state, roles) => {
       state.roles = roles
       state.roles = roles
     },
     },
@@ -29,6 +40,7 @@ const user = {
   },
   },
 
 
   actions: {
   actions: {
+
     // 登录
     // 登录
     Login({ commit }, userInfo) {
     Login({ commit }, userInfo) {
       const username = userInfo.username.trim()
       const username = userInfo.username.trim()
@@ -36,10 +48,12 @@ const user = {
       const rememberMe = userInfo.rememberMe
       const rememberMe = userInfo.rememberMe
 
 
       return new Promise((resolve, reject) => {
       return new Promise((resolve, reject) => {
-        login(username, password,rememberMe).then(res => {
+        login(username, password, rememberMe).then(res => {
+          if(res.code === 200){
             setToken(res.data)
             setToken(res.data)
             commit('SET_TOKEN', res.data)
             commit('SET_TOKEN', res.data)
-          resolve()
+          }
+          resolve(res)
         }).catch(error => {
         }).catch(error => {
           reject(error)
           reject(error)
         })
         })
@@ -52,6 +66,20 @@ const user = {
         getInfo().then(res => {
         getInfo().then(res => {
           const user = res.data.user
           const user = res.data.user
           const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+          let ports = [];
+          if(user.portName){
+            ports = user.portName.split(',');
+            commit('SET_PORTNAMES',ports)
+            commit('SET_ACTIVEPORTNAME', sessionStorage.getItem('portName')?sessionStorage.getItem('portName'):state.portNames[0])
+          }else{
+            Message({
+              message: "未找到口岸信息！请确认后再登录",
+              type: 'error'
+            })
+            this.LogOut().then(()=>{
+              window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout/";//wsso系统跳转
+            })
+          }
           if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
           if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.data.roles)
             commit('SET_ROLES', res.data.roles)
             commit('SET_PERMISSIONS', res.data.permissions)
             commit('SET_PERMISSIONS', res.data.permissions)
@@ -67,11 +95,25 @@ const user = {
       })
       })
     },
     },
 
 
+    //切换口岸
+    changePort({ commit }, portName) {
+      return new Promise((resolve, reject) => {
+        changeCurrentPort({ portName: portName }).then(res=>{
+          if(res.code === 200){
+            commit('SET_ACTIVEPORTNAME',portName)
+          }
+          resolve(res)
+        }).catch(err=>{
+          reject(err)
+        })
+      })
+    },
+
     // 退出系统
     // 退出系统
     LogOut({ commit, state }) {
     LogOut({ commit, state }) {
       return new Promise((resolve, reject) => {
       return new Promise((resolve, reject) => {
         logout(state.token).then(() => {
         logout(state.token).then(() => {
-
+          // window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout";//wsso系统跳转
           commit('SET_TOKEN', '')
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
           commit('SET_ROLES', [])
           commit('SET_PERMISSIONS', [])
           commit('SET_PERMISSIONS', [])
@@ -86,6 +128,7 @@ const user = {
     // 前端 登出
     // 前端 登出
     FedLogOut({ commit }) {
     FedLogOut({ commit }) {
       return new Promise(resolve => {
       return new Promise(resolve => {
+        // window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout";//wsso系统跳转
         commit('SET_TOKEN', '')
         commit('SET_TOKEN', '')
         removeToken()
         removeToken()
         resolve()
         resolve()

@@ -5,9 +5,9 @@
 
 
  const baseURL = process.env.VUE_APP_BASE_API
  const baseURL = process.env.VUE_APP_BASE_API
 
 
-// 日期格式化
-export function parseTime(time, pattern) {
-	debugger
+ // 日期格式化
+ export function parseTime(time, pattern) {
+	 //debugger
 	 if (arguments.length === 0 || !time) {
 	 if (arguments.length === 0 || !time) {
 		 return null
 		 return null
 	 }
 	 }
@@ -45,17 +45,17 @@ export function parseTime(time, pattern) {
 		 return value || 0
 		 return value || 0
 	 })
 	 })
 	 return time_str
 	 return time_str
-}
+ }
  
  
-// 表单重置
-export function resetForm(refName) {
+ // 表单重置
+ export function resetForm(refName) {
 	 if (this.$refs[refName]) {
 	 if (this.$refs[refName]) {
 		 this.$refs[refName].resetFields();
 		 this.$refs[refName].resetFields();
 	 }
 	 }
-}
+ }
  
  
-// 添加日期范围
-export function addDateRange(params, dateRange, propName) {
+ // 添加日期范围
+ export function addDateRange(params, dateRange, propName) {
 	 var search = params;
 	 var search = params;
 	 search.params = {};
 	 search.params = {};
 	 if (null != dateRange && '' != dateRange) {
 	 if (null != dateRange && '' != dateRange) {
@@ -68,10 +68,10 @@ export function addDateRange(params, dateRange, propName) {
 		 }
 		 }
 	 }
 	 }
 	 return search;
 	 return search;
-}
+ }
  
  
-// 回显数据字典
-export function selectDictLabel(datas, value) {
+ // 回显数据字典
+ export function selectDictLabel(datas, value) {
 	 var actions = [];
 	 var actions = [];
 	 Object.keys(datas).some((key) => {
 	 Object.keys(datas).some((key) => {
 		 if (datas[key].dictValue == ('' + value)) {
 		 if (datas[key].dictValue == ('' + value)) {
@@ -80,10 +80,10 @@ export function selectDictLabel(datas, value) {
 		 }
 		 }
 	 })
 	 })
 	 return actions.join('');
 	 return actions.join('');
-}
+ }
  
  
-// 回显数据字典（字符串数组）
-export function selectDictLabels(datas, value, separator) {
+ // 回显数据字典（字符串数组）
+ export function selectDictLabels(datas, value, separator) {
 	 var actions = [];
 	 var actions = [];
 	 var currentSeparator = undefined === separator ? "," : separator;
 	 var currentSeparator = undefined === separator ? "," : separator;
 	 var temp = value.split(currentSeparator);
 	 var temp = value.split(currentSeparator);
@@ -95,15 +95,15 @@ export function selectDictLabels(datas, value, separator) {
 		 })
 		 })
 	 })
 	 })
 	 return actions.join('').substring(0, actions.join('').length - 1);
 	 return actions.join('').substring(0, actions.join('').length - 1);
-}
+ }
  
  
-// 通用下载方法
-export function download(fileName) {
+ // 通用下载方法
+ export function download(fileName) {
 	 window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
 	 window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
-}
+ }
  
  
-// 字符串格式化(%s )
-export function sprintf(str) {
+ // 字符串格式化(%s )
+ export function sprintf(str) {
 	 var args = arguments, flag = true, i = 1;
 	 var args = arguments, flag = true, i = 1;
 	 str = str.replace(/%s/g, function () {
 	 str = str.replace(/%s/g, function () {
 		 var arg = args[i++];
 		 var arg = args[i++];
@@ -114,24 +114,24 @@ export function sprintf(str) {
 		 return arg;
 		 return arg;
 	 });
 	 });
 	 return flag ? str : '';
 	 return flag ? str : '';
-}
+ }
  
  
-// 转换字符串，undefined,null等转化为""
-export function praseStrEmpty(str) {
+ // 转换字符串，undefined,null等转化为""
+ export function praseStrEmpty(str) {
 	 if (!str || str == "undefined" || str == "null") {
 	 if (!str || str == "undefined" || str == "null") {
 		 return "";
 		 return "";
 	 }
 	 }
 	 return str;
 	 return str;
-}
+ }
  
  
-/**
+ /**
   * 构造树型结构数据
   * 构造树型结构数据
   * @param {*} data 数据源
   * @param {*} data 数据源
   * @param {*} id id字段 默认 'id'
   * @param {*} id id字段 默认 'id'
   * @param {*} parentId 父节点字段 默认 'parentId'
   * @param {*} parentId 父节点字段 默认 'parentId'
   * @param {*} children 孩子节点字段 默认 'children'
   * @param {*} children 孩子节点字段 默认 'children'
   */
   */
-export function handleTree(data, id, parentId, children) {
+ export function handleTree(data, id, parentId, children) {
 	 let config = {
 	 let config = {
 		 id: id || 'id',
 		 id: id || 'id',
 		 parentId: parentId || 'parentId',
 		 parentId: parentId || 'parentId',
@@ -173,10 +173,10 @@ export function handleTree(data, id, parentId, children) {
 		 }
 		 }
 	 }
 	 }
 	 return tree;
 	 return tree;
-}
+ }
  
  
-//字符串英文转大写，；转英文;
-export function upCase(str){
-	let newStr = str.replace(/；/g,";").toUpperCase().trim();
+ //字符串英文转大写，；转英文;
+ export function upCase(str){
+	  let newStr = str.replace(/；/g,";").toUpperCase();
 	 return newStr;
 	 return newStr;
-}
+ }

@@ -17,5 +17,6 @@ export function setToken(token) {
 export function removeToken() {
 export function removeToken() {
   //return Cookies.remove(TokenKey)
   //return Cookies.remove(TokenKey)
   // return localStorage.removeItem(TokenKey)
   // return localStorage.removeItem(TokenKey)
+  sessionStorage.removeItem('portName')
   return sessionStorage.removeItem(TokenKey)
   return sessionStorage.removeItem(TokenKey)
 }
 }

@@ -67,8 +67,10 @@ service.interceptors.response.use(res => {
       type: 'warning'
       type: 'warning'
     }
     }
     ).then(() => {
     ).then(() => {
-      store.dispatch('FedLogOut').then(() => {
-        location.href = '/index';
+      store.dispatch('LogOut').then(() => {
+        // location.href = '/';
+         window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout/";//wsso系统跳转
+        //  testsso.ute.apac.fedex.com/iMAC
       })
       })
     })
     })
   } else if (code === 403) {
   } else if (code === 403) {

@@ -199,6 +199,7 @@
         <el-col :span="6">
         <el-col :span="6">
           <el-form-item label="取件日期">
           <el-form-item label="取件日期">
             <el-date-picker
             <el-date-picker
+              class="formItem"
               v-model="formData.pickUpDate"
               v-model="formData.pickUpDate"
               type="date"
               type="date"
               placeholder="选择日期"
               placeholder="选择日期"
@@ -208,16 +209,6 @@
             </el-date-picker>
             </el-date-picker>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="口岸代码">
-            <el-input
-              v-model="portName"
-              placeholder="请输入口岸代码"
-              class="formItem"
-              clearable
-            ></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="24">
         <el-col :span="24">
           <el-form-item label="Handling Code">
           <el-form-item label="Handling Code">
             <el-empty
             <el-empty
@@ -267,6 +258,7 @@
         <el-button
         <el-button
           :type="downLoadingTip.downloading ? 'warning' : 'primary'"
           :type="downLoadingTip.downloading ? 'warning' : 'primary'"
           size="mini"
           size="mini"
+          v-hasPermi="['allocation:cargo:export']"
           @click="xlsx(0)"
           @click="xlsx(0)"
           :loading="downLoadingTip.downloading"
           :loading="downLoadingTip.downloading"
           :disabled="tableData.length <= 0"
           :disabled="tableData.length <= 0"
@@ -277,6 +269,7 @@
         <el-button
         <el-button
           :type="downLoadingTip.downloading ? 'warning' : 'primary'"
           :type="downLoadingTip.downloading ? 'warning' : 'primary'"
           size="mini"
           size="mini"
+          v-hasPermi="['allocation:cargo:export']"
           @click="xlsx(1)"
           @click="xlsx(1)"
           :loading="downLoadingTip.downloading"
           :loading="downLoadingTip.downloading"
           :disabled="tableData.length <= 0"
           :disabled="tableData.length <= 0"
@@ -287,8 +280,9 @@
         <el-button
         <el-button
           type="primary"
           type="primary"
           size="mini"
           size="mini"
+          v-hasPermi="['allocation:cargo:allocation']"
           @click="addFit"
           @click="addFit"
-          :disabled="tableSelection.length <= 0"
+          :disabled="tableSelection.length <= 0 || formData.accsPool!='OSPR'"
           >添加到航班</el-button
           >添加到航班</el-button
         >
         >
         <div class="tips">
         <div class="tips">
@@ -307,7 +301,8 @@
       :limitStart="formData.limitStart"
       :limitStart="formData.limitStart"
       :page="page"
       :page="page"
       :shiftKey="shiftKey"
       :shiftKey="shiftKey"
-      height="350"
+      :infoShow="false"
+      :height="tableHeight"
       @tableSelect="tableSelect"
       @tableSelect="tableSelect"
       @tableSelectAll="tableSelectAll"
       @tableSelectAll="tableSelectAll"
       @currentChange="currentChange"
       @currentChange="currentChange"
@@ -817,6 +812,7 @@ export default {
       size: 100,
       size: 100,
       allWeight: 0,
       allWeight: 0,
       allQty: 0,
       allQty: 0,
+      tableHeight:null,
       dialogVisible: false,
       dialogVisible: false,
       shiftKey: false,
       shiftKey: false,
       createDate: null,
       createDate: null,
@@ -829,6 +825,11 @@ export default {
   },
   },
   created() {
   created() {
     this.seleData();
     this.seleData();
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.select();
+    }
+  },
+  activated(){
     this.select();
     this.select();
   },
   },
   mounted() {
   mounted() {
@@ -842,6 +843,7 @@ export default {
         this.shiftKey = false;
         this.shiftKey = false;
       }
       }
     });
     });
+    this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight-60
   },
   },
   methods: {
   methods: {
     //查询条件
     //查询条件
@@ -888,9 +890,9 @@ export default {
             this.tableData = res.data.list;
             this.tableData = res.data.list;
             this.totalCount = res.data.total;
             this.totalCount = res.data.total;
             if (res.data.list.length > 0) {
             if (res.data.list.length > 0) {
-              this.tableData.forEach((item, index = 0) => {
-                item.index = index;
-              });
+              // this.tableData.forEach((item, index = 0) => {
+              //   item.index = index;
+              // });
             } else {
             } else {
               this.$message({
               this.$message({
                 message: "未查询到数据",
                 message: "未查询到数据",
@@ -1025,14 +1027,20 @@ export default {
         }
         }
       });
       });
       data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
       data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
-      if (val.order != "ascending") {
+      if (val.order == "descending") {
         this.tableData = nullData.concat(data);
         this.tableData = nullData.concat(data);
-      } else {
+      } else{
         this.tableData = data.concat(nullData);
         this.tableData = data.concat(nullData);
       }
       }
-      this.tableData.forEach((item, index = 0) => {
-        item.index = index;
-      });
+      this.tableSelection = []
+      this.cargoTotal()
+      // this.tableData.forEach((item, index = 0) => {
+      //   item.index = index;
+      // });
+    },
+    sizeChange(val){
+      this.size = val
+      this.select(0);
     },
     },
     //添加到航班
     //添加到航班
     addFit() {
     addFit() {
@@ -1083,6 +1091,9 @@ export default {
       },
       },
     },
     },
   },
   },
+  deactivated(){
+    this.tableData = []
+  },
 };
 };
 </script>
 </script>
 
 

@@ -28,6 +28,7 @@
           :label="item.name"
           :label="item.name"
           :key="index"
           :key="index"
           :show-overflow-tooltip="true"
           :show-overflow-tooltip="true"
+          :formatter="formatter"
         >
         >
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -119,7 +120,7 @@ export default {
           },
           },
         ],
         ],
       },
       },
-      loading:false
+      loading:false,
     };
     };
   },
   },
   methods: {
   methods: {
@@ -133,7 +134,7 @@ export default {
     },
     },
     //确定配舱
     //确定配舱
     submit() {
     submit() {
-      this.loading = true;
+      this.loading= true;
       let arr = [];
       let arr = [];
       this.tableData.forEach((item) => {
       this.tableData.forEach((item) => {
         arr.push(item.id);
         arr.push(item.id);
@@ -141,6 +142,7 @@ export default {
       this.formData.ids = arr;
       this.formData.ids = arr;
       if (this.formData.fltNo && this.formData.fltDate) {
       if (this.formData.fltNo && this.formData.fltDate) {
         allocationFlight(this.formData).then((res) => {
         allocationFlight(this.formData).then((res) => {
+          this.loading = false;
           //code 200 配舱成功 202 重量已满需要确认 其余code直接输出msg
           //code 200 配舱成功 202 重量已满需要确认 其余code直接输出msg
           if (res.code === 200) {
           if (res.code === 200) {
             this.$message({
             this.$message({
@@ -148,7 +150,6 @@ export default {
               type: "success",
               type: "success",
             });
             });
             this.cleaerForm();
             this.cleaerForm();
-            this.loading = false;
             this.$emit("dialogBeforeClose", { close: false, reload: true });
             this.$emit("dialogBeforeClose", { close: false, reload: true });
           } else if (res.code === 202) {
           } else if (res.code === 202) {
             MessageBox.confirm(res.msg, "提示", {
             MessageBox.confirm(res.msg, "提示", {
@@ -210,6 +211,16 @@ export default {
       this.cleaerForm();
       this.cleaerForm();
       this.$emit("dialogBeforeClose", { close: false, reload: true });
       this.$emit("dialogBeforeClose", { close: false, reload: true });
     },
     },
+    formatter(row, column, cellValue, index){
+      if(column.property == "cargoRulesStatus"){
+        if(cellValue == 1){
+          return "手动"
+        }else{
+          return "自动"
+        }
+      }
+      return cellValue
+    }
   },
   },
   computed: {
   computed: {
     fltNo: {
     fltNo: {

@@ -37,6 +37,7 @@
           type="primary"
           type="primary"
           icon="el-icon-plus"
           icon="el-icon-plus"
           size="mini"
           size="mini"
+          v-hasPermi="['allocation:alloc:add']"
           @click="
           @click="
             $router.push({
             $router.push({
               name: 'FlightAllocConfigAdd',
               name: 'FlightAllocConfigAdd',
@@ -90,6 +91,7 @@
             type="text"
             type="text"
             size="mini"
             size="mini"
             icon="el-icon-edit"
             icon="el-icon-edit"
+            v-hasPermi="['allocation:alloc:update']"
             @click="handleClick(scope.row.id, 'update')"
             @click="handleClick(scope.row.id, 'update')"
             >修改</el-button
             >修改</el-button
           >
           >
@@ -97,6 +99,7 @@
             type="text"
             type="text"
             size="mini"
             size="mini"
             icon="el-icon-delete"
             icon="el-icon-delete"
+            v-hasPermi="['allocation:alloc:delete']"
             @click="del(scope.row.id, scope.row.status)"
             @click="del(scope.row.id, scope.row.status)"
             >删除</el-button
             >删除</el-button
           >
           >
@@ -104,6 +107,7 @@
             type="text"
             type="text"
             size="mini"
             size="mini"
             icon="el-icon-video-pause"
             icon="el-icon-video-pause"
+            v-hasPermi="['allocation:alloc:openClose']"
             @click="changeStatus(scope.row.id, 3)"
             @click="changeStatus(scope.row.id, 3)"
             v-if="scope.row.status == '1'"
             v-if="scope.row.status == '1'"
             >停用</el-button
             >停用</el-button
@@ -112,6 +116,7 @@
             type="text"
             type="text"
             size="mini"
             size="mini"
             icon="el-icon-video-play"
             icon="el-icon-video-play"
+            v-hasPermi="['allocation:alloc:openClose']"
             @click="changeStatus(scope.row.id, 1)"
             @click="changeStatus(scope.row.id, 1)"
             v-else
             v-else
             >启用</el-button
             >启用</el-button
@@ -159,9 +164,17 @@ export default {
       loading: false,
       loading: false,
     };
     };
   },
   },
+  created() {
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.getList();
+    }
+  },
   activated(){
   activated(){
     this.getList()
     this.getList()
   },
   },
+  deactivated(){
+    this.flyList = []
+  },
   methods: {
   methods: {
     getList() {
     getList() {
       this.queryParams.limit = this.limit;
       this.queryParams.limit = this.limit;
@@ -240,9 +253,6 @@ export default {
       });
       });
     },
     },
   },
   },
-  created() {
-    this.getList();
-  },
   computed: {
   computed: {
     purposeOfFlightNo: {
     purposeOfFlightNo: {
       get: function () {
       get: function () {

 <template>
 <template>
   <div>
   <div>
-    <el-form :model="queryParams" ref="queryForm" :inline="true">
-      <el-form-item label="ACCS原航班">
+    <el-form
+      class="form-header"
+      :model="queryParams"
+      ref="queryForm"
+      size="medium"
+      :inline="true"
+      label-position="right"
+      label-width="auto"
+    >
+      <el-form-item label="原航班">
         <el-input
         <el-input
           type="text"
           type="text"
           v-model="upCase"
           v-model="upCase"
-          placeholder="请输入ACCS原航班"
+          placeholder="请输入原航班"
           clearable
           clearable
-          class="formItem"
         ></el-input>
         ></el-input>
         <!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> -->
         <!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> -->
       </el-form-item>
       </el-form-item>
       <el-form-item label="状态" prop="status">
       <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择"
-          clearable
-          size="small"
-        >
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable>
           <el-option
           <el-option
             v-for="dict in statusList"
             v-for="dict in statusList"
             :key="dict.id"
             :key="dict.id"
@@ -33,7 +35,7 @@
           icon="el-icon-search"
           icon="el-icon-search"
           size="mini"
           size="mini"
           @click="handleQuery"
           @click="handleQuery"
-          >查询ACCS原航班配置</el-button
+          >查询原航班配置</el-button
         >
         >
       </el-form-item>
       </el-form-item>
       <br />
       <br />
@@ -43,7 +45,6 @@
           v-model="queryParams.flightDate"
           v-model="queryParams.flightDate"
           type="date"
           type="date"
           placeholder="选择日期"
           placeholder="选择日期"
-          clearable
         >
         >
         </el-date-picker>
         </el-date-picker>
       </el-form-item>
       </el-form-item>
@@ -56,22 +57,18 @@
           @click="findSourceFlightAndFlightDate"
           @click="findSourceFlightAndFlightDate"
           >查询实际配载航班 </el-button
           >查询实际配载航班 </el-button
         >&#12288;
         >&#12288;
-        <span style="color: #ff4949"
-          >注：ACCS原航班+日期查询该日期的航班实际情况</span
-        >
+        <span style="color:#ff4949">注：原航班+日期查询该日期的航班实际情况</span>
       </el-form-item>
       </el-form-item>
       <br />
       <br />
       <el-form-item>
       <el-form-item>
-        <el-col :span="1.5">
         <el-button
         <el-button
           type="primary"
           type="primary"
           icon="el-icon-plus"
           icon="el-icon-plus"
           size="mini"
           size="mini"
+          v-hasPermi="['allocation:rand:add']"
           @click="handleAdd"
           @click="handleAdd"
           >添加规则</el-button
           >添加规则</el-button
         >
         >
-        </el-col>
-        &#12288;
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
           >重置</el-button
         >
         >
@@ -90,18 +87,13 @@
       <el-table-column type="index" label="序号" align="center">
       <el-table-column type="index" label="序号" align="center">
         <template slot-scope="scope">{{ scope.$index + 1 }}</template>
         <template slot-scope="scope">{{ scope.$index + 1 }}</template>
       </el-table-column>
       </el-table-column>
-      <el-table-column
-        label="ACCS原航班"
-        align="center"
-        prop="sourceFlightNo"
-      />
+      <el-table-column label="原航班" align="center" prop="sourceFlightNo" />
       <el-table-column
       <el-table-column
         label="配载航班排序"
         label="配载航班排序"
         align="center"
         align="center"
         prop="flightRank"
         prop="flightRank"
         width="280"
         width="280"
       />
       />
-      <!-- <el-table-column label="优先级" align="center" prop="priority"  /> -->
       <el-table-column
       <el-table-column
         label="周期"
         label="周期"
         align="center"
         align="center"
@@ -150,6 +142,7 @@
             size="mini"
             size="mini"
             type="text"
             type="text"
             icon="el-icon-edit"
             icon="el-icon-edit"
+            v-hasPermi="['allocation:rand:update']"
             @click="handleUpdate(scope.row)"
             @click="handleUpdate(scope.row)"
             >修改</el-button
             >修改</el-button
           >
           >
@@ -157,6 +150,7 @@
             size="mini"
             size="mini"
             type="text"
             type="text"
             icon="el-icon-delete"
             icon="el-icon-delete"
+            v-hasPermi="['allocation:rand:delete']"
             @click="handleDeleteorPlayorpause(scope.row, 0, '删除')"
             @click="handleDeleteorPlayorpause(scope.row, 0, '删除')"
           >
           >
             删除</el-button
             删除</el-button
@@ -166,6 +160,7 @@
             type="text"
             type="text"
             icon="el-icon-video-play"
             icon="el-icon-video-play"
             v-if="scope.row.status == '3'"
             v-if="scope.row.status == '3'"
+            v-hasPermi="['allocation:rand:openClose']"
             @click="handleDeleteorPlayorpause(scope.row, 1, '启用')"
             @click="handleDeleteorPlayorpause(scope.row, 1, '启用')"
             >启用</el-button
             >启用</el-button
           >
           >
@@ -174,6 +169,7 @@
             type="text"
             type="text"
             icon="el-icon-video-pause"
             icon="el-icon-video-pause"
             v-if="scope.row.status != '3'"
             v-if="scope.row.status != '3'"
+            v-hasPermi="['allocation:rand:openClose']"
             @click="handleDeleteorPlayorpause(scope.row, 3, '停用')"
             @click="handleDeleteorPlayorpause(scope.row, 3, '停用')"
             >停用</el-button
             >停用</el-button
           >
           >
@@ -202,11 +198,7 @@
         <el-table-column type="index" label="序号" align="center">
         <el-table-column type="index" label="序号" align="center">
           <template slot-scope="scope">{{ scope.$index + 1 }}</template>
           <template slot-scope="scope">{{ scope.$index + 1 }}</template>
         </el-table-column>
         </el-table-column>
-        <el-table-column
-          label="ACCS原航班"
-          align="center"
-          prop="sourceFlightNo"
-        />
+        <el-table-column label="原航班" align="center" prop="sourceFlightNo" />
         <el-table-column
         <el-table-column
           label="实际配载航班"
           label="实际配载航班"
           align="center"
           align="center"
@@ -244,17 +236,42 @@
       :append-to-body="true"
       :append-to-body="true"
       :close-on-click-modal="false"
       :close-on-click-modal="false"
     >
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-position="right"
+        label-width="auto"
+      >
         <el-row>
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="ACCS原航班" prop="sourceFlightNo">
+          <el-col :span="8">
+            <el-form-item label="原航班" prop="sourceFlightNo">
               <el-input
               <el-input
                 v-model="form.sourceFlightNo"
                 v-model="form.sourceFlightNo"
-                placeholder="请输入ACCS原航班号"
+                placeholder="请输入原航班号"
                 maxlength="10"
                 maxlength="10"
               />
               />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="口岸" prop="portName">
+              <el-select
+                :disabled="true"
+                v-model="form.portName"
+                size="mini"
+                placeholder="选择口岸"
+              >
+                <el-option
+                  v-for="item in portNameList"
+                  :label="item"
+                  :value="item"
+                  :key="item"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         </el-row>
         <el-row>
         <el-row>
           <el-col :span="8">
           <el-col :span="8">
@@ -287,10 +304,10 @@
           </el-col>
           </el-col>
 
 
           <el-col :span="24" style="margin-bottom: 5%">
           <el-col :span="24" style="margin-bottom: 5%">
-            <span style="color:#ff4949; margin-left: 10%"
+            <span style="color: #ff4949; margin-left: 10%"
               >提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span
               >提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span
             ><br />
             ><br />
-            <span style="color:#ff4949; margin-left: 10%"
+            <span style="color: #ff4949; margin-left: 10%"
               >提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1;CZ433-1</span
               >提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1;CZ433-1</span
             >
             >
           </el-col>
           </el-col>
@@ -335,6 +352,7 @@ export default {
   name: "FlightRandConfig",
   name: "FlightRandConfig",
   data() {
   data() {
     return {
     return {
+      portNameList: [],
       // data 中设定
       // data 中设定
       pickerOptionsStart: {
       pickerOptionsStart: {
         disabledDate: (time) => {
         disabledDate: (time) => {
@@ -359,7 +377,6 @@ export default {
           }
           }
         },
         },
       },
       },
-
       //周期段
       //周期段
       dayOfWeekList: ["D1", "D2", "D3", "D4", "D5", "D6", "D7"],
       dayOfWeekList: ["D1", "D2", "D3", "D4", "D5", "D6", "D7"],
       // 遮罩层
       // 遮罩层
@@ -390,6 +407,7 @@ export default {
       openFlightDate: false,
       openFlightDate: false,
       // 查询参数
       // 查询参数
       queryParams: {
       queryParams: {
+        portName: undefined,
         start: 0, //当前条数【代表第几条数据 +1开始】
         start: 0, //当前条数【代表第几条数据 +1开始】
         pageNum: 1,
         pageNum: 1,
         limit: 20, //一页显示多少条数据
         limit: 20, //一页显示多少条数据
@@ -422,8 +440,26 @@ export default {
     };
     };
   },
   },
   created() {
   created() {
+    this.queryParams.portName = this.$store.state.user.activePortName;
+    this.portNameList = this.$store.state.user.portNames;
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.findSourceFlightRules();
+    }
+  },
+  activated(){
     this.findSourceFlightRules();
     this.findSourceFlightRules();
   },
   },
+  deactivated(){
+    this.sourceFlightRulesList = []
+  },
+  watch:{
+    open(val,oldVal){
+      if(val){
+        this.queryParams.portName = this.$store.state.user.activePortName;
+        this.form.portName = this.$store.state.user.activePortName;
+      }
+    }
+  },
   methods: {
   methods: {
     //跳转到查看，修改页面
     //跳转到查看，修改页面
     handleClick(flightiId, handle) {
     handleClick(flightiId, handle) {
@@ -459,16 +495,17 @@ export default {
     handleAdd() {
     handleAdd() {
       this.form = {};
       this.form = {};
       this.open = true;
       this.open = true;
-      this.title = "添加ACCS原航班顺位规则";
+      this.title = "添加原航班顺位规则";
       this.form.id = -1;
       this.form.id = -1;
       this.dayOfWeek = [];
       this.dayOfWeek = [];
+      this.form.portName = this.$store.state.user.activePortName;
     },
     },
     /** 修改按钮操作 */
     /** 修改按钮操作 */
     handleUpdate(row) {
     handleUpdate(row) {
       this.form = {};
       this.form = {};
       this.dayOfWeek = [];
       this.dayOfWeek = [];
       this.open = true;
       this.open = true;
-      this.title = "修改ACCS原航班顺位规则";
+      this.title = "修改原航班顺位规则";
       this.form = JSON.parse(JSON.stringify(row));
       this.form = JSON.parse(JSON.stringify(row));
       this.dayOfWeek = this.form.dayOfWeek
       this.dayOfWeek = this.form.dayOfWeek
         ? this.form.dayOfWeek.split(";")
         ? this.form.dayOfWeek.split(";")
@@ -490,12 +527,15 @@ export default {
         confirmButtonText: "确定",
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         cancelButtonText: "取消",
         type: "warning",
         type: "warning",
-      }).then(() => {
+      })
+        .then(() => {
           let disable = {
           let disable = {
             id: row.id,
             id: row.id,
             status: status,
             status: status,
           };
           };
-        delOrEnableORDisableApi(disable)
+
+          return delOrEnableORDisableApi(disable);
+        })
         .then((response) => {
         .then((response) => {
           if (response.code == 200) {
           if (response.code == 200) {
             this.findSourceFlightRules();
             this.findSourceFlightRules();
@@ -505,7 +545,6 @@ export default {
           }
           }
         })
         })
         .catch(() => {});
         .catch(() => {});
-      });
     },
     },
     /** 提交按钮 */
     /** 提交按钮 */
     submitForm: function () {
     submitForm: function () {

@@ -108,6 +108,7 @@
           :loading="downLoadingTip.downloading"
           :loading="downLoadingTip.downloading"
           icon="el-icon-download"
           icon="el-icon-download"
           size="mini"
           size="mini"
+          v-hasPermi="['base:caExport:export']"
           >{{
           >{{
             downLoadingTip.downloading ? downLoadingTip.tip : "导出"
             downLoadingTip.downloading ? downLoadingTip.tip : "导出"
           }}</el-button
           }}</el-button
@@ -178,7 +179,7 @@
 
 
 <script>
 <script>
 import { findCagroPreData } from "@/api/cargoSelect";
 import { findCagroPreData } from "@/api/cargoSelect";
-import { cargoXlsxPre } from "@/utils/zipdownload";
+import { downLoadXlsx } from "@/utils/zipdownload";
 export default {
 export default {
   name: "CAPreQualificationExport",
   name: "CAPreQualificationExport",
   data() {
   data() {
@@ -232,7 +233,7 @@ export default {
       );
       );
       cargoXlse.cargoExportPreQueryDto.limitStart = 0;
       cargoXlse.cargoExportPreQueryDto.limitStart = 0;
       cargoXlse.cargoExportPreQueryDto.limitSize = -1;
       cargoXlse.cargoExportPreQueryDto.limitSize = -1;
-      cargoXlsxPre("/cargo/excelPre", cargoXlse)
+      downLoadXlsx("/cargo/excelPre", cargoXlse,'航班预审表')
         .then(() => {
         .then(() => {
           this.downLoadingTip.downloading = false;
           this.downLoadingTip.downloading = false;
           this.downLoadingTip.tip = "";
           this.downLoadingTip.tip = "";

@@ -4,12 +4,12 @@
       <el-form-item>
       <el-form-item>
         <el-upload action="/caPreReviewImport/importFlight" name="file" :http-request="uploadExcel"
         <el-upload action="/caPreReviewImport/importFlight" name="file" :http-request="uploadExcel"
           :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
           :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
-          class="upload-demo">
+          class="upload-demo" v-hasPermi="['base:caImport:import']">
           <el-button type="primary">点击上传</el-button>
           <el-button type="primary">点击上传</el-button>
         </el-upload>
         </el-upload>
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="downloadTempleate">下载模板</el-button>
+        <el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:caImport:download']">下载模板</el-button>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
     <div style="font-size: 12px; font-weight: 700">
     <div style="font-size: 12px; font-weight: 700">

@@ -23,12 +23,13 @@
           :file-list="fileList"
           :file-list="fileList"
           accept=".xlsx"
           accept=".xlsx"
           class="upload-demo"
           class="upload-demo"
+          v-hasPermi="['base:flightImport:importFlight']"
         >
         >
           <el-button type="primary">点击上传</el-button>
           <el-button type="primary">点击上传</el-button>
         </el-upload>
         </el-upload>
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="downloadTempleate"
+        <el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:flightImport:exportExcel']"
           >下载模板</el-button
           >下载模板</el-button
         >
         >
       </el-form-item>
       </el-form-item>

@@ -21,7 +21,6 @@
             </el-date-picker>
             </el-date-picker>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-
         <el-col :span="6">
         <el-col :span="6">
           <el-form-item label="到" prop="fltDateEnd">
           <el-form-item label="到" prop="fltDateEnd">
             <el-date-picker
             <el-date-picker
@@ -34,7 +33,6 @@
             </el-date-picker>
             </el-date-picker>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-
         <el-col :span="6">
         <el-col :span="6">
           <el-form-item label="航班号" prop="fltNo">
           <el-form-item label="航班号" prop="fltNo">
             <el-input
             <el-input
@@ -45,7 +43,6 @@
             />
             />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-
         <el-col :span="6">
         <el-col :span="6">
           <el-form-item label="航班类型" prop="typeId">
           <el-form-item label="航班类型" prop="typeId">
             <el-select
             <el-select
@@ -55,7 +52,7 @@
               clearable
               clearable
             >
             >
               <el-option
               <el-option
-                v-for="dict in flightTypelist"
+                v-for="dict in selectOption.flightTypelist"
                 :key="dict.id"
                 :key="dict.id"
                 :label="dict.chineseName"
                 :label="dict.chineseName"
                 :value="dict.id"
                 :value="dict.id"
@@ -63,7 +60,6 @@
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-
         <el-col :span="6">
         <el-col :span="6">
           <el-form-item label="航班状态" prop="statusId">
           <el-form-item label="航班状态" prop="statusId">
             <el-select
             <el-select
@@ -73,7 +69,7 @@
               clearable
               clearable
             >
             >
               <el-option
               <el-option
-                v-for="dict in flightStatuslist"
+                v-for="dict in selectOption.flightStatuslist"
                 :key="dict.id"
                 :key="dict.id"
                 :label="dict.chineseName"
                 :label="dict.chineseName"
                 :value="dict.id"
                 :value="dict.id"
@@ -81,7 +77,6 @@
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
-
         <el-col :span="6">
         <el-col :span="6">
           <el-form-item label="航班种类" prop="flightKindId">
           <el-form-item label="航班种类" prop="flightKindId">
             <el-select
             <el-select
@@ -91,7 +86,7 @@
               clearable
               clearable
             >
             >
               <el-option
               <el-option
-                v-for="dict in flightKindlist"
+                v-for="dict in selectOption.flightKindlist"
                 :key="dict.id"
                 :key="dict.id"
                 :label="dict.chineseName"
                 :label="dict.chineseName"
                 :value="dict.id"
                 :value="dict.id"
@@ -100,7 +95,6 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
-
       <el-button
       <el-button
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
@@ -116,6 +110,7 @@
         icon="el-icon-plus"
         icon="el-icon-plus"
         size="mini"
         size="mini"
         @click="handleAdd"
         @click="handleAdd"
+        v-hasPermi="['base:flightInfo:add']"
         >新增</el-button
         >新增</el-button
       >
       >
       <el-button
       <el-button
@@ -124,197 +119,52 @@
         size="mini"
         size="mini"
         :disabled="multiple"
         :disabled="multiple"
         @click="handleDelete"
         @click="handleDelete"
+        v-hasPermi="['base:flightInfo:delete']"
         >删除
         >删除
       </el-button>
       </el-button>
       <el-button
       <el-button
         type="primary"
         type="primary"
         icon="el-icon-circle-check"
         icon="el-icon-circle-check"
         size="mini"
         size="mini"
+        :disabled="multiple"
         @click="handleFlightStatus('flightStatus10')"
         @click="handleFlightStatus('flightStatus10')"
+        v-hasPermi="['base:flightInfo:open']"
         >自动配舱开启</el-button
         >自动配舱开启</el-button
       >
       >
       <el-button
       <el-button
         type="primary"
         type="primary"
         icon="el-icon-circle-close"
         icon="el-icon-circle-close"
         size="mini"
         size="mini"
+        :disabled="multiple"
         @click="handleFlightStatus('flightStatus80')"
         @click="handleFlightStatus('flightStatus80')"
+        v-hasPermi="['base:flightInfo:close']"
         >自动配舱关闭</el-button
         >自动配舱关闭</el-button
       >
       >
     </el-form>
     </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"
+    <Tables
+      ref="flightInfoTable"
       :data="findAllFltDatList"
       :data="findAllFltDatList"
-      size="small"
-      @selection-change="handleSelectionChange"
+      :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"
     >
     >
-      <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">
-        <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"
-      />
-
+      <template>
         <el-table-column
         <el-table-column
           v-if="findAllFltDatList.length > 0"
           v-if="findAllFltDatList.length > 0"
           label="操作"
           label="操作"
           align="center"
           align="center"
           class-name="small-padding fixed-width"
           class-name="small-padding fixed-width"
-        width="130"
           fixed="right"
           fixed="right"
         >
         >
           <template slot-scope="scope">
           <template slot-scope="scope">
@@ -323,23 +173,13 @@
               type="text"
               type="text"
               icon="el-icon-edit"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
               @click="handleUpdate(scope.row)"
+              v-hasPermi="['base:flightInfo:update']"
               >修改</el-button
               >修改</el-button
             >
             >
-          <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row,'删除')">
-            删除</el-button> -->
           </template>
           </template>
         </el-table-column>
         </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
     <el-dialog
       :title="title"
       :title="title"
@@ -364,10 +204,10 @@
                 style="width: 93%"
                 style="width: 93%"
                 v-model="form.fltNo"
                 v-model="form.fltNo"
                 placeholder="请输入航班号"
                 placeholder="请输入航班号"
+                maxlength="10"
               />
               />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-          <!-- <el-col :span="1"> &#12288;</el-col> -->
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="航班日期" prop="fltDate">
             <el-form-item label="航班日期" prop="fltDate">
               <el-date-picker
               <el-date-picker
@@ -382,7 +222,6 @@
               </el-date-picker>
               </el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="航班路线" prop="route">
             <el-form-item label="航班路线" prop="route">
               <el-input
               <el-input
@@ -392,12 +231,11 @@
               />
               />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="航班种类" prop="kindId">
             <el-form-item label="航班种类" prop="kindId">
               <el-select v-model="form.kindId" placeholder="请选择航班种类">
               <el-select v-model="form.kindId" placeholder="请选择航班种类">
                 <el-option
                 <el-option
-                  v-for="item in flightKindlist"
+                  v-for="item in selectOption.flightKindlist"
                   :key="item.id"
                   :key="item.id"
                   :label="item.chineseName"
                   :label="item.chineseName"
                   :value="item.id"
                   :value="item.id"
@@ -410,7 +248,7 @@
             <el-form-item label="航班类型" prop="typeId">
             <el-form-item label="航班类型" prop="typeId">
               <el-select v-model="form.typeId" placeholder="请选择航班类型">
               <el-select v-model="form.typeId" placeholder="请选择航班类型">
                 <el-option
                 <el-option
-                  v-for="item in flightTypelist"
+                  v-for="item in selectOption.flightTypelist"
                   :key="item.id"
                   :key="item.id"
                   :label="item.chineseName"
                   :label="item.chineseName"
                   :value="item.id"
                   :value="item.id"
@@ -427,7 +265,7 @@
                 placeholder="请选择航班状态"
                 placeholder="请选择航班状态"
               >
               >
                 <el-option
                 <el-option
-                  v-for="item in flightStatuslist"
+                  v-for="item in selectOption.flightStatuslist"
                   :key="item.id"
                   :key="item.id"
                   :label="item.chineseName"
                   :label="item.chineseName"
                   :value="item.id"
                   :value="item.id"
@@ -446,7 +284,6 @@
               ></el-input-number>
               ></el-input-number>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="额外增重百分比" prop="extraWeightPercent">
             <el-form-item label="额外增重百分比" prop="extraWeightPercent">
               <el-input-number
               <el-input-number
@@ -457,30 +294,30 @@
               ></el-input-number>
               ></el-input-number>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="是否开启高低价" prop="highLowPriceFlg">
             <el-form-item label="是否开启高低价" prop="highLowPriceFlg">
               <el-switch
               <el-switch
                 @change="LowHighAvailable"
                 @change="LowHighAvailable"
                 v-model="form.highLowPriceFlg"
                 v-model="form.highLowPriceFlg"
+                :active-value="1"
+                :inactive-value="0"
                 active-color="#13ce66"
                 active-color="#13ce66"
               >
               >
               </el-switch>
               </el-switch>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
-          <!-- 是否需要预审，1：预审，0：取消预审 -->
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="是否预审" prop="isNeedRequired">
             <el-form-item label="是否预审" prop="isNeedRequired">
               <el-switch
               <el-switch
                 :disabled="true"
                 :disabled="true"
                 v-model="form.isNeedRequired"
                 v-model="form.isNeedRequired"
+                :active-value="1"
+                :inactive-value="0"
                 active-color="#13ce66"
                 active-color="#13ce66"
               >
               >
               </el-switch>
               </el-switch>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="高价百分比" prop="highPriceWeightPercent">
             <el-form-item label="高价百分比" prop="highPriceWeightPercent">
               <el-input-number
               <el-input-number
@@ -492,7 +329,6 @@
               ></el-input-number>
               ></el-input-number>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="低价百分比" prop="lowPriceWeightPercent">
             <el-form-item label="低价百分比" prop="lowPriceWeightPercent">
               <el-input-number
               <el-input-number
@@ -503,7 +339,6 @@
               ></el-input-number>
               ></el-input-number>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="高价可配重量" prop="highAvailableWeight">
             <el-form-item label="高价可配重量" prop="highAvailableWeight">
               <el-input-number
               <el-input-number
@@ -526,7 +361,6 @@
               ></el-input-number>
               ></el-input-number>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="高价已配重量" prop="highAllocatedWeight">
             <el-form-item label="高价已配重量" prop="highAllocatedWeight">
               <el-input-number
               <el-input-number
@@ -567,29 +401,20 @@
         <el-button @click="cancel">取 消</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
-
     <el-dialog
     <el-dialog
       title="未删除成功航班"
       title="未删除成功航班"
       width="40%"
       width="40%"
       center
       center
       :visible.sync="dialogTableVisible"
       :visible.sync="dialogTableVisible"
-      :close-on-click-modal="false" :append-to-body="true"
+      :close-on-click-modal="false"
+      :append-to-body="true"
     >
     >
       <el-table :data="gridData">
       <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="fltNo" label="航班号"></el-table-column>
+        <el-table-column property="fltDate" label="航班日期"></el-table-column>
         <el-table-column
         <el-table-column
           property="alloctedWeight"
           property="alloctedWeight"
           label="已配重量"
           label="已配重量"
-          width="200"
         ></el-table-column>
         ></el-table-column>
       </el-table>
       </el-table>
     </el-dialog>
     </el-dialog>
@@ -610,66 +435,7 @@ export default {
   name: "FlightInformationMaintenance",
   name: "FlightInformationMaintenance",
   data() {
   data() {
     return {
     return {
-      gridData: [],
-      dialogTableVisible: false,
-      //高价百分比是否打开
-      ishighPriceWeightPercent: true,
-      //form属性禁用状态
-      formdisabled: {
-        //航班号
-        fltNo: false,
-        //航班日期
-        fltDate: false,
-        //航班路线
-        route: false,
-        //航班种类
-        kindId: false,
-        //航班类型
-        typeId: false,
-        //原始重量
-        originalWeight: false,
-      },
-
-      //航班种类
-      flightKindlist: [],
-      //航班状态
-      flightStatuslist: [],
-      //航班类型
-      flightTypelist: [],
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-
-      // 遮罩层
-      loading: false,
-      // 遮罩层
-      loadingFlightDate: false,
-      // 弹出层标题
-      title: "",
-      // 总条数
-      total: 0,
-      // 原航班规则数据
-      findAllFltDatList: [],
-      //目的航班数据
-      sourceFlightAndFlightDate: [],
-      statusList: [
-        {
-          id: 1,
-          name: "有效",
-        },
-        {
-          id: 3,
-          name: "停用",
-        },
-      ],
-      // 新增修改查看规则弹出层
-      open: false,
-      // 是否显示查看目的航班弹出层
-      openFlightDate: false,
-      // 查询参数
+      //查询参数
       queryParams: {
       queryParams: {
         limitStart: 0, //当前条数【代表第几条数据 +1开始】
         limitStart: 0, //当前条数【代表第几条数据 +1开始】
         pageNum: 1,
         pageNum: 1,
@@ -681,10 +447,9 @@ export default {
         flightKindId: undefined, //航班种类
         flightKindId: undefined, //航班种类
         fltNo: undefined, //航班号，要大写
         fltNo: undefined, //航班号，要大写
       },
       },
-
-      // 表单参数
+      //表单参数
       form: {},
       form: {},
-      // 表单校验
+      //表单校验
       rules: {
       rules: {
         fltNo: [
         fltNo: [
           {
           {
@@ -715,13 +480,381 @@ export default {
           },
           },
         ],
         ],
       },
       },
+      //原航班规则数据
+      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: "航班号",
+          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: {
+        //航班号
+        fltNo: false,
+        //航班日期
+        fltDate: false,
+        //航班路线
+        route: false,
+        //航班种类
+        kindId: false,
+        //航班类型
+        typeId: 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: [],
+      //目的航班数据
+      sourceFlightAndFlightDate: [],
+      //高价百分比是否打开
+      ishighPriceWeightPercent: true,
+      //非单个禁用
+      //single: true,
+      //非多个禁用
+      multiple: true,
+      //遮罩层
+      loading: false,
+      //遮罩层
+      loadingFlightDate: false,
+      //删除失败弹框
+      dialogTableVisible: false,
+      //弹出层标题
+      title: "",
+      //总条数
+      total: 0,
+      //表格高度
+      tableHeight: null,
+      //新增修改查看规则弹出层
+      open: false,
+      //是否显示查看目的航班弹出层
+      openFlightDate: false,
+      //shift键状态
+      shiftKey: false,
     };
     };
   },
   },
   created() {
   created() {
     //查询条件数据源
     //查询条件数据源
     this.findFltConditionData();
     this.findFltConditionData();
+    if (this.$store.state.tagsView.cachedViews.length == 0) {
+      this.findAllFltData();
+    }
+  },
+  activated() {
     this.findAllFltData();
     this.findAllFltData();
   },
   },
+  deactivated(){
+    this.findAllFltDatList = []
+  },
+  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 - 150;
+  },
   methods: {
   methods: {
     //输入航班号后
     //输入航班号后
     blurfltNo() {
     blurfltNo() {
@@ -755,10 +888,9 @@ export default {
               response.data.highLowPriceFlg != null &&
               response.data.highLowPriceFlg != null &&
               response.data.highLowPriceFlg != undefined
               response.data.highLowPriceFlg != undefined
             ) {
             ) {
-              this.form.highLowPriceFlg =
-                response.data.highLowPriceFlg === 1 ? true : false;
+              this.form.highLowPriceFlg = response.data.highLowPriceFlg;
             } else {
             } else {
-              this.$set(this.form, "highLowPriceFlg", true);
+              this.$set(this.form, "highLowPriceFlg", 1);
               //this.form.highLowPriceFlg = true;
               //this.form.highLowPriceFlg = true;
             }
             }
             //是否预审：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘是否预审’ 为否，不可编辑；
             //是否预审：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘是否预审’ 为否，不可编辑；
@@ -767,10 +899,9 @@ export default {
               response.data.isNeedRequired != null &&
               response.data.isNeedRequired != null &&
               response.data.isNeedRequired != undefined
               response.data.isNeedRequired != undefined
             ) {
             ) {
-              this.form.isNeedRequired =
-                response.data.isNeedRequired === 1 ? true : false;
+              this.form.isNeedRequired = response.data.isNeedRequired;
             } else {
             } else {
-              this.form.isNeedRequired = false;
+              this.form.isNeedRequired = 0;
             }
             }
             //高/低价百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘高价百分比’60%，‘低价百分比’40%，不可编辑
             //高/低价百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘高价百分比’60%，‘低价百分比’40%，不可编辑
             if (
             if (
@@ -800,66 +931,25 @@ export default {
         });
         });
       }
       }
     },
     },
-    // 是否一票一件
-    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() {
     findFltConditionData() {
       findFltConditionDataApi().then((response) => {
       findFltConditionDataApi().then((response) => {
         if (response.code == 200) {
         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 {
         } else {
           this.msgError(response.msg);
           this.msgError(response.msg);
         }
         }
       });
       });
     },
     },
-
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-    },
-
     /** 航班信息维护查询*/
     /** 航班信息维护查询*/
     findAllFltData() {
     findAllFltData() {
+      this.ids = [];
+      this.multiple = true;
       this.loading = true;
       this.loading = true;
       if (this.queryParams.pageNum > 1) {
       if (this.queryParams.pageNum > 1) {
         this.queryParams.limitStart =
         this.queryParams.limitStart =
@@ -874,12 +964,11 @@ export default {
       ) {
       ) {
         this.queryParams.fltNo = this.queryParams.fltNo.toUpperCase();
         this.queryParams.fltNo = this.queryParams.fltNo.toUpperCase();
       }
       }
-
       findAllFltDataApi(this.queryParams).then((response) => {
       findAllFltDataApi(this.queryParams).then((response) => {
+        this.loading = false;
         if (response.code == 200) {
         if (response.code == 200) {
           this.findAllFltDatList = response.data.list;
           this.findAllFltDatList = response.data.list;
           this.total = response.data.totalCount;
           this.total = response.data.totalCount;
-          this.loading = false;
         } else {
         } else {
           this.msgError(response.msg);
           this.msgError(response.msg);
         }
         }
@@ -891,11 +980,10 @@ export default {
       this.open = true;
       this.open = true;
       this.title = "添加航班信息";
       this.title = "添加航班信息";
       this.form.id = null;
       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.alloctedWeight = 0; //已配重量
       this.form.lowAllocatedWeight = 0; //低价已配重量
       this.form.lowAllocatedWeight = 0; //低价已配重量
       this.form.highAllocatedWeight = 0; //高价已配重量
       this.form.highAllocatedWeight = 0; //高价已配重量
-
       //航班号
       //航班号
       this.formdisabled.fltNo = false;
       this.formdisabled.fltNo = false;
       //航班日期
       //航班日期
@@ -1003,7 +1091,6 @@ export default {
       }
       }
       return Weight;
       return Weight;
     },
     },
-
     /** 修改按钮操作 */
     /** 修改按钮操作 */
     handleUpdate(row) {
     handleUpdate(row) {
       this.reset();
       this.reset();
@@ -1018,11 +1105,9 @@ export default {
         if (response.code == 200) {
         if (response.code == 200) {
           this.form = response.data;
           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();
           this.LowHighAvailable();
         } else {
         } else {
@@ -1061,13 +1146,11 @@ export default {
         })
         })
         .catch(() => {});
         .catch(() => {});
     },
     },
-
     /** 提交按钮 */
     /** 提交按钮 */
     submitForm: function () {
     submitForm: function () {
       this.$refs["form"].validate((valid) => {
       this.$refs["form"].validate((valid) => {
         if (valid) {
         if (valid) {
           let formdata = JSON.parse(JSON.stringify(this.form));
           let formdata = JSON.parse(JSON.stringify(this.form));
-
           //高价百分比和低价百分比和不可以大于100
           //高价百分比和低价百分比和不可以大于100
           if (
           if (
             this.form.highLowPriceFlg &&
             this.form.highLowPriceFlg &&
@@ -1080,7 +1163,7 @@ export default {
           //已删除的无法修改
           //已删除的无法修改
           //拿到已删除的id
           //拿到已删除的id
           let statusId = 0;
           let statusId = 0;
-          this.flightStatuslist.map((item) => {
+          this.selectOption.flightStatuslist.map((item) => {
             //  this.unitList 是你 select option遍历的集合 e 是选中的id
             //  this.unitList 是你 select option遍历的集合 e 是选中的id
             if (item.chineseName === "已删除") {
             if (item.chineseName === "已删除") {
               statusId = item.id;
               statusId = item.id;
@@ -1092,9 +1175,9 @@ export default {
             return;
             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) {
             if (response.code === 200) {
@@ -1108,18 +1191,17 @@ export default {
         }
         }
       });
       });
     },
     },
-    // 表单重置
+    //表单重置
     reset() {
     reset() {
       this.form = {};
       this.form = {};
       this.resetForm("form");
       this.resetForm("form");
     },
     },
-    // 取消按钮
+    //取消按钮
     cancel() {
     cancel() {
       this.open = false;
       this.open = false;
       this.findAllFltData();
       this.findAllFltData();
       this.reset();
       this.reset();
     },
     },
-
     /** 重置按钮操作 */
     /** 重置按钮操作 */
     resetQuery() {
     resetQuery() {
       this.resetForm("queryForm");
       this.resetForm("queryForm");
@@ -1151,6 +1233,30 @@ export default {
         }
         }
       });
       });
     },
     },
+    //多选框选中数据
+    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();
+    },
   },
   },
 };
 };
 </script>
 </script>

@@ -19,14 +19,13 @@
               start-placeholder="开始日期"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               end-placeholder="结束日期"
               :value-format="valueFormat"
               :value-format="valueFormat"
-              clearable
             >
             >
             </el-date-picker>
             </el-date-picker>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
         <el-col :span="6">
         <el-col :span="6">
           <el-form-item label="配载航班号">
           <el-form-item label="配载航班号">
-            <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true" clearable></el-input>
+            <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true"></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
         <el-col :span="6">
         <el-col :span="6">
@@ -56,7 +55,6 @@
               class="formItem"
               class="formItem"
               placeholder="请输入运单号（回车间隔）"
               placeholder="请输入运单号（回车间隔）"
               :autosize="true"
               :autosize="true"
-              clearable
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -105,7 +103,6 @@
               class="formItem"
               class="formItem"
               placeholder="S_;P_;E2"
               placeholder="S_;P_;E2"
               :autosize="true"
               :autosize="true"
-              clearable
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -117,7 +114,6 @@
               class="formItem"
               class="formItem"
               placeholder="PVG;PEK"
               placeholder="PVG;PEK"
               :autosize="true"
               :autosize="true"
-              clearable
             ></el-input>
             ></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -133,25 +129,22 @@
                   start-placeholder="开始日期"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                   end-placeholder="结束日期"
                   :value-format="valueFormat"
                   :value-format="valueFormat"
-                  clearable
                 >
                 >
                 </el-date-picker>
                 </el-date-picker>
               </el-form-item> 
               </el-form-item> 
             </el-col>
             </el-col>
             <el-col :span="6">
             <el-col :span="6">
               <el-form-item label="ACCS原航班号">
               <el-form-item label="ACCS原航班号">
-                <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input>
+                <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号"></el-input>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
             <el-col :span="6">
             <el-col :span="6">
               <el-form-item label="取件日期">
               <el-form-item label="取件日期">
                 <el-date-picker
                 <el-date-picker
-                  class="formItem"
                   v-model="formData.pickUpDate"
                   v-model="formData.pickUpDate"
                   type="date"
                   type="date"
                   placeholder="选择日期"
                   placeholder="选择日期"
                   :value-format="valueFormat"
                   :value-format="valueFormat"
-                  clearable
                 >
                 >
                 </el-date-picker>
                 </el-date-picker>
               </el-form-item>
               </el-form-item>
@@ -166,7 +159,6 @@
                   start-placeholder="开始日期"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                   end-placeholder="结束日期"
                   :value-format="valueFormat"
                   :value-format="valueFormat"
-                  clearable
                 >
                 >
                 </el-date-picker>
                 </el-date-picker>
               </el-form-item>
               </el-form-item>
@@ -223,10 +215,10 @@
           @click="select(0)"
           @click="select(0)"
           >查询</el-button
           >查询</el-button
         >
         >
-        <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
+        <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" v-hasPermi="['base:cargo:export']"
           >{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button
           >{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button
         >
         >
-        <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(1)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
+        <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(1)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" v-hasPermi="['base:cargo:export']"
           >{{downLoadingTip.downloading?downLoadingTip.tip:"导出全部查询结果"}}</el-button
           >{{downLoadingTip.downloading?downLoadingTip.tip:"导出全部查询结果"}}</el-button
         >
         >
         <span style="marginLeft:20px;color:#ffba00">全部导出上限80000条数据</span>
         <span style="marginLeft:20px;color:#ffba00">全部导出上限80000条数据</span>
@@ -248,7 +240,7 @@
       :limitStart="limitStart"
       :limitStart="limitStart"
       :page="page"
       :page="page"
       :shiftKey="shiftKey"
       :shiftKey="shiftKey"
-      height="550"
+      :height="tableHeight"
       @tableSelect="tableSelect"
       @tableSelect="tableSelect"
       @tableSelectAll="tableSelectAll"
       @tableSelectAll="tableSelectAll"
       @currentChange="currentChange"
       @currentChange="currentChange"
@@ -319,7 +311,7 @@ export default {
           type: "",
           type: "",
           name: "口岸代码",
           name: "口岸代码",
           value: "portName",
           value: "portName",
-          width: "100",
+          width: "120",
           align: "center",
           align: "center",
           sorTable: true,
           sorTable: true,
           fixed: false,
           fixed: false,
@@ -359,7 +351,7 @@ export default {
           type: "",
           type: "",
           name: "运单号",
           name: "运单号",
           value: "waybillNo",
           value: "waybillNo",
-          width: "120",
+          width: "150",
           align: "center",
           align: "center",
           sorTable: true,
           sorTable: true,
           fixed: false,
           fixed: false,
@@ -369,7 +361,7 @@ export default {
           type: "",
           type: "",
           name: "总单号",
           name: "总单号",
           value: "totalWaybillNo",
           value: "totalWaybillNo",
-          width: "120",
+          width: "150",
           align: "center",
           align: "center",
           sorTable: true,
           sorTable: true,
           fixed: false,
           fixed: false,
@@ -389,7 +381,7 @@ export default {
           type: "",
           type: "",
           name: "服务代码",
           name: "服务代码",
           value: "serviceCode",
           value: "serviceCode",
-          width: "100",
+          width: "90",
           align: "center",
           align: "center",
           sorTable: false,
           sorTable: false,
           fixed: false,
           fixed: false,
@@ -429,7 +421,7 @@ export default {
           type: "",
           type: "",
           name: "subcategory",
           name: "subcategory",
           value: "subCategory",
           value: "subCategory",
-          width: "140",
+          width: "150",
           align: "center",
           align: "center",
           sorTable: true,
           sorTable: true,
           fixed: false,
           fixed: false,
@@ -499,7 +491,7 @@ export default {
           type: "",
           type: "",
           name: "航班预审意见",
           name: "航班预审意见",
           value: "caPretrialOpinion",
           value: "caPretrialOpinion",
-          width: "120",
+          width: "140",
           align: "center",
           align: "center",
           sorTable: false,
           sorTable: false,
           fixed: false,
           fixed: false,
@@ -519,7 +511,7 @@ export default {
           type: "",
           type: "",
           name: "终配航班号",
           name: "终配航班号",
           value: "finalFlightNo",
           value: "finalFlightNo",
-          width: "120",
+          width: "130",
           align: "center",
           align: "center",
           sorTable: true,
           sorTable: true,
           fixed: false,
           fixed: false,
@@ -529,7 +521,7 @@ export default {
           type: "",
           type: "",
           name: "终配航班日期",
           name: "终配航班日期",
           value: "finalFlightTime",
           value: "finalFlightTime",
-          width: "140",
+          width: "150",
           align: "center",
           align: "center",
           sorTable: true,
           sorTable: true,
           fixed: false,
           fixed: false,
@@ -539,7 +531,7 @@ export default {
           type: "",
           type: "",
           name: "二配航班号",
           name: "二配航班号",
           value: "twoMatchFlightNo",
           value: "twoMatchFlightNo",
-          width: "120",
+          width: "130",
           align: "center",
           align: "center",
           sorTable: true,
           sorTable: true,
           fixed: false,
           fixed: false,
@@ -559,7 +551,7 @@ export default {
           type: "",
           type: "",
           name: "预配航班号",
           name: "预配航班号",
           value: "preplanFlightNo",
           value: "preplanFlightNo",
-          width: "120",
+          width: "130",
           align: "center",
           align: "center",
           sorTable: true,
           sorTable: true,
           fixed: false,
           fixed: false,
@@ -579,7 +571,7 @@ export default {
           type: "",
           type: "",
           name: "ACCS原航班号",
           name: "ACCS原航班号",
           value: "fltNoAccs",
           value: "fltNoAccs",
-          width: "150",
+          width: "140",
           align: "center",
           align: "center",
           sorTable: true,
           sorTable: true,
           fixed: false,
           fixed: false,
@@ -599,7 +591,7 @@ export default {
           type: "",
           type: "",
           name: "ACCS原航线",
           name: "ACCS原航线",
           value: "accsFlightRoute",
           value: "accsFlightRoute",
-          width: "140",
+          width: "150",
           align: "center",
           align: "center",
           sorTable: true,
           sorTable: true,
           fixed: false,
           fixed: false,
@@ -629,7 +621,7 @@ export default {
           type: "",
           type: "",
           name: "发件人账号",
           name: "发件人账号",
           value: "shipperAccount",
           value: "shipperAccount",
-          width: "120",
+          width: "150",
           align: "center",
           align: "center",
           sorTable: false,
           sorTable: false,
           fixed: false,
           fixed: false,
@@ -649,7 +641,7 @@ export default {
           type: "",
           type: "",
           name: "始发地城市名称",
           name: "始发地城市名称",
           value: "originCity",
           value: "originCity",
-          width: "130",
+          width: "150",
           align: "center",
           align: "center",
           sorTable: false,
           sorTable: false,
           fixed: false,
           fixed: false,
@@ -689,7 +681,7 @@ export default {
           type: "",
           type: "",
           name: "大货预审时间",
           name: "大货预审时间",
           value: "bigPretrialTime",
           value: "bigPretrialTime",
-          width: "120",
+          width: "150",
           align: "center",
           align: "center",
           sorTable: false,
           sorTable: false,
           fixed: false,
           fixed: false,
@@ -729,7 +721,7 @@ export default {
           type: "",
           type: "",
           name: "创建时间",
           name: "创建时间",
           value: "createTime",
           value: "createTime",
-          width: "100",
+          width: "120",
           align: "center",
           align: "center",
           sorTable: true,
           sorTable: true,
           fixed: false,
           fixed: false,
@@ -757,6 +749,7 @@ export default {
       limitSize: 100, //无限制-1
       limitSize: 100, //无限制-1
       page:1,
       page:1,
       progress:0,
       progress:0,
+      tableHeight:null,
       formShow:true,
       formShow:true,
     };
     };
   },
   },
@@ -774,6 +767,20 @@ export default {
     });
     });
   },
   },
 
 
+  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() {
   mounted() {
     window.addEventListener("keydown", (code) => {
     window.addEventListener("keydown", (code) => {
       if (code.keyCode === 16 && code.shiftKey) {
       if (code.keyCode === 16 && code.shiftKey) {
@@ -785,6 +792,7 @@ export default {
         this.shiftKey = false;
         this.shiftKey = false;
       }
       }
     });
     });
+    this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-80
   },
   },
 
 
   methods: {
   methods: {

+<template>
+  <div class="menuDrawer">
+    <el-dialog
+      :title="drawerTitle"
+      width="50%"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :append-to-body="true"
+    >
+      <el-form
+        ref="userForm"
+        :model="menuForm"
+        :disabled="menuFormDisabled"
+        :rules="rules"
+        label-width="auto"
+        style="margin: 10px"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="菜单名称" prop="">
+              <!-- <el-input
+                placeholder="请输入权限名"
+                :disabled="menuFormDisabled"
+                v-model="menuData.userName"
+                size="mini"
+              ></el-input> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="菜单路由" prop="">
+              <!-- <el-input
+                placeholder="请输入权限名"
+                :disabled="menuFormDisabled"
+                v-model="menuData.userName"
+                size="mini"
+              ></el-input> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="组件名称" prop="">
+              <!-- <el-input
+                placeholder="请输入权限名"
+                :disabled="menuFormDisabled"
+                v-model="menuData.userName"
+                size="mini"
+              ></el-input> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="菜单状态" prop="">
+              <el-switch
+                v-model="menuData.menuStatus"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                :disabled="menuFormDisabled"
+              ></el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="图标选择" prop="">
+              <iconSelect @selected="selected"></iconSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="权限设置" prop="">
+              <el-col :span="6">
+                <el-radio label="页面" size="medium"></el-radio>
+              </el-col>
+              <el-col :span="6">
+                <el-radio label="按钮" size="medium"></el-radio>
+              </el-col>
+              <el-col :span="24">
+                <el-card shadow="never">
+                  <el-input placeholder=""></el-input>
+                </el-card>
+              </el-col>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer">
+        <el-button @click="handleClose">取 消</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import iconSelect from "@/components/IconSelect";
+export default {
+  components: {
+    iconSelect,
+  },
+  props: {
+    drawerTitle: {
+      type: String,
+      default: "",
+    },
+    menuFormDisabled: {
+      type: Boolean,
+      default: false,
+    },
+    dialogVisible: {
+      type: Boolean,
+      default: false,
+    },
+    menuData: {
+      type: Object,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      menuForm: {},
+      rules:{}
+    };
+  },
+  updated() {
+    this.menuForm = this.menuData;
+  },
+  watch:{
+    dialogVisible(val,oldVal){
+      if(val){
+        this.menuForm = this.menuData;
+      }
+    }
+  },
+  methods: {
+    handleClose() {
+      this.$emit("handleClose", false);
+    },
+    selected(val) {
+      console.log(val);
+    },
+    submit() {},
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

+<template>
+  <div>
+    <el-form ref="selectionUserForm" label-width="auto" style="margin: 20px">
+      <el-row :gutter="50"> </el-row>
+    </el-form>
+    <!-- <div style="margin:20px">
+      <el-button type="primary" icon="el-icon-plus" size="mini" @click="addMenu"
+        >新增菜单</el-button
+      >
+    </div> -->
+    <el-table
+      :data="data"
+      row-key="id"
+      fit
+      border
+      stripe
+      highlightCurrentRow
+      v-loading="loading"
+      default-expand-all
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+    >
+      <template v-for="(item, index) in tableHeader">
+        <el-table-column
+          v-if="item.value === 'menuType'"
+          :prop="item.value"
+          :label="item.name"
+          :key="index"
+          :align="item.align"
+          header-align="center"
+          showOverflowTooltip
+          :width="item.width"
+          :formatter="formatter"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              :type="scope.row.menuType === 'B' ? '' : 'success'"
+              disable-transitions
+              >{{ scope.row.menuType === "B" ? "按钮" : "菜单" }}</el-tag
+            >
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :prop="item.value"
+          :label="item.name"
+          :key="index"
+          :align="item.align"
+          header-align="center"
+          showOverflowTooltip
+          :width="item.width"
+          :formatter="formatter"
+        >
+        </el-table-column>
+      </template>
+
+      <el-table-column
+        header-align="center"
+        align="center"
+        label="操作"
+        width="auto"
+      >
+        <template slot-scope="scope">
+          <!-- <el-button type="success" size="mini" @click="buttonClick(scope)">修改</el-button>
+            <el-button type="primary" size="mini" @click="buttonClick(scope)"
+              >查看</el-button
+            > -->
+          <el-button
+            :type="scope.row.status == 1 ? 'warning' : 'primary'"
+            v-hasPermi="['system:menu:openClose']"
+            size="mini"
+            @click="menuStatus(scope)"
+            v-if="scope.row.menuType == 'C'"
+            >{{ scope.row.status == 1 ? "停用菜单" : "启用菜单" }}</el-button
+          >
+          <el-button
+            type="danger"
+            size="mini"
+            v-hasPermi="['system:menu:delete']"
+            @click="removeMenu(scope)"
+            v-if="scope.row.menuType == 'C'"
+            >删除菜单</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- <Tables
+      ref="newTable"
+      :data="data"
+      :headerData="tableHeader"
+      size="medium"
+      rowKey="id"
+      :defaultExpandAll="true"
+      height="auto"
+      @tableSelect="tableSelect"
+      @tableSelectAll="tableSelectAll"
+      @SelectChange="SelectChange"
+    >
+      <el-table-column
+        header-align="center"
+        align="center"
+        label="操作"
+        width="auto"
+      >
+        <template slot-scope="scope">
+          <el-button type="primary" size="mini" @click="menuStatus(scope)">{{
+            scope.menuStatus == 0 ? "停用" : "启用"
+          }}</el-button>
+          <el-button type="danger" size="mini" @click="removeMenu(scope)"
+            >删除菜单</el-button
+          >
+        </template>
+      </el-table-column>
+    </Tables> -->
+    <!-- <Drawer
+      :dialogVisible="drawer"
+      :drawerTitle="drawerTitle"
+      :menuFormDisabled="menuFormDisabled"
+      :menuData="menuData"
+      @handleClose="handleClose"
+    ></Drawer> -->
+  </div>
+</template>
+
+<script>
+import { getAllAuth, updateStatus } from "@/api/system/user.js";
+import dictLabels from "@/assets/languages/dictLabels.js";
+import Drawer from "./drawer.vue";
+import { MessageBox } from "element-ui";
+export default {
+  name: "MenuConfig",
+  components: {
+    Drawer,
+  },
+  data() {
+    return {
+      drawer: false,
+      menuFormDisabled: false,
+      loading: false,
+      drawerTitle: "",
+      menuData: {},
+      data: [],
+      tableHeader: [
+        {
+          name: "菜单名",
+          value: "title",
+          width: "200",
+          align: "left",
+          sorTable: false,
+        },
+        {
+          name: "菜单类型",
+          value: "menuType",
+          width: "100",
+          align: "center",
+          sortable: false,
+        },
+        {
+          name: "权限标识",
+          value: "permissionKey",
+          width: "auto",
+          align: "left",
+          sortable: false,
+        },
+        {
+          name: "菜单状态",
+          value: "status",
+          width: "100",
+          align: "center",
+          sorTable: false,
+        },
+        {
+          name: "菜单路由",
+          value: "path",
+          width: "auto",
+          align: "left",
+          sorTable: false,
+        },
+      ],
+    };
+  },
+  created() {
+    if (this.$store.state.tagsView.cachedViews.length == 0) {
+      this.menuAll();
+    }
+  },
+  activated() {
+    this.menuAll();
+  },
+  deactivated() {
+    this.data = [];
+  },
+  methods: {
+    addMenu() {
+      this.menuData = {};
+      this.drawer = true;
+      this.drawerTitle = "新增菜单";
+      this.menuFormDisabled = false;
+    },
+
+    //关闭
+    handleClose(val) {
+      this.drawer = val;
+    },
+
+    buttonClick(row) {
+      this.menuData = row.row;
+      this.drawer = true;
+      this.drawerTitle = "查看/修改";
+      this.menuFormDisabled = true;
+    },
+
+    //表格数据
+    menuAll() {
+      this.loading = true;
+      getAllAuth()
+        .then((res) => {
+          this.loading = false;
+          if (res.code === 200) {
+            res.data.length > 0
+              ? (this.data = res.data)
+              : this.$message({
+                  message: "数据为空",
+                  type: "warning",
+                });
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "warning",
+            });
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+
+    //菜单状态改变
+    statusUpdate(data) {
+      updateStatus(data)
+        .then((res) => {
+          if (res.code === 200) {
+            this.menuAll();
+            this.$message({
+              message: "操作成功",
+              type: "success",
+            });
+            location.reload();
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "warning",
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+
+    //菜单开启关闭
+    menuStatus(row) {
+      MessageBox.confirm(
+        row.row.status == 1 ? "是否要关闭此菜单" : "是否要启用此菜单",
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          let data = {};
+          data.id = row.row.id;
+          data.status = row.row.status == 1 ? "2" : "1";
+          this.statusUpdate(data);
+        })
+        .catch(() => {});
+    },
+
+    //菜单删除
+    removeMenu(row) {
+      MessageBox.confirm("是否要删除此菜单", "提示", {
+        confirmButtonText: "确定删除",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let data = {};
+          data.id = row.row.id;
+          data.status = "0";
+          this.statusUpdate(data);
+        })
+        .catch(() => {});
+    },
+
+    formatter(row, column, cellValue, index) {
+      if (dictLabels[column.property]) {
+        if (dictLabels[column.property][cellValue]) {
+          return dictLabels[column.property][cellValue];
+        }
+      }
+      return cellValue;
+    },
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

+<template>
+  <div class="roleDrawer">
+    <el-drawer
+      :title="drawerTitle"
+      :visible.sync="drawer"
+      direction="rtl"
+      size="40%"
+      destroy-on-close
+      :close-on-click-modal="false"
+      :wrapperClosable="false"
+      :show-close="false"
+    >
+      <el-form
+        ref="roleForm"
+        :model="roleForm"
+        label-width="auto"
+        :rules="rules"
+        size="mini"
+        style="margin: 10px"
+      >
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="角色名:" prop="name">
+              <el-input
+                placeholder="请输入角色名"
+                v-model.trim="roleForm.name"
+                :disabled="roleFormDisabled"
+                v-if="!roleFormDisabled"
+                clearable
+              ></el-input>
+              <div v-else>{{ roleData.name }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="角色描述:" prop="remark">
+              <el-input
+                v-model="roleForm.remark"
+                type="textarea"
+                placeholder="请输入角色描述"
+                :disabled="roleFormDisabled"
+                v-if="!roleFormDisabled"
+                clearable
+              ></el-input>
+              <div v-else>{{ roleData.remark }}</div>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24">
+            <el-form-item label="角色状态:" prop="valid">
+              <el-switch
+                v-model="roleForm.valid"
+                :active-value="1"
+                :inactive-value="2"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                :disabled="roleFormDisabled"
+              ></el-switch>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="24">
+            <el-form-item label="角色权限:" prop="menuIdList">
+              <el-tree
+                ref="tree"
+                :data="treeData"
+                node-key="id"
+                :props="defaultProps"
+                :show-checkbox="true"
+                :default-checked-keys="roleData.menuIds"
+                accordion
+              >
+              </el-tree>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item>
+          <el-button
+            type="primary"
+            v-if="!roleFormDisabled"
+            size="mini"
+            :loading="loading"
+            @click="submit"
+            >提交</el-button
+          >
+          <el-button type="primary" size="mini" @click="handleClose"
+            >取消</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import { getAllAuth, addOrUpdateRole } from "@/api/system/user.js";
+export default {
+  props: {
+    drawerTitle: {
+      type: String,
+      default: "",
+    },
+    roleFormDisabled: {
+      type: Boolean,
+      default: false,
+    },
+    drawer: {
+      type: Boolean,
+      default: false,
+    },
+    roleData: {
+      type: Object,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      roleForm: {
+        name: null,
+      },
+      treeData: [],
+      loading: false,
+      defaultProps: {
+        children: "children",
+        label: "title",
+      },
+      rules: {
+        name: [
+          {
+            required: true,
+            message: "角色名不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    //权限列表
+    getAllAuth()
+      .then((res) => {
+        if (res.code === 200) {
+          this.treeData = this.treeDataInfo(res.data);
+        } else {
+          this.$message({
+            message: res.msg,
+            type: "warning",
+          });
+        }
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+  },
+  watch: {
+    roleFormDisabled() {
+      this.treeData = this.treeDisabled(this.treeData);
+    },
+    drawer(val, oldVal) {
+      if (val) {
+        this.roleForm = this.roleData;
+      } else {
+        this.loading = false;
+      }
+    },
+  },
+  methods: {
+    //关闭
+    handleClose() {
+      this.$refs["roleForm"].clearValidate();
+      this.$emit("handleClose", false);
+    },
+
+    //提交
+    submit() {
+      let formData = {};
+      this.loading = true;
+      let arr = [];
+      arr = this.$refs.tree.getCheckedKeys().filter((item,index)=>{
+        return this.$refs.tree.getCheckedKeys().indexOf(item) == index
+      })
+      formData.menuIdList = arr;
+      this.roleData ? (formData.id = this.roleData.id) : "";
+      formData.remark = this.roleForm.remark;
+      formData.valid = this.roleForm.valid;
+      formData.name = this.roleForm.name;
+      addOrUpdateRole(formData)
+        .then((res) => {
+          this.loading = false;
+          if (res.code === 200) {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+            });
+            this.$emit("handleClose", false);
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "warning",
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+
+    //权限结构禁用
+    treeDisabled(val) {
+      let data = [];
+      val.forEach((item) => {
+        item.disabled = this.roleFormDisabled;
+        data.push(item);
+        if (item.children && item.children.length) {
+          item.children = this.treeDisabled(item.children);
+        }
+      });
+      return data;
+    },
+
+    treeDataInfo(val) {
+      let data = [];
+      val.forEach((item) => {
+        let menuItem = {};
+        menuItem.id = item.id;
+        menuItem.title = item.title;
+        data.push(menuItem)
+        if (item.children && item.children.length) {
+          menuItem.children = this.treeDataInfo(item.children);
+          menuItem.children.unshift({id:item.id,title:`${item.title}(菜单)`})
+        }
+      });
+      return data;
+    },
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

+<template>
+  <div class="roleConfig">
+    <el-form ref="selectionRoleForm" label-width="auto" style="margin: 20px">
+      <el-row :gutter="50">
+        <el-col :span="6">
+          <el-form-item label="角色名称">
+            <el-input
+              v-model="formData.name"
+              placeholder="请输入角色名称"
+              clearable
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="createTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+              clearable
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="状态">
+            <el-select v-model="formData.valid" placeholder="角色状态" clearable>
+              <el-option label="启用" value="1"> </el-option>
+              <el-option label="停用" value="2"> </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="margin:20px">
+      <el-button
+        type="primary"
+        icon="el-icon-search"
+        size="mini"
+        :loading="tableLoading"
+        @click="selectRoleList(0)"
+        >搜索</el-button
+      >
+      <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRole" v-hasPermi="['system:role:add']"
+        >新增角色</el-button
+      >
+    </div>
+    <Tables
+      :data="data"
+      :headerData="tableHeader"
+      :infoData="tableHeader"
+      :totalCount="total"
+      :limitSize="formData.size"
+      :page="formData.page"
+      :pageSizes="[20,30,40,50]"
+      :loading="tableLoading"
+      height="600"
+       @sizeChange="sizeChange"
+      @currentChange="currentChange"
+    >
+      <template>
+        <el-table-column header-align="center" align="center" label="操作">
+          <template slot-scope="scope">
+            <el-button type="primary" size="mini" @click="buttonClick(scope, 0)"
+              >查看</el-button
+            >
+            <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']"
+              >修改</el-button
+            >
+            <el-button
+              :type="scope.row.valid == 1 ? 'warning' : 'primary'"
+              size="mini"
+              v-hasPermi="['system:role:openClose']"
+              @click="roleStatus(scope)"
+              >{{ scope.row.valid == 1 ? "停用" : "启用" }}</el-button
+            >
+            <el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']"
+              >删除角色</el-button
+            >
+          </template>
+        </el-table-column>
+      </template>
+    </Tables>
+    <Drawer
+      :drawer="drawer"
+      :drawerTitle="drawerTitle"
+      :roleFormDisabled="roleFormDisabled"
+      :roleData="roleData"
+      @handleClose="handleClose"
+    ></Drawer>
+  </div>
+</template>
+
+<script>
+import Drawer from "./drawer.vue";
+import { MessageBox } from "element-ui";
+import {
+  getRoleList,
+  detailRole,
+  updateRoleStatus,
+} from "@/api/system/user.js";
+export default {
+  name:"RoleConfig",
+  components: {
+    Drawer,
+  },
+  data() {
+    return {
+      formData: {
+        page: 1,
+        size: 20,
+        valid: null,
+        createStart: null,
+        createEnd: null,
+        name: null,
+      }, //查询条件
+      data: [], //表格数据
+      tableHeader: [
+        {
+          type: "index",
+          name: "",
+          value: "",
+          width: "",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "角色名称",
+          value: "name",
+          width: "150px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "角色状态",
+          value: "valid",
+          width: "150px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "创建人",
+          value: "createUserName",
+          width: "150px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "创建时间",
+          value: "createTime",
+          width: "150px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "修改时间",
+          value: "updateTime",
+          width: "150px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "备注",
+          value: "remark",
+          width: "400px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+      ], //表头数据
+      roleData: {}, //角色详情
+      createTime: [],
+      drawer: false,
+      drawerTitle: "",
+      roleFormDisabled: false,
+      tableLoading: false,
+      total: 0,
+    };
+  },
+  created() {
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.selectRoleList();
+    }
+  },
+  activated(){
+    this.selectRoleList();
+  },
+  deactivated(){
+    this.data = []
+  },
+  methods: {
+    //角色列表
+    selectRoleList(val) {
+      if(val == 0){
+        this.formData.page = 1
+      }
+      this.tableLoading = true;
+      if (this.createTime.length > 0) {
+        this.formData.createStart = this.createTime[0];
+        this.formData.createEnd = this.createTime[1];
+      }
+      getRoleList(this.formData)
+        .then((res) => {
+          this.tableLoading = false;
+          if (res.code === 200) {
+            this.data = res.data.list;
+            this.total = res.data.total;
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "warning",
+            });
+          }
+        })
+        .catch((err) => {
+          this.tableLoading = false;
+          console.log(err);
+        });
+    },
+    //角色详情
+    roleDetail(id) {
+      detailRole(id)
+        .then((res) => {
+          if (res.code === 200) {
+            this.roleData = res.data;
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "warning",
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    //新增角色
+    addRole() {
+      this.roleData = {};
+      this.drawer = true;
+      this.roleFormDisabled = false;
+      this.drawerTitle = "新增角色";
+    },
+    //修改查看角色
+    buttonClick(row, status) {
+      this.roleDetail(row.row.id);
+      this.roleData = row.row;
+      this.drawer = true;
+      status == 0
+        ? (this.roleFormDisabled = true)
+        : (this.roleFormDisabled = false);
+      this.drawerTitle = "修改角色";
+    },
+    //修改角色状态
+    roleStatus(row) {
+      let msg = "";
+      let status = {};
+      status.id = row.row.id;
+      row.row.valid == 1
+        ? ((msg = "是否关闭此角色"), (status.valid = 2))
+        : ((msg = "是否启用此角色"), (status.valid = 1));
+      MessageBox.confirm(msg, "注意", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          updateRoleStatus(status).then((res) => {
+            if (res.code === 200) {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.selectRoleList();
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "warning",
+              });
+            }
+          });
+        })
+        .catch(() => []);
+    },
+    //删除角色
+    removeRole(row) {
+      MessageBox.confirm(
+        "如删除此角色，角色下所有用户将从中被剔除，可能会对用户操作造成影响！",
+        "注意",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          updateRoleStatus({
+            id: row.row.id,
+            valid: 0,
+            confirmDel: false,
+          }).then((res) => {
+            if (res.code === 200) {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.selectRoleList();
+            } else if (res.code === 202) {
+              MessageBox.confirm(res.msg, "注意", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+              })
+                .then(() => {
+                  updateRoleStatus({
+                    id: row.row.id,
+                    valid: 0,
+                    confirmDel: true,
+                  }).then((res) => {
+                    if (res.code === 200) {
+                      this.$message({
+                        message: "操作成功",
+                        type: "success",
+                      });
+                      this.selectRoleList();
+                    }
+                  });
+                })
+                .catch(() => {});
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "warning",
+              });
+            }
+          });
+        })
+        .catch(() => []);
+    },
+    handleClose(val) {
+      this.drawer = val;
+      this.selectRoleList();
+    },
+    currentChange(val) {
+      this.formData.page = val.page;
+      this.selectRoleList();
+    },
+    sizeChange(val){
+      this.formData.size = val;
+      this.selectRoleList()
+    }
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

+<template>
+  <div class="userDrawer">
+    <el-drawer
+      :title="drawerTitle"
+      :visible.sync="drawer"
+      direction="rtl"
+      size="40%"
+      :close-on-click-modal="false"
+      :wrapperClosable="false"
+      :show-close="false"
+    >
+      <el-form
+        ref="userForm"
+        :model="userForm"
+        label-width="auto"
+        :rules="rules"
+        style="margin: 10px"
+      >
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="员工号:" prop="loginName">
+              <el-input
+                placeholder="请输入员工号"
+                v-model.trim="userForm.loginName"
+                v-if="!userFormDisabled"
+                :disabled="drawerTitle != '新增用户'"
+                size="small"
+                clearable
+              ></el-input>
+              <div v-else>{{ userForm.loginName }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用户姓名:" prop="username">
+              <el-input
+                placeholder="请输入用户姓名"
+                :disabled="userFormDisabled"
+                v-model.trim="userForm.username"
+                v-if="!userFormDisabled"
+                size="small"
+                clearable
+              ></el-input>
+              <div v-else>{{ userForm.username }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-alert
+              title="注意:员工号一但设置就无法更改，请谨慎填写！"
+              type="warning"
+              show-icon
+              size="mini"
+              :closable="false"
+              style="width: 400px"
+            >
+            </el-alert>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="手机号:" prop="phone">
+              <el-input
+                placeholder="请输入手机号"
+                type="phone"
+                v-model.trim="userForm.phone"
+                :disabled="userFormDisabled"
+                v-if="!userFormDisabled"
+                size="small"
+                clearable
+              ></el-input>
+              <div v-else>{{ userForm.phone }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电子邮箱:" prop="email">
+              <el-input
+                placeholder="请输入电子邮箱"
+                type="email"
+                v-model.trim="userForm.email"
+                :disabled="userFormDisabled"
+                v-if="!userFormDisabled"
+                size="small"
+                clearable
+              ></el-input>
+              <div v-else>{{ userForm.email }}</div>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12" v-if="drawerTitle == '新增用户'">
+            <el-form-item label="密码:">
+              <el-input
+                placeholder="请输入密码"
+                :disabled="userFormDisabled"
+                type="password"
+                size="mini"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="drawerTitle == '新增用户'">
+            <el-form-item label="确认密码:">
+              <el-input
+                placeholder="请确认密码"
+                :disabled="userFormDisabled"
+                type="password"
+                size="mini"
+              ></el-input>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="24">
+            <el-form-item label="所属口岸:" prop="portName">
+              <el-select
+                placeholder="请选择口岸"
+                v-model="port"
+                :disabled="userFormDisabled"
+                size="small"
+                style="width: 100%"
+                multiple
+                clearable
+              >
+                <el-option
+                  v-for="item in portNameList"
+                  :label="item.englishName"
+                  :value="item.englishName"
+                  :key="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="所属角色:" prop="roleIds">
+              <el-checkbox-group
+                v-model="roleid"
+                :disabled="userFormDisabled"
+                @change="change"
+              >
+                <el-checkbox
+                  v-for="item in roleList"
+                  :label="item.id"
+                  :key="item.id"
+                  >{{ item.name }}</el-checkbox
+                >
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注:" prop="remark">
+              <el-input
+                type="textarea"
+                v-model="userForm.remark"
+                placeholder="备注"
+                :disabled="userFormDisabled"
+                v-if="!userFormDisabled"
+                size="small"
+                clearable
+              ></el-input>
+              <div v-else>{{ userForm.remark }}</div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item>
+          <el-button
+            type="primary"
+            size="mini"
+            v-if="!userFormDisabled"
+            :loading="loading"
+            @click="submit"
+            >提交</el-button
+          >
+          <el-button type="primary" size="mini" @click="handleClose"
+            >取消</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import {
+  getRoleList,
+  addOrUpdateUser,
+  portNameList,
+} from "@/api/system/user.js";
+export default {
+  props: {
+    drawerTitle: {
+      type: String,
+      default: "",
+    },
+    userFormDisabled: {
+      type: Boolean,
+      default: false,
+    },
+    drawer: {
+      type: Boolean,
+      default: false,
+    },
+    userData: {
+      type: Object,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      userForm: {
+        roleIds: [],
+      },
+      roleList: [],
+      portNameList: [],
+      port: [],
+      roleid: [],
+      ImageUploadUrl: "",
+      dialogVisible: false,
+      loading: false,
+      rules: {
+        loginName: [
+          {
+            required: true,
+            message: "员工号不能为空",
+            trigger: "blur",
+          },
+        ],
+        username: [
+          {
+            required: true,
+            message: "用户名不能为空",
+            trigger: "blur",
+          },
+        ],
+        portName: [
+          {
+            required: true,
+            message: "所属口岸不能为空",
+            trigger: "blur",
+          },
+        ],
+        phone:[
+          {
+            min:11,
+            max:11,
+            message:"请输入11位手机号码",
+            trigger:"blur"
+          },
+          {
+            pattern:/^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+            message:"请输入正确得手机号码"
+          }
+        ],
+        email:[
+          {
+            pattern:/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
+            message:"请输入正确得电子邮箱"
+          }
+        ]
+      },
+    };
+  },
+  created() {
+  },
+  watch: {
+    drawer(val, oldVal) {
+      if (val) {
+        this.roleList = []
+        this.selectRoleList();
+        this.userForm = this.userData;
+        if (this.userForm.roleIds) {
+          this.roleid = this.userForm.roleIds;
+        }
+        if (this.userForm.portName) {
+          this.port = this.userForm.portName;
+        }
+      }else{
+        this.loading = false;
+      }
+    },
+  },
+  methods: {
+    clearValidate(formName){
+      this.$refs[formName].clearValidate();
+    },
+    change(val) {
+      this.roleid = val;
+    },
+    selectRoleList() {
+      //角色列表
+      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,
+              type: "warning",
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+      //获取口岸
+      // this.portNameList = this.$store.state.user.portNames;
+      portNameList()
+        .then((res) => {
+          if (res.code === 200) {
+            this.portNameList = res.data;
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "warning",
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+
+    //关闭
+    handleClose() {
+      this.roleid = [];
+      this.port = [];
+      this.userForm = {
+        roleIds: [],
+      };
+      this.clearValidate('userForm')
+      this.$emit("handleClose", false);
+    },
+
+    //提交
+    submit() {
+      if (this.port.join(",").length > 0) {
+        this.loading = true;
+        this.userData.isValid ? "" : (this.userForm.isValid = 1);
+        this.userForm.roleIds = this.roleid;
+        this.userForm.portName = this.port.join(",");
+        addOrUpdateUser(this.userForm)
+          .then((res) => {
+            this.loading = false;
+            if (res.code === 200) {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.$emit("handleClose", false);
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "warning",
+              });
+            }
+          })
+          .catch((err) => {
+            this.loading = false;
+            console.log(err);
+          });
+      }else{
+        this.$message({
+                message: "口岸不能为空",
+                type: "warning",
+              });
+      }
+    },
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file

+<template>
+  <div>
+    <el-form ref="selectionUserForm" label-width="auto" style="margin: 20px">
+      <el-row :gutter="50">
+        <el-col :span="6">
+          <el-form-item label="用户姓名">
+            <el-input
+              placeholder="请输入用户名称"
+              v-model="formData.username"
+              clearable
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="手机号码">
+            <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" clearable>
+              <el-option label="启用" value="1"> </el-option>
+              <el-option label="停用" value="2"> </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="margin:20px">
+      <el-button
+        type="primary"
+        icon="el-icon-search"
+        size="mini"
+        :loading="loading"
+        @click="selectUser(0)"
+        >搜索</el-button
+      >
+      <el-button type="primary" icon="el-icon-plus" size="mini" @click="addUser" v-hasPermi="['system:user:add']"
+        >新增用户</el-button
+      >
+    </div>
+    <Tables
+      :data="data"
+      :headerData="tableHeader"
+      :limitSize="formData.size"
+      :totalCount="total"
+      :loading="loading"
+      :page="formData.page"
+      :pageSizes="[20,30,40,50]"
+      height="600"
+      @sizeChange="sizeChange"
+      @currentChange="currentChange"
+    >
+      <template>
+        <el-table-column
+          header-align="center"
+          align="center"
+          width="auto"
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button type="primary" size="mini" @click="buttonClick(scope, 0)"
+              >查看</el-button
+            >
+            <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']"
+              >修改</el-button
+            >
+            <!-- <el-button type="primary" size="mini" @click="passwordShow = !passwordShow"
+              >修改密码</el-button
+            > -->
+            <el-button
+              :type="scope.row.isValid == 1 ? 'warning' : 'primary'"
+              size="mini"
+              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']"
+              >删除用户</el-button
+            >
+          </template>
+        </el-table-column>
+      </template>
+    </Tables>
+    <Drawer
+      :drawer="drawer"
+      :drawerTitle="drawerTitle"
+      :userFormDisabled="userFormDisabled"
+      :userData="userData"
+      @handleClose="handleClose"
+    ></Drawer>
+    <!-- <el-dialog
+      title="修改密码"
+      :visible.sync="passwordShow"
+      width="30%"
+      :close-on-click-modal="false"
+      :append-to-body="true"
+    >
+      <el-form label-width="auto">
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <el-form-item label="旧密码：">
+              <el-input placeholder="请输入旧密码" type="password"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="新密码：">
+              <el-input placeholder="请输入新密码" type="password"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="确认新密码：">
+              <el-input placeholder="请确认新密码" type="password"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <div class="dialogFoot">
+          <el-button @click="passwordShow = false">取 消</el-button>
+          <el-button type="primary" @click="passwordShow = false">确 定</el-button>
+        </div>
+      </el-form>
+    </el-dialog> -->
+  </div>
+</template>
+
+<script>
+import Drawer from "./drawer.vue";
+import { MessageBox } from "element-ui";
+import { listUser, detailUser, updateUserStatus } from "@/api/system/user.js";
+export default {
+  name: "UserConfig",
+  components: {
+    Drawer,
+  },
+  data() {
+    return {
+      formData: {
+        page: 1,
+        size: 20,
+        isValid: null,
+        username: null,
+        phone: null,
+      }, //查询条件
+      tableHeader: [
+        {
+          type: "index",
+          name: "",
+          value: "",
+          width: "",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "员工号",
+          value: "loginName",
+          width: "150px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "用户姓名",
+          value: "username",
+          width: "150px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "所属口岸",
+          value: "portName",
+          width: "150px",
+          align: "center",
+          sortable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "所属角色",
+          value: "roleNames",
+          width: "150px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "电子邮箱",
+          value: "email",
+          width: "150px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "用户状态",
+          value: "isValid",
+          width: "100px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "修改时间",
+          value: "updateTime",
+          width: "150px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+        {
+          type: "",
+          name: "备注",
+          value: "remark",
+          width: "150px",
+          align: "center",
+          sorTable: false,
+          disabled:true
+        },
+      ], //表头数据
+      userData: {}, //用户详情
+      data: [], //用户列表
+      drawer: false,
+      userFormDisabled: false,
+      passwordShow: false,
+      drawerTitle: "",
+      total: 0,
+      loading: false,
+    };
+  },
+  created() {
+    if(this.$store.state.tagsView.cachedViews.length == 0){
+      this.selectUser();
+    }
+  },
+  activated(){
+    this.selectUser();
+  },
+  deactivated(){
+    this.data = []
+  },
+  methods: {
+    //用户列表
+    selectUser(val) {
+      if(val == 0){
+        this.formData.page = 1
+      }
+      this.loading = true;
+      listUser(this.formData)
+        .then((res) => {
+          this.loading = false;
+          if (res.code === 200) {
+            this.data = res.data.list;
+            this.total = res.data.total;
+            this.formData.page = res.data.page;
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "warning",
+            });
+          }
+        })
+        .catch((err) => {
+          this.loading = false;
+          console.log(err);
+        });
+    },
+
+    //用户详情
+    userDetail(id) {
+      detailUser(id)
+        .then((res) => {
+          this.drawer = true;
+          this.drawerTitle = "修改用户";
+          if (res.code === 200) {
+            this.userData = res.data;
+            this.userData.portName
+              ?this.userData.portName=this.userData.portName.split(",")
+              : '';
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "warning",
+            });
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+
+    //新增用户
+    addUser() {
+      this.userData = {};
+      this.drawer = true;
+      this.drawerTitle = "新增用户";
+      this.userFormDisabled = false;
+    },
+
+    //查询修改用户
+    buttonClick(row, status) {
+      this.userDetail(row.row.id);
+      status == 0
+        ? (this.userFormDisabled = true)
+        : (this.userFormDisabled = false);
+    },
+
+    //修改用户状态
+    userStatus(row) {
+      let msg = "";
+      let nowValid = 1;
+      row.row.isValid == 1
+        ? ((msg = "是否要停用此用户"), (nowValid = 2))
+        : ((msg = "是否要启用此用户"), (nowValid = 1));
+      MessageBox.confirm(msg, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          updateUserStatus({ id: row.row.id, isValid: nowValid }).then(
+            (res) => {
+              if (res.code === 200) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                });
+                this.selectUser();
+              } else {
+                this.$message({
+                  message: res.msg,
+                  type: "warning",
+                });
+              }
+            }
+          );
+        })
+        .catch((err) => {
+          console.log(err);
+        })
+        .catch(() => []);
+    },
+
+    //删除用户
+    removeUser(row) {
+      MessageBox.confirm("是否要删除此用户", "提示", {
+        confirmButtonText: "确定删除",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          updateUserStatus({ id: row.row.id, isValid: 0 }).then((res) => {
+            if (res.code === 200) {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+              });
+              this.selectUser();
+            } else {
+              this.$message({
+                message: res.msg,
+                type: "warning",
+              });
+            }
+          });
+        })
+        .catch((err) => {
+          console.log(err);
+        })
+        .catch(() => []);
+    },
+
+    handleClose(val) {
+      this.drawer = val;
+      this.userData = {};
+      this.selectUser();
+    },
+
+    currentChange(val) {
+      this.formData.page = val.page;
+      this.selectUser();
+    },
+
+    sizeChange(val){
+      this.formData.size = val;
+      this.selectUser()
+    }
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file