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 1/2] =?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 2/2] =?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: {