diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index 06c1d4e4..56eb7823 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -7,51 +7,52 @@
             <el-button type="primary" plain>成功按钮</el-button>
             <el-button type="primary" plain>信息按钮</el-button>
         </el-row>
-        <template>
-          <span>街道&nbsp;&nbsp;&nbsp;&nbsp;</span>
-          <el-select v-model="value" placeholder="请选择">
+        <P></P>
+        <el-form-item label="街道">
+          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              v-for="item in streetOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
             </el-option>
           </el-select>
-      </template>
-      <template>
-          <span>社区&nbsp;&nbsp;&nbsp;&nbsp;</span>
-          <el-select v-model="value" placeholder="请选择">
+        </el-form-item>
+        <el-form-item label="社区">
+          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              v-for="item in communityOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
             </el-option>
           </el-select>
-      </template>
-      <template>
-          <span>网格&nbsp;&nbsp;&nbsp;&nbsp;</span>
-          <el-select v-model="value" placeholder="请选择">
+        </el-form-item>
+        <el-form-item label="网格">
+          <el-select v-model="dataForm.gridId" placeholder="请选择">
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              v-for="item in gridOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
             </el-option>
           </el-select>
-      </template>
+        </el-form-item>
       <p></p>
-        <span >姓名&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <el-form-item label="姓名">
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-input v-model="dataForm.realName" placeholder="realName" clearable></el-input>
+        </el-form-item>
         </el-form-item>
-        <span>手机号&nbsp;&nbsp;&nbsp;&nbsp;</span>
+         <el-form-item label="手机号">
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-input v-model="dataForm.mobile" placeholder="mobile" clearable></el-input>
         </el-form-item>
-          <span>身份证号&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        </el-form-item>
+           <el-form-item label="身份证号">
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-input v-model="dataForm.identityNo" placeholder="identityNo" clearable></el-input>
+        </el-form-item>
         </el-form-item>
         <p></p>
         <div class="block">
@@ -84,10 +85,13 @@
         <!-- <el-table-column prop="nickname" 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="是否是党员(0-否，1-是)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="partyFlag" label="是否是党员(0-否，1-是)" :formatter="formatPartyFlag" header-align="center" align="center"></el-table-column>
         <el-table-column prop="state" label="审核状态" 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="phoneProvince" label="手机号所属省份" header-align="center" align="center"></el-table-column>
+        <!-- <el-table-column prop="phoneProvince" 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 prop="faceImg" label="头像" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sex" label="性别(女性-female，男性-male)" header-align="center" align="center"></el-table-column>
@@ -147,46 +151,60 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: 'app-user/epdc/user/page',
+        getDataListURL: 'app-user/user/page',
         getDataListIsPage: true,
-        deleteURL: '/app-use/epdc/user',
+        deleteURL: '/app-use/user',
         deleteIsBatch: true,
         exportURL: '/sys/log/login/export'
       },
       dataForm: {
-        id: ''
+        id: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        realName: '',
+        mobile: '',
+        identityNo: ''
       },
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      value: ''
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      value1: ''
     }
   },
   created () {
-    this.getDeptList()
+    this.getStreetList()
   },
   methods: {
-    // 获取部门列表
-    getDeptList () {
-      return this.$http.get('/sys/dept/list').then(({ data: res }) => {
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => {})
+    },
+    getCommunityList () {
+      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 () {
+      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.deptList = res.data
+        this.gridOptions = res.data
       }).catch(() => {})
+    },
+    formatPartyFlag: function (row, column) {
+      return row.partyFlag === 1 ? '是' : row.partyFlag === 0 ? '否' : '未知'
     }
   },
   components: {