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

liuyg

2022-02-16 19e0b728e8cd41f9ddcd62eea6c15ebf769d9977

 src/views/securityCompany/confess.vue

@@ -100,7 +100,7 @@
  savePunish,
} from "@/api/securityCompany/security";
import { mapGetters } from "vuex";
import { companyColimn } from "./column";
import { confessColumn } from "./column";

export default {
  data() {
@@ -192,14 +192,14 @@
        calcHeight: 30,
        tip: false,
        searchShow: true,
        menuWidth: 175,
        menuWidth: 210,
        searchMenuSpan: 6,
        index: true,
        viewBtn: true,
        dialogClickModal: false,

        column: companyColimn,
        ...this.$store.state.control.clearOtherBut,

        column: confessColumn,
        group: [
          {
            label: "详细信息",
@@ -247,6 +247,33 @@
      });
      return ids.join(",");
    },
  },
  created() {
    //列控制
    const representativecolumn = this.findObject(
      this.option.column,
      "representative"
    );
    const representativecellcolumn = this.findObject(
      this.option.column,
      "representativecell"
    );
    //法人及电话，办公地址不可见
    representativecolumn.hide = true;
    representativecolumn.search = false;
    representativecellcolumn.hide = true;

    const contactscolumn = this.findObject(this.option.column, "contacts");
    const contactscellcolumn = this.findObject(
      this.option.column,
      "contactscell"
    );
    const ftimecolumn = this.findObject(this.option.column, "ftime");
    const fregioncolumn = this.findObject(this.option.column, "fregion");
    ftimecolumn.hide = false;
    fregioncolumn.hide = false;
    contactscolumn.hide = false;
    contactscellcolumn.hide = false;
  },
  mounted() {
    this.$store.commit("setWindowSizeHeightAdd");
@@ -408,8 +435,8 @@
        this.page.total = data.total;
        this.data = data.records;
        // console.log(this.data);
        this.loading = false;
        this.$store.commit("setWindowSizeHeightAdd");
        this.loading = false;
        this.selectionClear();
      });
    },
@@ -419,10 +446,10 @@
      // delete (row["name"]);
      var obj = row;
      obj["name"] = "保安公司详细信息";
      // console.log(obj, "obj");
      var data = JSON.stringify(obj);
      this.$router.push({
        path: `/securityCompany/index`,
        query: obj,
        query: { data: data },
      });
    },
  },