From e88aff7524d3b38c78a73e7f1923cf6ba70fa2a8 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 20 Jun 2024 15:39:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=9F=A5=E8=AF=A2=E6=88=BF?=
 =?UTF-8?q?=E5=B1=8B=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?,=E5=AF=BC=E5=85=A5=E6=8C=89=E9=92=AE=E5=8A=A0loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequ/chaxun.vue | 128 +++--------------------------
 1 file changed, 12 insertions(+), 116 deletions(-)

diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index d794ff48d..859d475b7 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -75,6 +75,7 @@
       <div class="header_btn">
         <el-button
               @click="handleExport"
+               :loading="btnLoading"
               type="primary"
               size="small"
               class="diy-button--white el-button--default"
@@ -122,91 +123,8 @@
               label="居民分类"
               align="center"
               :show-overflow-tooltip="true"
-            >
-              <template slot-scope="scope">
-                <template v-if="scope.row.categoryInfo">
-                  {{
-                    scope.row.categoryInfo.bereavedPersonFlag == 1
-                      ? "特扶人员 "
-                      : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.chronicDiseaseFlag == 1
-                      ? "慢病 "
-                      : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.dementedFlag == 1 ? "失智老人 " : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.disabilityFlag == 1 ? "残疾 " : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.disabledFlag == 1 ? "失能老人 " : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.emptyNesterFlag == 1
-                      ? "空巢老人 "
-                      : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.ensureHouseFlag == 1
-                      ? "保障房人员 "
-                      : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.fertileWomanFlag == 1
-                      ? "育龄妇女 "
-                      : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.floatingFlag == 1 ? "流动人口 " : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.liveAloneFlag == 1 ? "独居老人 " : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.oldPeopleFlag == 1 ? "老年人 " : ""
-                  }}
-                  {{ scope.row.categoryInfo.partyFlag == 1 ? "党员 " : "" }}
-                  {{
-                    scope.row.categoryInfo.petitionOfficerFlag == 1
-                      ? "信访人员 "
-                      : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.seriousIllnessFlag == 1
-                      ? "大病 "
-                      : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.specialCrowdFlag == 1
-                      ? "特殊人群 "
-                      : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.subsistenceAllowanceFlag == 1
-                      ? "低保人员 "
-                      : ""
-                  }}
-                  {{ scope.row.categoryInfo.tenantFlag == 1 ? "租户 " : "" }}
-                  {{
-                    scope.row.categoryInfo.unemployedFlag == 1 ? "失业 " : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.unitedFrontFlag == 1
-                      ? "统战人员 "
-                      : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.veteranFlag == 1 ? "退役军人 " : ""
-                  }}
-                  {{
-                    scope.row.categoryInfo.volunteerFlag == 1 ? "志愿者 " : ""
-                  }}
-                </template>
-              </template>
-            </el-table-column>
+              prop="categoryNameStr"
+            > </el-table-column>
             <el-table-column
               label="备注"
               align="center"
@@ -276,10 +194,10 @@
             </el-table-column>
             <el-table-column prop="buildingUnitName" label="单元号">
             </el-table-column>
-            <el-table-column prop="doorName" label="门牌号"> </el-table-column>
-            <el-table-column prop="houseType" label="类型"> </el-table-column>
-            <el-table-column prop="purpose" label="用途"> </el-table-column>
-            <el-table-column prop="rentFlag" label="房屋状态">
+            <el-table-column prop="houseName" label="门牌号"> </el-table-column>
+            <el-table-column prop="houseTypeName" label="类型"> </el-table-column>
+            <el-table-column prop="purposeName" label="用途"> </el-table-column>
+            <el-table-column prop="rentFlagName" label="房屋状态">
             </el-table-column>
             <el-table-column prop="ownerName" label="房主姓名">
             </el-table-column>
@@ -383,6 +301,7 @@ export default {
 
   data() {
     return {
+      btnLoading:false,
       searchStatus: "ini", //ing over
       searchData: {
         type: "fangwu",
@@ -515,6 +434,7 @@ export default {
   },
   methods: {
     async handleExport() {
+        this.btnLoading = true;
         const url = this.searchData.type === 'fangwu'?"/actual/base/communityHouse/houseSearchExport":'/actual/base/residentBaseInfo/residentSearchExport';
         axios({
           url: window.SITE_CONFIG["apiURL"] + url,
@@ -541,8 +461,10 @@ export default {
             aLink.click();
             document.body.removeChild(aLink); //下载完成移除元素
             window.URL.revokeObjectURL(url); //释放掉blob对象
+            this.btnLoading = false;
           })
           .catch((err) => {
+            this.btnLoading = false;
             return this.$message.error("网络错误");
           });
       },
@@ -764,34 +686,8 @@ export default {
       });
       this.searchFangwu.loading = false;
       if (code === 0) {
-        console.log("列表请求成功！！！！！！！！！！！！！！");
         this.searchFangwu.total = data.total || 0;
-        this.searchFangwu.list = data.list
-          ? data.list.map((item) => {
-              const { houseType, rentFlag, purpose } = item;
-              item.houseType = {
-                1: "楼房",
-                2: "平房",
-                3: "别墅",
-              }[houseType];
-              item.rentFlag = {
-                0: "自住",
-                1: "出租",
-                2: "闲置",
-                3: "未售出",
-              }[rentFlag];
-              item.purpose = {
-                1: "住宅",
-                2: "商业",
-                3: "办公",
-                4: "工业",
-                5: "存储",
-                6: "商住混用",
-                7: "其它",
-              }[purpose];
-              return item;
-            })
-          : [];
+        this.searchFangwu.list = data.list;
       } else {
       }
       this.getRulesList();