Browse Source

调整

feature
jiangyuying 2 years ago
parent
commit
ef39264de4
  1. 14
      src/js/columns/constants/index.js
  2. 44
      src/views/business/resi-category-map.js
  3. 392
      src/views/modules/base/residentManagement/housingNature/housingNature.vue

14
src/js/columns/constants/index.js

@ -59,6 +59,8 @@ export const dormitoryTypeList = [
value: '0' value: '0'
} }
] ]
//证件类型
export const idTypeList = [ export const idTypeList = [
{ {
label: '其他', label: '其他',
@ -85,3 +87,15 @@ export const idTypeList = [
value: 5 value: 5
} }
] ]
//是否list
export const yesOrNoList = [
{
label: '是',
value: 1
},
{
label: '否',
value: 0
}
]

44
src/views/business/resi-category-map.js

@ -1,23 +1,23 @@
export default { export default {
PARTY_FLAG: "党员", PARTY_FLAG: '党员',
SUBSISTENCE_ALLOWANCE_FLAG: "低保人员", SUBSISTENCE_ALLOWANCE_FLAG: '低保人员',
ENSURE_HOUSE_FLAG: "保障房人员", ENSURE_HOUSE_FLAG: '保障房人员',
UNEMPLOYED_FLAG: "失业人员", UNEMPLOYED_FLAG: '失业人员',
FERTILE_WOMAN_FLAG: "育龄妇女", FERTILE_WOMAN_FLAG: '育龄妇女',
VETERAN_FLAG: "退役军人", VETERAN_FLAG: '退役军人',
UNITED_FRONT_FLAG: "统战人员", UNITED_FRONT_FLAG: '统战人员',
PETITION_OFFICER_FLAG: "信访人员", PETITION_OFFICER_FLAG: '信访人员',
VOLUNTEER_FLAG: "志愿者", VOLUNTEER_FLAG: '志愿者',
OLD_PEOPLE_FLAG: "老年人", OLD_PEOPLE_FLAG: '老年人',
EMPTY_NESTER_FLAG: "空巢老人", EMPTY_NESTER_FLAG: '空巢老人',
BEREAVED_PERSON_FLAG: "特扶人员", SPECIAL_SUPPORT_FLAG: '特扶人员',
DISABLED_FLAG: "失能老人", DISABLED_FLAG: '失能老人',
DEMENTED_FLAG: "失智老人", DEMENTED_FLAG: '失智老人',
DISABILITY_FLAG: "残疾", DISABILITY_FLAG: '残疾',
SERIOUS_ILLNESS_FLAG: "大病", SERIOUS_ILLNESS_FLAG: '大病',
CHRONIC_DISEASE_FLAG: "慢病", CHRONIC_DISEASE_FLAG: '慢病',
SPECIAL_CROWD_FLAG: "特殊人群", SPECIAL_CROWD_FLAG: '特殊人群',
TENANT_FLAG: "租户", TENANT_FLAG: '租户',
FLOATING_FLAG: "流动人口", FLOATING_FLAG: '流动人口',
LIVE_ALONE_FLAG: "独居老人", LIVE_ALONE_FLAG: '独居老人'
}; }

392
src/views/modules/base/residentManagement/housingNature/housingNature.vue

@ -2,127 +2,128 @@
<div class="g-main"> <div class="g-main">
<div> <div>
<div class="m-search"> <div class="m-search">
<el-form <el-form :inline="true"
:inline="true"
:model="formData" :model="formData"
ref="ref_searchform" ref="ref_searchform"
:label-width="'100px'" :label-width="'100px'">
>
<el-form-item label="住房性质">
<el-select v-model="formData.gender"
placeholder="请输入"
size="small"
class="u-item-width-normal"
clearable>
<el-option v-for="item in housingNatureList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input <el-input v-model="formData.name"
v-model="formData.name"
placeholder="请输入" placeholder="请输入"
size="small" size="small"
class="u-item-width-normal" class="u-item-width-normal"
clearable clearable></el-input>
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="联系电话"> <el-form-item label="联系电话">
<el-input <el-input v-model="formData.mobile"
v-model="formData.mobile"
placeholder="请输入" placeholder="请输入"
size="small" size="small"
class="u-item-width-normal" class="u-item-width-normal"
clearable clearable></el-input>
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="证件号"> <el-form-item label="证件号">
<el-input <el-input v-model="formData.idNum"
v-model="formData.idNum"
placeholder="请输入" placeholder="请输入"
size="small" size="small"
class="u-item-width-normal" class="u-item-width-normal"
clearable clearable></el-input>
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="性别"> <el-form-item label="户籍地址">
<el-select <el-input v-model="formData.currentResidence"
v-model="formData.gender"
placeholder="请输入" placeholder="请输入"
size="small" size="small"
class="u-item-width-normal" class="u-item-width-normal"
clearable clearable></el-input>
> </el-form-item>
<el-option
v-for="item in genderList" <el-form-item label="现居地址">
:key="item.value" <el-input v-model="formData.currentResidence"
:label="item.label" placeholder="请输入"
:value="item.value" size="small"
> class="u-item-width-normal"
</el-option> clearable></el-input>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="本地户籍">
<el-select <el-form-item label="保障类型">
v-model="formData.localResidenceFlag" <el-select v-model="formData.localResidenceFlag"
placeholder="请输入" placeholder="请输入"
size="small" size="small"
class="u-item-width-normal" class="u-item-width-normal"
clearable clearable>
> <el-option v-for="item in binaryOptionList"
<el-option
v-for="item in binaryOptionList"
: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 label="居住地址"> <el-form-item label="补贴编号">
<el-input <el-input v-model="formData.currentResidence"
v-model="formData.currentResidence"
placeholder="请输入" placeholder="请输入"
size="small" size="small"
class="u-item-width-normal" class="u-item-width-normal"
clearable clearable></el-input>
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="低保"> <el-form-item label="补贴金额">
<el-select <el-input v-model="formData.currentResidence"
v-model="formData.subsistenceAllowanceFlag" placeholder="请输入"
placeholder="请选择"
size="small" size="small"
class="u-item-width-normal" class="u-item-width-normal"
clearable clearable></el-input>
> </el-form-item>
<el-option
v-for="item in binaryOptionList" <el-form-item label="发证日期">
:key="item.value" <el-date-picker v-model="formData.birthdayStart"
:label="item.label" type="date"
:value="item.value" size="small"
> class="u-item-width-daterange"
</el-option> value-format="yyyy-MM-dd"
</el-select> placeholder="开始日期">
</el-date-picker>
<span class="u-data-tag"></span>
<el-date-picker v-model="formData.birthdayEnd"
type="date"
size="small"
value-format="yyyy-MM-dd"
class="u-item-width-daterange u-data-tag"
placeholder="结束日期"
:picker-options="pickerOptionsEnd">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input <el-input v-model="formData.remark"
v-model="formData.remark"
placeholder="请输入" placeholder="请输入"
size="small" size="small"
class="u-item-width-normal" class="u-item-width-normal"
clearable clearable></el-input>
></el-input>
</el-form-item> </el-form-item>
<el-row type="flex"> <el-row type="flex">
<el-col :span="24" align="right"> <el-col :span="24"
<el-button align="right">
style="margin-left: 30px" <el-button style="margin-left: 30px"
size="small" size="small"
type="primary " type="primary "
@click="handleSearch" @click="handleSearch">查询</el-button>
>查询</el-button <el-button style="margin-left: 10px"
>
<el-button
style="margin-left: 10px"
is-plain is-plain
class="diy-button--white el-button--default" class="diy-button--white el-button--default"
size="small" size="small"
@click="resetSearch" @click="resetSearch">重置</el-button>
>重置</el-button
>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -131,31 +132,22 @@
<div class="m-table"> <div class="m-table">
<div class="div_btn"> <div class="div_btn">
<div class="div_btn_left"> <div class="div_btn_left">
<el-button <el-button size="small"
size="small"
@click="handleAdd" @click="handleAdd"
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus">新增</el-button>
>新增</el-button
>
</div> </div>
<el-button <el-button @click="handleExport"
@click="handleExport"
type="primary" type="primary"
size="small" size="small"
class="diy-button--white el-button--default" class="diy-button--white el-button--default">导出</el-button>
>导出</el-button <el-button @click="onDeleteBatch"
>
<el-button
@click="onDeleteBatch"
style="margin: 0 10px" style="margin: 0 10px"
size="small" size="small"
type="primary" type="primary">
>
批量删除 批量删除
</el-button> </el-button>
<el-upload <el-upload :headers="$getElUploadHeaders()"
:headers="$getElUploadHeaders()"
ref="upload" ref="upload"
class="upload-btn" class="upload-btn"
action="uploadUlr" action="uploadUlr"
@ -165,159 +157,142 @@
:show-file-list="false" :show-file-list="false"
:auto-upload="true" :auto-upload="true"
:before-upload="beforeExcelUpload" :before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest" :http-request="uploadHttpRequest">
> <el-button type="primary"
<el-button
type="primary"
size="small" size="small"
class="diy-button--white el-button--default" class="diy-button--white el-button--default"
:loading="importLoading" :loading="importLoading">导入</el-button>
>导入</el-button
>
</el-upload> </el-upload>
<el-button <el-button style="margin-left: 10px"
style="margin-left: 10px"
class="diy-button--blue" class="diy-button--blue"
size="small" size="small"
@click="handleExportModule('room')" @click="handleExportModule('room')">下载模板</el-button>
>下载模板</el-button
>
</div> </div>
<el-table <el-table :data="tableData"
:data="tableData"
border border
v-loading="tableLoading" v-loading="tableLoading"
class="m-table-item" class="m-table-item"
style="width: 100%" style="width: 100%"
:height="maxTableHeight" :height="maxTableHeight"
@selection-change="onMultiSelection" @selection-change="onMultiSelection">
> <el-table-column type="selection"
<el-table-column
type="selection"
fixed="left" fixed="left"
align="center" align="center"
width="50" width="50" />
/>
<el-table-column <el-table-column label="序号"
label="序号"
fixed="left" fixed="left"
type="index" type="index"
align="center" align="center"
width="50" width="50" />
/>
<el-table-column <el-table-column prop="agencyName"
prop="name" align="center"
width="150"
label="所属组织"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="name"
align="center" align="center"
width="100" width="100"
label="姓名" label="姓名"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="mobile"
prop="mobile"
align="center" align="center"
width="150" width="150"
label="联系电话" label="联系电话"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="idNum"
prop="idNum"
align="center" align="center"
width="200" width="200"
label="证件号" label="证件号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column
prop="genderName" <el-table-column prop="placeOfDomicile"
align="center" align="center"
width="80" width="150"
label="性别" label="户籍地址"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
<template slot-scope="scope">
<span>{{ scope.row.gender?scope.row.gender == "1" ? "男":scope.row.gender == "2"?"女" :'--':"--" }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="currentResidence"
prop="localResidenceFlagName" align="center"
width="150"
label="居住地址"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="disabilityCategoryName"
align="center" align="center"
width="100" width="100"
label="本地户籍" label="住房性质"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="disabilityCategoryName"
prop="currentResidence"
align="center" align="center"
width="100" width="100"
label="居住地址" label="保障类型"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
> </el-table-column>
<el-table-column prop="disabilityCategoryName"
align="center"
width="100"
label="补贴编号"
:show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="disabilityCategoryName"
prop="disabilityCategoryName"
align="center" align="center"
width="100" width="100"
label="残疾类别" label="补贴金额"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="disabilityCategoryName"
prop="disabilityCategoryName"
align="center" align="center"
width="100" width="100"
label="残疾级别" label="发证日期"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="disabilityCategoryName"
fixed="right" align="center"
width="100"
label="备注"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column fixed="right"
label="操作" label="操作"
align="center" align="center"
width="220" width="220">
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button @click="handleDetail(scope.row)"
@click="handleDetail(scope.row)"
type="text" type="text"
size="small" size="small">查看</el-button>
>查看</el-button <el-button @click="handleEdit(scope.row)"
>
<el-button
@click="handleEdit(scope.row)"
type="text" type="text"
size="small" size="small">编辑</el-button>
>编辑</el-button
>
<el-button @click="handleDel(scope.row)" type="text" size="small" <el-button @click="handleDel(scope.row)"
>删除</el-button type="text"
> size="small">删除</el-button>
</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>
</div> </div>
</div> </div>
<el-dialog <el-dialog v-if="showAdd"
v-if="showAdd"
:visible.sync="showAdd" :visible.sync="showAdd"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -326,21 +301,18 @@
width="720px" width="720px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="showAdd = false" @closed="showAdd = false">
> <add-form ref="ref_add_form"
<add-form
ref="ref_add_form"
:formType="formType" :formType="formType"
@handleComfirm="handleComfirm" @handleComfirm="handleComfirm"
@handleClose="handleClose" @handleClose="handleClose"></add-form>
></add-form>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { requestPost } from "@/js/dai/request"; import { requestPost } from "@/js/dai/request";
import { genderList, binaryOptionList } from "@/js/columns/constants"; import { genderList, binaryOptionList, yesOrNoList } from "@/js/columns/constants";
import nextTick from "dai-js/tools/nextTick"; import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import axios from "axios"; import axios from "axios";
@ -352,24 +324,7 @@
components: { addForm, }, components: { addForm, },
data () { data () {
let endDisabledDate = (time) => {
//datareturn
let nowData = Date.now();
if (this.formData.serviceTimeStart) {
let serviceTimeStart = new Date(this.formData.serviceTimeStart);
return (
time.getTime() < serviceTimeStart - 24 * 60 * 60 * 1000 ||
time.getTime() === serviceTimeStart - 24 * 60 * 60 * 1000
);
} else {
return time.getTime() > nowData || time.getTime() === nowData;
}
};
// let startDisabledDate = (time) => {
// //datareturn
// let nowData = Date.now() - 24 * 60 * 60 * 1000;
// return time.getTime() < nowData;
// };
return { return {
tableLoading: false, tableLoading: false,
@ -377,33 +332,28 @@
agencyId: "", agencyId: "",
searchH: 170, searchH: 170,
tableData: [], tableData: [],
genderList, genderList,
binaryOptionList, binaryOptionList,
yesOrNoList,
formData: { formData: {
name: "刘备", certificateDateEnd: '',
mobile: "174744645454", certificateDateStart: '',
gender: "1", currentResidence: null,
idNum: "37024545454544545", housingNature: '',
localResidenceFlag: "1", idNum: '',
currentResidence: "青岛市市北区时代国际广场", mobile: '',
disabilityCategoryCode: "", name: '',
disabilityLevel: "", placeOfDomicile: '',
disabilityNum: "12345678", remark: '',
subsistenceAllowanceFlag: "1", securityType: '',
monthIncome: 2000, subsidyAmount: '',
contactName: "关羽", subsidyNum: '',
contactMobile: "12345678",
remark: "ipsum nostrud adipisicing",
}, },
pageNo: 1, pageNo: 1,
pageSize: window.localStorage.getItem("pageSize") || 20, pageSize: window.localStorage.getItem("pageSize") || 20,
total: 1, total: 1,
endPickerOptions: {
disabledDate: endDisabledDate,
},
startPickerOptions: {
// disabledDate: startDisabledDate
},
showAdd: false, showAdd: false,
showEdit: false, showEdit: false,

Loading…
Cancel
Save