From 5f8b41792cfdcbc832d11ea6d815772e12387af1 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 12 Mar 2021 18:03:05 +0800
Subject: [PATCH] 客户管理调整，行政区样式调整

---
 src/views/clientManagement/clientManagement.vue |   67 +++++++++++++++++----------------
 1 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 130f559..b49d9a9 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -102,6 +102,7 @@
         <el-table-column property="deviceNumber" label="设备编号" width="150"></el-table-column>
         <el-table-column property="street" label="所属单位" width="200"></el-table-column>
         <el-table-column property="expireTime" label="到期时间"></el-table-column>
+        <el-table-column property="pay" label="缴费信息"></el-table-column>
       </el-table>
     </el-dialog>
   </el-row>
@@ -110,6 +111,7 @@
 <script>
   import {getList, remove, update, add, getclient, getDeptLazyTree, getAll} from "@/api/client/client";
   import {mapGetters} from "vuex";
+
   export default {
     created() {
       this.payWin();
@@ -217,12 +219,13 @@
                   trigger: "blur"
                 }
               ]
-            },
+            }
+            ,
             {
               label: "设备编号",
               prop: "deviceNumber",
               width: 130,
-              editDisabled:true,
+              editDisabled: true,
               rules: [
                 {
                   required: false,
@@ -273,9 +276,21 @@
               slot: true,
               addDisplay: false,
               editDisplay: false,
-            }, {
-              label: "缴费信息",
-              prop: "pay",
+            },
+            {
+              label: "设备类型",
+              prop: "deviceType",
+              width: 160,
+              search: true,
+              searchSpan: 3,
+              searchLabelWidth: 80,
+              searchPlaceholder: "请选择",
+              type: "select",
+              props: {
+                label: "dictValue",
+                value: "dictValue"
+              },
+              dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1357568691367661569",
             },
             {
               label: "省份",
@@ -331,21 +346,6 @@
               className: "cityClass3"
             },
             {
-              label: "设备类型",
-              prop: "deviceType",
-              width: 160,
-              search: true,
-              searchSpan: 3,
-              searchLabelWidth: 80,
-              searchPlaceholder: "请选择",
-              type: "select",
-              props: {
-                label: "dictValue",
-                value: "dictValue"
-              },
-              dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1357568691367661569",
-            },
-            {
               label: "权属",
               prop: "ownership",
               width: 150
@@ -353,13 +353,6 @@
               label: "街道",
               prop: "street",
               width: 200
-            }, {
-              label: "安装时间",
-              prop: "stime",
-              type: "datetime",
-              format: "yyyy-MM-dd",
-              valueFormat: "yyyy-MM-dd HH:mm:ss",
-              width: 130
             }, {
               label: "到期时间",
               prop: "expireTime",
@@ -369,6 +362,16 @@
               valueFormat: "yyyy-MM-dd HH:mm:ss",
               width: 150
             },{
+              label: "缴费信息",
+              prop: "pay",
+            }, {
+              label: "安装时间",
+              prop: "stime",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              width: 130
+            }, {
               label: "最后上传时间",
               prop: "heartbeat",
               type: "datetime",
@@ -543,7 +546,7 @@
             }
           }
 
-          data.records.sort((a,b)=>{
+          data.records.sort((a, b) => {
             return a.dxzt - b.dxzt;
           });
 
@@ -586,7 +589,7 @@
           }
         });
 
-      },handleStart(row) {
+      }, handleStart(row) {
         var arr = [];
         this.$store.state.tags.tagList.forEach(item => {
           if (item.label != "视频") {
@@ -595,13 +598,13 @@
         });
         this.$store.state.tags.tagList = arr;
         this.$router.push({
-          path: `/real/video/`,query:row
+          path: `/real/video/`, query: row
         });
-      },handleMap(row) {
+      }, handleMap(row) {
         this.showMap = true;
         this.$nextTick(() => {
           this.$refs.mapDiv.onload = () => {
-            window.frames[0].init("equipment",{x: row.jd, y: row.wd});
+            window.frames[0].init("equipment", {x: row.jd, y: row.wd});
           };
         })
       },

--
Gitblit v1.9.3