diff --git a/src/views/modules/user/user-add-or-update.vue b/src/views/modules/user/user-add-or-update.vue
index 3e6755f1..b92cd4e5 100644
--- a/src/views/modules/user/user-add-or-update.vue
+++ b/src/views/modules/user/user-add-or-update.vue
@@ -20,18 +20,20 @@
                     prop="identityNo">
         <span>{{dataForm.identityNo}}</span>
       </el-form-item>
-      <el-form-item label="是否党员">
-        <el-select v-model="dataForm.partyFlag"
-                   clearable
-                   placeholder="请选择">
-          <el-option v-for="item in partyFlagOptions"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
+      <el-form-item label="居民住址"
+                    prop="address">
+        <span>{{dataForm.address}}</span>
+      </el-form-item>
+      <el-form-item label="是否党员"
+                    prop="partyFlag">
+        <template>
+          <el-radio v-model="dataForm.partyFlag"
+                    label="1">是</el-radio>
+          <el-radio v-model="dataForm.partyFlag"
+                    label="0">否</el-radio>
+        </template>
       </el-form-item>
-      <el-form-item label="干部下沉">
+      <!-- <el-form-item label="干部下沉">
         <el-select v-model="dataForm.cadreFlag"
                    clearable
                    placeholder="请选择">
@@ -41,26 +43,17 @@
                      :value="item.cadreFlag">
           </el-option>
         </el-select>
-      </el-form-item>
-      <el-form-item label="扫码网格">
-        <span>{{dataForm.street}} - </span>
-        <span>{{dataForm.community}} - </span>
-        <span>{{dataForm.grid}}</span>
-      </el-form-item>
-      <el-form-item label="居民住址"
-                    prop="address">
-        <span>{{dataForm.address}}</span>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="通过审核"
-                    prop="pass">
+                    prop="state">
         <template>
-          <el-radio v-model="dataForm.pass"
-                    label="1">是</el-radio>
-          <el-radio v-model="dataForm.pass"
+          <el-radio v-model="dataForm.state"
+                    label="3">是</el-radio>
+          <el-radio v-model="dataForm.state"
                     label="2">否</el-radio>
         </template>
       </el-form-item>
-      <el-form-item v-if="dataForm.pass === '2'"
+      <el-form-item v-if="dataForm.state === '2'"
                     label="审核备注"
                     prop="remark">
         <el-input v-model="dataForm.remark"
@@ -68,15 +61,30 @@
                   show-word-limit
                   placeholder="审核备注"></el-input>
       </el-form-item>
-      <p></p>
-      <el-form-item label="用户标签"
+      <el-form-item label="扫码网格">
+        <el-table :data="userGridList"
+                  style="width: 100%">
+          <el-table-column prop="street"
+                           label="街道"
+                           width="180">
+          </el-table-column>
+          <el-table-column prop="community"
+                           label="社区"
+                           width="180">
+          </el-table-column>
+          <el-table-column prop="grid"
+                           label="网格">
+          </el-table-column>
+        </el-table>
+      </el-form-item>
+      <!-- <el-form-item label="用户标签"
                     prop="tagIds">
         <el-checkbox-group v-model="dataForm.tagIds">
           <el-checkbox v-for="item in tagOptions"
                        :key="item.tagName"
                        :label="item.id">{{item.tagName}}</el-checkbox>
         </el-checkbox-group>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -96,44 +104,22 @@ export default {
         id: '',
         partyFlag: '',
         cadreFlag: '',
-        pass: '',
-        street: '',
-        community: '',
-        grid: '',
+        state: '',
         tagIds: [],
-        registTime: '',
         remark: ''
       },
-      partyFlagOptions: [{ id: '0', name: '不是' }, { id: '1', name: '是' }],
       cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],
-      tagOptions: []
+      tagOptions: [],
+      userGridList: []
     }
   },
   computed: {
     dataRule () {
       return {
-        nickname: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        realName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        identityNo: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        address: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         partyFlag: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        pass: [
+        state: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         remark: [
@@ -171,9 +157,14 @@ export default {
           ...this.dataForm,
           ...res.data
         }
-        console.log(this.dataForm)
         this.dataForm.tagIds = []
       }).catch(() => { })
+      this.$http.get(`/app-user/usergrid/listUserGrid/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.userGridList = res.data
+      }).catch(() => { })
     },
     // 审核
     dataFormSubmitHandle: debounce(function () {
@@ -181,12 +172,19 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'post']('/app-user/user/audit/', this.dataForm).then(({ data: res }) => {
+        let postData = {
+          tagIds: this.dataForm.tagIds,
+          id: this.dataForm.id,
+          state: this.dataForm.state,
+          partyFlag: this.dataForm.partyFlag,
+          cadreFlag: this.dataForm.cadreFlag
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'post']('/app-user/user/audit/', postData).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
           // 审核通过之后触发发短信
-          this.registerResult(this.dataForm.id)
+          // this.registerResult(this.dataForm.id)
           this.$message({
             message: this.$t('prompt.success'),
             type: 'success',
diff --git a/src/views/modules/user/user-detail.vue b/src/views/modules/user/user-detail.vue
new file mode 100644
index 00000000..07c94adb
--- /dev/null
+++ b/src/views/modules/user/user-detail.vue
@@ -0,0 +1,160 @@
+<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' : '80px'">
+      <el-form-item label="真实姓名"
+                    prop="realName">
+        <span>{{dataForm.realName}}</span>
+      </el-form-item>
+      <el-form-item label="手机号"
+                    prop="mobile">
+        <span>{{dataForm.mobile}}</span>
+      </el-form-item>
+      <el-form-item label="身份证号"
+                    prop="identityNo">
+        <span>{{dataForm.identityNo}}</span>
+      </el-form-item>
+      <el-form-item label="居民住址"
+                    prop="address">
+        <span>{{dataForm.address}}</span>
+      </el-form-item>
+      <el-form-item label="是否党员"
+                    prop="partyFlag">
+        <span v-if="dataForm.partyFlag === '0'">否</span>
+        <span v-if="dataForm.partyFlag === '1'">是</span>
+      </el-form-item>
+      <!-- <el-form-item label="干部下沉">
+        <el-select v-model="dataForm.cadreFlag"
+                   clearable
+                   placeholder="请选择">
+          <el-option v-for="item in cadreOptions"
+                     :key="item.cadreFlag"
+                     :label="item.cadreTitle"
+                     :value="item.cadreFlag">
+          </el-option>
+        </el-select>
+      </el-form-item> -->
+      <el-form-item label="通过审核"
+                    prop="state">
+        <span v-if="dataForm.state === '3'">是</span>
+        <span v-if="dataForm.state === '2'">否</span>
+      </el-form-item>
+      <el-form-item v-if="dataForm.state === '2'"
+                    label="审核备注"
+                    prop="remark">
+        <span>{{dataForm.remark}}</span>
+      </el-form-item>
+      <el-form-item label="扫码网格">
+        <el-table :data="userGridList"
+                  style="width: 100%">
+          <el-table-column prop="street"
+                           label="街道">
+          </el-table-column>
+          <el-table-column prop="community"
+                           label="社区">
+          </el-table-column>
+          <el-table-column prop="grid"
+                           label="网格">
+          </el-table-column>
+          <el-table-column prop="leaderFlag"
+                           label="是否为网格长"
+                           :formatter="showLeaderFlagFormatter">
+          </el-table-column>
+        </el-table>
+      </el-form-item>
+      <!-- <el-form-item label="用户标签"
+                    prop="tagIds">
+        <el-checkbox-group v-model="dataForm.tagIds">
+          <el-checkbox v-for="item in tagOptions"
+                       :key="item.tagName"
+                       :label="item.id">{{item.tagName}}</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item> -->
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false"
+                 type="primary">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        partyFlag: '',
+        cadreFlag: '',
+        state: '',
+        tagIds: [],
+        remark: ''
+      },
+      partyFlagOptions: [{ id: '0', name: '不是' }, { id: '1', name: '是' }],
+      cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],
+      tagOptions: [],
+      userGridList: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+      this.getTagOptions()
+    },
+    getTagOptions () {
+      this.$http.get(`/app-user/usertag/list`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.tagOptions = res.data
+      }).catch(() => { })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/user/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        this.dataForm.tagIds = []
+      }).catch(() => { })
+      this.$http.get(`/app-user/usergrid/listUserGrid/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.userGridList = res.data
+      }).catch(() => { })
+    },
+    showLeaderFlagFormatter (row, column, cellValue, index) {
+      console.log(cellValue)
+      if (cellValue === '1') {
+        return '是'
+      } else {
+        return '否'
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index 042b5af7..21b3c656 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -1,323 +1,155 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <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()">
-        <P></P>
-        <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-form-item>
-          <el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input>
-        </el-form-item>
-        </el-form-item>
-         <el-form-item label="手机号">
-        <el-form-item>
-          <el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input>
-        </el-form-item>
-        </el-form-item>
-           <el-form-item label="身份证号">
-        <el-form-item>
-          <el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input>
-        </el-form-item>
-        </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="street" label="所属街道" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="community" label="所属社区" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="grid" label="所属网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="address" label="居民住址" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button  type="text" size="small" @click="addOrUpdateHandle(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>
-           <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-form-item>
-          <el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input>
-        </el-form-item>
-        </el-form-item>
-         <el-form-item label="手机号">
-        <el-form-item>
-          <el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input>
-        </el-form-item>
-        </el-form-item>
-           <el-form-item label="身份证号">
-        <el-form-item>
-          <el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input>
-        </el-form-item>
-        </el-form-item>
-        <div class="block">
-          <el-form-item label="是否是党员">
-          <el-select v-model="dataForm.isParty" clearable placeholder="请选择" >
-            <el-option
-              v-for="(item,index) in partyFlagOptions"
-              :key="index"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <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="partyFlag" label="是否党员" :formatter="formatPartyFlag" 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="street" label="所属街道" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="community" label="所属社区" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="grid" label="所属网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="address" label="居民住址" header-align="center" align="center"></el-table-column>
-      </el-table>
-      <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="2">
-              <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-form-item>
-          <el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input>
-        </el-form-item>
-        </el-form-item>
-         <el-form-item label="手机号">
-        <el-form-item>
-          <el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input>
-        </el-form-item>
-        </el-form-item>
-           <el-form-item label="身份证号">
-        <el-form-item>
-          <el-input v-model="dataForm.identityNo" placeholder="请输入" clearable></el-input>
-        </el-form-item>
-        </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="street" label="所属街道" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="community" label="所属社区" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="grid" label="所属网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="address" label="居民住址" header-align="center" align="center"></el-table-column>
-      </el-table>
-      <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-tabs>
-            <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-        </template>
+      <template>
+        <el-tabs v-model="tabFlag" type="border-card" @tab-click="handleClick">
+          <el-tab-pane  name="1">
+            <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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+                  <template slot-scope="scope"><el-button  type="text" size="small" @click="addOrUpdateHandle(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="3">
+            <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">
+                  <el-form-item label="是否是党员">
+                    <el-select v-model="dataForm.partyFlag" clearable placeholder="请选择" >
+                      <el-option v-for="(item,index) in partyFlagOptions" :key="index" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                  </el-form-item>
+                  <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="partyFlag" label="是否党员" :formatter="formatPartyFlag" 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 :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="2">
+            <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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="100">
+                  <template slot-scope="scope"><el-button  type="text" size="mini" @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-tabs>
+        <!-- 弹窗, 新增 / 修改 -->
+        <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+        <user-detail v-if="userDetailVisible" ref="userDetail" @refreshDataList="getDataList"></user-detail>
+      </template>
     </div>
   </el-card>
 </template>
@@ -325,6 +157,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './user-add-or-update'
+import UserDetail from './user-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -346,14 +179,15 @@ export default {
         identityNo: '',
         startTime: '',
         endTime: '',
-        isParty: '',
-        auditState: '0'
+        partyFlag: '',
+        state: '1'
       },
+      userDetailVisible: false,
       streetOptions: [],
       communityOptions: [],
       gridOptions: [],
       time: '',
-      tabFlag: '0',
+      tabFlag: '1',
       state: '待审核用户',
       partyFlagOptions: [{ id: '1', name: '是' }, { id: '0', name: '否' }]
     }
@@ -371,41 +205,42 @@ export default {
       }).catch(() => {})
     },
     getCommunityList () {
-      if (this.dataForm.streetId === '') {
-        this.communityOptions = []
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        return
+      this.communityOptions = this.gridOptions = []
+      this.dataForm.communityId = this.dataForm.gridId = null
+      if (this.dataForm.streetId) {
+        this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.communityOptions = res.data
+        }).catch(() => {})
       }
-      this.dataForm.communityId = ''
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.communityOptions = res.data
-      }).catch(() => {})
     },
     getGridList () {
-      if (this.dataForm.communityId === '') {
-        this.gridOptions = []
-        this.dataForm.gridId = ''
-        return
+      this.gridOptions = []
+      this.dataForm.gridId = null
+      if (this.dataForm.communityId) {
+        this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.gridOptions = res.data
+        }).catch(() => {})
       }
-      this.dataForm.gridId = ''
-      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.gridOptions = res.data
-      }).catch(() => {})
     },
     setRegistTime () {
       this.dataForm.startTime = this.time[0]
       this.dataForm.endTime = this.time[1]
     },
     formatState: function (row, column) {
-      return row.state === '1' ? '审核通过' : row.state === '0' ? '待审核' : '审核未通过'
+      let state = row.state
+      if (state === '1') {
+        return '待审核'
+      } else if (state === '2') {
+        return '审核不通过'
+      } else if (state === '3') {
+        return '审核通过'
+      }
     },
     formatPartyFlag: function (row, column) {
       return row.partyFlag === '1' ? '是' : row.state === '0' ? '未知' : '否'
@@ -419,17 +254,8 @@ export default {
       this.dataForm.identityNo = ''
       this.dataForm.startTime = ''
       this.dataForm.endTime = ''
-      this.dataForm.isParty = ''
-      this.dataForm.auditState = ''
-      if (this.tabFlag === '0') {
-        this.dataForm.auditState = 0
-        this.dataForm.isParty = ''
-      } else if (this.tabFlag === '1') {
-        this.dataForm.auditState = 1
-      } else if (this.tabFlag === '2') {
-        this.dataForm.auditState = 2
-        this.dataForm.isParty = ''
-      }
+      this.dataForm.partyFlag = ''
+      this.dataForm.state = this.tabFlag
       this.getDataList()
     },
     // 获取数据列表
@@ -462,10 +288,18 @@ export default {
       }).catch(() => {
         this.dataListLoading = false
       })
+    },
+    userDetailHandle (userId) {
+      this.userDetailVisible = true
+      this.$nextTick(() => {
+        this.$refs.userDetail.dataForm.id = userId
+        this.$refs.userDetail.init()
+      })
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    UserDetail
   }
 }
 </script>