From cecf184fa181ab30882b889ba34029c954e9f63a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 03 Feb 2021 10:28:23 +0800
Subject: [PATCH] 客户列表

---
 src/views/clientManagement/clientManagement.vue |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index f0b8a05..78c2d1f 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -54,7 +54,7 @@
           <template slot-scope="{ row }" slot="expireTime">
             <span>
               {{
-                row.expireTime
+                row.expireTime == "" ? row.expireTime : row.expireTime == null ? row.expireTime : row.expireTime.split(" ")[0]
               }}
             </span>
             <i class="el-icon-warning" v-if="row.type == 1"></i>
@@ -149,6 +149,27 @@
               search: true,
             },
             {
+              label: "到期时间",
+              prop: "releaseTimeRange",
+              type: "datetime",
+              format: "yyyy-MM-dd hh:mm:ss",
+              valueFormat: "yyyy-MM-dd hh:mm:ss",
+              searchRange: true,
+              searchSpan: 5,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [
+                {
+                  required: true,
+                  message: "请输入时间",
+                  trigger: "blur"
+                }
+              ]
+            },
+            {
               label: "设备编号",
               prop: "deviceNumber",
               width: 130
@@ -211,6 +232,10 @@
               type: "select",
               slot: true,
               width: 100,
+              rules: [{
+                required: true,
+                trigger: "blur"
+              }],
               dicData: [
                 {
                   label: "撤防",
@@ -402,8 +427,8 @@
         if (releaseTimeRange) {
           values = {
             ...params,
-            releaseTime_datege: releaseTimeRange[0],
-            releaseTime_datelt: releaseTimeRange[1],
+            beginTime: releaseTimeRange[0],
+            endTime: releaseTimeRange[1],
             ...this.query
           };
           values.releaseTimeRange = null;

--
Gitblit v1.9.3