From 28453725444ca5a85cdad8531950368521b21fa4 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 6 Feb 2020 14:40:10 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/evaluatedept.vue     | 20 +++++-
 .../custom/evaluateoption-add-or-update.vue   | 21 ++++---
 src/views/modules/custom/evaluateoption.vue   | 63 +++++++++++++++++--
 3 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/custom/evaluatedept.vue b/src/views/modules/custom/evaluatedept.vue
index 241b101c..9dd9cfd1 100644
--- a/src/views/modules/custom/evaluatedept.vue
+++ b/src/views/modules/custom/evaluatedept.vue
@@ -2,8 +2,11 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-custom__evaluatedept}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item> -->
+        <el-form-item label="街道名称" prop="deptName">
+          <el-input v-model="dataForm.deptName" placeholder="请输入" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
@@ -25,6 +28,7 @@
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('custom:evaluatedept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('custom:evaluatedept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="manageHandle(scope.row.id,scope.row.deptId)">管理</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -39,6 +43,7 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <evaluateofficer v-if="evaluateofficerVisible" ref="evaluateofficer" @refreshDataList="getDataList"></evaluateofficer>
     </div>
   </el-card>
 </template>
@@ -46,6 +51,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './evaluatedept-add-or-update'
+import Evaluateofficer from './evaluateofficer'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -58,11 +64,19 @@ export default {
       },
       dataForm: {
         id: ''
-      }
+      },
+      evaluateofficerVisible: false
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    Evaluateofficer
+  },
+  methods: {
+    manageHandle (id, deptId) {
+      this.$parent.selectComponent = 'Evaluateofficer'
+      this.$router.push({ path: '/custom-evaluateofficer', query: { id: id } })
+    }
   }
 }
 </script>
diff --git a/src/views/modules/custom/evaluateoption-add-or-update.vue b/src/views/modules/custom/evaluateoption-add-or-update.vue
index c960fb84..30cda96b 100644
--- a/src/views/modules/custom/evaluateoption-add-or-update.vue
+++ b/src/views/modules/custom/evaluateoption-add-or-update.vue
@@ -2,16 +2,19 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
       <el-form-item label="类别" prop="roleCode">
-          <el-input v-model="dataForm.roleCode" placeholder="权限编码（1.点赞，2.吐槽）"></el-input>
-      </el-form-item>
+          <el-select v-model="dataForm.roleCode" placeholder="类别" clearable=true>
+            <el-option v-for="item in roleFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
       <el-form-item label="是否启用" prop="available">
-          <el-input v-model="dataForm.available" placeholder="可用标记(0-不可用，1-可用)"></el-input>
+          <el-switch v-model="dataForm.available" active-color="#13ce66" inactive-color="#ff4949" active-value="1" inactive-value="0"></el-switch>
       </el-form-item>
       <el-form-item label="显示顺序" prop="sort">
-          <el-input v-model="dataForm.sort" placeholder="显示顺序"></el-input>
+          <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
       </el-form-item>
       <el-form-item label="评价选项" prop="optionContent">
-          <el-input v-model="dataForm.optionContent" placeholder="评价选项"></el-input>
+          <el-input type="textarea" :rows="2" placeholder="评价选项" v-model="dataForm.optionContent"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
@@ -32,14 +35,18 @@ export default {
         roleCode: '',
         optionContent: '',
         sort: '',
-        available: '',
+        available: '1',
         revision: '',
         delFlag: '',
         createdBy: '',
         createdTime: '',
         updatedBy: '',
         updatedTime: ''
-      }
+      },
+      roleFlagArr: [
+        { dictValue: 1, dictName: '点赞' },
+        { dictValue: 2, dictName: '吐槽' }
+      ]
     }
   },
   computed: {
diff --git a/src/views/modules/custom/evaluateoption.vue b/src/views/modules/custom/evaluateoption.vue
index 92afd2dd..00a5bd9d 100644
--- a/src/views/modules/custom/evaluateoption.vue
+++ b/src/views/modules/custom/evaluateoption.vue
@@ -2,8 +2,17 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-custom__evaluateoption}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item> -->
+        <el-form-item label="评价选项" prop="optionContent">
+          <el-input v-model="dataForm.optionContent" placeholder="评价选项" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="类别" prop="roleCode">
+          <el-select v-model="dataForm.roleCode" placeholder="类别" clearable=true>
+            <el-option v-for="item in roleFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
@@ -16,12 +25,16 @@
         </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 type="selection" header-align="center" align="center" width="50"></el-table-column> -->
         <el-table-column prop="sort" label="序号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="optionContent" label="评价选项" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="roleCode" label="类别" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="available" label="可用标记(0-不可用，1-可用)" 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 prop="roleCode" label="类别" header-align="center" align="center" :formatter="showFlagFormat"></el-table-column>
+        <el-table-column prop="available" label="操作" header-align="center" align="center">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.available" active-color="#13ce66" inactive-color="#ff4949" active-value="1" inactive-value="0" @change="availableHandle(scope.row.id,scope.row.available)"></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column v-if=false :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('custom:evaluateoption:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('custom:evaluateoption:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
@@ -58,11 +71,49 @@ export default {
       },
       dataForm: {
         id: ''
-      }
+      },
+      roleFlagArr: [
+        { dictValue: 1, dictName: '点赞' },
+        { dictValue: 2, dictName: '吐槽' }
+      ]
     }
   },
   components: {
     AddOrUpdate
+  },
+  methods: {
+    showFlagFormat (row, column) {
+      if (row.roleCode === 1) {
+        return '点赞'
+      } else {
+        return '吐槽'
+      }
+    },
+    availableHandle (id, availableValue) {
+      let postData = {
+        id: id,
+        available: availableValue
+      }
+      this.$http['post'](
+        '/custom/evaluateoption/updateOptionInfo',
+        postData
+      )
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        })
+        .catch(() => {})
+    }
   }
 }
 </script>

From c7231970824a9e44969394a8ccd3e5af6aeb9a8e Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 6 Feb 2020 14:45:16 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/custom/evaluatedept.vue b/src/views/modules/custom/evaluatedept.vue
index 9dd9cfd1..79c3dd1a 100644
--- a/src/views/modules/custom/evaluatedept.vue
+++ b/src/views/modules/custom/evaluatedept.vue
@@ -75,7 +75,7 @@ export default {
   methods: {
     manageHandle (id, deptId) {
       this.$parent.selectComponent = 'Evaluateofficer'
-      this.$router.push({ path: '/custom-evaluateofficer', query: { id: id } })
+      this.$router.push({ path: '/custom-evaluateofficer', query: { id: id, deptId: deptId } })
     }
   }
 }

From b54a15d825c178564914a5b4ca2c8763c837b9d2 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 6 Feb 2020 16:09:06 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actinfo-add-or-update.vue   |  8 ++++---
 src/views/modules/heart/actinfo-cancel.vue    |  2 +-
 .../modules/heart/actinfo-detail-view.vue     |  4 +++-
 .../modules/heart/actphrase-add-or-update.vue | 12 +++++-----
 src/views/modules/heart/actphrase.vue         |  2 +-
 .../modules/heart/actuserclock-detail.vue     |  8 +++----
 src/views/modules/heart/actuserclocklog.vue   | 16 ++++++++++----
 .../heart/actuserrelation-add-or-update.vue   |  4 ++--
 .../modules/heart/actuserrelation-detail.vue  | 22 +++++++++----------
 .../points/volunteerinfo-points-adjust.vue    | 22 +++++++++----------
 .../modules/user/volunteerinfo-check.vue      |  4 ++--
 .../modules/user/volunteerinfo-detail.vue     | 20 ++++++++---------
 12 files changed, 68 insertions(+), 56 deletions(-)

diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index 235f2c52..f809c729 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -65,7 +65,7 @@
                         <template>
                             <el-radio v-model="dataForm.actQuotaCategory"
                                       label="1">固定名额</el-radio>&emsp;&emsp;
-                            <el-input-number v-enter-number type="number" :min="1" v-model="dataForm.actQuota" placeholder="固定名额"style="width:150px"></el-input-number>&emsp; 人&emsp;&emsp;
+                            <el-input-number v-enter-number type="number" :min="1" v-model="dataForm.actQuota" placeholder="固定名额" style="width:150px"></el-input-number>&emsp; 人&emsp;&emsp;
                             <el-radio v-model="dataForm.actQuotaCategory"
                                       label="0">不限名额</el-radio>
                         </template>
@@ -180,6 +180,8 @@
                                   prop="contacts">
                         <el-input v-model="dataForm.contacts" style="width:150px"></el-input>
                     </el-form-item>
+                </el-row>
+                <el-row>
                     <el-form-item label="联系电话："
                                   prop="tel">
                         <el-input v-model="dataForm.tel" style="width:200px"></el-input>
@@ -201,7 +203,7 @@
                 <el-row>
                     <el-form-item label="奖励积分："
                                   prop="reward">
-                        <el-input-number v-enter-number type="number" :min="0"v-model="dataForm.reward"
+                        <el-input-number v-enter-number type="number" :min="0" v-model="dataForm.reward"
                                   clearable style="width:150px">
                         </el-input-number>&emsp;积分
                     </el-form-item>
@@ -266,7 +268,7 @@
                     <el-form-item label-width="500px">
                         <el-button type="primary" :disabled="isAble"
                                    @click="dataFormSubmitHandle()">{{$t("confirm")}}</el-button>
-                        <el-button  @click="backToActList">{{ $t('cancel') }}</el-button>
+                        <el-button  @click="backToActList">返回</el-button>
                     </el-form-item>
                 </el-row>
             </el-form>
diff --git a/src/views/modules/heart/actinfo-cancel.vue b/src/views/modules/heart/actinfo-cancel.vue
index b543f191..d4f945c0 100644
--- a/src/views/modules/heart/actinfo-cancel.vue
+++ b/src/views/modules/heart/actinfo-cancel.vue
@@ -7,7 +7,7 @@
         活动取消，并发送通知给已报名的志愿者，是否确定取消？
         </p>
       </el-form-item>
-      <el-form-item label="取消原因" prop="cancelReason">
+      <el-form-item label="取消原因 :" prop="cancelReason">
         <el-input v-model="dataForm.cancelReason" placeholder="请输入原因，50字以内"
                   type="textarea"
                   style="width:500px"
diff --git a/src/views/modules/heart/actinfo-detail-view.vue b/src/views/modules/heart/actinfo-detail-view.vue
index 5cbb2969..f13bf3b6 100644
--- a/src/views/modules/heart/actinfo-detail-view.vue
+++ b/src/views/modules/heart/actinfo-detail-view.vue
@@ -98,6 +98,8 @@
                                   prop="contacts">
                         {{dataForm.contacts}}
                     </el-form-item>
+                </el-row>
+                <el-row>
                     <el-form-item label="联系电话："
                                   prop="tel">
                         {{dataForm.tel}}
@@ -148,7 +150,7 @@
 
                 <el-row>
                     <el-form-item label-width="500px">
-                        <el-button size="small" style="width: 95px" @click="back">{{ $t('cancel') }}</el-button>
+                        <el-button size="small" style="width: 95px" @click="back">返回</el-button>
 
                     </el-form-item>
                 </el-row>
diff --git a/src/views/modules/heart/actphrase-add-or-update.vue b/src/views/modules/heart/actphrase-add-or-update.vue
index 0f996962..b88b69d1 100644
--- a/src/views/modules/heart/actphrase-add-or-update.vue
+++ b/src/views/modules/heart/actphrase-add-or-update.vue
@@ -1,22 +1,22 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-      <el-form-item label="常用语" prop="phrase">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '100px'">
+      <el-form-item label="常用语 :" prop="phrase">
         <el-input v-model="dataForm.phrase" maxlength="500" show-word-limit placeholder="常用语"></el-input>
       </el-form-item>
-      <el-form-item label="编码" prop="code">
+      <el-form-item label="编码 :" prop="code">
         <el-input v-model="dataForm.code" maxlength="20" placeholder="编码"></el-input>
       </el-form-item>
-      <el-form-item label="是否显示" prop="showFlag">
+      <el-form-item label="是否显示 :" prop="showFlag">
         <el-select v-model="dataForm.showFlag" placeholder="是否显示">
           <el-option v-for="item in showFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="sort" label="显示顺序">
+      <el-form-item prop="sort" label="显示顺序 :">
         <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
       </el-form-item>
-      <!-- <el-form-item prop="usageNum" label="使用次数">
+      <!-- <el-form-item prop="usageNum" label="使用次数 :">
         <el-input-number v-model="dataForm.usageNum" controls-position="right" :min="0" label="使用次数" disabled="true"></el-input-number>
       </el-form-item> -->
     </el-form>
diff --git a/src/views/modules/heart/actphrase.vue b/src/views/modules/heart/actphrase.vue
index 22afa5a5..9f92f229 100644
--- a/src/views/modules/heart/actphrase.vue
+++ b/src/views/modules/heart/actphrase.vue
@@ -5,7 +5,7 @@
         <!--<el-form-item  label="ID" prop="id">
           <el-input v-model="dataForm.id" placeholder="ID" clearable></el-input>
         </el-form-item>-->
-        <el-form-item label="常用语" prop="phrase">
+        <el-form-item label="常用语:" prop="phrase">
           <el-input v-model="dataForm.phrase" placeholder="常用语" clearable></el-input>
         </el-form-item>
         <el-form-item label="编码" prop="code">
diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue
index 86e63ccd..5bd5fadd 100644
--- a/src/views/modules/heart/actuserclock-detail.vue
+++ b/src/views/modules/heart/actuserclock-detail.vue
@@ -1,13 +1,13 @@
 <template>
     <div class="project-handle">
         <div class="project-detail">
-            <div class="project-detail-tip">处理操作</div>
+            <div class="project-detail-tip">处理操作 :</div>
             <el-form ref="dataForm" label-width="120px" label-position="right" style="width: 720px;" :model="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()">
-                <el-form-item label="是否加积分" prop="status">
+                <el-form-item label="是否加积分 :" prop="status">
                     <el-radio v-model="dataForm.status" :disabled="isAble" label="5">确认加积分</el-radio>
                         <el-radio v-model="dataForm.status" :disabled="isAble" label="6">拒绝加积分</el-radio>
                 </el-form-item>
-                <el-form-item label="处理意见:" prop="failureReason">
+                <el-form-item label="处理意见 :" prop="failureReason">
                     <el-input :rows="4" v-model="dataForm.failureReason" :disabled="isAble" type="textarea" placeholder="请写明理由，100字以内"></el-input>
                 </el-form-item>
                 <el-form-item style="float: right;">
@@ -16,7 +16,7 @@
                 </el-form-item>
             </el-form>
             <div class="container">
-                <div class="location"><span style="font-weight: bold;color: #606266">打卡位置:</span> {{dataForm.address}}</div>
+                <div class="location"><span style="font-weight: bold;color: #606266">打卡位置 :</span> {{dataForm.address}}</div>
                 <div id="mapContainer" style="width:450px;height:220px;"></div>
             </div>
         </div>
diff --git a/src/views/modules/heart/actuserclocklog.vue b/src/views/modules/heart/actuserclocklog.vue
index 5aa9ce39..542b10dd 100644
--- a/src/views/modules/heart/actuserclocklog.vue
+++ b/src/views/modules/heart/actuserclocklog.vue
@@ -34,7 +34,7 @@
         <el-table-column prop="clockAddress" label="打卡地点" header-align="center" align="center"></el-table-column>
         <el-table-column prop="clockCount" label="打卡次数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="status" label="打卡状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="checkPoint" label="是否发放积分" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="checkPoint" :formatter="isCheckPoint" label="是否发放积分" header-align="center" align="center"></el-table-column>
         <el-table-column prop="point" 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">
@@ -88,11 +88,11 @@ export default {
     backToActList () {
       this.$emit('refreshDataList')
       this.$parent.selectComponent = 'ActInfoList'
-      this.$router.push({ path: '/heart-actinfo'})
+      this.$router.push({ path: '/heart-actinfo' })
     },
     detailHandle (id) {
       this.$parent.selectComponent = 'ActUserClockDetail'
-      this.$router.push({ path: '/heart-actinfo', query: { id: id,actId: this.dataForm.actId} })
+      this.$router.push({ path: '/heart-actinfo', query: { id: id, actId: this.dataForm.actId } })
     },
     setRegistTime () {
       this.dataForm.startTime = this.time[0]
@@ -124,7 +124,15 @@ export default {
         return '男'
       }
     },
-
+    // 是否发放积分转义
+    isCheckPoint: function (row, column) {
+      let state = row.checkPoint
+      if (state === '0') {
+        return '否'
+      } else if (state === '1') {
+        return '是'
+      }
+    }
   },
   components: {
     ActUserClockDetail
diff --git a/src/views/modules/heart/actuserrelation-add-or-update.vue b/src/views/modules/heart/actuserrelation-add-or-update.vue
index 5b9f491b..e019d776 100644
--- a/src/views/modules/heart/actuserrelation-add-or-update.vue
+++ b/src/views/modules/heart/actuserrelation-add-or-update.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog :visible.sync="visible" title="审核" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
-          <el-form-item label="审核" prop="auditState">
+          <el-form-item label="审核 :" prop="auditState">
               <template>
                   <el-radio v-model="dataForm.status"
                             label="1">通过</el-radio>
@@ -9,7 +9,7 @@
                             label="4">不通过</el-radio>
               </template>
           </el-form-item>
-          <el-form-item label="请填写原因" prop="failureReason">
+          <el-form-item label="请填写原因 :" prop="failureReason">
               <el-input v-model="dataForm.failureReason" placeholder="请输入原因，50字以内"
                         type="textarea"
                         style="width:500px"
diff --git a/src/views/modules/heart/actuserrelation-detail.vue b/src/views/modules/heart/actuserrelation-detail.vue
index 05f2e099..a22d0421 100644
--- a/src/views/modules/heart/actuserrelation-detail.vue
+++ b/src/views/modules/heart/actuserrelation-detail.vue
@@ -1,40 +1,40 @@
 <template>
   <el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
-          <el-form-item label="用户昵称" prop="nickname">
+          <el-form-item label="用户昵称 :" prop="nickname">
           {{dataForm.nickname}}
       </el-form-item>
-          <el-form-item label="真实姓名" prop="realName">
+          <el-form-item label="真实姓名 :" prop="realName">
           {{dataForm.realName}}
       </el-form-item>
-          <el-form-item label="性别" prop="sex">
+          <el-form-item label="性别 :" prop="sex">
              {{formatSex(dataForm.sex)}}
       </el-form-item>
-          <el-form-item label="年龄" prop="age">
+          <el-form-item label="年龄 :" prop="age">
               {{dataForm.age}}
       </el-form-item>
-          <el-form-item label="联系电话" prop="mobile">
+          <el-form-item label="联系电话 :" prop="mobile">
               {{dataForm.mobile}}
       </el-form-item>
-          <el-form-item label="身份证号" prop="identityNo">
+          <el-form-item label="身份证号 :" prop="identityNo">
               {{dataForm.identityNo}}
       </el-form-item>
-          <el-form-item label="当前状态" prop="status">
+          <el-form-item label="当前状态 :" prop="status">
               {{formatState(dataForm.status)}}
 <!--          <el-input v-model="dataForm.status" placeholder="当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）"></el-input>-->
       </el-form-item>
-          <el-form-item label="原因" prop="failureReason">
+          <el-form-item label="原因 :" prop="failureReason">
               {{dataForm.failureReason}}
       </el-form-item>
-          <el-form-item label="审核时间" prop="auditTime">
+          <el-form-item label="审核时间 :" prop="auditTime">
               {{dataForm.auditTime}}
       </el-form-item>
-          <el-form-item label="报名时间" prop="signupTime">
+          <el-form-item label="报名时间 :" prop="signupTime">
               {{dataForm.signupTime}}
       </el-form-item>
       </el-form>
     <template slot="footer">
-      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button @click="visible = false">返回</el-button>
     </template>
   </el-dialog>
 </template>
diff --git a/src/views/modules/points/volunteerinfo-points-adjust.vue b/src/views/modules/points/volunteerinfo-points-adjust.vue
index 35065d25..5c9bee14 100644
--- a/src/views/modules/points/volunteerinfo-points-adjust.vue
+++ b/src/views/modules/points/volunteerinfo-points-adjust.vue
@@ -9,34 +9,34 @@
       :model="dataForm"
       :rules="dataRule"
        ref="dataForm">
-      <el-form-item label="主键:" v-if="false">
+      <el-form-item label="主键 :" v-if="false">
         <div>{{dataForm.id}}</div>
       </el-form-item>
-      <el-form-item label="userId:" v-if="false">
+      <el-form-item label="userId :" v-if="false">
         <div>{{dataForm.userId}}</div>
       </el-form-item>
-      <el-form-item label="姓名:">
+      <el-form-item label="姓名 :">
         <div>{{dataForm.realName}}</div>
       </el-form-item>
-      <el-form-item label="性别:">
+      <el-form-item label="性别 :">
         <div v-if="dataForm.sex === '1'">男</div>
         <div v-if="dataForm.sex === '0'">女</div>
         <div v-if="dataForm.sex !=='0' && dataForm.sex !=='1'">未知</div>
       </el-form-item>
-      <el-form-item label="出生日期:">
+      <el-form-item label="出生日期 :">
         <el-date-picker v-model="dataForm.birthday"
                           type="date"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd" readonly>
           </el-date-picker>
       </el-form-item>
-      <el-form-item label="手机号:">
+      <el-form-item label="手机号 :">
         <div>{{dataForm.mobile}}</div>
       </el-form-item>
-       <el-form-item label="积分:">
+       <el-form-item label="积分 :">
         <div>{{dataForm.points}}</div>
       </el-form-item>
-      <el-form-item label="积分行为"  prop="behaviorCode">
+      <el-form-item label="积分行为 :"  prop="behaviorCode">
         <el-select v-model="dataForm.behaviorCode">
             <el-option
               v-for="item in behaviorTypeList"
@@ -46,16 +46,16 @@
             </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="调整原因:" prop="adjustReason">
+      <el-form-item label="调整原因 :" prop="adjustReason">
           <el-input v-model="dataForm.adjustReason" type="textarea" placeholder="不超过500字"></el-input>
       </el-form-item>
-      <el-form-item label="操作类型:" prop="operationType">
+      <el-form-item label="操作类型 :" prop="operationType">
         <el-radio-group v-model="dataForm.operationType">
             <el-radio :label="1">加积分</el-radio>
             <el-radio :label="0">减积分</el-radio>
           </el-radio-group>
       </el-form-item>
-      <el-form-item label="积分调整:" prop="operatePoints">
+      <el-form-item label="积分调整 :" prop="operatePoints">
         <el-input-number v-model="dataForm.operatePoints"  :min="0"></el-input-number>
       </el-form-item>
     </el-form>
diff --git a/src/views/modules/user/volunteerinfo-check.vue b/src/views/modules/user/volunteerinfo-check.vue
index f45ca672..d2944dab 100644
--- a/src/views/modules/user/volunteerinfo-check.vue
+++ b/src/views/modules/user/volunteerinfo-check.vue
@@ -13,13 +13,13 @@
       @keyup.enter.native="dataFormSubmitHandle()"
       :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"
     >
-      <el-form-item label="审核" prop="auditStatus">
+      <el-form-item label="审核 :" prop="auditStatus">
         <template>
           <el-radio v-model="dataForm.auditStatus" label="1">通过</el-radio>
           <el-radio v-model="dataForm.auditStatus" label="2">不通过</el-radio>
         </template>
       </el-form-item>
-      <el-form-item v-if="dataForm.auditStatus === '2'" label="填写原因" prop="failureReason">
+      <el-form-item v-if="dataForm.auditStatus === '2'" label="填写原因 :" prop="failureReason">
         <el-input
           v-model="dataForm.failureReason"
           maxlength="50"
diff --git a/src/views/modules/user/volunteerinfo-detail.vue b/src/views/modules/user/volunteerinfo-detail.vue
index a012a4bb..f1dd08e7 100644
--- a/src/views/modules/user/volunteerinfo-detail.vue
+++ b/src/views/modules/user/volunteerinfo-detail.vue
@@ -10,35 +10,35 @@
       :rules="dataRule"
       ref="dataForm"
       @keyup.enter.native="dataFormSubmitHandle()"
-      :label-width="$i18n.locale === 'en-US' ? '120px' : '110px'"
+      :label-width="$i18n.locale === 'en-US' ? '120px' : '130px'"
     >
-      <el-form-item label="姓名" prop="realName" v-if="dataForm.realName">
+      <el-form-item label="姓名 :" prop="realName" v-if="dataForm.realName">
         <span>{{dataForm.realName}}</span>
       </el-form-item>
-      <el-form-item label="性别" prop="sex">
+      <el-form-item label="性别 :" prop="sex">
         <div v-if="dataForm.sex === '1'">男</div>
         <div v-if="dataForm.sex === '0'">女</div>
         <div v-if="dataForm.sex !=='0' && dataForm.sex !=='1'">未知</div>
       </el-form-item>
-      <el-form-item label="出生日期" prop="birthdayString">
+      <el-form-item label="出生日期 :" prop="birthdayString">
         <span>{{dataForm.birthdayString}}</span>
       </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
+      <el-form-item label="手机号 :" prop="mobile">
         <span>{{dataForm.mobile}}</span>
       </el-form-item>
-      <el-form-item label="身份证号" prop="identityNo">
+      <el-form-item label="身份证号 :" prop="identityNo">
         <span>{{dataForm.identityNo}}</span>
       </el-form-item>
-      <el-form-item label="地址" prop="address">
+      <el-form-item label="地址 :" prop="address">
         <span>{{dataForm.address}}</span>
       </el-form-item>
-      <el-form-item label="自我介绍" prop="introduce">
+      <el-form-item label="自我介绍 :" prop="introduce">
         <span>{{dataForm.introduce}}</span>
       </el-form-item>
-      <el-form-item label="积分" prop="points">
+      <el-form-item label="积分 :" prop="points">
         <span>{{dataForm.points}}</span>
       </el-form-item>
-      <el-form-item label="成为志愿者时间" prop="registTimeString">
+      <el-form-item label="成为志愿者时间 :" prop="registTimeString">
         <span>{{dataForm.registTimeString}}</span>
       </el-form-item>
     </el-form>

From aae0417a3df20c7958efaa2abf70cfea98fb97d1 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 6 Feb 2020 17:23:27 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/evaluatedept.vue     |   6 +-
 .../custom/evaluateofficer-add-or-update.vue  |  46 ++---
 .../modules/custom/evaluateofficer-add.vue    | 160 ++++++++++++++++++
 src/views/modules/custom/evaluateofficer.vue  |  84 ++++++++-
 4 files changed, 256 insertions(+), 40 deletions(-)
 create mode 100644 src/views/modules/custom/evaluateofficer-add.vue

diff --git a/src/views/modules/custom/evaluatedept.vue b/src/views/modules/custom/evaluatedept.vue
index 79c3dd1a..49e147aa 100644
--- a/src/views/modules/custom/evaluatedept.vue
+++ b/src/views/modules/custom/evaluatedept.vue
@@ -28,7 +28,7 @@
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('custom:evaluatedept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('custom:evaluatedept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button type="text" size="small" @click="manageHandle(scope.row.id,scope.row.deptId)">管理</el-button>
+            <el-button type="text" size="small" @click="manageHandle(scope.row.deptId)">管理</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -73,9 +73,9 @@ export default {
     Evaluateofficer
   },
   methods: {
-    manageHandle (id, deptId) {
+    manageHandle (deptId) {
       this.$parent.selectComponent = 'Evaluateofficer'
-      this.$router.push({ path: '/custom-evaluateofficer', query: { id: id, deptId: deptId } })
+      this.$router.push({ path: '/custom-evaluateofficer', query: { deptId: deptId } })
     }
   }
 }
diff --git a/src/views/modules/custom/evaluateofficer-add-or-update.vue b/src/views/modules/custom/evaluateofficer-add-or-update.vue
index cc88d4bc..7b40d359 100644
--- a/src/views/modules/custom/evaluateofficer-add-or-update.vue
+++ b/src/views/modules/custom/evaluateofficer-add-or-update.vue
@@ -1,44 +1,30 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="部门ID 部门表主键ID" prop="deptId">
+      <el-form-item v-if=false label="街道名称" prop="deptId">
           <el-input v-model="dataForm.deptId" placeholder="部门ID 部门表主键ID"></el-input>
       </el-form-item>
           <el-form-item label="姓名" prop="fullName">
           <el-input v-model="dataForm.fullName" placeholder="姓名"></el-input>
       </el-form-item>
-          <el-form-item label="性别(0-女，1-男)" prop="sex">
-          <el-input v-model="dataForm.sex" placeholder="性别(0-女，1-男)"></el-input>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="dataForm.sex" placeholder="性别">
+          <el-option v-for="item in sexFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
-          <el-form-item label="职位" prop="position">
-          <el-input v-model="dataForm.position" placeholder="职位"></el-input>
+      <el-form-item label="单位职务" prop="position">
+          <el-input v-model="dataForm.position" placeholder="单位职务"></el-input>
       </el-form-item>
-          <el-form-item label="点赞次数" prop="likesCount">
+          <!-- <el-form-item label="点赞次数" prop="likesCount">
           <el-input v-model="dataForm.likesCount" placeholder="点赞次数"></el-input>
       </el-form-item>
           <el-form-item label="被踩次数" prop="opposeCount">
           <el-input v-model="dataForm.opposeCount" placeholder="被踩次数"></el-input>
-      </el-form-item>
-          <el-form-item label="排序" prop="sort">
-          <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识 0：否，1：是" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0：否，1：是"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item> -->
+      <el-form-item label="排序" prop="sort">
+          <!-- <el-input v-model="dataForm.sort" placeholder="排序"></el-input> -->
+          <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -69,7 +55,11 @@ export default {
         createdTime: '',
         updatedBy: '',
         updatedTime: ''
-      }
+      },
+      sexFlagArr: [
+        { dictValue: '1', dictName: '男' },
+        { dictValue: '0', dictName: '女' }
+      ]
     }
   },
   computed: {
diff --git a/src/views/modules/custom/evaluateofficer-add.vue b/src/views/modules/custom/evaluateofficer-add.vue
new file mode 100644
index 00000000..a1ca7739
--- /dev/null
+++ b/src/views/modules/custom/evaluateofficer-add.vue
@@ -0,0 +1,160 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="$t('add')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item v-if=false label="街道ID" prop="deptId">
+          <el-input v-model="dataForm.deptId" placeholder="部门ID 部门表主键ID"></el-input>
+      </el-form-item>
+          <el-form-item label="姓名" prop="fullName">
+          <el-input v-model="dataForm.fullName" placeholder="姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="dataForm.sex" placeholder="性别">
+          <el-option v-for="item in sexFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单位职务" prop="position">
+          <el-input v-model="dataForm.position" placeholder="单位职务"></el-input>
+      </el-form-item>
+          <!-- <el-form-item label="点赞次数" prop="likesCount">
+          <el-input v-model="dataForm.likesCount" placeholder="点赞次数"></el-input>
+      </el-form-item>
+          <el-form-item label="被踩次数" prop="opposeCount">
+          <el-input v-model="dataForm.opposeCount" placeholder="被踩次数"></el-input>
+      </el-form-item> -->
+      <el-form-item label="排序" prop="sort">
+          <!-- <el-input v-model="dataForm.sort" placeholder="排序"></el-input> -->
+          <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
+      </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>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        deptId: '',
+        fullName: '',
+        sex: '',
+        position: '',
+        likesCount: '',
+        opposeCount: '',
+        sort: '',
+        revision: '',
+        delFlag: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      },
+      sexFlagArr: [
+        { dictValue: '1', dictName: '男' },
+        { dictValue: '0', dictName: '女' }
+      ]
+    }
+  },
+  // mounted () {
+  //   // this.dataForm.id = this.$route.query.id
+  //   this.dataForm.deptId = this.$route.query.deptId
+  // },
+  computed: {
+    dataRule () {
+      return {
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        fullName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        position: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        likesCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        opposeCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/custom/evaluateofficer/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/custom/evaluateofficer/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/custom/evaluateofficer.vue b/src/views/modules/custom/evaluateofficer.vue
index ff441729..86e82b0c 100644
--- a/src/views/modules/custom/evaluateofficer.vue
+++ b/src/views/modules/custom/evaluateofficer.vue
@@ -2,14 +2,54 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-custom__evaluateofficer}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item> -->
+        <el-form-item label="干部名称" prop="fullName">
+          <el-input v-model="dataForm.fullName" placeholder="干部名称" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="evaluateofficerAddHandle(dataForm.deptId)">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('epdc:topic:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-upload class="upload-demo"
+                     ref="upload"
+                     v-loading="dataListLoading"
+                     :action="uploadUrl"
+                     :on-preview="handlePreview"
+                     multiple
+                     :limit="1"
+                     :on-success='uploadSuccess'
+                     :on-error='errorExceed'>
+            <el-button type="primary">导入</el-button>
+          </el-upload>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('custom:evaluateofficer:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -17,9 +57,9 @@
       </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="fullName" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sex" label="性别(0-女，1-男)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="position" label="职位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="fullName" label="干部姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sex" label="性别" header-align="center" align="center" :formatter="showFlagFormat"></el-table-column>
+        <el-table-column prop="position" label="单位职务" header-align="center" align="center"></el-table-column>
         <el-table-column prop="likesCount" label="点赞次数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="opposeCount" label="被踩次数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
@@ -42,6 +82,7 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <evaluateofficer-add v-if="evaluateofficerAddVisible" ref="evaluateofficerAdd" @refreshDataList="getDataList"></evaluateofficer-add>
     </div>
   </el-card>
 </template>
@@ -49,6 +90,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './evaluateofficer-add-or-update'
+import evaluateofficerAdd from './evaluateofficer-add'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -57,15 +99,39 @@ export default {
         getDataListURL: '/custom/evaluateofficer/page',
         getDataListIsPage: true,
         deleteURL: '/custom/evaluateofficer',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/custom/evaluateofficer/export'
       },
       dataForm: {
-        id: ''
-      }
+        id: '',
+        deptId: ''
+      },
+      evaluateofficerAddVisible: false
     }
   },
+  mounted () {
+    // this.dataForm.id = this.$route.query.id
+    this.dataForm.deptId = this.$route.query.deptId
+  },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    evaluateofficerAdd
+  },
+  methods: {
+    showFlagFormat (row, column) {
+      if (row.sex === '0') {
+        return '女'
+      } else {
+        return '男'
+      }
+    },
+    evaluateofficerAddHandle (deptId) {
+      this.evaluateofficerAddVisible = true
+      this.$nextTick(() => {
+        this.$refs.evaluateofficerAdd.dataForm.deptId = deptId
+        this.$refs.evaluateofficerAdd.init()
+      })
+    }
   }
 }
 </script>

From 0467627ea3c1d125154e720d14e742aaf32c96a8 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 6 Feb 2020 21:20:55 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=8C=89=E9=92=AE=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/heart/actuserrelation.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/heart/actuserrelation.vue b/src/views/modules/heart/actuserrelation.vue
index db387b20..b2e60b10 100644
--- a/src/views/modules/heart/actuserrelation.vue
+++ b/src/views/modules/heart/actuserrelation.vue
@@ -39,7 +39,8 @@
         <el-table-column prop="failureReason" 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  type="text" size="small" :disabled="scope.row.status ==='0'? false :true" @click="addOrUpdateHandle(scope.row.id)">审核</el-button>
+            <el-button  type="text" size="small" v-if="show" @click="addOrUpdateHandle(scope.row.id)">审核</el-button>
+            <!-- <el-button  type="text" size="small" :disabled="scope.row.status ==='0'? false :true" @click="addOrUpdateHandle(scope.row.id)">审核</el-button> -->
             <el-button v-if="$hasPermission('heart:actinfo:look')" type="text" size="small" @click="detailHandle(scope.row.id)">查看</el-button>
           </template>
         </el-table-column>
@@ -76,6 +77,7 @@ export default {
         deleteURL: '/heart/actuserrelation',
         deleteIsBatch: true
       },
+      show: false,
       dataForm: {
         id: '',
         actId: '',
@@ -114,18 +116,25 @@ export default {
     formatState: function (row, column) {
       let state = row.status
       if (state === '0') {
+        this.show = true
         return '报名'
       } else if (state === '1') {
+        this.show = false
         return '审核通过'
       } else if (state === '2') {
+        this.show = false
         return '打卡'
       } else if (state === '3') {
+        this.show = false
         return '取消报名'
       } else if (state === '4') {
+        this.show = false
         return '审核不通过'
       } else if (state === '5') {
+        this.show = false
         return '确认加积分'
       } else if (state === '6') {
+        this.show = false
         return '拒绝加积分'
       }
     },

From a7e431b9011b30f0e7f22d550acaeeeafcb08398 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 7 Feb 2020 11:04:53 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=89=93=E5=8D=A1=E8=AF=A6=E6=83=85=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=20bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actuserclock-detail.vue     | 49 ++++++++++++++++---
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue
index 5bd5fadd..c0e1a5c7 100644
--- a/src/views/modules/heart/actuserclock-detail.vue
+++ b/src/views/modules/heart/actuserclock-detail.vue
@@ -30,18 +30,35 @@
                 <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="clockAddress" label="打卡地点" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="clockDesc" label="打卡描述" header-align="center" align="center"></el-table-column>
-                <el-table-column label="图片" fixed="right" header-align="center" align="center" width="200">
+                <el-table-column label="图片" fixed="right" header-align="center" align="center" width="400">  
                     <template slot-scope="scope">
-                        <img v-if="scope.row.clockPic"
-                             :src="scope.row.clockPic"
-                             class="avatar">
+                        <el-image
+                                class="avatar1"
+                                v-if="scope.row.clockPic[0]"
+                                :src="scope.row.clockPic[0]"
+                                :key="scope.row.clockPic[0]"
+                                :preview-src-list="previewImgList"
+                                @click="clickImg(scope.row.clockPic[0])"></el-image>
+                        <el-image
+                                class="avatar1"
+                                v-if="scope.row.clockPic[1]"
+                                :src="scope.row.clockPic[1]"
+                                :key="scope.row.clockPic[1]"
+                                :preview-src-list="previewImgList"
+                                @click="clickImg(scope.row.clockPic[1])"></el-image>
+                        <el-image
+                                class="avatar1"
+                                v-if="scope.row.clockPic[2]"
+                                :src="scope.row.clockPic[2]"
+                                :key="scope.row.clockPic[2]"
+                                :preview-src-list="previewImgList"
+                                @click="clickImg(scope.row.clockPic[2])"></el-image>
                     </template>
                 </el-table-column>
             </el-table>
         </div>
     </div>
 </template>
-
 <script>
 var map;
 var markerList =[];
@@ -69,8 +86,10 @@ export default {
                 address: '',
                 latitude: '',
                 longitude: '',
-                radius: 200
+                radius: 200,
+                clockPic: []
             },
+            previewImgList: [],
             isAble: false
         }
     },
@@ -78,7 +97,6 @@ export default {
         this.dataForm.id = this.$route.query.id
         this.dataForm.actId = this.$route.query.actId
         this.init()
-        console.log(this.dataForm);
     },
     computed: {
         dataRule () {
@@ -134,6 +152,11 @@ export default {
                 }
             })
         },
+        // 点击查看大图
+        clickImg (url) {
+            this.previewImgList = []
+            this.previewImgList.push(url)
+        },
         getDataList () {
             this.dataListLoading = true
             this.$http.get(
@@ -250,6 +273,18 @@ export default {
     }
 }
 </script>
+<style lang="scss">
+    .avatar1 {
+        width: 120px;
+        height: 120px;
+    }
+    .el-image-viewer__close {
+        top: 16%;
+    }
+    .el-table__fixed-right::before, .el-table__fixed::before {
+        background: transparent !important;
+    }
+</style>
 
 <style lang="scss">
     .project-handle {

From 536292d3c93a0d3b52ba84fbc52cff7e4c3e285e Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 7 Feb 2020 16:38:49 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E8=AF=84=E4=BB=B7?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/evaluateofficer.vue  | 27 +++++++-
 .../custom/evaluaterole-add-or-update.vue     | 18 -----
 .../modules/custom/evaluaterole-switch.vue    | 69 +++++++++++++++++++
 src/views/modules/custom/evaluaterole.vue     |  2 +-
 4 files changed, 96 insertions(+), 20 deletions(-)
 create mode 100644 src/views/modules/custom/evaluaterole-switch.vue

diff --git a/src/views/modules/custom/evaluateofficer.vue b/src/views/modules/custom/evaluateofficer.vue
index 86e82b0c..4d789557 100644
--- a/src/views/modules/custom/evaluateofficer.vue
+++ b/src/views/modules/custom/evaluateofficer.vue
@@ -106,7 +106,8 @@ export default {
         id: '',
         deptId: ''
       },
-      evaluateofficerAddVisible: false
+      evaluateofficerAddVisible: false,
+      upLoadUrl: ''
     }
   },
   mounted () {
@@ -117,6 +118,9 @@ export default {
     AddOrUpdate,
     evaluateofficerAdd
   },
+  created: function () {
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/evaluateofficer/importExcel?token=${Cookies.get('token')}`
+  },
   methods: {
     showFlagFormat (row, column) {
       if (row.sex === '0') {
@@ -131,6 +135,27 @@ export default {
         this.$refs.evaluateofficerAdd.dataForm.deptId = deptId
         this.$refs.evaluateofficerAdd.init()
       })
+    },
+    errorExceed (file, fileList) {
+      this.$message.error('上传失败请重试')
+    },
+    uploadSuccess (response, file, fileList) {
+      this.getDataList()// 刷新列表
+      this.dataListLoading = false
+      this.$refs.upload.clearFiles()
+      if (response.data !== null && response.data.length > 0) {
+        this.faultDataVisible = true
+        this.errordataList = response.data
+        return
+      }
+      this.$message({
+        message: this.$t('prompt.success'),
+        type: 'success',
+        duration: 500,
+        onClose: () => {
+          this.getDataList()
+        }
+      })
     }
   }
 }
diff --git a/src/views/modules/custom/evaluaterole-add-or-update.vue b/src/views/modules/custom/evaluaterole-add-or-update.vue
index a9d11b54..7a1f43c2 100644
--- a/src/views/modules/custom/evaluaterole-add-or-update.vue
+++ b/src/views/modules/custom/evaluaterole-add-or-update.vue
@@ -9,24 +9,6 @@
       </el-form-item>
           <el-form-item label="可用标记(0-不可用，1-可用)" prop="available">
           <el-input v-model="dataForm.available" placeholder="可用标记(0-不可用，1-可用)"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识 0：否，1：是" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0：否，1：是"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/custom/evaluaterole-switch.vue b/src/views/modules/custom/evaluaterole-switch.vue
new file mode 100644
index 00000000..51b2368b
--- /dev/null
+++ b/src/views/modules/custom/evaluaterole-switch.vue
@@ -0,0 +1,69 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-custom__evaluaterole}">
+      <el-form :inline="true" :model="dataForm" ref="dataForm">
+        <!-- <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item> -->
+        <el-form-item label="是否开启“干部评价”功能" prop="available">
+          <el-switch v-model="dataForm.available" active-color="#13ce66" inactive-color="#ff4949" active-value="1" inactive-value="0" @change="availableHandle()"></el-switch>
+        </el-form-item>
+      </el-form>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  created () {
+    this.getInfo()
+  },
+  methods: {
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/custom/evaluaterole/getAvailable`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    availableHandle () {
+      let postData = {
+        available: this.dataForm.available
+      }
+      this.$http['post'](
+        '/custom/evaluaterole/updateRoleInfo',
+        postData
+      )
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        })
+        .catch(() => {})
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/custom/evaluaterole.vue b/src/views/modules/custom/evaluaterole.vue
index c0c38a31..2080f4a1 100644
--- a/src/views/modules/custom/evaluaterole.vue
+++ b/src/views/modules/custom/evaluaterole.vue
@@ -9,7 +9,7 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('custom:evaluaterole:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('custom:evaluaterole:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>

From e84f5bad8acafaaed5f2a734e46819721fa834f6 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 7 Feb 2020 18:07:36 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/custom/evaluateofficer.vue b/src/views/modules/custom/evaluateofficer.vue
index 4d789557..960f3fed 100644
--- a/src/views/modules/custom/evaluateofficer.vue
+++ b/src/views/modules/custom/evaluateofficer.vue
@@ -91,6 +91,7 @@
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './evaluateofficer-add-or-update'
 import evaluateofficerAdd from './evaluateofficer-add'
+import Cookies from 'js-cookie'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -119,7 +120,7 @@ export default {
     evaluateofficerAdd
   },
   created: function () {
-    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/evaluateofficer/importExcel?token=${Cookies.get('token')}`
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/evaluateofficer/importExcel/${this.$route.query.deptId}?token=${Cookies.get('token')}`
   },
   methods: {
     showFlagFormat (row, column) {

From 2207056cc34b1d7d17cd1ddf73e64fcdcf2959ad Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 7 Feb 2020 18:53:57 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=EF=BC=9A=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=B4=BB=E5=8A=A8banner=E5=9B=BE=E7=89=87=E6=9C=AA?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C;=20=E5=8F=96=E6=B6=88=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=8E=BB=E6=8E=89=E6=96=87=E5=AD=97=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actinfo-add-or-update.vue   | 25 ++++++++++++++++---
 src/views/modules/heart/actinfo-cancel.vue    |  6 -----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index f809c729..ea352ae2 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -55,6 +55,7 @@
                                         type="datetime"
                                         value-format="yyyy-MM-dd HH:mm"
                                         format="yyyy-MM-dd HH:mm"
+                                        :picker-options="isSignupEndTime"
                                         placeholder="选择日期时间">
                         </el-date-picker>
                     </el-form-item>
@@ -240,9 +241,9 @@
                                   prop="isBanner">
                         <template>
                             <el-radio v-model="dataForm.isBanner"
-                                      label="1">是</el-radio>
+                                      label="1" @change="changeHandler">是</el-radio>
                             <el-radio v-model="dataForm.isBanner"
-                                      label="0">否</el-radio>
+                                      label="0" @change="changeHandler">否</el-radio>
                         </template>
                     </el-form-item>
                 </el-row>
@@ -320,6 +321,12 @@ export default {
         actUserDefaultState: '1',
         bannerUrl:""
       },
+        isSignupEndTime: {
+          disabledDate(time) {
+            return time < Date.now() - 8.64e7;//8.64e7=1000*60*60*24一天
+          }
+        },
+        isImgRequired: true,
         mapSelectVisible:false,
         signInIsAble: true,
         isAble: false,
@@ -499,6 +506,9 @@ export default {
         ],
         updatedTime: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        isBanner: [
+          { required: this.isImgRequired, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -507,6 +517,13 @@ export default {
     dateChangeTime(){
         this.dataForm.signinStartTime = this.dataForm.actStartTime
     },
+    changeHandler(value) {
+      if(value == 1){
+        this.isImgRequired = true
+      } else{
+        this.isImgRequired = false
+      } 
+    },
     backToActList () {
         this.$emit('refreshDataList')
         this.$parent.selectComponent = 'ActInfoList'
@@ -609,9 +626,9 @@ export default {
 
               return this.$message.error('活动结束时间必须大于活动开始时间。');
           }
-          if (signinEndTime < actStarTime) {
+          if (signinEndTime < actEndTime) {
 
-              return this.$message.error('签到结束时间必须大于签到开始时间。');
+              return this.$message.error('签到结束时间必须大于活动结束时间。');
           }
 
         this.isAble = true
diff --git a/src/views/modules/heart/actinfo-cancel.vue b/src/views/modules/heart/actinfo-cancel.vue
index d4f945c0..98f22154 100644
--- a/src/views/modules/heart/actinfo-cancel.vue
+++ b/src/views/modules/heart/actinfo-cancel.vue
@@ -1,12 +1,6 @@
 <template>
   <el-dialog :visible.sync="visible" :title="$t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
-
-      <el-form-item label=" " >
-        <p>
-        活动取消，并发送通知给已报名的志愿者，是否确定取消？
-        </p>
-      </el-form-item>
       <el-form-item label="取消原因 :" prop="cancelReason">
         <el-input v-model="dataForm.cancelReason" placeholder="请输入原因，50字以内"
                   type="textarea"