diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss index 19420ef94..cf7cc4fd6 100644 --- a/src/assets/scss/modules/management/detail-main.scss +++ b/src/assets/scss/modules/management/detail-main.scss @@ -15,7 +15,7 @@ margin: 10px 0; display: flex; - padding-left: 15px; + // padding-left: 15px; padding-top:10px; // border-bottom: 1px solid #d8d8d8; @@ -51,6 +51,10 @@ text-align: right; margin-right:8px; } + .u-info-title-80 { + flex: 0 0 80px; + + } .u-info-title-100 { 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; - width:50%; - } +//一行两列 +.m-detail-main-2row{ + display: flex; + justify-content: space-between; + + .m-info-2row{ + flex:0 0 1; + width:45%; } } diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index 101e97295..dd8a7f865 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -4,7 +4,7 @@ width: 100%; .m-search { - padding: 10px; + padding: 24px 10px 10px; // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); background: #FFFFFF; box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12); diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue index b06f2935a..fbb4a7fd3 100644 --- a/src/views/components/resiInfo.vue +++ b/src/views/components/resiInfo.vue @@ -11,7 +11,8 @@ -
本地户籍:
{{resiDetailObj.localResidenceFlag==1?'是':resiDetailObj.localResidenceFlag==0?'否':'--'}} +
本地户籍:
+ {{resiDetailObj.localResidenceFlag==1?'是':resiDetailObj.localResidenceFlag==0?'否':'--'}}
@@ -33,7 +34,9 @@ -
联系电话:
{{resiDetailObj.showMobile?resiDetailObj.showMobile:resiDetailObj.mobile?`${resiDetailObj.mobile.substr(0,3)}`+ "****" +`${resiDetailObj.mobile.substr(7,5)}`:'--'}}
+
联系电话:
+ {{resiDetailObj.showMobile?resiDetailObj.showMobile:resiDetailObj.mobile?`${resiDetailObj.mobile.substr(0,3)}`+ "****" +`${resiDetailObj.mobile.substr(7,5)}`:'--'}} +
显示 -
证件号:
{{resiDetailObj.showIdNum?resiDetailObj.showIdNum:resiDetailObj.idNum?`${resiDetailObj.idNum.substr(0, 11)}` +"******" +`${resiDetailObj.idNum.substr(16, 2)}`:'--'}}
+
证件号:
+
{{resiDetailObj.showIdNum?resiDetailObj.showIdNum:resiDetailObj.idNum?`${resiDetailObj.idNum.substr(0, 11)}` +"******" +`${resiDetailObj.idNum.substr(16, 2)}`:'--'}} +
-
备注:
{{resiDetailObj.remark?resiDetailObj.remark:'--'}}
- +
备注:
+
{{resiDetailObj.remark?resiDetailObj.remark:'--'}}
 -
分类信息
@@ -169,13 +173,13 @@
监护人:
- {{resiHealthInfonObj.guardianFlag?resiHealthInfonObj.guardianFlag==1?'有':'--':'无'}} + {{resiHealthInfonObj.guardianFlag==1?'有':resiHealthInfonObj.guardianFlag==0?'无':'--'}}
技能特长:
- {{resiHealthInfonObj.specialSkillFlag?resiHealthInfonObj.specialSkillFlag==1?'有':'--':'无'}} + {{resiHealthInfonObj.specialSkillFlag==1?'有':resiHealthInfonObj.specialSkillFlag==0?'无':'--'}}
@@ -184,13 +188,13 @@
劳动能力:
- {{resiHealthInfonObj.workCapacityFlag?resiHealthInfonObj.workCapacityFlag==1?'有':'--':'无'}} + {{resiHealthInfonObj.workCapacityFlag==1?'有':resiHealthInfonObj.workCapacityFlag==0?'无':'--'}}
非义务教育阶段助学:
- {{resiHealthInfonObj.voluntaryEducationFlag!=''?resiHealthInfonObj.voluntaryEducationFlag==1?'有':'--':'无'}} + {{resiHealthInfonObj.voluntaryEducationFlag==1?'有':resiHealthInfonObj.voluntaryEducationFlag==0?'无':'--'}}
@@ -254,7 +258,9 @@ {{resiHealthInfonObj?resiHealthInfonObj.deliveranceNum?resiHealthInfonObj.deliveranceNum:'--':'--'}}
- + + +
备注:
{{resiHealthInfonObj?resiHealthInfonObj.healthRemark?resiHealthInfonObj.healthRemark:'--':'--'}} @@ -369,7 +375,7 @@
有无赡养人 :
- {{residentFamilyInfoObj?residentFamilyInfoObj.elderlyFlag==1?'有':'--':'无'}} + {{residentFamilyInfoObj.elderlyFlag==1?'有':residentFamilyInfoObj.elderlyFlag==0?'无':'--'}}
@@ -662,7 +668,7 @@ - +
备注 :
{{residentVolunteerObj?residentVolunteerObj.volunteerRemark?residentVolunteerObj.volunteerRemark:'--':'--'}} diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index cd1c357fa..7bfc7107b 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -742,7 +742,7 @@ export default { } console.log( agencyIdTemp); this.$http - .post('/actual/base/communityQuarters/listQuartersOptions', { + .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: agencyIdTemp[1], agencyId: agencyIdTemp[0], // agencyId: user.agencyId @@ -761,8 +761,8 @@ export default { }, getBuildList() { this.$http - .post('/actual/base/communityBuilding/buildingoption', { - quartersId: this.form.villageId + .post('/gov/org/icbuilding/buildingoption', { + neighborHoodId: this.form.villageId }) .then(({ data: res }) => { if (res.code !== 0) { @@ -778,7 +778,7 @@ export default { }, getUniList() { this.$http - .post('/actual/base/communityBuildingUnit/unitoption', { + .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.form.buildId }) .then(({ data: res }) => { @@ -795,7 +795,7 @@ export default { }, getHouseList() { this.$http - .post('/actual/base/communityHouse/houseoption', { unitId: this.form.unitId }) + .post('/gov/org/ichouse/houseoption', { unitId: this.form.unitId }) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) diff --git a/src/views/modules/base/community/roomDetail.vue b/src/views/modules/base/community/roomDetail.vue index 4717052e3..11b2d6180 100644 --- a/src/views/modules/base/community/roomDetail.vue +++ b/src/views/modules/base/community/roomDetail.vue @@ -1,109 +1,99 @@ @@ -115,7 +105,7 @@ import { requestPost, requestGet } from "@/js/dai/request"; let loading; // 加载动画 export default { - data() { + data () { return { formType: "add", //表单操作类型 add新增，edit编辑，detail详情 btnDisable: false, @@ -149,26 +139,26 @@ export default { }; }, components: {}, - mounted() {}, + mounted () { }, methods: { - handleCancle() { + handleCancle () { this.$emit("diaDetailClose"); }, - diaDestroy() { + diaDestroy () { if (map) { map.destroy(); } }, - async initForm(row) { + async initForm (row) { this.houseId = row.houseId; await this.loadHouseInfo(); this.initLoading = true; }, - async handleTuomin(type) { + async handleTuomin (type) { const url = "/data/aggregator/epmetuser/detailByType"; const { data, code, msg } = await requestPost(url, { @@ -188,7 +178,7 @@ export default { } }, - async loadHouseInfo() { + async loadHouseInfo () { const url = "/actual/base/communityHouse/getHouseDeatilById/" + this.houseId; let params = {}; @@ -207,7 +197,7 @@ export default { } }, - resetData() { + resetData () { this.houseId = ""; //房屋ID this.houseType = "1"; this.purpose = "1"; @@ -229,7 +219,7 @@ export default { }; }, // 开启加载动画 - startLoading() { + startLoading () { loading = Loading.service({ lock: true, // 是否锁定 text: "正在加载……", // 加载中需要显示的文字 @@ -237,7 +227,7 @@ export default { }); }, // 结束加载动画 - endLoading() { + endLoading () { // clearTimeout(timer); if (loading) { loading.close(); @@ -245,7 +235,7 @@ export default { }, }, computed: { - dataRule() { + dataRule () { return { buildingUnitId: [ { required: true, message: "所属单元不能为空", trigger: "blur" }, diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index b5e91b7f6..a11e5f458 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -277,7 +277,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :title="'查看房屋'" - width="950px" + width="820px" top="5vh" class="dialog-h" @closed="detailFormCancle">