From 58691b5f4e5fdce584c7376daa3464de67c2e105 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 28 Jul 2020 13:55: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=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=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/heart/actinfo-list.vue      | 85 +++++++++----------
 .../modules/message/mail-template-send.vue    | 15 ++++
 .../modules/user/authenticate-history.vue     |  8 ++
 .../user/hasAuthenticationpartymembers.vue    | 52 ++++++++----
 src/views/modules/user/party-review.vue       |  6 +-
 .../user/party-wait-authentication.vue        | 68 ++++++++++-----
 .../user/partyauthenticationfailed.vue        | 68 +++++++++------
 src/views/modules/user/partymembers.vue       | 79 ++++++++++-------
 .../modules/workRecord/dailyrecordinfo.vue    |  4 +-
 9 files changed, 246 insertions(+), 139 deletions(-)

diff --git a/src/views/modules/heart/actinfo-list.vue b/src/views/modules/heart/actinfo-list.vue
index 0a39b3df..9b1f3f8a 100644
--- a/src/views/modules/heart/actinfo-list.vue
+++ b/src/views/modules/heart/actinfo-list.vue
@@ -2,50 +2,41 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__actinfo}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
-        <el-form-item label="活动发布状态">
+        <el-form-item label="发布状态" label-width="70px">
           <el-select v-model="dataForm.actStatus" placeholder="状态" clearable>
             <el-option label="上架" :value="1"></el-option>
             <el-option label="下架" :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="活动标题">
+        <el-form-item label="标题" label-width="70px">
           <el-input placeholder="活动标题" @keyup.native="btKeyUpTitle" v-model="dataForm.title" clearable></el-input>
         </el-form-item>
           <br>
-        <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="选择日期时间">-->
-<!--          </el-date-picker>-->
-          <el-date-picker  @change='setRegistTime'
-                  v-model="time"
-                  value-format="yyyy-MM-dd"
-                  type="daterange"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期">
+          <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"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px">
           </el-date-picker>
         </el-form-item>
-<!--        <el-form-item label="至"-->
-<!--                      label-width="25px"-->
-<!--                      prop="endTime">-->
-<!--          <el-date-picker v-model="dataForm.endTime"-->
-<!--                          type="date"-->
-<!--                          :picker-options="pickerBeginDateAfter"-->
-<!--                          value-format="yyyy-MM-dd"-->
-<!--                          format="yyyy-MM-dd"-->
-<!--                          placeholder="选择日期时间">-->
-<!--          </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('heart:actinfo:add')" type="success" @click="addAction()">增加活动</el-button>
+          <el-button v-if="$hasPermission('heart:actinfo:add')" type="primary" @click="addAction()">增加活动</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading"
@@ -116,7 +107,23 @@ export default {
         endTime: '',
         title:'', //新增活动标题查询
       },
-        time:[],
+      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,
       actInfoDetailVisible: false,
       actUserRelationVisible: false,
@@ -155,7 +162,7 @@ export default {
       this.$parent.selectComponent = 'ActInfoDetailView'
       this.$router.push({ path: '/heart-actinfo', query: { id: id } })
     },
-      btKeyUpTitle (e) {
+    btKeyUpTitle (e) {
         e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
         this.dataForm.title = e.target.value
     },
@@ -190,17 +197,7 @@ export default {
           this.$refs.actinfoCancel.init()
         })
       }
-    },
-    setRegistTime () { //时间处理
-          if (null == this.time){
-              this.dataForm.startTime = ''
-              this.dataForm.endTime = ''
-          }else {
-              console.log(this.time[0])
-              this.dataForm.startTime = this.time[0]
-              this.dataForm.endTime = this.time[1]
-          }
-      },
+    }
   }
 }
 </script>
diff --git a/src/views/modules/message/mail-template-send.vue b/src/views/modules/message/mail-template-send.vue
index 996dd41f..004bd807 100644
--- a/src/views/modules/message/mail-template-send.vue
+++ b/src/views/modules/message/mail-template-send.vue
@@ -41,10 +41,25 @@ export default {
         }
         callback()
       }
+      var validateEmailCc = (rule, value, callback) => {
+        if (value === null || value === '') {
+          // 未填写不做校验
+          callback()
+        } else if (!isEmail(value)) {
+          // 填写做邮箱校验
+          return callback(new Error(this.$t('validate.format', { 'attr': this.$t('user.email') })))
+        } else {
+          callback()
+        }
+      }
       return {
         mailTo: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' },
           { validator: validateEmail, trigger: 'blur' }
+        ],
+        mailCc: [
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' },
+          { validator: validateEmailCc, trigger: 'blur' }
         ]
       }
     }
diff --git a/src/views/modules/user/authenticate-history.vue b/src/views/modules/user/authenticate-history.vue
index e9240fe5..92219103 100644
--- a/src/views/modules/user/authenticate-history.vue
+++ b/src/views/modules/user/authenticate-history.vue
@@ -13,24 +13,29 @@
         label="姓名"
         header-align="center"
         align="center"
+        width="100"
       ></el-table-column>
       <el-table-column
         prop="mobile"
         label="手机号"
         header-align="center"
         align="center"
+        width="120"
       ></el-table-column>
       <el-table-column
         prop="address"
         label="居住地址"
         header-align="center"
         align="center"
+        min-width="150"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="authenticatedFlag"
         label="结果"
         header-align="center"
         align="center"
+        width="120"
         :formatter="formatterAuthenticatedFlag"
       ></el-table-column>
       <el-table-column
@@ -38,12 +43,15 @@
         label="备注"
         header-align="center"
         align="center"
+        min-width="250"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="createdTime"
         label="时间"
         header-align="center"
         align="center"
+        width="160"
       ></el-table-column>
     </el-table>
     <template slot="footer">
diff --git a/src/views/modules/user/hasAuthenticationpartymembers.vue b/src/views/modules/user/hasAuthenticationpartymembers.vue
index 44bd4001..127cefc3 100644
--- a/src/views/modules/user/hasAuthenticationpartymembers.vue
+++ b/src/views/modules/user/hasAuthenticationpartymembers.vue
@@ -27,7 +27,7 @@
         <el-form-item label="姓名" label-width="68px">
           <el-input v-model="dataForm.realName"
                     placeholder=""
-                    @keyup.native="btKeyUpUsername"
+                    @keyup.native="btKeyUpRealName"
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="手机号">
@@ -43,18 +43,28 @@
                     clearable></el-input>
         </el-form-item>
         <br>
-        <el-form-item label="注册时间">
-          <el-date-picker v-model="timeRange"
-                          type="daterange"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+        <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"
-                          :default-time="['00:00:00', '23:59:59']"
-                          @change="selectedTime">
+                          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 @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('epdc:user:export')"
@@ -164,6 +174,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()
+          }
+        }
+      },
       // streetOptions: [],
       communityOptions: [],
       gridOptions: [],
@@ -247,10 +273,6 @@ export default {
       this.dataForm.startTime = startDate
       this.dataForm.endTime = endDate
     },
-    selectedTime () {
-      this.dataForm.startTime = this.timeRange[0]
-      this.dataForm.endTime = this.timeRange[1]
-    },
     // getStreetList () {
     //   this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
     //     if (res.code !== 0) {
@@ -259,9 +281,9 @@ export default {
     //     this.streetOptions = res.data
     //   }).catch(() => { })
     // },
-    btKeyUpUsername (e) {
+    btKeyUpRealName (e) {
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
-      this.dataForm.username = e.target.value
+      this.dataForm.realName = e.target.value
     },
     btKeyUpMobile (e) {
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
diff --git a/src/views/modules/user/party-review.vue b/src/views/modules/user/party-review.vue
index f135a0a2..6a198502 100644
--- a/src/views/modules/user/party-review.vue
+++ b/src/views/modules/user/party-review.vue
@@ -13,19 +13,19 @@
                           prop="realName">
                 <el-input v-model="dataForm.realName"
                           placeholder="请输入"
-                          clearable></el-input>
+                          clearable disabled></el-input>
             </el-form-item>
             <el-form-item label="手机号"
                           prop="mobile">
                 <el-input v-model="dataForm.mobile"
                           placeholder="请输入"
-                          clearable></el-input>
+                          clearable disabled></el-input>
             </el-form-item>
             <el-form-item label="身份证号"
                           prop="identityNo">
                 <el-input v-model="dataForm.identityNo"
                           placeholder="请输入"
-                          clearable></el-input>
+                          clearable disabled></el-input>
             </el-form-item>
             <el-form-item label="认证网格"
                           prop="allDeptNames">
diff --git a/src/views/modules/user/party-wait-authentication.vue b/src/views/modules/user/party-wait-authentication.vue
index 64a76f2c..15d7fcb4 100644
--- a/src/views/modules/user/party-wait-authentication.vue
+++ b/src/views/modules/user/party-wait-authentication.vue
@@ -5,7 +5,7 @@
       <el-form :inline="true"
                :model="dataForm"
                @keyup.enter.native="getDataListSearch()">
-        <el-form-item label="所属机构">
+        <el-form-item label="所属机构" label-width="70px">
           <el-cascader v-model="deptIdList"
                        :options="options"
                        :props="{ checkStrictly: true }"
@@ -13,7 +13,7 @@
           </el-cascader>
         </el-form-item>
         <el-form-item label="街道"
-                      v-if="false">
+                      v-if="false" label-width="70px">
           <el-select v-model="dataForm.streetId"
                      clearable
                      placeholder="请选择"
@@ -25,7 +25,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="社区"
-                      v-if="false">
+                      v-if="false" label-width="70px">
           <el-select v-model="dataForm.communityId"
                      clearable
                      placeholder="请选择"
@@ -37,7 +37,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="网格"
-                      v-if="false">
+                      v-if="false" label-width="70px">
           <el-select v-model="dataForm.gridId"
                      clearable
                      placeholder="请选择">
@@ -47,13 +47,13 @@
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="姓名">
+        <el-form-item label="姓名" label-width="70px">
           <el-input v-model="dataForm.realName"
                     placeholder="请输入"
-                    @keyup.native="btKeyUpUsername"
+                    @keyup.native="btKeyUpRealName"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item label="手机号">
+        <el-form-item label="手机号" label-width="70px">
           <el-input v-model="dataForm.mobile"
                     placeholder="请输入"
                     @keyup.native="btKeyUpMobile"
@@ -61,16 +61,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" 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"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('epdc:user:export')"
@@ -176,6 +188,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: [],
       partyReviewVisible: false,
@@ -253,9 +281,9 @@ export default {
       this.dataForm.startTime = startDate
       this.dataForm.endTime = endDate
     },
-    btKeyUpUsername (e) {
+    btKeyUpRealName (e) {
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
-      this.dataForm.username = e.target.value
+      this.dataForm.realName = e.target.value
     },
     btKeyUpMobile (e) {
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
@@ -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/partyauthenticationfailed.vue b/src/views/modules/user/partyauthenticationfailed.vue
index 75a160ba..ca47f26a 100644
--- a/src/views/modules/user/partyauthenticationfailed.vue
+++ b/src/views/modules/user/partyauthenticationfailed.vue
@@ -5,40 +5,53 @@
       <el-form :inline="true"
                :model="dataForm"
                @keyup.enter.native="getDataListSearch()">
-        <el-form-item label="姓名" label-width="68px">
+        <el-form-item label="姓名" label-width="70px">
           <el-input v-model="dataForm.realName"
                     placeholder="请输入"
-                    @keyup.native="btKeyUpUsername"
+                    @keyup.native="btKeyUpRealname"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item label="手机号">
+        <el-form-item label="手机号" label-width="70px">
           <el-input v-model="dataForm.mobile"
                     placeholder="请输入"
                     @keyup.native="btKeyUpMobile"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item label="身份证号">
+        <el-form-item label="身份证号" label-width="70px">
           <el-input v-model="dataForm.identityNo"
                     placeholder="请输入"
                     @keyup.native="btKeyUpIdentityNo"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item label="认证时间">
-          <el-date-picker @change='setRegistTime'
-                          v-model="time"
+        <br>
+        <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">
+          </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 @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
+            <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
           </el-form-item>
           <el-form-item>
             <el-button type="success"
                        @click="exportHandle()">{{ $t('export') }}</el-button>
           </el-form-item>
-        </el-form-item>
+        
       </el-form>
       <el-table v-loading="dataListLoading"
                 :data="dataList"
@@ -133,6 +146,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()
+          }
+        }
+      },
       time: ''
     }
   },
@@ -168,18 +197,9 @@ export default {
       this.dataForm.startTime = startDate
       this.dataForm.endTime = endDate
     },
-    setRegistTime () {
-      if (this.time === null) {
-        this.dataForm.startTime = ''
-        this.dataForm.endTime = ''
-      } else {
-        this.dataForm.startTime = this.time[0]
-        this.dataForm.endTime = this.time[1]
-      }
-    },
-    btKeyUpUsername (e) {
+    btKeyUpRealname (e) {
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
-      this.dataForm.username = e.target.value
+      this.dataForm.realName = e.target.value
     },
     btKeyUpMobile (e) {
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
diff --git a/src/views/modules/user/partymembers.vue b/src/views/modules/user/partymembers.vue
index 727ee6a9..eeb57c1b 100755
--- a/src/views/modules/user/partymembers.vue
+++ b/src/views/modules/user/partymembers.vue
@@ -5,27 +5,37 @@
       <el-form :inline="true"
                :model="dataForm"
                @keyup.enter.native="getDataListSearch()">
-        <el-form-item label="所属机构">
+        <el-form-item label="所属机构" label-width="70px">
           <el-cascader v-model="deptIdList"
                        :options="options"
                        :props="{ checkStrictly: true }"
                        clearable>
           </el-cascader>
         </el-form-item>
+        <el-form-item label="注册状态" label-width="70px">
+          <el-select v-model="dataForm.registFlag"
+                     placeholder="请选择">
+            <el-option v-for="item in registFlagOptions"
+                       :key="item.dictValue"
+                       :label="item.dictName"
+                       :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <br>
-        <el-form-item label="姓名" label-width="65px">
+        <el-form-item label="姓名" label-width="70px">
           <el-input v-model="dataForm.realName"
                     placeholder="请输入姓名"
-                    @keyup.native="btKeyUpUsername"
+                    @keyup.native="btKeyUpRealName"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item label="手机号">
+        <el-form-item label="手机号" label-width="70px">
           <el-input v-model="dataForm.mobile"
                     placeholder="请输入手机号"
                     @keyup.native="btKeyUpMobile"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item label="身份证号">
+        <el-form-item label="身份证号" label-width="70px">
           <el-input v-model="dataForm.identityNo"
                     placeholder="请输入身份证号"
                     @keyup.native="btKeyUpIdentityNo"
@@ -42,30 +52,29 @@
           </el-select>
         </el-form-item>
         <br>
-        <el-form-item label="注册状态">
-          <el-select v-model="dataForm.registFlag"
-                     placeholder="请选择">
-            <el-option v-for="item in registFlagOptions"
-                       :key="item.dictValue"
-                       :label="item.dictName"
-                       :value="item.dictValue">
-            </el-option>
-          </el-select>
+        <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="注册时间">
-          <el-date-picker v-model="timeRange"
-                          type="daterange"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+        <el-form-item label="至" prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd"
-                          :default-time="['00:00:00', '23:59:59']"
-                          @change="selectedTime">
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
-        <br>
         <el-form-item>
           <el-button v-if="$hasPermission('partymembers:save')"
                      type="success"
@@ -262,6 +271,22 @@ export default {
           dictValue: '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()
+          }
+        }
+      },
       timeRange: [],
       upLoadUrl: '',
       faultDataVisible: false,
@@ -313,13 +338,9 @@ export default {
     this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/app-user/partymembers/importExcel?token=${Cookies.get('token')}`
   },
   methods: {
-    selectedTime () {
-      this.dataForm.startTime = this.timeRange[0]
-      this.dataForm.endTime = this.timeRange[1]
-    },
-    btKeyUpUsername (e) {
+    btKeyUpRealName (e) {
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
-      this.dataForm.username = e.target.value
+      this.dataForm.realName = e.target.value
     },
      btKeyUpMobile (e) {
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
diff --git a/src/views/modules/workRecord/dailyrecordinfo.vue b/src/views/modules/workRecord/dailyrecordinfo.vue
index fcac0a7e..5476ad37 100644
--- a/src/views/modules/workRecord/dailyrecordinfo.vue
+++ b/src/views/modules/workRecord/dailyrecordinfo.vue
@@ -53,13 +53,13 @@
           </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 type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item> -->
         <el-form-item>
-          <el-button type="success" @click="addHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:dailyrecordinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>