elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

feature
mk 2 years ago
parent
807f774afb
commit
544b480d4c
9 changed files with 178 additions and 170 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/modules/base/residentManagement/housingNature/housingNature.vue
  2. 2
      src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
  3. 4
      src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
  4. 2
      src/views/modules/base/residentManagement/tefu/tefuList.vue
  5. 4
      src/views/modules/base/residentManagement/unemployment/unemployment.vue
  6. 2
      src/views/modules/base/residentManagement/veteran/veteran.vue
  7. 2
      src/views/modules/base/residentManagement/volunteer/volunteer.vue
  8. 324
      src/views/modules/communityParty/members/memberList.vue
  9. 6
      src/views/modules/communityParty/partyOrg/create.vue

2
src/views/modules/base/residentManagement/housingNature/housingNature.vue
View File

@ -611,7 +611,7 @@ export default {
let url = "/actual/base/resiCategorized/ensureHouse/downloadImportTemplate"; let url = "/actual/base/resiCategorized/ensureHouse/downloadImportTemplate";
let params = {}; let params = {};
await this.$http({ await this.$http({
method: "POST", method: "get",
url, url,
responseType: "blob", responseType: "blob",
data: params, data: params,

2
src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
View File

@ -198,7 +198,6 @@
<div class="m-table"> <div class="m-table">
<div class="div_btn"> <div class="div_btn">
<div class="div_btn_left">
<el-button <el-button
size="small" size="small"
@click="handleAdd" @click="handleAdd"
@ -206,7 +205,6 @@
icon="el-icon-plus" icon="el-icon-plus"
>新增</el-button >新增</el-button
> >
</div>
<el-button <el-button
@click="handleExport" @click="handleExport"
type="primary" type="primary"

4
src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
View File

@ -654,10 +654,10 @@
}, },
// 下载模板 // 下载模板
async handleExportModule() { async handleExportModule() {
let url = "/actual/base/resiCategorized/resiSubsistenceAllowance/downloadImportTemplate"; let url = "/actual/base/resiCategorized/subsistenceAllowance/downloadImportTemplate";
let params = {}; let params = {};
await this.$http({ await this.$http({
method: "POST", method: "get",
url, url,
responseType: "blob", responseType: "blob",
data: params, data: params,

2
src/views/modules/base/residentManagement/tefu/tefuList.vue
View File

@ -834,7 +834,7 @@ export default {
let url = "/actual/base/resiCategorized/specialSupport/downloadImportTemplate"; let url = "/actual/base/resiCategorized/specialSupport/downloadImportTemplate";
let params = {}; let params = {};
await this.$http({ await this.$http({
method: "POST", method: "get",
url, url,
responseType: "blob", responseType: "blob",
data: params, data: params,

4
src/views/modules/base/residentManagement/unemployment/unemployment.vue
View File

@ -909,10 +909,10 @@ export default {
}, },
// 下载模板 // 下载模板
async handleExportModule() { async handleExportModule() {
let url = "/actual/base/resiCategorized/resiUnemployment/downloadImportTemplate"; let url = "/actual/base/resiCategorized/unemployed/downloadImportTemplate";
let params = {}; let params = {};
await this.$http({ await this.$http({
method: "POST", method: "get",
url, url,
responseType: "blob", responseType: "blob",
data: params, data: params,

2
src/views/modules/base/residentManagement/veteran/veteran.vue
View File

@ -891,7 +891,7 @@ export default {
let url = "/actual/base/resiCategorized/veteran/downloadImportTemplate"; let url = "/actual/base/resiCategorized/veteran/downloadImportTemplate";
let params = {}; let params = {};
await this.$http({ await this.$http({
method: "POST", method: "get",
url, url,
responseType: "blob", responseType: "blob",
data: params, data: params,

2
src/views/modules/base/residentManagement/volunteer/volunteer.vue
View File

@ -769,7 +769,7 @@ export default {
let url = "/actual/base/resiCategorized/volunteer/downloadImportTemplate"; let url = "/actual/base/resiCategorized/volunteer/downloadImportTemplate";
let params = {}; let params = {};
await this.$http({ await this.$http({
method: "POST", method: "get",
url, url,
responseType: "blob", responseType: "blob",
data: params, data: params,

324
src/views/modules/communityParty/members/memberList.vue
View File

@ -104,159 +104,165 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div class="g-table"> <div class="m-table">
<el-button type="primary" <div class="div_btn">
@click="handleCreateBtnClick">新增 <el-button type="primary"
</el-button> size="small"
<el-upload @click="handleCreateBtnClick">新增
:headers="$getElUploadHeaders()" </el-button>
ref="upload" <el-upload
class="upload-btn" :headers="$getElUploadHeaders()"
action="uploadUlr" ref="upload"
:limit="1" class="upload-btn"
:accept="'.xls,.xlsx'" action="uploadUlr"
:with-credentials="true" :limit="1"
:show-file-list="false" :accept="'.xls,.xlsx'"
:auto-upload="true" :with-credentials="true"
:on-success="handleExcelSuccess" :show-file-list="false"
:before-upload="beforeExcelUpload" :auto-upload="true"
:http-request="uploadHttpRequest" :on-success="handleExcelSuccess"
style="display: inline-block;margin:0px 10px" :before-upload="beforeExcelUpload"
> :http-request="uploadHttpRequest"
<el-button type="primary" :loading="importLoading">导入</el-button> style="display: inline-block;margin:0px 10px"
</el-upload> >
<el-button type="primary" <el-button type="primary" :loading="importLoading"
:loading="exportBtnLoading" size="small"
@click="handleExportBtnClick">导出 class="diy-button--white el-button--default">导入</el-button>
</el-button> </el-upload>
<el-button type="primary" <el-button type="primary"
@click="handleDownloadTemplateBtnClick">下载模板 size="small"
</el-button> :loading="exportBtnLoading"
<el-button type="primary" @click="handleExportBtnClick">导出
@click="handleDeleteBatchBtnClick">批量删除 </el-button>
</el-button> <el-button type="primary"
</div> size="small"
class="diy-button--white el-button--default"
<div style="margin-top: 10px;margin-bottom: 10px"> @click="handleDownloadTemplateBtnClick">下载模板
<el-table </el-button>
:data="partymemberList" <el-button type="primary"
border size="small"
v-loading="loading" @click="handleDeleteBatchBtnClick">批量删除
@select-all="handleMultiSelect" </el-button>
@selection-change="handleMultiSelect" </div>
style="width: 100%" <el-table
table :data="partymemberList"
> border
<el-table-column v-loading="loading"
type="selection" @select-all="handleMultiSelect"
width="55"> @selection-change="handleMultiSelect"
</el-table-column> style="width: 100%"
<el-table-column class="m-table-item"
prop="partyOrgName" :height="maxTableHeight"
label="党组织名称" >
width="180"> <el-table-column
</el-table-column> type="selection"
<el-table-column width="55">
prop="name" </el-table-column>
label="姓名" <el-table-column
width="180"> prop="partyOrgName"
</el-table-column> label="党组织名称"
<el-table-column width="180">
prop="mobile" </el-table-column>
label="联系电话"> <el-table-column
</el-table-column>
<el-table-column prop="name"
prop="idCard" label="姓名"
label="身份证号"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="jzAddress" prop="mobile"
label="居住地址"> label="联系电话">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="partyJobName" prop="idCard"
label="职务"> label="身份证号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="joinTime" prop="jzAddress"
label="入党日期"> label="居住地址">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="payStatus" prop="partyJobName"
label="是否缴费" style="width: 50px"> label="职务">
<template slot-scope="scope"> </el-table-column>
{{ scope.row.payStatus ? '是' : '否' }} <el-table-column
</template> prop="joinTime"
</el-table-column> label="入党日期">
<el-table-column </el-table-column>
prop="latestPayDate" <el-table-column
label="最近缴费日期"> prop="payStatus"
</el-table-column> label="是否缴费" style="width: 50px">
<el-table-column <template slot-scope="scope">
prop="centerFlag" {{ scope.row.payStatus ? '是' : '否' }}
label="党员中心户"> </template>
<template slot-scope="scope"> </el-table-column>
{{ scope.row.centerFlag == null ? null : (scope.row.centerFlag === 1 ? '是' : '否') }} <el-table-column
</template> prop="latestPayDate"
</el-table-column> label="最近缴费日期">
<el-table-column </el-table-column>
prop="flowFlag" <el-table-column
label="流动党员"> prop="centerFlag"
<template slot-scope="scope"> label="党员中心户">
{{ scope.row.flowFlag == null ? null : (scope.row.flowFlag === 1 ? '是' : '否') }} <template slot-scope="scope">
</template> {{ scope.row.centerFlag == null ? null : (scope.row.centerFlag === 1 ? '是' : '否') }}
</el-table-column> </template>
<el-table-column </el-table-column>
prop="studyNotNeed" <el-table-column
label="免学习"> prop="flowFlag"
<template slot-scope="scope"> label="流动党员">
{{ scope.row.studyNotNeed == null ? null : scope.row.studyNotNeed === 1 ? '是' : '否' }} <template slot-scope="scope">
</template> {{ scope.row.flowFlag == null ? null : (scope.row.flowFlag === 1 ? '是' : '否') }}
</el-table-column> </template>
</el-table-column>
<el-table-column <el-table-column
label="操作" prop="studyNotNeed"
width="280"> label="免学习">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" {{ scope.row.studyNotNeed == null ? null : scope.row.studyNotNeed === 1 ? '是' : '否' }}
@click="handleDetailBtnClick(scope.row)" </template>
size="small" </el-table-column>
class="div-table-button--detail">查看</el-button>
<el-button type="text" <el-table-column
@click="handleUpdateBtnClick(scope.row)" label="操作"
size="small" width="280">
class="div-table-button--detail">编辑</el-button> <template slot-scope="scope">
<el-button type="text" <el-button type="text"
@click="handleDeleteSingleBtnClick(scope.row)" @click="handleDetailBtnClick(scope.row)"
size="small" size="small"
class="div-table-button--detail">删除</el-button> class="div-table-button--detail">查看</el-button>
<el-button type="text" <el-button type="text"
@click="handlePayRecordBtnClick(scope.row)" @click="handleUpdateBtnClick(scope.row)"
size="small" size="small"
class="div-table-button--detail">缴费记录</el-button> class="div-table-button--detail">编辑</el-button>
<el-button type="text" <el-button type="text"
@click="handlePointsRecordBtnClick(scope.row)" @click="handleDeleteSingleBtnClick(scope.row)"
size="small" size="small"
class="div-table-button--detail">量化积分</el-button> class="div-table-button--detail">删除</el-button>
</template> <el-button type="text"
</el-table-column> @click="handlePayRecordBtnClick(scope.row)"
</el-table> size="small"
</div> class="div-table-button--detail">缴费记录</el-button>
<el-button type="text"
<div> @click="handlePointsRecordBtnClick(scope.row)"
<el-pagination size="small"
background class="div-table-button--detail">量化积分</el-button>
layout="sizes, prev, pager, next" </template>
@size-change="handleSizeChange" </el-table-column>
@current-change="handleCurrentChange" </el-table>
:current-page.sync="searchForm.pageNo" <div>
:page-sizes="pageSizes" <el-pagination
:page-size="searchForm.pageSize" background
:total="total"> layout="sizes, prev, pager, next"
</el-pagination> @size-change="handleSizeChange"
</div> @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> <Create ref="create" @finishUpdate="search"></Create>
<Detail ref="detail" @finishUpdate="search"></Detail> <Detail ref="detail" @finishUpdate="search"></Detail>
<Update ref="update" @finishUpdate="search"></Update> <Update ref="update" @finishUpdate="search"></Update>
@ -268,6 +274,7 @@
import { defineComponent } from 'vue' import { defineComponent } from 'vue'
import { Loading } from 'element-ui'; import { Loading } from 'element-ui';
import { mapGetters } from "vuex";
import Create from './create' import Create from './create'
import Detail from './detail' import Detail from './detail'
import Update from './update' import Update from './update'
@ -358,7 +365,8 @@ export default {
label: 'partyOrgName', label: 'partyOrgName',
checkStrictly: true, checkStrictly: true,
multiple: false multiple: false
} },
searchH: 160,
} }
}, },
@ -702,7 +710,15 @@ export default {
this.searchForm.pageNo = pageNo; this.searchForm.pageNo = pageNo;
this.search(); 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> </script>

6
src/views/modules/communityParty/partyOrg/create.vue
View File

@ -120,7 +120,6 @@
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
var map var map
var search var search
@ -192,12 +191,7 @@ export default {
let { latitude, longitude } = this.$store.state.user; let { latitude, longitude } = this.$store.state.user;
this.$nextTick(() => { this.$nextTick(() => {
if (!map) {
this.initMap(latitude, longitude); this.initMap(latitude, longitude);
} else {
map.setCenter(latitude, longitude);
map.setMarker(latitude, longitude);
}
}) })
}, },

Write Preview
Loading…
Cancel
Save