Commit b429f045 authored by tianhongyang's avatar tianhongyang

页数限制 样式更改

parent 967b7fdd
...@@ -194,14 +194,14 @@ ...@@ -194,14 +194,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="土地交易" width="107" :resizable="false" :sortable="'custom'" prop="landMarketCount"> <!-- <el-table-column label="土地交易" width="107" :resizable="false" :sortable="'custom'" prop="landMarketCount">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link v-if="scope.row.landMarketCount" <router-link v-if="scope.row.landMarketCount"
:to="scope.row.other ? `/enterprise/${encodeStr(scope.row.id)}?path=landtransaction` : `/company/${encodeStr(scope.row.id)}?path=landtransaction`" :to="scope.row.other ? `/enterprise/${encodeStr(scope.row.id)}?path=landtransaction` : `/company/${encodeStr(scope.row.id)}?path=landtransaction`"
tag="a" class="list-titel-a">{{`${scope.row.landMarketCount}个`}}</router-link> tag="a" class="list-titel-a">{{`${scope.row.landMarketCount}个`}}</router-link>
<span v-else>--</span> <span v-else>--</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="拟建项目" width="107" :resizable="false" :sortable="'custom'" prop="approvalProjectCount"> <el-table-column label="拟建项目" width="107" :resizable="false" :sortable="'custom'" prop="approvalProjectCount">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -389,33 +389,8 @@ export default { ...@@ -389,33 +389,8 @@ export default {
} }
}, },
methods: { methods: {
// 排序 // 生成查询条件
sortChange({ column, prop, order }) { createSearchConditions() {
// 有order排序 无order默认排序
this.sort = order ? toLine(prop) : "";
// 升序
if (order == "ascending") {
this.order = "asc";
}
// 降序
if (order == "descending" || !order) {
this.order = "desc";
}
this.sortSearch(this.pageNum);
},
// 排序搜索
async sortSearch(num, size) {
this.dialogVisible = false;
if (!num) {
this.pageNum = 1;
}
if (!size) {
this.pageSize = 20;
}
if (!num && !size) {
this.reloadPage();
}
// 默认传递参数 // 默认传递参数
let params = { let params = {
aptitudeQueryDto: {}, aptitudeQueryDto: {},
...@@ -455,11 +430,42 @@ export default { ...@@ -455,11 +430,42 @@ export default {
params.aptitudeQueryDto["tagCodeQueryType"] = this.tagCodeQueryType; params.aptitudeQueryDto["tagCodeQueryType"] = this.tagCodeQueryType;
} }
return params;
},
// 排序
sortChange({ column, prop, order }) {
// 有order排序 无order默认排序
this.sort = order ? toLine(prop) : "";
// 升序
if (order == "ascending") {
this.order = "asc";
}
// 降序
if (order == "descending" || !order) {
this.order = "desc";
}
this.sortSearch(this.pageNum);
},
// 排序搜索
async sortSearch(num, size) {
this.dialogVisible = false;
if (!num) {
this.pageNum = 1;
}
if (!size) {
this.pageSize = 20;
}
if (!num && !size) {
this.reloadPage();
}
const params = this.createSearchConditions();
try { try {
const result = await api.searchOwnerUnitListApi(params); const result = await api.searchOwnerUnitListApi(params);
if (result.code == 200) { if (result.code == 200) {
this.tableData = result.data?.list ? result.data.list : []; this.tableData = result.data?.list ? result.data.list : [];
this.total = result.data?.total ? result.data?.total : 0; this.total = res.data?.total ? (res.data?.total > 10000 ? 10000 : res.data?.total) : 0;
this.addHeaderListener(); this.addHeaderListener();
} }
} catch (error) { } catch (error) {
...@@ -716,53 +722,14 @@ export default { ...@@ -716,53 +722,14 @@ export default {
this.reloadPage(); this.reloadPage();
} }
// 默认传递参数 const params = this.createSearchConditions();
let params = {
aptitudeQueryDto: {
},
page: {
page: this.pageNum,
limit: this.pageSize,
order: this.order,
field: this.sort
}
};
var data = JSON.parse(JSON.stringify(this.jskBidQueryDto));
// 搜索关键词处理
if (this.keys) {
params.aptitudeQueryDto['ename'] = this.keys;
}
// 处理地区选择
if (data.provinceIds.length > 0) {
params.aptitudeQueryDto['province'] = data.provinceIds.join(",");
}
if (data.cityIds.length > 0) {
params.aptitudeQueryDto['city'] = data.cityIds.join(",");
}
if (data.areaIds.length > 0) {
params.aptitudeQueryDto['county'] = data.areaIds.join(",");
}
// 业主标签选中处理
if (this.currentOwnerLabels.length > 0) {
params.aptitudeQueryDto["tagCode"] = this.currentOwnerLabels.join(",");
}
// 选中大于等于两个业主标签 添加 任意均可 或 同时具备条件
if (this.currentOwnerLabels.length >= 2) {
params.aptitudeQueryDto["tagCodeQueryType"] = this.tagCodeQueryType;
}
this.isSkeleton = true; this.isSkeleton = true;
api.searchOwnerUnitListApi(params).then(res => { api.searchOwnerUnitListApi(params).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.isSkeleton = false; this.isSkeleton = false;
this.tableData = res.data?.list ? res.data.list : []; this.tableData = res.data?.list ? res.data.list : [];
this.total = res.data?.total ? res.data?.total : 0; this.total = res.data?.total ? (res.data?.total > 10000 ? 10000 : res.data?.total) : 0;
this.addHeaderListener(); this.addHeaderListener();
} }
}).catch(error => { }).catch(error => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment