From 2c788cbc21742582172f4e022232b090a2a6b0bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Mon, 30 Mar 2020 13:58:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E7=BB=8F=E5=AE=A1=E6=89=B9=E8=BF=87=E7=9A=84?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=A6=81=E6=98=BE=E7=A4=BA=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/volunteerinfo.vue | 186 +++++++++++++----------
 1 file changed, 102 insertions(+), 84 deletions(-)

diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue
index a5b39c19..f9f2c871 100644
--- a/src/views/modules/user/volunteerinfo.vue
+++ b/src/views/modules/user/volunteerinfo.vue
@@ -1,111 +1,129 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-epdc__user}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <el-form-item label="所属机构">
-          <el-cascader
-            v-model="deptIdList"
-            :options="options"
-            :props="{ checkStrictly: true }"
-            clearable
-          ></el-cascader>
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
         </el-form-item>
         <el-form-item label="姓名">
-          <el-input v-model="dataForm.realName" placeholder="姓名" clearable></el-input>
+          <el-input v-model="dataForm.realName"
+                    placeholder="姓名"
+                    clearable></el-input>
         </el-form-item>
         <el-form-item label="手机号">
-          <el-input v-model="dataForm.mobile" placeholder="手机号" clearable></el-input>
+          <el-input v-model="dataForm.mobile"
+                    placeholder="手机号"
+                    clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        style="width: 100%"
-      >
+      <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="userId" label="用户ID" header-align="center" align="center"></el-table-column> -->
-        <el-table-column prop="realName" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column
-          prop="sex" width="140"
-          label="性别"
-          :formatter="sexState"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column prop="birthdayString" width="140" 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="identityNo" label="身份证" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="registTimeString" label="认证时间" header-align="center" align="center"></el-table-column>
-        <el-table-column
-          prop="auditStatus"
-          label="状态"
-          :formatter="auditStatusState"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column prop="kindnessTime" label="爱心时长" :formatter="kindnessTimeState" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="points" label="积分" header-align="center" align="center"></el-table-column>
-        <el-table-column
-          :label="$t('handle')"
-          fixed="right"
-          header-align="center"
-          align="center"
-          width="200"
-        >
+        <el-table-column prop="realName"
+                         label="姓名"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="sex"
+                         width="140"
+                         label="性别"
+                         :formatter="sexState"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="birthdayString"
+                         width="140"
+                         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="identityNo"
+                         label="身份证"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="registTimeString"
+                         label="认证时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="auditStatus"
+                         label="状态"
+                         :formatter="auditStatusState"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="kindnessTime"
+                         label="爱心时长"
+                         :formatter="kindnessTimeState"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="points"
+                         label="积分"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="200">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="userDetailHandle(scope.row.id)">查看</el-button>
-            <el-button
-              type="text"
-              size="small"
-              @click="checkHandle(scope.row.id,1)"
-            >审批</el-button>
+            <el-button type="text"
+                       size="small"
+                       @click="userDetailHandle(scope.row.id)">查看</el-button>
+            <el-button v-if="scope.row.auditStatus == 1"
+                       type="text"
+                       size="small"
+                       @click="checkHandle(scope.row.id,1)">审批</el-button>
             <!-- <el-button type="text" size="small" @click="checkHandle(scope.row.id, 2)">拉入黑名单</el-button> -->
-            <el-button  type="text" size="small" @click="pointsAdjustHandle(scope.row.id)">积分调整</el-button>
-            <el-button  type="text" size="small" @click="pointsLogs(scope.row.id)">积分记录</el-button>
+            <el-button type="text"
+                       size="small"
+                       @click="pointsAdjustHandle(scope.row.id)">积分调整</el-button>
+            <el-button type="text"
+                       size="small"
+                       @click="pointsLogs(scope.row.id)">积分记录</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle"
-      ></el-pagination>
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle"></el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
       <!-- 弹窗, 查看 -->
-      <volunteerinfo-detail
-        v-if="volunteerinfoDetailVisible"
-        ref="volunteerinfoDetail"
-        @refreshDataList="getDataList"
-      ></volunteerinfo-detail>
+      <volunteerinfo-detail v-if="volunteerinfoDetailVisible"
+                            ref="volunteerinfoDetail"
+                            @refreshDataList="getDataList"></volunteerinfo-detail>
       <!-- 弹窗, 审批 -->
-      <volunteerinfo-check
-        v-if="volunteerinfoCheckVisible"
-        ref="volunteerinfoCheck"
-        @refreshDataList="getDataList"
-      ></volunteerinfo-check>
+      <volunteerinfo-check v-if="volunteerinfoCheckVisible"
+                           ref="volunteerinfoCheck"
+                           @refreshDataList="getDataList"></volunteerinfo-check>
       <!-- 弹窗, 积分调整 -->
-      <volunteerinfo-points-adjust
-        v-if="volunteerinfoPointsAdjustVisible"
-        ref="volunteerinfoPointsAdjust"
-        @refreshDataList="getDataList"
-        ></volunteerinfo-points-adjust>
+      <volunteerinfo-points-adjust v-if="volunteerinfoPointsAdjustVisible"
+                                   ref="volunteerinfoPointsAdjust"
+                                   @refreshDataList="getDataList"></volunteerinfo-points-adjust>
       <!-- 积分记录 -->
-      <volunteer-points-log
-        v-if="volunteerPointsLogVisible"
-        ref="volunteerPointsLog"
-        @refreshDataList="getDataList"
-      ></volunteer-points-log>
+      <volunteer-points-log v-if="volunteerPointsLogVisible"
+                            ref="volunteerPointsLog"
+                            @refreshDataList="getDataList"></volunteer-points-log>
     </div>
   </el-card>
 </template>
@@ -166,7 +184,7 @@ export default {
         }
         this.options = res.data.options
       })
-      .catch(() => {})
+      .catch(() => { })
   },
   watch: {
     deptIdList: function (val) {