From d2611ee5cb26997b5902b0be82c10c3d1fe4a86c Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 22 Sep 2021 10:38:06 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory_ys
---
src/views/statisticalQueryManagement/securityGuardDetail.vue | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/src/views/statisticalQueryManagement/securityGuardDetail.vue b/src/views/statisticalQueryManagement/securityGuardDetail.vue
index 4f05081..dd55c71 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>
@@ -22,8 +23,10 @@
<script>
import { mapGetters } from "vuex";
import { pageSecurity } from "../../api/statisticalQueryManagement/statisticalQueryManagement";
+
export default {
name: "保安员明细",
+ props: ["fwdeptId", "paramCz"],
data() {
return {
page: {
@@ -211,7 +214,7 @@
}
],
slot: true,
- display: false,
+ display: false
},
{
label: "是否持证",
@@ -234,7 +237,7 @@
}
],
slot: true,
- display: false,
+ display: false
}
]
},
@@ -283,8 +286,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 => {
@@ -293,23 +300,23 @@
this.data = data.records;
this.loading = false;
});
- },
- getLocationParams() {
- let url = window.location.href;
- let urlArr = url.split("?")[1].split("&");
- var object = new Object();
- for (var i = 0; i < urlArr.length; i++) {
- let mm = urlArr[i].split("=");
- object[decodeURIComponent(mm[0])] = decodeURIComponent(mm[1]);
- }
- this.deptid = object["departmentid"] || "";
- this.query = { deptid: this.deptid };
- this.onLoad(this.page, this.query);
- // this.onLoad(this.page, this.query);
}
+ // getLocationParams() {
+ // let url = window.location.href;
+ // let urlArr = url.split("?")[1].split("&");
+ // var object = new Object();
+ // for (var i = 0; i < urlArr.length; i++) {
+ // let mm = urlArr[i].split("=");
+ // object[decodeURIComponent(mm[0])] = decodeURIComponent(mm[1]);
+ // }
+ // this.deptid = object["departmentid"] || "";
+ // this.query = { deptid: this.deptid };
+ // this.onLoad(this.page, this.query);
+ // // this.onLoad(this.page, this.query);
+ // }
},
mounted() {
- this.getLocationParams();
+ // this.getLocationParams();
}
};
</script>
--
Gitblit v1.9.3