From 92490810412908bbe2fe365007d6f7ee68656957 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 27 Aug 2021 09:21:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory

---
 src/views/statisticalQueryManagement/securityGuardDetail.vue |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/statisticalQueryManagement/securityGuardDetail.vue b/src/views/statisticalQueryManagement/securityGuardDetail.vue
index fe63b2e..f9e009c 100644
--- a/src/views/statisticalQueryManagement/securityGuardDetail.vue
+++ b/src/views/statisticalQueryManagement/securityGuardDetail.vue
@@ -21,7 +21,7 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
-import { getListSecurity } from "@/api/system/user";
+import { pageSecurity } from "../../api/statisticalQueryManagement/statisticalQueryManagement";
 export default {
   name: "保安员明细",
   data() {
@@ -123,8 +123,8 @@
             label: "保安公司",
             prop: "deptName",
             // width: 120,
-            search: true,
-            searchSpan: 4,
+            // search: true,
+            // searchSpan: 4,
             overHidden: true,
             slot: true,
             display: false
@@ -283,13 +283,14 @@
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      params["deptName"] = params["enterpriseName"];
-      params["jurisdiction"] = this.jurisdiction;
-      getListSecurity(
-        page.currentPage,
-        page.pageSize,
-        Object.assign(params, this.query)
-      ).then(res => {
+      let param = {};
+      param["realName"] = params["realName"] || "";
+      param["status"] = params["status"] || "";
+      param["deptId"] = this.deptid;
+      param["hold"] = params["hold"] || "";
+      param["current"] = page.currentPage;
+      param["size"] = page.pageSize;
+      pageSecurity(param).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
@@ -304,9 +305,9 @@
         let mm = urlArr[i].split("=");
         object[decodeURIComponent(mm[0])] = decodeURIComponent(mm[1]);
       }
-      let enterpriseName = object["enterpriseName"] || "";
-      this.query = { enterpriseName: enterpriseName };
-      this.onLoad(this.page,  this.query);
+      this.deptid = object["departmentid"] || "";
+      this.query = { deptid: this.deptid };
+      this.onLoad(this.page, this.query);
       //   this.onLoad(this.page, this.query);
     }
   },

--
Gitblit v1.9.3