From 1f531be4ff85f6c313e49c1156f422377325fecb Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 22 Sep 2021 09:22:54 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory
---
src/views/statisticalQueryManagement/securityGuardDetail.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/views/statisticalQueryManagement/securityGuardDetail.vue b/src/views/statisticalQueryManagement/securityGuardDetail.vue
index 4f05081..eab1b5e 100644
--- a/src/views/statisticalQueryManagement/securityGuardDetail.vue
+++ b/src/views/statisticalQueryManagement/securityGuardDetail.vue
@@ -15,6 +15,7 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@row-click="handleRowClick"
+ @on-load="onLoad"
>
</avue-crud>
</basic-container>
@@ -24,6 +25,7 @@
import { pageSecurity } from "../../api/statisticalQueryManagement/statisticalQueryManagement";
export default {
name: "保安员明细",
+ props: ["fwdeptId", "paramCz"],
data() {
return {
page: {
@@ -211,7 +213,7 @@
}
],
slot: true,
- display: false,
+ display: false
},
{
label: "是否持证",
@@ -234,7 +236,7 @@
}
],
slot: true,
- display: false,
+ display: false
}
]
},
@@ -283,8 +285,12 @@
let param = {};
param["realName"] = params["realName"] || "";
param["status"] = params["status"] || "";
- param["deptId"] = this.deptid;
- param["hold"] = params["hold"] || "";
+ param["deptId"] = this.fwdeptId;
+ if (this.paramCz) {
+ param["hold"] = "0";
+ } else {
+ param["hold"] = params["hold"] || "";
+ }
param["current"] = page.currentPage;
param["size"] = page.pageSize;
pageSecurity(param).then(res => {
@@ -309,7 +315,7 @@
}
},
mounted() {
- this.getLocationParams();
+ // this.getLocationParams();
}
};
</script>
--
Gitblit v1.9.3