Browse Source

Merge branch 'dev-detail-adjust0919'

dev-map-local
jiangyy 3 years ago
parent
commit
930e136723
  1. 5
      src/assets/scss/modules/management/detail-main.scss
  2. 2
      src/views/modules/base/community/buildDetail.vue
  3. 9
      src/views/modules/base/community/communityDetail.vue
  4. 2
      src/views/modules/base/community/roomTable.vue
  5. 185
      src/views/modules/base/huji/chusheng/cpts/detail.vue
  6. 332
      src/views/modules/base/huji/chusheng/index.vue
  7. 176
      src/views/modules/base/huji/immigration/detail.vue
  8. 348
      src/views/modules/base/huji/immigration/index.vue

5
src/assets/scss/modules/management/detail-main.scss

@ -134,7 +134,10 @@
.info-title-2 {
flex: 0 0 100px;
font-size: 15px;
}
.info-title-3{
flex: 0 0 150px;
}
> span,

2
src/views/modules/base/community/buildDetail.vue

@ -22,7 +22,7 @@
<div class="info-prop">
<span class="info-title-2">楼栋类型</span>
<span>{{ dataForm.buildType?dataForm.buildType:'--'}}</span>
<span>{{ dataForm.typeName?dataForm.typeName:'--'}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">单元数</span>

9
src/views/modules/base/community/communityDetail.vue

@ -36,7 +36,7 @@
<div class="info-prop">
<span class="info-title-2">关联物业</span>
<span>{{ dataForm.propertyName?dataForm.propertyName:'--'}}</span>
<span>{{ dataForm.propertyShow?dataForm.propertyShow:'--'}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">实有楼栋</span>
@ -115,6 +115,13 @@ export default {
async initForm (row) {
this.dataForm = JSON.parse(JSON.stringify(row))
let propertyShowList = []
this.dataForm.propertyList.forEach(element => {
propertyShowList.push(element.name)
});
this.dataForm.propertyShow = propertyShowList.join(',')
this.initLoading = true
this.$nextTick(() => {

2
src/views/modules/base/community/roomTable.vue

@ -453,7 +453,7 @@ export default {
},
detailFormCancle () {
this.$refs.ref_form_detail.diaDestroy()
// this.$refs.ref_form_detail.diaDestroy()
this.detailShow = false
},

185
src/views/modules/base/huji/chusheng/cpts/detail.vue

@ -0,0 +1,185 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<div v-if="initLoading"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-3">所属网格</span>
<span>{{ fmData.gridName }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">所属房屋</span>
<span>{{ fmData.homeAllName ?fmData.homeAllName :'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">姓名</span>
<span>{{ fmData.name}}</span>
</div>
<div class="info-prop">
<span class="info-title-3">手机号</span>
<span>{{ fmData.mobile?fmData.mobile:'--'}}</span>
</div>
<div class="info-prop">
<span class="info-title-3">证件号</span>
<span>{{ fmData.idCard?fmData.idCard:'--'}}</span>
</div>
<div class="info-prop">
<span class="info-title-3">性别</span>
<span>{{fmData.gender==='1' ?'男' :fmData.gender==='2'?'女':'未知' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">出生日期</span>
<span>{{ fmData.birthday?fmData.birthday:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">出生地</span>
<span>{{ fmData.birthplace?fmData.birthplace:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">出生父亲姓名</span>
<span>{{ fmData.father?fmData.father:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">出生母亲姓名</span>
<span>{{ fmData.mother?fmData.mother:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">胎次</span>
<span>{{ fmData.count? fmData.count:0}}</span>
</div>
<div class="info-prop">
<span class="info-title-3">申报户口日期</span>
<span>{{ fmData.reportDate?fmData.reportDate:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">户主姓名</span>
<span>{{ fmData.householderName? fmData.householderName:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-3">与户主关系</span>
<span>{{ fmData.householderRelationName ? fmData.householderRelationName :'--' }}</span>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import { Loading } from "element-ui"; // Loading
import { requestPost } from "@/js/dai/request";
let loading; //
function iniFmData () {
return {
id: "",
gridId: "",
villageId: "",
buildId: "",
unitId: "",
homeId: "",
name: "",
mobile: "",
idCard: "",
isWelfare: "0", //01
isCheck: "0",
isReplace: "0",
gender: "",
birthplace: "",
father: "",
mother: "",
count: "",
reportDate: "",
householderName: "",
householderRelation: "",
alreadyHaveMaster: false,
};
}
export default {
data () {
return {
btnDisable: false,
initLoading: false,
fmData: iniFmData(),
};
},
components: {},
computed: {
},
props: {},
watch: {},
async mounted () {
},
methods: {
async initForm (row) {
await this.getInfo(row.id);
this.initLoading = true
},
async getInfo (id) {
const { data, code, msg } = await requestPost(
"/epmetuser/icBirthRecord/" + id,
{
// id,
}
);
if (code === 0) {
this.fmData = { ...this.fmData, ...data };
} else {
this.$message.error(msg);
}
},
resetData () {
this.fmData = iniFmData();
},
//
startLoading () {
loading = Loading.service({
lock: true, //
text: "正在加载……", //
background: "rgba(0,0,0,.7)", //
});
},
//
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close();
}
},
},
};
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/management/detail-main.scss";
</style>

332
src/views/modules/base/huji/chusheng/index.vue

@ -1,30 +1,26 @@
<template>
<div class="resi-container">
<el-card ref="searchCard" class="search-card">
<el-form
ref="searchForm"
<el-card ref="searchCard"
class="search-card">
<el-form ref="searchForm"
:inline="true"
:model="fmData"
:label-width="'100px'"
class="demo-form-inline"
>
class="demo-form-inline">
<div>
<el-form-item prop="gridId" label="所属网格">
<el-form-item prop="gridId"
label="所属网格">
<div class="resi-cell-value">
<el-select
v-model.trim="fmData.gridId"
<el-select v-model.trim="fmData.gridId"
placeholder="请选择"
size="small"
clearable
class="resi-cell-select"
@change="handleChangeGrid"
>
<el-option
v-for="item in optionsG"
@change="handleChangeGrid">
<el-option v-for="item in optionsG"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</div>
@ -32,25 +28,20 @@
<el-form-item label="所属房屋">
<div class="resi-cell-value">
<el-select
v-model.trim="fmData.villageId"
<el-select v-model.trim="fmData.villageId"
placeholder="请选择小区"
size="small"
clearable
class="resi-cell-select"
@clear="handleClearVillage"
@change="handleChangeV"
>
<el-option
v-for="item in optionsV"
@change="handleChangeV">
<el-option v-for="item in optionsV"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
<el-select
v-model.trim="fmData.buildId"
<el-select v-model.trim="fmData.buildId"
placeholder="楼号"
size="small"
clearable
@ -58,18 +49,14 @@
class="resi-cell-select"
:disabled="changeVDisabled"
@clear="handleClearBuild"
@change="handleChangeB"
>
<el-option
v-for="item in optionsB"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
<el-select
v-model.trim="fmData.unitId"
<el-select v-model.trim="fmData.unitId"
:disabled="changeBDisabled"
placeholder="单元"
size="small"
@ -77,31 +64,24 @@
style="width: 120px"
class="resi-cell-select"
@click="handleClearDan"
@change="handleChangeD"
>
<el-option
v-for="item in optionsD"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
<el-select
v-model.trim="fmData.homeId"
<el-select v-model.trim="fmData.homeId"
:disabled="changeDDisabled"
placeholder="房号"
size="small"
clearable
style="width: 120px"
class="resi-cell-select"
>
<el-option
v-for="item in optionsH"
class="resi-cell-select">
<el-option v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</div>
@ -109,103 +89,86 @@
</div>
<div>
<el-form-item label="姓名" prop="name">
<el-input
v-model="fmData.name"
<el-form-item label="姓名"
prop="name">
<el-input v-model="fmData.name"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input
v-model="fmData.mobile"
<el-form-item label="手机号"
prop="mobile">
<el-input v-model="fmData.mobile"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="证件号" prop="idCard">
<el-input
v-model="fmData.idCard"
<el-form-item label="证件号"
prop="idCard">
<el-input v-model="fmData.idCard"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入身份证号或证件号"
>
placeholder="请输入身份证号或证件号">
</el-input>
</el-form-item>
</div>
<div>
<el-form-item label="出生日期" prop="birthdayTime">
<el-date-picker
v-model="fmData.birthdayTime"
<el-form-item label="出生日期"
prop="birthdayTime">
<el-date-picker v-model="fmData.birthdayTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="享受福利" prop="remark">
<el-select
v-model.trim="fmData.isWelfare"
<el-form-item label="享受福利"
prop="remark">
<el-select v-model.trim="fmData.isWelfare"
placeholder="请选择"
size="small"
clearable
style="width: 120px"
class="resi-cell-select"
>
<el-option
v-for="item in optionsWelfare"
class="resi-cell-select">
<el-option v-for="item in optionsWelfare"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
class="diy-button--search"
<el-button class="diy-button--search"
size="small"
@click="handleSearch"
>查询</el-button
>
<el-button
class="diy-button--reset"
@click="handleSearch">查询</el-button>
<el-button class="diy-button--reset"
size="small"
@click="resetForm('searchForm')"
>重置</el-button
>
@click="resetForm('searchForm')">重置</el-button>
</el-form-item>
</div>
</el-form>
</el-card>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button class="diy-button--add" size="small" @click="handleAdd"
>出生登记</el-button
>
<el-button
v-if="false"
<el-button class="diy-button--add"
size="small"
@click="handleAdd">出生登记</el-button>
<el-button v-if="false"
class="diy-button--export"
size="small"
@click="handleExportModule('room')"
>下载模板</el-button
>
<el-upload
v-if="false"
@click="handleExportModule('room')">下载模板</el-button>
<el-upload v-if="false"
ref="upload"
class="upload-btn"
action="uploadUlr"
@ -217,131 +180,114 @@
:on-progress="handleProgress"
:on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest"
>
<el-button
size="small"
:http-request="uploadHttpRequest">
<el-button size="small"
class="diy-button--delete"
:loading="importLoading"
>{{ importBtnTitle }}</el-button
>
:loading="importLoading">{{ importBtnTitle }}</el-button>
</el-upload>
<el-button @click="handleChu" class="diy-button--reset" size="small"
>导出</el-button
>
<el-button @click="handleChu"
class="diy-button--reset"
size="small">导出</el-button>
</div>
<el-table
:data="tableData"
<el-table :data="tableData"
border
style="width: 100%"
class="resi-table"
:height="maxTableHeight"
>
<el-table-column
label="序号"
:height="maxTableHeight">
<el-table-column label="序号"
fixed="left"
type="index"
align="center"
width="50"
/>
width="50" />
<el-table-column prop="name" fixed="left" label="姓名" align="center">
<el-table-column prop="name"
fixed="left"
label="姓名"
align="center">
<template slot-scope="scope">
<a class="name-a" @click="handleWatch(scope.$index)">
<a class="name-a"
@click="handleWatch(scope.$index)">
{{ scope.row.name }}
</a>
</template>
</el-table-column>
<el-table-column
prop="gridName"
<el-table-column prop="gridName"
align="center"
label="所属网格"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="home"
<el-table-column prop="home"
label="所属房屋"
align="center"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="mobile"
<el-table-column prop="mobile"
width="100"
align="center"
label="手机号"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="idCard"
<el-table-column prop="idCard"
align="center"
label="证件号"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="gender" align="center" label="性别">
<el-table-column prop="gender"
align="center"
label="性别">
</el-table-column>
<el-table-column
prop="birthday"
<el-table-column prop="birthday"
align="center"
label="出生日期"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="birthplace"
<el-table-column prop="birthplace"
align="center"
label="出生地"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="parentName"
<el-table-column prop="parentName"
align="center"
label="出生人父/母姓名"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="count" align="center" label="胎次">
<el-table-column prop="count"
align="center"
label="胎次">
</el-table-column>
<el-table-column
prop="reportDate"
<el-table-column prop="reportDate"
align="center"
label="申报户口日期"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="householderName"
<el-table-column prop="householderName"
align="center"
label="户主姓名"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="householderRelation"
<el-table-column prop="householderRelation"
align="center"
label="与户主关系"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="160">
<el-table-column fixed="right"
label="操作"
align="center"
width="160">
<template slot-scope="scope">
<!-- <el-button
@click="handleWatch(scope.$index)"
@ -350,63 +296,61 @@
>查看</el-button
> -->
<el-button
@click="handleEdit(scope.$index)"
<el-button @click="handleEdit(scope.$index)"
type="text"
size="small"
class="div-table-button--edit"
>修改</el-button
>
class="div-table-button--edit">修改</el-button>
<el-popconfirm
v-if="false"
<el-popconfirm v-if="false"
title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row, scope.$index)"
@confirm="handleDel(scope.row, scope.$index)"
>
<el-button
slot="reference"
@confirm="handleDel(scope.row, scope.$index)">
<el-button slot="reference"
type="text"
size="small"
class="div-table-button--delete"
style="margin-left: 10px"
>删除</el-button
>
style="margin-left: 10px">删除</el-button>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChange"
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total"
:total="total"
>
:total="total">
</el-pagination>
</div>
</el-card>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="formShow"
<el-dialog :visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleClose"
>
<edit-form
ref="eleEditForm"
@closed="handleClose">
<edit-form ref="eleEditForm"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"
></edit-form>
@dialogOk="handleEditSuccess"></edit-form>
</el-dialog>
<!-- 详情弹出框 -->
<el-dialog :visible.sync="detailShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'出生详情'"
width="850px"
top="5vh"
class="dialog-h"
@closed="detailFormCancle">
<detail-form ref="ref_form_detail"></detail-form>
</el-dialog>
</div>
</template>
@ -416,16 +360,18 @@ import { requestPost } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
import editForm from "./cpts/edit";
import detailForm from "./cpts/detail";
import axios from "axios";
export default {
components: { editForm },
components: { editForm, detailForm },
data () {
return {
openSearch: false,
formShow: false,
formTitle: "出生登记",
detailShow: false,
pageNo: 1,
pageSize: window.localStorage.getItem("pageSize") || 20,
@ -827,9 +773,19 @@ export default {
},
async handleWatch (rowIndex) {
this.formShow = true;
await nextTick();
this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
// this.formShow = true;
// await nextTick();
// this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
this.detailShow = true
this.$nextTick(() => {
this.$refs.ref_form_detail.initForm(this.tableData[rowIndex])
})
},
detailFormCancle () {
this.detailShow = false
},
async handleEdit (rowIndex) {

176
src/views/modules/base/huji/immigration/detail.vue

@ -0,0 +1,176 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<div v-if="initLoading"
class="m-row">
<div class="m-info">
<div class="info-prop">
<span class="info-title-2">所属网格</span>
<span>{{ fmData.gridName }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">所属房屋</span>
<span>{{ fmData.allName?fmData.allName:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">姓名</span>
<span>{{ fmData.name}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">手机号</span>
<span>{{ fmData.mobile?fmData.mobile:'--'}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">证件号</span>
<span>{{ fmData.idCard?fmData.idCard:'--'}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">性别</span>
<span>{{fmData.genderName?fmData.genderName:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">年龄</span>
<span>{{ fmData.age?fmData.age:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">迁入日期</span>
<span>{{ fmData.inTime?fmData.inTime:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">迁入原因</span>
<span>{{ fmData.inReason?fmData.inReason:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">来源地</span>
<span>{{ fmData.sourceAddress?fmData.sourceAddress:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">详细地址</span>
<span>{{ fmData.address? fmData.address:'--'}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">迁移证号码</span>
<span>{{ fmData.moveNumber?fmData.moveNumber:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">户主姓名</span>
<span>{{ fmData.householderName? fmData.householderName:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">与户主关系</span>
<span>{{ fmData.householderRelationName? fmData.householderRelationName:'--' }}</span>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import { requestPost } from "@/js/dai/request";
import formVltHelper from 'dai-js/tools/formVltHelper'
import { computedCard } from '@/utils/index'
import { isCard, isMobile } from '@/utils/validate'
function iniFmData () {
return {
gridId: '',
villageId: '',
buildId: '',
unitId: '',
homeId: '',
name: '',
mobile: '',
idCard: '',
isWelfare: '0', //01
isCheck: '0',
gender: '',
age: '',
inTime: '',
inReason: '',
sourceAddress: '',
address: '',
sourceAddressPathCode: '',
sourceAddressCode: '',
householderName: '',
moveNumber: '',
householderRelation: '',
alreadyHaveMaster: false,
isReplace: '0'
}
}
export default {
data () {
return {
formType: 'add', // addeditdetail
btnDisable: false,
initLoading: false,
fmData: iniFmData(),
userInfo: {},
}
},
components: {},
computed: {
},
props: {},
watch: {},
async mounted () {
console.log('mounted-----我执行了')
},
methods: {
async initForm (id) {
await this.getDatail(id)
this.initLoading = true
},
async getDatail (moveInId) {
let url = '/epmetuser/icMoveIn/detail'
const params = {
moveInId: moveInId || ''
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.fmData = { ...data }
} else this.$message.error(msg)
},
resetData () {
this.orgId = ''
this.btnDisable = false
this.userInfo = {}
this.fmData = iniFmData()
}
}
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/modules/management/detail-main.scss";
</style>

348
src/views/modules/base/huji/immigration/index.vue

@ -1,30 +1,26 @@
<template>
<div class="resi-container">
<el-card ref="searchCard" class="search-card">
<el-form
ref="searchForm"
<el-card ref="searchCard"
class="search-card">
<el-form ref="searchForm"
:inline="true"
:model="fmData"
:label-width="'100px'"
class="demo-form-inline"
>
class="demo-form-inline">
<div>
<el-form-item prop="gridId" label="所属网格">
<el-form-item prop="gridId"
label="所属网格">
<div class="resi-cell-value">
<el-select
v-model.trim="fmData.gridId"
<el-select v-model.trim="fmData.gridId"
placeholder="请选择网格"
size="small"
clearable
class="resi-cell-select"
@change="handleChangeGrid"
>
<el-option
v-for="item in optionsG"
@change="handleChangeGrid">
<el-option v-for="item in optionsG"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</div>
@ -33,76 +29,60 @@
<div class="resi-cell-value">
<div class="resi-cell-col">
<el-form-item prop="villageId">
<el-select
v-model.trim="fmData.villageId"
<el-select v-model.trim="fmData.villageId"
placeholder="请选择小区"
size="small"
clearable
class="resi-cell-select"
@change="handleChangeV"
>
<el-option
v-for="item in optionsV"
@change="handleChangeV">
<el-option v-for="item in optionsV"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="buildId">
<el-select
v-model.trim="fmData.buildId"
<el-select v-model.trim="fmData.buildId"
placeholder="楼号"
size="small"
clearable
:disabled="changeVDisabled"
class="resi-cell-select resi-cell-select-middle"
@change="handleChangeB"
>
<el-option
v-for="item in optionsB"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="unitId">
<el-select
v-model.trim="fmData.unitId"
<el-select v-model.trim="fmData.unitId"
placeholder="单元"
size="small"
clearable
:disabled="changeBDisabled"
class="resi-cell-select resi-cell-select-middle"
@change="handleChangeD"
>
<el-option
v-for="item in optionsD"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="homeId">
<el-select
v-model.trim="fmData.homeId"
<el-select v-model.trim="fmData.homeId"
placeholder="房号"
size="small"
clearable
:disabled="changeDDisabled"
class="resi-cell-select resi-cell-select-middle"
>
<el-option
v-for="item in optionsH"
class="resi-cell-select resi-cell-select-middle">
<el-option v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
@ -112,102 +92,85 @@
</div>
<div>
<el-form-item label="姓名" prop="name">
<el-input
v-model="fmData.name"
<el-form-item label="姓名"
prop="name">
<el-input v-model="fmData.name"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input
v-model="fmData.mobile"
<el-form-item label="手机号"
prop="mobile">
<el-input v-model="fmData.mobile"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="证件号" prop="idCard">
<el-input
v-model="fmData.idCard"
<el-form-item label="证件号"
prop="idCard">
<el-input v-model="fmData.idCard"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
placeholder="请输入">
</el-input>
</el-form-item>
</div>
<div>
<el-form-item label="迁入时间" prop="startTime">
<el-date-picker
v-model="rangeTime"
<el-form-item label="迁入时间"
prop="startTime">
<el-date-picker v-model="rangeTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="享受福利" prop="remark">
<el-select
v-model.trim="fmData.isWeifare"
<el-form-item label="享受福利"
prop="remark">
<el-select v-model.trim="fmData.isWeifare"
placeholder="享受福利"
size="small"
clearable
style="width: 120px"
class="resi-cell-select"
>
<el-option
v-for="item in optionsWelfare"
class="resi-cell-select">
<el-option v-for="item in optionsWelfare"
:key="item.value"
:label="item.label"
:value="item.value"
>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
class="diy-button--search"
<el-button class="diy-button--search"
size="small"
@click="handleSearch"
>查询</el-button
>
<el-button
class="diy-button--reset"
@click="handleSearch">查询</el-button>
<el-button class="diy-button--reset"
size="small"
@click="resetForm('searchForm')"
>重置</el-button
>
@click="resetForm('searchForm')">重置</el-button>
</el-form-item>
</div>
</el-form>
</el-card>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button class="diy-button--add" size="small" @click="handleAdd"
>迁入登记</el-button
>
<el-button
v-if="false"
<el-button class="diy-button--add"
size="small"
@click="handleAdd">迁入登记</el-button>
<el-button v-if="false"
class="diy-button--export"
size="small"
@click="handleExportModule('room')"
>下载模板</el-button
>
<el-upload
v-if="false"
@click="handleExportModule('room')">下载模板</el-button>
<el-upload v-if="false"
ref="upload"
class="upload-btn"
action="uploadUlr"
@ -219,205 +182,181 @@
:on-progress="handleProgress"
:on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest"
>
<el-button
size="small"
:http-request="uploadHttpRequest">
<el-button size="small"
class="diy-button--delete"
:loading="importLoading"
>{{ importBtnTitle }}</el-button
>
:loading="importLoading">{{ importBtnTitle }}</el-button>
</el-upload>
<el-button @click="handleChu" class="diy-button--reset" size="small"
>导出</el-button
>
<el-button @click="handleChu"
class="diy-button--reset"
size="small">导出</el-button>
</div>
<el-table
:data="tableData"
<el-table :data="tableData"
border
style="width: 100%"
class="resi-table"
:height="tableHeight"
>
<el-table-column
label="序号"
:height="tableHeight">
<el-table-column label="序号"
fixed="left"
type="index"
align="center"
width="50"
/>
width="50" />
<el-table-column
prop="name"
<el-table-column prop="name"
width="100"
fixed="left"
label="姓名"
align="center"
>
align="center">
<template slot-scope="scope">
<a class="name-a" @click="handleWatch(scope.$index)">
<a class="name-a"
@click="handleWatch(scope.$index)">
{{ scope.row.name }}
</a>
</template>
</el-table-column>
<el-table-column
prop="gridName"
<el-table-column prop="gridName"
align="center"
label="所属网格"
min-width="160"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="allName"
<el-table-column prop="allName"
label="所属房屋"
align="center"
min-width="160"
:show-overflow-tooltip="true"
/>
:show-overflow-tooltip="true" />
<el-table-column
prop="mobile"
<el-table-column prop="mobile"
width="140"
align="center"
label="手机号"
>
label="手机号">
</el-table-column>
<el-table-column
prop="idCard"
<el-table-column prop="idCard"
align="center"
min-width="160"
label="证件号"
>
label="证件号">
</el-table-column>
<el-table-column prop="genderName" align="center" width="60" label="性别">
<el-table-column prop="genderName"
align="center"
width="60"
label="性别">
</el-table-column>
<el-table-column prop="age" align="center" width="60" label="年龄">
<el-table-column prop="age"
align="center"
width="60"
label="年龄">
</el-table-column>
<el-table-column
prop="inTime"
<el-table-column prop="inTime"
align="center"
min-width="140"
label="迁入时间"
>
label="迁入时间">
</el-table-column>
<el-table-column
prop="inReason"
<el-table-column prop="inReason"
align="center"
label="迁入原因"
min-width="160"
show-overflow-tooltip
>
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="sourceAddress"
<el-table-column prop="sourceAddress"
min-width="160"
align="center"
label="由何地迁入"
>
label="由何地迁入">
</el-table-column>
<el-table-column
prop="moveNumber"
<el-table-column prop="moveNumber"
min-width="160"
align="center"
label="迁移证号码"
>
label="迁移证号码">
</el-table-column>
<el-table-column
prop="householderName"
<el-table-column prop="householderName"
min-width="100"
align="center"
label="户主姓名"
>
label="户主姓名">
</el-table-column>
<el-table-column
prop="householderRelationName"
<el-table-column prop="householderRelationName"
align="center"
min-width="100"
label="与户主关系"
>
label="与户主关系">
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="120">
<el-table-column fixed="right"
label="操作"
align="center"
width="120">
<template slot-scope="scope">
<el-button
v-if="false"
<el-button v-if="false"
@click="handleWatch(scope.$index)"
type="text"
size="small"
>查看</el-button
>
size="small">查看</el-button>
<el-button
@click="handleEdit(scope.$index)"
<el-button @click="handleEdit(scope.$index)"
type="text"
size="small"
class="div-table-button--edit"
>修改</el-button
>
class="div-table-button--edit">修改</el-button>
<el-popconfirm
v-if="false"
<el-popconfirm v-if="false"
title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row, scope.$index)"
@confirm="handleDel(scope.row, scope.$index)"
>
<el-button
slot="reference"
@confirm="handleDel(scope.row, scope.$index)">
<el-button slot="reference"
type="text"
size="small"
class="div-table-button--delete"
style="margin-left: 10px"
>删除</el-button
>
style="margin-left: 10px">删除</el-button>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChange"
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total"
:total="total"
>
:total="total">
</el-pagination>
</div>
</el-card>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="formShow"
<el-dialog :visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleClose"
>
<edit-form
v-if="formShow"
@closed="handleClose">
<edit-form v-if="formShow"
ref="eleEditForm"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"
></edit-form>
@dialogOk="handleEditSuccess"></edit-form>
</el-dialog>
<!-- 详情弹出框 -->
<el-dialog :visible.sync="detailShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'迁入详情'"
width="850px"
top="5vh"
class="dialog-h"
@closed="detailFormCancle">
<detail-form v-if="detailShow"
ref="ref_form_detail"></detail-form>
</el-dialog>
</div>
</template>
@ -427,16 +366,19 @@ import { requestPost } from '@/js/dai/request'
import nextTick from 'dai-js/tools/nextTick'
import { mapGetters } from 'vuex'
import editForm from './edit'
import detailForm from './detail'
import axios from 'axios'
export default {
components: { editForm },
components: { editForm, detailForm },
data () {
return {
openSearch: false,
formShow: false,
detailShow: false,
formTitle: '迁入登记',
detailShow: false,
pageNo: 1,
pageSize: window.localStorage.getItem('pageSize') || 20,
@ -911,9 +853,21 @@ export default {
},
async handleWatch (rowIndex) {
this.formShow = true
await nextTick()
this.$refs.eleEditForm.initForm('detail', this.tableData[rowIndex].moveInId)
// this.formShow = true
// await nextTick()
// this.$refs.eleEditForm.initForm('detail', this.tableData[rowIndex].moveInId)
this.detailShow = true
this.$nextTick(() => {
this.$refs.ref_form_detail.initForm(this.tableData[rowIndex].moveInId)
})
},
detailFormCancle () {
this.detailShow = false
},
async handleEdit (rowIndex) {
@ -968,7 +922,7 @@ export default {
</script>
<style lang="scss" scoped>
@import '@/assets/scss/buttonstyle.scss';
@import "@/assets/scss/buttonstyle.scss";
.resi-container .resi-card-table {
::v-deep .el-table th {

Loading…
Cancel
Save