From 6dd2dd98b33df077d35af77b0179b66a7c8447be Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 29 Nov 2022 16:55:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E7=AE=A1=E7=90=86=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B411-29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/change/resiwelfare.vue      |  2 +-
 .../plugins/rent/rentcontractinfo-add-or-update.vue   |  4 ++--
 .../plugins/rent/rentcontractinfo-look-or-check.vue   |  8 +++++---
 src/views/modules/plugins/rent/rentcontractreview.vue | 11 +++++++----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/plugins/change/resiwelfare.vue b/src/views/modules/plugins/change/resiwelfare.vue
index 4b2d325b7..4e323498f 100644
--- a/src/views/modules/plugins/change/resiwelfare.vue
+++ b/src/views/modules/plugins/change/resiwelfare.vue
@@ -400,7 +400,7 @@ export default {
   },
   methods: {
     searchFilter (columnName) {
-      const filterName = [ 'NAME', 'MOBILE', 'ID_CARD' ]
+      const filterName = [ 'NAME', 'MOBILE', 'ID_CARD', 'IS_BDHJ' ]
       return filterName.some(item => {
         return item == columnName
       })
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index 0ca43f14d..bb50164b7 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -95,7 +95,7 @@
             </el-form-item>
             <br/>
             <el-form-item label="房主姓名" prop="ownerName">
-                <el-input v-model="dataForm.ownerName" placeholder="房主姓名" style="width: 210px;" disabled></el-input>
+                <el-input v-model="dataForm.ownerName" placeholder="房主姓名" style="width: 210px;"></el-input>
             </el-form-item>
 
         <div style="margin-left: 30px;height: 30px;font-weight: bold;">合同信息</div>
@@ -417,7 +417,7 @@ export default {
             { dictValue: '媳婿', dictName: '媳婿' },
             { dictValue: '孙子女', dictName: '孙子女' },
             { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
-            { dictValue: '中介', dictName: '中介' }
+            { dictValue: '其他', dictName: '其他' }
         ],
         checkVisible: false,
         disabledBtn: false,
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
index 4f651215a..36e556d40 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
@@ -136,8 +136,10 @@
     <template slot="footer">
         <div class="resi-btns">
         <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-        <el-button v-if="dataForm.state === '0'" type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>
-        <el-button v-if="dataForm.state === '0'" type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>
+        <!--<el-button v-if="dataForm.state === '0'" type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>-->
+        <!--<el-button v-if="dataForm.state === '0'" type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>-->
+            <el-button type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>
+            <el-button type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>
         </div>
     </template>
       <el-dialog :visible.sync="dialogVisible" :modal="false">
@@ -204,7 +206,7 @@ export default {
             { dictValue: '媳婿', dictName: '媳婿' },
             { dictValue: '孙子女', dictName: '孙子女' },
             { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
-            { dictValue: '中介', dictName: '中介' }
+            { dictValue: '其他', dictName: '其他' }
         ],
         checkReason: '',
         checkVisible: false,
diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue
index 9049969df..8a8366e8f 100644
--- a/src/views/modules/plugins/rent/rentcontractreview.vue
+++ b/src/views/modules/plugins/rent/rentcontractreview.vue
@@ -195,10 +195,13 @@
         <el-table-column prop="isBlack" label="是否黑名单人员" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'2')">登记</el-button>
-             <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button>
-            <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button v-else type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'1')">{{ $t('lookBtn') }}</el-button>
+            <!--<el-button v-if="scope.row.state === '0'" type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'2')">登记</el-button>-->
+            <!--<el-button v-if="scope.row.state === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button>-->
+            <!--<el-button v-if="scope.row.state === '0'" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
+            <!--<el-button v-else type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'1')">{{ $t('lookBtn') }}</el-button>-->
+            <el-button type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'2')">登记</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>