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/clientManagement/clientManagement.vue |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index a4da94f..368eb50 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -255,12 +255,23 @@
             }, {
               label: "缴费信息",
               prop: "pay",
-            }, {
+            },
+            {
               label: "设备类型",
               prop: "deviceType",
-              width: 150,
               search: true,
-            }, {
+              searchSpan: 3,
+              searchLabelWidth: 80,
+              searchPlaceholder: "请选择",
+              type: "select",
+              props: {
+                label: "dictValue",
+                value: "dictValue"
+              },
+              dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1357568691367661569",
+              span: 6
+            },
+            {
               label: "权属",
               prop: "ownership",
             }, {

--
Gitblit v1.9.3