+解决和冲突合并，加上适应1366*768分辨率

liuyg

2022-02-16 19e0b728e8cd41f9ddcd62eea6c15ebf769d9977

 src/views/licenseApproval/crossRegion.vue

@@ -1,15 +1,17 @@
/*
 * @Author:liu
 * @Date: 2021-08-26 16:59:35 
 * @Last Modified by: liu
 * @Last Modified time: 2021-11-04 19:36:56
 */

/* * @Author:liu * @Date: 2021-08-26 16:59:35 * @Last Modified by: liu * @Last
Modified time: 2021-11-04 19:36:56 */

<template>
  <div>
    <basic-container class="permit">
    <basic-container
      :class="[
        'permit',
        $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
        $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : '',
      ]"
    >
      <avue-crud
        class="tablesss"
        :option="option"
        :table-loading="loading"
        :data="data"
@@ -191,6 +193,7 @@
        pageSize: 10,
        currentPage: 1,
        total: 0,
        ...this.$store.state.control.changePageSize,
      },
      selectionList: [],
      option: {
@@ -211,6 +214,7 @@
        viewBtn: true,
        selection: true,
        dialogClickModal: false,
        ...this.$store.state.control.clearOtherBut,
        column: column,
      },
      data: [],
@@ -234,9 +238,10 @@
      return ids.join(",");
    },
  },
  // mounted() {
  //     console.log(this.userInfo.dept_id);
  // },
  mounted() {
    this.$store.commit("setWindowSizeHeightAdd");
    //     console.log(this.userInfo.dept_id);
  },
  methods: {
    Print() {
      this.$Print(this.$refs.licence);
@@ -391,6 +396,7 @@
        const data = res.data.data;
        this.page.total = data.total;
        this.data = data.records;
        this.$store.commit("setWindowSizeHeightAdd");
        this.loading = false;
        this.selectionClear();
      });