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
commit
049aad2262
  1. 41
      src/views/components/resiChangeRecord.vue
  2. 1
      src/views/modules/base/huji/chusheng/cpts/edit.vue
  3. 38
      src/views/modules/base/huji/chusheng/index.vue
  4. 178
      src/views/modules/base/huji/immigration/edit.vue
  5. 5
      src/views/modules/base/huji/immigration/index.vue

41
src/views/components/resiChangeRecord.vue

@ -20,38 +20,46 @@
label="变更类型" label="变更类型"
width="80"> width="80">
</el-table-column> </el-table-column>
<el-table-column prop="beforeChangeName" <el-table-column prop="reason"
header-align="center"
align="center"
label="变更前"
width="230">
</el-table-column>
<el-table-column prop="afterChangeName"
header-align="center" header-align="center"
align="center" align="center"
label="变更后" label="原因"
min-width="230"> show-overflow-tooltip
min-width="120">
</el-table-column> </el-table-column>
<el-table-column prop="changeTime" <el-table-column prop="changeTime"
header-align="center" header-align="center"
align="center" align="center"
label="变更时间" label="变更时间"
width="160"> width="160">
</el-table-column> </el-table-column>
<el-table-column prop="remark" <el-table-column prop="beforeChangeName"
header-align="center" header-align="center"
align="center" align="center"
label="原因" label="变更前"
show-overflow-tooltip show-overflow-tooltip
min-width="120"> width="230">
</el-table-column> </el-table-column>
<el-table-column prop="afterChangeName"
header-align="center"
align="center"
label="变更后"
show-overflow-tooltip
min-width="230">
</el-table-column>
<el-table-column prop="operatorName" <el-table-column prop="operatorName"
header-align="center" header-align="center"
align="center" align="center"
label="操作人" label="操作人"
width="80"> width="80">
</el-table-column> </el-table-column>
<el-table-column prop="createdTime"
header-align="center"
align="center"
label="调整时间"
width="160">
</el-table-column>
<el-table-column prop="remark" <el-table-column prop="remark"
header-align="center" header-align="center"
@ -60,12 +68,7 @@
show-overflow-tooltip show-overflow-tooltip
min-width="120"> min-width="120">
</el-table-column> </el-table-column>
<el-table-column prop="createdTime"
header-align="center"
align="center"
label="调整时间"
width="160">
</el-table-column>
</el-table> </el-table>
<div> <div>
<el-pagination @size-change="handleSizeChange" <el-pagination @size-change="handleSizeChange"

1
src/views/modules/base/huji/chusheng/cpts/edit.vue

@ -808,7 +808,6 @@ export default {
this.optionsB = []; this.optionsB = [];
this.optionsH = []; this.optionsH = [];
this.optionsD = []; this.optionsD = [];
this.optionsRelation = [];
this.fmData = iniFmData(); this.fmData = iniFmData();
}, },
// //

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

@ -275,41 +275,69 @@
width="100" width="100"
align="center" align="center"
label="手机号" label="手机号"
:show-overflow-tooltip="true"
> >
</el-table-column> </el-table-column>
<el-table-column prop="idCard" align="center" label="身份证号"> <el-table-column
prop="idCard"
align="center"
label="身份证号"
: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 prop="birthday" align="center" label="出生日期"> <el-table-column
prop="birthday"
align="center"
label="出生日期"
:show-overflow-tooltip="true"
>
</el-table-column> </el-table-column>
<el-table-column prop="birthplace" align="center" label="出生地"> <el-table-column
prop="birthplace"
align="center"
label="出生地"
: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"
> >
</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 prop="reportDate" align="center" label="申报户口日期"> <el-table-column
prop="reportDate"
align="center"
label="申报户口日期"
:show-overflow-tooltip="true"
>
</el-table-column> </el-table-column>
<el-table-column prop="householderName" align="center" label="户主姓名"> <el-table-column
prop="householderName"
align="center"
label="户主姓名"
: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"
> >
</el-table-column> </el-table-column>

178
src/views/modules/base/huji/immigration/edit.vue

@ -40,81 +40,90 @@
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
<el-select <el-input
v-model.trim="fmData.villageId" v-if="formType == 'detail'"
placeholder="请选择小区" class="item_width_2"
size="small" placeholder="请输入来源地"
clearable disabled
class="resi-cell-select" v-model="fmData.allName"
@clear="handleClearVillage" />
@change="handleChangeV" <template v-else>
:disabled="formType === 'edit'" <el-select
style="margin-right: 8px; width: 120px" v-model.trim="fmData.villageId"
> placeholder="请选择小区"
<el-option size="small"
v-for="item in optionsV" clearable
:key="item.value" class="resi-cell-select"
:label="item.label" @clear="handleClearVillage"
:value="item.value" @change="handleChangeV"
:disabled="formType === 'edit'"
style="margin-right: 8px; width: 120px"
> >
</el-option> <el-option
</el-select> v-for="item in optionsV"
<el-select :key="item.value"
v-model.trim="fmData.buildId" :label="item.label"
placeholder="楼号" :value="item.value"
size="small" >
clearable </el-option>
style="margin-right: 8px; width: 120px" </el-select>
class="resi-cell-select" <el-select
:disabled="changeVDisabled || formType === 'edit'" v-model.trim="fmData.buildId"
@clear="handleClearBuild" placeholder="楼号"
@change="handleChangeB" size="small"
> clearable
<el-option style="margin-right: 8px; width: 120px"
v-for="item in optionsB" class="resi-cell-select"
:key="item.value" :disabled="changeVDisabled || formType === 'edit'"
:label="item.label" @clear="handleClearBuild"
:value="item.value" @change="handleChangeB"
> >
</el-option> <el-option
</el-select> v-for="item in optionsB"
<el-select :key="item.value"
v-model.trim="fmData.unitId" :label="item.label"
:disabled="changeBDisabled || formType === 'edit'" :value="item.value"
placeholder="单元" >
size="small" </el-option>
clearable </el-select>
style="margin-right: 8px; width: 120px" <el-select
class="resi-cell-select" v-model.trim="fmData.unitId"
@click="handleClearDan" :disabled="changeBDisabled || formType === 'edit'"
@change="handleChangeD" placeholder="单元"
> size="small"
<el-option clearable
v-for="item in optionsD" style="margin-right: 8px; width: 120px"
:key="item.value" class="resi-cell-select"
:label="item.label" @click="handleClearDan"
:value="item.value" @change="handleChangeD"
> >
</el-option> <el-option
</el-select> v-for="item in optionsD"
<el-select :key="item.value"
v-model.trim="fmData.homeId" :label="item.label"
:disabled="changeDDisabled || formType === 'edit'" :value="item.value"
placeholder="房号" >
size="small" </el-option>
clearable </el-select>
@change="handleChangeH" <el-select
style="width: 120px" v-model.trim="fmData.homeId"
class="resi-cell-select" :disabled="changeDDisabled || formType === 'edit'"
> placeholder="房号"
<el-option size="small"
v-for="item in optionsH" clearable
:key="item.value" @change="handleChangeH"
:label="item.label" style="width: 120px"
:value="item.value" class="resi-cell-select"
> >
</el-option> <el-option
</el-select> v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</template>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -256,16 +265,17 @@
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
<el-cascader ref="nowArea" class="item_width_1" :props="areaProps" <el-input
v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader> v-if="formType == 'detail'"
<!-- <el-input class="item_width_2"
class="item_width_1"
placeholder="请输入来源地" placeholder="请输入来源地"
disabled
v-model="fmData.sourceAddress" v-model="fmData.sourceAddress"
> --> />
</el-input> <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"
@ -500,7 +510,7 @@ export default {
message: `请联系${data.resiAgencyName}迁出该居民后操作` message: `请联系${data.resiAgencyName}迁出该居民后操作`
}) })
this.btnDisable = true this.btnDisable = true
} } else this.btnDisable = false
this.userInfo = { ...data } this.userInfo = { ...data }
} else { } else {
this.$message.error(msg) this.$message.error(msg)
@ -771,13 +781,13 @@ export default {
}, },
async handleComfirm() { async handleComfirm() {
this.btnDisable = true
// setTimeout(() => { // setTimeout(() => {
// this.btnDisable = false // this.btnDisable = false
// }, 10000) // }, 10000)
this.$refs['ref_form'].validate((valid, messageObj) => { this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) { if (!valid) {
app.util.validateRule(messageObj) // app.util.validateRule(messageObj)
this.btnDisable = false this.btnDisable = false
} else { } else {
if (!formVltHelper.userOrMobile(this.fmData.mobile)) { if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
@ -786,6 +796,7 @@ export default {
message: '手机号格式有误' message: '手机号格式有误'
}) })
} }
this.btnDisable = true
if (this.fmData.isCheck && this.userInfo && this.userInfo.resiHomeId) { if (this.fmData.isCheck && 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) {
@ -804,8 +815,8 @@ export default {
return return
} }
} }
}
} else this.submit() this.submit()
} }
}) })
@ -846,6 +857,7 @@ export default {
this.orgId = '' this.orgId = ''
this.nowAllCode = [] this.nowAllCode = []
this.btnDisable = false this.btnDisable = false
this.userInfo = {}
this.fmData = iniFmData() this.fmData = iniFmData()
} }
} }

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

@ -292,7 +292,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column prop="gender" 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="年龄">
@ -347,9 +347,10 @@
> >
</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="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-if="false"
@click="handleWatch(scope.$index)" @click="handleWatch(scope.$index)"
type="text" type="text"
size="small" size="small"

Loading…
Cancel
Save