From 5e9e28fd320b0c1fb18596ce3eb3075e7480eb5a Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 28 Jul 2020 16:13:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96=EF=BC=88=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=A1=86=E6=8E=A7=E4=BB=B6=E6=9B=BF=E6=8D=A2=EF=BC=89-?=
 =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-07-28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/alluser.vue            | 54 +++++++++++++------
 .../modules/user/fail-authentication.vue      | 50 ++++++++++++-----
 .../modules/user/pass-authentication.vue      | 50 ++++++++++++-----
 src/views/modules/user/unauthorized.vue       | 50 ++++++++++++-----
 .../modules/user/wait-authentication.vue      | 50 ++++++++++++-----
 5 files changed, 187 insertions(+), 67 deletions(-)

diff --git a/src/views/modules/user/alluser.vue b/src/views/modules/user/alluser.vue
index ee0c7368..4c9760c2 100644
--- a/src/views/modules/user/alluser.vue
+++ b/src/views/modules/user/alluser.vue
@@ -5,36 +5,48 @@
       <el-form :inline="true"
                :model="dataForm"
                @keyup.enter.native="getDataListSearch()">
-        <el-form-item label="昵称" label-width="52px">
+        <el-form-item label="昵称" label-width="70px">
           <el-input v-model="dataForm.nickname" @keyup.native="btKeyUpnickname"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item label="姓名" label-width="68px">
+        <el-form-item label="真实姓名" label-width="70px">
           <el-input v-model="dataForm.realName" @keyup.native="btKeyUprealName"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
-        <br/>
         <el-form-item label="手机号">
           <el-input v-model="dataForm.mobile" @keyup.native="btKeyUpmobile"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item label="身份证号">
+        <br/>
+        <el-form-item label="身份证号" label-width="70px">
           <el-input v-model="dataForm.identityNo" @keyup.native="btKeyUpidentityNo"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
         <!-- <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"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px">
+          </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"
-                          type="daterange"
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"></el-date-picker>&nbsp;
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px">
+          </el-date-picker>
+        </el-form-item>
           <el-form-item>
             <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
           </el-form-item>
@@ -152,6 +164,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()
+          }
+        }
+      },
       deptIdList: [],
       options: [],
       userDetailVisible: false,
@@ -234,10 +262,6 @@ export default {
         }).catch(() => { })
       }
     },
-    setRegistTime () {
-      this.dataForm.startTime = this.time[0]
-      this.dataForm.endTime = this.time[1]
-    },
     formatPartyFlag: function (row, column) {
       return row.partyFlag === '1' ? '是' : row.state === '0' ? '未知' : '否'
     },
diff --git a/src/views/modules/user/fail-authentication.vue b/src/views/modules/user/fail-authentication.vue
index 9c30226b..0f4cc610 100644
--- a/src/views/modules/user/fail-authentication.vue
+++ b/src/views/modules/user/fail-authentication.vue
@@ -58,16 +58,28 @@
                     clearable></el-input>
         </el-form-item>
         <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">
+            </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">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+            <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
           </el-form-item>
           <el-form-item>
             <el-button v-if="$hasPermission('epdc:user:export')"
@@ -183,6 +195,22 @@ export default {
         partyFlag: '0', // 是否是党员(0-否，1-是)
         state: '2'
       },
+      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()
+          }
+        }
+      },
       deptIdList: [],
       options: [],
       userDetailVisible: false,
@@ -293,10 +321,6 @@ export default {
         }).catch(() => { })
       }
     },
-    setRegistTime () {
-      this.dataForm.startTime = this.time[0]
-      this.dataForm.endTime = this.time[1]
-    },
     formatState: function (row, column) {
       let state = row.state
       if (state === '1') {
diff --git a/src/views/modules/user/pass-authentication.vue b/src/views/modules/user/pass-authentication.vue
index c862195a..9b325682 100644
--- a/src/views/modules/user/pass-authentication.vue
+++ b/src/views/modules/user/pass-authentication.vue
@@ -58,16 +58,28 @@
                     clearable></el-input>
         </el-form-item>
         <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">
+            <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">
+            </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">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+            <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
           </el-form-item>
           <el-form-item>
             <el-button v-if="$hasPermission('epdc:user:export')"
@@ -177,6 +189,22 @@ export default {
         partyFlag: '0', // 是否是党员(0-否，1-是)
         state: '3'
       },
+      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()
+          }
+        }
+      },
       deptIdList: [],
       options: [],
       userDetailVisible: false,
@@ -288,10 +316,6 @@ export default {
         }).catch(() => { })
       }
     },
-    setRegistTime () {
-      this.dataForm.startTime = this.time[0]
-      this.dataForm.endTime = this.time[1]
-    },
     formatState: function (row, column) {
       let state = row.state
       if (state === '1') {
diff --git a/src/views/modules/user/unauthorized.vue b/src/views/modules/user/unauthorized.vue
index e8143c3b..6c05a447 100644
--- a/src/views/modules/user/unauthorized.vue
+++ b/src/views/modules/user/unauthorized.vue
@@ -59,16 +59,28 @@
         </el-form-item>
         <!-- <div class="block"> -->
         <br>
-        <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">
+          <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">
+          </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">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('epdc:user:export')"
@@ -181,6 +193,22 @@ export default {
         state: '0',
         nickname: ''
       },
+      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()
+          }
+        }
+      },
       deptIdList: [],
       options: [],
       userDetailVisible: false,
@@ -291,10 +319,6 @@ export default {
         }).catch(() => { })
       }
     },
-    setRegistTime () {
-      this.dataForm.startTime = this.time[0]
-      this.dataForm.endTime = this.time[1]
-    },
     formatState: function (row, column) {
       let state = row.state
       if (state === '1') {
diff --git a/src/views/modules/user/wait-authentication.vue b/src/views/modules/user/wait-authentication.vue
index 9b911ab3..2be6f616 100644
--- a/src/views/modules/user/wait-authentication.vue
+++ b/src/views/modules/user/wait-authentication.vue
@@ -58,16 +58,28 @@
                     clearable></el-input>
         </el-form-item>
         <br>
-        <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">
+          <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">
+          </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">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('epdc:user:export')"
@@ -170,6 +182,22 @@ export default {
         partyFlag: '0', // 是否是党员(0-否，1-是)
         state: '1'
       },
+      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()
+          }
+        }
+      },
       deptIdList: [],
       options: [],
       userDetailVisible: false,
@@ -280,10 +308,6 @@ export default {
         }).catch(() => { })
       }
     },
-    setRegistTime () {
-      this.dataForm.startTime = this.time[0]
-      this.dataForm.endTime = this.time[1]
-    },
     formatState: function (row, column) {
       let state = row.state
       if (state === '1') {