From 544b480d4ce3f89d19b4a1a7310d3b3d90438d46 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 31 Aug 2023 17:24:16 +0800
Subject: [PATCH] =?UTF-8?q?bug#488=20=E5=85=9A=E7=BB=84=E7=BB=87=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E9=97=AE=E9=A2=98,=E5=85=9A=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../housingNature/housingNature.vue           |   2 +-
 .../resiDisability/resiDisability.vue         |   2 -
 .../subsistenceAllowance.vue                  |   4 +-
 .../base/residentManagement/tefu/tefuList.vue |   2 +-
 .../unemployment/unemployment.vue             |   4 +-
 .../residentManagement/veteran/veteran.vue    |   2 +-
 .../volunteer/volunteer.vue                   |   2 +-
 .../communityParty/members/memberList.vue     | 324 +++++++++---------
 .../communityParty/partyOrg/create.vue        |   6 -
 9 files changed, 178 insertions(+), 170 deletions(-)

diff --git a/src/views/modules/base/residentManagement/housingNature/housingNature.vue b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
index 5098a7cf0..10ec1f5e7 100644
--- a/src/views/modules/base/residentManagement/housingNature/housingNature.vue
+++ b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
@@ -611,7 +611,7 @@ export default {
       let url = "/actual/base/resiCategorized/ensureHouse/downloadImportTemplate";
       let params = {};
       await this.$http({
-        method: "POST",
+        method: "get",
         url,
         responseType: "blob",
         data: params,
diff --git a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
index 52364c49c..80230c63b 100644
--- a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
+++ b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
@@ -198,7 +198,6 @@
 
       <div class="m-table">
         <div class="div_btn">
-          <div class="div_btn_left">
             <el-button
               size="small"
               @click="handleAdd"
@@ -206,7 +205,6 @@
               icon="el-icon-plus"
               >新增</el-button
             >
-          </div>
           <el-button
             @click="handleExport"
             type="primary"
diff --git a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
index 94f756c77..c6bd8da4e 100644
--- a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
+++ b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
@@ -654,10 +654,10 @@
       },
       // 下载模板
       async handleExportModule() {
-        let url = "/actual/base/resiCategorized/resiSubsistenceAllowance/downloadImportTemplate";
+        let url = "/actual/base/resiCategorized/subsistenceAllowance/downloadImportTemplate";
         let params = {};
         await this.$http({
-          method: "POST",
+          method: "get",
           url,
           responseType: "blob",
           data: params,
diff --git a/src/views/modules/base/residentManagement/tefu/tefuList.vue b/src/views/modules/base/residentManagement/tefu/tefuList.vue
index b9f392a9a..63b84fdf4 100644
--- a/src/views/modules/base/residentManagement/tefu/tefuList.vue
+++ b/src/views/modules/base/residentManagement/tefu/tefuList.vue
@@ -834,7 +834,7 @@ export default {
       let url = "/actual/base/resiCategorized/specialSupport/downloadImportTemplate";
       let params = {};
       await this.$http({
-        method: "POST",
+        method: "get",
         url,
         responseType: "blob",
         data: params,
diff --git a/src/views/modules/base/residentManagement/unemployment/unemployment.vue b/src/views/modules/base/residentManagement/unemployment/unemployment.vue
index 7801c2ac0..ba6be6a4b 100644
--- a/src/views/modules/base/residentManagement/unemployment/unemployment.vue
+++ b/src/views/modules/base/residentManagement/unemployment/unemployment.vue
@@ -909,10 +909,10 @@ export default {
     },
     // 下载模板
     async handleExportModule() {
-      let url = "/actual/base/resiCategorized/resiUnemployment/downloadImportTemplate";
+      let url = "/actual/base/resiCategorized/unemployed/downloadImportTemplate";
       let params = {};
       await this.$http({
-        method: "POST",
+        method: "get",
         url,
         responseType: "blob",
         data: params,
diff --git a/src/views/modules/base/residentManagement/veteran/veteran.vue b/src/views/modules/base/residentManagement/veteran/veteran.vue
index c500c65dd..33108dc72 100644
--- a/src/views/modules/base/residentManagement/veteran/veteran.vue
+++ b/src/views/modules/base/residentManagement/veteran/veteran.vue
@@ -891,7 +891,7 @@ export default {
       let url = "/actual/base/resiCategorized/veteran/downloadImportTemplate";
       let params = {};
       await this.$http({
-        method: "POST",
+        method: "get",
         url,
         responseType: "blob",
         data: params,
diff --git a/src/views/modules/base/residentManagement/volunteer/volunteer.vue b/src/views/modules/base/residentManagement/volunteer/volunteer.vue
index d95bb09bf..c8d4834b1 100644
--- a/src/views/modules/base/residentManagement/volunteer/volunteer.vue
+++ b/src/views/modules/base/residentManagement/volunteer/volunteer.vue
@@ -769,7 +769,7 @@ export default {
       let url = "/actual/base/resiCategorized/volunteer/downloadImportTemplate";
       let params = {};
       await this.$http({
-        method: "POST",
+        method: "get",
         url,
         responseType: "blob",
         data: params,
diff --git a/src/views/modules/communityParty/members/memberList.vue b/src/views/modules/communityParty/members/memberList.vue
index c3a081a7a..1bef326bb 100644
--- a/src/views/modules/communityParty/members/memberList.vue
+++ b/src/views/modules/communityParty/members/memberList.vue
@@ -104,159 +104,165 @@
           </el-col>
         </el-row>
     </div>
-      
        
-      <div class="g-table">
-        <el-button type="primary"
-                   @click="handleCreateBtnClick">新增
-        </el-button>
-        <el-upload
-            :headers="$getElUploadHeaders()"
-            ref="upload"
-            class="upload-btn"
-            action="uploadUlr"
-            :limit="1"
-            :accept="'.xls,.xlsx'"
-            :with-credentials="true"
-            :show-file-list="false"
-            :auto-upload="true"
-            :on-success="handleExcelSuccess"
-            :before-upload="beforeExcelUpload"
-            :http-request="uploadHttpRequest"
-            style="display: inline-block;margin:0px 10px"
-        >
-          <el-button type="primary" :loading="importLoading">导入</el-button>
-        </el-upload>
-        <el-button type="primary"
-                   :loading="exportBtnLoading"
-                   @click="handleExportBtnClick">导出
-        </el-button>
-        <el-button type="primary"
-                   @click="handleDownloadTemplateBtnClick">下载模板
-        </el-button>
-        <el-button type="primary"
-                   @click="handleDeleteBatchBtnClick">批量删除
-        </el-button>
-      </div>
-    
-      <div style="margin-top: 10px;margin-bottom: 10px">
-        <el-table
-            :data="partymemberList"
-            border
-            v-loading="loading"
-            @select-all="handleMultiSelect"
-            @selection-change="handleMultiSelect"
-            style="width: 100%"
-            table
-            >
-          <el-table-column
-              type="selection"
-              width="55">
-          </el-table-column>
-          <el-table-column
-              prop="partyOrgName"
-              label="党组织名称"
-              width="180">
-          </el-table-column>
-          <el-table-column
-              prop="name"
-              label="姓名"
-              width="180">
-          </el-table-column>
-          <el-table-column
-              prop="mobile"
-              label="联系电话">
-          </el-table-column>
-          <el-table-column
-              prop="idCard"
-              label="身份证号">
-          </el-table-column>
-          <el-table-column
-              prop="jzAddress"
-              label="居住地址">
-          </el-table-column>
-          <el-table-column
-              prop="partyJobName"
-              label="职务">
-          </el-table-column>
-          <el-table-column
-              prop="joinTime"
-              label="入党日期">
-          </el-table-column>
-          <el-table-column
-              prop="payStatus"
-              label="是否缴费" style="width: 50px">
-            <template slot-scope="scope">
-              {{ scope.row.payStatus ? '是' : '否' }}
-            </template>
-          </el-table-column>
-          <el-table-column
-              prop="latestPayDate"
-              label="最近缴费日期">
-          </el-table-column>
-          <el-table-column
-              prop="centerFlag"
-              label="党员中心户">
-            <template slot-scope="scope">
-              {{ scope.row.centerFlag == null ? null : (scope.row.centerFlag === 1 ? '是' : '否') }}
-            </template>
-          </el-table-column>
-          <el-table-column
-              prop="flowFlag"
-              label="流动党员">
-            <template slot-scope="scope">
-              {{ scope.row.flowFlag == null ? null : (scope.row.flowFlag === 1 ? '是' : '否') }}
-            </template>
-          </el-table-column>
-          <el-table-column
-              prop="studyNotNeed"
-              label="免学习">
-            <template slot-scope="scope">
-              {{ scope.row.studyNotNeed == null ? null : scope.row.studyNotNeed === 1 ? '是' : '否' }}
-            </template>
-          </el-table-column>
-
-          <el-table-column
-              label="操作"
-              width="280">
-            <template slot-scope="scope">
-              <el-button type="text"
-                         @click="handleDetailBtnClick(scope.row)"
-                         size="small"
-                         class="div-table-button--detail">查看</el-button>
-              <el-button type="text"
-                         @click="handleUpdateBtnClick(scope.row)"
-                         size="small"
-                         class="div-table-button--detail">编辑</el-button>
-              <el-button type="text"
-                         @click="handleDeleteSingleBtnClick(scope.row)"
-                         size="small"
-                         class="div-table-button--detail">删除</el-button>
-              <el-button type="text"
-                         @click="handlePayRecordBtnClick(scope.row)"
-                         size="small"
-                         class="div-table-button--detail">缴费记录</el-button>
-              <el-button type="text"
-                         @click="handlePointsRecordBtnClick(scope.row)"
-                         size="small"
-                         class="div-table-button--detail">量化积分</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      
-      <div>
-        <el-pagination
-            background
-            layout="sizes, prev, pager, next"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page.sync="searchForm.pageNo"
-            :page-sizes="pageSizes"
-            :page-size="searchForm.pageSize"
-            :total="total">
-        </el-pagination>
-      </div>
+      <div class="m-table">
+          <div class="div_btn">
+            <el-button type="primary"
+                    size="small"
+                     @click="handleCreateBtnClick">新增
+          </el-button>
+          <el-upload
+              :headers="$getElUploadHeaders()"
+              ref="upload"
+              class="upload-btn"
+              action="uploadUlr"
+              :limit="1"
+              :accept="'.xls,.xlsx'"
+              :with-credentials="true"
+              :show-file-list="false"
+              :auto-upload="true"
+              :on-success="handleExcelSuccess"
+              :before-upload="beforeExcelUpload"
+              :http-request="uploadHttpRequest"
+              style="display: inline-block;margin:0px 10px"
+          >
+              <el-button type="primary" :loading="importLoading"   
+                size="small"
+                class="diy-button--white el-button--default">导入</el-button>
+            </el-upload>
+            <el-button type="primary"
+                        size="small"
+                       :loading="exportBtnLoading"
+                       @click="handleExportBtnClick">导出
+            </el-button>
+            <el-button type="primary"
+                       size="small"
+                       class="diy-button--white el-button--default"
+                       @click="handleDownloadTemplateBtnClick">下载模板
+            </el-button>
+            <el-button type="primary"
+                     size="small"
+                       @click="handleDeleteBatchBtnClick">批量删除
+            </el-button>
+            </div>
+            <el-table
+              :data="partymemberList"
+              border
+              v-loading="loading"
+              @select-all="handleMultiSelect"
+              @selection-change="handleMultiSelect"
+              style="width: 100%"
+              class="m-table-item"
+              :height="maxTableHeight"
+              >
+            <el-table-column
+                type="selection"
+                width="55">
+            </el-table-column>
+            <el-table-column
+                prop="partyOrgName"
+                label="党组织名称"
+                width="180">
+            </el-table-column>
+            <el-table-column
+
+                prop="name"
+                label="姓名"
+                width="180">
+            </el-table-column>
+            <el-table-column
+                prop="mobile"
+                label="联系电话">
+            </el-table-column>
+            <el-table-column
+                prop="idCard"
+                label="身份证号">
+            </el-table-column>
+            <el-table-column
+                prop="jzAddress"
+                label="居住地址">
+            </el-table-column>
+            <el-table-column
+                prop="partyJobName"
+                label="职务">
+            </el-table-column>
+            <el-table-column
+                prop="joinTime"
+                label="入党日期">
+            </el-table-column>
+            <el-table-column
+                prop="payStatus"
+                label="是否缴费" style="width: 50px">
+              <template slot-scope="scope">
+                {{ scope.row.payStatus ? '是' : '否' }}
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="latestPayDate"
+                label="最近缴费日期">
+            </el-table-column>
+            <el-table-column
+                prop="centerFlag"
+                label="党员中心户">
+              <template slot-scope="scope">
+                {{ scope.row.centerFlag == null ? null : (scope.row.centerFlag === 1 ? '是' : '否') }}
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="flowFlag"
+                label="流动党员">
+              <template slot-scope="scope">
+                {{ scope.row.flowFlag == null ? null : (scope.row.flowFlag === 1 ? '是' : '否') }}
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="studyNotNeed"
+                label="免学习">
+              <template slot-scope="scope">
+                {{ scope.row.studyNotNeed == null ? null : scope.row.studyNotNeed === 1 ? '是' : '否' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column
+                label="操作"
+                width="280">
+              <template slot-scope="scope">
+                <el-button type="text"
+                           @click="handleDetailBtnClick(scope.row)"
+                           size="small"
+                           class="div-table-button--detail">查看</el-button>
+                <el-button type="text"
+                           @click="handleUpdateBtnClick(scope.row)"
+                           size="small"
+                           class="div-table-button--detail">编辑</el-button>
+                <el-button type="text"
+                           @click="handleDeleteSingleBtnClick(scope.row)"
+                           size="small"
+                           class="div-table-button--detail">删除</el-button>
+                <el-button type="text"
+                           @click="handlePayRecordBtnClick(scope.row)"
+                           size="small"
+                           class="div-table-button--detail">缴费记录</el-button>
+                <el-button type="text"
+                           @click="handlePointsRecordBtnClick(scope.row)"
+                           size="small"
+                           class="div-table-button--detail">量化积分</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div>
+          <el-pagination
+              background
+              layout="sizes, prev, pager, next"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page.sync="searchForm.pageNo"
+              :page-sizes="pageSizes"
+              :page-size="searchForm.pageSize"
+              :total="total">
+          </el-pagination>
+        </div>
+        </div>
     <Create ref="create" @finishUpdate="search"></Create>
     <Detail ref="detail" @finishUpdate="search"></Detail>
     <Update ref="update" @finishUpdate="search"></Update>
@@ -268,6 +274,7 @@
 
 import { defineComponent } from 'vue'
 import { Loading } from 'element-ui';
+import { mapGetters } from "vuex";
 import Create from './create'
 import Detail from './detail'
 import Update from './update'
@@ -358,7 +365,8 @@ export default {
         label: 'partyOrgName',
         checkStrictly: true,
         multiple: false
-      }
+      },
+      searchH: 160,
     }
   },
 
@@ -702,7 +710,15 @@ export default {
       this.searchForm.pageNo = pageNo;
       this.search();
     },
-  }
+  },
+  computed: {
+    maxTableHeight() {
+      const h = this.clientHeight - this.searchH - 330 + this.iframeHeight;
+      const _h = this.clientHeight - 330 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
 }
 
 </script>
diff --git a/src/views/modules/communityParty/partyOrg/create.vue b/src/views/modules/communityParty/partyOrg/create.vue
index 81337d21d..36bca0a26 100644
--- a/src/views/modules/communityParty/partyOrg/create.vue
+++ b/src/views/modules/communityParty/partyOrg/create.vue
@@ -120,7 +120,6 @@
     </template>
   </el-dialog>
 </template>
-
 <script>
 var map
 var search
@@ -192,12 +191,7 @@ export default {
       let { latitude, longitude } = this.$store.state.user;
 
       this.$nextTick(() => {
-        if (!map) {
           this.initMap(latitude, longitude);
-        } else {
-          map.setCenter(latitude, longitude);
-          map.setMarker(latitude, longitude);
-        }
       })  
     },