From fc90177d1207b9598404ce9ac29969e024d76747 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 15:05:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory
---
src/views/statisticalQueryManagement/businessStatisticsDetail.vue | 94 ++++++++++++++++++++++++++---------------------
1 files changed, 52 insertions(+), 42 deletions(-)
diff --git a/src/views/statisticalQueryManagement/businessStatisticsDetail.vue b/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
index 53b4f88..7900a98 100644
--- a/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
+++ b/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
@@ -94,48 +94,38 @@
viewBtn: true,
dialogClickModal: false,
column: [
- {
- label: "公司名称",
- prop: "gsname",
- // search: true,
- // searchSpan: 4,
- display: false
- },
+ // {
+ // label: "公司名称",
+ // prop: "gsname",
+ // // search: true,
+ // // searchSpan: 4,
+ // display: false
+ // },
- {
- label: "所属辖区",
- prop: "jurname",
- searchSpan: 4,
- props: {
- label: "title",
- value: "id"
- },
- // cascaderItem: ["city", "area"],
- // dicUrl:subofficeOptions,
- dicData: [],
- search: true,
- type: "tree",
- rules: [
- {
- required: true,
- message: "请选择所属辖区",
- trigger: "blur"
- }
- ]
- },
- {
- label: "服务开始时间",
- prop: "dispatcherTime",
- display: false
- },
- {
- label: "服务到期时间",
- prop: "end_time",
- display: false
- },
+ // {
+ // label: "所属辖区",
+ // prop: "jurname",
+ // searchSpan: 4,
+ // props: {
+ // label: "title",
+ // value: "id"
+ // },
+ // // cascaderItem: ["city", "area"],
+ // // dicUrl:subofficeOptions,
+ // dicData: [],
+ // search: true,
+ // type: "tree",
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择所属辖区",
+ // trigger: "blur"
+ // }
+ // ]
+ // },
{
label: "服务单位名称",
- prop: "fwname",
+ prop: "name",
props: {
label: "name",
value: "id"
@@ -155,8 +145,28 @@
// display: false
},
{
- label: "保安派遣人数",
- prop: "num",
+ label: "服务开始时间",
+ prop: "startTime",
+ display: false
+ },
+ {
+ label: "服务到期时间",
+ prop: "endTime",
+ display: false
+ },
+ // {
+ // label: "保安派遣人数",
+ // prop: "num",
+ // display: false
+ // },
+ {
+ label: "联系人",
+ prop: "linkman",
+ display: false
+ },
+ {
+ label: "联系电话",
+ prop: "phone",
display: false
}
// {
@@ -256,7 +266,7 @@
this.loading = true;
let param = {};
// param["jurisdiction"] = params["jurname"] || "";
- // param["fid"] = params["fwname"] || "";
+ param["id"] = params["name"] || "";
param["deptId"] = this.deptid;
param["current"] = page.currentPage;
param["size"] = page.pageSize;
--
Gitblit v1.9.3