Browse Source

部分居民信息bug修改

feature
jiangyy 3 years ago
parent
commit
a5f77d2608
  1. 2
      src/assets/scss/modules/management/edit-main.scss
  2. 12
      src/views/modules/base/community/community.vue
  3. 4
      src/views/modules/base/community/roomDetail.vue
  4. 4
      src/views/modules/base/huji/immigration/edit.vue
  5. 9
      src/views/modules/plugins/change/changedeath.vue
  6. 6
      src/views/modules/plugins/change/resideath.vue

2
src/assets/scss/modules/management/edit-main.scss

@ -6,7 +6,7 @@
margin-top: 30px; margin-top: 30px;
/deep/ .el-form-item{ /deep/ .el-form-item{
margin-bottom:14px; margin-bottom:19px;
} }
//编辑框-普通form宽度 //编辑框-普通form宽度

12
src/views/modules/base/community/community.vue

@ -28,7 +28,13 @@
<!-- <span v-if="data.level==='building'&&!data.showIcon" <!-- <span v-if="data.level==='building'&&!data.showIcon"
style="padding-left:20px;">{{ ' ' }}</span> --> style="padding-left:20px;">{{ ' ' }}</span> -->
<span :id="data.id">{{ data.showName }}</span> <span v-if="data.showIcon"
:id="data.id">{{ data.label+'(' }}
<span style="color:red">{{ data.showNum }}</span>
<span>{{')' }}</span>
</span>
<span v-else
:id="data.id">{{ data.showName }}</span>
</span> </span>
</el-tree> </el-tree>
</el-scrollbar> </el-scrollbar>
@ -399,11 +405,7 @@ export default {
}, },
computed: { computed: {
showIcon (showNum, level) {
},
rowHeight () { rowHeight () {
return this.$store.state.inIframe ? this.clientHeight - 160 + this.iframeHeight + 'px' : this.clientHeight - 160 + 'px' return this.$store.state.inIframe ? this.clientHeight - 160 + this.iframeHeight + 'px' : this.clientHeight - 160 + 'px'

4
src/views/modules/base/community/roomDetail.vue

@ -39,7 +39,7 @@
<div class="m-info-prop"> <div class="m-info-prop">
<span class="u-info-title u-info-title-100">联系方式</span> <span class="u-info-title u-info-title-100">联系方式</span>
<span class="info-mingan">{{dataForm.showOwnerPhone?dataForm.showOwnerPhone:'--' }}</span> <span class="info-mingan">{{dataForm.showOwnerPhone?dataForm.showOwnerPhone:'--' }}</span>
<el-button v-if="view_real_data" <el-button v-if="view_real_data && dataForm.showOwnerPhone"
style="margin-left: 10px" style="margin-left: 10px"
type="text" type="text"
class="div-table-button--blue" class="div-table-button--blue"
@ -50,7 +50,7 @@
<div class="m-info-prop"> <div class="m-info-prop">
<span class="u-info-title u-info-title-100">房主身份证</span> <span class="u-info-title u-info-title-100">房主身份证</span>
<span class="info-mingan">{{dataForm.showOwnerIdCard?dataForm.showOwnerIdCard:'--' }}</span> <span class="info-mingan">{{dataForm.showOwnerIdCard?dataForm.showOwnerIdCard:'--' }}</span>
<el-button v-if="view_real_data" <el-button v-if="view_real_data && dataForm.showOwnerIdCard"
style="margin-left: 10px" style="margin-left: 10px"
type="text" type="text"
class="div-table-button--blue" class="div-table-button--blue"

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

@ -104,9 +104,9 @@
maxlength="30"> maxlength="30">
</el-input> </el-input>
<div> <div>
<el-checkbox v-model="fmData.isWelfare" <!-- <el-checkbox v-model="fmData.isWelfare"
true-label="1" true-label="1"
false-label="0">享受福利</el-checkbox> false-label="0">享受福利</el-checkbox> -->
<template v-if="formType === 'edit'"> <template v-if="formType === 'edit'">
<el-checkbox v-model="fmData.isCheck" <el-checkbox v-model="fmData.isCheck"

9
src/views/modules/plugins/change/changedeath.vue

@ -84,8 +84,7 @@
<el-table class="m-table-item" <el-table class="m-table-item"
v-loading="dataListLoading" v-loading="dataListLoading"
:data="dataList" :data="dataList"
border border>
@selection-change="dataListSelectionChangeHandle">
<!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>--> <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
<el-table-column label="序号" <el-table-column label="序号"
type="index" type="index"
@ -150,16 +149,16 @@
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="170"> width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="handleLook(scope.row)" <el-button @click="handleLook(scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--blue">查看</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--blue">变更记录</el-button> class="div-table-button--blue">变更记录</el-button> -->
<!--<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>--> <!--<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>-->
<!--<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>--> <!--<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
<el-popconfirm v-if="scope.row.status !== '0'" <el-popconfirm v-if="scope.row.status !== '0'"

6
src/views/modules/plugins/change/resideath.vue

@ -281,11 +281,11 @@
</el-form-item> </el-form-item>
<el-form-item label="享受福利" <!-- <el-form-item label="享受福利"
prop="gridId" prop="gridId"
style="display: block"> style="display: block">
<el-checkbox v-model="welfareFlag"></el-checkbox> <el-checkbox v-model="welfareFlag"></el-checkbox>
</el-form-item> </el-form-item> -->
<el-form-item label="死亡日期" <el-form-item label="死亡日期"
prop="gridId" prop="gridId"
style="display: block"> style="display: block">
@ -301,7 +301,7 @@
</el-form> </el-form>
<div class="div_btn"> <div class="m-edit-btn">
<el-button size="small" <el-button size="small"
@click="blacklistVisible = false"> </el-button> @click="blacklistVisible = false"> </el-button>
<el-button type="primary" <el-button type="primary"

Loading…
Cancel
Save