elink-star
/
epmet-work-pc
17
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into dev

V1.0
dai 3 years ago
parent
ef05a194c2 58bc237efc
commit
5da61ec607
6 changed files with 91 additions and 89 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. 24
      src/assets/scss/modules/management/detail-main.scss
  2. 2
      src/assets/scss/modules/management/list-main.scss
  3. 32
      src/views/components/resiInfo.vue
  4. 10
      src/views/components/resiSearch.vue
  5. 110
      src/views/modules/base/community/roomDetail.vue
  6. 2
      src/views/modules/base/community/roomTable.vue

24
src/assets/scss/modules/management/detail-main.scss
View File

@ -15,7 +15,7 @@
margin: 10px 0; margin: 10px 0;
display: flex; display: flex;
padding-left: 15px; // padding-left: 15px;
padding-top:10px; padding-top:10px;
// border-bottom: 1px solid #d8d8d8; // border-bottom: 1px solid #d8d8d8;
@ -51,6 +51,10 @@
text-align: right; text-align: right;
margin-right:8px; margin-right:8px;
} }
.u-info-title-80 {
flex: 0 0 80px;
}
.u-info-title-100 { .u-info-title-100 {
flex: 0 0 100px; flex: 0 0 100px;
@ -84,15 +88,17 @@
} }
} }
//一行两列
.m-detail-main-2row{ }
display: flex;
justify-content: space-between;
.m-info-2row{ //一行两列
flex:0 0 1; .m-detail-main-2row{
width:50%; display: flex;
} justify-content: space-between;
.m-info-2row{
flex:0 0 1;
width:45%;
} }
} }

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

@ -4,7 +4,7 @@
width: 100%; width: 100%;
.m-search { .m-search {
padding: 10px; padding: 24px 10px 10px;
// box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
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);

32
src/views/components/resiInfo.vue
View File

@ -11,7 +11,8 @@
</el-row> </el-row>
<el-row type="flex" justify="" class="f-m-top29" > <el-row type="flex" justify="" class="f-m-top29" >
<el-col :span="24" class="f-flex"> <el-col :span="24" class="f-flex">
<div class="f-label">本地户籍:</div> <div class="f-left8 f-font-color"> {{resiDetailObj.localResidenceFlag==1?'是':resiDetailObj.localResidenceFlag==0?'否':'--'}} <div class="f-label">本地户籍:</div> <div class="f-left8 f-font-color">
{{resiDetailObj.localResidenceFlag==1?'是':resiDetailObj.localResidenceFlag==0?'否':'--'}}
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -33,7 +34,9 @@
</el-row> </el-row>
<el-row type="flex" justify="" class="f-m-top29" > <el-row type="flex" justify="" class="f-m-top29" >
<el-col :span="12" class="f-flex"> <el-col :span="12" class="f-flex">
<div class="f-label">联系电话:</div> <div class="f-left8 f-font-color"> {{resiDetailObj.showMobile?resiDetailObj.showMobile:resiDetailObj.mobile?`${resiDetailObj.mobile.substr(0,3)}`+ "****" +`${resiDetailObj.mobile.substr(7,5)}`:'--'}} </div> <div class="f-label">联系电话:</div> <div class="f-left8 f-font-color">
{{resiDetailObj.showMobile?resiDetailObj.showMobile:resiDetailObj.mobile?`${resiDetailObj.mobile.substr(0,3)}`+ "****" +`${resiDetailObj.mobile.substr(7,5)}`:'--'}}
</div>
<el-button v-if="resiDetailObj.mobile" <el-button v-if="resiDetailObj.mobile"
style="margin-left: 10px" style="margin-left: 10px"
type="text" type="text"
@ -43,7 +46,9 @@
@click="handleTuomin('mobile')">显示</el-button> @click="handleTuomin('mobile')">显示</el-button>
</el-col> </el-col>
<el-col :span="12" class="f-flex"> <el-col :span="12" class="f-flex">
<div class="f-label">证件号: </div> <div class="f-left8 f-font-color"> {{resiDetailObj.showIdNum?resiDetailObj.showIdNum:resiDetailObj.idNum?`${resiDetailObj.idNum.substr(0, 11)}` +"******" +`${resiDetailObj.idNum.substr(16, 2)}`:'--'}}</div> <div class="f-label">证件号: </div>
<div class="f-left8 f-font-color">{{resiDetailObj.showIdNum?resiDetailObj.showIdNum:resiDetailObj.idNum?`${resiDetailObj.idNum.substr(0, 11)}` +"******" +`${resiDetailObj.idNum.substr(16, 2)}`:'--'}}
</div>
<el-button v-if="resiDetailObj.idNum" <el-button v-if="resiDetailObj.idNum"
style="margin-left: 10px" style="margin-left: 10px"
type="text" type="text"
@ -55,10 +60,9 @@
</el-row> </el-row>
<el-row type="flex" justify="" class="f-m-top29" > <el-row type="flex" justify="" class="f-m-top29" >
<el-col :span="24" class="f-flex"> <el-col :span="24" class="f-flex">
<div class="f-label">备注:</div> <div class="f-left8 f-font-color">{{resiDetailObj.remark?resiDetailObj.remark:'--'}}</div> <div class="f-label">备注:</div>
<div class="f-left8 f-font-color">{{resiDetailObj.remark?resiDetailObj.remark:'--'}}</div>
</el-col> </el-col>
</el-row> </el-row>
<div class=" title-small title_postion f-top40" >分类信息 </div> <div class=" title-small title_postion f-top40" >分类信息 </div>
<el-row class="f-m-top29"> <el-row class="f-m-top29">
@ -169,13 +173,13 @@
<el-col :span="8"> <el-col :span="8">
<div class="f-flex f-bto16 f-top24"> <div class="f-flex f-bto16 f-top24">
<div class="f-labels">监护人:</div> <div class="f-labels">监护人:</div>
<span class="f-left8 f-font-color">{{resiHealthInfonObj.guardianFlag?resiHealthInfonObj.guardianFlag==1?'有':'--':'无'}}</span> <span class="f-left8 f-font-color">{{resiHealthInfonObj.guardianFlag==1?'有':resiHealthInfonObj.guardianFlag==0?'无':'--'}}</span>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="f-flex f-bto16 f-top24"> <div class="f-flex f-bto16 f-top24">
<div class="f-labels">技能特长:</div> <div class="f-labels">技能特长:</div>
<span class="f-left8 f-font-color">{{resiHealthInfonObj.specialSkillFlag?resiHealthInfonObj.specialSkillFlag==1?'有':'--':'无'}}</span> <span class="f-left8 f-font-color">{{resiHealthInfonObj.specialSkillFlag==1?'有':resiHealthInfonObj.specialSkillFlag==0?'无':'--'}}</span>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -184,13 +188,13 @@
<el-col :span="8"> <el-col :span="8">
<div class="f-flex f-bto16 f-top24"> <div class="f-flex f-bto16 f-top24">
<div class="f-labels">劳动能力:</div> <div class="f-labels">劳动能力:</div>
<span class="f-left8 f-font-color">{{resiHealthInfonObj.workCapacityFlag?resiHealthInfonObj.workCapacityFlag==1?'有':'--':'无'}}</span> <span class="f-left8 f-font-color">{{resiHealthInfonObj.workCapacityFlag==1?'有':resiHealthInfonObj.workCapacityFlag==0?'无':'--'}}</span>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="f-flex f-bto16 f-top24"> <div class="f-flex f-bto16 f-top24">
<div class="f-labels">非义务教育阶段助学:</div> <div class="f-labels">非义务教育阶段助学:</div>
<span class="f-left8 f-font-color">{{resiHealthInfonObj.voluntaryEducationFlag!=''?resiHealthInfonObj.voluntaryEducationFlag==1?'有':'--':'无'}}</span> <span class="f-left8 f-font-color">{{resiHealthInfonObj.voluntaryEducationFlag==1?'有':resiHealthInfonObj.voluntaryEducationFlag==0?'无':'--'}}</span>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -254,7 +258,9 @@
<span class="f-left8 f-font-color">{{resiHealthInfonObj?resiHealthInfonObj.deliveranceNum?resiHealthInfonObj.deliveranceNum:'--':'--'}}</span> <span class="f-left8 f-font-color">{{resiHealthInfonObj?resiHealthInfonObj.deliveranceNum?resiHealthInfonObj.deliveranceNum:'--':'--'}}</span>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> </el-row>
<el-row>
<el-col :span="24">
<div class="f-flex f-bto16 f-top24"> <div class="f-flex f-bto16 f-top24">
<div class="f-labels">备注:</div> <div class="f-labels">备注:</div>
<span class="f-left8 f-font-color">{{resiHealthInfonObj?resiHealthInfonObj.healthRemark?resiHealthInfonObj.healthRemark:'--':'--'}}</span> <span class="f-left8 f-font-color">{{resiHealthInfonObj?resiHealthInfonObj.healthRemark?resiHealthInfonObj.healthRemark:'--':'--'}}</span>
@ -369,7 +375,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="f-flex f-bto16 f-top24"> <div class="f-flex f-bto16 f-top24">
<div class="f-labels">有无赡养人 :</div> <div class="f-labels">有无赡养人 :</div>
<span class="f-left8 f-font-color">{{residentFamilyInfoObj?residentFamilyInfoObj.elderlyFlag==1?'有':'--':'无'}}</span> <span class="f-left8 f-font-color">{{residentFamilyInfoObj.elderlyFlag==1?'有':residentFamilyInfoObj.elderlyFlag==0?'无':'--'}}</span>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -662,7 +668,7 @@
</span> </span>
</section> </section>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="24">
<div class="f-flex f-bto16 f-top24"> <div class="f-flex f-bto16 f-top24">
<div class="f-labels">备注 :</div> <div class="f-labels">备注 :</div>
<span class="f-left8 f-font-color">{{residentVolunteerObj?residentVolunteerObj.volunteerRemark?residentVolunteerObj.volunteerRemark:'--':'--'}}</span> <span class="f-left8 f-font-color">{{residentVolunteerObj?residentVolunteerObj.volunteerRemark?residentVolunteerObj.volunteerRemark:'--':'--'}}</span>

10
src/views/components/resiSearch.vue
View File

@ -742,7 +742,7 @@ export default {
} }
console.log( agencyIdTemp); console.log( agencyIdTemp);
this.$http this.$http
.post('/actual/base/communityQuarters/listQuartersOptions', { .post('/gov/org/icneighborhood/neighborhoodoption', {
gridId: agencyIdTemp[1], gridId: agencyIdTemp[1],
agencyId: agencyIdTemp[0], agencyId: agencyIdTemp[0],
// agencyId: user.agencyId // agencyId: user.agencyId
@ -761,8 +761,8 @@ export default {
}, },
getBuildList() { getBuildList() {
this.$http this.$http
.post('/actual/base/communityBuilding/buildingoption', { .post('/gov/org/icbuilding/buildingoption', {
quartersId: this.form.villageId neighborHoodId: this.form.villageId
}) })
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
@ -778,7 +778,7 @@ export default {
}, },
getUniList() { getUniList() {
this.$http this.$http
.post('/actual/base/communityBuildingUnit/unitoption', { .post('/gov/org/icbuildingunit/unitoption', {
buildingId: this.form.buildId buildingId: this.form.buildId
}) })
.then(({ data: res }) => { .then(({ data: res }) => {
@ -795,7 +795,7 @@ export default {
}, },
getHouseList() { getHouseList() {
this.$http this.$http
.post('/actual/base/communityHouse/houseoption', { unitId: this.form.unitId }) .post('/gov/org/ichouse/houseoption', { unitId: this.form.unitId })
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)

110
src/views/modules/base/community/roomDetail.vue
View File

@ -1,109 +1,99 @@
<template> <template>
<div> <div>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<div v-if="initLoading" class="m-detail-main m-detail-main-2row"> <div v-if="initLoading"
class="m-detail-main m-detail-main-2row">
<div class="m-info-2row"> <div class="m-info-2row">
<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-80">所属楼栋：</span>
<span <span>{{ dataForm.neighborHoodName }}-{{ dataForm.buildingName }}</span>
>{{ dataForm.neighborHoodName }}-{{ dataForm.buildingName }}</span
>
</div> </div>
<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-80">单元号：</span>
<span>{{ dataForm.unitName ? dataForm.unitName : "--" }}</span> <span>{{ dataForm.unitName ? dataForm.unitName : "--" }}</span>
</div> </div>
<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-80">门牌号：</span>
<span>{{ dataForm.doorName }}</span> <span>{{ dataForm.doorName }}</span>
</div> </div>
<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-80">房屋类型：</span>
<span>{{ <span>{{
dataForm.houseTypeName ? dataForm.houseTypeName : "--" dataForm.houseTypeName ? dataForm.houseTypeName : "--"
}}</span> }}</span>
</div> </div>
<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-80">房屋用途：</span>
<span>{{ <span>{{
dataForm.purposeName ? dataForm.purposeName : "--" dataForm.purposeName ? dataForm.purposeName : "--"
}}</span> }}</span>
</div> </div>
<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-80">房屋状态：</span>
<span>{{ dataForm.rentName ? dataForm.rentName : "--" }}</span> <span>{{ dataForm.rentName ? dataForm.rentName : "--" }}</span>
</div> </div>
<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-80">房主姓名：</span>
<span>{{ dataForm.ownerName ? dataForm.ownerName : "--" }}</span> <span>{{ dataForm.ownerName ? dataForm.ownerName : "--" }}</span>
</div> </div>
<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-80">联系电话：</span>
<span class="info-mingan">{{ <span class="info-mingan">{{
dataForm.showOwnerPhone ? dataForm.showOwnerPhone : "--" dataForm.showOwnerPhone ? dataForm.showOwnerPhone : "--"
}}</span> }}</span>
<el-button <el-button v-if="view_real_data && dataForm.showOwnerPhone"
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" icon="el-icon-view"
icon="el-icon-view" size="small"
size="small" @click="handleTuomin('phone')">显示</el-button>
@click="handleTuomin('phone')"
>显示</el-button
>
</div> </div>
<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-80">证件号：</span>
<span class="info-mingan">{{ <span class="info-mingan">{{
dataForm.showOwnerIdCard ? dataForm.showOwnerIdCard : "--" dataForm.showOwnerIdCard ? dataForm.showOwnerIdCard : "--"
}}</span> }}</span>
<el-button <el-button v-if="view_real_data && dataForm.showOwnerIdCard"
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" icon="el-icon-view"
icon="el-icon-view" size="small"
size="small" @click="handleTuomin('idcard')">显示</el-button>
@click="handleTuomin('idcard')"
>显示</el-button
>
</div> </div>
<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-80">备注：</span>
<span>{{ dataForm.remark ? dataForm.remark : "--" }}</span> <span>{{ dataForm.remark ? dataForm.remark : "--" }}</span>
</div> </div>
</div> </div>
<div class="m-info-2row"> <div class="m-info-2row">
<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-80">房屋编码：</span>
<span>{{ dataForm.coding ? dataForm.coding : "--" }}</span> <span>{{ dataForm.coding ? dataForm.coding : "--" }}</span>
</div> </div>
<div v-if="dataForm.houseQrcodeUrl" class="m-info-prop"> <div v-if="dataForm.houseQrcodeUrl"
<span class="u-info-title u-info-title-100">二维码：</span> class="m-info-prop">
<span class="u-info-title u-info-title-80">二维码：</span>
<div style="display: flex; flex-direction: column"> <div style="display: flex; flex-direction: column">
<img <img style="margin-left: 0; width: 150px"
style="margin-left: 20px; width: 150px" :src="dataForm.houseQrcodeUrl" />
:src="dataForm.houseQrcodeUrl" <a style="margin-left: 0; margin-top: 20px"
/> class="div-table-button--blue"
<a :href="dataForm.houseQrcodeUrl"
style="margin-left: 30px; margin-top: 20px" target="_blank"><i class="el-icon-download"></i>下载</a>
class="div-table-button--blue"
:href="dataForm.houseQrcodeUrl"
target="_blank"
><i class="el-icon-download"></i>下载</a
>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="m-detail-btn"> <div class="m-detail-btn">
<el-button size="small" @click="handleCancle">关 闭</el-button> <el-button size="small"
@click="handleCancle">关 闭</el-button>
</div> </div>
</div> </div>
</template> </template>
@ -115,7 +105,7 @@ import { requestPost, requestGet } from "@/js/dai/request";
let loading; // 加载动画 let loading; // 加载动画
export default { export default {
data() { data () {
return { return {
formType: "add", //表单操作类型 add新增，edit编辑，detail详情 formType: "add", //表单操作类型 add新增，edit编辑，detail详情
btnDisable: false, btnDisable: false,
@ -149,26 +139,26 @@ export default {
}; };
}, },
components: {}, components: {},
mounted() {}, mounted () { },
methods: { methods: {
handleCancle() { handleCancle () {
this.$emit("diaDetailClose"); this.$emit("diaDetailClose");
}, },
diaDestroy() { diaDestroy () {
if (map) { if (map) {
map.destroy(); map.destroy();
} }
}, },
async initForm(row) { async initForm (row) {
this.houseId = row.houseId; this.houseId = row.houseId;
await this.loadHouseInfo(); await this.loadHouseInfo();
this.initLoading = true; this.initLoading = true;
}, },
async handleTuomin(type) { async handleTuomin (type) {
const url = "/data/aggregator/epmetuser/detailByType"; const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
@ -188,7 +178,7 @@ export default {
} }
}, },
async loadHouseInfo() { async loadHouseInfo () {
const url = const url =
"/actual/base/communityHouse/getHouseDeatilById/" + this.houseId; "/actual/base/communityHouse/getHouseDeatilById/" + this.houseId;
let params = {}; let params = {};
@ -207,7 +197,7 @@ export default {
} }
}, },
resetData() { resetData () {
this.houseId = ""; //房屋ID this.houseId = ""; //房屋ID
this.houseType = "1"; this.houseType = "1";
this.purpose = "1"; this.purpose = "1";
@ -229,7 +219,7 @@ export default {
}; };
}, },
// 开启加载动画 // 开启加载动画
startLoading() { startLoading () {
loading = Loading.service({ loading = Loading.service({
lock: true, // 是否锁定 lock: true, // 是否锁定
text: "正在加载……", // 加载中需要显示的文字 text: "正在加载……", // 加载中需要显示的文字
@ -237,7 +227,7 @@ export default {
}); });
}, },
// 结束加载动画 // 结束加载动画
endLoading() { endLoading () {
// clearTimeout(timer); // clearTimeout(timer);
if (loading) { if (loading) {
loading.close(); loading.close();
@ -245,7 +235,7 @@ export default {
}, },
}, },
computed: { computed: {
dataRule() { dataRule () {
return { return {
buildingUnitId: [ buildingUnitId: [
{ required: true, message: "所属单元不能为空", trigger: "blur" }, { required: true, message: "所属单元不能为空", trigger: "blur" },

2
src/views/modules/base/community/roomTable.vue
View File

@ -277,7 +277,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:title="'查看房屋'" :title="'查看房屋'"
width="950px" width="820px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="detailFormCancle"> @closed="detailFormCancle">

Write Preview
Loading…
Cancel
Save