elink-star
/
epmet-oper-gov
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

迁出记录 列表

dev2
jiangyy 3 years ago
parent
3407696b6b
commit
af89a07f30
7 changed files with 267 additions and 490 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/assets/scss/modules/management/edit-main.scss
  2. 2
      src/assets/scss/modules/management/list-main.scss
  3. 3
      src/views/modules/base/community/buildForm.vue
  4. 3
      src/views/modules/base/community/communityForm.vue
  5. 3
      src/views/modules/base/community/roomForm.vue
  6. 379
      src/views/modules/base/huji/immigration/edit.vue
  7. 107
      src/views/modules/base/huji/immigration/index.vue

4
src/assets/scss/modules/management/edit-main.scss
View File

@ -22,6 +22,10 @@
.edit_item_width_normal{ .edit_item_width_normal{
width:320px; width:320px;
} }
//编辑框-房屋级联选择 楼号-单元-放号宽度
.edit_item_width_build{
width:100px;
}
.edit_map{ .edit_map{

2
src/assets/scss/modules/management/list-main.scss
View File

@ -65,7 +65,7 @@
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12); box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12);
position: relative; position: relative;
padding:24px 16px 0; padding:24px 16px 10px;
.div_btn { .div_btn {
display: flex; display: flex;

3
src/views/modules/base/community/buildForm.vue
View File

@ -148,13 +148,12 @@
</div> </div>
<div class="div_btn"> <div class="div_btn">
<el-button size="small" <el-button size="small"
class="diy-button--white"
@click="handleCancle">取 消</el-button> @click="handleCancle">取 消</el-button>
<el-button size="small" <el-button size="small"
type="primary" type="primary"
class="diy-button--blue" class="diy-button--blue"
:disabled="btnDisable" :disabled="btnDisable"
@click="handleComfirm">确 定</el-button> @click="handleComfirm">保 存</el-button>
</div> </div>
</div> </div>
</template> </template>

3
src/views/modules/base/community/communityForm.vue
View File

@ -179,12 +179,11 @@
</div> </div>
<div class="div_btn"> <div class="div_btn">
<el-button size="small" <el-button size="small"
class="diy-button--white"
@click="handleCancle">取 消</el-button> @click="handleCancle">取 消</el-button>
<el-button size="small" <el-button size="small"
class="diy-button--blue" class="diy-button--blue"
:disabled="btnDisable" :disabled="btnDisable"
@click="handleComfirm">确 定</el-button> @click="handleComfirm">保 存</el-button>
</div> </div>
</div> </div>
</template> </template>

3
src/views/modules/base/community/roomForm.vue
View File

@ -179,13 +179,12 @@
</div> </div>
<div class="div_btn"> <div class="div_btn">
<el-button size="small" <el-button size="small"
class="diy-button--white"
@click="handleCancle">取 消</el-button> @click="handleCancle">取 消</el-button>
<el-button size="small" <el-button size="small"
type="primary" type="primary"
class="diy-button--blue" class="diy-button--blue"
:disabled="btnDisable" :disabled="btnDisable"
@click="handleComfirm">确 定</el-button> @click="handleComfirm">保 存</el-button>
</div> </div>
</div> </div>
</template> </template>

379
src/views/modules/base/huji/immigration/edit.vue
View File

@ -1,366 +1,265 @@
<template> <template>
<div> <div>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<el-form <el-form ref="ref_form"
ref="ref_form"
:inline="true" :inline="true"
:model="fmData" :model="fmData"
:rules="dataRule" :rules="dataRule"
:disabled="formType === 'detail'"
class="form"
>
<el-form-item
label="所属网格 "
prop="gridId"
label-width="150px" label-width="150px"
style="display: block" class="edit_form">
> <el-form-item label="所属网格 "
<el-select prop="gridId"
v-model.trim="fmData.gridId" style="display: block">
<el-select v-model.trim="fmData.gridId"
placeholder="请选择" placeholder="请选择"
size="small" size="small"
clearable clearable
class="item_width_1" class="edit_item_width_normal"
:disabled="formType === 'edit'" :disabled="formType === 'edit'"
@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>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="所属房屋 "
label="所属房屋 "
prop="homeId" prop="homeId"
label-width="150px" style="display: block">
style="display: block"
> <div>
<el-input <el-select v-model.trim="fmData.villageId"
v-if="formType == 'detail'"
class="item_width_2"
placeholder="请输入来源地"
disabled
v-model="fmData.allName"
/>
<template v-else>
<el-select
v-model.trim="fmData.villageId"
placeholder="请选择小区" placeholder="请选择小区"
size="small" size="small"
clearable clearable
class="resi-cell-select" class="edit_item_width_normal"
@clear="handleClearVillage" @clear="handleClearVillage"
@change="handleChangeV" @change="handleChangeV"
:disabled="formType === 'edit'" :disabled="formType === 'edit'">
style="margin-right: 8px; width: 120px" <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 </div>
v-model.trim="fmData.buildId" <div>
<el-select v-model.trim="fmData.buildId"
placeholder="楼号" placeholder="楼号"
size="small" size="small"
clearable clearable
style="margin-right: 8px; width: 120px" class="edit_item_width_build"
class="resi-cell-select"
:disabled="changeVDisabled || formType === 'edit'" :disabled="changeVDisabled || formType === 'edit'"
@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 || formType === 'edit'" :disabled="changeBDisabled || formType === 'edit'"
placeholder="单元" placeholder="单元"
size="small" size="small"
clearable clearable
style="margin-right: 8px; width: 120px" style="margin-left: 10px;"
class="resi-cell-select" class="edit_item_width_build"
@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 || formType === 'edit'" :disabled="changeDDisabled || formType === 'edit'"
placeholder="房号" placeholder="房号"
size="small" size="small"
clearable clearable
@change="handleChangeH" @change="handleChangeH"
style="width: 120px" style="margin-left: 10px;"
class="resi-cell-select" class="edit_item_width_build">
> <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>
</template> </div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="姓名"
label="姓名"
prop="name" prop="name"
label-width="150px" style="display: block">
style="display: block" <el-input class="edit_item_width_normal"
>
<el-input
class="item_width_1"
style="margin-right: 20px" style="margin-right: 20px"
placeholder="请输入姓名 " placeholder="请输入姓名 "
v-model="fmData.name" v-model="fmData.name"
:disabled="formType === 'edit'" :disabled="formType === 'edit'"
maxlength="30" maxlength="30">
>
</el-input> </el-input>
<div>
<el-checkbox v-model="fmData.isWelfare"
true-label="1"
false-label="0">享受福利</el-checkbox>
<el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0">享受福利</el-checkbox>
<template v-if="formType === 'edit'"> <template v-if="formType === 'edit'">
<el-checkbox <el-checkbox v-model="fmData.isCheck"
v-model="fmData.isCheck"
true-label="1" true-label="1"
false-label="0" false-label="0"
:disabled="initCheck == 1" :disabled="initCheck == 1"
@change="checkResiAvailable" @change="checkResiAvailable">补充居民信息</el-checkbox>
>补充居民信息</el-checkbox
>
</template> </template>
<el-checkbox <el-checkbox v-else
v-else
v-model="fmData.isCheck" v-model="fmData.isCheck"
true-label="1" true-label="1"
false-label="0" false-label="0"
@change="checkResiAvailable" @change="checkResiAvailable">补充居民信息</el-checkbox>
>补充居民信息</el-checkbox </div>
>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="手机号"
label="手机号"
prop="mobile" prop="mobile"
label-width="150px" style="display: block">
style="display: block" <el-input class="edit_item_width_normal"
>
<el-input
class="item_width_1"
type="number" type="number"
maxlength="11" maxlength="11"
show-word-limit show-word-limit
placeholder="请输入手机号 " placeholder="请输入手机号 "
:disabled="formType === 'edit'" :disabled="formType === 'edit'"
v-model="fmData.mobile" v-model="fmData.mobile">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="证件号"
label="证件号"
prop="idCard" prop="idCard"
label-width="150px" style="display: block">
style="display: block" <el-input class="edit_item_width_normal"
>
<el-input
class="item_width_1"
placeholder="请输入身份证号或护照号" placeholder="请输入身份证号或护照号"
v-model="fmData.idCard" v-model="fmData.idCard"
:disabled="formType === 'edit'" :disabled="formType === 'edit'"
@blur="handleBlurId" @blur="handleBlurId"></el-input>
></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="性别"
label="性别"
prop="principalName" prop="principalName"
label-width="150px" style="display: block">
style="display: block" <el-select v-model.trim="fmData.gender"
>
<el-select
v-model.trim="fmData.gender"
placeholder="性别" placeholder="性别"
size="small" size="small"
clearable clearable
class="item_width_1" class="edit_item_width_normal"
:disabled="true" :disabled="true">
> <el-option v-for="item in optionsGender"
<el-option
v-for="item in optionsGender"
: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 label="年龄"
label="年龄"
prop="age" prop="age"
label-width="150px" style="display: block">
style="display: block" <el-input class="edit_item_width_normal"
>
<el-input
class="item_width_1"
type="number" type="number"
show-word-limit show-word-limit
placeholder="请输入" placeholder="请输入"
v-model="fmData.age" v-model="fmData.age"
:disabled="true" :disabled="true">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="迁入日期"
label="迁入日期"
prop="inTime" prop="inTime"
label-width="150px" style="display: block">
style="display: block" <el-date-picker v-model="fmData.inTime"
>
<el-date-picker
v-model="fmData.inTime"
type="date" type="date"
placeholder="迁入时间" placeholder="迁入时间"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
class="item_width_1" class="edit_item_width_normal"
:disabled="formType === 'edit'" :disabled="formType === 'edit'">
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="迁入原因"
label="迁入原因"
prop="inReason" prop="inReason"
label-width="150px" style="display: block">
style="display: block" <el-input type="textarea"
> class="edit_item_width_normal"
<el-input
type="textarea"
class="item_width_2"
placeholder="请输入迁入原因" placeholder="请输入迁入原因"
v-model="fmData.inReason" v-model="fmData.inReason">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="来源地"
label="来源地"
prop="sourceAddress" prop="sourceAddress"
label-width="150px" style="display: block">
style="display: block"
> <el-cascader ref="nowArea"
<el-input class="edit_item_width_normal"
v-if="formType == 'detail'" :props="areaProps"
class="item_width_2" v-model="nowAllCode"
placeholder="请输入来源地" clearable
disabled @change="handleNowArea"></el-cascader>
v-model="fmData.sourceAddress"
/>
<el-cascader v-else ref="nowArea" class="item_width_1" :props="areaProps"
v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="详细地址"
label="详细地址"
prop="address" prop="address"
label-width="150px" style="display: block">
style="display: block" <el-input class="edit_item_width_normal"
>
<el-input
class="item_width_1"
placeholder="请输入详细地址" placeholder="请输入详细地址"
v-model="fmData.address" v-model="fmData.address">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="迁移证号码"
label="迁移证号码"
prop="moveNumber" prop="moveNumber"
label-width="150px" style="display: block">
style="display: block" <el-input class="edit_item_width_normal"
>
<el-input
class="item_width_1"
placeholder="请输入迁移证号码" placeholder="请输入迁移证号码"
v-model="fmData.moveNumber" v-model="fmData.moveNumber">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="户主姓名"
label="户主姓名"
prop="householderName" prop="householderName"
label-width="150px" style="display: block">
style="display: block" <el-input class="edit_item_width_normal"
>
<el-input
class="item_width_1"
placeholder="请输入户主姓名" placeholder="请输入户主姓名"
v-model="fmData.householderName" v-model="fmData.householderName">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="与户主关系"
label="与户主关系"
prop="householderRelation" prop="householderRelation"
label-width="150px" style="display: block">
style="display: block" <el-select v-model.trim="fmData.householderRelation"
>
<el-select
v-model.trim="fmData.householderRelation"
placeholder="与户主关系" placeholder="与户主关系"
size="small" size="small"
clearable clearable
class="item_width_1" class="edit_item_width_normal">
> <el-option v-for="item in optionsRelation"
<el-option
v-for="item in optionsRelation"
: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> </el-form>
</div> </div>
<div class="div_btn resi-btns"> <div class="div_btn">
<el-button size="small" @click="handleCancle">取 消</el-button> <el-button size="small"
<el-button @click="handleCancle">取 消</el-button>
v-if="formType != 'detail'" <el-button type="primary"
type="primary"
size="small" size="small"
class="diy-button--blue"
:disabled="btnDisable" :disabled="btnDisable"
@click="handleComfirm" @click="handleComfirm">保 存</el-button>
>确 定</el-button
>
</div> </div>
</div> </div>
</template> </template>
@ -877,53 +776,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.item_width_1 { @import "@/assets/scss/modules/management/edit-main.scss";
width: 220px;
}
.item_width_2 {
width: 400px;
}
.item_width_3 {
margin-left: 10px;
width: 200px;
}
.item_width_4 {
width: 200px;
}
.div_map {
margin-top: 10px;
}
.div_btn {
// display: flex;
// justify-content: flex-end;
}
.el-tabs {
margin: 0 20px;
}
.el-upload__tip {
color: rgb(155, 155, 155);
margin: 0;
}
.form {
margin-top: 30px;
}
.m-staffs {
width: 468px;
.item {
display: flex;
justify-content: space-around;
margin-bottom: 7px;
}
.item-add {
}
}
</style> </style>
<style>
.el-dialog__body {
padding: 0 10px 20px !important;
}
</style>

107
src/views/modules/base/huji/immigration/index.vue
View File

@ -158,11 +158,12 @@
<div class="div_table"> <div class="div_table">
<div class="div_btn"> <div class="div_btn">
<div class="div_btn_left"> <div class="div_btn_left">
<el-button class="diy-button--add" <el-button class="diy-button--blue"
icon="el-icon-plus"
size="small" size="small"
@click="handleAdd">迁入登记</el-button> @click="handleAdd">迁入登记</el-button>
<el-button v-if="false" <el-button v-if="false"
class="diy-button--export" class="diy-button--white"
size="small" size="small"
@click="handleExportModule('room')">下载模板</el-button> @click="handleExportModule('room')">下载模板</el-button>
<el-upload :headers="$getElUploadHeaders()" <el-upload :headers="$getElUploadHeaders()"
@ -180,12 +181,12 @@
: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--white"
:loading="importLoading">{{ importBtnTitle }}</el-button> :loading="importLoading">{{ importBtnTitle }}</el-button>
</el-upload> </el-upload>
<el-button @click="handleChu" <el-button @click="handleChu"
class="diy-button--reset" class="diy-button--white"
size="small">导出</el-button> size="small">导出</el-button>
</div> </div>
</div> </div>
@ -290,22 +291,23 @@
<el-table-column fixed="right" <el-table-column fixed="right"
label="操作" label="操作"
align="center" align="center"
width="150"> width="190">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="false" <el-button v-if="false"
@click="handleWatch(scope.$index)" @click="handleWatch(scope.$index)"
type="text" type="text"
class="div-table-button--blue"
size="small">查看</el-button> size="small">查看</el-button>
<el-button @click="handleEdit(scope.$index)" <el-button @click="handleEdit(scope.$index)"
type="text" type="text"
size="small" size="small"
class="div-table-button--edit">修改</el-button> class="div-table-button--blue">修改</el-button>
<el-button @click="handleChangeRecord(scope.row)" <el-button @click="handleChangeRecord(scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--detail">变更记录</el-button> class="div-table-button--blue">变更记录</el-button>
<el-popconfirm v-if="false" <el-popconfirm v-if="false"
title="删除之后无法回复，确认删除？" title="删除之后无法回复，确认删除？"
@ -324,7 +326,7 @@
<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--blue"
style="margin-left: 10px">删除</el-button> style="margin-left: 10px">删除</el-button>
</el-popconfirm> </el-popconfirm>
</template> </template>
@ -349,7 +351,7 @@
: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="670px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="handleClose"> @closed="handleClose">
@ -364,7 +366,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:title="'迁入详情'" :title="'迁入详情'"
width="850px" width="670px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="detailFormCancle"> @closed="detailFormCancle">
@ -497,8 +499,9 @@ export default {
this.getGridList() this.getGridList()
this.getValiheList() this.getValiheList()
this.getTableData() this.getTableData()
this.searchH = this.$refs.searchForm.$el.offsetHeight + 270
console.log('searchH----', this.$refs.searchForm.$el.offsetHeight) this.searchH = this.$refs.searchForm.offsetHeight + 300
console.log('searchH----', this.$refs.searchForm.offsetHeight)
}, },
methods: { methods: {
diaClose () { diaClose () {
@ -974,84 +977,4 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/modules/management/list-main.scss"; @import "@/assets/scss/modules/management/list-main.scss";
.resi-container .resi-card-table {
::v-deep .el-table th {
color: #fff;
background-color: rgba(33, 149, 254, 1);
// border-right: 1px solid rgba(33, 149, 254, 1);
}
}
.resi-table {
::v-deep .el-button--text {
text-decoration: underline;
}
}
.resi-card-table {
margin-top: 20px;
}
.resi-row-btn {
margin-bottom: 13px;
.upload-btn {
display: inline-block;
margin: 0 10px;
}
}
.resi-btns {
margin-top: 20px;
text-align: center;
}
.resi-container .resi-card {
position: relative;
overflow: visible;
}
.demo-form-inline {
// display: flex;
// align-items: center;
// margin-bottom: 20px;
.resi-cell-label {
flex-shrink: 0;
min-width: 0;
box-sizing: border-box;
margin-right: 15px;
// text-align: right;
// line-height: 32;
}
.resi-cell-label1 {
width: max-content;
}
.resi-cell-value-radio {
display: flex;
align-items: center;
min-height: 32px;
}
.item_width_normal {
width: 200px;
}
.resi-cell--daterange {
max-width: 260px;
}
.item_width_normal {
width: 200px;
box-sizing: border-box;
margin-right: 10px;
&-middle {
width: 120px;
}
&-small {
width: 88px;
}
}
.item_width_normal:last-child {
margin-right: 0;
}
}
.mt10 {
margin-top: 10px;
}
</style> </style>

Write Preview
Loading…
Cancel
Save