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

3 years ago · 5da61ec607
6 changed files with 91 additions and 89 deletions
--- 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,6 +88,9 @@
    }
  }

+  
+}
+
 //一行两列
 .m-detail-main-2row{
  display: flex;
@ -91,8 +98,7 @@

  .m-info-2row{
    flex:0 0 1;
-      width:50%;
-    }
+    width:45%;
  }
 }

--- 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);
--- a/src/views/components/resiInfo.vue
+++ b/src/views/components/resiInfo.vue
@ -11,7 +11,8 @@
         </el-row>
         <el-row type="flex" justify=""  class="f-m-top29" >
             <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>
             </el-col>
         </el-row>
@ -33,7 +34,9 @@
         </el-row>
         <el-row type="flex" justify=""  class="f-m-top29" >
             <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"
                         style="margin-left: 10px"
                         type="text"
@ -43,7 +46,9 @@
                         @click="handleTuomin('mobile')">显示</el-button>
             </el-col>
             <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"
                         style="margin-left: 10px"
                         type="text"
@ -55,10 +60,9 @@
         </el-row>
         <el-row type="flex" justify=""  class="f-m-top29" >
             <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-row>
         <div class=" title-small title_postion f-top40" >分类信息 </div>
           <el-row class="f-m-top29">
@ -169,13 +173,13 @@
                              <el-col :span="8">
                                <div class="f-flex f-bto16 f-top24">
                                   <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>
                              </el-col>
                              <el-col :span="8">
                                <div class="f-flex f-bto16 f-top24">
                                   <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>
                              </el-col>
                          </el-row>
@ -184,13 +188,13 @@
                              <el-col :span="8">
                                <div class="f-flex f-bto16 f-top24">
                                   <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>
                              </el-col>
                              <el-col :span="8">
                                <div class="f-flex f-bto16 f-top24">
                                   <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>
                              </el-col>
                              <el-col :span="8">
@ -254,7 +258,9 @@
                                   <span class="f-left8 f-font-color">{{resiHealthInfonObj?resiHealthInfonObj.deliveranceNum?resiHealthInfonObj.deliveranceNum:'--':'--'}}</span> 
                                </div>
                              </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-labels">备注:</div>  
                                   <span class="f-left8 f-font-color">{{resiHealthInfonObj?resiHealthInfonObj.healthRemark?resiHealthInfonObj.healthRemark:'--':'--'}}</span> 
@ -369,7 +375,7 @@
                              <el-col :span="8">
                                <div class="f-flex f-bto16 f-top24">
                                   <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>
                              </el-col>
                              <el-col :span="8">
@ -662,7 +668,7 @@
                               </span>
                         </section>
                        <el-row>
-                              <el-col :span="8">
+                              <el-col :span="24">
                                <div class="f-flex f-bto16 f-top24">
                                   <div class="f-labels">备注 :</div>  
                                <span class="f-left8 f-font-color">{{residentVolunteerObj?residentVolunteerObj.volunteerRemark?residentVolunteerObj.volunteerRemark:'--':'--'}}</span> 
--- 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)
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@ -1,109 +1,99 @@
 <template>
  <div>
    <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-prop">
-            <span class="u-info-title u-info-title-100">所属楼栋：</span>
-            <span
-              >{{ dataForm.neighborHoodName }}-{{ dataForm.buildingName }}</span
-            >
+            <span class="u-info-title u-info-title-80">所属楼栋：</span>
+            <span>{{ dataForm.neighborHoodName }}-{{ dataForm.buildingName }}</span>
          </div>

          <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>
          </div>

          <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>
          </div>

          <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.houseTypeName ? dataForm.houseTypeName : "--"
            }}</span>
          </div>
          <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.purposeName ? dataForm.purposeName : "--"
            }}</span>
          </div>
          <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>
          </div>
          <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>
          </div>
          <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">{{
              dataForm.showOwnerPhone ? dataForm.showOwnerPhone : "--"
            }}</span>
-            <el-button
-              v-if="view_real_data && dataForm.showOwnerPhone"
+            <el-button v-if="view_real_data && dataForm.showOwnerPhone"
                       style="margin-left: 10px"
                       type="text"
                       class="div-table-button--blue"
                       icon="el-icon-view"
                       size="small"
-              @click="handleTuomin('phone')"
-              >显示</el-button
-            >
+                       @click="handleTuomin('phone')">显示</el-button>
          </div>
          <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">{{
              dataForm.showOwnerIdCard ? dataForm.showOwnerIdCard : "--"
            }}</span>
-            <el-button
-              v-if="view_real_data && dataForm.showOwnerIdCard"
+            <el-button v-if="view_real_data && dataForm.showOwnerIdCard"
                       style="margin-left: 10px"
                       type="text"
                       class="div-table-button--blue"
                       icon="el-icon-view"
                       size="small"
-              @click="handleTuomin('idcard')"
-              >显示</el-button
-            >
+                       @click="handleTuomin('idcard')">显示</el-button>
          </div>
          <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>
          </div>
        </div>

        <div class="m-info-2row">
          <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>
          </div>
-          <div v-if="dataForm.houseQrcodeUrl" class="m-info-prop">
-            <span class="u-info-title u-info-title-100">二维码：</span>
+          <div v-if="dataForm.houseQrcodeUrl"
+               class="m-info-prop">
+            <span class="u-info-title u-info-title-80">二维码：</span>
            <div style="display: flex; flex-direction: column">
-              <img
-                style="margin-left: 20px; width: 150px"
-                :src="dataForm.houseQrcodeUrl"
-              />
-              <a
-                style="margin-left: 30px; margin-top: 20px"
+              <img style="margin-left: 0; width: 150px"
+                   :src="dataForm.houseQrcodeUrl" />
+              <a style="margin-left: 0; margin-top: 20px"
                 class="div-table-button--blue"
                 :href="dataForm.houseQrcodeUrl"
-                target="_blank"
-                ><i class="el-icon-download"></i>下载</a
-              >
+                 target="_blank"><i class="el-icon-download"></i>下载</a>
            </div>
          </div>
        </div>
      </div>
    </div>
    <div class="m-detail-btn">
-      <el-button size="small" @click="handleCancle">关 闭</el-button>
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
    </div>
  </div>
 </template>
--- 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">