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/businessStatisticsDetail.vue |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/views/statisticalQueryManagement/businessStatisticsDetail.vue b/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
index b43d288..0f48442 100644
--- a/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
+++ b/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
@@ -14,6 +14,7 @@
       @current-change="currentChange"
       @size-change="sizeChange"
       @refresh-change="refreshChange"
+      @on-load="onLoad"
     >
     </avue-crud>
   </basic-container>
@@ -25,9 +26,10 @@
   selectFw,
   fwList
 } from "../../api/statisticalQueryManagement/statisticalQueryManagement";
-import { lazyTreeJu,lazyTrees } from "../../api/index/index";
+import { lazyTreeJu, lazyTrees } from "../../api/index/index";
 export default {
   name: "业务情况统计明细",
+  props: ["fwdeptId"],
   data() {
     return {
       page: {
@@ -128,13 +130,13 @@
             prop: "name",
             props: {
               label: "name",
-              value: "id"
+              value: "name"
             },
             dicData: [],
             searchLabelWidth: 110,
             search: true,
             type: "tree",
-            searchSpan: 4,
+            searchSpan: 8,
             rules: [
               {
                 required: true,
@@ -145,6 +147,12 @@
             // display: false
           },
           {
+            label: "保安公司名称",
+            width: 300,
+            prop: "tenantName",
+            display: false
+          },
+          {
             label: "服务开始时间",
             prop: "startTime",
             display: false
@@ -152,6 +160,11 @@
           {
             label: "服务到期时间",
             prop: "endTime",
+            display: false
+          },
+          {
+            label: "保安员姓名",
+            prop: "realName",
             display: false
           },
           // {
@@ -266,10 +279,11 @@
       this.loading = true;
       let param = {};
       // param["jurisdiction"] = params["jurname"] || "";
-      param["id"] = params["name"] || "";
-      param["deptId"] = this.deptid;
+      // param["id"] = params["name"] || "";
+      param["deptId"] = this.fwdeptId;
       param["current"] = page.currentPage;
       param["size"] = page.pageSize;
+      param["name"] = params["name"] || "";
       fwList(param).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
@@ -321,7 +335,7 @@
     // this.getTableData();
     this.getFuWuList();
     this.getSubOfficeData();
-    this.getLocationParams();
+    // this.getLocationParams();
   }
 };
 </script>

--
Gitblit v1.9.3