From 6fd200f8bd80a158a2555b77bdaa2cb60406063d Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 14 Apr 2020 15:12:53 +0800
Subject: [PATCH 01/20] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/workRecord/dailyrecordinfo.vue    |   8 +
 .../modules/workRecord/monthexcellentcase.vue |  18 +-
 .../workRecord/monthexcellentcaseDetail.vue   |   2 +-
 .../modules/workRecord/monthexcellentgrid.vue |  18 +-
 .../workRecord/monthexcellentgridDetail.vue   |  42 ++-
 .../workRecord/monthexcellentperson.vue       | 165 ++++++++-
 .../workRecord/monthexcellentpersonDetail.vue | 312 ++++++++++++++++++
 .../workRecord/monthexcellentpersonroute.vue  |  29 ++
 .../modules/workRecord/monthgridsort.vue      | 142 +++++++-
 .../workRecord/monthgridsortDetail.vue        | 197 +++++++++++
 .../modules/workRecord/monthgridsortroute.vue |  29 ++
 .../modules/workRecord/monthrecordinfo.vue    |  12 +-
 .../workRecord/monthrecordinfoDetail.vue      |   2 +-
 .../workRecord/monthrecordinforoute.vue       |   6 +-
 14 files changed, 920 insertions(+), 62 deletions(-)
 create mode 100644 src/views/modules/workRecord/monthexcellentpersonDetail.vue
 create mode 100644 src/views/modules/workRecord/monthexcellentpersonroute.vue
 create mode 100644 src/views/modules/workRecord/monthgridsortDetail.vue
 create mode 100644 src/views/modules/workRecord/monthgridsortroute.vue

diff --git a/src/views/modules/workRecord/dailyrecordinfo.vue b/src/views/modules/workRecord/dailyrecordinfo.vue
index 9cdd5177..3c5efede 100644
--- a/src/views/modules/workRecord/dailyrecordinfo.vue
+++ b/src/views/modules/workRecord/dailyrecordinfo.vue
@@ -225,3 +225,11 @@ export default {
   }
 }
 </script>
+<style>
+.el-tooltip__popper {
+  max-width: 80%;
+  color: #353434 !important;
+  background:#ffffff !important;
+  word-break:break-all;
+}
+</style>
diff --git a/src/views/modules/workRecord/monthexcellentcase.vue b/src/views/modules/workRecord/monthexcellentcase.vue
index 70aed4a5..6671f577 100644
--- a/src/views/modules/workRecord/monthexcellentcase.vue
+++ b/src/views/modules/workRecord/monthexcellentcase.vue
@@ -59,7 +59,7 @@
             </template>
         </el-table-column>
         <el-table-column prop="nickName" label="发布人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="content" 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="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
@@ -159,7 +159,23 @@ export default {
           this.options = res.data.options
         })
         .catch(() => {})
+    },
+    btKeyUpContent (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.content = e.target.value
+    },
+    btKeyUpNickName (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.nickName = e.target.value
     }
   }
 }
 </script>
+<style>
+.el-tooltip__popper {
+  max-width: 80%;
+  color: #353434 !important;
+  background:#ffffff !important;
+  word-break:break-all;
+}
+</style>
diff --git a/src/views/modules/workRecord/monthexcellentcaseDetail.vue b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
index a57c4412..57463faf 100644
--- a/src/views/modules/workRecord/monthexcellentcaseDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
@@ -44,7 +44,7 @@
           :on-error="handelError"
           :on-preview="handleFileCardPreview"
           style="width:480px">
-          <el-button size="small">点击上传</el-button>
+          <el-button size="small" :disabled="isAble">点击上传</el-button>
           <div slot="tip" class="el-upload__tip">支持.word、PDF、Excel文件</div>
         </el-upload>
       </el-form-item>
diff --git a/src/views/modules/workRecord/monthexcellentgrid.vue b/src/views/modules/workRecord/monthexcellentgrid.vue
index 62803410..84fb022c 100644
--- a/src/views/modules/workRecord/monthexcellentgrid.vue
+++ b/src/views/modules/workRecord/monthexcellentgrid.vue
@@ -60,7 +60,7 @@
         </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="content" 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="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
@@ -160,7 +160,23 @@ export default {
           this.options = res.data.options
         })
         .catch(() => {})
+    },
+    btKeyUpContent (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.content = e.target.value
+    },
+    btKeyUpNickName (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.nickName = e.target.value
     }
   }
 }
 </script>
+<style>
+.el-tooltip__popper {
+  max-width: 80%;
+  color: #353434 !important;
+  background:#ffffff !important;
+  word-break:break-all;
+}
+</style>
diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue
index c8e08353..3e4c0f5a 100644
--- a/src/views/modules/workRecord/monthexcellentgridDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue
@@ -2,17 +2,18 @@
   <el-card shadow="never" class="aui-card--fill"  v-loading="pageloading">
     <div class="mod-__masteruserrelation}">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
-      <el-form-item label="选择网格" label-width="90px">
+      <el-form-item label="选择网格" prop="deptId" label-width="90px">
         <el-cascader
           ref="name"
-          v-model="ids"
+          v-model="dataForm.deptId"
           :options="options"
           :props="{ checkStrictly: true }"
+          @change="changeHandle"
           clearable
         >
         </el-cascader>
       </el-form-item>
-      <el-form-item label="会议内容" prop="content" label-width="100px">
+      <el-form-item label="会议内容" prop="content" label-width="90px">
         <el-input
           type="textarea"
           :rows="6"
@@ -54,7 +55,7 @@
           :on-error="handelError"
           :on-preview="handleFileCardPreview"
           style="width:480px">
-          <el-button size="small">点击上传</el-button>
+          <el-button size="small" :disabled="isAble">点击上传</el-button>
           <div slot="tip" class="el-upload__tip">支持.word、PDF、Excel文件</div>
         </el-upload>
       </el-form-item>
@@ -107,7 +108,6 @@ export default {
       isAutoRemoveFile: true,
       fileloading: false,
       pageloading: true,
-      ids: [],
       options: []
     }
   },
@@ -116,26 +116,19 @@ export default {
       return {
         content: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
   },
-  watch: {
-    ids: function (val) {
-      if (val.length === 0) {
-        this.dataForm.deptId = ''
-      } else {
-        this.dataForm.deptId = this.ids[val.length - 1]
-      }
-      this.dataForm.deptName = this.$refs['name'].getCheckedNodes()[0].label
-    }
-  },
   created: function () {
     this.getOptions()
-    // this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadImg?token=${Cookies.get('token')}`
-    // this.uploadFileUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadAllFile?token=${Cookies.get('token')}`
-    this.uploadUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadImg?token=${Cookies.get('token')}`
-    this.uploadFileUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadAllFile?token=${Cookies.get('token')}`
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadImg?token=${Cookies.get('token')}`
+    this.uploadFileUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadAllFile?token=${Cookies.get('token')}`
+    // this.uploadUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadImg?token=${Cookies.get('token')}`
+    // this.uploadFileUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadAllFile?token=${Cookies.get('token')}`
   },
   components: {
     MapSelect
@@ -159,13 +152,18 @@ export default {
     }
   },
   methods: {
+    changeHandle (value, selectedData) {
+      console.log(this.$refs['name'].getCheckedNodes()[0])
+      this.dataForm.deptName = this.$refs['name'].getCheckedNodes()[0].label
+      this.dataForm.deptId = this.$refs['name'].getCheckedNodes()[0].value
+    },
     init () {
       this.dataForm.id = this.$route.query.id
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
-          this.getInfo()
+          // this.getInfo()
         }
       })
     },
@@ -212,8 +210,8 @@ export default {
     },
     // --------------文件上传-----------------
     handleFileCardPreview (file) {
-      // window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${file.url}`
-      window.location.href = `http://219.146.91.110:10000/epdc-api/oss/file/download?fileUrl=${file.url}`
+      window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${file.url}`
+      // window.location.href = `http://219.146.91.110:10000/epdc-api/oss/file/download?fileUrl=${file.url}`
     },
     beforeFileRemove (file, fileList) {
       if (this.isAutoRemoveFile) {
diff --git a/src/views/modules/workRecord/monthexcellentperson.vue b/src/views/modules/workRecord/monthexcellentperson.vue
index 34a17142..dcd165c5 100644
--- a/src/views/modules/workRecord/monthexcellentperson.vue
+++ b/src/views/modules/workRecord/monthexcellentperson.vue
@@ -2,12 +2,63 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthexcellentperson}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <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>
+        </el-form-item>
+        <el-form-item label="手机号" prop="mobile" label-width="90px">
+          <el-input v-model="dataForm.mobile" placeholder="手机号" clearable maxlength="10" @keyup.native="btKeyUpMobile" style="width:200px"></el-input>
+        </el-form-item>
+        </div>
+        <div>
+        <el-form-item label="发布人" prop="nickName" label-width="90px">
+          <el-input v-model="dataForm.nickName" placeholder="发布人" clearable maxlength="20" @keyup.native="btKeyUpNickName" style="width:200px"></el-input>
+        </el-form-item>
+        <el-form-item label="榜样身份" prop="partyFlag" label-width="90px">
+          <el-select v-model="dataForm.partyFlag" placeholder="榜样身份" style="width:200px" clearable>
+            <el-option v-for="item in partyFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        </div>
+        <el-form-item label="所属机构" label-width="90px">
+          <el-cascader
+            v-model="ids"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          >
+          </el-cascader>
+        </el-form-item>
+        <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-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-button @click="getDataListOverWrite()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
+        <!-- <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item> -->
         <el-form-item>
           <el-button v-if="$hasPermission('news:monthexcellentperson:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
@@ -16,21 +67,21 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="infoId" label="信息ID" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
         <el-table-column prop="name" label="榜样姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="partyFlag" label="党员标识" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="content" label="内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="逻辑删除标识" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" 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="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" 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 :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>
+            <el-button type="text" size="small" @click="addHandle(scope.row.id,'1')">{{ '查看' }}</el-button>
             <el-button v-if="$hasPermission('news:monthexcellentperson:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('news:monthexcellentperson:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
@@ -59,18 +110,100 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/monthexcellentperson/page',
+        getDataListURL: '/workRecord/monthexcellentperson/page',
         getDataListIsPage: true,
-        deleteURL: '/news/monthexcellentperson',
-        deleteIsBatch: true
+        deleteURL: '/workRecord/monthexcellentperson',
+        deleteIsBatch: true,
+        exportURL: '/workRecord/monthexcellentperson/export'
       },
       dataForm: {
-        id: ''
+        id: '',
+        name: '',
+        mobile: '',
+        partyFlag: '',
+        content: '',
+        nickName: ''
+      },
+      partyFlagArr: [
+        { dictValue: '0', dictName: '居民' },
+        { dictValue: '1', dictName: '党员' }
+      ],
+      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()
+          }
+        }
+      },
+      ids: [],
+      options: []
+    }
+  },
+  watch: {
+    ids: function (val) {
+      if (val.length === 0) {
+        this.dataForm.deptId = ''
+      } else {
+        this.dataForm.deptId = this.ids[val.length - 1]
       }
     }
   },
+  created: function () {
+    this.getDataList()
+    this.getOptions()
+  },
   components: {
     AddOrUpdate
+  },
+  methods: {
+    addHandle (id, disabled) {
+      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/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {})
+    },
+    btKeyUpName (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.name = e.target.value
+    },
+    btKeyUpNickName (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.nickName = e.target.value
+    },
+    btKeyUpMobile (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.mobile = e.target.value
+    }
   }
 }
 </script>
+<style>
+.el-tooltip__popper {
+  max-width: 80%;
+  color: #353434 !important;
+  background:#ffffff !important;
+  word-break:break-all;
+}
+</style>
diff --git a/src/views/modules/workRecord/monthexcellentpersonDetail.vue b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
new file mode 100644
index 00000000..e9eb7582
--- /dev/null
+++ b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
@@ -0,0 +1,312 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill"  v-loading="pageloading">
+    <div class="mod-__masteruserrelation}">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
+      <el-form-item label="榜样身份" prop="partyFlag" label-width="100px">
+        <el-select v-model="dataForm.partyFlag" placeholder="榜样身份" style="width:300px" clearable>
+          <el-option v-for="item in partyFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="榜样名称" prop="name" label-width="100px">
+        <el-input v-model="dataForm.name" placeholder="榜样名称" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:300px"></el-input>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="mobile" label-width="100px">
+        <el-input v-model="dataForm.mobile" placeholder="联系电话" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:300px"></el-input>
+      </el-form-item>
+      <el-form-item label="会议内容" prop="content" label-width="100px">
+        <el-input
+          type="textarea"
+          :rows="6"
+          placeholder="请输入会议内容，2000字以内"
+          v-model="dataForm.content"
+          maxlength="2000"
+          style="width:50%">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="添加图片" v-loading="loading" prop="images" label-width="90px">
+          <el-upload
+            :action="uploadUrl"
+            :class="{hide:hideUpload}"
+            list-type="picture-card"
+            :file-list="dataForm.images"
+            :limit=9
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove"
+            :on-success="handleAvatarSuccess"
+            :on-error="handelError"
+            :before-upload="beforeAvatarUpload"
+            style="width:480px">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
+          </el-dialog>
+          <div><font color="gray">1~9张图</font></div>
+      </el-form-item>
+      <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="90px">
+        <el-upload
+          class="upload-demo"
+          :action="uploadFileUrl"
+          :before-remove="beforeFileRemove"
+          :file-list="dataForm.files"
+          :before-upload="beforeAvatarFileUpload"
+          :on-remove="handleFileRemove"
+          :on-success="handleAvatarFileSuccess"
+          :on-error="handelError"
+          :on-preview="handleFileCardPreview"
+          style="width:480px">
+          <el-button size="small" :disabled="isAble">点击上传</el-button>
+          <div slot="tip" class="el-upload__tip">支持.word、PDF、Excel文件</div>
+        </el-upload>
+      </el-form-item>
+      </el-form>
+      <el-form>
+        <el-form-item style="margin-left:35px;">
+          <el-button type="primary" @click="backToUserRelationList">{{"返回"}}</el-button>
+          <el-button v-if="!pageDisabled" type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+        </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </div>
+  </el-card>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+import Cookies from 'js-cookie'
+import 'quill/dist/quill.snow.css'
+import MapSelect from './map-select'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        name: '',
+        mobile: '',
+        partyFlag: '',
+        content: '',
+        state: '',
+        images: [],
+        files: []
+      },
+      partyFlagArr: [
+        { dictValue: '0', dictName: '居民' },
+        { dictValue: '1', dictName: '党员' }
+      ],
+      isAble: false,
+      hideUpload: false,
+      pageDisabled: false,
+      uploadUrl: '',
+      uploadFileUrl: '',
+      loading: false,
+      dialogImageUrl: '',
+      dialogVisible: false,
+      isAutoRemoveFile: true,
+      fileloading: false,
+      pageloading: true
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+          { pattern: /^[1][3,4,5,7,8,9][0-9]{9}$/, message: '请输入正确号码格式', trigger: 'blur' }
+        ],
+        partyFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created: function () {
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadImg?token=${Cookies.get('token')}`
+    this.uploadFileUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadAllFile?token=${Cookies.get('token')}`
+    // this.uploadUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadImg?token=${Cookies.get('token')}`
+    // this.uploadFileUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadAllFile?token=${Cookies.get('token')}`
+  },
+  components: {
+    MapSelect
+  },
+  mounted () {
+    if (this.$route.query.disabled === '0') {
+      this.pageDisabled = false
+      this.hideUpload = false
+    } else {
+      this.pageDisabled = true
+      this.hideUpload = true
+    }
+    if (this.$route.query.id !== '' && this.$route.query.id != null) {
+      this.dataForm.id = this.$route.query.id
+      this.getInfo()
+    } else {
+      this.pageloading = false
+    }
+    if (this.$route.query.infoId !== '' && this.$route.query.infoId != null) {
+      this.dataForm.infoId = this.$route.query.infoId
+    }
+  },
+  methods: {
+    init () {
+      this.dataForm.id = this.$route.query.id
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    beforeAvatarUpload (file) {
+      if (this.dataForm.length === 9) {
+        this.$message.error('最多上传9张图片!')
+        return false
+      }
+      this.loading = true
+      this.isAble = true
+      const isJPG = file.type === 'image/jpeg'
+      const isPNG = file.type === 'image/png'
+      // 判断是否符合格式要求
+      if (!isJPG && !isPNG) {
+        this.$message.error('上传文件必须是jpg、png格式!')
+        this.loading = false
+        return false
+      }
+    },
+    handleAvatarSuccess (res, file) {
+      this.loading = false
+      this.isAble = false
+      this.dataForm.images.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 1, recordType: 3, fileName: res.data.fileName })
+      this.hideUpload = this.dataForm.images.length >= 9
+    },
+    handelError () {
+      this.loading = false
+      this.fileloading = false
+      this.isAble = false
+      this.$message.error('上传文件失败!')
+    },
+    handleRemove (file, fileList) {
+      for (var i = 0; i < this.dataForm.images.length; i++) {
+        let item = this.dataForm.images[i]
+        if (item.url === file.url) {
+          this.dataForm.images.splice(i, 1)
+        }
+      }
+      this.hideUpload = this.dataForm.images.length >= 9
+    },
+    handlePictureCardPreview (file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    // --------------文件上传-----------------
+    handleFileCardPreview (file) {
+      window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${file.url}`
+      // window.location.href = `http://219.146.91.110:10000/epdc-api/oss/file/download?fileUrl=${file.url}`
+    },
+    beforeFileRemove (file, fileList) {
+      if (this.isAutoRemoveFile) {
+        return this.$confirm(`确定移除${file.name}？`)
+      }
+      this.isAutoRemoveFile = true
+    },
+    beforeAvatarFileUpload (file) {
+      this.fileloading = true
+      this.isAble = true
+      if (file.size === 0) {
+        this.isAutoRemoveFile = false
+        this.$message.error('文件为空文件，请上传非空文件！')
+        this.fileloading = false
+        this.isAble = false
+        return false
+      }
+    },
+    handleFileRemove (file, fileList) {
+      for (var i = 0; i < this.dataForm.files.length; i++) {
+        let item = this.dataForm.files[i]
+        if (item.url === file.url) {
+          this.dataForm.files.splice(i, 1)
+        }
+      }
+    },
+    handleAvatarFileSuccess (res, file) {
+      this.fileloading = false
+      this.isAble = false
+      if (res === null || res.data === null || res.data.imgUrl === null) {
+        this.$message.error('文件上传失败！')
+        return false
+      }
+      this.dataForm.files.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 2, recordType: 3, fileName: res.data.fileName, name: res.data.fileName })
+    },
+    // 返回按钮点击事件
+    backToUserRelationList () {
+      this.$emit('refreshDataList')
+      if (this.$route.query.infoId !== '' && this.$route.query.infoId != null) {
+        this.$parent.selectComponent = 'Monthrecordinfo'
+        this.$router.push({ path: '/workRecord-Monthrecordinforoute' })
+      } else {
+        this.$parent.selectComponent = 'Monthexcellentperson'
+        this.$router.push({ path: '/workRecord-Monthexcellentpersonroute' })
+      }
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/workRecord/monthexcellentperson/${this.dataForm.id}`).then(({ data: res }) => {
+        this.pageloading = false
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        // 判断是否存在九张照片，九张照片隐藏上传操作按钮(非查看状态下)
+        if (this.$route.query.disabled === '0') {
+          this.hideUpload = this.dataForm.images.length >= 9
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.isAble = true
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/monthexcellentperson/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            this.isAble = false
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.isAble = false
+              this.visible = false
+              this.$emit('refreshDataList')
+              // 返回主列表
+              this.backToUserRelationList()
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
+<style>
+.hide .el-upload--picture-card {
+    display: none;
+}
+</style>
diff --git a/src/views/modules/workRecord/monthexcellentpersonroute.vue b/src/views/modules/workRecord/monthexcellentpersonroute.vue
new file mode 100644
index 00000000..c7577bd7
--- /dev/null
+++ b/src/views/modules/workRecord/monthexcellentpersonroute.vue
@@ -0,0 +1,29 @@
+<template>
+    <keep-alive include="monthexcellentperson">
+        <component :is="selectComponent"></component>
+    </keep-alive>
+</template>
+<script>
+import Monthexcellentperson from './monthexcellentperson'
+import MonthexcellentpersonDetail from './monthexcellentpersonDetail'
+export default {
+  data () {
+    return {
+      selectComponent: Monthexcellentperson
+    }
+  },
+  components: {
+    Monthexcellentperson,
+    MonthexcellentpersonDetail
+  },
+  methods: {
+    init () {
+      this.selectComponent = Monthexcellentperson
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/workRecord/monthgridsort.vue b/src/views/modules/workRecord/monthgridsort.vue
index 62bf66d0..cda70900 100644
--- a/src/views/modules/workRecord/monthgridsort.vue
+++ b/src/views/modules/workRecord/monthgridsort.vue
@@ -2,11 +2,48 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthgridsort}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <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>
+        </el-form-item>
+        <el-form-item label="发布人" prop="nickName" label-width="90px">
+          <el-input v-model="dataForm.nickName" placeholder="发布人" clearable maxlength="10" @keyup.native="btKeyUpNickName" style="width:200px"></el-input>
+        </el-form-item>
+        </div>
+        <el-form-item label="所属机构" label-width="90px">
+          <el-cascader
+            v-model="ids"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          >
+          </el-cascader>
+        </el-form-item>
+        <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-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-button @click="getDataListOverWrite()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @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>
@@ -16,20 +53,18 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="infoId" label="信息ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptId" label="部门ID" 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="sort" label="排序" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="逻辑删除标识" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" 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="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </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"></el-table-column>
+        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center"></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>
+            <el-button type="text" size="small" @click="addHandle(scope.row.infoId,'1')">{{ '查看' }}</el-button>
             <el-button v-if="$hasPermission('news:monthgridsort:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('news:monthgridsort:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
@@ -58,18 +93,89 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/monthgridsort/page',
+        getDataListURL: '/workRecord/monthgridsort/page',
         getDataListIsPage: true,
-        deleteURL: '/news/monthgridsort',
-        deleteIsBatch: true
+        deleteURL: '/workRecord/monthgridsort',
+        deleteIsBatch: true,
+        exportURL: '/workRecord/monthgridsort/export'
       },
       dataForm: {
-        id: ''
+        id: '',
+        deptName: '',
+        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()
+          }
+        }
+      },
+      ids: [],
+      options: []
+    }
+  },
+  watch: {
+    ids: function (val) {
+      if (val.length === 0) {
+        this.dataForm.deptId = ''
+      } else {
+        this.dataForm.deptId = this.ids[val.length - 1]
       }
     }
   },
   components: {
     AddOrUpdate
+  },
+  created: function () {
+    this.getDataList()
+    this.getOptions()
+  },
+  methods: {
+    addHandle (infoId, disabled) {
+      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/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {})
+    },
+    btKeyUpDeptName (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.deptName = e.target.value
+    },
+    btKeyUpNickName (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.nickName = e.target.value
+    }
   }
 }
 </script>
+<style>
+.el-tooltip__popper {
+  max-width: 80%;
+  color: #353434 !important;
+  background:#ffffff !important;
+  word-break:break-all;
+}
+</style>
diff --git a/src/views/modules/workRecord/monthgridsortDetail.vue b/src/views/modules/workRecord/monthgridsortDetail.vue
new file mode 100644
index 00000000..5a169c57
--- /dev/null
+++ b/src/views/modules/workRecord/monthgridsortDetail.vue
@@ -0,0 +1,197 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill"  v-loading="pageloading">
+  <div class="mod-__masteruserrelation}">
+    <!-- <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled"> -->
+      <div v-for="(item, index) in this.dataForm.sortList" :key="index">
+          <el-form :inline="true" :rules="dataRule" ref="item" :model="item" @keyup.enter.native="dataFormSubmitHandle()" :disabled="pageDisabled">
+            <el-form-item prop="deptId" :label="'第'+(index+1)+'名：'">
+              <el-cascader
+                ref="name"
+                v-model="item.deptId"
+                :options="options"
+                :props="{ checkStrictly: true }"
+                @change="(value,selectedData)=>{changeHandle(value,selectedData,index)}"
+                style="width:500px;"
+              >
+              </el-cascader>&emsp;
+              <el-button @click="deleteUserMethod(index)">{{"删除"}}</el-button>
+            </el-form-item>
+          </el-form>
+      </div>
+    <!-- </el-form> -->
+    <el-form>
+      <el-form-item style="margin-left:35px;">
+        <el-button type="primary" @click="addSort" v-if="!pageDisabled" :disabled="isAble">{{"添加排名-名额"}}</el-button>
+      </el-form-item>
+    </el-form>
+    <el-form>
+      <el-form-item style="margin-left:35px;">
+        <el-button type="primary" @click="backToUserRelationList">{{"返回"}}</el-button>
+        <el-button v-if="!pageDisabled" type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </div>
+  </el-card>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+import 'quill/dist/quill.snow.css'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        infoId: '',
+        sortList: [ { deptId: '', deptName: '', sort: '0' }, { deptId: '', deptName: '', sort: '1' }, { deptId: '', deptName: '', sort: '2' } ]
+      },
+      isAble: false,
+      pageDisabled: false,
+      pageloading: true,
+      options: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created: function () {
+    this.getOptions()
+  },
+  components: {},
+  mounted () {
+    if (this.$route.query.infoId !== '' && this.$route.query.infoId != null) {
+      this.dataForm.infoId = this.$route.query.infoId
+    }
+    if (this.$route.query.disabled === '0') {
+      this.pageDisabled = false
+    } else {
+      this.pageDisabled = true
+    }
+    if (this.$route.query.isAdd === '0') {
+      this.getInfo()
+    } else {
+      this.pageloading = false
+    }
+  },
+  methods: {
+    changeHandle (value, selectedData, index) {
+      this.dataForm.sortList[index].deptId = this.$refs['name'][index].getCheckedNodes()[0].value
+      this.dataForm.sortList[index].deptName = this.$refs['name'][index].getCheckedNodes()[0].label
+    },
+    // 添加一个名额
+    addSort () {
+      this.dataForm.sortList.push({ deptId: '', deptName: '', sort: '' })
+    },
+    // 删除一个名额
+    deleteUserMethod (index) {
+      if (this.dataForm.sortList.length === 1) {
+        this.dataForm.sortList = [{ deptId: '', deptName: '', sort: '' }]
+      } else {
+        this.dataForm.sortList.splice(index, 1)
+      }
+    },
+    init () {
+      this.dataForm.id = this.$route.query.id
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          // this.getInfo()
+        }
+      })
+    },
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {})
+    },
+    // 返回按钮点击事件
+    backToUserRelationList () {
+      this.$emit('refreshDataList')
+      if (this.$route.query.isAdd === '1') {
+        this.$parent.selectComponent = 'Monthrecordinfo'
+        this.$router.push({ path: '/workRecord-Monthrecordinforoute' })
+      } else {
+        this.$parent.selectComponent = 'Monthgridsort'
+        this.$router.push({ path: '/workRecord-Monthgridsortroute' })
+      }
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/workRecord/monthgridsort/${this.dataForm.infoId}`).then(({ data: res }) => {
+        this.pageloading = false
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      let remindInfo = ''
+      var deptIdArr = []
+      for (var i = 0; i < this.dataForm.sortList.length; i++) {
+        this.dataForm.sortList[i].sort = i
+        if (this.dataForm.sortList[i].deptId === '' || this.dataForm.sortList[i].deptId === null) {
+          remindInfo += '第' + (i + 1) + '名、'
+        }
+      }
+      if (remindInfo.length > 0) {
+        remindInfo = remindInfo.substring(0, remindInfo.length - 1)
+        this.$message.error(remindInfo + '信息不完善，请完善后提交！')
+        return false
+      }
+      for (var j = 0; j < this.dataForm.sortList.length; j++) {
+        let deptId = this.dataForm.sortList[j].deptId
+        let deptName = this.dataForm.sortList[j].deptName
+        let data = deptIdArr.find(function (value) {
+          return value === deptId
+        })
+        if (data) {
+          this.$message.error('第' + (j + 1) + '名：' + deptName + '已存在，请更换网格！')
+          return false
+        }
+        deptIdArr.push(this.dataForm.sortList[j].deptId)
+      }
+      this.isAble = true
+      this.$http[this.$route.query.isAdd === '1' ? 'post' : 'put']('/workRecord/monthgridsort/', this.dataForm).then(({ data: res }) => {
+        if (res.code !== 0) {
+          this.isAble = false
+          return this.$message.error(res.msg)
+        }
+        this.$message({
+          message: this.$t('prompt.success'),
+          type: 'success',
+          duration: 500,
+          onClose: () => {
+            this.isAble = false
+            this.visible = false
+            this.$emit('refreshDataList')
+            // 返回主列表
+            this.backToUserRelationList()
+          }
+        })
+      }).catch(() => {})
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/workRecord/monthgridsortroute.vue b/src/views/modules/workRecord/monthgridsortroute.vue
new file mode 100644
index 00000000..3db04ce4
--- /dev/null
+++ b/src/views/modules/workRecord/monthgridsortroute.vue
@@ -0,0 +1,29 @@
+<template>
+    <keep-alive include="monthgridsort">
+        <component :is="selectComponent"></component>
+    </keep-alive>
+</template>
+<script>
+import Monthgridsort from './monthgridsort'
+import MonthgridsortDetail from './monthgridsortDetail'
+export default {
+  data () {
+    return {
+      selectComponent: Monthgridsort
+    }
+  },
+  components: {
+    Monthgridsort,
+    MonthgridsortDetail
+  },
+  methods: {
+    init () {
+      this.selectComponent = Monthgridsort
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/workRecord/monthrecordinfo.vue b/src/views/modules/workRecord/monthrecordinfo.vue
index ac32cdb9..b8d2a82f 100644
--- a/src/views/modules/workRecord/monthrecordinfo.vue
+++ b/src/views/modules/workRecord/monthrecordinfo.vue
@@ -71,12 +71,14 @@
         <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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="250">
           <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>
             <el-button type="text" size="small" @click="addHandle(scope.row.id,'1')">{{ '查看' }}</el-button>
             <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addCaseHandle(scope.row.id,'0')">{{ '新建优秀案例' }}</el-button>
             <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addGridHandle(scope.row.id,'0')">{{ '新建示范网格' }}</el-button>
+            <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addPersonHandle(scope.row.id,'0')">{{ '新建身边榜样' }}</el-button>
+            <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addSortHandle(scope.row.id,'0')">{{ '新建网格排序' }}</el-button>
             <el-button v-if="$hasPermission('news:monthrecordinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
@@ -164,6 +166,14 @@ export default {
       this.$parent.selectComponent = 'MonthexcellentgridDetail'
       this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: '', disabled: disabled, infoId: infoId } })
     },
+    addPersonHandle (infoId, disabled) {
+      this.$parent.selectComponent = 'MonthexcellentpersonDetail'
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: '', disabled: disabled, infoId: infoId } })
+    },
+    addSortHandle (infoId, disabled) {
+      this.$parent.selectComponent = 'MonthgridsortDetail'
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { isAdd: '1', disabled: disabled, infoId: infoId } })
+    },
     getOptions () {
       this.$http
         .get(`/sys/user/deptOptions/getByLoginUser`)
diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue
index b2b38e6c..41d512e2 100644
--- a/src/views/modules/workRecord/monthrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue
@@ -44,7 +44,7 @@
           :on-error="handelError"
           :on-preview="handleFileCardPreview"
           style="width:480px">
-          <el-button size="small">点击上传</el-button>
+          <el-button size="small" :disabled="isAble">点击上传</el-button>
           <div slot="tip" class="el-upload__tip">支持.word、PDF、Excel文件</div>
         </el-upload>
       </el-form-item>
diff --git a/src/views/modules/workRecord/monthrecordinforoute.vue b/src/views/modules/workRecord/monthrecordinforoute.vue
index efb8a4fe..4df085c9 100644
--- a/src/views/modules/workRecord/monthrecordinforoute.vue
+++ b/src/views/modules/workRecord/monthrecordinforoute.vue
@@ -8,6 +8,8 @@ import Monthrecordinfo from './monthrecordinfo'
 import MonthrecordinfoDetail from './monthrecordinfoDetail'
 import MonthexcellentcaseDetail from './monthexcellentcaseDetail'
 import MonthexcellentgridDetail from './monthexcellentgridDetail'
+import MonthexcellentpersonDetail from './monthexcellentpersonDetail'
+import MonthgridsortDetail from './monthgridsortDetail'
 export default {
   data () {
     return {
@@ -18,7 +20,9 @@ export default {
     Monthrecordinfo,
     MonthrecordinfoDetail,
     MonthexcellentcaseDetail,
-    MonthexcellentgridDetail
+    MonthexcellentgridDetail,
+    MonthexcellentpersonDetail,
+    MonthgridsortDetail
   },
   methods: {
     init () {

From a8bf9fbee9239540f260ab8569b7bd0945a67026 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 14 Apr 2020 15:51:20 +0800
Subject: [PATCH 02/20] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=97=E5=AE=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/monthexcellentcase.vue   |  4 ++--
 src/views/modules/workRecord/monthexcellentgrid.vue   |  6 +++---
 src/views/modules/workRecord/monthexcellentperson.vue | 10 +++++-----
 src/views/modules/workRecord/monthgridsort.vue        |  4 ++--
 src/views/modules/workRecord/monthgridsortDetail.vue  |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/workRecord/monthexcellentcase.vue b/src/views/modules/workRecord/monthexcellentcase.vue
index 6671f577..a2053a8f 100644
--- a/src/views/modules/workRecord/monthexcellentcase.vue
+++ b/src/views/modules/workRecord/monthexcellentcase.vue
@@ -58,9 +58,9 @@
                 {{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="content" label="内容" header-align="center" align="center" show-overflow-tooltip></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="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">
           <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>
diff --git a/src/views/modules/workRecord/monthexcellentgrid.vue b/src/views/modules/workRecord/monthexcellentgrid.vue
index 84fb022c..f00812c1 100644
--- a/src/views/modules/workRecord/monthexcellentgrid.vue
+++ b/src/views/modules/workRecord/monthexcellentgrid.vue
@@ -58,10 +58,10 @@
                 {{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="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"></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">
           <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>
diff --git a/src/views/modules/workRecord/monthexcellentperson.vue b/src/views/modules/workRecord/monthexcellentperson.vue
index dcd165c5..901fa6dd 100644
--- a/src/views/modules/workRecord/monthexcellentperson.vue
+++ b/src/views/modules/workRecord/monthexcellentperson.vue
@@ -72,12 +72,12 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="name" label="榜样姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="partyFlag" label="党员标识" header-align="center" align="center"></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"></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="200"></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">
           <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>
diff --git a/src/views/modules/workRecord/monthgridsort.vue b/src/views/modules/workRecord/monthgridsort.vue
index cda70900..5c4258d5 100644
--- a/src/views/modules/workRecord/monthgridsort.vue
+++ b/src/views/modules/workRecord/monthgridsort.vue
@@ -59,8 +59,8 @@
             </template>
         </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"></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="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">
           <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>
diff --git a/src/views/modules/workRecord/monthgridsortDetail.vue b/src/views/modules/workRecord/monthgridsortDetail.vue
index 5a169c57..5cb80755 100644
--- a/src/views/modules/workRecord/monthgridsortDetail.vue
+++ b/src/views/modules/workRecord/monthgridsortDetail.vue
@@ -4,7 +4,7 @@
     <!-- <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled"> -->
       <div v-for="(item, index) in this.dataForm.sortList" :key="index">
           <el-form :inline="true" :rules="dataRule" ref="item" :model="item" @keyup.enter.native="dataFormSubmitHandle()" :disabled="pageDisabled">
-            <el-form-item prop="deptId" :label="'第'+(index+1)+'名：'">
+            <el-form-item prop="deptId" :label="'第'+(index+1)+'名：'" label-width="90px">
               <el-cascader
                 ref="name"
                 v-model="item.deptId"
@@ -20,12 +20,12 @@
       </div>
     <!-- </el-form> -->
     <el-form>
-      <el-form-item style="margin-left:35px;">
+      <el-form-item style="margin-left:250px;">
         <el-button type="primary" @click="addSort" v-if="!pageDisabled" :disabled="isAble">{{"添加排名-名额"}}</el-button>
       </el-form-item>
     </el-form>
     <el-form>
-      <el-form-item style="margin-left:35px;">
+      <el-form-item style="margin-left:18px;">
         <el-button type="primary" @click="backToUserRelationList">{{"返回"}}</el-button>
         <el-button v-if="!pageDisabled" type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
       </el-form-item>

From 7fe740527299edea3fed916219572152252b8078 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 14 Apr 2020 17:02:37 +0800
Subject: [PATCH 03/20] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/monthexcellentcase.vue       | 2 +-
 src/views/modules/workRecord/monthexcellentcaseDetail.vue | 4 ++--
 src/views/modules/workRecord/monthexcellentgrid.vue       | 2 +-
 src/views/modules/workRecord/monthexcellentgridDetail.vue | 2 +-
 src/views/modules/workRecord/monthexcellentperson.vue     | 2 +-
 .../modules/workRecord/monthexcellentpersonDetail.vue     | 4 ++--
 src/views/modules/workRecord/monthgridsort.vue            | 2 +-
 src/views/modules/workRecord/monthgridsortDetail.vue      | 8 +++++---
 src/views/modules/workRecord/monthrecordinfo.vue          | 2 +-
 src/views/modules/workRecord/monthrecordinfoDetail.vue    | 4 ++--
 10 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/workRecord/monthexcellentcase.vue b/src/views/modules/workRecord/monthexcellentcase.vue
index a2053a8f..fb306032 100644
--- a/src/views/modules/workRecord/monthexcellentcase.vue
+++ b/src/views/modules/workRecord/monthexcellentcase.vue
@@ -151,7 +151,7 @@ export default {
     },
     getOptions () {
       this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
diff --git a/src/views/modules/workRecord/monthexcellentcaseDetail.vue b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
index 57463faf..9c16424b 100644
--- a/src/views/modules/workRecord/monthexcellentcaseDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
@@ -12,7 +12,7 @@
           style="width:50%">
         </el-input>
       </el-form-item>
-      <el-form-item label="添加图片" v-loading="loading" prop="images" label-width="90px">
+      <el-form-item label="添加图片" v-loading="loading" prop="images" label-width="100px">
           <el-upload
             :action="uploadUrl"
             :class="{hide:hideUpload}"
@@ -32,7 +32,7 @@
           </el-dialog>
           <div><font color="gray">1~9张图</font></div>
       </el-form-item>
-      <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="90px">
+      <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="100px">
         <el-upload
           class="upload-demo"
           :action="uploadFileUrl"
diff --git a/src/views/modules/workRecord/monthexcellentgrid.vue b/src/views/modules/workRecord/monthexcellentgrid.vue
index f00812c1..4a459270 100644
--- a/src/views/modules/workRecord/monthexcellentgrid.vue
+++ b/src/views/modules/workRecord/monthexcellentgrid.vue
@@ -152,7 +152,7 @@ export default {
     },
     getOptions () {
       this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue
index 3e4c0f5a..bd5128a3 100644
--- a/src/views/modules/workRecord/monthexcellentgridDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue
@@ -304,7 +304,7 @@ export default {
     }, 1000, { 'leading': true, 'trailing': false }),
     getOptions () {
       this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
diff --git a/src/views/modules/workRecord/monthexcellentperson.vue b/src/views/modules/workRecord/monthexcellentperson.vue
index 901fa6dd..8a29e289 100644
--- a/src/views/modules/workRecord/monthexcellentperson.vue
+++ b/src/views/modules/workRecord/monthexcellentperson.vue
@@ -175,7 +175,7 @@ export default {
     },
     getOptions () {
       this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
diff --git a/src/views/modules/workRecord/monthexcellentpersonDetail.vue b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
index e9eb7582..d24bf24f 100644
--- a/src/views/modules/workRecord/monthexcellentpersonDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
@@ -24,7 +24,7 @@
           style="width:50%">
         </el-input>
       </el-form-item>
-      <el-form-item label="添加图片" v-loading="loading" prop="images" label-width="90px">
+      <el-form-item label="添加图片" v-loading="loading" prop="images" label-width="100px">
           <el-upload
             :action="uploadUrl"
             :class="{hide:hideUpload}"
@@ -44,7 +44,7 @@
           </el-dialog>
           <div><font color="gray">1~9张图</font></div>
       </el-form-item>
-      <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="90px">
+      <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="100px">
         <el-upload
           class="upload-demo"
           :action="uploadFileUrl"
diff --git a/src/views/modules/workRecord/monthgridsort.vue b/src/views/modules/workRecord/monthgridsort.vue
index 5c4258d5..5a6a3487 100644
--- a/src/views/modules/workRecord/monthgridsort.vue
+++ b/src/views/modules/workRecord/monthgridsort.vue
@@ -151,7 +151,7 @@ export default {
     },
     getOptions () {
       this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
diff --git a/src/views/modules/workRecord/monthgridsortDetail.vue b/src/views/modules/workRecord/monthgridsortDetail.vue
index 5cb80755..dc5b5508 100644
--- a/src/views/modules/workRecord/monthgridsortDetail.vue
+++ b/src/views/modules/workRecord/monthgridsortDetail.vue
@@ -6,10 +6,11 @@
           <el-form :inline="true" :rules="dataRule" ref="item" :model="item" @keyup.enter.native="dataFormSubmitHandle()" :disabled="pageDisabled">
             <el-form-item prop="deptId" :label="'第'+(index+1)+'名：'" label-width="90px">
               <el-cascader
+                :show-all-levels="false"
                 ref="name"
                 v-model="item.deptId"
                 :options="options"
-                :props="{ checkStrictly: true }"
+                :props="{ emitPath: false }"
                 @change="(value,selectedData)=>{changeHandle(value,selectedData,index)}"
                 style="width:500px;"
               >
@@ -47,7 +48,8 @@ export default {
       visible: false,
       dataForm: {
         infoId: '',
-        sortList: [ { deptId: '', deptName: '', sort: '0' }, { deptId: '', deptName: '', sort: '1' }, { deptId: '', deptName: '', sort: '2' } ]
+        sortList: [ { deptId: '', deptName: '', sort: '0' }, { deptId: '', deptName: '', sort: '1' },
+          { deptId: '', deptName: '', sort: '2' }, { deptId: '', deptName: '', sort: '3' }, { deptId: '', deptName: '', sort: '4' } ]
       },
       isAble: false,
       pageDisabled: false,
@@ -112,7 +114,7 @@ export default {
     },
     getOptions () {
       this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
diff --git a/src/views/modules/workRecord/monthrecordinfo.vue b/src/views/modules/workRecord/monthrecordinfo.vue
index b8d2a82f..ff2fcb10 100644
--- a/src/views/modules/workRecord/monthrecordinfo.vue
+++ b/src/views/modules/workRecord/monthrecordinfo.vue
@@ -176,7 +176,7 @@ export default {
     },
     getOptions () {
       this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue
index 41d512e2..8407e052 100644
--- a/src/views/modules/workRecord/monthrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue
@@ -12,7 +12,7 @@
           style="width:50%">
         </el-input>
       </el-form-item>
-      <el-form-item label="添加图片" v-loading="loading" prop="images" label-width="90px">
+      <el-form-item label="添加图片" v-loading="loading" prop="images" label-width="100px">
           <el-upload
             :action="uploadUrl"
             :class="{hide:hideUpload}"
@@ -32,7 +32,7 @@
           </el-dialog>
           <div><font color="gray">1~9张图</font></div>
       </el-form-item>
-      <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="90px">
+      <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="100px">
         <el-upload
           class="upload-demo"
           :action="uploadFileUrl"

From 0da2654dab3990c32190d5d05b56fd95b5158997 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 14 Apr 2020 19:24:32 +0800
Subject: [PATCH 04/20] =?UTF-8?q?=E9=9A=8F=E6=89=8B=E8=AE=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=82=E4=B8=8E=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workRecord/dailyrecordinfoDetail.vue      | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/workRecord/dailyrecordinfoDetail.vue b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
index 8c40bab6..00aab91d 100644
--- a/src/views/modules/workRecord/dailyrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
@@ -14,6 +14,18 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="所属机构" prop="joinDeptIdsArr" label-width="100px">
+        <el-cascader
+          ref="name"
+          clearable
+          v-model="dataForm.joinDeptIdsArr"
+          :options="options"
+          :props="{ multiple: true, emitPath: false, checkStrictly: false }"
+          @change="changeHandle"
+          style="width:50%;"
+        >
+        </el-cascader>
+      </el-form-item>
       <el-form-item label="会议时间" prop="dailyDate" label-width="100px">
           <el-date-picker v-model="dataForm.dailyDate"
                           type="datetime"
@@ -100,6 +112,9 @@ export default {
         userFace: '',
         deptName: '',
         deptId: '',
+        joinDeptIds: '',
+        joinDeptIdsArr: [], // '1169155547183017986','1169155603583823874'
+        joinDeptNames: '',
         dailyType: '',
         meetType: '',
         resourceId: '',
@@ -124,7 +139,8 @@ export default {
       uploadUrl: '',
       loading: false,
       dialogImageUrl: '',
-      dialogVisible: false
+      dialogVisible: false,
+      options: []
     }
   },
   computed: {
@@ -153,11 +169,15 @@ export default {
         ],
         content: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        joinDeptIdsArr: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
   },
   created: function () {
+    this.getOptions()
     this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadImg?token=${Cookies.get('token')}`
     // this.uploadUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadImg?token=${Cookies.get('token')}`
   },
@@ -173,6 +193,31 @@ export default {
     }
   },
   methods: {
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {})
+    },
+    changeHandle (value, selectedData) {
+      let joinDeptIds = ''
+      let joinDeptNames = ''
+      if (this.$refs['name'].getCheckedNodes() !== null) {
+        for (var i = 0; i < this.$refs['name'].getCheckedNodes().length; i++) {
+          if (!this.$refs['name'].getCheckedNodes()[i].hasChildren) {
+            joinDeptIds += this.$refs['name'].getCheckedNodes()[i].value + ','
+            joinDeptNames += this.$refs['name'].getCheckedNodes()[i].label + '、'
+          }
+        }
+      }
+      this.dataForm.joinDeptIds = joinDeptIds.length > 0 ? joinDeptIds.substring(0, joinDeptIds.length - 1) : joinDeptIds
+      this.dataForm.joinDeptNames = joinDeptNames.length > 0 ? joinDeptNames.substring(0, joinDeptNames.length - 1) : joinDeptNames
+    },
     init () {
       this.dataForm.id = this.$route.query.id
       this.visible = true
@@ -265,6 +310,7 @@ 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

From 3b20c62ca66476ec9d8466c4618b6c2f0c42699c Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 14 Apr 2020 19:52:58 +0800
Subject: [PATCH 05/20] =?UTF-8?q?=E9=9A=8F=E6=89=8B=E8=AE=B0=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E5=8F=82=E4=B8=8E?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/dailyrecordinfoDetail.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/workRecord/dailyrecordinfoDetail.vue b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
index 00aab91d..ba0acb9a 100644
--- a/src/views/modules/workRecord/dailyrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
@@ -21,7 +21,7 @@
           v-model="dataForm.joinDeptIdsArr"
           :options="options"
           :props="{ multiple: true, emitPath: false, checkStrictly: false }"
-          @change="changeHandle"
+          @visible-change="changeHandle"
           style="width:50%;"
         >
         </el-cascader>
@@ -36,8 +36,6 @@
           </el-date-picker>
       </el-form-item>
       <el-form-item label="地址" prop="address" label-width="100px">
-        <!-- <el-input v-model="dataForm.address" placeholder="地址" maxlength="60" style="width:50%"></el-input>
-        <div><font color="gray">默认定位，可手动修改</font></div> -->
         <el-input v-model="dataForm.address"
                                   type="text"
                                   clearable
@@ -113,7 +111,7 @@ export default {
         deptName: '',
         deptId: '',
         joinDeptIds: '',
-        joinDeptIdsArr: [], // '1169155547183017986','1169155603583823874'
+        joinDeptIdsArr: [],
         joinDeptNames: '',
         dailyType: '',
         meetType: '',

From 77173c4f750e1aa6128242a35567fe65d22947a3 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 14 Apr 2020 20:40:14 +0800
Subject: [PATCH 06/20] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workRecord/dailyrecordinfoDetail.vue      | 20 ++++++++++++++++---
 .../modules/workRecord/monthexcellentcase.vue |  4 ++--
 .../modules/workRecord/monthexcellentgrid.vue |  4 ++--
 .../modules/workRecord/monthgridsort.vue      | 12 +++++------
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/workRecord/dailyrecordinfoDetail.vue b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
index ba0acb9a..695b2e53 100644
--- a/src/views/modules/workRecord/dailyrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
@@ -14,14 +14,14 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="所属机构" prop="joinDeptIdsArr" label-width="100px">
+      <el-form-item label="参与部门" prop="joinDeptIdsArr" label-width="100px">
         <el-cascader
           ref="name"
-          clearable
           v-model="dataForm.joinDeptIdsArr"
           :options="options"
           :props="{ multiple: true, emitPath: false, checkStrictly: false }"
           @visible-change="changeHandle"
+          @remove-tag="removeTagHandle"
           style="width:50%;"
         >
         </el-cascader>
@@ -169,7 +169,7 @@ export default {
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         joinDeptIdsArr: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -216,6 +216,20 @@ export default {
       this.dataForm.joinDeptIds = joinDeptIds.length > 0 ? joinDeptIds.substring(0, joinDeptIds.length - 1) : joinDeptIds
       this.dataForm.joinDeptNames = joinDeptNames.length > 0 ? joinDeptNames.substring(0, joinDeptNames.length - 1) : joinDeptNames
     },
+    removeTagHandle (value) {
+      let joinDeptIds = ''
+      let joinDeptNames = ''
+      if (this.$refs['name'].getCheckedNodes() !== null) {
+        for (var i = 0; i < this.$refs['name'].getCheckedNodes().length; i++) {
+          if (!this.$refs['name'].getCheckedNodes()[i].hasChildren && this.$refs['name'].getCheckedNodes()[i].value !== value) {
+            joinDeptIds += this.$refs['name'].getCheckedNodes()[i].value + ','
+            joinDeptNames += this.$refs['name'].getCheckedNodes()[i].label + '、'
+          }
+        }
+      }
+      this.dataForm.joinDeptIds = joinDeptIds.length > 0 ? joinDeptIds.substring(0, joinDeptIds.length - 1) : joinDeptIds
+      this.dataForm.joinDeptNames = joinDeptNames.length > 0 ? joinDeptNames.substring(0, joinDeptNames.length - 1) : joinDeptNames
+    },
     init () {
       this.dataForm.id = this.$route.query.id
       this.visible = true
diff --git a/src/views/modules/workRecord/monthexcellentcase.vue b/src/views/modules/workRecord/monthexcellentcase.vue
index fb306032..e80bb812 100644
--- a/src/views/modules/workRecord/monthexcellentcase.vue
+++ b/src/views/modules/workRecord/monthexcellentcase.vue
@@ -3,8 +3,8 @@
     <div class="mod-news__monthexcellentcase}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <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>
+        <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>
         </el-form-item>
         <el-form-item label="发布人" prop="nickName" label-width="90px">
           <el-input v-model="dataForm.nickName" placeholder="发布人" clearable maxlength="10" @keyup.native="btKeyUpNickName" style="width:200px"></el-input>
diff --git a/src/views/modules/workRecord/monthexcellentgrid.vue b/src/views/modules/workRecord/monthexcellentgrid.vue
index 4a459270..a448b2cb 100644
--- a/src/views/modules/workRecord/monthexcellentgrid.vue
+++ b/src/views/modules/workRecord/monthexcellentgrid.vue
@@ -3,8 +3,8 @@
     <div class="mod-news__monthexcellentgrid}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <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>
+        <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>
         </el-form-item>
         <el-form-item label="发布人" prop="nickName" label-width="90px">
           <el-input v-model="dataForm.nickName" placeholder="发布人" clearable maxlength="10" @keyup.native="btKeyUpNickName" style="width:200px"></el-input>
diff --git a/src/views/modules/workRecord/monthgridsort.vue b/src/views/modules/workRecord/monthgridsort.vue
index 5a6a3487..4fd9267c 100644
--- a/src/views/modules/workRecord/monthgridsort.vue
+++ b/src/views/modules/workRecord/monthgridsort.vue
@@ -3,13 +3,9 @@
     <div class="mod-news__monthgridsort}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <div>
-        <el-form-item label="网格名称" prop="deptName" label-width="90px">
+        <!-- <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>
-        </el-form-item>
-        <el-form-item label="发布人" prop="nickName" label-width="90px">
-          <el-input v-model="dataForm.nickName" placeholder="发布人" clearable maxlength="10" @keyup.native="btKeyUpNickName" style="width:200px"></el-input>
-        </el-form-item>
-        </div>
+        </el-form-item> -->
         <el-form-item label="所属机构" label-width="90px">
           <el-cascader
             v-model="ids"
@@ -19,6 +15,10 @@
           >
           </el-cascader>
         </el-form-item>
+        <el-form-item label="发布人" prop="nickName" label-width="90px">
+          <el-input v-model="dataForm.nickName" placeholder="发布人" clearable maxlength="10" @keyup.native="btKeyUpNickName" style="width:200px"></el-input>
+        </el-form-item>
+        </div>
         <el-form-item label="发布时间" prop="startTime" label-width="90px">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"

From 8cf18e371cd7ee1bd9c298c213dd743ae9af4f4e Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 14 Apr 2020 20:59:59 +0800
Subject: [PATCH 07/20] =?UTF-8?q?=E7=A4=BA=E8=8C=83=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/monthexcellentgridDetail.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue
index bd5128a3..479d11de 100644
--- a/src/views/modules/workRecord/monthexcellentgridDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue
@@ -7,9 +7,10 @@
           ref="name"
           v-model="dataForm.deptId"
           :options="options"
-          :props="{ checkStrictly: true }"
+          :props="{ emitPath: false }"
           @change="changeHandle"
           clearable
+          style="width:50%"
         >
         </el-cascader>
       </el-form-item>

From ce76245ec0693678e618960fb86f93cd7d9bf91d Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 15 Apr 2020 10:36:06 +0800
Subject: [PATCH 08/20] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/workRecord/monthexcellentcase.vue |  1 +
 .../modules/workRecord/monthexcellentgrid.vue |  1 +
 .../workRecord/monthexcellentperson.vue       |  1 +
 .../modules/workRecord/monthgridsort.vue      |  1 +
 .../workRecord/monthgridsortDetail.vue        |  8 ++--
 .../modules/workRecord/monthrecordinfo.vue    | 18 ++++----
 .../workRecord/monthrecordinfoDetail.vue      | 46 ++++++++++++++++++-
 7 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/workRecord/monthexcellentcase.vue b/src/views/modules/workRecord/monthexcellentcase.vue
index e80bb812..bc68d1e9 100644
--- a/src/views/modules/workRecord/monthexcellentcase.vue
+++ b/src/views/modules/workRecord/monthexcellentcase.vue
@@ -58,6 +58,7 @@
                 {{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="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="250"></el-table-column>
         <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center" width="250"></el-table-column>
diff --git a/src/views/modules/workRecord/monthexcellentgrid.vue b/src/views/modules/workRecord/monthexcellentgrid.vue
index a448b2cb..66d5377b 100644
--- a/src/views/modules/workRecord/monthexcellentgrid.vue
+++ b/src/views/modules/workRecord/monthexcellentgrid.vue
@@ -58,6 +58,7 @@
                 {{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>
diff --git a/src/views/modules/workRecord/monthexcellentperson.vue b/src/views/modules/workRecord/monthexcellentperson.vue
index 8a29e289..92da00cf 100644
--- a/src/views/modules/workRecord/monthexcellentperson.vue
+++ b/src/views/modules/workRecord/monthexcellentperson.vue
@@ -72,6 +72,7 @@
                 {{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>
diff --git a/src/views/modules/workRecord/monthgridsort.vue b/src/views/modules/workRecord/monthgridsort.vue
index 4fd9267c..d0ac9811 100644
--- a/src/views/modules/workRecord/monthgridsort.vue
+++ b/src/views/modules/workRecord/monthgridsort.vue
@@ -58,6 +58,7 @@
                 {{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>
diff --git a/src/views/modules/workRecord/monthgridsortDetail.vue b/src/views/modules/workRecord/monthgridsortDetail.vue
index dc5b5508..9d841244 100644
--- a/src/views/modules/workRecord/monthgridsortDetail.vue
+++ b/src/views/modules/workRecord/monthgridsortDetail.vue
@@ -79,10 +79,10 @@ export default {
     } else {
       this.pageDisabled = true
     }
-    if (this.$route.query.isAdd === '0') {
-      this.getInfo()
-    } else {
+    if (this.$route.query.isAdd === '1') {
       this.pageloading = false
+    } else {
+      this.getInfo()
     }
   },
   methods: {
@@ -126,7 +126,7 @@ export default {
     // 返回按钮点击事件
     backToUserRelationList () {
       this.$emit('refreshDataList')
-      if (this.$route.query.isAdd === '1') {
+      if (this.$route.query.isAdd === '1' || this.$route.query.isAdd === '2') {
         this.$parent.selectComponent = 'Monthrecordinfo'
         this.$router.push({ path: '/workRecord-Monthrecordinforoute' })
       } else {
diff --git a/src/views/modules/workRecord/monthrecordinfo.vue b/src/views/modules/workRecord/monthrecordinfo.vue
index ff2fcb10..5224d0c7 100644
--- a/src/views/modules/workRecord/monthrecordinfo.vue
+++ b/src/views/modules/workRecord/monthrecordinfo.vue
@@ -49,7 +49,7 @@
           <el-button v-if="$hasPermission('news:monthrecordinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item> -->
         <el-form-item>
-          <el-button type="primary" @click="addHandle('','0')">{{ $t('add') }}</el-button>
+          <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>
@@ -73,12 +73,12 @@
         <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="250">
           <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>
-            <el-button type="text" size="small" @click="addHandle(scope.row.id,'1')">{{ '查看' }}</el-button>
-            <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addCaseHandle(scope.row.id,'0')">{{ '新建优秀案例' }}</el-button>
-            <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addGridHandle(scope.row.id,'0')">{{ '新建示范网格' }}</el-button>
-            <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addPersonHandle(scope.row.id,'0')">{{ '新建身边榜样' }}</el-button>
-            <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addSortHandle(scope.row.id,'0')">{{ '新建网格排序' }}</el-button>
+            <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addHandle(scope.row.id,'0',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="addHandle(scope.row.id,'1',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ '查看' }}</el-button>
+            <el-button :disabled="scope.row.isUpdate == '0' || scope.row.isHaveCase == '1'" type="text" size="small" @click="addCaseHandle(scope.row.id,'0')">{{ '新建优秀案例' }}</el-button>
+            <el-button :disabled="scope.row.isUpdate == '0' || scope.row.isHaveGrid == '1'" type="text" size="small" @click="addGridHandle(scope.row.id,'0')">{{ '新建示范网格' }}</el-button>
+            <el-button :disabled="scope.row.isUpdate == '0' || scope.row.isHavePerson == '1'" type="text" size="small" @click="addPersonHandle(scope.row.id,'0')">{{ '新建身边榜样' }}</el-button>
+            <el-button :disabled="scope.row.isUpdate == '0' || scope.row.isHaveSort == '1'" type="text" size="small" @click="addSortHandle(scope.row.id,'0')">{{ '新建网格排序' }}</el-button>
             <el-button v-if="$hasPermission('news:monthrecordinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
@@ -154,9 +154,9 @@ export default {
     this.getOptions()
   },
   methods: {
-    addHandle (id, disabled) {
+    addHandle (id, disabled, caseId, gridId, personId, isHaveSort) {
       this.$parent.selectComponent = 'MonthrecordinfoDetail'
-      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: id, disabled: disabled } })
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: id, disabled: disabled, caseId: caseId, gridId: gridId, personId: personId, isHaveSort: isHaveSort } })
     },
     addCaseHandle (infoId, disabled) {
       this.$parent.selectComponent = 'MonthexcellentcaseDetail'
diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue
index 8407e052..82467e86 100644
--- a/src/views/modules/workRecord/monthrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue
@@ -1,6 +1,14 @@
 <template>
   <el-card shadow="never" class="aui-card--fill"  v-loading="pageloading">
     <div class="mod-__masteruserrelation}">
+      <el-form>
+        <el-form-item style="margin-left:35px;">
+          <el-button v-if="isShowCaseBtn" type="primary" @click="goToCaseHandle()">{{ '优秀案例' }}</el-button>
+          <el-button v-if="isShowGridBtn" type="primary" @click="goToGridHandle()">{{ '示范网格' }}</el-button>
+          <el-button v-if="isShowPersonBtn" type="primary" @click="goToPersonHandle()">{{ '身边榜样' }}</el-button>
+          <el-button v-if="isShowSortBtn" type="primary" @click="goToSortHandle()">{{ '网格排序' }}</el-button>
+        </el-form-item>
+      </el-form>
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
       <el-form-item label="会议内容" prop="content" label-width="100px">
         <el-input
@@ -96,7 +104,11 @@ export default {
       dialogVisible: false,
       isAutoRemoveFile: true,
       fileloading: false,
-      pageloading: true
+      pageloading: true,
+      isShowCaseBtn: false,
+      isShowGridBtn: false,
+      isShowPersonBtn: false,
+      isShowSortBtn: false
     }
   },
   computed: {
@@ -131,8 +143,40 @@ export default {
     } else {
       this.pageloading = false
     }
+    if (this.$route.query.caseId !== '' && this.$route.query.caseId != null) {
+      // 展示优秀案例跳转按钮
+      this.isShowCaseBtn = true
+    }
+    if (this.$route.query.gridId !== '' && this.$route.query.gridId != null) {
+      // 展示示范网格跳转按钮
+      this.isShowGridBtn = true
+    }
+    if (this.$route.query.personId !== '' && this.$route.query.personId != null) {
+      // 展示身边榜样跳转按钮
+      this.isShowPersonBtn = true
+    }
+    if (this.$route.query.isHaveSort === '1') {
+      // 展示网格排序跳转按钮
+      this.isShowSortBtn = true
+    }
   },
   methods: {
+    goToCaseHandle () {
+      this.$parent.selectComponent = 'MonthexcellentcaseDetail'
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.$route.query.caseId, disabled: this.$route.query.disabled, infoId: this.$route.query.id } })
+    },
+    goToGridHandle () {
+      this.$parent.selectComponent = 'MonthexcellentgridDetail'
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.$route.query.gridId, disabled: this.$route.query.disabled, infoId: this.$route.query.id } })
+    },
+    goToPersonHandle () {
+      this.$parent.selectComponent = 'MonthexcellentpersonDetail'
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.$route.query.personId, disabled: this.$route.query.disabled, infoId: this.$route.query.id } })
+    },
+    goToSortHandle () {
+      this.$parent.selectComponent = 'MonthgridsortDetail'
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { isAdd: '2', disabled: this.$route.query.disabled, infoId: this.$route.query.id } })
+    },
     init () {
       this.dataForm.id = this.$route.query.id
       this.visible = true

From 4fe16046e715cd8873eb2ce0d7a53a405e5991e7 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 15 Apr 2020 14:01:36 +0800
Subject: [PATCH 09/20] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/monthgridsortDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/workRecord/monthgridsortDetail.vue b/src/views/modules/workRecord/monthgridsortDetail.vue
index 9d841244..dc461b15 100644
--- a/src/views/modules/workRecord/monthgridsortDetail.vue
+++ b/src/views/modules/workRecord/monthgridsortDetail.vue
@@ -6,7 +6,7 @@
           <el-form :inline="true" :rules="dataRule" ref="item" :model="item" @keyup.enter.native="dataFormSubmitHandle()" :disabled="pageDisabled">
             <el-form-item prop="deptId" :label="'第'+(index+1)+'名：'" label-width="90px">
               <el-cascader
-                :show-all-levels="false"
+                :show-all-levels="true"
                 ref="name"
                 v-model="item.deptId"
                 :options="options"

From 004d82a570d9fc94b3a7f38a6b41fec8d8f8d37e Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 15 Apr 2020 14:46:28 +0800
Subject: [PATCH 10/20] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/monthgridsortDetail.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/workRecord/monthgridsortDetail.vue b/src/views/modules/workRecord/monthgridsortDetail.vue
index dc461b15..e7b4aec4 100644
--- a/src/views/modules/workRecord/monthgridsortDetail.vue
+++ b/src/views/modules/workRecord/monthgridsortDetail.vue
@@ -88,7 +88,15 @@ export default {
   methods: {
     changeHandle (value, selectedData, index) {
       this.dataForm.sortList[index].deptId = this.$refs['name'][index].getCheckedNodes()[0].value
-      this.dataForm.sortList[index].deptName = this.$refs['name'][index].getCheckedNodes()[0].label
+      let pathLabels = this.$refs['name'][index].getCheckedNodes()[0].pathLabels
+      let labels = ''
+      for (var i = 0; i < pathLabels.length; i++) {
+        labels += pathLabels[i] + '/'
+      }
+      if (labels.length > 0) {
+        labels = labels.substring(0, labels.length - 1)
+      }
+      this.dataForm.sortList[index].deptName = labels
     },
     // 添加一个名额
     addSort () {

From 9b857a9efe29298c0e65721aacb7717a1e2170aa Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 15 Apr 2020 14:53:34 +0800
Subject: [PATCH 11/20] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/dailyrecordinfo.vue      | 2 +-
 src/views/modules/workRecord/monthexcellentcase.vue   | 2 +-
 src/views/modules/workRecord/monthexcellentgrid.vue   | 2 +-
 src/views/modules/workRecord/monthexcellentperson.vue | 2 +-
 src/views/modules/workRecord/monthgridsort.vue        | 2 +-
 src/views/modules/workRecord/monthrecordinfo.vue      | 2 +-
 src/views/modules/workRecord/weekrecordinfo.vue       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/workRecord/dailyrecordinfo.vue b/src/views/modules/workRecord/dailyrecordinfo.vue
index 3c5efede..87cd145d 100644
--- a/src/views/modules/workRecord/dailyrecordinfo.vue
+++ b/src/views/modules/workRecord/dailyrecordinfo.vue
@@ -229,7 +229,7 @@ export default {
 .el-tooltip__popper {
   max-width: 80%;
   color: #353434 !important;
-  background:#ffffff !important;
+  background:#e6eaebf3 !important;
   word-break:break-all;
 }
 </style>
diff --git a/src/views/modules/workRecord/monthexcellentcase.vue b/src/views/modules/workRecord/monthexcellentcase.vue
index bc68d1e9..ed309923 100644
--- a/src/views/modules/workRecord/monthexcellentcase.vue
+++ b/src/views/modules/workRecord/monthexcellentcase.vue
@@ -176,7 +176,7 @@ export default {
 .el-tooltip__popper {
   max-width: 80%;
   color: #353434 !important;
-  background:#ffffff !important;
+  background:#e6eaebf3 !important;
   word-break:break-all;
 }
 </style>
diff --git a/src/views/modules/workRecord/monthexcellentgrid.vue b/src/views/modules/workRecord/monthexcellentgrid.vue
index 66d5377b..385111e1 100644
--- a/src/views/modules/workRecord/monthexcellentgrid.vue
+++ b/src/views/modules/workRecord/monthexcellentgrid.vue
@@ -177,7 +177,7 @@ export default {
 .el-tooltip__popper {
   max-width: 80%;
   color: #353434 !important;
-  background:#ffffff !important;
+  background:#e6eaebf3 !important;
   word-break:break-all;
 }
 </style>
diff --git a/src/views/modules/workRecord/monthexcellentperson.vue b/src/views/modules/workRecord/monthexcellentperson.vue
index 92da00cf..3cb1196e 100644
--- a/src/views/modules/workRecord/monthexcellentperson.vue
+++ b/src/views/modules/workRecord/monthexcellentperson.vue
@@ -204,7 +204,7 @@ export default {
 .el-tooltip__popper {
   max-width: 80%;
   color: #353434 !important;
-  background:#ffffff !important;
+  background:#e6eaebf3 !important;
   word-break:break-all;
 }
 </style>
diff --git a/src/views/modules/workRecord/monthgridsort.vue b/src/views/modules/workRecord/monthgridsort.vue
index d0ac9811..ecdc6999 100644
--- a/src/views/modules/workRecord/monthgridsort.vue
+++ b/src/views/modules/workRecord/monthgridsort.vue
@@ -176,7 +176,7 @@ export default {
 .el-tooltip__popper {
   max-width: 80%;
   color: #353434 !important;
-  background:#ffffff !important;
+  background:#e6eaebf3 !important;
   word-break:break-all;
 }
 </style>
diff --git a/src/views/modules/workRecord/monthrecordinfo.vue b/src/views/modules/workRecord/monthrecordinfo.vue
index 5224d0c7..ed730801 100644
--- a/src/views/modules/workRecord/monthrecordinfo.vue
+++ b/src/views/modules/workRecord/monthrecordinfo.vue
@@ -208,7 +208,7 @@ export default {
 .el-tooltip__popper {
   max-width: 80%;
   color: #353434 !important;
-  background:#ffffff !important;
+  background:#e6eaebf3 !important;
   word-break:break-all;
 }
 </style>
diff --git a/src/views/modules/workRecord/weekrecordinfo.vue b/src/views/modules/workRecord/weekrecordinfo.vue
index 686f84a3..d595282b 100644
--- a/src/views/modules/workRecord/weekrecordinfo.vue
+++ b/src/views/modules/workRecord/weekrecordinfo.vue
@@ -189,7 +189,7 @@ export default {
 .el-tooltip__popper {
   max-width: 80%;
   color: #353434 !important;
-  background:#ffffff !important;
+  background:#e6eaebf3 !important;
   word-break:break-all;
 }
 </style>

From f6320e444c7c616b4845d1908cffabb545d1a93f Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 15 Apr 2020 17:57:24 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/monthexcellentcaseDetail.vue   | 1 +
 src/views/modules/workRecord/monthexcellentgridDetail.vue   | 1 +
 src/views/modules/workRecord/monthexcellentpersonDetail.vue | 1 +
 src/views/modules/workRecord/monthrecordinfoDetail.vue      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/views/modules/workRecord/monthexcellentcaseDetail.vue b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
index 9c16424b..d04bfde7 100644
--- a/src/views/modules/workRecord/monthexcellentcaseDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
@@ -35,6 +35,7 @@
       <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="100px">
         <el-upload
           class="upload-demo"
+          :disabled="isAble"
           :action="uploadFileUrl"
           :before-remove="beforeFileRemove"
           :file-list="dataForm.files"
diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue
index 479d11de..86d50971 100644
--- a/src/views/modules/workRecord/monthexcellentgridDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue
@@ -47,6 +47,7 @@
       <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="90px">
         <el-upload
           class="upload-demo"
+          :disabled="isAble"
           :action="uploadFileUrl"
           :before-remove="beforeFileRemove"
           :file-list="dataForm.files"
diff --git a/src/views/modules/workRecord/monthexcellentpersonDetail.vue b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
index d24bf24f..24a6de39 100644
--- a/src/views/modules/workRecord/monthexcellentpersonDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
@@ -47,6 +47,7 @@
       <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="100px">
         <el-upload
           class="upload-demo"
+          :disabled="isAble"
           :action="uploadFileUrl"
           :before-remove="beforeFileRemove"
           :file-list="dataForm.files"
diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue
index 82467e86..bd823ba6 100644
--- a/src/views/modules/workRecord/monthrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue
@@ -23,6 +23,7 @@
       <el-form-item label="添加图片" v-loading="loading" prop="images" label-width="100px">
           <el-upload
             :action="uploadUrl"
+            :disabled="isAble"
             :class="{hide:hideUpload}"
             list-type="picture-card"
             :file-list="dataForm.images"

From f5667c23372ce85094631f8dc883eb3786482f91 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 16 Apr 2020 10:42:14 +0800
Subject: [PATCH 13/20] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=B7=BB=E5=8A=A0=E6=89=80=E6=9C=89=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8ID=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/workRecord/monthexcellentgridDetail.vue   | 11 ++++++++++-
 src/views/modules/workRecord/monthgridsortDetail.vue  | 10 ++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue
index 86d50971..79f94376 100644
--- a/src/views/modules/workRecord/monthexcellentgridDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue
@@ -96,6 +96,7 @@ export default {
         endDate: '',
         content: '',
         state: '',
+        allDeptIds: '',
         images: [],
         files: []
       },
@@ -155,9 +156,17 @@ export default {
   },
   methods: {
     changeHandle (value, selectedData) {
-      console.log(this.$refs['name'].getCheckedNodes()[0])
       this.dataForm.deptName = this.$refs['name'].getCheckedNodes()[0].label
       this.dataForm.deptId = this.$refs['name'].getCheckedNodes()[0].value
+      let path = this.$refs['name'].getCheckedNodes()[0].path
+      let allDeptIds = ''
+      for (var i = 0; i < path.length; i++) {
+        allDeptIds += path[i] + ','
+      }
+      if (allDeptIds.length > 0) {
+        allDeptIds = allDeptIds.substring(0, allDeptIds.length - 1)
+      }
+      this.dataForm.allDeptIds = allDeptIds
     },
     init () {
       this.dataForm.id = this.$route.query.id
diff --git a/src/views/modules/workRecord/monthgridsortDetail.vue b/src/views/modules/workRecord/monthgridsortDetail.vue
index e7b4aec4..9b8ce393 100644
--- a/src/views/modules/workRecord/monthgridsortDetail.vue
+++ b/src/views/modules/workRecord/monthgridsortDetail.vue
@@ -97,6 +97,16 @@ export default {
         labels = labels.substring(0, labels.length - 1)
       }
       this.dataForm.sortList[index].deptName = labels
+      // 所有ID
+      let path = this.$refs['name'][index].getCheckedNodes()[0].path
+      let allDeptIds = ''
+      for (var j = 0; j < path.length; j++) {
+        allDeptIds += path[j] + ','
+      }
+      if (allDeptIds.length > 0) {
+        allDeptIds = allDeptIds.substring(0, allDeptIds.length - 1)
+      }
+      this.dataForm.sortList[index].allDeptIds = allDeptIds
     },
     // 添加一个名额
     addSort () {

From 32f67a094b79390c62553f632b59499a865150bb Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 16 Apr 2020 18:56:19 +0800
Subject: [PATCH 14/20] =?UTF-8?q?form=E8=A1=A8=E5=8D=95=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=9B=9E=E8=BD=A6=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/dailyrecordinfoDetail.vue      | 2 +-
 src/views/modules/workRecord/monthexcellentcaseDetail.vue   | 2 +-
 src/views/modules/workRecord/monthexcellentgridDetail.vue   | 2 +-
 src/views/modules/workRecord/monthexcellentpersonDetail.vue | 2 +-
 src/views/modules/workRecord/monthgridsortDetail.vue        | 2 +-
 src/views/modules/workRecord/monthrecordinfoDetail.vue      | 2 +-
 src/views/modules/workRecord/weekrecordinfoDetail.vue       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/workRecord/dailyrecordinfoDetail.vue b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
index 695b2e53..9135bea8 100644
--- a/src/views/modules/workRecord/dailyrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__masteruserrelation}">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
       <el-form-item v-if="dailyTypeArr.length > 0" label="随手记类型" prop="dailyType" label-width="100px">
         <el-select v-model="dataForm.dailyType" placeholder="随手记类型" @change="selectModel($event)" clearable style="width:50%">
           <el-option v-for="item in dailyTypeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
diff --git a/src/views/modules/workRecord/monthexcellentcaseDetail.vue b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
index d04bfde7..a5af5c9f 100644
--- a/src/views/modules/workRecord/monthexcellentcaseDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill"  v-loading="pageloading">
     <div class="mod-__masteruserrelation}">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
       <el-form-item label="会议内容" prop="content" label-width="100px">
         <el-input
           type="textarea"
diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue
index 79f94376..5c5dd5c9 100644
--- a/src/views/modules/workRecord/monthexcellentgridDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill"  v-loading="pageloading">
     <div class="mod-__masteruserrelation}">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
       <el-form-item label="选择网格" prop="deptId" label-width="90px">
         <el-cascader
           ref="name"
diff --git a/src/views/modules/workRecord/monthexcellentpersonDetail.vue b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
index 24a6de39..07fbc5c2 100644
--- a/src/views/modules/workRecord/monthexcellentpersonDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill"  v-loading="pageloading">
     <div class="mod-__masteruserrelation}">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
       <el-form-item label="榜样身份" prop="partyFlag" label-width="100px">
         <el-select v-model="dataForm.partyFlag" placeholder="榜样身份" style="width:300px" clearable>
           <el-option v-for="item in partyFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
diff --git a/src/views/modules/workRecord/monthgridsortDetail.vue b/src/views/modules/workRecord/monthgridsortDetail.vue
index 9b8ce393..ece02497 100644
--- a/src/views/modules/workRecord/monthgridsortDetail.vue
+++ b/src/views/modules/workRecord/monthgridsortDetail.vue
@@ -3,7 +3,7 @@
   <div class="mod-__masteruserrelation}">
     <!-- <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled"> -->
       <div v-for="(item, index) in this.dataForm.sortList" :key="index">
-          <el-form :inline="true" :rules="dataRule" ref="item" :model="item" @keyup.enter.native="dataFormSubmitHandle()" :disabled="pageDisabled">
+          <el-form :inline="true" :rules="dataRule" ref="item" :model="item" :disabled="pageDisabled">
             <el-form-item prop="deptId" :label="'第'+(index+1)+'名：'" label-width="90px">
               <el-cascader
                 :show-all-levels="true"
diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue
index bd823ba6..bbad444b 100644
--- a/src/views/modules/workRecord/monthrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue
@@ -9,7 +9,7 @@
           <el-button v-if="isShowSortBtn" type="primary" @click="goToSortHandle()">{{ '网格排序' }}</el-button>
         </el-form-item>
       </el-form>
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
       <el-form-item label="会议内容" prop="content" label-width="100px">
         <el-input
           type="textarea"
diff --git a/src/views/modules/workRecord/weekrecordinfoDetail.vue b/src/views/modules/workRecord/weekrecordinfoDetail.vue
index e7557a0b..eaf20094 100644
--- a/src/views/modules/workRecord/weekrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/weekrecordinfoDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill" v-loading="pageloading">
     <div class="mod-__masteruserrelation}">
-    <el-form label-width="370px" label-position="left" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :disabled="pageDisabled">
+    <el-form label-width="370px" label-position="left" :model="dataForm" :rules="dataRule" ref="dataForm" :disabled="pageDisabled">
       <div v-for="(item, index) in this.dataForm.totalConfigList" :key="index">
           <div>
           <el-form-item :label="item.totalDescribe" prop="showFlag" style="font-weight:bold;" :label-width="(item.totalDescribe.length*15+5)+'px'">

From e5758ab69585232545be869bf81aee68de8799f0 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 16 Apr 2020 20:15:13 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/dailyrecordinfoDetail.vue      | 1 +
 src/views/modules/workRecord/monthexcellentcaseDetail.vue   | 1 +
 src/views/modules/workRecord/monthexcellentgridDetail.vue   | 1 +
 src/views/modules/workRecord/monthexcellentpersonDetail.vue | 1 +
 src/views/modules/workRecord/monthrecordinfoDetail.vue      | 1 +
 src/views/modules/workRecord/weekrecordinfoDetail.vue       | 1 +
 6 files changed, 6 insertions(+)

diff --git a/src/views/modules/workRecord/dailyrecordinfoDetail.vue b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
index 9135bea8..f689b67c 100644
--- a/src/views/modules/workRecord/dailyrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
@@ -264,6 +264,7 @@ export default {
       if (!isJPG && !isPNG) {
         this.$message.error('上传文件必须是jpg、png格式!')
         this.loading = false
+        this.isAble = false
         return false
       }
     },
diff --git a/src/views/modules/workRecord/monthexcellentcaseDetail.vue b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
index a5af5c9f..b7dc7b88 100644
--- a/src/views/modules/workRecord/monthexcellentcaseDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
@@ -160,6 +160,7 @@ export default {
       if (!isJPG && !isPNG) {
         this.$message.error('上传文件必须是jpg、png格式!')
         this.loading = false
+        this.isAble = false
         return false
       }
     },
diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue
index 5c5dd5c9..73912fa8 100644
--- a/src/views/modules/workRecord/monthexcellentgridDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue
@@ -191,6 +191,7 @@ export default {
       if (!isJPG && !isPNG) {
         this.$message.error('上传文件必须是jpg、png格式!')
         this.loading = false
+        this.isAble = false
         return false
       }
     },
diff --git a/src/views/modules/workRecord/monthexcellentpersonDetail.vue b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
index 07fbc5c2..41afb1a3 100644
--- a/src/views/modules/workRecord/monthexcellentpersonDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
@@ -181,6 +181,7 @@ export default {
       if (!isJPG && !isPNG) {
         this.$message.error('上传文件必须是jpg、png格式!')
         this.loading = false
+        this.isAble = false
         return false
       }
     },
diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue
index bbad444b..afaf3da9 100644
--- a/src/views/modules/workRecord/monthrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue
@@ -201,6 +201,7 @@ export default {
       if (!isJPG && !isPNG) {
         this.$message.error('上传文件必须是jpg、png格式!')
         this.loading = false
+        this.isAble = false
         return false
       }
     },
diff --git a/src/views/modules/workRecord/weekrecordinfoDetail.vue b/src/views/modules/workRecord/weekrecordinfoDetail.vue
index eaf20094..54fc3749 100644
--- a/src/views/modules/workRecord/weekrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/weekrecordinfoDetail.vue
@@ -191,6 +191,7 @@ export default {
       if (!isJPG && !isPNG) {
         this.$message.error('上传文件必须是jpg、png格式!')
         this.loading = false
+        this.isAble = false
         return false
       }
     },

From 54cb0c406ae5b7f431114e3bb361e8fc0aebed73 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 17 Apr 2020 13:30:29 +0800
Subject: [PATCH 16/20] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E9=A1=B5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workRecord/monthrecordinfoDetail.vue       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue
index afaf3da9..fa4c1743 100644
--- a/src/views/modules/workRecord/monthrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue
@@ -109,7 +109,11 @@ export default {
       isShowCaseBtn: false,
       isShowGridBtn: false,
       isShowPersonBtn: false,
-      isShowSortBtn: false
+      isShowSortBtn: false,
+      caseId: '',
+      gridId: '',
+      personId: '',
+      queryDisabled: ''
     }
   },
   computed: {
@@ -131,6 +135,7 @@ export default {
     MapSelect
   },
   mounted () {
+    this.queryDisabled = this.$route.query.disabled
     if (this.$route.query.disabled === '0') {
       this.pageDisabled = false
       this.hideUpload = false
@@ -147,14 +152,17 @@ export default {
     if (this.$route.query.caseId !== '' && this.$route.query.caseId != null) {
       // 展示优秀案例跳转按钮
       this.isShowCaseBtn = true
+      this.caseId = this.$route.query.caseId
     }
     if (this.$route.query.gridId !== '' && this.$route.query.gridId != null) {
       // 展示示范网格跳转按钮
       this.isShowGridBtn = true
+      this.gridId = this.$route.query.gridId
     }
     if (this.$route.query.personId !== '' && this.$route.query.personId != null) {
       // 展示身边榜样跳转按钮
       this.isShowPersonBtn = true
+      this.personId = this.$route.query.personId
     }
     if (this.$route.query.isHaveSort === '1') {
       // 展示网格排序跳转按钮
@@ -164,19 +172,19 @@ export default {
   methods: {
     goToCaseHandle () {
       this.$parent.selectComponent = 'MonthexcellentcaseDetail'
-      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.$route.query.caseId, disabled: this.$route.query.disabled, infoId: this.$route.query.id } })
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.caseId, disabled: this.queryDisabled, infoId: this.dataForm.id } })
     },
     goToGridHandle () {
       this.$parent.selectComponent = 'MonthexcellentgridDetail'
-      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.$route.query.gridId, disabled: this.$route.query.disabled, infoId: this.$route.query.id } })
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.gridId, disabled: this.queryDisabled, infoId: this.dataForm.id } })
     },
     goToPersonHandle () {
       this.$parent.selectComponent = 'MonthexcellentpersonDetail'
-      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.$route.query.personId, disabled: this.$route.query.disabled, infoId: this.$route.query.id } })
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.personId, disabled: this.queryDisabled, infoId: this.dataForm.id } })
     },
     goToSortHandle () {
       this.$parent.selectComponent = 'MonthgridsortDetail'
-      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { isAdd: '2', disabled: this.$route.query.disabled, infoId: this.$route.query.id } })
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { isAdd: '2', disabled: this.queryDisabled, infoId: this.dataForm.id } })
     },
     init () {
       this.dataForm.id = this.$route.query.id

From 1a9de8b1e844ba9cfd17e1ac14ea21ba574560b0 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 17 Apr 2020 18:13:00 +0800
Subject: [PATCH 17/20] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=ACBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workRecord/dailyrecordinfoDetail.vue       | 16 ++++++++++++++++
 .../workRecord/monthexcellentcaseDetail.vue    | 18 ++++++++++++++++--
 .../workRecord/monthexcellentgridDetail.vue    | 18 ++++++++++++++++--
 .../workRecord/monthexcellentpersonDetail.vue  | 18 ++++++++++++++++--
 .../modules/workRecord/monthgridsortDetail.vue |  6 ++++--
 .../workRecord/monthrecordinfoDetail.vue       | 17 +++++++++++++++++
 .../workRecord/weekrecordinfoDetail.vue        | 16 ++++++++++++++++
 7 files changed, 101 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/workRecord/dailyrecordinfoDetail.vue b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
index f689b67c..1b16b51c 100644
--- a/src/views/modules/workRecord/dailyrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
@@ -60,6 +60,7 @@
       </el-form-item>
       <el-form-item label="添加图片" v-loading="loading" prop="images" label-width="100px">
           <el-upload
+            ref="upload"
             :action="uploadUrl"
             :class="{hide:hideUpload}"
             list-type="picture-card"
@@ -271,9 +272,24 @@ export default {
     handleAvatarSuccess (res, file) {
       this.loading = false
       this.isAble = false
+      if (res === null || res.data === null || res.data.imgUrl === null) {
+        this.$message.error('文件上传失败！')
+        this.handleErrorRemove(file)
+        return false
+      }
       this.dataForm.images.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 1 })
       this.hideUpload = this.dataForm.images.length >= 9
     },
+    handleErrorRemove (file) {
+      // 实现缩略图模板时删除文件
+      let fileList = this.$refs.upload.uploadFiles
+      for (var i = 0; i < fileList.length; i++) {
+        let item = fileList[i]
+        if (item.url === file.url) {
+          fileList.splice(i, 1)
+        }
+      }
+    },
     handelError () {
       this.loading = false
       this.isAble = false
diff --git a/src/views/modules/workRecord/monthexcellentcaseDetail.vue b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
index b7dc7b88..1fd51df4 100644
--- a/src/views/modules/workRecord/monthexcellentcaseDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
@@ -35,6 +35,7 @@
       <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="100px">
         <el-upload
           class="upload-demo"
+          ref="upload"
           :disabled="isAble"
           :action="uploadFileUrl"
           :before-remove="beforeFileRemove"
@@ -97,7 +98,8 @@ export default {
       dialogVisible: false,
       isAutoRemoveFile: true,
       fileloading: false,
-      pageloading: true
+      pageloading: true,
+      isGoToInfo: '0' // 是否回到月报列表：0否；1是
     }
   },
   computed: {
@@ -134,6 +136,7 @@ export default {
     }
     if (this.$route.query.infoId !== '' && this.$route.query.infoId != null) {
       this.dataForm.infoId = this.$route.query.infoId
+      this.isGoToInfo = '1'
     }
   },
   methods: {
@@ -219,11 +222,22 @@ export default {
         }
       }
     },
+    handleErrorRemove (file) {
+      // 实现缩略图模板时删除文件
+      let fileList = this.$refs.upload.uploadFiles
+      for (var i = 0; i < fileList.length; i++) {
+        let item = fileList[i]
+        if (item.url === file.url) {
+          fileList.splice(i, 1)
+        }
+      }
+    },
     handleAvatarFileSuccess (res, file) {
       this.fileloading = false
       this.isAble = false
       if (res === null || res.data === null || res.data.imgUrl === null) {
         this.$message.error('文件上传失败！')
+        this.handleErrorRemove(file)
         return false
       }
       this.dataForm.files.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 2, recordType: 2, fileName: res.data.fileName, name: res.data.fileName })
@@ -231,7 +245,7 @@ export default {
     // 返回按钮点击事件
     backToUserRelationList () {
       this.$emit('refreshDataList')
-      if (this.$route.query.infoId !== '' && this.$route.query.infoId != null) {
+      if (this.isGoToInfo === '1') {
         this.$parent.selectComponent = 'Monthrecordinfo'
         this.$router.push({ path: '/workRecord-Monthrecordinforoute' })
       } else {
diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue
index 73912fa8..77c4e4a4 100644
--- a/src/views/modules/workRecord/monthexcellentgridDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue
@@ -47,6 +47,7 @@
       <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="90px">
         <el-upload
           class="upload-demo"
+          ref="upload"
           :disabled="isAble"
           :action="uploadFileUrl"
           :before-remove="beforeFileRemove"
@@ -111,7 +112,8 @@ export default {
       isAutoRemoveFile: true,
       fileloading: false,
       pageloading: true,
-      options: []
+      options: [],
+      isGoToInfo: '0' // 是否回到月报列表：0否；1是
     }
   },
   computed: {
@@ -152,6 +154,7 @@ export default {
     }
     if (this.$route.query.infoId !== '' && this.$route.query.infoId != null) {
       this.dataForm.infoId = this.$route.query.infoId
+      this.isGoToInfo = '1'
     }
   },
   methods: {
@@ -250,11 +253,22 @@ export default {
         }
       }
     },
+    handleErrorRemove (file) {
+      // 实现缩略图模板时删除文件
+      let fileList = this.$refs.upload.uploadFiles
+      for (var i = 0; i < fileList.length; i++) {
+        let item = fileList[i]
+        if (item.url === file.url) {
+          fileList.splice(i, 1)
+        }
+      }
+    },
     handleAvatarFileSuccess (res, file) {
       this.fileloading = false
       this.isAble = false
       if (res === null || res.data === null || res.data.imgUrl === null) {
         this.$message.error('文件上传失败！')
+        this.handleErrorRemove(file)
         return false
       }
       this.dataForm.files.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 2, recordType: 4, fileName: res.data.fileName, name: res.data.fileName })
@@ -262,7 +276,7 @@ export default {
     // 返回按钮点击事件
     backToUserRelationList () {
       this.$emit('refreshDataList')
-      if (this.$route.query.infoId !== '' && this.$route.query.infoId != null) {
+      if (this.isGoToInfo === '1') {
         this.$parent.selectComponent = 'Monthrecordinfo'
         this.$router.push({ path: '/workRecord-Monthrecordinforoute' })
       } else {
diff --git a/src/views/modules/workRecord/monthexcellentpersonDetail.vue b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
index 41afb1a3..30b2d244 100644
--- a/src/views/modules/workRecord/monthexcellentpersonDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentpersonDetail.vue
@@ -47,6 +47,7 @@
       <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="100px">
         <el-upload
           class="upload-demo"
+          ref="upload"
           :disabled="isAble"
           :action="uploadFileUrl"
           :before-remove="beforeFileRemove"
@@ -108,7 +109,8 @@ export default {
       dialogVisible: false,
       isAutoRemoveFile: true,
       fileloading: false,
-      pageloading: true
+      pageloading: true,
+      isGoToInfo: '0' // 是否回到月报列表：0否；1是
     }
   },
   computed: {
@@ -155,6 +157,7 @@ export default {
     }
     if (this.$route.query.infoId !== '' && this.$route.query.infoId != null) {
       this.dataForm.infoId = this.$route.query.infoId
+      this.isGoToInfo = '1'
     }
   },
   methods: {
@@ -240,11 +243,22 @@ export default {
         }
       }
     },
+    handleErrorRemove (file) {
+      // 实现缩略图模板时删除文件
+      let fileList = this.$refs.upload.uploadFiles
+      for (var i = 0; i < fileList.length; i++) {
+        let item = fileList[i]
+        if (item.url === file.url) {
+          fileList.splice(i, 1)
+        }
+      }
+    },
     handleAvatarFileSuccess (res, file) {
       this.fileloading = false
       this.isAble = false
       if (res === null || res.data === null || res.data.imgUrl === null) {
         this.$message.error('文件上传失败！')
+        this.handleErrorRemove(file)
         return false
       }
       this.dataForm.files.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 2, recordType: 3, fileName: res.data.fileName, name: res.data.fileName })
@@ -252,7 +266,7 @@ export default {
     // 返回按钮点击事件
     backToUserRelationList () {
       this.$emit('refreshDataList')
-      if (this.$route.query.infoId !== '' && this.$route.query.infoId != null) {
+      if (this.isGoToInfo === '1') {
         this.$parent.selectComponent = 'Monthrecordinfo'
         this.$router.push({ path: '/workRecord-Monthrecordinforoute' })
       } else {
diff --git a/src/views/modules/workRecord/monthgridsortDetail.vue b/src/views/modules/workRecord/monthgridsortDetail.vue
index ece02497..7deeb817 100644
--- a/src/views/modules/workRecord/monthgridsortDetail.vue
+++ b/src/views/modules/workRecord/monthgridsortDetail.vue
@@ -54,7 +54,8 @@ export default {
       isAble: false,
       pageDisabled: false,
       pageloading: true,
-      options: []
+      options: [],
+      isAdd: '0' // 是不是新增：0否；1是
     }
   },
   computed: {
@@ -71,6 +72,7 @@ export default {
   },
   components: {},
   mounted () {
+    this.isAdd = this.$route.query.isAdd
     if (this.$route.query.infoId !== '' && this.$route.query.infoId != null) {
       this.dataForm.infoId = this.$route.query.infoId
     }
@@ -144,7 +146,7 @@ export default {
     // 返回按钮点击事件
     backToUserRelationList () {
       this.$emit('refreshDataList')
-      if (this.$route.query.isAdd === '1' || this.$route.query.isAdd === '2') {
+      if (this.isAdd === '1' || this.isAdd === '2') {
         this.$parent.selectComponent = 'Monthrecordinfo'
         this.$router.push({ path: '/workRecord-Monthrecordinforoute' })
       } else {
diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue
index fa4c1743..bd32fa9d 100644
--- a/src/views/modules/workRecord/monthrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue
@@ -44,6 +44,7 @@
       <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="100px">
         <el-upload
           class="upload-demo"
+          ref="upload"
           :action="uploadFileUrl"
           :before-remove="beforeFileRemove"
           :file-list="dataForm.files"
@@ -216,6 +217,11 @@ export default {
     handleAvatarSuccess (res, file) {
       this.loading = false
       this.isAble = false
+      if (res === null || res.data === null || res.data.imgUrl === null) {
+        this.$message.error('文件上传失败！')
+        this.handleErrorRemove(file)
+        return false
+      }
       this.dataForm.images.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 1, recordType: 1, fileName: res.data.fileName })
       this.hideUpload = this.dataForm.images.length >= 9
     },
@@ -268,11 +274,22 @@ export default {
         }
       }
     },
+    handleErrorRemove (file) {
+      // 实现缩略图模板时删除文件
+      let fileList = this.$refs.upload.uploadFiles
+      for (var i = 0; i < fileList.length; i++) {
+        let item = fileList[i]
+        if (item.url === file.url) {
+          fileList.splice(i, 1)
+        }
+      }
+    },
     handleAvatarFileSuccess (res, file) {
       this.fileloading = false
       this.isAble = false
       if (res === null || res.data === null || res.data.imgUrl === null) {
         this.$message.error('文件上传失败！')
+        this.handleErrorRemove(file)
         return false
       }
       this.dataForm.files.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 2, recordType: 1, fileName: res.data.fileName, name: res.data.fileName })
diff --git a/src/views/modules/workRecord/weekrecordinfoDetail.vue b/src/views/modules/workRecord/weekrecordinfoDetail.vue
index 54fc3749..7bf864a7 100644
--- a/src/views/modules/workRecord/weekrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/weekrecordinfoDetail.vue
@@ -53,6 +53,7 @@
       </el-form-item>
       <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="90px">
         <el-upload
+          ref="upload"
           class="upload-demo"
           :action="uploadFileUrl"
           :before-remove="beforeFileRemove"
@@ -198,6 +199,11 @@ export default {
     handleAvatarSuccess (res, file) {
       this.loading = false
       this.isAble = false
+      if (res === null || res.data === null || res.data.imgUrl === null) {
+        this.$message.error('文件上传失败！')
+        this.handleErrorRemove(file)
+        return false
+      }
       this.dataForm.images.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 1, fileName: res.data.fileName })
       this.hideUpload = this.dataForm.images.length >= 9
     },
@@ -207,6 +213,16 @@ export default {
       this.isAble = false
       this.$message.error('上传文件失败!')
     },
+    handleErrorRemove (file) {
+      // 实现缩略图模板时删除文件
+      let fileList = this.$refs.upload.uploadFiles
+      for (var i = 0; i < fileList.length; i++) {
+        let item = fileList[i]
+        if (item.url === file.url) {
+          fileList.splice(i, 1)
+        }
+      }
+    },
     handleRemove (file, fileList) {
       for (var i = 0; i < this.dataForm.images.length; i++) {
         let item = this.dataForm.images[i]

From ca7fdbb2a6a040d4b9e8c424b6ee89a3498606d1 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 20 Apr 2020 15:59:32 +0800
Subject: [PATCH 18/20] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/evaluateinfo.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/custom/evaluateinfo.vue b/src/views/modules/custom/evaluateinfo.vue
index c608d843..bdf9e473 100644
--- a/src/views/modules/custom/evaluateinfo.vue
+++ b/src/views/modules/custom/evaluateinfo.vue
@@ -59,7 +59,7 @@
                 align="center"
                 show-overflow-tooltip>
           <template slot-scope="scope">
-            <div v-for="(item) in scope.row.optionsList">
+            <div v-for="(item, index) in scope.row.optionsList" :key="index">
               <div v-if="item.optionId == option.optionId">
                 <div v-if="item.selectFlag == 1 && item.roleCode == 1">
                   <img src="@/assets/img/like.png">
@@ -73,8 +73,9 @@
           </template>
         </el-table-column>
         <el-table-column prop="content" label="评价内容" :show-overflow-tooltip="true" min-width="150" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="60">
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="120">
           <template slot-scope="scope">
+            <el-button v-if="$hasPermission('custom:evaluateinfo:delete')" type="text" size="small" @click="open(scope.row.content)">{{ '查看内容' }}</el-button>
             <el-button v-if="$hasPermission('custom:evaluateinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
@@ -143,6 +144,12 @@ export default {
     this.getDataList()
   },
   methods: {
+    open (content) {
+      this.$alert(content, '内容', {
+        confirmButtonText: '确定',
+        callback: action => {}
+      })
+    },
     getOptionsList () {
       this.$http.get(`/custom/evaluateoption/optionShowList`).then(({ data: res }) => {
         if (res.code !== 0) {

From 675bbc1a095ecf0de96c5d47da88668fe20b7ee3 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 20 Apr 2020 17:04:46 +0800
Subject: [PATCH 19/20] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/workRecord/monthrecordinfo.vue    | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/workRecord/monthrecordinfo.vue b/src/views/modules/workRecord/monthrecordinfo.vue
index ed730801..ee6d9daf 100644
--- a/src/views/modules/workRecord/monthrecordinfo.vue
+++ b/src/views/modules/workRecord/monthrecordinfo.vue
@@ -73,13 +73,24 @@
         <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="250">
           <template slot-scope="scope">
-            <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addHandle(scope.row.id,'0',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ $t('update') }}</el-button>
-            <el-button type="text" size="small" @click="addHandle(scope.row.id,'1',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ '查看' }}</el-button>
-            <el-button :disabled="scope.row.isUpdate == '0' || scope.row.isHaveCase == '1'" type="text" size="small" @click="addCaseHandle(scope.row.id,'0')">{{ '新建优秀案例' }}</el-button>
-            <el-button :disabled="scope.row.isUpdate == '0' || scope.row.isHaveGrid == '1'" type="text" size="small" @click="addGridHandle(scope.row.id,'0')">{{ '新建示范网格' }}</el-button>
-            <el-button :disabled="scope.row.isUpdate == '0' || scope.row.isHavePerson == '1'" type="text" size="small" @click="addPersonHandle(scope.row.id,'0')">{{ '新建身边榜样' }}</el-button>
-            <el-button :disabled="scope.row.isUpdate == '0' || scope.row.isHaveSort == '1'" type="text" size="small" @click="addSortHandle(scope.row.id,'0')">{{ '新建网格排序' }}</el-button>
+            <div>
+              <el-button size="mini" type="primary" icon="el-icon-plus" :disabled="scope.row.isUpdate == '0' || scope.row.isHavePerson == '1'" @click="addPersonHandle(scope.row.id,'0')">{{ '身边榜样' }}</el-button>
+              <el-button size="mini" type="primary" icon="el-icon-plus" :disabled="scope.row.isUpdate == '0' || scope.row.isHaveCase == '1'" @click="addCaseHandle(scope.row.id,'0')">{{ '优秀案例' }}</el-button>
+            </div>
+            <div style="width:1px;height:5px;"></div>
+            <div>
+              <el-button size="mini" type="primary" icon="el-icon-plus" :disabled="scope.row.isUpdate == '0' || scope.row.isHaveGrid == '1'" @click="addGridHandle(scope.row.id,'0')">{{ '示范网格' }}</el-button>
+              <el-button size="mini" type="primary" icon="el-icon-plus" :disabled="scope.row.isUpdate == '0' || scope.row.isHaveSort == '1'" @click="addSortHandle(scope.row.id,'0')">{{ '网格排序' }}</el-button>
+            </div>
+            <div style="width:1px;height:5px;"></div>
+            <!-- <div>
             <el-button v-if="$hasPermission('news:monthrecordinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            </div>
+            <div style="width:1px;height:1px;"></div> -->
+            <div>
+              <el-button size="mini" type="primary" icon="el-icon-edit" :disabled="scope.row.isUpdate == '0'" @click="addHandle(scope.row.id,'0',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ $t('修改月报') }}</el-button>
+              <el-button size="mini" type="primary" icon="el-icon-search" @click="addHandle(scope.row.id,'1',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ '查看月报' }}</el-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>

From 42ba7f750a8fe99d35737c8424103e6abcd9f752 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 21 Apr 2020 10:56:15 +0800
Subject: [PATCH 20/20] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workRecord/monthrecordinfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/workRecord/monthrecordinfo.vue b/src/views/modules/workRecord/monthrecordinfo.vue
index ee6d9daf..e3d9672b 100644
--- a/src/views/modules/workRecord/monthrecordinfo.vue
+++ b/src/views/modules/workRecord/monthrecordinfo.vue
@@ -88,7 +88,7 @@
             </div>
             <div style="width:1px;height:1px;"></div> -->
             <div>
-              <el-button size="mini" type="primary" icon="el-icon-edit" :disabled="scope.row.isUpdate == '0'" @click="addHandle(scope.row.id,'0',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ $t('修改月报') }}</el-button>
+              <el-button size="mini" type="primary" icon="el-icon-edit" :disabled="scope.row.isUpdate == '0'" @click="addHandle(scope.row.id,'0',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ '修改月报' }}</el-button>
               <el-button size="mini" type="primary" icon="el-icon-search" @click="addHandle(scope.row.id,'1',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ '查看月报' }}</el-button>
             </div>
           </template>