航班信息维护按钮新增，字段新增，bug修复

 let ductLabels = {
+    "cargo": {//货物查询
         "cargoRulesStatus": {
             "1": "手动",
             "2": "自动"
         },
+        "releasing": {
+            "1": "正在释放"
+        }
+    },
+    "menu": {//菜单设置
         "menuType": {
             "M": "菜单",
             "C": "菜单",
@@ -12,14 +18,20 @@ let ductLabels = {
             "1": "启用",
             "2": "停用",
         },
+    },
+    "role": {//角色设置
         "valid": {
             "1": "开启",
             "2": "关闭",
         },
+    },
+    "user": {//用户设置
         "isValid": {
             "1": "开启",
             "2": "关闭",
         },
+    },
+    "FlightInformation": {//航班信息维护
         "ticketToPiece": {
             "1": "是",
             "0": "否",
@@ -31,8 +43,20 @@ let ductLabels = {
         "highLowPriceFlg": {
             "1": "开启",
             "0": "未开启",
+        },
+        "pushDateSwitch": {
+            "1": "是",
+            "2": "否",
+        },
+    },
+    "logDmData": {//DM数据
+        "status": {
+            "0": "未处理",
+            "1": "已处理",
+            "2": "处理失败",
+            "3": "无需处理",
+        },
     }
-
 }
 
 export default ductLabels;
\ No newline at end of file

@@ -37,12 +37,14 @@
         label-position="right"
         label-width="auto"
         style="width: 400px; margin: 30px auto"
+        v-model="formData"
       >
         <el-form-item label="航班号" prop="fltNo">
           <el-input
             v-model="fltNo"
             size="medium"
             placeholder="请输入航班号"
+            maxlength="10"
             style="width: 350px"
           ></el-input>
         </el-form-item>
@@ -134,7 +136,7 @@ export default {
     },
     //确定配舱
     submit() {
-      this.loading= true;
+      this.loading =true;
       let arr = [];
       this.tableData.forEach((item) => {
         arr.push(item.id);
@@ -142,6 +144,7 @@ export default {
       this.formData.ids = arr;
       if (this.formData.fltNo && this.formData.fltDate) {
         allocationFlight(this.formData).then((res) => {
+          this.loading = false;
           //code 200 配舱成功 202 重量已满需要确认 其余code直接输出msg
           if (res.code === 200) {
             this.$message({
@@ -149,7 +152,6 @@ export default {
               type: "success",
             });
             this.cleaerForm();
-            this.loading = false;
             this.$emit("dialogBeforeClose", { close: false, reload: true });
           } else if (res.code === 202) {
             MessageBox.confirm(res.msg, "提示", {
@@ -173,7 +175,6 @@ export default {
                   }
                 });
                 this.cleaerForm();
-                this.loading = false;
                 this.$emit("dialogBeforeClose", { close: false, reload: true });
               })
               .catch(() => {
@@ -183,7 +184,6 @@ export default {
                   type: "success",
                 });
                 this.cleaerForm();
-                this.loading = false;
                 this.$emit("dialogBeforeClose", {
                   close: false,
                   reload: true,
@@ -209,6 +209,7 @@ export default {
     },
     dialogBeforeClose() {
       this.cleaerForm();
+      this.$refs['form'].clearValidate();
       this.$emit("dialogBeforeClose", { close: false, reload: true });
     },
     formatter(row, column, cellValue, index){

@@ -232,15 +232,21 @@
     </el-form>
     <Tables
       ref="newTables"
+      ductName="cargo"
       :data="tableData"
       :headerData="tableHeader"
+      :infoData="tableHeader"
+      :selection="true"
       :totalCount="totalCount"
       :loading="tableLoading"
       :limitSize="limitSize"
       :limitStart="limitStart"
       :page="page"
       :shiftKey="shiftKey"
+      :infoShow="false"
+      :pageSizes="[100]"
       :height="tableHeight"
+      @sizeChange="sizeChange"
       @tableSelect="tableSelect"
       @tableSelectAll="tableSelectAll"
       @currentChange="currentChange"
@@ -288,27 +294,6 @@ export default {
       }, //表单数据
       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: "portName",
           width: "120",
@@ -318,7 +303,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "取件日期",
           value: "pickUpDate",
           width: "120",
@@ -328,7 +312,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "取件扫描号",
           value: "pickUpScanNo",
           width: "120",
@@ -338,7 +321,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "站点",
           value: "siteName",
           width: "80",
@@ -348,7 +330,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "运单号",
           value: "waybillNo",
           width: "150",
@@ -358,7 +339,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "总单号",
           value: "totalWaybillNo",
           width: "150",
@@ -368,7 +348,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "服务类型",
           value: "serviceTypeName",
           width: "100",
@@ -378,7 +357,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "服务代码",
           value: "serviceCode",
           width: "90",
@@ -388,7 +366,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "URSA",
           value: "ursa",
           width: "100",
@@ -398,7 +375,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "申报类型",
           value: "typeName",
           width: "100",
@@ -408,7 +384,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "HandlingCode",
           value: "handingCode",
           width: "150",
@@ -418,7 +393,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "subcategory",
           value: "subCategory",
           width: "150",
@@ -428,7 +402,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "件数",
           value: "qty",
           width: "80",
@@ -438,7 +411,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "实际重量",
           value: "actualWeight",
           width: "100",
@@ -448,7 +420,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "收件人国家代码",
           value: "consigneeCountry",
           width: "150",
@@ -458,7 +429,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "品名描述",
           value: "nameDescription",
           width: "100",
@@ -468,7 +438,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "海关回执状态",
           value: "customsReceiptStatusName",
           width: "140",
@@ -478,7 +447,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "预审状态",
           value: "preQualificationStatus",
           width: "100",
@@ -488,7 +456,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "航班预审意见",
           value: "caPretrialOpinion",
           width: "140",
@@ -498,7 +465,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "货物状态",
           value: "statusName",
           width: "100",
@@ -508,7 +474,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "终配航班号",
           value: "finalFlightNo",
           width: "130",
@@ -518,7 +483,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "终配航班日期",
           value: "finalFlightTime",
           width: "150",
@@ -528,7 +492,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "二配航班号",
           value: "twoMatchFlightNo",
           width: "130",
@@ -538,7 +501,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "二配航班日期",
           value: "twoMatchFlightTime",
           width: "150",
@@ -548,7 +510,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "预配航班号",
           value: "preplanFlightNo",
           width: "130",
@@ -558,7 +519,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "预配航班日期",
           value: "preplanFlightTime",
           width: "150",
@@ -568,7 +528,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "ACCS原航班号",
           value: "fltNoAccs",
           width: "140",
@@ -578,7 +537,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "ACCS原航班日期",
           value: "fltDateAccs",
           width: "150",
@@ -588,7 +546,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "ACCS原航线",
           value: "accsFlightRoute",
           width: "150",
@@ -598,7 +555,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "是否RDE手工录入",
           value: "manualRde",
           width: "170",
@@ -608,7 +564,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "是否自动",
           value: "cargoRulesStatus",
           width: "100",
@@ -618,7 +573,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "发件人账号",
           value: "shipperAccount",
           width: "150",
@@ -628,7 +582,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "发件公司中文名称",
           value: "shipperCompany",
           width: "150",
@@ -638,7 +591,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "始发地城市名称",
           value: "originCity",
           width: "150",
@@ -648,7 +600,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "收件地",
           value: "destinationSiteName",
           width: "90",
@@ -658,7 +609,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "尺寸",
           value: "sizeStr",
           width: "80",
@@ -668,7 +618,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "大货预审意见（是否可以配置航班）",
           value: "bigPretrialOpinion",
           width: "250",
@@ -678,7 +627,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "大货预审时间",
           value: "bigPretrialTime",
           width: "150",
@@ -688,7 +636,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "海关回执时间",
           value: "customsReceiptTime",
           width: "150",
@@ -698,7 +645,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "航班预审时间",
           value: "caPretrialTime",
           width: "150",
@@ -708,7 +654,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "创建人",
           value: "createUserName",
           width: "90",
@@ -718,7 +663,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "创建时间",
           value: "createTime",
           width: "120",
@@ -928,6 +872,10 @@ export default {
         item.index = index;
       });
     },
+    sizeChange(val){
+      this.limitSize = val
+      this.select(0);
+    },
     // 导出表格
     xlse(page) {
       this.progress = 1;

@@ -19,8 +19,9 @@
       default-expand-all
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
+      <template v-for="(item, index) in tableHeader">
         <el-table-column
-        v-for="(item, index) in tableHeader"
+          v-if="item.value === 'menuType'"
           :prop="item.value"
           :label="item.name"
           :key="index"
@@ -31,11 +32,26 @@
           :formatter="formatter"
         >
           <template slot-scope="scope">
-          <el-tag v-if="item.value === 'menuType'" :type="scope.row.menuType === 'B'?'':'success'"
-            disable-transitions>{{scope.row.menuType === 'B'?'按钮':'菜单'}}</el-tag>
-            <span v-else>{{scope.row.title}}</span>
+            <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"
@@ -112,7 +128,7 @@ import dictLabels from "@/assets/languages/dictLabels.js";
 import Drawer from "./drawer.vue";
 import { MessageBox } from "element-ui";
 export default {
-  name:"MenuConfig",
+  name: "MenuConfig",
   components: {
     Drawer,
   },
@@ -120,13 +136,12 @@ export default {
     return {
       drawer: false,
       menuFormDisabled: false,
-      loading:false,
+      loading: false,
       drawerTitle: "",
       menuData: {},
       data: [],
       tableHeader: [
         {
-          type: "",
           name: "菜单名",
           value: "title",
           width: "200",
@@ -134,7 +149,6 @@ export default {
           sorTable: false,
         },
         {
-          type: "",
           name: "菜单类型",
           value: "menuType",
           width: "100",
@@ -142,7 +156,6 @@ export default {
           sortable: false,
         },
         {
-          type: "",
           name: "权限标识",
           value: "permissionKey",
           width: "auto",
@@ -150,7 +163,6 @@ export default {
           sortable: false,
         },
         {
-          type: "",
           name: "菜单状态",
           value: "status",
           width: "100",
@@ -158,7 +170,6 @@ export default {
           sorTable: false,
         },
         {
-          type: "",
           name: "菜单路由",
           value: "path",
           width: "auto",
@@ -169,15 +180,15 @@ export default {
     };
   },
   created() {
-    if(this.$store.state.tagsView.cachedViews.length == 0){
+    if (this.$store.state.tagsView.cachedViews.length == 0) {
       this.menuAll();
     }
   },
-  activated(){
+  activated() {
     this.menuAll();
   },
-  deactivated(){
-    this.data = []
+  deactivated() {
+    this.data = [];
   },
   methods: {
     addMenu() {
@@ -202,7 +213,8 @@ export default {
     //表格数据
     menuAll() {
       this.loading = true;
-      getAllAuth().then((res) => {
+      getAllAuth()
+        .then((res) => {
           this.loading = false;
           if (res.code === 200) {
             res.data.length > 0
@@ -217,7 +229,8 @@ export default {
               type: "warning",
             });
           }
-      }).catch(()=>{
+        })
+        .catch(() => {
           this.loading = false;
         });
     },
@@ -232,7 +245,7 @@ export default {
               message: "操作成功",
               type: "success",
             });
-            location.reload()
+            location.reload();
           } else {
             this.$message({
               message: res.msg,
@@ -282,9 +295,9 @@ export default {
     },
 
     formatter(row, column, cellValue, index) {
-      if (dictLabels[column.property]) {
-        if (dictLabels[column.property][cellValue]) {
-          return dictLabels[column.property][cellValue];
+      if (dictLabels["menu"][column.property]) {
+        if (dictLabels["menu"][column.property][cellValue]) {
+          return dictLabels["menu"][column.property][cellValue];
         }
       }
       return cellValue;

@@ -65,7 +65,6 @@
                 :props="defaultProps"
                 :show-checkbox="true"
                 :default-checked-keys="roleData.menuIds"
-                check-strictly
                 accordion
               >
               </el-tree>
@@ -138,7 +137,7 @@ export default {
     getAllAuth()
       .then((res) => {
         if (res.code === 200) {
-          this.treeData = res.data;
+          this.treeData = this.treeDataInfo(res.data);
         } else {
           this.$message({
             message: res.msg,
@@ -150,22 +149,22 @@ export default {
         console.log(err);
       });
   },
-  watch:{
-    roleFormDisabled(){
-      this.treeData = this.treeDisabled(this.treeData)
+  watch: {
+    roleFormDisabled() {
+      this.treeData = this.treeDisabled(this.treeData);
     },
-    drawer(val,oldVal){
-      if(val){
+    drawer(val, oldVal) {
+      if (val) {
         this.roleForm = this.roleData;
-      }else{
+      } else {
         this.loading = false;
       }
-    }
+    },
   },
   methods: {
     //关闭
     handleClose() {
-      this.$refs['roleForm'].clearValidate();
+      this.$refs["roleForm"].clearValidate();
       this.$emit("handleClose", false);
     },
 
@@ -173,7 +172,11 @@ export default {
     submit() {
       let formData = {};
       this.loading = true;
-      formData.menuIdList = this.$refs.tree.getCheckedKeys();
+      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;
@@ -204,9 +207,24 @@ export default {
       let data = [];
       val.forEach((item) => {
         item.disabled = this.roleFormDisabled;
-        data.push(item)
+        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) {
-          item.children = this.treeDisabled(item.children)
+          menuItem.children = this.treeDataInfo(item.children);
+          menuItem.children.unshift({id:item.id,title:`${item.title}(菜单)`})
         }
       });
       return data;

@@ -28,8 +28,8 @@
         <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-option label="启用" value="1"> </el-option>
+              <el-option label="停用" value="2"> </el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -49,19 +49,21 @@
       >
     </div>
     <Tables
+      ductName="role"
       :data="data"
       :headerData="tableHeader"
       :infoData="tableHeader"
       :totalCount="total"
       :limitSize="formData.size"
       :page="formData.page"
+      :infoShow="false"
       :pageSizes="[20,30,40,50]"
       :loading="tableLoading"
       height="600"
        @sizeChange="sizeChange"
       @currentChange="currentChange"
     >
-      <template>
+      <template slot="optionColumn">
         <el-table-column header-align="center" align="center" label="操作">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" @click="buttonClick(scope, 0)"
@@ -120,16 +122,6 @@ export default {
       data: [], //表格数据
       tableHeader: [
         {
-          type: "index",
-          name: "",
-          value: "",
-          width: "",
-          align: "center",
-          sorTable: false,
-          disabled:true
-        },
-        {
-          type: "",
           name: "角色名称",
           value: "name",
           width: "150px",
@@ -138,7 +130,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "角色状态",
           value: "valid",
           width: "150px",
@@ -147,7 +138,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "创建人",
           value: "createUserName",
           width: "150px",
@@ -156,7 +146,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "创建时间",
           value: "createTime",
           width: "150px",
@@ -165,7 +154,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "修改时间",
           value: "updateTime",
           width: "150px",
@@ -174,7 +162,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "备注",
           value: "remark",
           width: "400px",

@@ -23,8 +23,8 @@
         <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-option label="启用" value="1"> </el-option>
+              <el-option label="停用" value="2"> </el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -44,18 +44,20 @@
       >
     </div>
     <Tables
+      ductName="user"
       :data="data"
       :headerData="tableHeader"
       :limitSize="formData.size"
       :totalCount="total"
       :loading="loading"
       :page="formData.page"
+      :infoShow="false"
       :pageSizes="[20,30,40,50]"
       height="600"
       @sizeChange="sizeChange"
       @currentChange="currentChange"
     >
-      <template>
+      <template slot="optionColumn">
         <el-table-column
           header-align="center"
           align="center"
@@ -147,16 +149,6 @@ export default {
       }, //查询条件
       tableHeader: [
         {
-          type: "index",
-          name: "",
-          value: "",
-          width: "",
-          align: "center",
-          sorTable: false,
-          disabled:true
-        },
-        {
-          type: "",
           name: "员工号",
           value: "loginName",
           width: "150px",
@@ -165,7 +157,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "用户姓名",
           value: "username",
           width: "150px",
@@ -174,7 +165,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "所属口岸",
           value: "portName",
           width: "150px",
@@ -183,7 +173,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "所属角色",
           value: "roleNames",
           width: "150px",
@@ -192,7 +181,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "电子邮箱",
           value: "email",
           width: "150px",
@@ -201,16 +189,14 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "用户状态",
           value: "isValid",
           width: "100px",
           align: "center",
           sorTable: false,
-          disabled:true
+          disabled:true,
         },
         {
-          type: "",
           name: "修改时间",
           value: "updateTime",
           width: "150px",
@@ -219,7 +205,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "备注",
           value: "remark",
           width: "150px",