From 8d86faa77fdef1973e6377221dbab4e981ef711c Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 21 Aug 2020 17:49:48 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=87=87=E9=9B=86-=E5=B1=85=E4=BD=8F=E4=BA=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/houseResidentInfo.vue  | 143 +++++
 .../user/housebusinessinfo-add-or-update.vue  | 152 +++++
 src/views/modules/user/housebusinessinfo.vue  |  76 +++
 src/views/modules/user/househeadedit.vue      | 530 ++++++++++++++++++
 .../modules/user/houseinfomationroute.vue     |  31 +
 .../user/houserentinfo-add-or-update.vue      | 145 +++++
 src/views/modules/user/houserentinfo.vue      |  75 +++
 .../user/houseresidentInfo-add-or-update.vue  | 210 +++++++
 .../user/housinginformation-add-or-update.vue | 267 +++++++++
 .../user/housinginformation-detail.vue        | 170 ++++++
 src/views/modules/user/housinginformation.vue | 186 ++++++
 .../populationinformation-add-or-update.vue   | 369 ++++++++++++
 .../modules/user/populationinformation.vue    | 107 ++++
 13 files changed, 2461 insertions(+)
 create mode 100644 src/views/modules/user/houseResidentInfo.vue
 create mode 100644 src/views/modules/user/housebusinessinfo-add-or-update.vue
 create mode 100644 src/views/modules/user/housebusinessinfo.vue
 create mode 100644 src/views/modules/user/househeadedit.vue
 create mode 100644 src/views/modules/user/houseinfomationroute.vue
 create mode 100644 src/views/modules/user/houserentinfo-add-or-update.vue
 create mode 100644 src/views/modules/user/houserentinfo.vue
 create mode 100644 src/views/modules/user/houseresidentInfo-add-or-update.vue
 create mode 100644 src/views/modules/user/housinginformation-add-or-update.vue
 create mode 100644 src/views/modules/user/housinginformation-detail.vue
 create mode 100644 src/views/modules/user/housinginformation.vue
 create mode 100644 src/views/modules/user/populationinformation-add-or-update.vue
 create mode 100644 src/views/modules/user/populationinformation.vue

diff --git a/src/views/modules/user/houseResidentInfo.vue b/src/views/modules/user/houseResidentInfo.vue
new file mode 100644
index 0000000..2492d7b
--- /dev/null
+++ b/src/views/modules/user/houseResidentInfo.vue
@@ -0,0 +1,143 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-news__populationinformation}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-button type="primary" @click="backToHouseheadedit">{{"返回"}}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+        <el-table-column prop="houseHeadRelation" label="与户主关系" header-align="center" align="center" :formatter="houseHeadRelationFormat"></el-table-column>
+        <el-table-column prop="residentsName" label="姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentsSex" label="性别" header-align="center" align="center" :formatter="sexFormat"></el-table-column>
+        <el-table-column prop="residentsNation" label="民族" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="educationLevel" label="文化程度" header-align="center" align="center" :formatter="educationLevelFormat"></el-table-column>
+        <el-table-column prop="politicsStatus" label="政治面貌" header-align="center" align="center" :formatter="politicsStatusFormat"></el-table-column>
+        <el-table-column prop="residentsIdentityNo" label="身份证号码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentsPhone" label="联系电话" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="currentEmployer" label="单位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="currentAddress" 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)">{{ $t('update') }}</el-button>
+            <el-button  type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" :houseId="dataForm.houseId"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './houseresidentInfo-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/houseresident/page',
+        getDataListIsPage: true,
+        deleteURL: '/app-user/houseresident',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        houseId: ''
+      },
+      educationLevelList: [],
+      politicsStatusList: [],
+      houseHeadRelationList: [
+        {
+          label: '子女',
+          value: '0'
+        },
+        {
+          label: '夫妻',
+          value: '1'
+        },
+        {
+          label: '其他',
+          value: '2'
+        }
+      ]
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  created () {
+    this.$http.get(`/sys/dict/listSimple/education_level`).then(({ data: res }) => {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.educationLevelList = res.data
+    }).catch(() => { })
+    this.$http.get(`/sys/dict/listSimple/politics_status`).then(({ data: res }) => {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.politicsStatusList = res.data
+    }).catch(() => { })
+  },
+  mounted () {
+    if (this.$route.query.id !== '' && this.$route.query.id != null) {
+      this.dataForm.houseId = this.$route.query.id
+      this.getDataList()
+    }
+  },
+  methods: {
+    backToHouseheadedit () {
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'Househeadedit'
+      this.$router.push({ path: '/user-houseinfomationroute', query: { id: this.$route.query.id } })
+    },
+    educationLevelFormat: function (row, column) {
+      if (row.educationLevel) {
+        let dict = this.educationLevelList.filter(item => item.dictValue === row.educationLevel)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    },
+    politicsStatusFormat: function (row, column) {
+      if (row.politicsStatus) {
+        let dict = this.politicsStatusList.filter(item => item.dictValue === row.politicsStatus)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    },
+    sexFormat: function (row, column) {
+      return row.residentsSex === '0' ? '女' : '男'
+    },
+    houseHeadRelationFormat: function (row, column) {
+      if (row.houseHeadRelation) {
+        let dict = this.houseHeadRelationList.filter(item => item.value === row.houseHeadRelation)[0]
+        if (dict) {
+          return dict.label
+        }
+      }
+      return ''
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/housebusinessinfo-add-or-update.vue b/src/views/modules/user/housebusinessinfo-add-or-update.vue
new file mode 100644
index 0000000..f3336b4
--- /dev/null
+++ b/src/views/modules/user/housebusinessinfo-add-or-update.vue
@@ -0,0 +1,152 @@
+<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="enterpriseName">
+          <el-input v-model="dataForm.enterpriseName" placeholder="企业名称"></el-input>
+      </el-form-item>
+          <el-form-item label="社会统一代码" prop="socialUniformCode">
+          <el-input v-model="dataForm.socialUniformCode" placeholder="社会统一代码"></el-input>
+      </el-form-item>
+          <el-form-item label="法人代表" prop="legalRepresentative">
+          <el-input v-model="dataForm.legalRepresentative" placeholder="法人代表"></el-input>
+      </el-form-item>
+          <el-form-item label="电话" prop="enterprisePhone">
+          <el-input v-model="dataForm.enterprisePhone" placeholder="电话"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋ID" prop="houseId">
+          <el-input v-model="dataForm.houseId" placeholder="房屋ID"></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">
+      <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: '',
+        enterpriseName: '',
+        socialUniformCode: '',
+        legalRepresentative: '',
+        enterprisePhone: '',
+        houseId: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        enterpriseName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        socialUniformCode: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        legalRepresentative: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        enterprisePhone: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { 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(`/news/housebusinessinfo/${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']('/news/housebusinessinfo/', 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/user/housebusinessinfo.vue b/src/views/modules/user/housebusinessinfo.vue
new file mode 100644
index 0000000..76ec403
--- /dev/null
+++ b/src/views/modules/user/housebusinessinfo.vue
@@ -0,0 +1,76 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-news__housebusinessinfo}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:housebusinessinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:housebusinessinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </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 prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="enterpriseName" label="企业名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="socialUniformCode" label="社会统一代码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="legalRepresentative" label="法人代表" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="enterprisePhone" label="电话" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="houseId" label="房屋ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标识 (0：否 1：是)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" 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 v-if="$hasPermission('news:housebusinessinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('news:housebusinessinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './housebusinessinfo-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/news/housebusinessinfo/page',
+        getDataListIsPage: true,
+        deleteURL: '/news/housebusinessinfo',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/user/househeadedit.vue b/src/views/modules/user/househeadedit.vue
new file mode 100644
index 0000000..3d2fe5a
--- /dev/null
+++ b/src/views/modules/user/househeadedit.vue
@@ -0,0 +1,530 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-news__news}">
+        <el-button type="primary" @click="backToUserRelationList">{{"返回"}}</el-button>
+       <el-button type="info" @click="getResidentsInfo">居住人信息</el-button>
+
+        <el-button style="float:right" v-if="noEdit" type="primary" @click="editResidentInfo">{{"编辑"}}</el-button>
+        <el-button style="float:right" v-if="isEdit" type="primary" @click="submitResidentInfo">{{"保存"}}</el-button>
+        <el-button style="float:right" v-if="isEdit" type="primary" @click="cancelEditResidentInfo">{{"取消"}}</el-button>
+    <el-form  :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+      <br>
+      <hr>
+      <fieldset :disabled="noEdit" style="border: 0">
+      <el-form-item class="item" label="基本信息">
+      </el-form-item>
+      <br>
+      <el-form-item label="户主姓名" prop="residentsName" >
+        <el-input v-model="dataForm.residentsName" placeholder="姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="性别" prop="residentsSex">
+        <el-radio-group v-model="dataForm.residentsSex">
+          <el-radio  label="0">女</el-radio>
+          <el-radio  label="1">男</el-radio>
+        </el-radio-group>
+      </el-form-item>
+          <el-form-item label="民族" prop="residentsNation">
+          <el-input v-model="dataForm.residentsNation" placeholder="民族"></el-input>
+      </el-form-item>
+          <el-form-item label="出生年月" prop="residentsBirthday">
+            <el-date-picker
+                v-model="dataForm.residentsBirthday"
+                type="date"
+                placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="文化程度" prop="educationLevel">
+            <el-radio-group v-model="dataForm.educationLevel">
+              <el-radio  v-for="item in educationLevelList"
+                         :key="item.dictValue"
+                         :label="item.dictValue">{{item.dictName}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="政治面貌" prop="politicsStatus">
+            <el-radio-group v-model="dataForm.politicsStatus">
+              <el-radio  v-for="item in politicsStatusList"
+                         :key="item.dictValue"
+                         :label="item.dictValue">{{item.dictName}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="入党时间" prop="joinTime">
+            <el-date-picker
+                v-model="dataForm.joinTime"
+                type="date"
+                placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="组织关系所在地" prop="organizationalRelationshipLocation">
+          <el-input v-model="dataForm.organizationalRelationshipLocation" placeholder="组织关系所在地"></el-input>
+      </el-form-item>
+          <el-form-item label="身份证号码" prop="residentsIdentityNo">
+          <el-input v-model="dataForm.residentsIdentityNo" placeholder="身份证号码"></el-input>
+      </el-form-item>
+          <el-form-item label="联系电话" prop="residentsPhone">
+          <el-input v-model="dataForm.residentsPhone" placeholder="联系电话"></el-input>
+      </el-form-item>
+      <br>
+          <el-form-item label="身体状况" prop="bodyStatus">
+            <el-radio-group v-model="dataForm.bodyStatus">
+              <el-radio  v-for="item in bodyStatusList"
+                         :key="item.dictValue"
+                         :label="item.dictValue">{{item.dictName}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="婚姻状况" prop="maritalStatus">
+            <el-radio-group v-model="dataForm.maritalStatus">
+              <el-radio  v-for="item in maritalStatusList"
+                         :key="item.dictValue"
+                         :label="item.dictValue">{{item.dictName}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="户口类型" prop="accountType">
+            <el-radio-group v-model="dataForm.accountType">
+              <el-radio  v-for="item in accountTypeList"
+                         :key="item.dictValue"
+                         :label="item.dictValue">{{item.dictName}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="服兵役" prop="militaryService">
+            <el-radio-group v-model="dataForm.militaryService">
+              <el-radio  label="0">否</el-radio>
+              <el-radio  label="1">是</el-radio>
+            </el-radio-group>
+          </el-form-item>
+      <br>
+          <el-form-item label="户籍地" prop="householdRegistrationPlace">
+          <el-input v-model="dataForm.householdRegistrationPlace" placeholder="户籍地" style="width: 500px"></el-input>
+      </el-form-item>
+      <br>
+      <hr>
+      <el-form-item class="item" label="就业情况">
+      </el-form-item>
+      <br>
+          <el-form-item label="就业情况" prop="employmentStatus">
+            <el-radio-group v-model="dataForm.employmentStatus">
+              <el-radio  v-for="item in employmentStatusList"
+                         :key="item.dictValue"
+                         :label="item.dictValue">{{item.dictName}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="现工作单位" prop="currentEmployer">
+          <el-input v-model="dataForm.currentEmployer" placeholder="现工作单位"></el-input>
+      </el-form-item>
+          <el-form-item label="现单位地址" prop="currentEmployerAddress">
+          <el-input v-model="dataForm.currentEmployerAddress" placeholder="现单位地址"></el-input>
+      </el-form-item>
+      <br>
+          <el-form-item label="失业原因" prop="unemploymentReason">
+            <el-radio-group v-model="dataForm.unemploymentReason">
+              <el-radio  v-for="item in unemploymentReasonList"
+                         :key="item.dictValue"
+                         :label="item.dictValue">{{item.dictName}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="再就业优惠证" prop="reemploymentPermit">
+          <el-input v-model="dataForm.reemploymentPermit" placeholder="再就业优惠证"></el-input>
+      </el-form-item>
+      <br>
+          <el-form-item label="失业登记" prop="unemploymentRegister">
+            <el-radio-group v-model="dataForm.unemploymentRegister">
+              <el-radio  label="0">否</el-radio>
+              <el-radio  label="1">是</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="失业登记时间" prop="unemploymentRegisterTime">
+            <el-date-picker
+                v-model="dataForm.unemploymentRegisterTime"
+                type="date"
+                placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+      <br>
+      <hr>
+      <el-form-item class="item" label="家庭情况">
+      </el-form-item>
+      <br>
+          <el-form-item label="家庭类别" prop="familyCategory">
+            <el-radio-group v-model="dataForm.familyCategory">
+              <el-radio  v-for="item in familyCategoryList"
+                         :key="item.dictValue"
+                         :label="item.dictValue">{{item.dictName}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+      <br>
+          <el-form-item label="救助情况" prop="helpStatus">
+            <el-radio-group v-model="dataForm.helpStatus">
+              <el-radio  v-for="item in helpStatusList"
+                         :key="item.dictValue"
+                         :label="item.dictValue">{{item.dictName}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+      <br>
+          <el-form-item label="机动车数量" prop="motorVehicleNum">
+            <el-input-number v-model="dataForm.motorVehicleNum" placeholder="机动车数量"></el-input-number>
+      </el-form-item>
+          <el-form-item label="机动车类型" prop="motorVehicleCategory">
+            <el-radio-group v-model="dataForm.motorVehicleCategory">
+              <el-radio  v-for="item in motorVehicleCategoryList"
+                         :key="item.dictValue"
+                         :label="item.dictValue">{{item.dictName}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="宠物犬状况" prop="dogStatus">
+            <el-radio-group v-model="dataForm.dogStatus">
+              <el-radio  label="0">无</el-radio>
+              <el-radio  label="1">有</el-radio>
+            </el-radio-group>
+          </el-form-item>
+      <br>
+          <el-form-item label="家庭成员数" prop="familyMemberNum">
+            <el-input-number v-model="dataForm.familyMemberNum" placeholder="家庭成员数"></el-input-number>
+      </el-form-item>
+          <el-form-item label="家庭外出成员数" prop="familyMemberOutNum">
+          <el-input v-model="dataForm.familyMemberOutNum" placeholder="家庭外出成员数"></el-input>
+      </el-form-item>
+          <el-form-item label="外出原因" prop="familyMemberOutReason">
+            <el-radio-group v-model="dataForm.familyMemberOutReason">
+              <el-radio  v-for="item in familyMemberOutReasonList"
+                         :key="item.dictValue"
+                         ::label="item.dictValue">{{item.dictName}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="在外月数" prop="familyMemberOutMonth">
+          <el-input-number v-model="dataForm.familyMemberOutMonth" placeholder="在外月数"></el-input-number>
+      </el-form-item>
+      </fieldset>
+      </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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        residentsName: '',
+        residentsSex: '',
+        residentsNation: '',
+        residentsBirthday: '',
+        educationLevel: '',
+        politicsStatus: '',
+        joinTime: '',
+        organizationalRelationshipLocation: '',
+        residentsIdentityNo: '',
+        residentsPhone: '',
+        bodyStatus: '',
+        maritalStatus: '',
+        accountType: '',
+        militaryService: '',
+        householdRegistrationPlace: '',
+        employmentStatus: '',
+        currentEmployer: '',
+        currentEmployerAddress: '',
+        unemploymentReason: '',
+        reemploymentPermit: '',
+        unemploymentRegister: '',
+        unemploymentRegisterTime: '',
+        familyCategory: '',
+        helpStatus: '',
+        motorVehicleNum: '',
+        motorVehicleCategory: '',
+        dogStatus: '',
+        familyMemberNum: '',
+        familyMemberOutNum: '',
+        familyMemberOutReason: '',
+        familyMemberOutMonth: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        gridId: '',
+        parentDeptIds: '',
+        parentDeptNames: '',
+        allDeptIds: '',
+        allDeptNames: ''
+      },
+      educationLevelList: [],
+      politicsStatusList: [],
+      bodyStatusList: [],
+      maritalStatusList: [],
+      accountTypeList: [],
+      employmentStatusList: [],
+      unemploymentReasonList: [],
+      familyCategoryList: [],
+      helpStatusList: [],
+      motorVehicleCategoryList: [],
+      familyMemberOutReasonList: [],
+      noEdit: true,
+      isEdit: false
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        residentsName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsSex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsNation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsBirthday: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        educationLevel: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        politicsStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        joinTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        organizationalRelationshipLocation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsIdentityNo: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsPhone: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        bodyStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        maritalStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        accountType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        militaryService: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        householdRegistrationPlace: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        employmentStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        currentEmployer: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        currentEmployerAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unemploymentReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        reemploymentPermit: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unemploymentRegister: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unemploymentRegisterTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        familyCategory: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        helpStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        motorVehicleNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        motorVehicleCategory: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        dogStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        familyMemberNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        familyMemberOutNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        familyMemberOutReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        familyMemberOutMonth: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  mounted () {
+    if (this.$route.query.id !== '' && this.$route.query.id != null) {
+      this.dataForm.id = this.$route.query.id
+      this.getInfo()
+    }
+  },
+  created () {
+    this.getAllDict()
+  },
+  methods: {
+    getResidentsInfo () {
+      this.$parent.selectComponent = 'HouseResidentInfo'
+      this.$router.push({ path: '/user-houseinfomationroute', query: { id: this.$route.query.id } })
+    },
+    editResidentInfo () {
+      this.isEdit = true
+      this.noEdit = false
+    },
+    cancelEditResidentInfo () {
+      this.$confirm('如果取消，之前编辑会丢失，确定取消吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.isEdit = false
+        this.noEdit = true
+        this.init()
+      }).catch(() => {
+      })
+    },
+    submitResidentInfo () {
+      this.dataFormSubmitHandle()
+    },
+    getAllDict () {
+      this.$http.get(`/sys/dict/listSimple/education_level`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.educationLevelList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/politics_status`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.politicsStatusList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/body_status`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.bodyStatusList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/marital_status`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.maritalStatusList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/account_type`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.accountTypeList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/employment_status`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.employmentStatusList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/unemployment_reason`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.unemploymentReasonList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/family_category`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.familyCategoryList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/help_status`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.helpStatusList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/motor_vehicle_category`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.motorVehicleCategoryList = res.data
+      }).catch(() => { })
+      this.$http.get(`/sys/dict/listSimple/family_member_out_reason`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.familyMemberOutReasonList = res.data
+      }).catch(() => { })
+    },
+    backToUserRelationList () {
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'Housinginformation'
+      this.$router.push({ path: '/user-houseinfomationroute' })
+    },
+    init () {
+      this.dataForm.id = this.$route.query.id
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/populationinformation/getHouseHeadInfo?id=` + 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']('/app-user/populationinformation/', 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>
+<style>
+  .item .el-form-item__label{
+    font-size: 20px;
+    width: 50px;
+    font-weight: bold;
+  }
+</style>
diff --git a/src/views/modules/user/houseinfomationroute.vue b/src/views/modules/user/houseinfomationroute.vue
new file mode 100644
index 0000000..db1b230
--- /dev/null
+++ b/src/views/modules/user/houseinfomationroute.vue
@@ -0,0 +1,31 @@
+<template>
+    <keep-alive include="housinginformation">
+        <component :is="selectComponent"></component>
+    </keep-alive>
+</template>
+<script>
+import Housinginformation from './housinginformation'
+import Househeadedit from './househeadedit'
+import HouseResidentInfo from './houseResidentInfo'
+export default {
+  data () {
+    return {
+      selectComponent: Housinginformation
+    }
+  },
+  components: {
+    Housinginformation,
+    Househeadedit,
+    HouseResidentInfo
+  },
+  methods: {
+    init () {
+      this.selectComponent = Housinginformation
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/user/houserentinfo-add-or-update.vue b/src/views/modules/user/houserentinfo-add-or-update.vue
new file mode 100644
index 0000000..f2ec19d
--- /dev/null
+++ b/src/views/modules/user/houserentinfo-add-or-update.vue
@@ -0,0 +1,145 @@
+<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="tenantName">
+          <el-input v-model="dataForm.tenantName" placeholder="承租人姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="承租人电话" prop="tenantPhone">
+          <el-input v-model="dataForm.tenantPhone" placeholder="承租人电话"></el-input>
+      </el-form-item>
+          <el-form-item label="承租人身份证号" prop="tenantIdentityNo">
+          <el-input v-model="dataForm.tenantIdentityNo" placeholder="承租人身份证号"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋ID" prop="houseId">
+          <el-input v-model="dataForm.houseId" placeholder="房屋ID"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" 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="创建人" 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">
+      <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: '',
+        tenantName: '',
+        tenantPhone: '',
+        tenantIdentityNo: '',
+        houseId: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        tenantName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        tenantPhone: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        tenantIdentityNo: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { 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(`/news/houserentinfo/${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']('/news/houserentinfo/', 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/user/houserentinfo.vue b/src/views/modules/user/houserentinfo.vue
new file mode 100644
index 0000000..d7282fa
--- /dev/null
+++ b/src/views/modules/user/houserentinfo.vue
@@ -0,0 +1,75 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-news__houserentinfo}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:houserentinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:houserentinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </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 prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="tenantName" label="承租人姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="tenantPhone" label="承租人电话" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="tenantIdentityNo" label="承租人身份证号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="houseId" label="房屋ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标识" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" 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 v-if="$hasPermission('news:houserentinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('news:houserentinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './houserentinfo-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/news/houserentinfo/page',
+        getDataListIsPage: true,
+        deleteURL: '/news/houserentinfo',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/user/houseresidentInfo-add-or-update.vue b/src/views/modules/user/houseresidentInfo-add-or-update.vue
new file mode 100644
index 0000000..c98bc98
--- /dev/null
+++ b/src/views/modules/user/houseresidentInfo-add-or-update.vue
@@ -0,0 +1,210 @@
+<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' : '120px'">
+      <el-form-item label="与户主关系" prop="houseHeadRelation">
+        <el-select v-model="dataForm.houseHeadRelation">
+          <el-option  v-for="item in houseHeadRelationList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="姓名" prop="residentsName" >
+        <el-input v-model="dataForm.residentsName" placeholder="姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="民族" prop="residentsNation">
+        <el-input v-model="dataForm.residentsNation" placeholder="民族"></el-input>
+      </el-form-item>
+      <el-form-item label="文化程度" prop="educationLevel">
+        <el-select v-model="dataForm.educationLevel">
+          <el-option  v-for="item in educationLevelList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="政治面貌" prop="politicsStatus">
+        <el-radio-group v-model="dataForm.politicsStatus">
+          <el-radio  v-for="item in politicsStatusList"
+                     :key="item.dictValue"
+                     :label="item.dictValue">{{item.dictName}}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="身份证号码" prop="residentsIdentityNo">
+        <el-input v-model="dataForm.residentsIdentityNo" placeholder="身份证号码"></el-input>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="residentsPhone">
+        <el-input v-model="dataForm.residentsPhone" placeholder="联系电话"></el-input>
+      </el-form-item>
+      <el-form-item label="工作单位" prop="currentEmployer">
+        <el-input v-model="dataForm.currentEmployer" placeholder="现工作单位"></el-input>
+      </el-form-item>
+      <el-form-item label="现居住地址单位" prop="currentAddress">
+        <el-input v-model="dataForm.currentAddress" placeholder="现工作单位"></el-input>
+      </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: {
+        houseId: '',
+        residentsName: '',
+        residentsSex: '',
+        residentsNation: '',
+        educationLevel: '',
+        politicsStatus: '',
+        residentsIdentityNo: '',
+        residentsPhone: '',
+        currentEmployer: '',
+        currentAddress: '',
+        houseHeadRelation: '',
+        isEditResidentInfo: ''
+      },
+      educationLevelList: [],
+      politicsStatusList: [],
+      houseHeadRelationList: [
+        {
+          label: '子女',
+          value: '0'
+        },
+        {
+          label: '夫妻',
+          value: '1'
+        },
+        {
+          label: '其他',
+          value: '2'
+        }
+      ]
+    }
+  },
+  props: ['houseId'],
+  computed: {
+    dataRule () {
+      return {
+        residentsName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsNation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        educationLevel: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        politicsStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsIdentityNo: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsPhone: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        currentEmployer: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        currentAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+    this.$http.get(`/sys/dict/listSimple/education_level`).then(({ data: res }) => {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.educationLevelList = res.data
+    }).catch(() => { })
+    this.$http.get(`/sys/dict/listSimple/politics_status`).then(({ data: res }) => {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.politicsStatusList = res.data
+    }).catch(() => { })
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/houseresident/${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.dataForm.houseId = this.houseId
+        this.dataForm.isEditResidentInfo = '0'
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/houseresident/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          if (res.data !== '' && res.data !== undefined && res.data !== null) {
+            this.$confirm(res.data, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.dataForm.isEditResidentInfo = '1'
+              this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/houseresident/', 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(() => {})
+            }).catch(() => {})
+          } else {
+            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/user/housinginformation-add-or-update.vue b/src/views/modules/user/housinginformation-add-or-update.vue
new file mode 100644
index 0000000..4594528
--- /dev/null
+++ b/src/views/modules/user/housinginformation-add-or-update.vue
@@ -0,0 +1,267 @@
+<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' : '120px'">
+          <el-form-item label="房屋地址" prop="houseAddress">
+          <el-input v-model="dataForm.houseAddress" placeholder="房屋地址"></el-input>
+      </el-form-item>
+          <el-form-item label="购房时间" prop="buyingTime">
+            <el-date-picker
+                v-model="dataForm.buyingTime"
+                type="date"
+                placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="房屋面积(m²)" prop="houseArea" width="50px">
+          <el-input-number v-model="dataForm.houseArea" placeholder="房屋面积" :min="1"></el-input-number>
+      </el-form-item>
+          <el-form-item label="产权人" prop="propertyOwner">
+          <el-input v-model="dataForm.propertyOwner" placeholder="产权人"></el-input>
+      </el-form-item>
+      <el-form-item label="产权人联系电话" prop="propertyOwnerMobile">
+        <el-input v-model="dataForm.propertyOwnerMobile" placeholder="联系电话"></el-input>
+      </el-form-item>
+          <el-form-item label="产权人身份证号" prop="propertyOwnerIdentityNo">
+          <el-input v-model="dataForm.propertyOwnerIdentityNo" placeholder="产权人身份证号"></el-input>
+      </el-form-item>
+      <el-form-item label="产权证" prop="propertyOwnerCard">
+          <el-input v-model="dataForm.propertyOwnerCard" placeholder="产权证"></el-input>
+      </el-form-item>
+      <el-form-item label="所属网格">
+        <el-cascader v-model="deptIdList"
+                     :options="options"
+                     :props="{ checkStrictly: true }"
+                     clearable>
+        </el-cascader>
+      </el-form-item>
+          <el-form-item label="房屋用途" prop="houseUse">
+          <el-select v-model="dataForm.houseUse" placeholder="房屋用途" clearable>
+            <el-option
+                v-for="item in houseUseFlag"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+            </el-option>
+          </el-select>
+      </el-form-item>
+      <div v-if="dataForm.houseUse === '1'">
+        <el-form-item label="承租人姓名" prop="tenantName">
+          <el-input v-model="dataForm.tenantName" placeholder="承租人姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="承租人电话" prop="tenantPhone">
+          <el-input v-model="dataForm.tenantPhone" placeholder="承租人电话"></el-input>
+        </el-form-item>
+        <el-form-item label="承租人身份证号" prop="tenantIdentityNo">
+          <el-input v-model="dataForm.tenantIdentityNo" placeholder="承租人身份证号"></el-input>
+        </el-form-item>
+      </div>
+      <div v-if="dataForm.houseUse === '2'">
+        <el-form-item label="企业名称" prop="enterpriseName">
+          <el-input v-model="dataForm.enterpriseName" placeholder="企业名称"></el-input>
+        </el-form-item>
+        <el-form-item label="社会统一代码" prop="socialUniformCode">
+          <el-input v-model="dataForm.socialUniformCode" placeholder="社会统一代码"></el-input>
+        </el-form-item>
+        <el-form-item label="法人代表" prop="legalRepresentative">
+          <el-input v-model="dataForm.legalRepresentative" placeholder="法人代表"></el-input>
+        </el-form-item>
+        <el-form-item label="电话" prop="enterprisePhone">
+          <el-input v-model="dataForm.enterprisePhone" placeholder="电话"></el-input>
+        </el-form-item>
+      </div>
+      </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: '',
+        houseAddress: '',
+        buyingTime: '',
+        houseArea: '',
+        propertyOwner: '',
+        propertyOwnerIdentityNo: '',
+        propertyOwnerMobile: '',
+        houseUse: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        gridId: '',
+        parentDeptIds: '',
+        parentDeptNames: '',
+        allDeptIds: '',
+        allDeptNames: '',
+        deptIdList: [],
+        propertyOwnerCard: ''
+      },
+      houseUseFlag: [
+        {
+          value: '0',
+          label: '自住'
+        },
+        {
+          value: '1',
+          label: '租赁'
+        },
+        {
+          value: '2',
+          label: '经营'
+        }
+      ],
+      options: [],
+      deptIdList: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        houseAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buyingTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseArea: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        propertyOwner: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        propertyOwnerIdentityNo: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        propertyOwnerMobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseUse: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        propertyOwnerCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
+  },
+  created: function () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => { })
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        } else {
+          this.deptIdList = []
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/housinginformation/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        this.deptIdList = this.dataForm.deptIdList
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        if (this.dataForm.gridId === '' || this.dataForm.gridId === undefined) {
+          return this.$message.error('请选择所属网格')
+        }
+        if (this.dataForm.houseUse === '1') {
+          if (this.dataForm.tenantName === '' || this.dataForm.tenantName === undefined) {
+            return this.$message.error('承租人姓名不能为空')
+          }
+          if (this.dataForm.tenantPhone === '' || this.dataForm.tenantPhone === undefined) {
+            return this.$message.error('承租人电话不能为空')
+          }
+          if (this.dataForm.tenantIdentityNo === '' || this.dataForm.tenantIdentityNo === undefined) {
+            return this.$message.error('承租人身份证号不能为空')
+          }
+        } else if (this.dataForm.houseUse === '2') {
+          if (this.dataForm.enterpriseName === '' || this.dataForm.enterpriseName === undefined) {
+            return this.$message.error('企业名称不能为空')
+          }
+          if (this.dataForm.socialUniformCode === '' || this.dataForm.socialUniformCode === undefined) {
+            return this.$message.error('社会统一代码不能为空')
+          }
+          if (this.dataForm.legalRepresentative === '' || this.dataForm.legalRepresentative === undefined) {
+            return this.$message.error('法人代表不能为空')
+          }
+          if (this.dataForm.enterprisePhone === '' || this.dataForm.enterprisePhone === undefined) {
+            return this.$message.error('电话不能为空')
+          }
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/housinginformation/', 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/user/housinginformation-detail.vue b/src/views/modules/user/housinginformation-detail.vue
new file mode 100644
index 0000000..1899093
--- /dev/null
+++ b/src/views/modules/user/housinginformation-detail.vue
@@ -0,0 +1,170 @@
+<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' : '130px'">
+          <el-form-item label="房屋地址：" prop="houseAddress">
+            <span>{{dataForm.houseAddress}}</span>
+      </el-form-item>
+          <el-form-item label="购房时间：" prop="buyingTime">
+            <span>{{dataForm.buyingTime.substr(0,10)}}</span>
+          </el-form-item>
+          <el-form-item label="房屋面积(m²)：" prop="houseArea" width="50px">
+            <span>{{dataForm.houseArea}}</span>
+      </el-form-item>
+          <el-form-item label="产权人：" prop="propertyOwner">
+            <span>{{dataForm.propertyOwner}}</span>
+      </el-form-item>
+      <el-form-item label="产权人联系电话：" prop="propertyOwnerMobile">
+        <span>{{dataForm.propertyOwnerMobile}}</span>
+      </el-form-item>
+          <el-form-item label="产权人身份证号：" prop="propertyOwnerIdentityNo">
+            <span>{{dataForm.propertyOwnerIdentityNo}}</span>
+      </el-form-item>
+      <el-form-item label="产权证：" prop="propertyOwnerCard">
+        <span>{{dataForm.propertyOwnerCard}}</span>
+      </el-form-item>
+      <el-form-item label="所属网格：">
+        <span>{{dataForm.gridName}}</span>
+      </el-form-item>
+          <el-form-item label="房屋用途：" prop="houseUse">
+            <span>{{houseUse}}</span>
+          </el-form-item>
+      <div v-if="dataForm.houseUse === '1'">
+        <el-form-item label="承租人姓名：" prop="tenantName">
+          <span>{{dataForm.tenantName}}</span>
+        </el-form-item>
+        <el-form-item label="承租人电话：" prop="tenantPhone">
+          <span>{{dataForm.tenantPhone}}</span>
+        </el-form-item>
+        <el-form-item label="承租人身份证号：" prop="tenantIdentityNo">
+          <span>{{dataForm.tenantIdentityNo}}</span>
+        </el-form-item>
+      </div>
+      <div v-if="dataForm.houseUse === '2'">
+        <el-form-item label="企业名称：" prop="enterpriseName">
+          <span>{{dataForm.enterpriseName}}</span>
+        </el-form-item>
+        <el-form-item label="社会统一代码：" prop="socialUniformCode">
+          <span>{{dataForm.socialUniformCode}}</span>
+        </el-form-item>
+        <el-form-item label="法人代表：" prop="legalRepresentative">
+          <span>{{dataForm.legalRepresentative}}</span>
+        </el-form-item>
+        <el-form-item label="电话：" prop="enterprisePhone">
+          <span>{{dataForm.enterprisePhone}}</span>
+        </el-form-item>
+      </div>
+      </el-form>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        houseAddress: '',
+        buyingTime: '',
+        houseArea: '',
+        propertyOwner: '',
+        propertyOwnerIdentityNo: '',
+        propertyOwnerMobile: '',
+        houseUse: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        gridId: '',
+        parentDeptIds: '',
+        parentDeptNames: '',
+        allDeptIds: '',
+        allDeptNames: '',
+        deptIdList: [],
+        propertyOwnerCard: ''
+      },
+      houseUseFlag: [
+        {
+          value: '0',
+          label: '自住'
+        },
+        {
+          value: '1',
+          label: '租赁'
+        },
+        {
+          value: '2',
+          label: '经营'
+        }
+      ],
+      options: [],
+      deptIdList: [],
+      houseUse: ''
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        houseAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buyingTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseArea: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        propertyOwner: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        propertyOwnerIdentityNo: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        propertyOwnerMobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseUse: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        propertyOwnerCard: [
+          { 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()
+        } else {
+          this.deptIdList = []
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/housinginformation/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        if (this.dataForm.houseUse === '0') {
+          this.houseUse = '自住'
+        } else if (this.dataForm.houseUse === '1') {
+          this.houseUse = '租赁'
+        } else if (this.dataForm.houseUse === '2') {
+          this.houseUse = '经营'
+        }
+      }).catch(() => {})
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/housinginformation.vue b/src/views/modules/user/housinginformation.vue
new file mode 100644
index 0000000..e47afef
--- /dev/null
+++ b/src/views/modules/user/housinginformation.vue
@@ -0,0 +1,186 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-news__housinginformation}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="房屋地址">
+          <el-input v-model="dataForm.houseAddress"
+                    placeholder=""
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="产权人">
+          <el-input v-model="dataForm.propertyOwner"
+                    placeholder=""
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input v-model="dataForm.propertyOwnerMobile"
+                    placeholder=""
+                    clearable></el-input>
+        </el-form-item>
+        <br>
+        <el-form-item label="所属机构">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="房屋用途" prop="houseUse">
+          <el-select v-model="dataForm.houseUse" placeholder="房屋用途" clearable>
+            <el-option
+                v-for="item in houseUseFlag"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+            </el-option>
+          </el-select>
+        </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-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+        <el-table-column prop="houseUse" label="房屋用途" header-align="center" align="center" :formatter="houseUseFormatter"></el-table-column>
+        <el-table-column prop="houseAddress" label="房屋地址" header-align="center" align="center" width="200px"></el-table-column>
+        <el-table-column prop="gridName" label="所属网格" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="propertyOwner" label="产权人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="propertyOwnerMobile" label="联系电话" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="propertyOwnerIdentityNo" label="身份证号" header-align="center" align="center" width="180px"></el-table-column>
+        <el-table-column label="房屋信息" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button  type="text" size="small" @click="lookHouseInfo(scope.row.id)">查看</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="居住人信息" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button  type="text" size="small" @click="lookResidentInfo(scope.row.id)">查看</el-button>
+          </template>
+        </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)">{{ $t('update') }}</el-button>
+            <el-button   type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <housinginformation-detail v-if="detailVisible" ref="housinginformationDetail" @refreshDataList="getDataList"></housinginformation-detail>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './housinginformation-add-or-update'
+import HousinginformationDetail from './housinginformation-detail'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/housinginformation/page',
+        getDataListIsPage: true,
+        deleteURL: '/app-user/housinginformation',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      },
+      deptIdList: [],
+      options: [],
+      houseUseFlag: [
+        {
+          value: '0',
+          label: '自住'
+        },
+        {
+          value: '1',
+          label: '租赁'
+        },
+        {
+          value: '2',
+          label: '经营'
+        }
+      ],
+      detailVisible: false
+    }
+  },
+  components: {
+    AddOrUpdate,
+    HousinginformationDetail
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
+  },
+  created: function () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => { })
+    this.getDataList()
+  },
+  methods: {
+    houseUseFormatter: function (row, column) {
+      if (row.houseUse === '0') {
+        return '自住'
+      } else if (row.houseUse === '1') {
+        return '租赁'
+      } else if (row.houseUse === '2') {
+        return '经营'
+      }
+      return ''
+    },
+    lookHouseInfo (id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.housinginformationDetail.dataForm.id = id
+        this.$refs.housinginformationDetail.init()
+      })
+    },
+    lookResidentInfo (id) {
+      this.$parent.selectComponent = 'Househeadedit'
+      this.$router.push({ path: '/user-houseinfomationroute', query: { id: id } })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/populationinformation-add-or-update.vue b/src/views/modules/user/populationinformation-add-or-update.vue
new file mode 100644
index 0000000..0f11b1b
--- /dev/null
+++ b/src/views/modules/user/populationinformation-add-or-update.vue
@@ -0,0 +1,369 @@
+<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="residentsName">
+          <el-input v-model="dataForm.residentsName" placeholder="姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="性别 (0：女 1：男)" prop="residentsSex">
+          <el-input v-model="dataForm.residentsSex" placeholder="性别 (0：女 1：男)"></el-input>
+      </el-form-item>
+          <el-form-item label="民族" prop="residentsNation">
+          <el-input v-model="dataForm.residentsNation" placeholder="民族"></el-input>
+      </el-form-item>
+          <el-form-item label="出生年/月" prop="residentsBirthday">
+          <el-input v-model="dataForm.residentsBirthday" placeholder="出生年/月"></el-input>
+      </el-form-item>
+          <el-form-item label="文化程度" prop="educationLevel">
+          <el-input v-model="dataForm.educationLevel" placeholder="文化程度"></el-input>
+      </el-form-item>
+          <el-form-item label="政治面貌 (0：群众 1：党员)" prop="politicsStatus">
+          <el-input v-model="dataForm.politicsStatus" placeholder="政治面貌 (0：群众 1：党员)"></el-input>
+      </el-form-item>
+          <el-form-item label="入党时间" prop="joinTime">
+          <el-input v-model="dataForm.joinTime" placeholder="入党时间"></el-input>
+      </el-form-item>
+          <el-form-item label="组织关系所在地" prop="organizationalRelationshipLocation">
+          <el-input v-model="dataForm.organizationalRelationshipLocation" placeholder="组织关系所在地"></el-input>
+      </el-form-item>
+          <el-form-item label="身份证号码" prop="residentsIdentityNo">
+          <el-input v-model="dataForm.residentsIdentityNo" placeholder="身份证号码"></el-input>
+      </el-form-item>
+          <el-form-item label="联系电话" prop="residentsPhone">
+          <el-input v-model="dataForm.residentsPhone" placeholder="联系电话"></el-input>
+      </el-form-item>
+          <el-form-item label="身体状况 (0：病残 1：健康)" prop="bodyStatus">
+          <el-input v-model="dataForm.bodyStatus" placeholder="身体状况 (0：病残 1：健康)"></el-input>
+      </el-form-item>
+          <el-form-item label="婚姻状况 (0：未婚 1：已婚)" prop="maritalStatus">
+          <el-input v-model="dataForm.maritalStatus" placeholder="婚姻状况 (0：未婚 1：已婚)"></el-input>
+      </el-form-item>
+          <el-form-item label="户口类型 (0：城镇 1：农业)" prop="accountType">
+          <el-input v-model="dataForm.accountType" placeholder="户口类型 (0：城镇 1：农业)"></el-input>
+      </el-form-item>
+          <el-form-item label="服兵役 (0：否 1：是)" prop="militaryService">
+          <el-input v-model="dataForm.militaryService" placeholder="服兵役 (0：否 1：是)"></el-input>
+      </el-form-item>
+          <el-form-item label="户籍地" prop="householdRegistrationPlace">
+          <el-input v-model="dataForm.householdRegistrationPlace" placeholder="户籍地"></el-input>
+      </el-form-item>
+          <el-form-item label="就业情况 (0：在岗 1：就业)" prop="employmentStatus">
+          <el-input v-model="dataForm.employmentStatus" placeholder="就业情况 (0：在岗 1：就业)"></el-input>
+      </el-form-item>
+          <el-form-item label="现工作单位" prop="currentEmployer">
+          <el-input v-model="dataForm.currentEmployer" placeholder="现工作单位"></el-input>
+      </el-form-item>
+          <el-form-item label="现单位地址" prop="currentEmployerAddress">
+          <el-input v-model="dataForm.currentEmployerAddress" placeholder="现单位地址"></el-input>
+      </el-form-item>
+          <el-form-item label="失业原因 (0：原单位破产 1：解除合同  2：效益不好 3：减员 4：其他)" prop="unemploymentReason">
+          <el-input v-model="dataForm.unemploymentReason" placeholder="失业原因 (0：原单位破产 1：解除合同  2：效益不好 3：减员 4：其他)"></el-input>
+      </el-form-item>
+          <el-form-item label="再就业优惠证 (0：无 1：有)" prop="reemploymentPermit">
+          <el-input v-model="dataForm.reemploymentPermit" placeholder="再就业优惠证 (0：无 1：有)"></el-input>
+      </el-form-item>
+          <el-form-item label="失业登记 (0：否 1：是)" prop="unemploymentRegister">
+          <el-input v-model="dataForm.unemploymentRegister" placeholder="失业登记 (0：否 1：是)"></el-input>
+      </el-form-item>
+          <el-form-item label="失业登记时间" prop="unemploymentRegisterTime">
+          <el-input v-model="dataForm.unemploymentRegisterTime" placeholder="失业登记时间"></el-input>
+      </el-form-item>
+          <el-form-item label="家庭类别 (0：普通家庭 1：五好家庭 2：军烈家庭 3：优抚家庭 4：单亲家庭 5：空巢老人 6：困难家庭)" prop="familyCategory">
+          <el-input v-model="dataForm.familyCategory" placeholder="家庭类别 (0：普通家庭 1：五好家庭 2：军烈家庭 3：优抚家庭 4：单亲家庭 5：空巢老人 6：困难家庭)"></el-input>
+      </el-form-item>
+          <el-form-item label="救助情况 (0：低保 1：大病 2：廉租 3：教育 4：临时 5：其他)" prop="helpStatus">
+          <el-input v-model="dataForm.helpStatus" placeholder="救助情况 (0：低保 1：大病 2：廉租 3：教育 4：临时 5：其他)"></el-input>
+      </el-form-item>
+          <el-form-item label="机动车数量" prop="motorVehicleNum">
+          <el-input v-model="dataForm.motorVehicleNum" placeholder="机动车数量"></el-input>
+      </el-form-item>
+          <el-form-item label="机动车类型 (0：轿车 1：摩托 2：其他)" prop="motorVehicleCategory">
+          <el-input v-model="dataForm.motorVehicleCategory" placeholder="机动车类型 (0：轿车 1：摩托 2：其他)"></el-input>
+      </el-form-item>
+          <el-form-item label="宠物犬状况 (0：无 1：有)" prop="dogStatus">
+          <el-input v-model="dataForm.dogStatus" placeholder="宠物犬状况 (0：无 1：有)"></el-input>
+      </el-form-item>
+          <el-form-item label="家庭成员数" prop="familyMemberNum">
+          <el-input v-model="dataForm.familyMemberNum" placeholder="家庭成员数"></el-input>
+      </el-form-item>
+          <el-form-item label="家庭外出成员数" prop="familyMemberOutNum">
+          <el-input v-model="dataForm.familyMemberOutNum" placeholder="家庭外出成员数"></el-input>
+      </el-form-item>
+          <el-form-item label="外出原因 (0：务工 1：上学 2：探亲 3：其他)" prop="familyMemberOutReason">
+          <el-input v-model="dataForm.familyMemberOutReason" placeholder="外出原因 (0：务工 1：上学 2：探亲 3：其他)"></el-input>
+      </el-form-item>
+          <el-form-item label="在外月数" prop="familyMemberOutMonth">
+          <el-input v-model="dataForm.familyMemberOutMonth" placeholder="在外月数"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标识" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" 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="创建人" 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="所属网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="所属网格ID"></el-input>
+      </el-form-item>
+          <el-form-item label="父所有部门" prop="parentDeptIds">
+          <el-input v-model="dataForm.parentDeptIds" placeholder="父所有部门"></el-input>
+      </el-form-item>
+          <el-form-item label="父所有部门" prop="parentDeptNames">
+          <el-input v-model="dataForm.parentDeptNames" placeholder="父所有部门"></el-input>
+      </el-form-item>
+          <el-form-item label="所有部门ID" prop="allDeptIds">
+          <el-input v-model="dataForm.allDeptIds" placeholder="所有部门ID"></el-input>
+      </el-form-item>
+          <el-form-item label="所有部门名称" prop="allDeptNames">
+          <el-input v-model="dataForm.allDeptNames" placeholder="所有部门名称"></el-input>
+      </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: '',
+        residentsName: '',
+        residentsSex: '',
+        residentsNation: '',
+        residentsBirthday: '',
+        educationLevel: '',
+        politicsStatus: '',
+        joinTime: '',
+        organizationalRelationshipLocation: '',
+        residentsIdentityNo: '',
+        residentsPhone: '',
+        bodyStatus: '',
+        maritalStatus: '',
+        accountType: '',
+        militaryService: '',
+        householdRegistrationPlace: '',
+        employmentStatus: '',
+        currentEmployer: '',
+        currentEmployerAddress: '',
+        unemploymentReason: '',
+        reemploymentPermit: '',
+        unemploymentRegister: '',
+        unemploymentRegisterTime: '',
+        familyCategory: '',
+        helpStatus: '',
+        motorVehicleNum: '',
+        motorVehicleCategory: '',
+        dogStatus: '',
+        familyMemberNum: '',
+        familyMemberOutNum: '',
+        familyMemberOutReason: '',
+        familyMemberOutMonth: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        gridId: '',
+        parentDeptIds: '',
+        parentDeptNames: '',
+        allDeptIds: '',
+        allDeptNames: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        residentsName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsSex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsNation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsBirthday: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        educationLevel: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        politicsStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        joinTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        organizationalRelationshipLocation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsIdentityNo: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentsPhone: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        bodyStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        maritalStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        accountType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        militaryService: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        householdRegistrationPlace: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        employmentStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        currentEmployer: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        currentEmployerAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unemploymentReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        reemploymentPermit: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unemploymentRegister: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unemploymentRegisterTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        familyCategory: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        helpStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        motorVehicleNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        motorVehicleCategory: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        dogStatus: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        familyMemberNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        familyMemberOutNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        familyMemberOutReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        familyMemberOutMonth: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { 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' }
+        ],
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        parentDeptIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        parentDeptNames: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptIds: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptNames: [
+          { 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(`/news/populationinformation/${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']('/news/populationinformation/', 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/user/populationinformation.vue b/src/views/modules/user/populationinformation.vue
new file mode 100644
index 0000000..f394bc9
--- /dev/null
+++ b/src/views/modules/user/populationinformation.vue
@@ -0,0 +1,107 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-news__populationinformation}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:populationinformation:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:populationinformation:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </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 prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentsName" label="姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentsSex" label="性别 (0：女 1：男)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentsNation" label="民族" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentsBirthday" label="出生年/月" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="educationLevel" label="文化程度" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="politicsStatus" label="政治面貌 (0：群众 1：党员)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="joinTime" label="入党时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="organizationalRelationshipLocation" label="组织关系所在地" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentsIdentityNo" label="身份证号码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentsPhone" label="联系电话" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="bodyStatus" label="身体状况 (0：病残 1：健康)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="maritalStatus" label="婚姻状况 (0：未婚 1：已婚)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="accountType" label="户口类型 (0：城镇 1：农业)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="militaryService" label="服兵役 (0：否 1：是)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="householdRegistrationPlace" label="户籍地" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="employmentStatus" label="就业情况 (0：在岗 1：就业)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="currentEmployer" label="现工作单位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="currentEmployerAddress" label="现单位地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unemploymentReason" label="失业原因 (0：原单位破产 1：解除合同  2：效益不好 3：减员 4：其他)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="reemploymentPermit" label="再就业优惠证 (0：无 1：有)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unemploymentRegister" label="失业登记 (0：否 1：是)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unemploymentRegisterTime" label="失业登记时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="familyCategory" label="家庭类别 (0：普通家庭 1：五好家庭 2：军烈家庭 3：优抚家庭 4：单亲家庭 5：空巢老人 6：困难家庭)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="helpStatus" label="救助情况 (0：低保 1：大病 2：廉租 3：教育 4：临时 5：其他)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="motorVehicleNum" label="机动车数量" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="motorVehicleCategory" label="机动车类型 (0：轿车 1：摩托 2：其他)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="dogStatus" label="宠物犬状况 (0：无 1：有)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="familyMemberNum" label="家庭成员数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="familyMemberOutNum" label="家庭外出成员数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="familyMemberOutReason" label="外出原因 (0：务工 1：上学 2：探亲 3：其他)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="familyMemberOutMonth" label="在外月数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标识" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="所属网格ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentDeptIds" label="父所有部门" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="父所有部门" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptIds" label="所有部门ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" 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 v-if="$hasPermission('news:populationinformation:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('news:populationinformation:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './populationinformation-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/news/populationinformation/page',
+        getDataListIsPage: true,
+        deleteURL: '/news/populationinformation',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>

From ad9dcca1a8566f51bb3d7a63cc08cf4273f11041 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Mon, 31 Aug 2020 09:00:44 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=87=87=E9=9B=86-=E5=AE=B6=E5=BA=AD=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/houseFamilyInfo.vue    | 152 ++++++++
 src/views/modules/user/houseResidentInfo.vue  |  32 +-
 src/views/modules/user/housebusinessinfo.vue  |  97 +++--
 src/views/modules/user/househeadedit.vue      | 230 ++++++-----
 .../user/houseresidentInfo-add-or-update.vue  |  48 +--
 .../user/housinginformation-detail.vue        |  28 +-
 src/views/modules/user/housinginformation.vue |   8 +-
 .../modules/user/populationInfoOverview.vue   | 211 ++++++++++
 .../modules/user/populationMotorVehicle.vue   |  84 ++++
 .../populationinformation-add-or-update.vue   | 369 ------------------
 .../user/populationinformation-detail.vue     | 102 +++++
 .../modules/user/populationinformation.vue    | 142 ++++---
 12 files changed, 855 insertions(+), 648 deletions(-)
 create mode 100644 src/views/modules/user/houseFamilyInfo.vue
 create mode 100644 src/views/modules/user/populationInfoOverview.vue
 create mode 100644 src/views/modules/user/populationMotorVehicle.vue
 delete mode 100644 src/views/modules/user/populationinformation-add-or-update.vue
 create mode 100644 src/views/modules/user/populationinformation-detail.vue

diff --git a/src/views/modules/user/houseFamilyInfo.vue b/src/views/modules/user/houseFamilyInfo.vue
new file mode 100644
index 0000000..66f8a3c
--- /dev/null
+++ b/src/views/modules/user/houseFamilyInfo.vue
@@ -0,0 +1,152 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-news__housebusinessinfo}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="户主姓名">
+          <el-input v-model="dataForm.residentsName"
+                    placeholder=""
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="家庭类别" prop="familyCategory">
+          <el-select v-model="dataForm.familyCategory" clearable>
+            <el-option  v-for="item in familyCategoryList"
+                       :key="item.dictValue"
+                      :value="item.dictValue"
+                       :label="item.dictName"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="救助情况" prop="helpStatus">
+          <el-select v-model="dataForm.helpStatus" clearable>
+            <el-option  v-for="item in helpStatusList"
+                       :key="item.dictValue"
+                        :value="item.dictValue"
+                        :label="item.dictName"></el-option>
+          </el-select>
+        </el-form-item>
+        <br>
+        <el-form-item label="辖区范围">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable>
+          </el-cascader>
+        </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="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+        <el-table-column prop="gridNames" label="辖区范围" header-align="center" align="center" width="300px"></el-table-column>
+        <el-table-column prop="residentsName" label="户主姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="helpStatus" label="救助情况" header-align="center" align="center" :formatter="helpStatusFormat"></el-table-column>
+        <el-table-column prop="familyCategory" label="家庭类列" header-align="center" align="center" :formatter="familyCategoryFormat"></el-table-column>
+        <el-table-column prop="houseAddress" label="家庭住址" header-align="center" align="center" width="300px"></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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/populationinformation/page',
+        getDataListIsPage: true,
+        exportURL: '/app-user/populationinformation/getFamily/export'
+      },
+      dataForm: {
+        id: ''
+      },
+      deptIdList: [],
+      options: [],
+      familyCategoryList: [],
+      helpStatusList: []
+    }
+  },
+  created: function () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => { })
+    this.$http.get(`/sys/dict/listSimple/family_category`).then(({ data: res }) => {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.familyCategoryList = res.data
+    }).catch(() => { })
+    this.$http.get(`/sys/dict/listSimple/help_status`).then(({ data: res }) => {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.helpStatusList = res.data
+    }).catch(() => { })
+  },
+  methods: {
+    familyCategoryFormat (row, column) {
+      if (row.familyCategory) {
+        let dict = this.familyCategoryList.filter(item => item.dictValue === row.familyCategory)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    },
+    helpStatusFormat (row, column) {
+      if (row.helpStatus) {
+        let dict = this.helpStatusList.filter(item => item.dictValue === row.helpStatus)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    }
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
+  }
+
+}
+</script>
diff --git a/src/views/modules/user/houseResidentInfo.vue b/src/views/modules/user/houseResidentInfo.vue
index 2492d7b..abcc9ac 100644
--- a/src/views/modules/user/houseResidentInfo.vue
+++ b/src/views/modules/user/houseResidentInfo.vue
@@ -16,11 +16,7 @@
         <el-table-column prop="residentsName" label="姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="residentsSex" label="性别" header-align="center" align="center" :formatter="sexFormat"></el-table-column>
         <el-table-column prop="residentsNation" label="民族" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="educationLevel" label="文化程度" header-align="center" align="center" :formatter="educationLevelFormat"></el-table-column>
-        <el-table-column prop="politicsStatus" label="政治面貌" header-align="center" align="center" :formatter="politicsStatusFormat"></el-table-column>
-        <el-table-column prop="residentsIdentityNo" label="身份证号码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residentsPhone" label="联系电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="currentEmployer" label="单位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="currentEmployer" label="工作单位/学校" header-align="center" align="center"></el-table-column>
         <el-table-column prop="currentAddress" 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">
@@ -61,8 +57,6 @@ export default {
         id: '',
         houseId: ''
       },
-      educationLevelList: [],
-      politicsStatusList: [],
       houseHeadRelationList: [
         {
           label: '子女',
@@ -73,8 +67,12 @@ export default {
           value: '1'
         },
         {
-          label: '其他',
+          label: '父母',
           value: '2'
+        },
+        {
+          label: '其他',
+          value: '3'
         }
       ]
     }
@@ -108,24 +106,6 @@ export default {
       this.$parent.selectComponent = 'Househeadedit'
       this.$router.push({ path: '/user-houseinfomationroute', query: { id: this.$route.query.id } })
     },
-    educationLevelFormat: function (row, column) {
-      if (row.educationLevel) {
-        let dict = this.educationLevelList.filter(item => item.dictValue === row.educationLevel)[0]
-        if (dict) {
-          return dict.dictName
-        }
-      }
-      return ''
-    },
-    politicsStatusFormat: function (row, column) {
-      if (row.politicsStatus) {
-        let dict = this.politicsStatusList.filter(item => item.dictValue === row.politicsStatus)[0]
-        if (dict) {
-          return dict.dictName
-        }
-      }
-      return ''
-    },
     sexFormat: function (row, column) {
       return row.residentsSex === '0' ? '女' : '男'
     },
diff --git a/src/views/modules/user/housebusinessinfo.vue b/src/views/modules/user/housebusinessinfo.vue
index 76ec403..f95b55b 100644
--- a/src/views/modules/user/housebusinessinfo.vue
+++ b/src/views/modules/user/housebusinessinfo.vue
@@ -2,39 +2,44 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__housebusinessinfo}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item label="经营者姓名">
+          <el-input v-model="dataForm.legalRepresentative"
+                    placeholder=""
+                    clearable></el-input>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-form-item label="企业名称">
+          <el-input v-model="dataForm.enterpriseName"
+                    placeholder=""
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="企业注册号">
+          <el-input v-model="dataForm.socialUniformCode"
+                    placeholder=""
+                    clearable></el-input>
+        </el-form-item>
+        <br>
+        <el-form-item label="辖区范围">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable>
+          </el-cascader>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:housebusinessinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:housebusinessinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button type="primary"
+                     @click="exportHandle()">{{ $t('export') }}</el-button>
         </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 prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+        <el-table-column prop="gridName" label="辖区范围" header-align="center" align="center" width="200px"></el-table-column>
+        <el-table-column prop="legalRepresentative" label="经营者姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="enterprisePhone" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="enterpriseName" label="企业名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="socialUniformCode" label="社会统一代码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="legalRepresentative" label="法人代表" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="enterprisePhone" label="电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="houseId" label="房屋ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标识 (0：否 1：是)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" 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 v-if="$hasPermission('news:housebusinessinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:housebusinessinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
+        <el-table-column prop="socialUniformCode" label="企业注册号" header-align="center" align="center"></el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"
@@ -59,18 +64,54 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/housebusinessinfo/page',
+        getDataListURL: '/app-user/housebusinessinfo/page',
         getDataListIsPage: true,
-        deleteURL: '/news/housebusinessinfo',
-        deleteIsBatch: true
+        exportURL: '/app-user/housebusinessinfo/export'
       },
       dataForm: {
         id: ''
-      }
+      },
+      deptIdList: [],
+      options: []
     }
   },
+  created: function () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => { })
+  },
   components: {
     AddOrUpdate
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/modules/user/househeadedit.vue b/src/views/modules/user/househeadedit.vue
index 3d2fe5a..a120a7d 100644
--- a/src/views/modules/user/househeadedit.vue
+++ b/src/views/modules/user/househeadedit.vue
@@ -17,23 +17,28 @@
       <br>
       <el-form-item label="户主姓名" prop="residentsName" >
         <el-input v-model="dataForm.residentsName" placeholder="姓名"></el-input>
-      </el-form-item>
-      <el-form-item label="性别" prop="residentsSex">
-        <el-radio-group v-model="dataForm.residentsSex">
-          <el-radio  label="0">女</el-radio>
-          <el-radio  label="1">男</el-radio>
-        </el-radio-group>
       </el-form-item>
           <el-form-item label="民族" prop="residentsNation">
           <el-input v-model="dataForm.residentsNation" placeholder="民族"></el-input>
       </el-form-item>
-          <el-form-item label="出生年月" prop="residentsBirthday">
-            <el-date-picker
-                v-model="dataForm.residentsBirthday"
-                type="date"
-                placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
+        <el-form-item label="身份证号码" prop="residentsIdentityNo" >
+          <el-input v-model="dataForm.residentsIdentityNo" placeholder="身份证号码" @blur="getSexAndBirthDay"></el-input>
+        </el-form-item>
+
+        <el-form-item label="性别" prop="residentsSex">
+          <el-radio-group v-model="dataForm.residentsSex" :disabled="true">
+            <el-radio  label="0">女</el-radio>
+            <el-radio  label="1">男</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="出生日期" prop="residentsBirthday">
+          <el-date-picker
+              v-model="dataForm.residentsBirthday"
+              type="date"
+              placeholder="选择日期"
+              :disabled="true">
+          </el-date-picker>
+        </el-form-item>
           <el-form-item label="文化程度" prop="educationLevel">
             <el-radio-group v-model="dataForm.educationLevel">
               <el-radio  v-for="item in educationLevelList"
@@ -48,19 +53,17 @@
                          :label="item.dictValue">{{item.dictName}}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="入党时间" prop="joinTime">
+          <el-form-item label="入党时间" prop="joinTime" v-if="dataForm.politicsStatus === '1'">
             <el-date-picker
                 v-model="dataForm.joinTime"
                 type="date"
                 placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="组织关系所在地" prop="organizationalRelationshipLocation">
+          <el-form-item label="组织关系所在地" prop="organizationalRelationshipLocation" v-if="dataForm.politicsStatus === '1'">
           <el-input v-model="dataForm.organizationalRelationshipLocation" placeholder="组织关系所在地"></el-input>
       </el-form-item>
-          <el-form-item label="身份证号码" prop="residentsIdentityNo">
-          <el-input v-model="dataForm.residentsIdentityNo" placeholder="身份证号码"></el-input>
-      </el-form-item>
+
           <el-form-item label="联系电话" prop="residentsPhone">
           <el-input v-model="dataForm.residentsPhone" placeholder="联系电话"></el-input>
       </el-form-item>
@@ -108,31 +111,34 @@
                          :label="item.dictValue">{{item.dictName}}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="现工作单位" prop="currentEmployer">
+          <el-form-item label="现工作单位" prop="currentEmployer" v-if="dataForm.employmentStatus === '0'">
           <el-input v-model="dataForm.currentEmployer" placeholder="现工作单位"></el-input>
       </el-form-item>
-          <el-form-item label="现单位地址" prop="currentEmployerAddress">
+          <el-form-item label="现单位地址" prop="currentEmployerAddress" v-if="dataForm.employmentStatus === '0'">
           <el-input v-model="dataForm.currentEmployerAddress" placeholder="现单位地址"></el-input>
       </el-form-item>
       <br>
-          <el-form-item label="失业原因" prop="unemploymentReason">
+          <el-form-item label="失业原因" prop="unemploymentReason" v-if="dataForm.employmentStatus === '1'">
             <el-radio-group v-model="dataForm.unemploymentReason">
               <el-radio  v-for="item in unemploymentReasonList"
                          :key="item.dictValue"
                          :label="item.dictValue">{{item.dictName}}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="再就业优惠证" prop="reemploymentPermit">
-          <el-input v-model="dataForm.reemploymentPermit" placeholder="再就业优惠证"></el-input>
-      </el-form-item>
+          <el-form-item label="再就业优惠证" prop="reemploymentPermit" v-if="dataForm.employmentStatus === '1'">
+            <el-radio-group v-model="dataForm.reemploymentPermit">
+              <el-radio  label="0">无</el-radio>
+              <el-radio  label="1">有</el-radio>
+            </el-radio-group>
+          </el-form-item>
       <br>
-          <el-form-item label="失业登记" prop="unemploymentRegister">
+          <el-form-item label="失业登记" prop="unemploymentRegister" v-if="dataForm.employmentStatus === '1'">
             <el-radio-group v-model="dataForm.unemploymentRegister">
               <el-radio  label="0">否</el-radio>
               <el-radio  label="1">是</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="失业登记时间" prop="unemploymentRegisterTime">
+          <el-form-item label="失业登记时间" prop="unemploymentRegisterTime" v-if="dataForm.employmentStatus === '1'">
             <el-date-picker
                 v-model="dataForm.unemploymentRegisterTime"
                 type="date"
@@ -176,23 +182,6 @@
               <el-radio  label="1">有</el-radio>
             </el-radio-group>
           </el-form-item>
-      <br>
-          <el-form-item label="家庭成员数" prop="familyMemberNum">
-            <el-input-number v-model="dataForm.familyMemberNum" placeholder="家庭成员数"></el-input-number>
-      </el-form-item>
-          <el-form-item label="家庭外出成员数" prop="familyMemberOutNum">
-          <el-input v-model="dataForm.familyMemberOutNum" placeholder="家庭外出成员数"></el-input>
-      </el-form-item>
-          <el-form-item label="外出原因" prop="familyMemberOutReason">
-            <el-radio-group v-model="dataForm.familyMemberOutReason">
-              <el-radio  v-for="item in familyMemberOutReasonList"
-                         :key="item.dictValue"
-                         ::label="item.dictValue">{{item.dictName}}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="在外月数" prop="familyMemberOutMonth">
-          <el-input-number v-model="dataForm.familyMemberOutMonth" placeholder="在外月数"></el-input-number>
-      </el-form-item>
       </fieldset>
       </el-form>
     <template slot="footer">
@@ -242,17 +231,7 @@ export default {
         familyMemberOutNum: '',
         familyMemberOutReason: '',
         familyMemberOutMonth: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: '',
-        gridId: '',
-        parentDeptIds: '',
-        parentDeptNames: '',
-        allDeptIds: '',
-        allDeptNames: ''
+        isSubmit: '0'
       },
       educationLevelList: [],
       politicsStatusList: [],
@@ -275,28 +254,22 @@ export default {
         residentsName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        residentsSex: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         residentsNation: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         residentsBirthday: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        educationLevel: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        politicsStatus: [
+        residentsSex: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        joinTime: [
+        educationLevel: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        organizationalRelationshipLocation: [
+        residentsIdentityNo: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        residentsIdentityNo: [
+        politicsStatus: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         residentsPhone: [
@@ -320,24 +293,6 @@ export default {
         employmentStatus: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        currentEmployer: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        currentEmployerAddress: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        unemploymentReason: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        reemploymentPermit: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        unemploymentRegister: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        unemploymentRegisterTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         familyCategory: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -352,25 +307,13 @@ export default {
         ],
         dogStatus: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        familyMemberNum: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        familyMemberOutNum: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        familyMemberOutReason: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        familyMemberOutMonth: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
   },
   mounted () {
     if (this.$route.query.id !== '' && this.$route.query.id != null) {
-      this.dataForm.id = this.$route.query.id
+      this.dataForm.houseId = this.$route.query.id
       this.getInfo()
     }
   },
@@ -378,6 +321,34 @@ export default {
     this.getAllDict()
   },
   methods: {
+    getSexAndBirthDay () {
+      // 先判断身份证是否合法
+      this.$http.get(`/app-user/populationinformation/isIdentifyNoLegal/${this.dataForm.residentsIdentityNo}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          this.dataForm.residentsIdentityNo = ''
+          return this.$message.error(res.msg)
+        }
+        let identifyNo = this.dataForm.residentsIdentityNo
+        this.dataForm.residentsSex = this.IdCard(identifyNo, 2)
+        this.dataForm.residentsBirthday = this.IdCard(identifyNo, 1)
+      }).catch(() => { })
+    },
+    IdCard (UUserCard, num) {
+      if (num === 1) {
+        // 获取出生日期
+        return UUserCard.substring(6, 10) + '-' + UUserCard.substring(10, 12) + '-' + UUserCard.substring(12, 14)
+      }
+      if (num === 2) {
+        // 获取性别
+        if (parseInt(UUserCard.substr(16, 1)) % 2 === 1) {
+          // 男
+          return '1'
+        } else {
+          // 女
+          return '0'
+        }
+      }
+    },
     getResidentsInfo () {
       this.$parent.selectComponent = 'HouseResidentInfo'
       this.$router.push({ path: '/user-houseinfomationroute', query: { id: this.$route.query.id } })
@@ -486,7 +457,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/app-user/populationinformation/getHouseHeadInfo?id=` + this.dataForm.id).then(({ data: res }) => {
+      this.$http.get(`/app-user/populationinformation/getHouseHeadInfo?id=` + this.dataForm.houseId).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -502,19 +473,68 @@ export default {
         if (!valid) {
           return false
         }
+        if (this.dataForm.politicsStatus === '1') {
+          if (this.dataForm.joinTime === '' || this.dataForm.organizationalRelationshipLocation === '' ||
+            this.dataForm.joinTime === null || this.dataForm.organizationalRelationshipLocation === null) {
+            return this.$message.error('请填写详细党员信息')
+          }
+        }
+        if (this.dataForm.employmentStatus === '0') {
+          if (this.dataForm.currentEmployerAddress === '' || this.dataForm.currentEmployer === '' ||
+            this.dataForm.currentEmployerAddress === null || this.dataForm.currentEmployer === null) {
+            return this.$message.error('请填写详细工作单位信息')
+          }
+        }
+        if (this.dataForm.employmentStatus === '1') {
+          if (this.dataForm.unemploymentReason === '' || this.dataForm.unemploymentRegister === '' ||
+            this.dataForm.reemploymentPermit === '' || this.dataForm.unemploymentRegisterTime === '' ||
+            this.dataForm.unemploymentReason === null || this.dataForm.unemploymentRegister === null ||
+            this.dataForm.reemploymentPermit === null || this.dataForm.unemploymentRegisterTime === null) {
+            return this.$message.error('请填写详细失业信息！')
+          }
+        }
+        this.dataForm.isSubmit = '0'
         this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/populationinformation/', 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')
-            }
-          })
+          if (res.data !== '' && res.data !== undefined && res.data !== null) {
+            this.$confirm(res.data, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.dataForm.isSubmit = '1'
+              this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/populationinformation/', 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.isEdit = false
+                    this.noEdit = true
+                    this.init()
+                  }
+                })
+              }).catch(() => {})
+            }).catch(() => {})
+          } else {
+            this.$message({
+              message: this.$t('prompt.success'),
+              type: 'success',
+              duration: 500,
+              onClose: () => {
+                this.visible = false
+                this.isEdit = false
+                this.noEdit = true
+                this.init()
+              }
+            })
+          }
         }).catch(() => {})
       })
     }, 1000, { 'leading': true, 'trailing': false })
diff --git a/src/views/modules/user/houseresidentInfo-add-or-update.vue b/src/views/modules/user/houseresidentInfo-add-or-update.vue
index c98bc98..ed828c1 100644
--- a/src/views/modules/user/houseresidentInfo-add-or-update.vue
+++ b/src/views/modules/user/houseresidentInfo-add-or-update.vue
@@ -13,33 +13,17 @@
       <el-form-item label="姓名" prop="residentsName" >
         <el-input v-model="dataForm.residentsName" placeholder="姓名"></el-input>
       </el-form-item>
-      <el-form-item label="民族" prop="residentsNation">
-        <el-input v-model="dataForm.residentsNation" placeholder="民族"></el-input>
-      </el-form-item>
-      <el-form-item label="文化程度" prop="educationLevel">
-        <el-select v-model="dataForm.educationLevel">
-          <el-option  v-for="item in educationLevelList"
-                     :key="item.dictValue"
-                     :label="item.dictName"
-                     :value="item.dictValue">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="政治面貌" prop="politicsStatus">
-        <el-radio-group v-model="dataForm.politicsStatus">
-          <el-radio  v-for="item in politicsStatusList"
-                     :key="item.dictValue"
-                     :label="item.dictValue">{{item.dictName}}</el-radio>
+      <el-form-item label="性别" prop="residentsSex">
+        <el-radio-group v-model="dataForm.residentsSex">
+          <el-radio  label="0">女</el-radio>
+          <el-radio  label="1">男</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="身份证号码" prop="residentsIdentityNo">
-        <el-input v-model="dataForm.residentsIdentityNo" placeholder="身份证号码"></el-input>
-      </el-form-item>
-      <el-form-item label="联系电话" prop="residentsPhone">
-        <el-input v-model="dataForm.residentsPhone" placeholder="联系电话"></el-input>
+      <el-form-item label="民族" prop="residentsNation">
+        <el-input v-model="dataForm.residentsNation" placeholder="民族"></el-input>
       </el-form-item>
-      <el-form-item label="工作单位" prop="currentEmployer">
-        <el-input v-model="dataForm.currentEmployer" placeholder="现工作单位"></el-input>
+      <el-form-item label="工作单位/学校" prop="currentEmployer">
+        <el-input v-model="dataForm.currentEmployer" placeholder="工作单位/学校"></el-input>
       </el-form-item>
       <el-form-item label="现居住地址单位" prop="currentAddress">
         <el-input v-model="dataForm.currentAddress" placeholder="现工作单位"></el-input>
@@ -70,7 +54,8 @@ export default {
         currentEmployer: '',
         currentAddress: '',
         houseHeadRelation: '',
-        isEditResidentInfo: ''
+        isEditResidentInfo: '',
+        residentId: ''
       },
       educationLevelList: [],
       politicsStatusList: [],
@@ -97,19 +82,10 @@ export default {
         residentsName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        residentsNation: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        educationLevel: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        politicsStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        residentsIdentityNo: [
+        residentsSex: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        residentsPhone: [
+        residentsNation: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         currentEmployer: [
diff --git a/src/views/modules/user/housinginformation-detail.vue b/src/views/modules/user/housinginformation-detail.vue
index 1899093..e5df911 100644
--- a/src/views/modules/user/housinginformation-detail.vue
+++ b/src/views/modules/user/housinginformation-detail.vue
@@ -1,6 +1,6 @@
 <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' : '130px'">
+  <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' : '140px'">
           <el-form-item label="房屋地址：" prop="houseAddress">
             <span>{{dataForm.houseAddress}}</span>
       </el-form-item>
@@ -107,30 +107,6 @@ export default {
   computed: {
     dataRule () {
       return {
-        houseAddress: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        buyingTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        houseArea: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        propertyOwner: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        propertyOwnerIdentityNo: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        propertyOwnerMobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        houseUse: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        propertyOwnerCard: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
       }
     }
   },
diff --git a/src/views/modules/user/housinginformation.vue b/src/views/modules/user/housinginformation.vue
index e47afef..1801da5 100644
--- a/src/views/modules/user/housinginformation.vue
+++ b/src/views/modules/user/housinginformation.vue
@@ -41,6 +41,10 @@
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="info"
+                     @click="exportMoudleHandle()">导出模板</el-button>
+        </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
@@ -95,7 +99,9 @@ export default {
         getDataListURL: '/app-user/housinginformation/page',
         getDataListIsPage: true,
         deleteURL: '/app-user/housinginformation',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/app-user/housinginformation/export',
+        exportMoudle: '/app-user/housinginformation/exportModule'
       },
       dataForm: {
         id: ''
diff --git a/src/views/modules/user/populationInfoOverview.vue b/src/views/modules/user/populationInfoOverview.vue
new file mode 100644
index 0000000..0cdeb49
--- /dev/null
+++ b/src/views/modules/user/populationInfoOverview.vue
@@ -0,0 +1,211 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-sys__user">
+      <table>
+        <tr>
+          <td>
+            <p class="item">居住类型统计</p>
+            <div id="houseUse"
+                 :style="{width: '600px', height: '325px'}"></div>
+          </td>
+          <td>
+            <p class="item">数据量统计</p>
+            <div
+                 style="width: 600px;height: 325px">
+              <div class="houseInfo" style="width: 300px;height: 200px;margin-left: 50px;margin-top: 30px">
+                <table style=" border-spacing:0px 10px">
+                  <tr>
+                    <td><label>房屋数量</label></td>
+                    <td><span>{{this.resultData.houseNum}}</span></td>
+                  </tr>
+                  <tr>
+                    <td><label>人口数量</label></td>
+                    <td><span>{{this.resultData.populationNum}}</span></td>
+                  </tr>
+                  <tr>
+                    <td><label>机动车数量</label></td>
+                    <td><span>{{this.resultData.motorVehicleNum}}</span></td>
+                  </tr>
+                  <tr>
+                    <td><label>党员数量</label></td>
+                    <td><span>{{this.resultData.partyMemberNum}}</span></td>
+                  </tr>
+                  <tr>
+                    <td><label>企业数量</label></td>
+                    <td><span>{{this.resultData.business}}</span></td>
+                  </tr>
+                </table>
+              </div>
+            </div>
+
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <p class="item">人员就业情况</p>
+            <div id="employStatus"
+                 :style="{width: '600px', height: '325px'}"></div>
+          </td>
+          <td></td>
+        </tr>
+      </table>
+    </div>
+  </el-card>
+</template>
+<script>
+
+export default {
+  data () {
+    return {
+      resultData: {
+        sinceTheLiving: 0,
+        rent: 0,
+        business: 0,
+        employment: 0,
+        unemployment: 0,
+        houseNum: 0,
+        populationNum: 0,
+        motorVehicleNum: 0,
+        partyMemberNum: 0
+      },
+      houseUse: '',
+      employStatus: ''
+    }
+  },
+  mounted () {
+    this.houseUse = this.$echarts.init(document.getElementById('houseUse'))
+    this.houseUse.setOption({
+      tooltip: {
+        trigger: 'item',
+        formatter: '{a} <br/>{b}: {c} ({d}%)'
+      },
+      legend: {
+        orient: 'vertical',
+        left: 10,
+        data: ['自住', '租赁', '经营']
+      },
+      series: [
+        {
+          name: '访问来源',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          label: {
+            show: false,
+            position: 'center'
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: '30',
+              fontWeight: 'bold'
+            }
+          },
+          labelLine: {
+            show: false
+          },
+          data: [
+            { value: this.resultData.sinceTheLiving, name: '自住' },
+            { value: this.resultData.rent, name: '租赁' },
+            { value: this.resultData.business, name: '经营' }
+          ]
+        }
+      ]
+    })
+    this.employStatus = this.$echarts.init(document.getElementById('employStatus'))
+    this.employStatus.setOption({
+      tooltip: {
+        trigger: 'item',
+        formatter: '{a} <br/>{b}: {c} ({d}%)'
+      },
+      legend: {
+        orient: 'vertical',
+        left: 10,
+        data: ['失业', '在岗']
+      },
+      series: [
+        {
+          name: '访问来源',
+          type: 'pie',
+          radius: ['50%', '70%'],
+          avoidLabelOverlap: false,
+          label: {
+            show: false,
+            position: 'center'
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: '30',
+              fontWeight: 'bold'
+            }
+          },
+          labelLine: {
+            show: false
+          },
+          data: [
+            { value: this.resultData.unemployment, name: '失业' },
+            { value: this.resultData.employment, name: '在岗' }
+          ]
+        }
+      ]
+    })
+  },
+  created () {
+    this.getPopulationInfoOverview()
+  },
+  methods: {
+    getPopulationInfoOverview () {
+      this.$http
+        .get(`app-user/populationinformation/getPopulationInfoOverview`)
+        .then(({ data: res }) => {
+          this.resultData = res
+          this.houseUse.setOption({
+            series: [
+              {
+                data: [
+                  { value: res.sinceTheLiving, name: '自住' },
+                  { value: res.rent, name: '租赁' },
+                  { value: res.business, name: '经营' }
+                ]
+              }
+            ]
+          })
+          this.employStatus.setOption({
+            series: [
+              {
+                data: [
+                  { value: this.resultData.unemployment, name: '失业' },
+                  { value: this.resultData.employment, name: '在岗' }
+                ]
+              }
+            ]
+          })
+        })
+        .catch(() => { })
+    }
+  },
+  components: {
+  }
+}
+</script>
+
+<style>
+  .item{
+    font-size: 20px;
+    width: 200px;
+    font-weight: bold;
+    color: #0aa0bf;
+  }
+  .houseInfo span{
+    font-size: 20px;
+    width: 200px;
+    margin-left: 50px;
+  }
+  .houseInfo label{
+    font-size: 20px;
+    width: 200px;
+    font-weight: bold;
+  }
+</style>
diff --git a/src/views/modules/user/populationMotorVehicle.vue b/src/views/modules/user/populationMotorVehicle.vue
new file mode 100644
index 0000000..4536f28
--- /dev/null
+++ b/src/views/modules/user/populationMotorVehicle.vue
@@ -0,0 +1,84 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-news__populationinformation}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="机动车类型">
+          <el-select v-model="dataForm.motorVehicleCategory" clearable>
+            <el-option  v-for="item in motorVehicleCategoryList"
+                       :key="item.dictValue"
+                       :label="item.dictName"
+                        :value="item.dictValue">
+
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="车主姓名">
+          <el-input v-model="dataForm.residentsName"
+                    placeholder=""
+                    clearable></el-input>
+        </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="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+        <el-table-column prop="motorVehicleCategory" label="机动车类型" header-align="center" align="center" width="200px" :formatter="setMotorVehicleCategory"></el-table-column>
+        <el-table-column prop="residentsName" label="车主姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentsPhone" 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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/populationinformation/motorVehicle/page',
+        getDataListIsPage: true,
+        exportURL: '/app-user/populationinformation/motorVehicle/export'
+      },
+      dataForm: {
+        id: ''
+      },
+      motorVehicleCategoryList: []
+    }
+  },
+  created: function () {
+    this.$http.get(`/sys/dict/listSimple/motor_vehicle_category`).then(({ data: res }) => {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.motorVehicleCategoryList = res.data
+    }).catch(() => { })
+  },
+  methods: {
+    setMotorVehicleCategory (row, column) {
+      if (row.motorVehicleCategory) {
+        let dict = this.motorVehicleCategoryList.filter(item => item.dictValue === row.motorVehicleCategory)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/user/populationinformation-add-or-update.vue b/src/views/modules/user/populationinformation-add-or-update.vue
deleted file mode 100644
index 0f11b1b..0000000
--- a/src/views/modules/user/populationinformation-add-or-update.vue
+++ /dev/null
@@ -1,369 +0,0 @@
-<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="residentsName">
-          <el-input v-model="dataForm.residentsName" placeholder="姓名"></el-input>
-      </el-form-item>
-          <el-form-item label="性别 (0：女 1：男)" prop="residentsSex">
-          <el-input v-model="dataForm.residentsSex" placeholder="性别 (0：女 1：男)"></el-input>
-      </el-form-item>
-          <el-form-item label="民族" prop="residentsNation">
-          <el-input v-model="dataForm.residentsNation" placeholder="民族"></el-input>
-      </el-form-item>
-          <el-form-item label="出生年/月" prop="residentsBirthday">
-          <el-input v-model="dataForm.residentsBirthday" placeholder="出生年/月"></el-input>
-      </el-form-item>
-          <el-form-item label="文化程度" prop="educationLevel">
-          <el-input v-model="dataForm.educationLevel" placeholder="文化程度"></el-input>
-      </el-form-item>
-          <el-form-item label="政治面貌 (0：群众 1：党员)" prop="politicsStatus">
-          <el-input v-model="dataForm.politicsStatus" placeholder="政治面貌 (0：群众 1：党员)"></el-input>
-      </el-form-item>
-          <el-form-item label="入党时间" prop="joinTime">
-          <el-input v-model="dataForm.joinTime" placeholder="入党时间"></el-input>
-      </el-form-item>
-          <el-form-item label="组织关系所在地" prop="organizationalRelationshipLocation">
-          <el-input v-model="dataForm.organizationalRelationshipLocation" placeholder="组织关系所在地"></el-input>
-      </el-form-item>
-          <el-form-item label="身份证号码" prop="residentsIdentityNo">
-          <el-input v-model="dataForm.residentsIdentityNo" placeholder="身份证号码"></el-input>
-      </el-form-item>
-          <el-form-item label="联系电话" prop="residentsPhone">
-          <el-input v-model="dataForm.residentsPhone" placeholder="联系电话"></el-input>
-      </el-form-item>
-          <el-form-item label="身体状况 (0：病残 1：健康)" prop="bodyStatus">
-          <el-input v-model="dataForm.bodyStatus" placeholder="身体状况 (0：病残 1：健康)"></el-input>
-      </el-form-item>
-          <el-form-item label="婚姻状况 (0：未婚 1：已婚)" prop="maritalStatus">
-          <el-input v-model="dataForm.maritalStatus" placeholder="婚姻状况 (0：未婚 1：已婚)"></el-input>
-      </el-form-item>
-          <el-form-item label="户口类型 (0：城镇 1：农业)" prop="accountType">
-          <el-input v-model="dataForm.accountType" placeholder="户口类型 (0：城镇 1：农业)"></el-input>
-      </el-form-item>
-          <el-form-item label="服兵役 (0：否 1：是)" prop="militaryService">
-          <el-input v-model="dataForm.militaryService" placeholder="服兵役 (0：否 1：是)"></el-input>
-      </el-form-item>
-          <el-form-item label="户籍地" prop="householdRegistrationPlace">
-          <el-input v-model="dataForm.householdRegistrationPlace" placeholder="户籍地"></el-input>
-      </el-form-item>
-          <el-form-item label="就业情况 (0：在岗 1：就业)" prop="employmentStatus">
-          <el-input v-model="dataForm.employmentStatus" placeholder="就业情况 (0：在岗 1：就业)"></el-input>
-      </el-form-item>
-          <el-form-item label="现工作单位" prop="currentEmployer">
-          <el-input v-model="dataForm.currentEmployer" placeholder="现工作单位"></el-input>
-      </el-form-item>
-          <el-form-item label="现单位地址" prop="currentEmployerAddress">
-          <el-input v-model="dataForm.currentEmployerAddress" placeholder="现单位地址"></el-input>
-      </el-form-item>
-          <el-form-item label="失业原因 (0：原单位破产 1：解除合同  2：效益不好 3：减员 4：其他)" prop="unemploymentReason">
-          <el-input v-model="dataForm.unemploymentReason" placeholder="失业原因 (0：原单位破产 1：解除合同  2：效益不好 3：减员 4：其他)"></el-input>
-      </el-form-item>
-          <el-form-item label="再就业优惠证 (0：无 1：有)" prop="reemploymentPermit">
-          <el-input v-model="dataForm.reemploymentPermit" placeholder="再就业优惠证 (0：无 1：有)"></el-input>
-      </el-form-item>
-          <el-form-item label="失业登记 (0：否 1：是)" prop="unemploymentRegister">
-          <el-input v-model="dataForm.unemploymentRegister" placeholder="失业登记 (0：否 1：是)"></el-input>
-      </el-form-item>
-          <el-form-item label="失业登记时间" prop="unemploymentRegisterTime">
-          <el-input v-model="dataForm.unemploymentRegisterTime" placeholder="失业登记时间"></el-input>
-      </el-form-item>
-          <el-form-item label="家庭类别 (0：普通家庭 1：五好家庭 2：军烈家庭 3：优抚家庭 4：单亲家庭 5：空巢老人 6：困难家庭)" prop="familyCategory">
-          <el-input v-model="dataForm.familyCategory" placeholder="家庭类别 (0：普通家庭 1：五好家庭 2：军烈家庭 3：优抚家庭 4：单亲家庭 5：空巢老人 6：困难家庭)"></el-input>
-      </el-form-item>
-          <el-form-item label="救助情况 (0：低保 1：大病 2：廉租 3：教育 4：临时 5：其他)" prop="helpStatus">
-          <el-input v-model="dataForm.helpStatus" placeholder="救助情况 (0：低保 1：大病 2：廉租 3：教育 4：临时 5：其他)"></el-input>
-      </el-form-item>
-          <el-form-item label="机动车数量" prop="motorVehicleNum">
-          <el-input v-model="dataForm.motorVehicleNum" placeholder="机动车数量"></el-input>
-      </el-form-item>
-          <el-form-item label="机动车类型 (0：轿车 1：摩托 2：其他)" prop="motorVehicleCategory">
-          <el-input v-model="dataForm.motorVehicleCategory" placeholder="机动车类型 (0：轿车 1：摩托 2：其他)"></el-input>
-      </el-form-item>
-          <el-form-item label="宠物犬状况 (0：无 1：有)" prop="dogStatus">
-          <el-input v-model="dataForm.dogStatus" placeholder="宠物犬状况 (0：无 1：有)"></el-input>
-      </el-form-item>
-          <el-form-item label="家庭成员数" prop="familyMemberNum">
-          <el-input v-model="dataForm.familyMemberNum" placeholder="家庭成员数"></el-input>
-      </el-form-item>
-          <el-form-item label="家庭外出成员数" prop="familyMemberOutNum">
-          <el-input v-model="dataForm.familyMemberOutNum" placeholder="家庭外出成员数"></el-input>
-      </el-form-item>
-          <el-form-item label="外出原因 (0：务工 1：上学 2：探亲 3：其他)" prop="familyMemberOutReason">
-          <el-input v-model="dataForm.familyMemberOutReason" placeholder="外出原因 (0：务工 1：上学 2：探亲 3：其他)"></el-input>
-      </el-form-item>
-          <el-form-item label="在外月数" prop="familyMemberOutMonth">
-          <el-input v-model="dataForm.familyMemberOutMonth" placeholder="在外月数"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" 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="创建人" 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="所属网格ID" prop="gridId">
-          <el-input v-model="dataForm.gridId" placeholder="所属网格ID"></el-input>
-      </el-form-item>
-          <el-form-item label="父所有部门" prop="parentDeptIds">
-          <el-input v-model="dataForm.parentDeptIds" placeholder="父所有部门"></el-input>
-      </el-form-item>
-          <el-form-item label="父所有部门" prop="parentDeptNames">
-          <el-input v-model="dataForm.parentDeptNames" placeholder="父所有部门"></el-input>
-      </el-form-item>
-          <el-form-item label="所有部门ID" prop="allDeptIds">
-          <el-input v-model="dataForm.allDeptIds" placeholder="所有部门ID"></el-input>
-      </el-form-item>
-          <el-form-item label="所有部门名称" prop="allDeptNames">
-          <el-input v-model="dataForm.allDeptNames" placeholder="所有部门名称"></el-input>
-      </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: '',
-        residentsName: '',
-        residentsSex: '',
-        residentsNation: '',
-        residentsBirthday: '',
-        educationLevel: '',
-        politicsStatus: '',
-        joinTime: '',
-        organizationalRelationshipLocation: '',
-        residentsIdentityNo: '',
-        residentsPhone: '',
-        bodyStatus: '',
-        maritalStatus: '',
-        accountType: '',
-        militaryService: '',
-        householdRegistrationPlace: '',
-        employmentStatus: '',
-        currentEmployer: '',
-        currentEmployerAddress: '',
-        unemploymentReason: '',
-        reemploymentPermit: '',
-        unemploymentRegister: '',
-        unemploymentRegisterTime: '',
-        familyCategory: '',
-        helpStatus: '',
-        motorVehicleNum: '',
-        motorVehicleCategory: '',
-        dogStatus: '',
-        familyMemberNum: '',
-        familyMemberOutNum: '',
-        familyMemberOutReason: '',
-        familyMemberOutMonth: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: '',
-        gridId: '',
-        parentDeptIds: '',
-        parentDeptNames: '',
-        allDeptIds: '',
-        allDeptNames: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        residentsName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        residentsSex: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        residentsNation: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        residentsBirthday: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        educationLevel: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        politicsStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        joinTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        organizationalRelationshipLocation: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        residentsIdentityNo: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        residentsPhone: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        bodyStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        maritalStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        accountType: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        militaryService: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        householdRegistrationPlace: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        employmentStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        currentEmployer: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        currentEmployerAddress: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        unemploymentReason: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        reemploymentPermit: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        unemploymentRegister: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        unemploymentRegisterTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        familyCategory: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        helpStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        motorVehicleNum: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        motorVehicleCategory: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        dogStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        familyMemberNum: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        familyMemberOutNum: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        familyMemberOutReason: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        familyMemberOutMonth: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { 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' }
-        ],
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentDeptIds: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentDeptNames: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allDeptIds: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allDeptNames: [
-          { 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(`/news/populationinformation/${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']('/news/populationinformation/', 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/user/populationinformation-detail.vue b/src/views/modules/user/populationinformation-detail.vue
new file mode 100644
index 0000000..0ec70a7
--- /dev/null
+++ b/src/views/modules/user/populationinformation-detail.vue
@@ -0,0 +1,102 @@
+<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' : '140px'">
+      <el-form-item class="item" label="户主信息">
+      </el-form-item>
+
+          <el-form-item label="户主姓名：" prop="residentsName">
+            <span>{{dataForm.residentsName}}</span>
+          </el-form-item>
+          <el-form-item label="户主性别：" prop="houseArea" width="50px">
+            <span>{{dataForm.residentsSex === '1' ? '男' : '女'}}</span>
+      </el-form-item>
+      <el-form-item label="户主联系电话：" prop="residentsPhone">
+        <span>{{dataForm.residentsPhone}}</span>
+      </el-form-item>
+      <el-form-item label="户主身份证号：" prop="residentsIdentityNo">
+        <span>{{dataForm.residentsIdentityNo}}</span>
+      </el-form-item>
+      <el-form-item label="户主民族：" prop="residentsNation">
+        <span>{{dataForm.residentsNation}}</span>
+      </el-form-item>
+      <el-form-item label="户籍地：" prop="householdRegistrationPlace">
+        <span>{{dataForm.householdRegistrationPlace}}</span>
+      </el-form-item>
+      <hr>
+      <el-form-item class="item" label="房屋信息">
+      </el-form-item>
+      <div :key="house.houseAddress" v-for="house in dataForm.housingInformationList">
+        <el-form-item label="房屋地址：" prop="houseAddress">
+          <span>{{house.houseAddress}}</span>
+        </el-form-item>
+        <el-form-item label="产权人：" prop="propertyOwner">
+          <span>{{house.propertyOwner}}</span>
+        </el-form-item>
+            <el-form-item label="产权人身份证号：" prop="propertyOwnerIdentityNo">
+              <span>{{house.propertyOwnerIdentityNo}}</span>
+        </el-form-item>
+        <el-form-item label="所属网格：" prop="gridName">
+          <span>{{house.gridName}}</span>
+        </el-form-item>
+      </div>
+      </el-form>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        householdRegistrationPlace: '',
+        residentsNation: '',
+        residentsIdentityNo: '',
+        residentsPhone: '',
+        residentsSex: '',
+        residentsName: '',
+        gridNames: '',
+        housingInformationList: []
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/populationinformation/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    }
+  }
+}
+</script>
+<style>
+  .item .el-form-item__label{
+    font-size: 20px;
+    width: 50px;
+    font-weight: bold;
+  }
+</style>
diff --git a/src/views/modules/user/populationinformation.vue b/src/views/modules/user/populationinformation.vue
index f394bc9..6b625e8 100644
--- a/src/views/modules/user/populationinformation.vue
+++ b/src/views/modules/user/populationinformation.vue
@@ -2,68 +2,45 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__populationinformation}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item label="姓名">
+          <el-input v-model="dataForm.residentsName"
+                    placeholder=""
+                    clearable></el-input>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-form-item label="联系电话">
+          <el-input v-model="dataForm.residentsPhone"
+                    placeholder=""
+                    clearable></el-input>
         </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('news:populationinformation:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        <el-form-item label="身份证号">
+          <el-input v-model="dataForm.residentsIdentityNo"
+                    placeholder=""
+                    clearable></el-input>
+        </el-form-item>
+        <br>
+        <el-form-item label="辖区范围">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable>
+          </el-cascader>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:populationinformation:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <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-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 label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+        <el-table-column prop="gridNames" label="辖区范围" header-align="center" align="center" width="200px"></el-table-column>
         <el-table-column prop="residentsName" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residentsSex" label="性别 (0：女 1：男)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residentsNation" label="民族" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residentsBirthday" label="出生年/月" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="educationLevel" label="文化程度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="politicsStatus" label="政治面貌 (0：群众 1：党员)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="joinTime" label="入党时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="organizationalRelationshipLocation" label="组织关系所在地" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="residentsIdentityNo" label="身份证号码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentsSex" label="性别" header-align="center" align="center" :formatter="sexFormat"></el-table-column>
         <el-table-column prop="residentsPhone" label="联系电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="bodyStatus" label="身体状况 (0：病残 1：健康)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="maritalStatus" label="婚姻状况 (0：未婚 1：已婚)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="accountType" label="户口类型 (0：城镇 1：农业)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="militaryService" label="服兵役 (0：否 1：是)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentsIdentityNo" label="身份证号码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="residentsNation" label="民族" header-align="center" align="center"></el-table-column>
         <el-table-column prop="householdRegistrationPlace" label="户籍地" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="employmentStatus" label="就业情况 (0：在岗 1：就业)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="currentEmployer" label="现工作单位" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="currentEmployerAddress" label="现单位地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="unemploymentReason" label="失业原因 (0：原单位破产 1：解除合同  2：效益不好 3：减员 4：其他)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="reemploymentPermit" label="再就业优惠证 (0：无 1：有)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="unemploymentRegister" label="失业登记 (0：否 1：是)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="unemploymentRegisterTime" label="失业登记时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="familyCategory" label="家庭类别 (0：普通家庭 1：五好家庭 2：军烈家庭 3：优抚家庭 4：单亲家庭 5：空巢老人 6：困难家庭)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="helpStatus" label="救助情况 (0：低保 1：大病 2：廉租 3：教育 4：临时 5：其他)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="motorVehicleNum" label="机动车数量" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="motorVehicleCategory" label="机动车类型 (0：轿车 1：摩托 2：其他)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="dogStatus" label="宠物犬状况 (0：无 1：有)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="familyMemberNum" label="家庭成员数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="familyMemberOutNum" label="家庭外出成员数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="familyMemberOutReason" label="外出原因 (0：务工 1：上学 2：探亲 3：其他)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="familyMemberOutMonth" label="在外月数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标识" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gridId" label="所属网格ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptIds" label="父所有部门" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptNames" label="父所有部门" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptIds" label="所有部门ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="所有部门名称" 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 label="更多信息" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('news:populationinformation:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:populationinformation:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+              <el-button  type="text" size="small" @click="lookResidentInfo(scope.row.id)">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -77,31 +54,82 @@
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <populationinformation-detail v-if="detailVisible" ref="populationinformationDetail" @refreshDataList="getDataList"></populationinformation-detail>
     </div>
   </el-card>
 </template>
 
 <script>
 import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './populationinformation-add-or-update'
+import PopulationinformationDetail from './populationinformation-detail'
+
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/populationinformation/page',
+        getDataListURL: '/app-user/populationinformation/page',
         getDataListIsPage: true,
-        deleteURL: '/news/populationinformation',
+        deleteURL: '/app-user/populationinformation',
         deleteIsBatch: true
       },
       dataForm: {
         id: ''
-      }
+      },
+      deptIdList: [],
+      options: [],
+      detailVisible: false
     }
   },
   components: {
-    AddOrUpdate
+    PopulationinformationDetail
+  },
+  created: function () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => { })
+  },
+  methods: {
+    sexFormat (row, column) {
+      return row.residentsSex === '0' ? '女' : '男'
+    },
+    lookResidentInfo (id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.populationinformationDetail.dataForm.id = id
+        this.$refs.populationinformationDetail.init()
+      })
+    }
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
   }
 }
 </script>

From 322c8fc725907c32740acfc85aa34bde200bbf0d Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Wed, 2 Sep 2020 13:28:12 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=87=87=E9=9B=86-Excel=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/housinginformation.vue | 82 ++++++++++++++++++-
 1 file changed, 80 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/user/housinginformation.vue b/src/views/modules/user/housinginformation.vue
index 1801da5..c5fcfbb 100644
--- a/src/views/modules/user/housinginformation.vue
+++ b/src/views/modules/user/housinginformation.vue
@@ -45,6 +45,21 @@
           <el-button type="info"
                      @click="exportMoudleHandle()">导出模板</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-upload class="upload-demo"
+                     ref="upload"
+                     :before-upload="handlePreview"
+                     :action="uploadUrl"
+                     :limit="1"
+                     :on-success='uploadSuccess'
+                     :on-error='errorExceed'>
+            <el-button type="primary">点击上传</el-button>
+          </el-upload>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
@@ -83,6 +98,30 @@
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
       <housinginformation-detail v-if="detailVisible" ref="housinginformationDetail" @refreshDataList="getDataList"></housinginformation-detail>
+      <!-- 错误信息 -->
+      <el-dialog :visible.sync="faultDataVisible"
+                 title="请修改后重新提交">
+        <el-table :data="errorDataList"
+                  border
+                  style="width: 100%;">
+          <el-table-column prop="sheetName"
+                           label="所属Sheet"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="errorLine"
+                           label="行数"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="errorInfo"
+                           label="错误信息"
+                           header-align="center"
+                           align="center"></el-table-column>
+        </el-table>
+        <template slot="footer">
+          <el-button type="primary"
+                     @click="faultDataVisible = false">确定</el-button>
+        </template>
+      </el-dialog>
     </div>
   </el-card>
 </template>
@@ -91,6 +130,8 @@
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './housinginformation-add-or-update'
 import HousinginformationDetail from './housinginformation-detail'
+import Cookies from 'js-cookie'
+
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -104,7 +145,8 @@ export default {
         exportMoudle: '/app-user/housinginformation/exportModule'
       },
       dataForm: {
-        id: ''
+        id: '',
+        gridId: ''
       },
       deptIdList: [],
       options: [],
@@ -122,7 +164,10 @@ export default {
           label: '经营'
         }
       ],
-      detailVisible: false
+      detailVisible: false,
+      uploadUrl: '',
+      faultDataVisible: false,
+      errorDataList: []
     }
   },
   components: {
@@ -150,6 +195,7 @@ export default {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
         this.dataForm.gridId = this.deptIdList[2]
+        this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/app-user/housinginformation/importExcel?gridId=${this.deptIdList[2]}&token=${Cookies.get('token')}`
       }
     }
   },
@@ -164,6 +210,7 @@ export default {
       })
       .catch(() => { })
     this.getDataList()
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/app-user/housinginformation/importExcel?gridId=${this.dataForm.gridId}&token=${Cookies.get('token')}`
   },
   methods: {
     houseUseFormatter: function (row, column) {
@@ -186,6 +233,37 @@ export default {
     lookResidentInfo (id) {
       this.$parent.selectComponent = 'Househeadedit'
       this.$router.push({ path: '/user-houseinfomationroute', query: { id: id } })
+    },
+    errorExceed (file, fileList) {
+      this.$message.error('上传失败请重试')
+    },
+    uploadError (error, file, fileList) {
+      this.$message.error(error)
+    },
+    handlePreview (file) {
+      if (this.dataForm.gridId === undefined || this.dataForm.gridId === '') {
+        this.$message.error('请选择网格后导入')
+        return false
+      }
+    },
+    uploadSuccess (response, file, fileList) {
+      this.$refs.upload.clearFiles()
+      if (response.code !== 0) {
+        return this.$message.error(response.msg)
+      }
+      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()
+        }
+      })
     }
   }
 }

From 0be8b7ea4518f3b3af9c89a29ca2326619535823 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Mon, 7 Sep 2020 08:59:12 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=87=87=E9=9B=86-bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/houseFamilyInfo.vue      |  2 +-
 src/views/modules/user/housebusinessinfo.vue    |  6 +++---
 src/views/modules/user/househeadedit.vue        | 17 +++++++++++------
 .../user/houseresidentInfo-add-or-update.vue    |  6 +++++-
 src/views/modules/user/housinginformation.vue   | 10 +++++-----
 .../modules/user/populationInfoOverview.vue     |  6 +++---
 .../modules/user/populationMotorVehicle.vue     |  2 +-
 .../modules/user/populationinformation.vue      |  6 +++---
 8 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/user/houseFamilyInfo.vue b/src/views/modules/user/houseFamilyInfo.vue
index 66f8a3c..3c4b9b7 100644
--- a/src/views/modules/user/houseFamilyInfo.vue
+++ b/src/views/modules/user/houseFamilyInfo.vue
@@ -3,7 +3,7 @@
     <div class="mod-news__housebusinessinfo}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="户主姓名">
-          <el-input v-model="dataForm.residentsName"
+          <el-input v-model.trim="dataForm.residentsName"
                     placeholder=""
                     clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/user/housebusinessinfo.vue b/src/views/modules/user/housebusinessinfo.vue
index f95b55b..c553f9d 100644
--- a/src/views/modules/user/housebusinessinfo.vue
+++ b/src/views/modules/user/housebusinessinfo.vue
@@ -3,17 +3,17 @@
     <div class="mod-news__housebusinessinfo}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="经营者姓名">
-          <el-input v-model="dataForm.legalRepresentative"
+          <el-input v-model.trim="dataForm.legalRepresentative"
                     placeholder=""
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="企业名称">
-          <el-input v-model="dataForm.enterpriseName"
+          <el-input v-model.trim="dataForm.enterpriseName"
                     placeholder=""
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="企业注册号">
-          <el-input v-model="dataForm.socialUniformCode"
+          <el-input v-model.trim="dataForm.socialUniformCode"
                     placeholder=""
                     clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/user/househeadedit.vue b/src/views/modules/user/househeadedit.vue
index a120a7d..95abbb7 100644
--- a/src/views/modules/user/househeadedit.vue
+++ b/src/views/modules/user/househeadedit.vue
@@ -138,7 +138,7 @@
               <el-radio  label="1">是</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="失业登记时间" prop="unemploymentRegisterTime" v-if="dataForm.employmentStatus === '1'">
+          <el-form-item label="失业登记时间" prop="unemploymentRegisterTime" v-if="dataForm.employmentStatus === '1' && dataForm.unemploymentRegister === '1'">
             <el-date-picker
                 v-model="dataForm.unemploymentRegisterTime"
                 type="date"
@@ -302,9 +302,6 @@ export default {
         motorVehicleNum: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        motorVehicleCategory: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         dogStatus: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
@@ -487,11 +484,19 @@ export default {
         }
         if (this.dataForm.employmentStatus === '1') {
           if (this.dataForm.unemploymentReason === '' || this.dataForm.unemploymentRegister === '' ||
-            this.dataForm.reemploymentPermit === '' || this.dataForm.unemploymentRegisterTime === '' ||
+            this.dataForm.reemploymentPermit === '' ||
             this.dataForm.unemploymentReason === null || this.dataForm.unemploymentRegister === null ||
-            this.dataForm.reemploymentPermit === null || this.dataForm.unemploymentRegisterTime === null) {
+            this.dataForm.reemploymentPermit === null) {
             return this.$message.error('请填写详细失业信息！')
           }
+          if (this.dataForm.unemploymentRegister === '1') {
+            if (this.dataForm.unemploymentRegisterTime === '' || this.dataForm.unemploymentRegisterTime === null) {
+              return this.$message.error('请填写失业登记时间')
+            }
+          }
+        }
+        if (this.dataForm.motorVehicleNum !== 0 && (this.dataForm.motorVehicleCategory === '' || this.dataForm.motorVehicleCategory === null)) {
+          return this.$message.error('请选择机动车类型')
         }
         this.dataForm.isSubmit = '0'
         this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/populationinformation/', this.dataForm).then(({ data: res }) => {
diff --git a/src/views/modules/user/houseresidentInfo-add-or-update.vue b/src/views/modules/user/houseresidentInfo-add-or-update.vue
index ed828c1..31d2bd4 100644
--- a/src/views/modules/user/houseresidentInfo-add-or-update.vue
+++ b/src/views/modules/user/houseresidentInfo-add-or-update.vue
@@ -69,8 +69,12 @@ export default {
           value: '1'
         },
         {
-          label: '其他',
+          label: '父母',
           value: '2'
+        },
+        {
+          label: '其他',
+          value: '3'
         }
       ]
     }
diff --git a/src/views/modules/user/housinginformation.vue b/src/views/modules/user/housinginformation.vue
index c5fcfbb..c3520b0 100644
--- a/src/views/modules/user/housinginformation.vue
+++ b/src/views/modules/user/housinginformation.vue
@@ -3,17 +3,17 @@
     <div class="mod-news__housinginformation}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="房屋地址">
-          <el-input v-model="dataForm.houseAddress"
+          <el-input v-model.trim="dataForm.houseAddress"
                     placeholder=""
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="产权人">
-          <el-input v-model="dataForm.propertyOwner"
+          <el-input v-model.trim="dataForm.propertyOwner"
                     placeholder=""
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="dataForm.propertyOwnerMobile"
+          <el-input v-model.trim="dataForm.propertyOwnerMobile"
                     placeholder=""
                     clearable></el-input>
         </el-form-item>
@@ -69,12 +69,12 @@
         <el-table-column prop="propertyOwner" label="产权人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="propertyOwnerMobile" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="propertyOwnerIdentityNo" label="身份证号" header-align="center" align="center" width="180px"></el-table-column>
-        <el-table-column label="房屋信息" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column label="房屋信息" fixed="right" header-align="center" align="center" width="90">
           <template slot-scope="scope">
             <el-button  type="text" size="small" @click="lookHouseInfo(scope.row.id)">查看</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="居住人信息" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column label="居住人信息" fixed="right" header-align="center" align="center" width="95">
           <template slot-scope="scope">
             <el-button  type="text" size="small" @click="lookResidentInfo(scope.row.id)">查看</el-button>
           </template>
diff --git a/src/views/modules/user/populationInfoOverview.vue b/src/views/modules/user/populationInfoOverview.vue
index 0cdeb49..f272d64 100644
--- a/src/views/modules/user/populationInfoOverview.vue
+++ b/src/views/modules/user/populationInfoOverview.vue
@@ -7,12 +7,12 @@
           <td>
             <p class="item">居住类型统计</p>
             <div id="houseUse"
-                 :style="{width: '600px', height: '325px'}"></div>
+                 :style="{width: '600px', height: '290px'}"></div>
           </td>
           <td>
             <p class="item">数据量统计</p>
             <div
-                 style="width: 600px;height: 325px">
+                 style="width: 600px;height: 290px">
               <div class="houseInfo" style="width: 300px;height: 200px;margin-left: 50px;margin-top: 30px">
                 <table style=" border-spacing:0px 10px">
                   <tr>
@@ -45,7 +45,7 @@
           <td>
             <p class="item">人员就业情况</p>
             <div id="employStatus"
-                 :style="{width: '600px', height: '325px'}"></div>
+                 :style="{width: '600px', height: '290px'}"></div>
           </td>
           <td></td>
         </tr>
diff --git a/src/views/modules/user/populationMotorVehicle.vue b/src/views/modules/user/populationMotorVehicle.vue
index 4536f28..7b7e7e4 100644
--- a/src/views/modules/user/populationMotorVehicle.vue
+++ b/src/views/modules/user/populationMotorVehicle.vue
@@ -13,7 +13,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="车主姓名">
-          <el-input v-model="dataForm.residentsName"
+          <el-input v-model.trim="dataForm.residentsName"
                     placeholder=""
                     clearable></el-input>
         </el-form-item>
diff --git a/src/views/modules/user/populationinformation.vue b/src/views/modules/user/populationinformation.vue
index 6b625e8..b387fae 100644
--- a/src/views/modules/user/populationinformation.vue
+++ b/src/views/modules/user/populationinformation.vue
@@ -3,17 +3,17 @@
     <div class="mod-news__populationinformation}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="姓名">
-          <el-input v-model="dataForm.residentsName"
+          <el-input v-model.trim="dataForm.residentsName"
                     placeholder=""
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="联系电话">
-          <el-input v-model="dataForm.residentsPhone"
+          <el-input v-model.trim="dataForm.residentsPhone"
                     placeholder=""
                     clearable></el-input>
         </el-form-item>
         <el-form-item label="身份证号">
-          <el-input v-model="dataForm.residentsIdentityNo"
+          <el-input v-model.trim="dataForm.residentsIdentityNo"
                     placeholder=""
                     clearable></el-input>
         </el-form-item>

From a1ddef7aeb7e864e5efce261c801099599484daa Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Tue, 8 Sep 2020 17:37:31 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=87=87=E9=9B=86-bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/househeadedit.vue      | 45 +++++++++-------
 .../user/houseresidentInfo-add-or-update.vue  | 13 +++--
 .../user/housinginformation-add-or-update.vue | 52 +++++++++++--------
 .../modules/user/populationMotorVehicle.vue   | 11 ++--
 4 files changed, 71 insertions(+), 50 deletions(-)

diff --git a/src/views/modules/user/househeadedit.vue b/src/views/modules/user/househeadedit.vue
index 95abbb7..1152eb9 100644
--- a/src/views/modules/user/househeadedit.vue
+++ b/src/views/modules/user/househeadedit.vue
@@ -16,13 +16,13 @@
       </el-form-item>
       <br>
       <el-form-item label="户主姓名" prop="residentsName" >
-        <el-input v-model="dataForm.residentsName" placeholder="姓名"></el-input>
+        <el-input v-model.trim="dataForm.residentsName" placeholder="姓名" maxlength="10" show-word-limit></el-input>
       </el-form-item>
           <el-form-item label="民族" prop="residentsNation">
-          <el-input v-model="dataForm.residentsNation" placeholder="民族"></el-input>
+          <el-input v-model.trim="dataForm.residentsNation" placeholder="民族" maxlength="10" show-word-limit></el-input>
       </el-form-item>
         <el-form-item label="身份证号码" prop="residentsIdentityNo" >
-          <el-input v-model="dataForm.residentsIdentityNo" placeholder="身份证号码" @blur="getSexAndBirthDay"></el-input>
+          <el-input v-model.trim="dataForm.residentsIdentityNo" placeholder="身份证号码" @blur="getSexAndBirthDay" maxlength="18" show-word-limit></el-input>
         </el-form-item>
 
         <el-form-item label="性别" prop="residentsSex">
@@ -61,11 +61,11 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="组织关系所在地" prop="organizationalRelationshipLocation" v-if="dataForm.politicsStatus === '1'">
-          <el-input v-model="dataForm.organizationalRelationshipLocation" placeholder="组织关系所在地"></el-input>
+          <el-input v-model="dataForm.organizationalRelationshipLocation" placeholder="组织关系所在地" maxlength="20" show-word-limit></el-input>
       </el-form-item>
 
           <el-form-item label="联系电话" prop="residentsPhone">
-          <el-input v-model="dataForm.residentsPhone" placeholder="联系电话"></el-input>
+          <el-input v-model.trim="dataForm.residentsPhone" placeholder="联系电话" maxlength="20" show-word-limit></el-input>
       </el-form-item>
       <br>
           <el-form-item label="身体状况" prop="bodyStatus">
@@ -97,7 +97,7 @@
           </el-form-item>
       <br>
           <el-form-item label="户籍地" prop="householdRegistrationPlace">
-          <el-input v-model="dataForm.householdRegistrationPlace" placeholder="户籍地" style="width: 500px"></el-input>
+          <el-input v-model.trim="dataForm.householdRegistrationPlace" placeholder="户籍地" style="width: 500px" maxlength="30" show-word-limit></el-input>
       </el-form-item>
       <br>
       <hr>
@@ -112,10 +112,10 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="现工作单位" prop="currentEmployer" v-if="dataForm.employmentStatus === '0'">
-          <el-input v-model="dataForm.currentEmployer" placeholder="现工作单位"></el-input>
+          <el-input v-model.trim="dataForm.currentEmployer" placeholder="现工作单位" maxlength="30" show-word-limit></el-input>
       </el-form-item>
           <el-form-item label="现单位地址" prop="currentEmployerAddress" v-if="dataForm.employmentStatus === '0'">
-          <el-input v-model="dataForm.currentEmployerAddress" placeholder="现单位地址"></el-input>
+          <el-input v-model.trim="dataForm.currentEmployerAddress" placeholder="现单位地址" maxlength="30" show-word-limit></el-input>
       </el-form-item>
       <br>
           <el-form-item label="失业原因" prop="unemploymentReason" v-if="dataForm.employmentStatus === '1'">
@@ -166,15 +166,17 @@
             </el-radio-group>
           </el-form-item>
       <br>
-          <el-form-item label="机动车数量" prop="motorVehicleNum">
-            <el-input-number v-model="dataForm.motorVehicleNum" placeholder="机动车数量"></el-input-number>
+          <el-form-item label="机动车数量">
+            <el-input-number v-model="dataForm.motorVehicleNum" placeholder="机动车数量" :min="0"></el-input-number>
       </el-form-item>
           <el-form-item label="机动车类型" prop="motorVehicleCategory">
-            <el-radio-group v-model="dataForm.motorVehicleCategory">
-              <el-radio  v-for="item in motorVehicleCategoryList"
-                         :key="item.dictValue"
-                         :label="item.dictValue">{{item.dictName}}</el-radio>
-            </el-radio-group>
+            <el-checkbox-group v-model="dataForm.motorVehicleCategoryList">
+              <el-checkbox v-for="item in motorVehicleCategoryList"
+                           :key="item.dictValue"
+                           :label="item.dictValue">
+                {{item.dictName}}
+              </el-checkbox>
+            </el-checkbox-group>
           </el-form-item>
           <el-form-item label="宠物犬状况" prop="dogStatus">
             <el-radio-group v-model="dataForm.dogStatus">
@@ -226,6 +228,7 @@ export default {
         helpStatus: '',
         motorVehicleNum: '',
         motorVehicleCategory: '',
+        motorVehicleCategoryList: [],
         dogStatus: '',
         familyMemberNum: '',
         familyMemberOutNum: '',
@@ -299,9 +302,6 @@ export default {
         helpStatus: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        motorVehicleNum: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         dogStatus: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
@@ -495,9 +495,16 @@ export default {
             }
           }
         }
-        if (this.dataForm.motorVehicleNum !== 0 && (this.dataForm.motorVehicleCategory === '' || this.dataForm.motorVehicleCategory === null)) {
+        if (this.dataForm.motorVehicleNum !== 0 && (this.dataForm.motorVehicleCategoryList.length === 0)) {
           return this.$message.error('请选择机动车类型')
         }
+        let motorVehicleCategoryStr = ''
+        if (this.dataForm.motorVehicleCategoryList.length > 0) {
+          for (let i = 0; i < this.dataForm.motorVehicleCategoryList.length; i++) {
+            motorVehicleCategoryStr += ',' + this.dataForm.motorVehicleCategoryList[i]
+          }
+        }
+        this.dataForm.motorVehicleCategory = motorVehicleCategoryStr.substr(1)
         this.dataForm.isSubmit = '0'
         this.$http[!this.dataForm.id ? 'post' : 'put']('/app-user/populationinformation/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
diff --git a/src/views/modules/user/houseresidentInfo-add-or-update.vue b/src/views/modules/user/houseresidentInfo-add-or-update.vue
index 31d2bd4..79af221 100644
--- a/src/views/modules/user/houseresidentInfo-add-or-update.vue
+++ b/src/views/modules/user/houseresidentInfo-add-or-update.vue
@@ -11,7 +11,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="姓名" prop="residentsName" >
-        <el-input v-model="dataForm.residentsName" placeholder="姓名"></el-input>
+        <el-input v-model.trim="dataForm.residentsName" placeholder="姓名" maxlength="10" show-word-limit></el-input>
       </el-form-item>
       <el-form-item label="性别" prop="residentsSex">
         <el-radio-group v-model="dataForm.residentsSex">
@@ -20,13 +20,13 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="民族" prop="residentsNation">
-        <el-input v-model="dataForm.residentsNation" placeholder="民族"></el-input>
+        <el-input v-model.trim="dataForm.residentsNation" placeholder="民族" maxlength="10" show-word-limit></el-input>
       </el-form-item>
       <el-form-item label="工作单位/学校" prop="currentEmployer">
-        <el-input v-model="dataForm.currentEmployer" placeholder="工作单位/学校"></el-input>
+        <el-input v-model.trim="dataForm.currentEmployer" placeholder="工作单位/学校" maxlength="30" show-word-limit></el-input>
       </el-form-item>
-      <el-form-item label="现居住地址单位" prop="currentAddress">
-        <el-input v-model="dataForm.currentAddress" placeholder="现工作单位"></el-input>
+      <el-form-item label="现居住地址" prop="currentAddress">
+        <el-input v-model.trim="dataForm.currentAddress" placeholder="现居住地址" maxlength="30" show-word-limit></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -86,6 +86,9 @@ export default {
         residentsName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        houseHeadRelation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         residentsSex: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
diff --git a/src/views/modules/user/housinginformation-add-or-update.vue b/src/views/modules/user/housinginformation-add-or-update.vue
index 4594528..8437797 100644
--- a/src/views/modules/user/housinginformation-add-or-update.vue
+++ b/src/views/modules/user/housinginformation-add-or-update.vue
@@ -2,7 +2,7 @@
   <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' : '120px'">
           <el-form-item label="房屋地址" prop="houseAddress">
-          <el-input v-model="dataForm.houseAddress" placeholder="房屋地址"></el-input>
+          <el-input v-model.trim="dataForm.houseAddress" placeholder="房屋地址" maxlength="30" show-word-limit></el-input>
       </el-form-item>
           <el-form-item label="购房时间" prop="buyingTime">
             <el-date-picker
@@ -15,16 +15,16 @@
           <el-input-number v-model="dataForm.houseArea" placeholder="房屋面积" :min="1"></el-input-number>
       </el-form-item>
           <el-form-item label="产权人" prop="propertyOwner">
-          <el-input v-model="dataForm.propertyOwner" placeholder="产权人"></el-input>
+          <el-input v-model.trim="dataForm.propertyOwner" placeholder="产权人" maxlength="10" show-word-limit></el-input>
       </el-form-item>
       <el-form-item label="产权人联系电话" prop="propertyOwnerMobile">
-        <el-input v-model="dataForm.propertyOwnerMobile" placeholder="联系电话"></el-input>
+        <el-input v-model.trim="dataForm.propertyOwnerMobile" placeholder="联系电话" maxlength="20" show-word-limit></el-input>
       </el-form-item>
           <el-form-item label="产权人身份证号" prop="propertyOwnerIdentityNo">
-          <el-input v-model="dataForm.propertyOwnerIdentityNo" placeholder="产权人身份证号"></el-input>
+          <el-input v-model.trim="dataForm.propertyOwnerIdentityNo" placeholder="产权人身份证号" maxlength="18" show-word-limit></el-input>
       </el-form-item>
       <el-form-item label="产权证" prop="propertyOwnerCard">
-          <el-input v-model="dataForm.propertyOwnerCard" placeholder="产权证"></el-input>
+          <el-input v-model.trim="dataForm.propertyOwnerCard" placeholder="产权证" maxlength="20" show-word-limit></el-input>
       </el-form-item>
       <el-form-item label="所属网格">
         <el-cascader v-model="deptIdList"
@@ -45,27 +45,27 @@
       </el-form-item>
       <div v-if="dataForm.houseUse === '1'">
         <el-form-item label="承租人姓名" prop="tenantName">
-          <el-input v-model="dataForm.tenantName" placeholder="承租人姓名"></el-input>
+          <el-input v-model.trim="dataForm.tenantName" placeholder="承租人姓名" maxlength="10" show-word-limit></el-input>
         </el-form-item>
         <el-form-item label="承租人电话" prop="tenantPhone">
-          <el-input v-model="dataForm.tenantPhone" placeholder="承租人电话"></el-input>
+          <el-input v-model.trim="dataForm.tenantPhone" placeholder="承租人电话" maxlength="20" show-word-limit></el-input>
         </el-form-item>
         <el-form-item label="承租人身份证号" prop="tenantIdentityNo">
-          <el-input v-model="dataForm.tenantIdentityNo" placeholder="承租人身份证号"></el-input>
+          <el-input v-model.trim="dataForm.tenantIdentityNo" placeholder="承租人身份证号" maxlength="18" show-word-limit></el-input>
         </el-form-item>
       </div>
       <div v-if="dataForm.houseUse === '2'">
         <el-form-item label="企业名称" prop="enterpriseName">
-          <el-input v-model="dataForm.enterpriseName" placeholder="企业名称"></el-input>
+          <el-input v-model.trim="dataForm.enterpriseName" placeholder="企业名称" maxlength="30" show-word-limit></el-input>
         </el-form-item>
         <el-form-item label="社会统一代码" prop="socialUniformCode">
-          <el-input v-model="dataForm.socialUniformCode" placeholder="社会统一代码"></el-input>
+          <el-input v-model.trim="dataForm.socialUniformCode" placeholder="社会统一代码" maxlength="30" show-word-limit></el-input>
         </el-form-item>
         <el-form-item label="法人代表" prop="legalRepresentative">
-          <el-input v-model="dataForm.legalRepresentative" placeholder="法人代表"></el-input>
+          <el-input v-model.trim="dataForm.legalRepresentative" placeholder="法人代表" maxlength="10" show-word-limit></el-input>
         </el-form-item>
         <el-form-item label="电话" prop="enterprisePhone">
-          <el-input v-model="dataForm.enterprisePhone" placeholder="电话"></el-input>
+          <el-input v-model.trim="dataForm.enterprisePhone" placeholder="电话" maxlength="20" show-word-limit></el-input>
         </el-form-item>
       </div>
       </el-form>
@@ -91,19 +91,18 @@ export default {
         propertyOwnerIdentityNo: '',
         propertyOwnerMobile: '',
         houseUse: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: '',
         gridId: '',
-        parentDeptIds: '',
-        parentDeptNames: '',
-        allDeptIds: '',
-        allDeptNames: '',
+        streetId: '',
+        communityId: '',
         deptIdList: [],
-        propertyOwnerCard: ''
+        propertyOwnerCard: '',
+        tenantName: '',
+        tenantPhone: '',
+        tenantIdentityNo: '',
+        enterpriseName: '',
+        socialUniformCode: '',
+        legalRepresentative: '',
+        enterprisePhone: ''
       },
       houseUseFlag: [
         {
@@ -197,6 +196,13 @@ export default {
           this.getInfo()
         } else {
           this.deptIdList = []
+          this.dataForm.tenantName = ''
+          this.dataForm.tenantPhone = ''
+          this.dataForm.tenantIdentityNo = ''
+          this.dataForm.enterpriseName = ''
+          this.dataForm.socialUniformCode = ''
+          this.dataForm.legalRepresentative = ''
+          this.dataForm.enterprisePhone = ''
         }
       })
     },
diff --git a/src/views/modules/user/populationMotorVehicle.vue b/src/views/modules/user/populationMotorVehicle.vue
index 7b7e7e4..fb8cf94 100644
--- a/src/views/modules/user/populationMotorVehicle.vue
+++ b/src/views/modules/user/populationMotorVehicle.vue
@@ -72,10 +72,15 @@ export default {
   methods: {
     setMotorVehicleCategory (row, column) {
       if (row.motorVehicleCategory) {
-        let dict = this.motorVehicleCategoryList.filter(item => item.dictValue === row.motorVehicleCategory)[0]
-        if (dict) {
-          return dict.dictName
+        let returnName = ''
+        let motorVehicleCategoryArray = row.motorVehicleCategory.split(',')
+        for (let i = 0; i < motorVehicleCategoryArray.length; i++) {
+          let dict = this.motorVehicleCategoryList.filter(item => item.dictValue === motorVehicleCategoryArray[i])[0]
+          if (dict) {
+            returnName += ',' + dict.dictName
+          }
         }
+        return returnName.substr(1)
       }
       return ''
     }

From b7d4576ff39756052e3463ea0ce733f15b9dfe9e Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Thu, 10 Sep 2020 08:52:16 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=87=87=E9=9B=86-=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/houseFamilyInfo.vue        | 2 +-
 src/views/modules/user/houseResidentInfo.vue      | 2 +-
 src/views/modules/user/housebusinessinfo.vue      | 2 +-
 src/views/modules/user/housinginformation.vue     | 2 +-
 src/views/modules/user/populationMotorVehicle.vue | 2 +-
 src/views/modules/user/populationinformation.vue  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/user/houseFamilyInfo.vue b/src/views/modules/user/houseFamilyInfo.vue
index 3c4b9b7..ac1b758 100644
--- a/src/views/modules/user/houseFamilyInfo.vue
+++ b/src/views/modules/user/houseFamilyInfo.vue
@@ -40,7 +40,7 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+        <el-table-column label="序号" width="70px" header-align="center" align="center"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
         <el-table-column prop="gridNames" label="辖区范围" header-align="center" align="center" width="300px"></el-table-column>
         <el-table-column prop="residentsName" label="户主姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="helpStatus" label="救助情况" header-align="center" align="center" :formatter="helpStatusFormat"></el-table-column>
diff --git a/src/views/modules/user/houseResidentInfo.vue b/src/views/modules/user/houseResidentInfo.vue
index abcc9ac..da1724d 100644
--- a/src/views/modules/user/houseResidentInfo.vue
+++ b/src/views/modules/user/houseResidentInfo.vue
@@ -11,7 +11,7 @@
 
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+        <el-table-column label="序号" width="70px" header-align="center" align="center"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
         <el-table-column prop="houseHeadRelation" label="与户主关系" header-align="center" align="center" :formatter="houseHeadRelationFormat"></el-table-column>
         <el-table-column prop="residentsName" label="姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="residentsSex" label="性别" header-align="center" align="center" :formatter="sexFormat"></el-table-column>
diff --git a/src/views/modules/user/housebusinessinfo.vue b/src/views/modules/user/housebusinessinfo.vue
index c553f9d..57fbdfb 100644
--- a/src/views/modules/user/housebusinessinfo.vue
+++ b/src/views/modules/user/housebusinessinfo.vue
@@ -34,7 +34,7 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+        <el-table-column label="序号" width="70px" header-align="center" align="center"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
         <el-table-column prop="gridName" label="辖区范围" header-align="center" align="center" width="200px"></el-table-column>
         <el-table-column prop="legalRepresentative" label="经营者姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="enterprisePhone" label="联系电话" header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/user/housinginformation.vue b/src/views/modules/user/housinginformation.vue
index c3520b0..b76dc7b 100644
--- a/src/views/modules/user/housinginformation.vue
+++ b/src/views/modules/user/housinginformation.vue
@@ -62,7 +62,7 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+        <el-table-column label="序号" width="70px" header-align="center" align="center"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
         <el-table-column prop="houseUse" label="房屋用途" header-align="center" align="center" :formatter="houseUseFormatter"></el-table-column>
         <el-table-column prop="houseAddress" label="房屋地址" header-align="center" align="center" width="200px"></el-table-column>
         <el-table-column prop="gridName" label="所属网格" header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/user/populationMotorVehicle.vue b/src/views/modules/user/populationMotorVehicle.vue
index fb8cf94..7448065 100644
--- a/src/views/modules/user/populationMotorVehicle.vue
+++ b/src/views/modules/user/populationMotorVehicle.vue
@@ -26,7 +26,7 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+        <el-table-column label="序号" width="70px" header-align="center" align="center"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
         <el-table-column prop="motorVehicleCategory" label="机动车类型" header-align="center" align="center" width="200px" :formatter="setMotorVehicleCategory"></el-table-column>
         <el-table-column prop="residentsName" label="车主姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="residentsPhone" label="联系电话" header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/user/populationinformation.vue b/src/views/modules/user/populationinformation.vue
index b387fae..8ade51c 100644
--- a/src/views/modules/user/populationinformation.vue
+++ b/src/views/modules/user/populationinformation.vue
@@ -30,7 +30,7 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column label="序号" width="70px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
+        <el-table-column label="序号" width="70px" header-align="center" align="center"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
         <el-table-column prop="gridNames" label="辖区范围" header-align="center" align="center" width="200px"></el-table-column>
         <el-table-column prop="residentsName" label="姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="residentsSex" label="性别" header-align="center" align="center" :formatter="sexFormat"></el-table-column>

From ef6d5d2222d42e422db79a393c12354a1ae2959e Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 11 Sep 2020 16:39:46 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=97=B6?=
 =?UTF-8?q?=E9=95=BF=E5=90=8E=E7=BC=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/volunteerinfo.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/user/volunteerinfo.vue b/src/views/modules/user/volunteerinfo.vue
index 93d0fbf..a091dfe 100644
--- a/src/views/modules/user/volunteerinfo.vue
+++ b/src/views/modules/user/volunteerinfo.vue
@@ -278,9 +278,9 @@ export default {
     kindnessTimeState: function (row, column) {
       var state = row.kindnessTime
       if (state === 0) {
-        return '0分钟'
+        return '0小时'
       } else {
-        return state + '分钟'
+        return state + '小时'
       }
     },
     // 审批状态转换

From 8b001c6ccaf4a49fa1a5552b3648dedc206e3335 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Tue, 15 Sep 2020 09:47:25 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=87=87=E9=9B=86-=E5=8E=BB=E6=8E=89=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/househeadedit.vue      | 64 -------------------
 .../user/housinginformation-add-or-update.vue | 21 +-----
 .../user/housinginformation-detail.vue        |  5 +-
 3 files changed, 2 insertions(+), 88 deletions(-)

diff --git a/src/views/modules/user/househeadedit.vue b/src/views/modules/user/househeadedit.vue
index 1152eb9..5fdbb3d 100644
--- a/src/views/modules/user/househeadedit.vue
+++ b/src/views/modules/user/househeadedit.vue
@@ -257,53 +257,17 @@ export default {
         residentsName: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        residentsNation: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         residentsBirthday: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         residentsSex: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        educationLevel: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         residentsIdentityNo: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        politicsStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         residentsPhone: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        bodyStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        maritalStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        accountType: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        militaryService: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        householdRegistrationPlace: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        employmentStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        familyCategory: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        helpStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        dogStatus: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -470,34 +434,6 @@ export default {
         if (!valid) {
           return false
         }
-        if (this.dataForm.politicsStatus === '1') {
-          if (this.dataForm.joinTime === '' || this.dataForm.organizationalRelationshipLocation === '' ||
-            this.dataForm.joinTime === null || this.dataForm.organizationalRelationshipLocation === null) {
-            return this.$message.error('请填写详细党员信息')
-          }
-        }
-        if (this.dataForm.employmentStatus === '0') {
-          if (this.dataForm.currentEmployerAddress === '' || this.dataForm.currentEmployer === '' ||
-            this.dataForm.currentEmployerAddress === null || this.dataForm.currentEmployer === null) {
-            return this.$message.error('请填写详细工作单位信息')
-          }
-        }
-        if (this.dataForm.employmentStatus === '1') {
-          if (this.dataForm.unemploymentReason === '' || this.dataForm.unemploymentRegister === '' ||
-            this.dataForm.reemploymentPermit === '' ||
-            this.dataForm.unemploymentReason === null || this.dataForm.unemploymentRegister === null ||
-            this.dataForm.reemploymentPermit === null) {
-            return this.$message.error('请填写详细失业信息！')
-          }
-          if (this.dataForm.unemploymentRegister === '1') {
-            if (this.dataForm.unemploymentRegisterTime === '' || this.dataForm.unemploymentRegisterTime === null) {
-              return this.$message.error('请填写失业登记时间')
-            }
-          }
-        }
-        if (this.dataForm.motorVehicleNum !== 0 && (this.dataForm.motorVehicleCategoryList.length === 0)) {
-          return this.$message.error('请选择机动车类型')
-        }
         let motorVehicleCategoryStr = ''
         if (this.dataForm.motorVehicleCategoryList.length > 0) {
           for (let i = 0; i < this.dataForm.motorVehicleCategoryList.length; i++) {
diff --git a/src/views/modules/user/housinginformation-add-or-update.vue b/src/views/modules/user/housinginformation-add-or-update.vue
index 8437797..60805bc 100644
--- a/src/views/modules/user/housinginformation-add-or-update.vue
+++ b/src/views/modules/user/housinginformation-add-or-update.vue
@@ -12,7 +12,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="房屋面积(m²)" prop="houseArea" width="50px">
-          <el-input-number v-model="dataForm.houseArea" placeholder="房屋面积" :min="1"></el-input-number>
+          <el-input-number v-model="dataForm.houseArea" placeholder="房屋面积" :min="0"></el-input-number>
       </el-form-item>
           <el-form-item label="产权人" prop="propertyOwner">
           <el-input v-model.trim="dataForm.propertyOwner" placeholder="产权人" maxlength="10" show-word-limit></el-input>
@@ -23,9 +23,6 @@
           <el-form-item label="产权人身份证号" prop="propertyOwnerIdentityNo">
           <el-input v-model.trim="dataForm.propertyOwnerIdentityNo" placeholder="产权人身份证号" maxlength="18" show-word-limit></el-input>
       </el-form-item>
-      <el-form-item label="产权证" prop="propertyOwnerCard">
-          <el-input v-model.trim="dataForm.propertyOwnerCard" placeholder="产权证" maxlength="20" show-word-limit></el-input>
-      </el-form-item>
       <el-form-item label="所属网格">
         <el-cascader v-model="deptIdList"
                      :options="options"
@@ -95,7 +92,6 @@ export default {
         streetId: '',
         communityId: '',
         deptIdList: [],
-        propertyOwnerCard: '',
         tenantName: '',
         tenantPhone: '',
         tenantIdentityNo: '',
@@ -128,12 +124,6 @@ export default {
         houseAddress: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        buyingTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        houseArea: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         propertyOwner: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -145,9 +135,6 @@ export default {
         ],
         houseUse: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        propertyOwnerCard: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -239,12 +226,6 @@ export default {
             return this.$message.error('承租人身份证号不能为空')
           }
         } else if (this.dataForm.houseUse === '2') {
-          if (this.dataForm.enterpriseName === '' || this.dataForm.enterpriseName === undefined) {
-            return this.$message.error('企业名称不能为空')
-          }
-          if (this.dataForm.socialUniformCode === '' || this.dataForm.socialUniformCode === undefined) {
-            return this.$message.error('社会统一代码不能为空')
-          }
           if (this.dataForm.legalRepresentative === '' || this.dataForm.legalRepresentative === undefined) {
             return this.$message.error('法人代表不能为空')
           }
diff --git a/src/views/modules/user/housinginformation-detail.vue b/src/views/modules/user/housinginformation-detail.vue
index e5df911..0ca7223 100644
--- a/src/views/modules/user/housinginformation-detail.vue
+++ b/src/views/modules/user/housinginformation-detail.vue
@@ -5,7 +5,7 @@
             <span>{{dataForm.houseAddress}}</span>
       </el-form-item>
           <el-form-item label="购房时间：" prop="buyingTime">
-            <span>{{dataForm.buyingTime.substr(0,10)}}</span>
+            <span>{{dataForm.buyingTime==null?dataForm.buyingTime:dataForm.buyingTime.substr(0,10)}}</span>
           </el-form-item>
           <el-form-item label="房屋面积(m²)：" prop="houseArea" width="50px">
             <span>{{dataForm.houseArea}}</span>
@@ -19,9 +19,6 @@
           <el-form-item label="产权人身份证号：" prop="propertyOwnerIdentityNo">
             <span>{{dataForm.propertyOwnerIdentityNo}}</span>
       </el-form-item>
-      <el-form-item label="产权证：" prop="propertyOwnerCard">
-        <span>{{dataForm.propertyOwnerCard}}</span>
-      </el-form-item>
       <el-form-item label="所属网格：">
         <span>{{dataForm.gridName}}</span>
       </el-form-item>

From 204770970c0934004ada603913c452d38dafac33 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Wed, 16 Sep 2020 17:04:01 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=85=9A=E7=BE=A41+1=20=E8=AF=9D?=
 =?UTF-8?q?=E9=A2=98=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=BD=AE=E9=A1=B6?=
 =?UTF-8?q?=E5=92=8C=E5=8F=96=E6=B6=88=E7=BD=AE=E9=A1=B6=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/partygroup/partytopic-list.vue    | 38 ++++++++++++++++++-
 src/views/modules/sys/role-add-or-update.vue  |  2 +-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/partygroup/partytopic-list.vue b/src/views/modules/partygroup/partytopic-list.vue
index fd35b2b..fcb92c3 100644
--- a/src/views/modules/partygroup/partytopic-list.vue
+++ b/src/views/modules/partygroup/partytopic-list.vue
@@ -48,16 +48,19 @@
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
         <el-table-column prop="nickname" label="发言人" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="createdTime" label="时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="createdTime" label="时间" header-align="center" align="center" width="160"></el-table-column>
         <el-table-column prop="topicContent" label="话题内容" header-align="center" align="center" min-width="300" show-overflow-tooltip></el-table-column>
         <el-table-column prop="commentNum" label="评论数" header-align="center" align="center" width="70"></el-table-column>
         <el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"  width="70"></el-table-column>
         <el-table-column prop="supportNum" label="点赞数" header-align="center" align="center"  width="70"></el-table-column>
+        <el-table-column prop="topFlag" label="置顶状态" header-align="center" align="center"  width="100" :formatter="topFlagFormat"></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="look(scope.row.id)">{{ $t('look') }}</el-button>
             <el-button v-if="scope.row.state !== 20" type="text" size="small" @click="close(scope.row.id)">{{ $t('close') }}</el-button>
             <el-button type="text" size="small" v-if="scope.row.state ===20" :disabled="true">已关闭</el-button>
+            <el-button v-if="scope.row.state !== 20 && scope.row.topFlag === '0'" type="text" size="small" @click="top(scope.row.id, '1')">{{ '置顶' }}</el-button>
+            <el-button v-if="scope.row.state !== 20 && scope.row.topFlag === '1'" type="text" size="small" @click="top(scope.row.id, '0')">{{ '取消置顶' }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -187,6 +190,39 @@ export default {
         }
         this.options = res.data.options
       }).catch(() => {})
+    },
+    topFlagFormat: function (row, column) {
+      let topFlag = row.topFlag
+      if (topFlag === '0') {
+        return '未置顶'
+      } else if (topFlag === '1') {
+        return '已置顶'
+      }
+    },
+    top (id, topFlag) {
+      let title = '置顶'
+      if (topFlag === '0') {
+        title = '取消置顶'
+      }
+      this.$confirm(this.$t('prompt.info', { 'handle': title }), this.$t(title), {
+        confirmButtonText: this.$t('confirm'),
+        cancelButtonText: this.$t('cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.$http['post']('/partyGroup/partytopic/top', { 'topicId': id, 'topFlag': topFlag }).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.getDataList()
+        }).catch(() => {})
+      }).catch(() => {})
     }
   }
 }
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index d503eab..7c9a8a1 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -124,7 +124,7 @@ export default {
       appMenuList: [],
       categoryList: [],
       roleTypeList: [],
-      analysisMenuList:[],
+      analysisMenuList: [],
       dataForm: {
         id: '',
         name: '',

From 6639585cb0381386431eadab7dd90e0d9e720df1 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Thu, 17 Sep 2020 14:52:21 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=87=87=E9=9B=86-=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/househeadedit.vue           | 14 ++++----------
 .../user/housinginformation-add-or-update.vue      |  7 ++-----
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/user/househeadedit.vue b/src/views/modules/user/househeadedit.vue
index 5fdbb3d..c11fa86 100644
--- a/src/views/modules/user/househeadedit.vue
+++ b/src/views/modules/user/househeadedit.vue
@@ -54,11 +54,8 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="入党时间" prop="joinTime" v-if="dataForm.politicsStatus === '1'">
-            <el-date-picker
-                v-model="dataForm.joinTime"
-                type="date"
-                placeholder="选择日期">
-            </el-date-picker>
+            <el-input v-model.trim="dataForm.joinTime" placeholder="入党时间" maxlength="10" show-word-limit></el-input>
+            例：1990/1990-01/1990-01-01
           </el-form-item>
           <el-form-item label="组织关系所在地" prop="organizationalRelationshipLocation" v-if="dataForm.politicsStatus === '1'">
           <el-input v-model="dataForm.organizationalRelationshipLocation" placeholder="组织关系所在地" maxlength="20" show-word-limit></el-input>
@@ -139,11 +136,8 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="失业登记时间" prop="unemploymentRegisterTime" v-if="dataForm.employmentStatus === '1' && dataForm.unemploymentRegister === '1'">
-            <el-date-picker
-                v-model="dataForm.unemploymentRegisterTime"
-                type="date"
-                placeholder="选择日期">
-            </el-date-picker>
+            <el-input v-model.trim="dataForm.unemploymentRegisterTime" placeholder="失业登记时间" maxlength="10" show-word-limit></el-input>
+            例：1990/1990-01/1990-01-01
           </el-form-item>
       <br>
       <hr>
diff --git a/src/views/modules/user/housinginformation-add-or-update.vue b/src/views/modules/user/housinginformation-add-or-update.vue
index 60805bc..35b91c9 100644
--- a/src/views/modules/user/housinginformation-add-or-update.vue
+++ b/src/views/modules/user/housinginformation-add-or-update.vue
@@ -5,11 +5,8 @@
           <el-input v-model.trim="dataForm.houseAddress" placeholder="房屋地址" maxlength="30" show-word-limit></el-input>
       </el-form-item>
           <el-form-item label="购房时间" prop="buyingTime">
-            <el-date-picker
-                v-model="dataForm.buyingTime"
-                type="date"
-                placeholder="选择日期">
-            </el-date-picker>
+            <el-input v-model.trim="dataForm.buyingTime" placeholder="购房时间" maxlength="10" show-word-limit></el-input>
+            例：1990/1990-01/1990-01-01
           </el-form-item>
           <el-form-item label="房屋面积(m²)" prop="houseArea" width="50px">
           <el-input-number v-model="dataForm.houseArea" placeholder="房屋面积" :min="0"></el-input-number>