bug#488 党组织地图问题,党员管理列表样式

2 years ago · 544b480d4c
9 changed files with 178 additions and 170 deletions
--- 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,
--- 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"
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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>
--- 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);
-        }
      })  
    },