From 6a3e7c03b302a2b0b141fb89256b502032460797 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 30 Jul 2020 18:02:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E3=80=90=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E3=80=91=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=97=B6=E9=97=B4=E6=8E=A7=E4=BB=B6=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-07-30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/heart/actuserclocklog.vue | 52 +++++++++++++------
 src/views/modules/heart/actuserrelation.vue | 55 ++++++++++++++-------
 2 files changed, 73 insertions(+), 34 deletions(-)

diff --git a/src/views/modules/heart/actuserclocklog.vue b/src/views/modules/heart/actuserclocklog.vue
index f9f1193f..55069705 100644
--- a/src/views/modules/heart/actuserclocklog.vue
+++ b/src/views/modules/heart/actuserclocklog.vue
@@ -38,14 +38,28 @@
           </el-form-item>
         </div>
         <div class="block">
-          <span class="demonstration">注册时间</span>&nbsp;&nbsp;
-          <el-date-picker @change='setRegistTime'
-                          v-model="time"
+          <el-form-item label="注册时间" prop="startTime" label-width="70px">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
                           value-format="yyyy-MM-dd"
-                          type="daterange"
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"></el-date-picker>&nbsp;
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px"
+                          @change="changeTime">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至" prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px"
+                          @change="changeTime">
+          </el-date-picker>
+        </el-form-item>
           <el-form-item>
             <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
           </el-form-item>
@@ -148,6 +162,22 @@ export default {
         startTime: '',
         endTime: ''
       },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
       detailVisible: false,
       time: ''
     }
@@ -174,14 +204,6 @@ export default {
       this.$parent.selectComponent = 'ActUserClockDetail'
       this.$router.push({ path: '/heart-actinfo', query: { id: id, actId: this.dataForm.actId } })
     },
-    setRegistTime () {
-      if (this.time === null) {
-        this.dataForm.startTime = ''
-        this.dataForm.endTime = ''
-      }
-      this.dataForm.startTime = this.time[0]
-      this.dataForm.endTime = this.time[1]
-    },
     formatState: function (row, column) {
       let state = row.status
       if (state === '0') {
diff --git a/src/views/modules/heart/actuserrelation.vue b/src/views/modules/heart/actuserrelation.vue
index 3da2f299..6d16462a 100644
--- a/src/views/modules/heart/actuserrelation.vue
+++ b/src/views/modules/heart/actuserrelation.vue
@@ -23,16 +23,26 @@
           </el-form-item>
         </div>
         <div class="block">
-          <span class="demonstration">注册时间</span>&nbsp;&nbsp;
-          <el-date-picker
-            @change="setRegistTime"
-            v-model="time"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>&nbsp;
+          <el-form-item label="注册时间" prop="startTime" label-width="90px">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px" @change="changeTime">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至" prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px" @change="changeTime">
+          </el-date-picker>
+        </el-form-item>
           <el-form-item>
             <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
           </el-form-item>
@@ -123,7 +133,6 @@ export default {
         deleteURL: '/heart/actuserrelation',
         deleteIsBatch: true
       },
-
       dataForm: {
         id: '',
         actId: '',
@@ -132,6 +141,22 @@ export default {
         realName: '',
         mobile: ''
       },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
       time: '',
       addOrUpdateVisible: false,
       detailVisible: false
@@ -163,14 +188,6 @@ export default {
         this.$refs.actuserrelationDetail.init()
       })
     },
-    setRegistTime () {
-      if (this.time === null) {
-        this.dataForm.startTime = ''
-        this.dataForm.endTime = ''
-      }
-      this.dataForm.startTime = this.time[0]
-      this.dataForm.endTime = this.time[1]
-    },
     formatState: function (row, column) {
       let state = row.status