From 05165cdb3b36e80e0772f868ea1ba127e4f15940 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 17 Sep 2020 14:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B8=82=E5=8C=97=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=87=B3=E5=AE=89=E5=AE=81=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97=E3=80=91-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-09-17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/dailyfile.vue    |  4 +--
 .../dailyrecordinfo-add-or-update.vue         |  6 ----
 .../modules/workRecord/dailyrecordinfo.vue    | 36 +++++++++----------
 .../workRecord/dailyrecordinfoDetail.vue      |  9 +----
 src/views/modules/workRecord/map-select.vue   |  5 +++
 .../modules/workRecord/monthexcellentcase.vue | 22 ++++++------
 .../workRecord/monthexcellentcaseDetail.vue   |  2 +-
 .../modules/workRecord/monthexcellentgrid.vue | 28 +++++++--------
 .../workRecord/monthexcellentgridDetail.vue   |  2 +-
 .../workRecord/monthexcellentperson.vue       | 32 ++++++++---------
 .../workRecord/monthexcellentpersonDetail.vue |  2 +-
 src/views/modules/workRecord/monthfile.vue    |  4 +--
 .../modules/workRecord/monthgridsort.vue      | 26 +++++++-------
 .../workRecord/monthgridsortDetail.vue        |  2 +-
 .../modules/workRecord/monthrecordinfo.vue    | 32 ++++++++---------
 .../workRecord/monthrecordinfoDetail.vue      |  2 +-
 .../workRecord/resourcesdictionary.vue        |  4 +--
 src/views/modules/workRecord/weekfile.vue     |  4 +--
 .../modules/workRecord/weekrecorddetail.vue   |  4 +--
 .../modules/workRecord/weekrecordinfo.vue     | 32 ++++++++---------
 .../workRecord/weekrecordinfoDetail.vue       |  2 +-
 21 files changed, 119 insertions(+), 141 deletions(-)

diff --git a/src/views/modules/workRecord/dailyfile.vue b/src/views/modules/workRecord/dailyfile.vue
index 487158e..e786713 100644
--- a/src/views/modules/workRecord/dailyfile.vue
+++ b/src/views/modules/workRecord/dailyfile.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__dailyfile}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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('news:dailyfile:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/workRecord/dailyrecordinfo-add-or-update.vue b/src/views/modules/workRecord/dailyrecordinfo-add-or-update.vue
index 63957c1..f1a8de6 100644
--- a/src/views/modules/workRecord/dailyrecordinfo-add-or-update.vue
+++ b/src/views/modules/workRecord/dailyrecordinfo-add-or-update.vue
@@ -18,7 +18,6 @@
                           type="datetime"
                           value-format="yyyy-MM-dd HH:mm"
                           format="yyyy-MM-dd HH:mm"
-                          :picker-options="isSignupEndTime"
                           placeholder="选择日期时间" style="width:90%">
           </el-date-picker>
       </el-form-item>
@@ -85,11 +84,6 @@ export default {
         content: '',
         file: ''
       },
-      isSignupEndTime: {
-        disabledDate (time) {
-          return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天
-        }
-      },
       meetTypeArr: [],
       dailyTypeArr: [],
       loading: false
diff --git a/src/views/modules/workRecord/dailyrecordinfo.vue b/src/views/modules/workRecord/dailyrecordinfo.vue
index 87cd145..382aa4e 100644
--- a/src/views/modules/workRecord/dailyrecordinfo.vue
+++ b/src/views/modules/workRecord/dailyrecordinfo.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__dailyrecordinfo}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
         <el-form-item v-if="dailyTypeArr.length > 0" label="随手记类型" prop="dailyType" label-width="90px">
           <el-select v-model="dataForm.dailyType" placeholder="随手记类型" @change="selectModel($event)" clearable style="width:200px">
@@ -39,7 +39,7 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至" prop="endTime">
@@ -49,11 +49,11 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListOverWrite()">{{ $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>
@@ -65,7 +65,7 @@
           <el-button v-if="$hasPermission('news:dailyrecordinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         </div>
       </el-form>
@@ -75,15 +75,15 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="dailyType" label="随手记类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="meetType" label="会议类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="dailyDate" label="会议时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="address" label="地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="joinNum" label="参加人数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="content" label="会议内容" header-align="center" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="nickName" label="发布人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="dailyType" label="随手记类型" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="meetType" label="会议类型" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="dailyDate" label="会议时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="address" label="地址" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="joinNum" label="参加人数" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="content" label="会议内容" header-align="center" align="left" min-width="400" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="nickName" label="发布人" header-align="center" align="center" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addHandle(scope.row.id,false)">{{ $t('update') }}</el-button>
@@ -140,7 +140,9 @@ export default {
       dataForm: {
         id: '',
         content: '',
-        nickName: ''
+        nickName: '',
+        startTime: '',
+        endTime: ''
       },
       meetTypeArr: [],
       dailyTypeArr: [],
@@ -177,10 +179,6 @@ export default {
         })
         .catch(() => {})
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     btKeyUpContent (e) {
       e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
       this.dataForm.content = e.target.value
diff --git a/src/views/modules/workRecord/dailyrecordinfoDetail.vue b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
index 1b16b51..a711e83 100644
--- a/src/views/modules/workRecord/dailyrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
@@ -31,7 +31,6 @@
                           type="datetime"
                           value-format="yyyy-MM-dd HH:mm"
                           format="yyyy-MM-dd HH:mm"
-                          :picker-options="isSignupEndTime"
                           placeholder="选择日期时间" style="width:50%">
           </el-date-picker>
       </el-form-item>
@@ -123,11 +122,6 @@ export default {
         content: '',
         images: []
       },
-      isSignupEndTime: {
-        disabledDate (time) {
-          return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天
-        }
-      },
       isAble: false,
       meetTypeArr: [],
       dailyTypeArr: [],
@@ -234,6 +228,7 @@ export default {
     init () {
       this.dataForm.id = this.$route.query.id
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -339,7 +334,6 @@ export default {
           return false
         }
         this.isAble = true
-        console.log(this.dataForm)
         this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/dailyrecordinfo/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             this.isAble = false
@@ -350,7 +344,6 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.isAble = false
               this.visible = false
               this.$emit('refreshDataList')
               // 返回主列表
diff --git a/src/views/modules/workRecord/map-select.vue b/src/views/modules/workRecord/map-select.vue
index 644dfcc..2b9855b 100644
--- a/src/views/modules/workRecord/map-select.vue
+++ b/src/views/modules/workRecord/map-select.vue
@@ -126,6 +126,11 @@ export default {
         map: map
       })
       markerList.push(marker)
+      // 初始化mark点击事件
+      that.getAddress(that.dataForm.latitude, that.dataForm.longitude)
+      qq.maps.event.addListener(marker, 'click', function (event) {
+        that.addressCheckHandle()
+      })
       // 添加监听事件   获取鼠标单击事件
       qq.maps.event.addListener(map, 'click', function (event) {
         that.cleanMarkRadius(markerList, radiusList)
diff --git a/src/views/modules/workRecord/monthexcellentcase.vue b/src/views/modules/workRecord/monthexcellentcase.vue
index ed30992..efb9ccf 100644
--- a/src/views/modules/workRecord/monthexcellentcase.vue
+++ b/src/views/modules/workRecord/monthexcellentcase.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthexcellentcase}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
         <el-form-item label="案例内容" prop="content" label-width="90px">
           <el-input v-model="dataForm.content" placeholder="案例内容" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:200px"></el-input>
@@ -26,7 +26,7 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至" prop="endTime">
@@ -36,17 +36,17 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListOverWrite()">{{ $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="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:monthexcellentcase:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('news:monthexcellentcase:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:monthexcellentcase:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -59,7 +59,7 @@
             </template>
         </el-table-column>
         <el-table-column prop="month" label="月份" header-align="center" align="center" width="150"></el-table-column>
-        <el-table-column prop="content" label="内容" header-align="center" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="content" label="内容" header-align="center" align="left" min-width="400" show-overflow-tooltip></el-table-column>
         <el-table-column prop="nickName" label="发布人" header-align="center" align="center" width="250"></el-table-column>
         <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center" width="250"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
@@ -103,7 +103,9 @@ export default {
       dataForm: {
         id: '',
         content: '',
-        nickName: ''
+        nickName: '',
+        startTime: '',
+        endTime: ''
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -146,10 +148,6 @@ export default {
       this.$parent.selectComponent = 'MonthexcellentcaseDetail'
       this.$router.push({ path: '/workRecord-Monthexcellentcaseroute', query: { id: id, disabled: disabled } })
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     getOptions () {
       this.$http
         .get(`/sys/user/deptOptions/getDeptAuthByUser`)
diff --git a/src/views/modules/workRecord/monthexcellentcaseDetail.vue b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
index 1fd51df..8694904 100644
--- a/src/views/modules/workRecord/monthexcellentcaseDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
@@ -143,6 +143,7 @@ export default {
     init () {
       this.dataForm.id = this.$route.query.id
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -287,7 +288,6 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.isAble = false
               this.visible = false
               this.$emit('refreshDataList')
               // 返回主列表
diff --git a/src/views/modules/workRecord/monthexcellentgrid.vue b/src/views/modules/workRecord/monthexcellentgrid.vue
index 385111e..ce3c2b4 100644
--- a/src/views/modules/workRecord/monthexcellentgrid.vue
+++ b/src/views/modules/workRecord/monthexcellentgrid.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthexcellentgrid}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
         <el-form-item label="网格内容" prop="content" label-width="90px">
           <el-input v-model="dataForm.content" placeholder="网格内容" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:200px"></el-input>
@@ -26,7 +26,7 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至" prop="endTime">
@@ -36,14 +36,14 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListOverWrite()">{{ $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="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:monthexcellentgrid:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -58,11 +58,11 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="month" label="月份" header-align="center" align="center" width="150"></el-table-column>
-        <el-table-column prop="nickName" label="发布人" header-align="center" align="center" width="250"></el-table-column>
-        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center" width="350"></el-table-column>
-        <el-table-column prop="content" label="内容" header-align="center" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center" width="250"></el-table-column>
+        <el-table-column prop="month" label="月份" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="nickName" label="发布人" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="content" label="内容" header-align="center" align="left" min-width="400" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addHandle(scope.row.id,'0')">{{ $t('update') }}</el-button>
@@ -104,7 +104,9 @@ export default {
       dataForm: {
         id: '',
         content: '',
-        nickName: ''
+        nickName: '',
+        startTime: '',
+        endTime: ''
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -147,10 +149,6 @@ export default {
       this.$parent.selectComponent = 'MonthexcellentgridDetail'
       this.$router.push({ path: '/workRecord-Monthexcellentgridroute', query: { id: id, disabled: disabled } })
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     getOptions () {
       this.$http
         .get(`/sys/user/deptOptions/getDeptAuthByUser`)
diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue
index 77c4e4a..ce91096 100644
--- a/src/views/modules/workRecord/monthexcellentgridDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue
@@ -174,6 +174,7 @@ export default {
     init () {
       this.dataForm.id = this.$route.query.id
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -318,7 +319,6 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.isAble = false
               this.visible = false
               this.$emit('refreshDataList')
               // 返回主列表
diff --git a/src/views/modules/workRecord/monthexcellentperson.vue b/src/views/modules/workRecord/monthexcellentperson.vue
index 3cb1196..3115270 100644
--- a/src/views/modules/workRecord/monthexcellentperson.vue
+++ b/src/views/modules/workRecord/monthexcellentperson.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthexcellentperson}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
         <el-form-item label="榜样姓名" prop="name" label-width="90px">
           <el-input v-model="dataForm.name" placeholder="榜样姓名" clearable maxlength="20" @keyup.native="btKeyUpName" style="width:200px"></el-input>
@@ -37,7 +37,7 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至" prop="endTime">
@@ -47,14 +47,14 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListOverWrite()">{{ $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="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         <!-- <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
@@ -72,13 +72,13 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="month" label="月份" header-align="center" align="center" width="150"></el-table-column>
-        <el-table-column prop="name" label="榜样姓名" header-align="center" align="center" width="200"></el-table-column>
-        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center" width="200"></el-table-column>
-        <el-table-column prop="partyFlag" label="党员标识" header-align="center" align="center" width="150"></el-table-column>
-        <el-table-column prop="content" label="内容" header-align="center" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="nickName" label="发布人" header-align="center" align="center" width="200"></el-table-column>
-        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center" width="250"></el-table-column>
+        <el-table-column prop="month" label="月份" header-align="center" align="center" width="130"></el-table-column>
+        <el-table-column prop="name" label="榜样姓名" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center" width="150"></el-table-column>
+        <el-table-column prop="partyFlag" label="党员标识" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="content" label="内容" header-align="center" align="left" min-width="400" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="nickName" label="发布人" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addHandle(scope.row.id,'0')">{{ $t('update') }}</el-button>
@@ -123,7 +123,9 @@ export default {
         mobile: '',
         partyFlag: '',
         content: '',
-        nickName: ''
+        nickName: '',
+        startTime: '',
+        endTime: ''
       },
       partyFlagArr: [
         { dictValue: '0', dictName: '居民' },
@@ -170,10 +172,6 @@ export default {
       this.$parent.selectComponent = 'MonthexcellentpersonDetail'
       this.$router.push({ path: '/workRecord-Monthexcellentpersonroute', query: { id: id, disabled: disabled } })
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     getOptions () {
       this.$http
         .get(`/sys/user/deptOptions/getDeptAuthByUser`)
diff --git a/src/views/modules/workRecord/monthexcellentpersonDetail.vue b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
index 30b2d24..6ec04aa 100644
--- a/src/views/modules/workRecord/monthexcellentpersonDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
@@ -164,6 +164,7 @@ export default {
     init () {
       this.dataForm.id = this.$route.query.id
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -308,7 +309,6 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.isAble = false
               this.visible = false
               this.$emit('refreshDataList')
               // 返回主列表
diff --git a/src/views/modules/workRecord/monthfile.vue b/src/views/modules/workRecord/monthfile.vue
index 648f818..67da0f5 100644
--- a/src/views/modules/workRecord/monthfile.vue
+++ b/src/views/modules/workRecord/monthfile.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthfile}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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('news:monthfile:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/workRecord/monthgridsort.vue b/src/views/modules/workRecord/monthgridsort.vue
index ecdc699..054fad5 100644
--- a/src/views/modules/workRecord/monthgridsort.vue
+++ b/src/views/modules/workRecord/monthgridsort.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthgridsort}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
         <!-- <el-form-item label="网格名称" prop="deptName" label-width="90px">
           <el-input v-model="dataForm.deptName" placeholder="网格名称" clearable maxlength="20" @keyup.native="btKeyUpDeptName" style="width:200px"></el-input>
@@ -26,7 +26,7 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至" prop="endTime">
@@ -36,14 +36,14 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListOverWrite()">{{ $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="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:monthgridsort:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -58,10 +58,10 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="month" label="月份" header-align="center" align="center" width="150"></el-table-column>
-        <el-table-column prop="deptNames" label="网格排序" header-align="center" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="nickName" label="发布人" header-align="center" align="center" width="250"></el-table-column>
-        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center" width="250"></el-table-column>
+        <el-table-column prop="month" label="月份" header-align="center" align="center" width="130"></el-table-column>
+        <el-table-column prop="deptNames" label="网格排序" header-align="center" align="left" min-width="400" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="nickName" label="发布人" header-align="center" align="center" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addHandle(scope.row.infoId,'0')">{{ $t('update') }}</el-button>
@@ -103,7 +103,9 @@ export default {
       dataForm: {
         id: '',
         deptName: '',
-        nickName: ''
+        nickName: '',
+        startTime: '',
+        endTime: ''
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -146,10 +148,6 @@ export default {
       this.$parent.selectComponent = 'MonthgridsortDetail'
       this.$router.push({ path: '/workRecord-Monthgridsortroute', query: { isAdd: '0', disabled: disabled, infoId: infoId } })
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     getOptions () {
       this.$http
         .get(`/sys/user/deptOptions/getDeptAuthByUser`)
diff --git a/src/views/modules/workRecord/monthgridsortDetail.vue b/src/views/modules/workRecord/monthgridsortDetail.vue
index 7deeb81..0317f79 100644
--- a/src/views/modules/workRecord/monthgridsortDetail.vue
+++ b/src/views/modules/workRecord/monthgridsortDetail.vue
@@ -125,6 +125,7 @@ export default {
     init () {
       this.dataForm.id = this.$route.query.id
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -205,7 +206,6 @@ export default {
           type: 'success',
           duration: 500,
           onClose: () => {
-            this.isAble = false
             this.visible = false
             this.$emit('refreshDataList')
             // 返回主列表
diff --git a/src/views/modules/workRecord/monthrecordinfo.vue b/src/views/modules/workRecord/monthrecordinfo.vue
index e3d9672..9fbaa0d 100644
--- a/src/views/modules/workRecord/monthrecordinfo.vue
+++ b/src/views/modules/workRecord/monthrecordinfo.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthrecordinfo}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item> -->
@@ -29,7 +29,7 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至" prop="endTime">
@@ -39,11 +39,11 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListOverWrite()">{{ $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('news:monthrecordinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -52,7 +52,7 @@
           <el-button type="primary" @click="addHandle('','0','','','','')">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:monthrecordinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -64,13 +64,13 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="nickName" label="发布人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="startDate" label="统计开始时间" header-align="center" align="center" :formatter="dateFormat"></el-table-column>
-        <el-table-column prop="endDate" label="统计结束时间" header-align="center" align="center" :formatter="dateFormat"></el-table-column>
-        <el-table-column prop="content" label="内容" header-align="center" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="state" label="月报状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nickName" label="发布人" header-align="center" align="center" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="startDate" label="统计开始时间" header-align="center" align="center" :formatter="dateFormat" width="180"></el-table-column>
+        <el-table-column prop="endDate" label="统计结束时间" header-align="center" align="center" :formatter="dateFormat" width="180"></el-table-column>
+        <el-table-column prop="content" label="内容" header-align="center" align="left" min-width="400" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="state" label="月报状态" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="250">
           <template slot-scope="scope">
             <div>
@@ -126,7 +126,9 @@ export default {
       dataForm: {
         id: '',
         content: '',
-        nickName: ''
+        nickName: '',
+        startTime: '',
+        endTime: ''
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -200,10 +202,6 @@ export default {
       let date = row[column.property]
       return date.length >= 10 ? date.substring(0, 10) : date
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     btKeyUpContent (e) {
       e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
       this.dataForm.content = e.target.value
diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue
index 60e0123..d78fb2a 100644
--- a/src/views/modules/workRecord/monthrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue
@@ -190,6 +190,7 @@ export default {
     init () {
       this.dataForm.id = this.$route.query.id
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -333,7 +334,6 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.isAble = false
               this.visible = false
               this.$emit('refreshDataList')
               // 返回主列表
diff --git a/src/views/modules/workRecord/resourcesdictionary.vue b/src/views/modules/workRecord/resourcesdictionary.vue
index fc8b7a5..b2f7a82 100644
--- a/src/views/modules/workRecord/resourcesdictionary.vue
+++ b/src/views/modules/workRecord/resourcesdictionary.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__resourcesdictionary}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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('news:resourcesdictionary:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/workRecord/weekfile.vue b/src/views/modules/workRecord/weekfile.vue
index 82efa94..d97f67e 100644
--- a/src/views/modules/workRecord/weekfile.vue
+++ b/src/views/modules/workRecord/weekfile.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__weekfile}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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('news:weekfile:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/workRecord/weekrecorddetail.vue b/src/views/modules/workRecord/weekrecorddetail.vue
index 2480e0e..b7daf58 100644
--- a/src/views/modules/workRecord/weekrecorddetail.vue
+++ b/src/views/modules/workRecord/weekrecorddetail.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__weekrecorddetail}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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('news:weekrecorddetail:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
diff --git a/src/views/modules/workRecord/weekrecordinfo.vue b/src/views/modules/workRecord/weekrecordinfo.vue
index d595282..02870c9 100644
--- a/src/views/modules/workRecord/weekrecordinfo.vue
+++ b/src/views/modules/workRecord/weekrecordinfo.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__weekrecordinfo}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item> -->
@@ -29,7 +29,7 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至" prop="endTime">
@@ -39,11 +39,11 @@
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
                           placeholder="选择日期时间"
-                          style="width:200px">
+                          style="width:200px" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListOverWrite()">{{ $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('news:weekrecordinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -52,7 +52,7 @@
           <el-button type="primary" @click="addHandle('','0','1')">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:weekrecordinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -64,13 +64,13 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="nickName" label="发布人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="startDate" label="统计开始时间" header-align="center" align="center" :formatter="dateFormat"></el-table-column>
-        <el-table-column prop="endDate" label="统计结束时间" header-align="center" align="center" :formatter="dateFormat"></el-table-column>
-        <el-table-column prop="content" label="内容" header-align="center" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="state" label="周报状态" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="nickName" label="发布人" header-align="center" align="center" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="startDate" label="统计开始时间" header-align="center" align="center" width="180" :formatter="dateFormat"></el-table-column>
+        <el-table-column prop="endDate" label="统计结束时间" header-align="center" align="center" width="180" :formatter="dateFormat"></el-table-column>
+        <el-table-column prop="content" label="内容" header-align="center" align="left" min-width="400" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="state" label="周报状态" header-align="center" align="center" width="120"></el-table-column>
+        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addHandle(scope.row.id,'0','0')">{{ $t('update') }}</el-button>
@@ -112,7 +112,9 @@ export default {
       dataForm: {
         id: '',
         content: '',
-        nickName: ''
+        nickName: '',
+        startTime: '',
+        endTime: ''
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -170,10 +172,6 @@ export default {
         })
         .catch(() => {})
     },
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     btKeyUpContent (e) {
       e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
       this.dataForm.content = e.target.value
diff --git a/src/views/modules/workRecord/weekrecordinfoDetail.vue b/src/views/modules/workRecord/weekrecordinfoDetail.vue
index 7bf864a..3d529e7 100644
--- a/src/views/modules/workRecord/weekrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/weekrecordinfoDetail.vue
@@ -171,6 +171,7 @@ export default {
     init () {
       this.dataForm.id = this.$route.query.id
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -344,7 +345,6 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.isAble = false
               this.visible = false
               this.$emit('refreshDataList')
               // 返回主列表