From c8e279927a36c755fd78769cfa8e489568192aa4 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 28 Aug 2021 16:31:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityEquipment/gun.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/securityEquipment/gun.vue b/src/views/securityEquipment/gun.vue
index 201dc21..7bc403c 100644
--- a/src/views/securityEquipment/gun.vue
+++ b/src/views/securityEquipment/gun.vue
@@ -59,6 +59,7 @@
align: "center",
border: true,
selection: true,
+ labelWidth:110,
column: column,
},
};
@@ -189,9 +190,9 @@
},
onLoad(page, params = {}) {
this.loading = true;
- params["deptId"] = this.fromDeptId;
// console.log(params.deptId);
- if (params.deptId != undefined) {
+ if (this.fromDeptId != undefined) {
+ params["deptId"] = this.fromDeptId;
this.option.column[5].search = false;
this.option.column[5].hide = true;
this.option.column[5].addDisplay = false;
--
Gitblit v1.9.3