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

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

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

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

@ -138,6 +138,7 @@
placeholder="请输入姓名 "
v-model="fmData.name"
:disabled="formType === 'edit'"
maxlength="30"
>
</el-input>
@ -199,7 +200,7 @@
size="small"
clearable
class="item_width_1"
:disabled="formType === 'edit'"
:disabled="true"
>
<el-option
v-for="item in optionsGender"
@ -222,7 +223,7 @@
show-word-limit
placeholder="请输入"
v-model="fmData.age"
:disabled="formType === 'edit'"
:disabled="true"
>
</el-input>
</el-form-item>
@ -235,9 +236,9 @@
>
<el-date-picker
v-model="fmData.inTime"
type="datetime"
type="date"
placeholder="迁入时间"
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
class="item_width_1"
:disabled="formType === 'edit'"
>
@ -797,7 +798,7 @@ export default {
})
}
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
if (user.agencyId == this.userInfo.resiAgencyId) {
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-select
v-model.trim="fmData.buildId"
placeholder="请选择楼号"
placeholder="楼号"
size="small"
clearable
:disabled="changeVDisabled"
class="resi-cell-select resi-cell-select-middle"
@change="handleChangeB"
>
@ -71,9 +72,10 @@
<el-form-item prop="unitId">
<el-select
v-model.trim="fmData.unitId"
placeholder="请选择单元"
placeholder="单元"
size="small"
clearable
:disabled="changeBDisabled"
class="resi-cell-select resi-cell-select-middle"
@change="handleChangeD"
>
@ -89,9 +91,10 @@
<el-form-item prop="homeId">
<el-select
v-model.trim="fmData.homeId"
placeholder="请选择房号"
placeholder="房号"
size="small"
clearable
:disabled="changeDDisabled"
class="resi-cell-select resi-cell-select-middle"
>
<el-option
@ -1032,7 +1035,7 @@ export default {
box-sizing: border-box;
margin-right: 10px;
&-middle {
width: 130px;
width: 120px;
}
&-small {
width: 88px;

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

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

Write Preview
Loading…
Cancel
Save