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. 402
      src/views/modules/base/huji/chusheng/index.vue
  7. 176
      src/views/modules/base/huji/immigration/detail.vue
  8. 424
      src/views/modules/base/huji/immigration/index.vue

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

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

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

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

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

@ -36,7 +36,7 @@
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">关联物业</span> <span class="info-title-2">关联物业</span>
<span>{{ dataForm.propertyName?dataForm.propertyName:'--'}}</span> <span>{{ dataForm.propertyShow?dataForm.propertyShow:'--'}}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">实有楼栋</span> <span class="info-title-2">实有楼栋</span>
@ -115,6 +115,13 @@ export default {
async initForm (row) { async initForm (row) {
this.dataForm = JSON.parse(JSON.stringify(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.initLoading = true
this.$nextTick(() => { this.$nextTick(() => {

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

@ -453,7 +453,7 @@ export default {
}, },
detailFormCancle () { detailFormCancle () {
this.$refs.ref_form_detail.diaDestroy() // this.$refs.ref_form_detail.diaDestroy()
this.detailShow = false 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>

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

@ -1,30 +1,26 @@
<template> <template>
<div class="resi-container"> <div class="resi-container">
<el-card ref="searchCard" class="search-card"> <el-card ref="searchCard"
<el-form class="search-card">
ref="searchForm" <el-form ref="searchForm"
:inline="true" :inline="true"
:model="fmData" :model="fmData"
:label-width="'100px'" :label-width="'100px'"
class="demo-form-inline" class="demo-form-inline">
>
<div> <div>
<el-form-item prop="gridId" label="所属网格"> <el-form-item prop="gridId"
label="所属网格">
<div class="resi-cell-value"> <div class="resi-cell-value">
<el-select <el-select v-model.trim="fmData.gridId"
v-model.trim="fmData.gridId"
placeholder="请选择" placeholder="请选择"
size="small" size="small"
clearable clearable
class="resi-cell-select" class="resi-cell-select"
@change="handleChangeGrid" @change="handleChangeGrid">
> <el-option v-for="item in optionsG"
<el-option
v-for="item in optionsG"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
@ -32,25 +28,20 @@
<el-form-item label="所属房屋"> <el-form-item label="所属房屋">
<div class="resi-cell-value"> <div class="resi-cell-value">
<el-select <el-select v-model.trim="fmData.villageId"
v-model.trim="fmData.villageId"
placeholder="请选择小区" placeholder="请选择小区"
size="small" size="small"
clearable clearable
class="resi-cell-select" class="resi-cell-select"
@clear="handleClearVillage" @clear="handleClearVillage"
@change="handleChangeV" @change="handleChangeV">
> <el-option v-for="item in optionsV"
<el-option
v-for="item in optionsV"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
<el-select <el-select v-model.trim="fmData.buildId"
v-model.trim="fmData.buildId"
placeholder="楼号" placeholder="楼号"
size="small" size="small"
clearable clearable
@ -58,18 +49,14 @@
class="resi-cell-select" class="resi-cell-select"
:disabled="changeVDisabled" :disabled="changeVDisabled"
@clear="handleClearBuild" @clear="handleClearBuild"
@change="handleChangeB" @change="handleChangeB">
> <el-option v-for="item in optionsB"
<el-option
v-for="item in optionsB"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
<el-select <el-select v-model.trim="fmData.unitId"
v-model.trim="fmData.unitId"
:disabled="changeBDisabled" :disabled="changeBDisabled"
placeholder="单元" placeholder="单元"
size="small" size="small"
@ -77,31 +64,24 @@
style="width: 120px" style="width: 120px"
class="resi-cell-select" class="resi-cell-select"
@click="handleClearDan" @click="handleClearDan"
@change="handleChangeD" @change="handleChangeD">
> <el-option v-for="item in optionsD"
<el-option
v-for="item in optionsD"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
<el-select <el-select v-model.trim="fmData.homeId"
v-model.trim="fmData.homeId"
:disabled="changeDDisabled" :disabled="changeDDisabled"
placeholder="房号" placeholder="房号"
size="small" size="small"
clearable clearable
style="width: 120px" style="width: 120px"
class="resi-cell-select" class="resi-cell-select">
> <el-option v-for="item in optionsH"
<el-option
v-for="item in optionsH"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
@ -109,103 +89,86 @@
</div> </div>
<div> <div>
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名"
<el-input prop="name">
v-model="fmData.name" <el-input v-model="fmData.name"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入" placeholder="请输入">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="mobile"> <el-form-item label="手机号"
<el-input prop="mobile">
v-model="fmData.mobile" <el-input v-model="fmData.mobile"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入" placeholder="请输入">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="证件号" prop="idCard"> <el-form-item label="证件号"
<el-input prop="idCard">
v-model="fmData.idCard" <el-input v-model="fmData.idCard"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入身份证号或证件号" placeholder="请输入身份证号或证件号">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item label="出生日期" prop="birthdayTime"> <el-form-item label="出生日期"
<el-date-picker prop="birthdayTime">
v-model="fmData.birthdayTime" <el-date-picker v-model="fmData.birthdayTime"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd">
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="享受福利" prop="remark"> <el-form-item label="享受福利"
<el-select prop="remark">
v-model.trim="fmData.isWelfare" <el-select v-model.trim="fmData.isWelfare"
placeholder="请选择" placeholder="请选择"
size="small" size="small"
clearable clearable
style="width: 120px" style="width: 120px"
class="resi-cell-select" class="resi-cell-select">
> <el-option v-for="item in optionsWelfare"
<el-option
v-for="item in optionsWelfare"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button class="diy-button--search"
class="diy-button--search"
size="small" size="small"
@click="handleSearch" @click="handleSearch">查询</el-button>
>查询</el-button <el-button class="diy-button--reset"
>
<el-button
class="diy-button--reset"
size="small" size="small"
@click="resetForm('searchForm')" @click="resetForm('searchForm')">重置</el-button>
>重置</el-button
>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
</el-card> </el-card>
<el-card class="resi-card-table"> <el-card class="resi-card-table">
<div class="resi-row-btn"> <div class="resi-row-btn">
<el-button class="diy-button--add" size="small" @click="handleAdd" <el-button class="diy-button--add"
>出生登记</el-button size="small"
> @click="handleAdd">出生登记</el-button>
<el-button <el-button v-if="false"
v-if="false"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule('room')" @click="handleExportModule('room')">下载模板</el-button>
>下载模板</el-button <el-upload v-if="false"
>
<el-upload
v-if="false"
ref="upload" ref="upload"
class="upload-btn" class="upload-btn"
action="uploadUlr" action="uploadUlr"
@ -217,131 +180,114 @@
:on-progress="handleProgress" :on-progress="handleProgress"
:on-success="handleExcelSuccess" :on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload" :before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest" :http-request="uploadHttpRequest">
> <el-button size="small"
<el-button
size="small"
class="diy-button--delete" class="diy-button--delete"
:loading="importLoading" :loading="importLoading">{{ importBtnTitle }}</el-button>
>{{ importBtnTitle }}</el-button
>
</el-upload> </el-upload>
<el-button @click="handleChu" class="diy-button--reset" size="small" <el-button @click="handleChu"
>导出</el-button class="diy-button--reset"
> size="small">导出</el-button>
</div> </div>
<el-table <el-table :data="tableData"
:data="tableData"
border border
style="width: 100%" style="width: 100%"
class="resi-table" class="resi-table"
:height="maxTableHeight" :height="maxTableHeight">
> <el-table-column label="序号"
<el-table-column
label="序号"
fixed="left" fixed="left"
type="index" type="index"
align="center" 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"> <template slot-scope="scope">
<a class="name-a" @click="handleWatch(scope.$index)"> <a class="name-a"
@click="handleWatch(scope.$index)">
{{ scope.row.name }} {{ scope.row.name }}
</a> </a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="gridName"
prop="gridName"
align="center" align="center"
label="所属网格" label="所属网格"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="home"
prop="home"
label="所属房屋" label="所属房屋"
align="center" align="center"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="mobile"
prop="mobile"
width="100" width="100"
align="center" align="center"
label="手机号" label="手机号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="idCard"
prop="idCard"
align="center" align="center"
label="证件号" label="证件号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </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>
<el-table-column <el-table-column prop="birthday"
prop="birthday"
align="center" align="center"
label="出生日期" label="出生日期"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="birthplace"
prop="birthplace"
align="center" align="center"
label="出生地" label="出生地"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="parentName"
prop="parentName"
align="center" align="center"
label="出生人父/母姓名" label="出生人父/母姓名"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </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>
<el-table-column <el-table-column prop="reportDate"
prop="reportDate"
align="center" align="center"
label="申报户口日期" label="申报户口日期"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="householderName"
prop="householderName"
align="center" align="center"
label="户主姓名" label="户主姓名"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="householderRelation"
prop="householderRelation"
align="center" align="center"
label="与户主关系" label="与户主关系"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </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"> <template slot-scope="scope">
<!-- <el-button <!-- <el-button
@click="handleWatch(scope.$index)" @click="handleWatch(scope.$index)"
@ -350,63 +296,61 @@
>查看</el-button >查看</el-button
> --> > -->
<el-button <el-button @click="handleEdit(scope.$index)"
@click="handleEdit(scope.$index)"
type="text" type="text"
size="small" size="small"
class="div-table-button--edit" class="div-table-button--edit">修改</el-button>
>修改</el-button
>
<el-popconfirm <el-popconfirm v-if="false"
v-if="false"
title="删除之后无法回复,确认删除?" title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row, scope.$index)" @onConfirm="handleDel(scope.row, scope.$index)"
@confirm="handleDel(scope.row, scope.$index)" @confirm="handleDel(scope.row, scope.$index)">
> <el-button slot="reference"
<el-button
slot="reference"
type="text" type="text"
size="small" size="small"
class="div-table-button--delete" class="div-table-button--delete"
style="margin-left: 10px" style="margin-left: 10px">删除</el-button>
>删除</el-button
>
</el-popconfirm> </el-popconfirm>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div> <div>
<el-pagination <el-pagination @size-change="handleSizeChange"
@size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo" :current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]" :page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)" :page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total" layout="sizes, prev, pager, next, total"
:total="total" :total="total">
>
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
<!-- 修改弹出框 --> <!-- 修改弹出框 -->
<el-dialog <el-dialog :visible.sync="formShow"
:visible.sync="formShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:title="formTitle" :title="formTitle"
width="850px" width="850px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="handleClose" @closed="handleClose">
> <edit-form ref="eleEditForm"
<edit-form
ref="eleEditForm"
@dialogCancle="handleClose" @dialogCancle="handleClose"
@dialogOk="handleEditSuccess" @dialogOk="handleEditSuccess"></edit-form>
></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> </el-dialog>
</div> </div>
</template> </template>
@ -416,16 +360,18 @@ import { requestPost } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick"; import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import editForm from "./cpts/edit"; import editForm from "./cpts/edit";
import detailForm from "./cpts/detail";
import axios from "axios"; import axios from "axios";
export default { export default {
components: { editForm }, components: { editForm, detailForm },
data() { data () {
return { return {
openSearch: false, openSearch: false,
formShow: false, formShow: false,
formTitle: "出生登记", formTitle: "出生登记",
detailShow: false,
pageNo: 1, pageNo: 1,
pageSize: window.localStorage.getItem("pageSize") || 20, pageSize: window.localStorage.getItem("pageSize") || 20,
@ -478,19 +424,19 @@ export default {
}; };
}, },
computed: { computed: {
maxTableHeight() { maxTableHeight () {
return this.$store.state.inIframe return this.$store.state.inIframe
? this.clientHeight - 360 + this.iframeHeigh ? this.clientHeight - 360 + this.iframeHeigh
: this.clientHeight - 360; : this.clientHeight - 360;
}, },
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
changeVDisabled() { changeVDisabled () {
return !this.fmData.villageId; return !this.fmData.villageId;
}, },
changeBDisabled() { changeBDisabled () {
return !this.fmData.buildId; return !this.fmData.buildId;
}, },
changeDDisabled() { changeDDisabled () {
return !this.fmData.unitId; return !this.fmData.unitId;
}, },
}, },
@ -505,26 +451,26 @@ export default {
} }
}, },
}, },
mounted() { mounted () {
this.getGridList(); this.getGridList();
this.getValiheList(); this.getValiheList();
this.getTableData(); this.getTableData();
}, },
methods: { methods: {
handleClearVillage() { handleClearVillage () {
this.fmData.buildId = ""; this.fmData.buildId = "";
this.fmData.homeId = ""; this.fmData.homeId = "";
}, },
handleClearBuild() { handleClearBuild () {
this.fmData.buildId = ""; this.fmData.buildId = "";
this.fmData.unitId = ""; this.fmData.unitId = "";
this.fmData.homeId = ""; this.fmData.homeId = "";
}, },
handleClearDan() { handleClearDan () {
this.fmData.unitId = ""; this.fmData.unitId = "";
this.fmData.homeId = ""; this.fmData.homeId = "";
}, },
handleChangeGrid(val) { handleChangeGrid (val) {
console.log("val", val); console.log("val", val);
this.fmData.villageId = ""; this.fmData.villageId = "";
this.fmData.buildId = ""; this.fmData.buildId = "";
@ -532,26 +478,26 @@ export default {
this.fmData.homeId = ""; this.fmData.homeId = "";
this.getValiheList(); this.getValiheList();
}, },
handleChangeV(val) { handleChangeV (val) {
console.log("val", val); console.log("val", val);
this.fmData.buildId = ""; this.fmData.buildId = "";
this.fmData.unitId = ""; this.fmData.unitId = "";
this.fmData.homeId = ""; this.fmData.homeId = "";
this.getBuildList(); this.getBuildList();
}, },
handleChangeB(val) { handleChangeB (val) {
console.log("val", val); console.log("val", val);
this.fmData.unitId = ""; this.fmData.unitId = "";
this.fmData.homeId = ""; this.fmData.homeId = "";
this.getUniList(); this.getUniList();
}, },
handleChangeD(val) { handleChangeD (val) {
console.log("val", val); console.log("val", val);
this.fmData.homeId = ""; this.fmData.homeId = "";
this.getHouseList(); this.getHouseList();
}, },
getGridList() { getGridList () {
const { user } = this.$store.state; const { user } = this.$store.state;
this.$http this.$http
.post("/gov/org/customergrid/gridoption", { .post("/gov/org/customergrid/gridoption", {
@ -570,7 +516,7 @@ export default {
return this.$message.error("网络错误"); return this.$message.error("网络错误");
}); });
}, },
getValiheList() { getValiheList () {
const { user } = this.$store.state; const { user } = this.$store.state;
this.$http this.$http
.post("/gov/org/icneighborhood/neighborhoodoption", { .post("/gov/org/icneighborhood/neighborhoodoption", {
@ -590,7 +536,7 @@ export default {
return this.$message.error("网络错误"); return this.$message.error("网络错误");
}); });
}, },
getBuildList() { getBuildList () {
this.$http this.$http
.post("/gov/org/icbuilding/buildingoption", { .post("/gov/org/icbuilding/buildingoption", {
neighborHoodId: this.fmData.villageId, neighborHoodId: this.fmData.villageId,
@ -607,7 +553,7 @@ export default {
return this.$message.error("网络错误"); return this.$message.error("网络错误");
}); });
}, },
getUniList() { getUniList () {
this.$http this.$http
.post("/gov/org/icbuildingunit/unitoption", { .post("/gov/org/icbuildingunit/unitoption", {
buildingId: this.fmData.buildId, buildingId: this.fmData.buildId,
@ -624,7 +570,7 @@ export default {
return this.$message.error("网络错误"); return this.$message.error("网络错误");
}); });
}, },
getHouseList() { getHouseList () {
this.$http this.$http
.post("/gov/org/ichouse/houseoption", { unitId: this.fmData.unitId }) .post("/gov/org/ichouse/houseoption", { unitId: this.fmData.unitId })
.then(({ data: res }) => { .then(({ data: res }) => {
@ -640,7 +586,7 @@ export default {
}); });
}, },
async handleExportModule() { async handleExportModule () {
let url = "/heart/iccommunityselforganization/import-template-download"; let url = "/heart/iccommunityselforganization/import-template-download";
let params = {}; let params = {};
@ -677,18 +623,18 @@ export default {
}); });
}, },
// //
handleExcelSuccess(res, file) { handleExcelSuccess (res, file) {
if (res.code === 0 && res.msg === "success") { if (res.code === 0 && res.msg === "success") {
console.log("resss---ppp", res); console.log("resss---ppp", res);
} else { } else {
this.$message.error(res.msg); this.$message.error(res.msg);
} }
}, },
handleProgress(event, file, fileList) { handleProgress (event, file, fileList) {
console.log("percentage", file.percentage); console.log("percentage", file.percentage);
}, },
beforeExcelUpload(file) { beforeExcelUpload (file) {
console.log("file", file); console.log("file", file);
const isType = file.type === "application/vnd.ms-excel"; const isType = file.type === "application/vnd.ms-excel";
const isTypeComputer = const isTypeComputer =
@ -705,7 +651,7 @@ export default {
} }
return fileType && isLt1M; return fileType && isLt1M;
}, },
async uploadHttpRequest(file) { async uploadHttpRequest (file) {
this.importLoading = true; this.importLoading = true;
this.importBtnTitle = "正在上传中..."; this.importBtnTitle = "正在上传中...";
this.$message({ this.$message({
@ -760,38 +706,38 @@ export default {
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
}, },
handleSizeChange(val) { handleSizeChange (val) {
console.log(`每页 ${val}`); console.log(`每页 ${val}`);
this.pageSize = val; this.pageSize = val;
window.localStorage.setItem("pageSize", val); window.localStorage.setItem("pageSize", val);
this.getTableData(); this.getTableData();
}, },
handleCurrentChange(val) { handleCurrentChange (val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.pageNo = val; this.pageNo = val;
this.getTableData(); this.getTableData();
}, },
handleClose() { handleClose () {
this.formShow = false; this.formShow = false;
}, },
handleSearch(val) { handleSearch (val) {
console.log(this.fmData); console.log(this.fmData);
this.pageNo = 1; this.pageNo = 1;
this.getTableData(); this.getTableData();
}, },
resetForm(formName) { resetForm (formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.handleSearch(); this.handleSearch();
}, },
async handleAdd() { async handleAdd () {
this.formShow = true; this.formShow = true;
await nextTick(); await nextTick();
console.log(this.$refs); console.log(this.$refs);
this.$refs.eleEditForm.initForm("add"); this.$refs.eleEditForm.initForm("add");
}, },
async handleChu() { async handleChu () {
const url = "/epmetuser/icBirthRecord/export"; const url = "/epmetuser/icBirthRecord/export";
const { pageSize, pageNo, fmData } = this; const { pageSize, pageNo, fmData } = this;
axios({ axios({
@ -826,23 +772,33 @@ export default {
}); });
}, },
async handleWatch(rowIndex) { async handleWatch (rowIndex) {
this.formShow = true; // this.formShow = true;
await nextTick(); // await nextTick();
this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]); // 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) { async handleEdit (rowIndex) {
this.formShow = true; this.formShow = true;
await nextTick(); await nextTick();
this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]); this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
}, },
handleEditSuccess() { handleEditSuccess () {
this.handleClose(); this.handleClose();
this.getTableData(); this.getTableData();
}, },
async handleDel(rowData, rowIndex) { async handleDel (rowData, rowIndex) {
console.log(rowData, rowIndex); console.log(rowData, rowIndex);
const url = const url =
"/heart/iccommunityselforganization/delcommunityselforganization"; "/heart/iccommunityselforganization/delcommunityselforganization";
@ -860,7 +816,7 @@ export default {
} }
}, },
async getTableData() { async getTableData () {
const url = "/epmetuser/icBirthRecord/page"; const url = "/epmetuser/icBirthRecord/page";
const { pageSize, pageNo, fmData } = this; const { pageSize, pageNo, fmData } = this;
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {

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>

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

@ -1,30 +1,26 @@
<template> <template>
<div class="resi-container"> <div class="resi-container">
<el-card ref="searchCard" class="search-card"> <el-card ref="searchCard"
<el-form class="search-card">
ref="searchForm" <el-form ref="searchForm"
:inline="true" :inline="true"
:model="fmData" :model="fmData"
:label-width="'100px'" :label-width="'100px'"
class="demo-form-inline" class="demo-form-inline">
>
<div> <div>
<el-form-item prop="gridId" label="所属网格"> <el-form-item prop="gridId"
label="所属网格">
<div class="resi-cell-value"> <div class="resi-cell-value">
<el-select <el-select v-model.trim="fmData.gridId"
v-model.trim="fmData.gridId"
placeholder="请选择网格" placeholder="请选择网格"
size="small" size="small"
clearable clearable
class="resi-cell-select" class="resi-cell-select"
@change="handleChangeGrid" @change="handleChangeGrid">
> <el-option v-for="item in optionsG"
<el-option
v-for="item in optionsG"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
@ -33,76 +29,60 @@
<div class="resi-cell-value"> <div class="resi-cell-value">
<div class="resi-cell-col"> <div class="resi-cell-col">
<el-form-item prop="villageId"> <el-form-item prop="villageId">
<el-select <el-select v-model.trim="fmData.villageId"
v-model.trim="fmData.villageId"
placeholder="请选择小区" placeholder="请选择小区"
size="small" size="small"
clearable clearable
class="resi-cell-select" class="resi-cell-select"
@change="handleChangeV" @change="handleChangeV">
> <el-option v-for="item in optionsV"
<el-option
v-for="item in optionsV"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="buildId"> <el-form-item prop="buildId">
<el-select <el-select v-model.trim="fmData.buildId"
v-model.trim="fmData.buildId"
placeholder="楼号" placeholder="楼号"
size="small" size="small"
clearable clearable
:disabled="changeVDisabled" :disabled="changeVDisabled"
class="resi-cell-select resi-cell-select-middle" class="resi-cell-select resi-cell-select-middle"
@change="handleChangeB" @change="handleChangeB">
> <el-option v-for="item in optionsB"
<el-option
v-for="item in optionsB"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="unitId"> <el-form-item prop="unitId">
<el-select <el-select v-model.trim="fmData.unitId"
v-model.trim="fmData.unitId"
placeholder="单元" placeholder="单元"
size="small" size="small"
clearable clearable
:disabled="changeBDisabled" :disabled="changeBDisabled"
class="resi-cell-select resi-cell-select-middle" class="resi-cell-select resi-cell-select-middle"
@change="handleChangeD" @change="handleChangeD">
> <el-option v-for="item in optionsD"
<el-option
v-for="item in optionsD"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="homeId"> <el-form-item prop="homeId">
<el-select <el-select v-model.trim="fmData.homeId"
v-model.trim="fmData.homeId"
placeholder="房号" placeholder="房号"
size="small" size="small"
clearable clearable
:disabled="changeDDisabled" :disabled="changeDDisabled"
class="resi-cell-select resi-cell-select-middle" class="resi-cell-select resi-cell-select-middle">
> <el-option v-for="item in optionsH"
<el-option
v-for="item in optionsH"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -112,102 +92,85 @@
</div> </div>
<div> <div>
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名"
<el-input prop="name">
v-model="fmData.name" <el-input v-model="fmData.name"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入" placeholder="请输入">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="mobile"> <el-form-item label="手机号"
<el-input prop="mobile">
v-model="fmData.mobile" <el-input v-model="fmData.mobile"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入" placeholder="请输入">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="证件号" prop="idCard"> <el-form-item label="证件号"
<el-input prop="idCard">
v-model="fmData.idCard" <el-input v-model="fmData.idCard"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入" placeholder="请输入">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item label="迁入时间" prop="startTime"> <el-form-item label="迁入时间"
<el-date-picker prop="startTime">
v-model="rangeTime" <el-date-picker v-model="rangeTime"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd">
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="享受福利" prop="remark"> <el-form-item label="享受福利"
<el-select prop="remark">
v-model.trim="fmData.isWeifare" <el-select v-model.trim="fmData.isWeifare"
placeholder="享受福利" placeholder="享受福利"
size="small" size="small"
clearable clearable
style="width: 120px" style="width: 120px"
class="resi-cell-select" class="resi-cell-select">
> <el-option v-for="item in optionsWelfare"
<el-option
v-for="item in optionsWelfare"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button class="diy-button--search"
class="diy-button--search"
size="small" size="small"
@click="handleSearch" @click="handleSearch">查询</el-button>
>查询</el-button <el-button class="diy-button--reset"
>
<el-button
class="diy-button--reset"
size="small" size="small"
@click="resetForm('searchForm')" @click="resetForm('searchForm')">重置</el-button>
>重置</el-button
>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
</el-card> </el-card>
<el-card class="resi-card-table"> <el-card class="resi-card-table">
<div class="resi-row-btn"> <div class="resi-row-btn">
<el-button class="diy-button--add" size="small" @click="handleAdd" <el-button class="diy-button--add"
>迁入登记</el-button size="small"
> @click="handleAdd">迁入登记</el-button>
<el-button <el-button v-if="false"
v-if="false"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule('room')" @click="handleExportModule('room')">下载模板</el-button>
>下载模板</el-button <el-upload v-if="false"
>
<el-upload
v-if="false"
ref="upload" ref="upload"
class="upload-btn" class="upload-btn"
action="uploadUlr" action="uploadUlr"
@ -219,205 +182,181 @@
:on-progress="handleProgress" :on-progress="handleProgress"
:on-success="handleExcelSuccess" :on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload" :before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest" :http-request="uploadHttpRequest">
> <el-button size="small"
<el-button
size="small"
class="diy-button--delete" class="diy-button--delete"
:loading="importLoading" :loading="importLoading">{{ importBtnTitle }}</el-button>
>{{ importBtnTitle }}</el-button
>
</el-upload> </el-upload>
<el-button @click="handleChu" class="diy-button--reset" size="small" <el-button @click="handleChu"
>导出</el-button class="diy-button--reset"
> size="small">导出</el-button>
</div> </div>
<el-table <el-table :data="tableData"
:data="tableData"
border border
style="width: 100%" style="width: 100%"
class="resi-table" class="resi-table"
:height="tableHeight" :height="tableHeight">
> <el-table-column label="序号"
<el-table-column
label="序号"
fixed="left" fixed="left"
type="index" type="index"
align="center" align="center"
width="50" width="50" />
/>
<el-table-column <el-table-column prop="name"
prop="name"
width="100" width="100"
fixed="left" fixed="left"
label="姓名" label="姓名"
align="center" align="center">
>
<template slot-scope="scope"> <template slot-scope="scope">
<a class="name-a" @click="handleWatch(scope.$index)"> <a class="name-a"
@click="handleWatch(scope.$index)">
{{ scope.row.name }} {{ scope.row.name }}
</a> </a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="gridName"
prop="gridName"
align="center" align="center"
label="所属网格" label="所属网格"
min-width="160" min-width="160"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="allName"
prop="allName"
label="所属房屋" label="所属房屋"
align="center" align="center"
min-width="160" min-width="160"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/>
<el-table-column <el-table-column prop="mobile"
prop="mobile"
width="140" width="140"
align="center" align="center"
label="手机号" label="手机号">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="idCard"
prop="idCard"
align="center" align="center"
min-width="160" min-width="160"
label="证件号" label="证件号">
>
</el-table-column> </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>
<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>
<el-table-column <el-table-column prop="inTime"
prop="inTime"
align="center" align="center"
min-width="140" min-width="140"
label="迁入时间" label="迁入时间">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="inReason"
prop="inReason"
align="center" align="center"
label="迁入原因" label="迁入原因"
min-width="160" min-width="160"
show-overflow-tooltip show-overflow-tooltip>
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="sourceAddress"
prop="sourceAddress"
min-width="160" min-width="160"
align="center" align="center"
label="由何地迁入" label="由何地迁入">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="moveNumber"
prop="moveNumber"
min-width="160" min-width="160"
align="center" align="center"
label="迁移证号码" label="迁移证号码">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="householderName"
prop="householderName"
min-width="100" min-width="100"
align="center" align="center"
label="户主姓名" label="户主姓名">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="householderRelationName"
prop="householderRelationName"
align="center" align="center"
min-width="100" min-width="100"
label="与户主关系" label="与户主关系">
>
</el-table-column> </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"> <template slot-scope="scope">
<el-button <el-button v-if="false"
v-if="false"
@click="handleWatch(scope.$index)" @click="handleWatch(scope.$index)"
type="text" type="text"
size="small" size="small">查看</el-button>
>查看</el-button
>
<el-button <el-button @click="handleEdit(scope.$index)"
@click="handleEdit(scope.$index)"
type="text" type="text"
size="small" size="small"
class="div-table-button--edit" class="div-table-button--edit">修改</el-button>
>修改</el-button
>
<el-popconfirm <el-popconfirm v-if="false"
v-if="false"
title="删除之后无法回复,确认删除?" title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row, scope.$index)" @onConfirm="handleDel(scope.row, scope.$index)"
@confirm="handleDel(scope.row, scope.$index)" @confirm="handleDel(scope.row, scope.$index)">
> <el-button slot="reference"
<el-button
slot="reference"
type="text" type="text"
size="small" size="small"
class="div-table-button--delete" class="div-table-button--delete"
style="margin-left: 10px" style="margin-left: 10px">删除</el-button>
>删除</el-button
>
</el-popconfirm> </el-popconfirm>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div> <div>
<el-pagination <el-pagination @size-change="handleSizeChange"
@size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo" :current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]" :page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)" :page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total" layout="sizes, prev, pager, next, total"
:total="total" :total="total">
>
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
<!-- 修改弹出框 --> <!-- 修改弹出框 -->
<el-dialog <el-dialog :visible.sync="formShow"
:visible.sync="formShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:title="formTitle" :title="formTitle"
width="850px" width="850px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="handleClose" @closed="handleClose">
> <edit-form v-if="formShow"
<edit-form
v-if="formShow"
ref="eleEditForm" ref="eleEditForm"
@dialogCancle="handleClose" @dialogCancle="handleClose"
@dialogOk="handleEditSuccess" @dialogOk="handleEditSuccess"></edit-form>
></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> </el-dialog>
</div> </div>
</template> </template>
@ -427,16 +366,19 @@ import { requestPost } from '@/js/dai/request'
import nextTick from 'dai-js/tools/nextTick' import nextTick from 'dai-js/tools/nextTick'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import editForm from './edit' import editForm from './edit'
import detailForm from './detail'
import axios from 'axios' import axios from 'axios'
export default { export default {
components: { editForm }, components: { editForm, detailForm },
data() { data () {
return { return {
openSearch: false, openSearch: false,
formShow: false, formShow: false,
detailShow: false,
formTitle: '迁入登记', formTitle: '迁入登记',
detailShow: false,
pageNo: 1, pageNo: 1,
pageSize: window.localStorage.getItem('pageSize') || 20, pageSize: window.localStorage.getItem('pageSize') || 20,
@ -485,7 +427,7 @@ export default {
}, },
computed: { computed: {
...mapGetters(['clientHeight', 'iframeHeight']), ...mapGetters(['clientHeight', 'iframeHeight']),
maxTableHeight() { maxTableHeight () {
console.log('computed-searchH---', this.searchH) console.log('computed-searchH---', this.searchH)
const h = this.clientHeight - this.searchH + this.iframeHeight const h = this.clientHeight - this.searchH + this.iframeHeight
const _h = this.clientHeight - this.searchH const _h = this.clientHeight - this.searchH
@ -494,13 +436,13 @@ export default {
}, },
changeVDisabled() { changeVDisabled () {
return !this.fmData.villageId return !this.fmData.villageId
}, },
changeBDisabled() { changeBDisabled () {
return !this.fmData.buildId return !this.fmData.buildId
}, },
changeDDisabled() { changeDDisabled () {
return !this.fmData.unitId return !this.fmData.unitId
} }
}, },
@ -515,7 +457,7 @@ export default {
this.fmData.endTime = '' this.fmData.endTime = ''
} }
}, },
searchH() { searchH () {
const h = this.clientHeight - this.searchH + this.iframeHeight const h = this.clientHeight - this.searchH + this.iframeHeight
const _h = this.clientHeight - this.searchH const _h = this.clientHeight - this.searchH
console.log('computed-searchH---_h', _h) console.log('computed-searchH---_h', _h)
@ -525,7 +467,7 @@ export default {
}) })
} }
}, },
mounted() { mounted () {
this.getGridList() this.getGridList()
this.getValiheList() this.getValiheList()
this.getTableData() this.getTableData()
@ -533,20 +475,20 @@ export default {
console.log('searchH----', this.$refs.searchCard.$el.offsetHeight) console.log('searchH----', this.$refs.searchCard.$el.offsetHeight)
}, },
methods: { methods: {
handleClearVillage() { handleClearVillage () {
this.fmData.buildId = '' this.fmData.buildId = ''
this.fmData.homeId = '' this.fmData.homeId = ''
}, },
handleClearBuild() { handleClearBuild () {
this.fmData.buildId = '' this.fmData.buildId = ''
this.fmData.unitId = '' this.fmData.unitId = ''
this.fmData.homeId = '' this.fmData.homeId = ''
}, },
handleClearDan() { handleClearDan () {
this.fmData.unitId = '' this.fmData.unitId = ''
this.fmData.homeId = '' this.fmData.homeId = ''
}, },
handleChangeGrid(val) { handleChangeGrid (val) {
console.log('val', val) console.log('val', val)
this.fmData.villageId = '' this.fmData.villageId = ''
this.fmData.buildId = '' this.fmData.buildId = ''
@ -554,26 +496,26 @@ export default {
this.fmData.homeId = '' this.fmData.homeId = ''
this.getValiheList() this.getValiheList()
}, },
handleChangeV(val) { handleChangeV (val) {
console.log('val', val) console.log('val', val)
this.fmData.buildId = '' this.fmData.buildId = ''
this.fmData.unitId = '' this.fmData.unitId = ''
this.fmData.homeId = '' this.fmData.homeId = ''
this.getBuildList() this.getBuildList()
}, },
handleChangeB(val) { handleChangeB (val) {
console.log('val', val) console.log('val', val)
this.fmData.unitId = '' this.fmData.unitId = ''
this.fmData.homeId = '' this.fmData.homeId = ''
this.getUniList() this.getUniList()
}, },
handleChangeD(val) { handleChangeD (val) {
console.log('val', val) console.log('val', val)
this.fmData.homeId = '' this.fmData.homeId = ''
this.getHouseList() this.getHouseList()
}, },
getGridList() { getGridList () {
const { user } = this.$store.state const { user } = this.$store.state
this.$http this.$http
.post('/gov/org/customergrid/gridoption', { .post('/gov/org/customergrid/gridoption', {
@ -592,7 +534,7 @@ export default {
return this.$message.error('网络错误') return this.$message.error('网络错误')
}) })
}, },
getValiheList() { getValiheList () {
const { user } = this.$store.state const { user } = this.$store.state
this.$http this.$http
.post('/gov/org/icneighborhood/neighborhoodoption', { .post('/gov/org/icneighborhood/neighborhoodoption', {
@ -612,7 +554,7 @@ export default {
return this.$message.error('网络错误') return this.$message.error('网络错误')
}) })
}, },
getBuildList() { getBuildList () {
this.$http this.$http
.post('/gov/org/icbuilding/buildingoption', { .post('/gov/org/icbuilding/buildingoption', {
neighborHoodId: this.fmData.villageId neighborHoodId: this.fmData.villageId
@ -629,7 +571,7 @@ export default {
return this.$message.error('网络错误') return this.$message.error('网络错误')
}) })
}, },
getUniList() { getUniList () {
this.$http this.$http
.post('/gov/org/icbuildingunit/unitoption', { .post('/gov/org/icbuildingunit/unitoption', {
buildingId: this.fmData.buildId buildingId: this.fmData.buildId
@ -646,7 +588,7 @@ export default {
return this.$message.error('网络错误') return this.$message.error('网络错误')
}) })
}, },
getHouseList() { getHouseList () {
this.$http this.$http
.post('/gov/org/ichouse/houseoption', { unitId: this.fmData.unitId }) .post('/gov/org/ichouse/houseoption', { unitId: this.fmData.unitId })
.then(({ data: res }) => { .then(({ data: res }) => {
@ -662,7 +604,7 @@ export default {
}) })
}, },
async handleExportModule() { async handleExportModule () {
let url = '/heart/iccommunityselforganization/import-template-download' let url = '/heart/iccommunityselforganization/import-template-download'
let params = {} let params = {}
@ -699,18 +641,18 @@ export default {
}) })
}, },
// //
handleExcelSuccess(res, file) { handleExcelSuccess (res, file) {
if (res.code === 0 && res.msg === 'success') { if (res.code === 0 && res.msg === 'success') {
console.log('resss---ppp', res) console.log('resss---ppp', res)
} else { } else {
this.$message.error(res.msg) this.$message.error(res.msg)
} }
}, },
handleProgress(event, file, fileList) { handleProgress (event, file, fileList) {
console.log('percentage', file.percentage) console.log('percentage', file.percentage)
}, },
beforeExcelUpload(file) { beforeExcelUpload (file) {
console.log('file', file) console.log('file', file)
const isType = file.type === 'application/vnd.ms-excel' const isType = file.type === 'application/vnd.ms-excel'
const isTypeComputer = const isTypeComputer =
@ -727,7 +669,7 @@ export default {
} }
return fileType && isLt1M return fileType && isLt1M
}, },
async uploadHttpRequest(file) { async uploadHttpRequest (file) {
this.importLoading = true this.importLoading = true
this.importBtnTitle = '正在上传中...' this.importBtnTitle = '正在上传中...'
this.$message({ this.$message({
@ -782,38 +724,38 @@ export default {
this.$refs.upload.clearFiles() this.$refs.upload.clearFiles()
}, },
handleSizeChange(val) { handleSizeChange (val) {
console.log(`每页 ${val}`) console.log(`每页 ${val}`)
this.pageSize = val this.pageSize = val
window.localStorage.setItem('pageSize', val) window.localStorage.setItem('pageSize', val)
this.getTableData() this.getTableData()
}, },
handleCurrentChange(val) { handleCurrentChange (val) {
console.log(`当前页: ${val}`) console.log(`当前页: ${val}`)
this.pageNo = val this.pageNo = val
this.getTableData() this.getTableData()
}, },
handleClose() { handleClose () {
this.formShow = false this.formShow = false
}, },
handleSearch(val) { handleSearch (val) {
console.log(this.fmData) console.log(this.fmData)
this.pageNo = 1 this.pageNo = 1
this.getTableData() this.getTableData()
}, },
resetForm(formName) { resetForm (formName) {
this.$refs[formName].resetFields() this.$refs[formName].resetFields()
this.handleSearch() this.handleSearch()
}, },
async handleAdd() { async handleAdd () {
this.formShow = true this.formShow = true
await nextTick() await nextTick()
console.log(this.$refs) console.log(this.$refs)
this.$refs.eleEditForm.initForm('add') this.$refs.eleEditForm.initForm('add')
}, },
async handleChu() { async handleChu () {
const url = const url =
'/epmetuser/icMoveIn/export' '/epmetuser/icMoveIn/export'
const { pageSize, pageNo, fmData } = this const { pageSize, pageNo, fmData } = this
@ -875,7 +817,7 @@ export default {
// return this.$message.error('') // return this.$message.error('')
// }) // })
}, },
formatData(res) { formatData (res) {
const fileReader = new FileReader() const fileReader = new FileReader()
fileReader.onloadend = () => { fileReader.onloadend = () => {
try { try {
@ -891,7 +833,7 @@ export default {
} }
fileReader.readAsText(res.data) fileReader.readAsText(res.data)
}, },
downloadFile(res) { downloadFile (res) {
if (res.headers["content-disposition"]) { if (res.headers["content-disposition"]) {
let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
console.log('filename', fileName) console.log('filename', fileName)
@ -910,23 +852,35 @@ export default {
} else this.$message.error('下载失败') } else this.$message.error('下载失败')
}, },
async handleWatch(rowIndex) { async handleWatch (rowIndex) {
this.formShow = true // this.formShow = true
await nextTick() // await nextTick()
this.$refs.eleEditForm.initForm('detail', this.tableData[rowIndex].moveInId) // 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) { async handleEdit (rowIndex) {
this.formShow = true this.formShow = true
await nextTick() await nextTick()
this.$refs.eleEditForm.initForm('edit', this.tableData[rowIndex].moveInId) this.$refs.eleEditForm.initForm('edit', this.tableData[rowIndex].moveInId)
}, },
handleEditSuccess() { handleEditSuccess () {
this.handleClose() this.handleClose()
this.getTableData() this.getTableData()
}, },
async handleDel(rowData, rowIndex) { async handleDel (rowData, rowIndex) {
console.log(rowData, rowIndex) console.log(rowData, rowIndex)
const url = const url =
'/heart/iccommunityselforganization/delcommunityselforganization' '/heart/iccommunityselforganization/delcommunityselforganization'
@ -944,7 +898,7 @@ export default {
} }
}, },
async getTableData() { async getTableData () {
const url = '/epmetuser/icMoveIn/list' const url = '/epmetuser/icMoveIn/list'
const { pageSize, pageNo, fmData } = this const { pageSize, pageNo, fmData } = this
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
@ -968,7 +922,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '@/assets/scss/buttonstyle.scss'; @import "@/assets/scss/buttonstyle.scss";
.resi-container .resi-card-table { .resi-container .resi-card-table {
::v-deep .el-table th { ::v-deep .el-table th {

Loading…
Cancel
Save