From 51baaf76c91832bf078a9083a109c4b6c43880bf Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 12 May 2022 14:51:37 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=A6=8F=E5=88=A9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/change/changewelfare.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index 901e61583..0a25cf0c1 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -75,7 +75,15 @@
         </el-table-column>
         <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gender" label="性别" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gender" label="性别" header-align="center" align="center">
+          <template slot-scope="scope">
+            {{
+            scope.row.gender == '2'
+            ? "保密"
+            : scope.row.gender
+            }}
+          </template>
+        </el-table-column>
         <!--<el-table-column prop="type" label="类型" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="joinDate" label="加入时间" header-align="center" align="center"></el-table-column>
         <!--<el-table-column prop="joinReason" label="加入原因" header-align="center" align="center"></el-table-column>-->
@@ -192,6 +200,10 @@ export default {
             }else{
                 this.lookInfo.gridName = ''
             }
+            if(row.userId === '' || row.userId === null){
+                this.$message.error('未查询到该用户的相关信息')
+                return false
+            }
             this.lookInfo.userId = row.userId
             this.showedPeopleMoreInfo = true
         },

From ddac35d42e20c7a2ac3708f91dc71d391ececd9c Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 12 May 2022 15:34:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=AB=E5=88=B0=E6=9C=9F=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/plugins/rent/rentcontractinfo.vue | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue
index 229785c2d..aaa68df24 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo.vue
@@ -112,14 +112,13 @@
           <el-form-item label="承租人" label-width="100px">
               <el-input v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
           </el-form-item>
-        <el-form-item label="承租人身份证" label-width="100px">
-          <el-input v-model="dataForm.lesseeIdCard" placeholder='承租人身份证' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
-        </el-form-item>
-        <el-form-item label="承租人手机号" label-width="100px">
-          <el-input v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
-        </el-form-item>
-        <br/>
-
+          <el-form-item label="承租人身份证" label-width="100px">
+            <el-input v-model="dataForm.lesseeIdCard" placeholder='承租人身份证' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
+          </el-form-item>
+          <el-form-item label="承租人手机号" label-width="100px">
+            <el-input v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
+          </el-form-item>
+          <br/>
           <el-form-item label="合同到期时间" prop="endDate" label-width="100px">
               <el-select v-model="dataForm.endDate" placeholder="合同到期时间" clearable>
                   <el-option v-for="item in endDateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
@@ -155,7 +154,8 @@
       </el-form>
       </el-card>
       <el-card class="resi-card-table">
-      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%" :row-class-name="tableRowClassName">
         <el-table-column label="序号" header-align="center" align="center" width="50px">
           <template slot-scope="scope">
             {{scope.$index+1}}
@@ -167,9 +167,6 @@
             {{scope.row.villageName}}{{scope.row.buildName}}{{scope.row.unitName}}{{scope.row.homeName}}
           </template>
         </el-table-column>
-<!--        <el-table-column prop="buildName" label="楼号" header-align="center" align="center"></el-table-column>-->
-<!--        <el-table-column prop="unitName" label="单元" header-align="center" align="center"></el-table-column>-->
-<!--        <el-table-column prop="homeName" label="房屋" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="lessorName" label="出租人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="lessorMobile" label="手机号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="lesseeName" label="承租人" header-align="center" align="center"></el-table-column>
@@ -279,6 +276,21 @@ export default {
     }
   },
   methods: {
+      tableRowClassName({row, rowIndex}) {
+          var endDate = row.endDate
+          var days = this.divTime(new Date(),endDate)
+          if (days <= 30) {
+              return 'warning-row';
+          }
+          return '';
+      },
+      // 计算两时间相差天数
+      divTime(startTime,endTime){
+          startTime = Date.parse(new Date(startTime))
+          endTime = Date.parse(new Date(endTime))
+          return Math.abs(parseInt((endTime - startTime) / 1000 / 3600 / 24));
+
+      },
       // 新增 / 修改
       addOrUpdateHandle (id,flag) {
           this.addOrUpdateVisible = true
@@ -494,3 +506,9 @@ export default {
     white-space: nowrap;
   }
 </style>
+
+<style>
+  .el-table .warning-row {
+    background: #ffe168;
+  }
+</style>

From 7dab76aa2dff93e73f169301eaa74a20493ea2e3 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 12 May 2022 17:00:27 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=81=E5=87=BA?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiChangeTransfer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index 3af132781..1990c3e19 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -16,7 +16,7 @@
         <el-form-item label="姓名"
                       label-width="150px"
                       style="display: block">
-          <span>{{ dataForm.ownerName }}</span>
+          <span>{{ dataForm.name }}</span>
         </el-form-item>
 
           <el-form-item label="迁出时间" prop="outOfTime" label-width="150px">

From 471f028aaad5ebb0cfeda8a5a30ffae3474b1f4b Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 12 May 2022 17:39:55 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=BF=81=E5=87=BA=E3=80=81=E6=AD=BB?=
 =?UTF-8?q?=E4=BA=A1=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E4=BA=AB=E5=8F=97?=
 =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/plugins/change/changedeath.vue    | 18 ++++++++++--
 .../plugins/change/changerelocation.vue       | 29 +++++++++++++------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index d71363517..ebd62669a 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -2,7 +2,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentDeath} resi-container">
       <el-card ref="searchCard" class="search-card">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
         <el-form-item label="姓名"
                       prop="name">
           <el-input v-model="dataForm.name"
@@ -30,6 +30,13 @@
                     placeholder="请输入手机">
           </el-input>
         </el-form-item>
+        <br/>
+        <el-form-item label="享受福利" prop="isWelfare">
+          <el-select v-model="dataForm.isWelfare" placeholder="请选择" clearable>
+            <el-option v-for="item in isWelfareArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="死亡时间"
                       prop="startTime">
           <el-date-picker v-model="timeRange"
@@ -142,14 +149,19 @@ export default {
         timeRange: '',
       dataForm: {
         id: '',
-          name: ''
+        name: '',
+        isWelfare: ''
       },
         // 显示人员详情
         showedPeopleMoreInfo: false,
         lookInfo: {
             userId: '',
             gridName: ''
-        }
+        },
+        isWelfareArr: [
+            { dictValue: '0', dictName: '否' },
+            { dictValue: '1', dictName: '是' }
+        ]
     }
   },
     watch: {
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index d6181065b..6967ec58b 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -128,6 +128,12 @@
           </el-input>
         </el-form-item>
         <br/>
+        <el-form-item label="享受福利" prop="isWelfare">
+          <el-select v-model="dataForm.isWelfare" placeholder="请选择" clearable>
+            <el-option v-for="item in isWelfareArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="迁出时间"
                       prop="startTime">
           <el-date-picker v-model="timeRange"
@@ -226,21 +232,26 @@ export default {
         optionsG: [],
       dataForm: {
         id: '',
-          name: '',
-          mobile: '',
-          idCard: '',
-          gridId: '',
-          villageId: '',
-          buildId: '',
-          unitId: '',
-          homeId: '',
+        name: '',
+        mobile: '',
+        idCard: '',
+        gridId: '',
+        villageId: '',
+        buildId: '',
+        unitId: '',
+        homeId: '',
+        isWelfare: ''
       },
         // 显示人员详情
         showedPeopleMoreInfo: false,
         lookInfo: {
             userId: '',
             gridName: ''
-        }
+        },
+        isWelfareArr: [
+            { dictValue: '0', dictName: '否' },
+            { dictValue: '1', dictName: '是' }
+        ]
     }
   },
   components: {