From d356332a2003d00ca803b4e73dc404b9643b60d5 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 08 Sep 2021 08:27:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory
---
src/views/statisticalQueryManagement/businessStatisticsDetail.vue | 130 +++++++++++++++++++++++-------------------
1 files changed, 71 insertions(+), 59 deletions(-)
diff --git a/src/views/statisticalQueryManagement/businessStatisticsDetail.vue b/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
index 69e6013..b43d288 100644
--- a/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
+++ b/src/views/statisticalQueryManagement/businessStatisticsDetail.vue
@@ -22,9 +22,10 @@
import { mapGetters } from "vuex";
import {
selectDis,
- selectFw
+ selectFw,
+ fwList
} from "../../api/statisticalQueryManagement/statisticalQueryManagement";
-import { lazyTreeJu } from "../../api/index/index";
+import { lazyTreeJu,lazyTrees } from "../../api/index/index";
export default {
name: "业务情况统计明细",
data() {
@@ -93,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"
@@ -154,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
}
// {
@@ -213,7 +224,8 @@
],
servicesList: [],
companyName: "",
- loading: true
+ loading: true,
+ deptid: ""
};
},
computed: {
@@ -253,12 +265,12 @@
onLoad(page, params = {}) {
this.loading = true;
let param = {};
- param["jurisdiction"] = params["jurname"] || "";
- param["fid"] = params["fwname"] || "";
- param["deptid"] = params["deptid"] || "1425365559645601794";
+ // param["jurisdiction"] = params["jurname"] || "";
+ param["id"] = params["name"] || "";
+ param["deptId"] = this.deptid;
param["current"] = page.currentPage;
param["size"] = page.pageSize;
- selectDis(param).then(res => {
+ fwList(param).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.tableData = data.records;
@@ -278,7 +290,7 @@
});
},
getSubOfficeData() {
- lazyTreeJu().then(res => {
+ lazyTrees().then(res => {
if (res.data.code === 200) {
this.tableOption.column.forEach(item => {
if (item.label == "所属辖区") {
@@ -291,16 +303,16 @@
});
},
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]);
- // }
- // let jurisdiction = object["jurisdiction1"] || "";
- // let enterpriseName = object["enterpriseName"] || "";
- // let obj = { jurisdiction: jurisdiction, enterpriseName: enterpriseName };
+ 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"] || "";
+ // let jurisdiction = object["jurisdiction"] || "";
+ this.query = { deptid: this.deptid };
// this.onLoad(this.page, obj);
this.onLoad(this.page, this.query);
}
--
Gitblit v1.9.3