From 20b918f561d977c018e39a960eb747f49760c1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Tue, 19 Nov 2019 09:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E8=AE=A4=E8=AF=81=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/user.vue | 55 +++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index 199a7ee5..b1ddb1aa 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -3,6 +3,53 @@
     <div class="mod-epdc__user}">
       <template>
         <el-tabs v-model="tabFlag" type="border-card" @tab-click="handleClick">
+          <el-tab-pane  name="0">
+            <span slot="label"><i class="el-icon-date"></i> 未认证用户</span>
+            <template>
+              <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+                <el-form-item label="街道">
+                  <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
+                    <el-option v-for="(item,index) in streetOptions" :key="index" :label="item.name" :value="item.id"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="社区">
+                  <el-select v-model="dataForm.communityId" clearable placeholder="请选择" @change="getGridList">
+                    <el-option v-for="(item,index) in communityOptions" :key="index" :label="item.name" :value="item.id"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="网格">
+                  <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
+                    <el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="姓名"><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-form-item>
+                <el-form-item label="身份证号"><el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input></el-form-item>
+                <div class="block">
+                  <span class="demonstration">注册时间</span>&nbsp;&nbsp;
+                  <el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
+                  <el-form-item><el-button @click="getDataList()">{{ $t('query') }}</el-button></el-form-item>
+                  <el-form-item>
+                    <el-button v-if="$hasPermission('epdc:user:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
+                  </el-form-item>
+                </div>
+              </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 label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+                <el-table-column prop="realName" 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="state" label="注册状态" :formatter="formatState" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="registerTime" label="加入网格时间" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="myGridName" label="所属网格（街道-社区-网格）" header-align="center" align="center"></el-table-column>
+                <!--<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="100">
+                  <template slot-scope="scope"><el-button  type="text" size="small" @click="userDetailHandle(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>
+            </template>
+          </el-tab-pane>
           <el-tab-pane  name="1">
             <span slot="label"><i class="el-icon-date"></i> 待审核用户</span>
             <template>
@@ -183,15 +230,15 @@ export default {
         startTime: '',
         endTime: '',
         partyFlag: '',
-        state: '1'
+        state: '0'
       },
       userDetailVisible: false,
       streetOptions: [],
       communityOptions: [],
       gridOptions: [],
       time: '',
-      tabFlag: '1',
-      state: '待审核用户',
+      tabFlag: '0',
+      state: '未认证用户',
       partyFlagOptions: [{ id: '1', name: '是' }, { id: '0', name: '否' }]
     }
   },
@@ -243,6 +290,8 @@ export default {
         return '审核不通过'
       } else if (state === '3') {
         return '审核通过'
+      } else if (state === '0') {
+        return '已注册'
       }
     },
     formatPartyFlag: function (row, column) {