From a5f77d26084d5b2565913966255f1a3a1c614d7c Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 29 Dec 2022 17:18:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=B1=85=E6=B0=91=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AFbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/management/edit-main.scss |  2 +-
 src/views/modules/base/community/community.vue    | 12 +++++++-----
 src/views/modules/base/community/roomDetail.vue   |  4 ++--
 src/views/modules/base/huji/immigration/edit.vue  |  4 ++--
 src/views/modules/plugins/change/changedeath.vue  |  9 ++++-----
 src/views/modules/plugins/change/resideath.vue    |  6 +++---
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss
index 69c2a4a4e..ee269f5c1 100644
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@@ -6,7 +6,7 @@
   margin-top: 30px;
 
   /deep/ .el-form-item{
-    margin-bottom:14px;
+    margin-bottom:19px;
   }
 
   //编辑框-普通form宽度
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index bdb5f6d73..3bf1e7f12 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -28,7 +28,13 @@
 
             <!-- <span v-if="data.level==='building'&&!data.showIcon"
                   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>
         </el-tree>
       </el-scrollbar>
@@ -399,11 +405,7 @@ export default {
 
   },
   computed: {
-    showIcon (showNum, level) {
 
-
-
-    },
     rowHeight () {
 
       return this.$store.state.inIframe ? this.clientHeight - 160 + this.iframeHeight + 'px' : this.clientHeight - 160 + 'px'
diff --git a/src/views/modules/base/community/roomDetail.vue b/src/views/modules/base/community/roomDetail.vue
index f1fd3453b..0d232f9f4 100644
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@@ -39,7 +39,7 @@
           <div class="m-info-prop">
             <span class="u-info-title u-info-title-100">联系方式：</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"
                        type="text"
                        class="div-table-button--blue"
@@ -50,7 +50,7 @@
           <div class="m-info-prop">
             <span class="u-info-title u-info-title-100">房主身份证：</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"
                        type="text"
                        class="div-table-button--blue"
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index dcf06904c..81806de9e 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -104,9 +104,9 @@
                     maxlength="30">
           </el-input>
           <div>
-            <el-checkbox v-model="fmData.isWelfare"
+            <!-- <el-checkbox v-model="fmData.isWelfare"
                          true-label="1"
-                         false-label="0">享受福利</el-checkbox>
+                         false-label="0">享受福利</el-checkbox> -->
 
             <template v-if="formType === 'edit'">
               <el-checkbox v-model="fmData.isCheck"
diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index c20d7772a..bf4e88a49 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -84,8 +84,7 @@
       <el-table class="m-table-item"
                 v-loading="dataListLoading"
                 :data="dataList"
-                border
-                @selection-change="dataListSelectionChangeHandle">
+                border>
         <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
         <el-table-column label="序号"
                          type="index"
@@ -150,16 +149,16 @@
                          fixed="right"
                          header-align="center"
                          align="center"
-                         width="170">
+                         width="140">
           <template slot-scope="scope">
             <el-button @click="handleLook(scope.row)"
                        type="text"
                        size="small"
                        class="div-table-button--blue">查看</el-button>
-            <el-button @click="handleChangeRecord(scope.row)"
+            <!-- <el-button @click="handleChangeRecord(scope.row)"
                        type="text"
                        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="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
             <el-popconfirm v-if="scope.row.status !== '0'"
diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index 11088e7c0..beeff894d 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -281,11 +281,11 @@
 
           </el-form-item>
 
-          <el-form-item label="享受福利"
+          <!-- <el-form-item label="享受福利"
                         prop="gridId"
                         style="display: block">
             <el-checkbox v-model="welfareFlag"></el-checkbox>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="死亡日期"
                         prop="gridId"
                         style="display: block">
@@ -301,7 +301,7 @@
 
         </el-form>
 
-        <div class="div_btn">
+        <div class="m-edit-btn">
           <el-button size="small"
                      @click="blacklistVisible = false">取 消</el-button>
           <el-button type="primary"