From 90ee0a2139d541cfd5ea6cfa2ee179cee90352a7 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 03 Mar 2021 09:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/policeInformationDistribution/index.vue |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/policeInformationDistribution/index.vue b/src/views/policeInformationDistribution/index.vue
index 6cad676..b748444 100644
--- a/src/views/policeInformationDistribution/index.vue
+++ b/src/views/policeInformationDistribution/index.vue
@@ -81,7 +81,7 @@
   update,
   add,
   getclient
-} from "@/api/policeInformation/index";
+} from "@/api/policeInformation/distribution";
 import { mapGetters } from "vuex";
 
 export default {
@@ -119,7 +119,17 @@
             label: "警情类型",
             prop: "waringType",
             search: true,
-            searchSpan: 3
+            searchSpan: 3,
+            searchLabelWidth: 80,
+            searchPlaceholder: "请选择",
+            type: "select",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            //cascaderItem: ["city", "district"],
+            dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1356516807043231746",
+            span: 6
           },
           {
             label: "报警时间",
@@ -152,7 +162,7 @@
           },
           {
             label: "报警内容",
-            prop: "rname"
+            prop: "rName"
           },
           {
             label: "处理人",
@@ -268,7 +278,7 @@
     ...mapGetters(["permission", "flowRoutes"]),
     permissionList() {
       return {
-        addBtn: this.vaildData(null, false),
+        addBtn: this.vaildData(this.permission.distribution_add, false),
         viewBtn: this.vaildData(null, false),
         delBtn: this.vaildData(null, false),
         editBtn: this.vaildData(this.permission.real_edit, false)

--
Gitblit v1.9.3