From 19e0b728e8cd41f9ddcd62eea6c15ebf769d9977 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Feb 2022 18:04:10 +0800
Subject: [PATCH] +解决和冲突合并，加上适应1366*768分辨率
---
src/views/securityCompany/securityCrossRegion.vue | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/views/securityCompany/securityCrossRegion.vue b/src/views/securityCompany/securityCrossRegion.vue
index ecbcad9..cf2bb8e 100644
--- a/src/views/securityCompany/securityCrossRegion.vue
+++ b/src/views/securityCompany/securityCrossRegion.vue
@@ -100,7 +100,7 @@
savePunish,
} from "@/api/securityCompany/security";
import { mapGetters } from "vuex";
-import { companyColimn } from "./column";
+import { crossColumn } 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: crossColumn,
group: [
{
label: "详细信息",
@@ -247,6 +247,20 @@
});
return ids.join(",");
},
+ },
+ created() {
+ //列控制
+ const representativecolumn = this.findObject(
+ this.option.column,
+ "representative"
+ );
+ const representativecellcolumn = this.findObject(
+ this.option.column,
+ "representativecell"
+ );
+ //法人及电话，办公地址不可见
+ representativecolumn.label = "分公司负责人";
+ representativecellcolumn.label = "分公司负责人电话";
},
mounted() {
this.$store.commit("setWindowSizeHeightAdd");
@@ -408,21 +422,20 @@
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();
});
},
// 行单击
handleRowClick(row) {
- // 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 },
});
},
},
--
Gitblit v1.9.3