From b8dfc98b089e47fdb3e269941bbd2de3f7fb7de1 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 13 Sep 2021 17:14:57 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises
---
src/views/securityEquipment/equipments.vue | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/views/securityEquipment/equipments.vue b/src/views/securityEquipment/equipments.vue
index 1452fe0..1d7800b 100644
--- a/src/views/securityEquipment/equipments.vue
+++ b/src/views/securityEquipment/equipments.vue
@@ -114,7 +114,7 @@
align: "center",
selection: true,
column: column,
- labelWidth:110,
+ labelWidth: 110,
},
};
},
@@ -263,17 +263,33 @@
// console.log(params.deptId);
if (this.fromDeptId != undefined) {
params["deptId"] = this.fromDeptId;
- this.option.column[4].search = false;
- this.option.column[6].search = false;
- this.option.column[6].hide = true;
- this.option.column[6].addDisplay = false;
- this.option.column[6].editDisplay = false;
+ for (let k in this.option.column) {
+ if (this.option.column[k].prop == "deptId") {
+ this.option.column[k].search = false;
+ this.option.column[k].hide = true;
+ this.option.column[k].addDisplay = false;
+ this.option.column[k].editDisplay = false;
+ }
+ }
+ // this.option.column[4]. = false;
+ // this.option.column[6].search = false;
+ // this.option.column[6].hide = true;
+ // this.option.column[6].addDisplay = false;
+ // this.option.column[6].editDisplay = false;
} else {
- this.option.column[4].search = true;
- this.option.column[6].search = true;
- this.option.column[6].hide = false;
- this.option.column[6].addDisplay = true;
- this.option.column[6].editDisplay = true;
+ for (let k in this.option.column) {
+ if (this.option.column[k].prop == "deptId") {
+ this.option.column[k].search = true;
+ this.option.column[k].hide = false;
+ this.option.column[k].addDisplay = true;
+ this.option.column[k].editDisplay = true;
+ }
+ }
+ // this.option.column[4].search = true;
+ // this.option.column[6].search = true;
+ // this.option.column[6].hide = false;
+ // this.option.column[6].addDisplay = true;
+ // this.option.column[6].editDisplay = true;
}
getdata(
page.currentPage,
--
Gitblit v1.9.3