From ffc31835fb765229c420db4a651abce3f8c832fc Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 03 Sep 2021 09:47:44 +0800
Subject: [PATCH] 冲突
---
src/views/statisticalQueryManagement/businessStatistics.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/statisticalQueryManagement/businessStatistics.vue b/src/views/statisticalQueryManagement/businessStatistics.vue
index 84e2a2e..0919ab9 100644
--- a/src/views/statisticalQueryManagement/businessStatistics.vue
+++ b/src/views/statisticalQueryManagement/businessStatistics.vue
@@ -30,7 +30,7 @@
selectYw,
dictionaryList
} from "../../api/statisticalQueryManagement/statisticalQueryManagement";
-import { lazyTreeJu } from "../../api/index/index";
+import { lazyTreeJu,lazyTrees } from "../../api/index/index";
export default {
name: "业务情况统计",
data() {
@@ -105,7 +105,7 @@
label: "所属辖区",
prop: "jurname",
searchSpan: 4,
- type: "select",
+ type: "tree",
props: {
label: "title",
value: "id"
@@ -148,7 +148,7 @@
},
methods: {
getSubOfficeData() {
- lazyTreeJu().then(res => {
+ lazyTrees().then(res => {
if (res.data.code === 200) {
this.tableOption.column.forEach(item => {
if (item.label == "所属辖区") {
--
Gitblit v1.9.3