修改

src/components/tableText/index.vue

@@ -0,0 +1,128 @@
+<template>
+  <div class="tableText newBagDetails">
+    <div class="newBagDetails-info">
+      <div class="newBagDetails-info-look">
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <div class="flex-wrap">
+              <el-tooltip class="item" effect="dark" :content="passengerName" placement="top">
+                <span class="newBagDetails-info-look-name">{{ passengerName }}</span>
+              </el-tooltip>
+              <el-button type="text">查看</el-button>
+            </div>
+          </el-col>
+          <el-col :span="item.rows" v-for="(item,index) in infoArrs" :key="index">{{ item.label }}：{{ item.value }}</el-col>
+        </el-row>
+      </div>
+      <div class="newBagDetails-info-details">
+        <div class="newBagDetails-info-details-tags">
+          <scroll-pane ref="scrollPane" class="tags-view-wrapper">
+            <div v-for="(item,index) in detailsArr" class="tags-view-item" @click="tagClick(item,index)" :class="activeIndex == index ? 'active' : ''" :key="index">{{ item.luggageNum }}</div>
+          </scroll-pane>
+        </div>
+        <div class="newBagDetails-info-details-msgs">
+          <el-row class="newBagDetails-info-details-msgs-l1" :gutter="20">
+            <el-col :span="item.rows" v-for="(item,index) in msgs1" :key="index">{{ item.label }}：{{ item.value }}</el-col>
+          </el-row>
+          <el-row class="newBagDetails-info-details-msgs-l2" :gutter="20">
+            <el-col :span="item.rows" v-for="(item,index) in msgs2" :key="index">{{ item.label }}：{{ item.value }}</el-col>
+          </el-row>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'TableText',
+  data () {
+    return {
+
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.newBagDetails {
+  height: calc(100vh - 80px);
+  padding: 12px;
+  &-info {
+    height: 200px;
+    background: #051436;
+    color: #fff;
+    font-size: 14px;
+    &-look {
+      padding: 0 32px;
+      height: 64px;
+      line-height: 64px;
+      background: #041741;
+      &-name {
+        font-size: 18px;
+        font-family: Microsoft YaHei;
+        font-weight: bold;
+        color: #ffffff;
+        margin-right: 7px;
+        max-width: 101px;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        display: inline-block;
+      }
+    }
+    &-details {
+      position: relative;
+      padding: 0 32px;
+      height: 136px;
+      &-tags {
+        height: 32px;
+        line-height: 32px;
+        .tags-view-wrapper {
+          width: calc(100%);
+          ::v-deep .el-scrollbar__wrap {
+            // margin-top: 8.5px;
+          }
+          .tags-view-item {
+            display: inline-block;
+            position: relative;
+            cursor: pointer;
+            height: 32px;
+            line-height: 32px;
+            // border: 1px solid #767eba;
+            // border-radius: 4px;
+            font-size: 14px;
+            font-family: Microsoft YaHei;
+            font-weight: 400;
+            color: #aaacb2;
+            margin-right: 100px;
+            &:last-child {
+              margin-right: 0;
+            }
+            &.active {
+              color: #fff;
+              position: relative;
+              &::after {
+                position: absolute;
+                content: "";
+                width: 100%;
+                left: 0;
+                bottom: 0;
+                height: 3px;
+                background: #2d67e3;
+              }
+            }
+          }
+        }
+      }
+      &-msgs {
+        padding: 25px 0;
+        height: 104px;
+        &-l1 {
+          margin-bottom: 22px;
+        }
+      }
+    }
+  }
+}
+</style>

src/layout/mixin/publicFunc.js

@@ -135,7 +135,23 @@ export default {
           pageSize: pageSize,
           dataContent: dataContent,
           event: '0',
-          authId: this.AauthId
+          // authId: this.AauthId
+        })
+        return { code, rowcount, returnData }
+      } catch (error) {
+        return []
+      }
+    },
+    //权限查询
+    async getQueryListAuth (id, dataContent = {}, pageIndex = 1, pageSize = 999, authId) {
+      try {
+        const { code, rowcount, returnData } = await Query({
+          serviceId: id,
+          page: pageIndex,
+          pageSize: pageSize,
+          dataContent: dataContent,
+          event: '0',
+          authId: authId ?? this.AauthId
         })
         return { code, rowcount, returnData }
       } catch (error) {
@@ -151,7 +167,7 @@ export default {
           pageSize: pageSize ?? this.pageSize,
           dataContent: this.formatQuery(dataContent, key),
           event: '0',
-          authId: this.AauthId
+          // authId: this.AauthId
         })
         if (code == 0) {
           return returnData
@@ -169,7 +185,7 @@ export default {
           serviceId: id,
           dataContent: this.formatChange(data, event, key),
           event: `${event}`,
-          authId: this.AauthId
+          // authId: this.AauthId
         };
         const { code, message } =
           event == 1

src/views/flightViewManagement/mixins/tableCols.js

@@ -8,7 +8,7 @@
  */
 
 export default {
-  data() {
+  data () {
     return {
       // 筛选后表头
       tableColsCopy: [],
@@ -20,25 +20,25 @@ export default {
       dialogFlag: false
     }
   },
-  created() {
-    this.initTableCols()
-  },
-  updated() {
+  // created () {
+  //   this.initTableCols()
+  // },
+  updated () {
     // table数据更新
     this.$nextTick(() => {
       this.$refs.table?.doLayout()
     })
   },
   computed: {
-    colsCheckClass() {
+    colsCheckClass () {
       return this.tableCols.some(col => col.children?.length) ? 'has-children' : 'no-children'
     }
   },
   methods: {
     // 列设置-初始化
-    initTableCols() {
+    initTableCols () {
       const that = this
-      function setTableCols(cols) {
+      function setTableCols (cols) {
         for (const col of cols) {
           col.index = that.checkedKeys.length
           that.checkedKeys.push(that.checkedKeys.length)
@@ -48,15 +48,15 @@ export default {
         }
       }
       setTableCols(this.tableCols)
-      this.tableColsCopy = this._.cloneDeep(this.tableCols)
+      // this.tableColsCopy = this._.cloneDeep(this.tableCols)
       this.checkedKeysTemp = [...this.checkedKeys]
     },
     // 列设置-确定
-    handleCheck(data, checked) {
+    handleCheck (data, checked) {
       this.checkedKeysTemp = [...checked.checkedKeys]
       this.halfCheckedKeys = [...checked.halfCheckedKeys]
     },
-    onCheck(tableDataName = 'tableData') {
+    onCheck (tableDataName = 'tableData') {
       if (this.dialogFlag === false) {
         return
       }
@@ -65,15 +65,16 @@ export default {
       this[tableDataName] = []
       this.dialogFlag = false
       this.checkedKeys = [...this.checkedKeysTemp]
-      this.tableColsCopy = this.colsFilter(this._.cloneDeep(this.tableCols))
+      const datas = this.colsFilter(this._.cloneDeep(this.tableCols))
+      this.tableColsCopy = datas.filter((item) => item.needShow)
       setTimeout(() => {
         if (!this[tableDataName].length) {
           this[tableDataName] = tableDataTemp
         }
         this.loading = false
-      }, 500)
+      }, 50)
     },
-    colsFilter(cols) {
+    colsFilter (cols) {
       const temp = cols.filter(col => {
         if (this.halfCheckedKeys.includes(col.index)) {
           col.children = this.colsFilter(col.children)
@@ -86,11 +87,11 @@ export default {
       return temp
     },
     // 弹框展开
-    show() {
+    show () {
       this.dialogFlag = true
     },
     // 弹框关闭
-    hide() {
+    hide () {
       this.dialogFlag = false
       this.checkedKeysTemp = [...this.checkedKeys]
     }

src/views/newBagDetails/components/baggageList.vue

@@ -1,47 +1,21 @@
 <template>
   <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="baggageList">
-    <el-table ref="table" :data="baggageTableData" height="100%" size="mini" border fit :header-cell-class-name="headerCellClass" :header-cell-style="{ color: '#101116' }" :cell-class-name="cellClass" :span-method="tableSpanMethod" @cell-click="cellClickHandler">
-      <el-table-column v-for="item in tableColsCopy" :key="item.index" :prop="item.prop" :label="item.name" :align="item.align || 'center'" :width="item.width" show-overflow-tooltip :fixed="item.fixed">
-        <template slot="header">
-          <div class="cell-content">{{ item.name }}</div>
-        </template>
-        <template slot-scope="scope">
-          <div class="cell-content">{{ scope.row[item.prop] }}</div>
-        </template>
-      </el-table-column>
-    </el-table>
+    <Table style="height:100%" :istableCol="true" :tableTag="tableTag" ref="table" />
     <div class="btns">
       <img class="btn-square btn-shadow r16" src="@/assets/baggage/ic_export.png" title="导出" @click="exportHandler('table', '行李节点列表')">
-      <img class="btn-square btn-shadow" src="@/assets/baggage/ic_setting.png" title="列设置" @click="show">
     </div>
-    <!--列设置-->
-    <Dialog :flag="dialogFlag" class="dialog-check-group">
-      <div class="dialog-wrapper">
-        <div class="title">列设置</div>
-        <div class="content">
-          <el-tree ref="columnSetTree" :data="tableCols" :class="colsCheckClass" show-checkbox node-key="index" :default-expand-all="true" :props="{
-              label: 'name',
-              children: 'children',
-            }" :default-checked-keys="checkedKeysTemp" @check="handleCheck" />
-        </div>
-        <div class="foot right t30">
-          <el-button size="medium" class="r24" type="primary" @click="onCheck('baggageTableData')">确定</el-button>
-          <el-button size="medium" @click="hide">取消</el-button>
-        </div>
-      </div>
-    </Dialog>
   </div>
 </template>
 
 <script>
+import Table from '../../newQuery/components/table.vue'
 import Dialog from '@/layout/components/Dialog/index.vue'
 import pf from '@/layout/mixin/publicFunc'
-import tableColsMixin from '@/views/flightViewManagement/mixins/tableCols'
 import { throttledExportToExcel } from '@/utils/table'
 export default {
   name: 'BaggageList',
-  mixins: [pf, tableColsMixin],
-  components: { Dialog },
+  mixins: [pf],
+  components: { Dialog, Table },
   props: {
     query: {
       type: Object,
@@ -50,60 +24,39 @@ export default {
     tagObj: {
       type: Object,
       default: () => { }
-    }
+    },
+    tableDatas: {
+      type: Array,
+      default: []
+    },
   },
   data () {
     return {
-      tableCols: [
-        { name: '航班号', prop: 'flightNo', fixed: true },
-        { name: '航班日期', prop: 'flightDate', width: 95, fixed: true },
-        // { name: '起飞航站\n起飞时间', prop: 'departureInfo', width: 100 },
-        // { name: '目的航站\n降落时间', prop: 'landingInfo', width: 100 },
-        { name: '旅客舱位', prop: 'passenger_cabin', width: 70 },
-        { name: '旅客座位号', prop: 'seatNum' },
-        { name: '值机序号', prop: 'checkin_number', width: 70 },
-        { name: '节点标识', prop: 'nodeCode', width: 100 },
-        { name: '节点名称', prop: 'nodeName', width: 70 },
-        { name: '位置标识', prop: 'location_code' },
-        { name: '位置描述', prop: 'location_describe' },
-        { name: '读取时间', prop: 'readTime', width: 158 },
-        { name: '结果', prop: 'currentResult', width: 60 },
-        { name: '次级代码', prop: 'secondary_code', width: 70 },
-        { name: '操作人', prop: 'agentNumber', width: 90 },
-        { name: '设备ID', prop: 'device_ID' },
-        { name: '发往位置', prop: 'to_location_code', width: 70 },
-        { name: '发往位置描述', prop: 'to_location_describe', width: 100 },
-        { name: '装载序号', prop: 'loadNumber', width: 70 },
-        { name: '容器编号', prop: 'container_ID', width: 110 },
-        { name: '数据来源', prop: 'dataObjectId', width: 200 }
-      ],
+      tableCols: [],
       baggageTableData: [],
       spanArr: [],
       pos: 0,
       loading: false,
-      dataContent: {}
+      dataContent: {},
+      tableTag: {}
     }
   },
   watch: {
     tagObj: {
       handler (obj) {
-        this.dataContent = obj
-        this.queryDetails()
+        this.tableTag = obj
       },
       deep: true
     }
   },
-  created () {
-    this.dataContent = this.query
-  },
   mounted () {
-    this.queryDetails()
+    this.tableTag = this.query
   },
   methods: {
-    async queryDetails () {
+    async queryDetails (auth_id) {
       try {
         this.loading = true
-        const { code, returnData } = await this.getQueryList(SERVICE_ID.bagDetailId, this.dataContent)
+        const { code, returnData } = await this.getQueryListAuth(SERVICE_ID.bagDetailId, this.dataContent, 1, 20, auth_id)
         if (code == 0 && returnData && returnData.length) {
           this.baggageTableData = returnData.map((item, index) => {
             if (item['dealTime']) {
@@ -210,8 +163,8 @@ export default {
     },
     exportHandler (refName, tableName) {
       const table = this.$refs[refName].$el.cloneNode(true)
-      const { luggageNum, flightNo, flightDate } = this.query
-      const fileName = `${tableName}-${luggageNum}-${flightNo}-${flightDate}.xlsx`
+      const { luggageNum, carrierFlights, carrierFlightsDate } = this.query
+      const fileName = `${tableName}-${luggageNum}-${carrierFlights}-${carrierFlightsDate}.xlsx`
       throttledExportToExcel(table, tableName, fileName)
     },
   }
@@ -225,7 +178,7 @@ export default {
   .btns {
     position: absolute;
     top: -50px;
-    right: 24px;
+    right: 66px;
     z-index: 10;
     .r16 {
       margin-right: 16px;

src/views/newBagDetails/index.vue

@@ -11,7 +11,7 @@
               <el-button type="text">查看</el-button>
             </div>
           </el-col>
-          <el-col :span="item.rows" v-for="(item,index) in infoArrs" :key="index">{{ item.label }}：{{ item.value }}</el-col>
+          <el-col :span="3" v-for="(item,index) in infoArrs" :key="index">{{ item.columnLabel }}：{{ item.value }}</el-col>
         </el-row>
       </div>
       <div class="newBagDetails-info-details">
@@ -21,12 +21,11 @@
           </scroll-pane>
         </div>
         <div class="newBagDetails-info-details-msgs">
-          <el-row class="newBagDetails-info-details-msgs-l1" :gutter="20">
-            <el-col :span="item.rows" v-for="(item,index) in msgs1" :key="index">{{ item.label }}：{{ item.value }}</el-col>
-          </el-row>
-          <el-row class="newBagDetails-info-details-msgs-l2" :gutter="20">
-            <el-col :span="item.rows" v-for="(item,index) in msgs2" :key="index">{{ item.label }}：{{ item.value }}</el-col>
-          </el-row>
+          <el-scrollbar style="height: 100%;">
+            <el-row class="newBagDetails-info-details-msgs-l1" :gutter="20">
+              <el-col :span="3" class="msgs-list" v-for="(item,index) in msgs1" :key="index">{{ item.columnLabel }}：{{ item.value }}</el-col>
+            </el-row>
+          </el-scrollbar>
         </div>
       </div>
     </div>
@@ -38,7 +37,7 @@
         </div>
       </div>
       <div class="newBagDetails-contents-page">
-        <component ref="dataChild" :query="query" :tagObj="tagObj" :is="componentName"></component>
+        <component ref="dataChild" :query="query" :tableDatas="tableDatas" :tagObj="tagObj" :is="componentName"></component>
       </div>
     </div>
   </div>
@@ -50,145 +49,19 @@ import baggageView from './components/baggageView.vue'
 import baggageList from './components/baggageList.vue'
 import baggageMessage from './components/baggageMessage.vue'
 import pf from '@/layout/mixin/publicFunc'
+import { getAuthData } from '@/utils/validate'
+import { getToken } from '@/utils/auth'
 export default {
   name: 'NewBagDetails',
   mixins: [pf],
   components: { ScrollPane, baggageView, baggageList, baggageMessage },
   data () {
     return {
-      infoArrs: [
-        {
-          prop: 'luggageCount',
-          label: '总件数',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'luggageWeight',
-          label: '重量',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'PNRNO',
-          label: 'PNR编号',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'groupName',
-          label: '企业或团队名称',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'frequentflyerNO',
-          label: '常旅客号',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'frequentflyerGrade',
-          label: '常旅客级别',
-          rows: 3,
-          value: ''
-        }
-      ],
+      infoArrs: [],
       passenger_name: '',
-      detailsArr: [
-        {
-          no: '39998979441'
-        },
-        {
-          no: '39998979441'
-        },
-        {
-          no: '39998979441'
-        }
-      ],
+      detailsArr: [],
       activeIndex: null,
-      msgs1: [
-        {
-          prop: 'nodeCode',
-          label: '最新节点',
-          rows: 4,
-          value: ''
-        },
-        {
-          prop: 'currentResult',
-          label: '最新结果',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'luggageType',
-          label: '特殊行李类型',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'no_checkin',
-          label: '删除',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'activeState',
-          label: '激活',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'file_code',
-          label: '卷宗号',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'No_BSM',
-          label: '无BSM',
-          rows: 3,
-          value: ''
-        }
-      ],
-      msgs2: [
-        {
-          prop: 'compensation_type',
-          label: '赔偿类型',
-          rows: 4,
-          value: ''
-        },
-        {
-          prop: 'compensation_amount',
-          label: '赔偿金额',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'abnormal_state',
-          label: '异常状态',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'loading_number',
-          label: '装载序列号',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'Loadable',
-          label: '可装载',
-          rows: 3,
-          value: ''
-        },
-        {
-          prop: 'Transport',
-          label: '可运输',
-          rows: 3,
-          value: ''
-        },
-      ],
+      msgs1: [],
       tabMenu: [
         {
           key: 'baggageView',
@@ -207,37 +80,65 @@ export default {
       componentName: 'baggageView',
       query: '',
       passengerName: '',
-      tagObj: {}
+      PNRNO: '',
+      tagObj: {},
+      tableDatas: []
     }
   },
   created () {
     const { query } = this.$route
+    const { auth_id } = this.$route.meta
+    const { arrs } = getAuthData(auth_id)
+    const table = arrs.filter(item => item.auth_type == 4 || item.auth_type == 5)
+    if (table && table.length) {
+      this.tableDatas = table
+      const tableDatas5 = table.filter(item => item.auth_type == 5)
+      if (tableDatas5 && tableDatas5.length) {
+        const { auth_id } = tableDatas5[0]
+        this.getColumnData(auth_id)
+      }
+    }
     this.query = query
   },
-  mounted () {
-    this.getLuggageInfo()
-  },
   methods: {
+    //获取表头数据
+    async getColumnData (auth_id) {
+      try {
+        const { code, returnData } = await this.getQueryList(SERVICE_ID.sysUserAuthId, [{
+          user_id: getToken('userid'),
+          auth_id
+        }]);
+        if (code == 0) {
+          if (returnData && returnData.length) {
+            const nodeDatas = returnData.filter(item => item.needShow)
+            const newNodeDatas = nodeDatas.sort((a, b) => a.orderNumber - b.orderNumber)
+            this.infoArrs = newNodeDatas.slice(0, 6)
+            this.msgs1 = newNodeDatas.slice(6)
+            this.getLuggageInfo(auth_id)
+          }
+        } else {
+          this.$message.error("获取表头数据失败");
+        }
+      } catch (error) {
+        console.log(error)
+      }
+    },
     //获取行李信息
-    async getLuggageInfo () {
+    async getLuggageInfo (auth_id) {
       try {
-        const { code, returnData } = await this.getQueryList(SERVICE_ID.bagTableId, this.query)
+        const { code, returnData } = await this.getQueryListAuth(SERVICE_ID.bagTableId, this.query, 1, 20, auth_id)
         if (code == 0 && returnData && returnData.length) {
           const datasObj = [...returnData][0]
           this.passengerName = datasObj['passengerName']
+          this.PNRNO = datasObj['PNRNO']
           for (const key in datasObj) {
             this.infoArrs.map(item => {
-              if (item.prop == key) {
+              if (item.columnName == key) {
                 item.value = datasObj[key]
               }
             })
             this.msgs1.map(item => {
-              if (item.prop == key) {
-                item.value = datasObj[key]
-              }
-            })
-            this.msgs2.map(item => {
-              if (item.prop == key) {
+              if (item.columnName == key) {
                 item.value = datasObj[key]
               }
             })
@@ -251,11 +152,11 @@ export default {
     //获取行李号
     async getLuggageNums () {
       try {
-        const { flightDate, flightNo } = this.query
+        const { carrierFlights, carrierFlightsDate } = this.query
         const { code, returnData } = await this.getQueryList(SERVICE_ID.bagTableId, {
-          passengerName: this.passengerName,
-          flightDate,
-          flightNo
+          PNRNO: this.PNRNO,
+          carrierFlightsDate,
+          carrierFlights
         })
         if (code == 0 && returnData && returnData.length) {
           this.detailsArr = [...returnData]
@@ -355,8 +256,16 @@ export default {
       &-msgs {
         padding: 25px 0;
         height: 104px;
+        ::v-deep .el-scrollbar__wrap {
+          overflow-x: hidden;
+        }
+        ::v-deep .el-scrollbar__bar.is-horizontal {
+          height: 0 !important;
+        }
         &-l1 {
-          margin-bottom: 22px;
+          .msgs-list {
+            margin-bottom: 22px;
+          }
         }
       }
     }

src/views/newQuery/components/table.vue

@@ -2,33 +2,30 @@
   <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="newQueryTable">
     <el-table v-el-table-infinite-scroll="load" :data="filteredTableData" :summary-method="getSummaries" :span-method="tableSpanMethod" stripe :show-summary="showSummary" border @cell-click="cellClick" :cell-class-name="cellClass" ref="table" height="100%" class="table infinite-list">
       <el-table-column v-for="(item, index) in tableColsCopy" :sortable="item.needSort ? true : false" :key="index" :prop="item.columnName" :label="item.columnLabel" :show-overflow-tooltip="showOverflowTooltip">
-        <template #header>
-          <span class="colTips">
-            <el-tooltip :content="item.columnDescribe" placement="top">
-              <span>{{ item.columnLabel }}</span>
-            </el-tooltip>
-          </span>
-          <span v-if="item.needFilters">
-            <el-popover placement="bottom" trigger="click" @show="popoverShowHandler(item.columnName)" @hide="popoverHideHandler">
-              <i slot="reference" :class="[
-                        'filter-arrow',
-                        'el-icon-arrow-down',
-                        arrowClass(item.columnName),
-                      ]" />
-              <el-form>
-                <el-form-item :label="item.columnLabel">
-                  <el-select v-model="filterValues[item.columnName]" size="small" placeholder="筛选" default-first-option filterable clearable>
-                    <el-option v-for="(option, optionIndex) in tableDataFilters[
-                              item.columnName
-                            ]" :key="option.value + optionIndex" :value="option.value" :label="option.text" />
-                  </el-select>
-                </el-form-item>
-              </el-form>
-            </el-popover>
-          </span>
-        </template>
       </el-table-column>
     </el-table>
+    <template v-if="istableCol">
+      <div class="btns">
+        <img class="btn-square btn-shadow" src="@/assets/baggage/ic_setting.png" title="列设置" @click="show">
+      </div>
+      <Dialog :flag="dialogFlag" width="600px" class="dialog-check-group">
+        <div class="dialog-wrapper">
+          <div class="title">列设置</div>
+          <div style="height: 600px;" class="content">
+            <el-scrollbar style="height: 100%">
+              <el-tree ref="columnSetTree" :data="tableCols" :class="colsCheckClass" show-checkbox node-key="index" :default-expand-all="true" :props="{
+              label: 'columnLabel',
+              children: 'children',
+            }" :default-checked-keys="checkedKeysTemp" @check="handleCheck" />
+            </el-scrollbar>
+          </div>
+          <div class="foot right t30">
+            <el-button size="medium" class="r24" type="primary" @click="onCheck('baggageTableData')">确定</el-button>
+            <el-button size="medium" @click="hide">取消</el-button>
+          </div>
+        </div>
+      </Dialog>
+    </template>
   </div>
 </template>
 
@@ -38,9 +35,12 @@ import { setTableFilters } from "@/utils/table";
 import { getToken } from '@/utils/auth';
 import { getAuthData } from "@/utils/validate";
 import { throttledExportToExcel } from '@/utils/table';
+import tableColsMixin from '@/views/flightViewManagement/mixins/tableCols';
+import Dialog from '@/layout/components/Dialog/index.vue'
 export default {
   name: 'NewQueryTable',
-  mixins: [pf],
+  mixins: [pf, tableColsMixin],
+  components: { Dialog },
   props: {
     // 是否显示合计行
     showSummary: {
@@ -59,6 +59,10 @@ export default {
     tableTag: {
       type: Object,
       default: () => { }
+    },
+    istableCol: {
+      type: Boolean,
+      default: false,
     }
   },
   data () {
@@ -128,9 +132,12 @@ export default {
         }]);
         if (code == 0) {
           if (returnData && returnData.length) {
-            this.$store.dispatch('auth/changeAuthMsg', returnData)
+            if (!this.istableCol) {
+              this.$store.dispatch('auth/changeAuthMsg', returnData)
+            }
             this.tableCols = returnData.sort((a, b) => b.orderNumber - a.orderNumber);
             this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
+            this.initTableCols();
           }
         } else {
           this.$message.error("获取表头数据失败");
@@ -143,7 +150,7 @@ export default {
     async getQuery (id, dataContent = this.dataContent, page, pageSize) {
       try {
         this.loading = true;
-        const { code, returnData } = await this.getQueryList(id, dataContent, page, pageSize);
+        const { code, returnData } = await this.getQueryListAuth(id, dataContent, page, pageSize);
         if (code == 0) {
           if (returnData.length === 0) {
             this.page--;
@@ -186,7 +193,6 @@ export default {
       if (table && table.length) {
         const obj = table[0]
         const { arrs } = getAuthData(obj.auth_id)
-        console.log(arrs)
         this.authBtnCol = arrs.filter(item => Number(item.service_type) == 6)
         if (this.authBtnCol.length) {
           this.authBtnCol.forEach(item => {
@@ -331,6 +337,7 @@ export default {
 <style lang="scss" scoped>
 .newQueryTable {
   height: 100%;
+  position: relative;
   ::v-deep .table {
     .is-click-btn {
       .cell {
@@ -343,5 +350,11 @@ export default {
       color: #000;
     }
   }
+  .btns {
+    position: absolute;
+    top: -50px;
+    right: 32px;
+    z-index: 10;
+  }
 }
 </style>

src/views/newRole/index.vue

@@ -47,7 +47,7 @@
                     <span class="custom-tree-node" slot-scope="{ node, data }">
                       <span class="customTxt">{{ node.label }}</span>
                       <span v-show="treeCheckId == data.auth_id" class="customBtn">
-                        <span @click.stop="setItem(node,data)" v-if="data.auth_id != 0 && data.auth_type == 4" class="ym">列授权</span>
+                        <span @click.stop="setItem(node,data)" v-if="data.auth_id != 0 && (data.auth_type == 4 || data.auth_type == 5)" class="ym">列授权</span>
                       </span>
                     </span>
                   </el-tree>

src/views/systemSettings/views/newAuth/index.vue

@@ -456,6 +456,9 @@ export default {
         case 4:
           this.componentName = 'Table'
           break;
+        case 5:
+          this.componentName = 'Table'
+          break;
         default:
           break;
       }

src/views/table/index.vue

@@ -231,7 +231,8 @@ export default {
       authBtns: [],
       authBtnCol: [],
       authBtnColName: [],
-      urlParams: {}
+      urlParams: {},
+      authId: ''
     };
   },
   computed: {
@@ -303,6 +304,7 @@ export default {
       this.isAuto = true
       this.tableOther = obj
       this.pageTitle = obj.auth_name;
+      this.authId = obj.auth_id
       this.queryId = obj.queryTemplateID;
       this.authBtns = arrs.filter(item => Number(item.service_type) > 2 && Number(item.service_type) < 6)
       this.authBtnCol = arrs.filter(item => Number(item.service_type) == 6)
@@ -321,6 +323,7 @@ export default {
       this.pageTitle = title;
       if (auth_id) {
         this.queryId = auth_id;
+        this.authId = auth_id
         this.getColumnData(auth_id);
       }
     }
@@ -522,6 +525,7 @@ export default {
           page: ++this.page,
           pageSize: this.pageSize,
           dataContent,
+          authId: this.authId
         });
         if (code == 0) {
           if (returnData.length === 0) {