From c5d24bc2fdee2e6978a3070402fdef6e9858dc81 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 11 May 2022 09:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AD=BB=E4=BA=A1=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/change/changedeath.vue |  2 +-
 src/views/modules/plugins/change/resideath.vue   | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index 33161588..965084d6 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -85,7 +85,7 @@
             <!--}}-->
           <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column prop="joinDate" label="死亡时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deathDate" label="死亡时间" header-align="center" align="center"></el-table-column>
         <!--<el-table-column prop="joinReason" label="加入原因" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="removeDate" label="移除时间" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="removeReason" label="移除原因" header-align="center" align="center"></el-table-column>-->
diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index 06b0f274..b859d42f 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -267,6 +267,17 @@
         <br/>
       </div>
       <el-checkbox v-model="welfareFlag">享受福利</el-checkbox>
+      <div>
+        <br/>
+      </div>
+      <el-date-picker v-model="deathDate"
+                      type="date"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      format="yyyy-MM-dd"
+                      placeholder="请选择死亡日期"
+                      style="width:200px"
+                      :clearable="false">
+      </el-date-picker>
       <span slot="footer" class="dialog-footer">
         <el-button @click="blacklistVisible = false">取 消</el-button>
         <el-button type="primary" @click="confirmJoinDeathlist">确 定</el-button>
@@ -348,6 +359,7 @@ export default {
       blacklistReason: '', // 加入黑名单原因
       welfareFlag: false,
       rowData: {}, // 加入黑名单的人员信息
+        deathDate: ''
     }
   },
   props: {
@@ -427,7 +439,8 @@ export default {
         type: '1',
         userId: this.rowData.icResiUserId,
         joinReason: this.blacklistReason,
-        welfareFlag: this.welfareFlag
+        welfareFlag: this.welfareFlag,
+          deathDate: this.deathDate
       }
       this.$http.post('/epmetuser/rentDeath/save', params).then(({ data: res }) => {
         if (res.code !== 0) {