elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-huji' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-huji

shibei_master
jiangyy 3 years ago
parent
e734c4196a e5d8e469c5
commit
226e428fcc
5 changed files with 210 additions and 203 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. 10
      src/views/modules/base/huji/chusheng/cpts/edit.vue
  2. 377
      src/views/modules/base/huji/chusheng/index.vue
  3. 11
      src/views/modules/base/huji/immigration/edit.vue
  4. 11
      src/views/modules/base/huji/immigration/index.vue
  5. 4
      src/views/modules/base/resi.vue

10
src/views/modules/base/huji/chusheng/cpts/edit.vue
View File

@ -126,7 +126,7 @@
> >
<el-input <el-input
class="item_width_1" class="item_width_1"
maxlength="50" maxlength="30"
show-word-limit show-word-limit
style="width: 200px; margin-right: 20px" style="width: 200px; margin-right: 20px"
placeholder="请输入姓名 " placeholder="请输入姓名 "
@ -160,8 +160,7 @@
> >
<el-input <el-input
class="item_width_1" class="item_width_1"
type="number" maxlength="30"
maxlength="50"
show-word-limit show-word-limit
placeholder="请输入手机号 " placeholder="请输入手机号 "
v-model="fmData.mobile" v-model="fmData.mobile"
@ -178,6 +177,7 @@
> >
<el-input <el-input
class="item_width_1" class="item_width_1"
maxlength="30"
placeholder="请输入身份证号" placeholder="请输入身份证号"
v-model="fmData.idCard" v-model="fmData.idCard"
@blur="handleBlurId" @blur="handleBlurId"
@ -250,7 +250,7 @@
> >
<el-input <el-input
class="item_width_1" class="item_width_1"
maxlength="50" maxlength="30"
show-word-limit show-word-limit
placeholder="请输入出生人父亲姓名" placeholder="请输入出生人父亲姓名"
v-model="fmData.father" v-model="fmData.father"
@ -266,7 +266,7 @@
> >
<el-input <el-input
class="item_width_1" class="item_width_1"
maxlength="50" maxlength="30"
show-word-limit show-word-limit
placeholder="请输入出生人母亲姓名" placeholder="请输入出生人母亲姓名"
v-model="fmData.mother" v-model="fmData.mother"

377
src/views/modules/base/huji/chusheng/index.vue
View File

@ -5,191 +5,191 @@
ref="searchForm" ref="searchForm"
:inline="true" :inline="true"
:model="fmData" :model="fmData"
:label-width="'100px'"
class="demo-form-inline" class="demo-form-inline"
> >
<el-row class="resi-row"> <div>
<el-col :span="6"> <el-form-item prop="gridId" label="所属网格">
<div class="resi-cell2"> <div class="resi-cell-value">
<div class="resi-cell2-label">所属网格</div> <el-select
<div class="resi-cell2-value"> v-model.trim="fmData.gridId"
<el-select placeholder="请选择"
v-model.trim="fmData.gridId" size="small"
placeholder="请选择" clearable
size="small" class="resi-cell-select"
clearable @change="handleChangeGrid"
class="resi-cell2-select" >
@change="handleChangeGrid" <el-option
v-for="item in optionsG"
:key="item.value"
:label="item.label"
:value="item.value"
> >
<el-option </el-option>
v-for="item in optionsG" </el-select>
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</div>
</div> </div>
</el-col> </el-form-item>
<el-col :span="18">
<div class="resi-cell2"> <el-form-item label="所属房屋">
<div class="resi-cell2-label">所属房屋</div> <div class="resi-cell-value">
<div class="resi-cell2-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-cell2-select" @clear="handleClearVillage"
@clear="handleClearVillage" @change="handleChangeV"
@change="handleChangeV" >
<el-option
v-for="item in optionsV"
:key="item.value"
:label="item.label"
:value="item.value"
> >
<el-option </el-option>
v-for="item in optionsV" </el-select>
:key="item.value" <el-select
:label="item.label" v-model.trim="fmData.buildId"
:value="item.value" placeholder="楼号"
> size="small"
</el-option> clearable
</el-select> style="width: 120px"
<el-select class="resi-cell-select"
v-model.trim="fmData.buildId" :disabled="changeVDisabled"
placeholder="楼号" @clear="handleClearBuild"
size="small" @change="handleChangeB"
clearable >
style="width: 120px" <el-option
class="resi-cell2-select" v-for="item in optionsB"
:disabled="changeVDisabled" :key="item.value"
@clear="handleClearBuild" :label="item.label"
@change="handleChangeB" :value="item.value"
> >
<el-option </el-option>
v-for="item in optionsB" </el-select>
:key="item.value" <el-select
:label="item.label" v-model.trim="fmData.unitId"
:value="item.value" :disabled="changeBDisabled"
> placeholder="单元"
</el-option> size="small"
</el-select> clearable
<el-select style="width: 120px"
v-model.trim="fmData.unitId" class="resi-cell-select"
:disabled="changeBDisabled" @click="handleClearDan"
placeholder="单元" @change="handleChangeD"
size="small" >
clearable <el-option
style="width: 120px" v-for="item in optionsD"
class="resi-cell2-select" :key="item.value"
@click="handleClearDan" :label="item.label"
@change="handleChangeD" :value="item.value"
> >
<el-option </el-option>
v-for="item in optionsD" </el-select>
:key="item.value" <el-select
:label="item.label" v-model.trim="fmData.homeId"
:value="item.value" :disabled="changeDDisabled"
> placeholder="房号"
</el-option> size="small"
</el-select> clearable
<el-select style="width: 120px"
v-model.trim="fmData.homeId" class="resi-cell-select"
:disabled="changeDDisabled" >
placeholder="房号" <el-option
size="small" v-for="item in optionsH"
clearable :key="item.value"
style="width: 120px" :label="item.label"
class="resi-cell2-select" :value="item.value"
> >
<el-option </el-option>
v-for="item in optionsH" </el-select>
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</div>
</div> </div>
</el-col> </el-form-item>
</el-row> </div>
<el-form-item label="姓名" prop="name"> <div>
<el-input <el-form-item label="姓名" prop="name">
v-model="fmData.name" <el-input
class="resi-cell2-input" v-model="fmData.name"
size="small" class="resi-cell-input"
clearable size="small"
placeholder="请输入" clearable
> placeholder="请输入"
</el-input> >
</el-form-item> </el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile"> <el-form-item label="手机号" prop="mobile">
<el-input <el-input
v-model="fmData.mobile" v-model="fmData.mobile"
class="resi-cell2-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="身份证号" prop="idCard">
<el-input <el-input
v-model="fmData.idCard" v-model="fmData.idCard"
class="resi-cell2-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入" placeholder="请输入"
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
</div>
<el-form-item label="出生日期" prop="birthdayTime">
<el-date-picker <div>
v-model="fmData.birthdayTime" <el-form-item label="出生日期" prop="birthdayTime">
type="daterange" <el-date-picker
range-separator="至" v-model="fmData.birthdayTime"
start-placeholder="开始日期" type="daterange"
end-placeholder="结束日期" range-separator="至"
value-format="yyyy-MM-dd" start-placeholder="开始日期"
> end-placeholder="结束日期"
</el-date-picker> value-format="yyyy-MM-dd"
</el-form-item> >
</el-date-picker>
</el-form-item>
<el-form-item label="享受福利" prop="remark"> <el-form-item label="享受福利" prop="remark">
<el-select <el-select
v-model.trim="fmData.isWelfare" v-model.trim="fmData.isWelfare"
placeholder="享受福利" placeholder="请选择"
size="small" size="small"
clearable clearable
style="width: 120px" style="width: 120px"
class="resi-cell2-select" class="resi-cell-select"
>
<el-option
v-for="item in optionsWelfare"
:key="item.value"
:label="item.label"
:value="item.value"
> >
</el-option> <el-option
</el-select> v-for="item in optionsWelfare"
</el-form-item> :key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</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 <el-button
class="diy-button--reset" 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>
</el-form> </el-form>
</el-card> </el-card>
<el-card class="resi-card-table"> <el-card class="resi-card-table">
@ -440,10 +440,10 @@ export default {
optionsG: [], optionsG: [],
optionsWelfare: [ optionsWelfare: [
{ // {
value: "", // value: "",
label: "全部", // label: "全部",
}, // },
{ {
value: "1", value: "1",
label: "是", label: "是",
@ -882,7 +882,6 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss"; @import "@/assets/scss/buttonstyle.scss";
@ -919,12 +918,12 @@ export default {
overflow: visible; overflow: visible;
} }
.demo-form-inline .resi-cell2 { .demo-form-inline {
display: flex; // display: flex;
align-items: center; // align-items: center;
margin-bottom: 20px; // margin-bottom: 20px;
.resi-cell2-label { .resi-cell-label {
flex-shrink: 0; flex-shrink: 0;
min-width: 0; min-width: 0;
box-sizing: border-box; box-sizing: border-box;
@ -932,21 +931,21 @@ export default {
// text-align: right; // text-align: right;
// line-height: 32; // line-height: 32;
} }
.resi-cell2-label1 { .resi-cell-label1 {
width: max-content; width: max-content;
} }
.resi-cell2-value-radio { .resi-cell-value-radio {
display: flex; display: flex;
align-items: center; align-items: center;
min-height: 32px; min-height: 32px;
} }
.resi-cell2-input { .resi-cell-input {
width: 200px; width: 200px;
} }
.resi-cell2--daterange { .resi-cell--daterange {
max-width: 260px; max-width: 260px;
} }
.resi-cell2-select { .resi-cell-select {
width: 200px; width: 200px;
box-sizing: border-box; box-sizing: border-box;
margin-right: 10px; margin-right: 10px;
@ -957,8 +956,12 @@ export default {
width: 88px; width: 88px;
} }
} }
.resi-cell2-select:last-child { .resi-cell-select:last-child {
margin-right: 0; margin-right: 0;
} }
} }
.mt10 {
margin-top: 10px;
}
</style> </style>

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

@ -138,6 +138,7 @@
placeholder="请输入姓名 " placeholder="请输入姓名 "
v-model="fmData.name" v-model="fmData.name"
:disabled="formType === 'edit'" :disabled="formType === 'edit'"
maxlength="30"
> >
</el-input> </el-input>
@ -199,7 +200,7 @@
size="small" size="small"
clearable clearable
class="item_width_1" class="item_width_1"
:disabled="formType === 'edit'" :disabled="true"
> >
<el-option <el-option
v-for="item in optionsGender" v-for="item in optionsGender"
@ -222,7 +223,7 @@
show-word-limit show-word-limit
placeholder="请输入" placeholder="请输入"
v-model="fmData.age" v-model="fmData.age"
:disabled="formType === 'edit'" :disabled="true"
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -235,9 +236,9 @@
> >
<el-date-picker <el-date-picker
v-model="fmData.inTime" v-model="fmData.inTime"
type="datetime" type="date"
placeholder="迁入时间" placeholder="迁入时间"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd"
class="item_width_1" class="item_width_1"
:disabled="formType === 'edit'" :disabled="formType === 'edit'"
> >
@ -797,7 +798,7 @@ export default {
}) })
} }
this.btnDisable = true this.btnDisable = true
if (this.fmData.isCheck && this.userInfo && this.userInfo.resiHomeId) { if (this.fmData.isCheck == '1' && this.userInfo && this.userInfo.resiHomeId) {
const { user } = this.$store.state const { user } = this.$store.state
if (user.agencyId == this.userInfo.resiAgencyId) { if (user.agencyId == this.userInfo.resiAgencyId) {
if (this.userInfo.resiHomeId !== this.fmData.homeId) { if (this.userInfo.resiHomeId !== this.fmData.homeId) {

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

@ -53,9 +53,10 @@
<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"
class="resi-cell-select resi-cell-select-middle" class="resi-cell-select resi-cell-select-middle"
@change="handleChangeB" @change="handleChangeB"
> >
@ -71,9 +72,10 @@
<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"
class="resi-cell-select resi-cell-select-middle" class="resi-cell-select resi-cell-select-middle"
@change="handleChangeD" @change="handleChangeD"
> >
@ -89,9 +91,10 @@
<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"
class="resi-cell-select resi-cell-select-middle" class="resi-cell-select resi-cell-select-middle"
> >
<el-option <el-option
@ -1032,7 +1035,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
margin-right: 10px; margin-right: 10px;
&-middle { &-middle {
width: 130px; width: 120px;
} }
&-small { &-small {
width: 88px; width: 88px;

4
src/views/modules/base/resi.vue
View File

@ -126,10 +126,10 @@
type="text" type="text"
size="small" size="small"
class="btn-color-look">查看</el-button> --> class="btn-color-look">查看</el-button> -->
<el-button @click="handleTransfer(scope.row)" <!-- <el-button @click="handleTransfer(scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--detail">变动</el-button> class="div-table-button--detail">变动</el-button> -->
<el-button @click="handleChangeRecord(scope.row)" <el-button @click="handleChangeRecord(scope.row)"
type="text" type="text"
size="small" size="small"

Write Preview
Loading…
Cancel
Save