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/businessStatisticsDetail.vue | 70 ++++++++++++----------------------
1 files changed, 25 insertions(+), 45 deletions(-)
diff --git a/src/views/statisticalQueryManagement/businessStatisticsDetail.vue b/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
index b43d288..d86972a 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>
@@ -23,11 +24,13 @@
import {
selectDis,
selectFw,
- fwList
+ fwList,
+ dispatcherUnit
} 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: {
@@ -38,38 +41,7 @@
query: {},
value1: "",
value2: "",
- tableData: [
- // {
- // company: "江西省永安保安服务有限公司",
- // subOffice: "南昌市公安局",
- // timeStart: "2020-07-14",
- // timeEnd: "2021-06-30",
- // customerName: "南昌市幼儿园",
- // num: "7",
- // // status: "正在服务",
- // bz: ""
- // },
- // {
- // company: "南昌市赣水保安服务有限公司",
- // subOffice: "东湖分局",
- // timeStart: "2020-01-23",
- // timeEnd: "2020-12-31",
- // customerName: "南昌市第一人民医院",
- // num: "32",
- // // status: "已完成",
- // bz: ""
- // },
- // {
- // company: "江西中业兴达保安服务有限公司",
- // subOffice: "西湖分局",
- // timeStart: "2020-03-16",
- // timeEnd: "2021-7-29",
- // customerName: "南昌市动物园",
- // num: "12",
- // // status: "未下单",
- // bz: ""
- // }
- ],
+ // tableData: [],
tablePage: {
pageSize: 10,
currentPage: 1,
@@ -126,15 +98,16 @@
{
label: "服务单位名称",
prop: "name",
+ width: 300,
props: {
label: "name",
- value: "id"
+ value: "name"
},
dicData: [],
searchLabelWidth: 110,
search: true,
type: "tree",
- searchSpan: 4,
+ searchSpan: 8,
rules: [
{
required: true,
@@ -143,6 +116,12 @@
}
]
// display: false
+ },
+ {
+ label: "保安公司名称",
+ width: 300,
+ prop: "tenantName",
+ display: false
},
{
label: "服务开始时间",
@@ -154,11 +133,11 @@
prop: "endTime",
display: false
},
- // {
- // label: "保安派遣人数",
- // prop: "num",
- // display: false
- // },
+ {
+ label: "保安员姓名",
+ prop: "realName",
+ display: false
+ },
{
label: "联系人",
prop: "linkman",
@@ -266,11 +245,12 @@
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;
- fwList(param).then(res => {
+ param["name"] = params["name"] || "";
+ dispatcherUnit(param).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.tableData = data.records;
@@ -321,7 +301,7 @@
// this.getTableData();
this.getFuWuList();
this.getSubOfficeData();
- this.getLocationParams();
+ // this.getLocationParams();
}
};
</script>
--
Gitblit v1.9.3