From b1f745a0020d711d50e0522beb9978ae4778d197 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 11 May 2022 14:02:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/plugins/rent/rentcontractinfo-add-or-update.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ab554ad7..05c44d9b 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog class="rent" :visible.sync="visible" :title="dataForm.flag === '1' ? '查看' : '审核'" :close-on-click-modal="false" :close-on-press-escape="false">
+  <el-dialog class="rent" :visible.sync="visible" :title="dataForm.flag === '1' ? '查看详情' : '审核'" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :inline="true" :model="dataForm" :rules="dataRule" ref="dataForm"
              @keyup.enter.native="dataFormSubmitHandle()" label-width="140px" disabled>
         <div v-if="dataForm.flag === '2'">

From 7f21cbca36ec6a1b6e17d9163f71effc4ac33ad7 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 11 May 2022 16:02:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/plugins/change/changedeath.vue    | 31 +++++++++++++++++++
 .../plugins/change/changerelocation.vue       |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index 965084d6..20ca3bc2 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -163,6 +163,37 @@ export default {
       peopleMore
   },
     methods: {
+      exportHandle () {
+        const url = this.mixinViewModuleOptions.exportURL
+
+         this.$http({
+          method: 'GET',
+          url,
+          responseType: 'blob',
+          data: this.formData
+        })
+                .then(res => {
+                  // this.download(res.data, title + '.xls')
+                  if (res.headers["content-disposition"]) {
+                    let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+                    console.log('filename', fileName)
+                    let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+                    var url = window.URL.createObjectURL(blob)
+                    var aLink = document.createElement('a')
+                    aLink.style.display = 'none'
+                    aLink.href = url
+                    aLink.setAttribute('download', fileName)
+                    document.body.appendChild(aLink)
+                    aLink.click()
+                    document.body.removeChild(aLink) //下载完成移除元素
+                    window.URL.revokeObjectURL(url) //释放掉blob对象
+                  } else this.$message.error('下载失败')
+                })
+                .catch(err => {
+                  console.log('err', err)
+                  return this.$message.error('网络错误')
+                })
+      },
         resetForm(formName) {
             for(const n in this.dataForm) {
                 this.dataForm[n] = ''
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index b5fc3f4e..608e42a4 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -169,6 +169,7 @@
         <el-table-column prop="name" label="姓名" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="agencyName" label="所属网格" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="oldAddress" label="所属房屋" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="ownerName" label="户主姓名" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="idCard" label="身份证号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="gender" label="性别" header-align="center" align="center" min-width="70" show-overflow-tooltip></el-table-column>
@@ -176,7 +177,6 @@
         <el-table-column prop="outOfTime" label="迁出时间" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="reason" label="迁出原因" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column prop="address" label="迁往何地" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="ownerName" label="户主姓名" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"