Commit ae1ef8cb authored by “yiyousong”'s avatar “yiyousong”

perf: 优化办事指南数据管理

parent 5fe0b31b
...@@ -54,7 +54,7 @@ export default { ...@@ -54,7 +54,7 @@ export default {
type: Number, type: Number,
default: 10, default: 10,
}, },
current: { page: {
required: true, required: true,
type: Number, type: Number,
default: 1, default: 1,
...@@ -119,10 +119,10 @@ export default { ...@@ -119,10 +119,10 @@ export default {
}, },
Current: { Current: {
get() { get() {
return this.current; return this.page;
}, },
set(value) { set(value) {
this.$emit("update:current", value); this.$emit("update:page", value);
}, },
}, },
Pagination() { Pagination() {
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
:expandIconColumnIndex="2" :expandIconColumnIndex="2"
:data="siteBusinessTable.data" :data="siteBusinessTable.data"
:pageSize.sync="siteBusinessTable.size" :pageSize.sync="siteBusinessTable.size"
:current.sync="siteBusinessTable.current" :page.sync="siteBusinessTable.page"
:total="siteBusinessTable.total" :total="siteBusinessTable.total"
:loading="siteBusinessTable.loading" :loading="siteBusinessTable.loading"
size="middle" size="middle"
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
:expandIconColumnIndex="2" :expandIconColumnIndex="2"
:data="businessTable.data" :data="businessTable.data"
:pageSize.sync="businessTable.size" :pageSize.sync="businessTable.size"
:current.sync="businessTable.current" :page.sync="businessTable.page"
:total="businessTable.total" :total="businessTable.total"
:loading="businessTable.loading" :loading="businessTable.loading"
size="middle" size="middle"
...@@ -156,7 +156,7 @@ export default { ...@@ -156,7 +156,7 @@ export default {
customRender: (text, record, index) => { customRender: (text, record, index) => {
if (record.parentId === 0) { if (record.parentId === 0) {
return ( return (
(this.siteBusinessTable.current - 1) * (this.siteBusinessTable.page - 1) *
this.siteBusinessTable.size + this.siteBusinessTable.size +
index + index +
1 1
...@@ -178,7 +178,7 @@ export default { ...@@ -178,7 +178,7 @@ export default {
}, },
], ],
total: 0, total: 0,
current: 1, page: 1,
size: 10, size: 10,
data: [], data: [],
}, },
...@@ -192,7 +192,7 @@ export default { ...@@ -192,7 +192,7 @@ export default {
customRender: (text, record, index) => { customRender: (text, record, index) => {
if (record.parentId === 0) { if (record.parentId === 0) {
return ( return (
(this.businessTable.current - 1) * this.businessTable.size + (this.businessTable.page - 1) * this.businessTable.size +
index + index +
1 1
); );
...@@ -213,7 +213,7 @@ export default { ...@@ -213,7 +213,7 @@ export default {
}, },
], ],
total: 0, total: 0,
current: 1, page: 1,
size: 10, size: 10,
data: [], data: [],
}, },
...@@ -255,15 +255,15 @@ export default { ...@@ -255,15 +255,15 @@ export default {
async getSiteBusinessData() { async getSiteBusinessData() {
this.siteBusinessTable.loading = true; this.siteBusinessTable.loading = true;
let res = await siteBusinessList({ let res = await siteBusinessList({
page: this.siteBusinessTable.current, page: this.siteBusinessTable.page,
size: this.siteBusinessTable.size, size: this.siteBusinessTable.size,
siteId: this.siteId, siteId: this.siteId,
businessName: `%${this.serchSiteBusiness}%`, businessName: `%${this.serchSiteBusiness}%`,
}); });
let { code, data } = res.data; let { code, data } = res.data;
if (code === 1) { if (code === 1) {
if (!data.data.length && this.siteBusinessTable.current > 1) { if (!data.data.length && this.siteBusinessTable.page > 1) {
this.siteBusinessTable.current -= 1; this.siteBusinessTable.page -= 1;
this.getSiteBusinessData(); this.getSiteBusinessData();
} }
this.siteBusinessTable.total = data.pageInfo.totalResult; this.siteBusinessTable.total = data.pageInfo.totalResult;
...@@ -275,15 +275,15 @@ export default { ...@@ -275,15 +275,15 @@ export default {
async getBusinessListData() { async getBusinessListData() {
this.businessTable.loading = true; this.businessTable.loading = true;
let res = await businessList({ let res = await businessList({
page: this.businessTable.current, page: this.businessTable.page,
size: this.businessTable.size, size: this.businessTable.size,
name: `%${this.serchData}%`, name: `%${this.serchData}%`,
businessType: 0, //一体化业务 businessType: 0, //一体化业务
}); });
let { code, data } = res.data; let { code, data } = res.data;
if (code === 1) { if (code === 1) {
if (!data.data.length && this.businessTable.current > 1) { if (!data.data.length && this.businessTable.page > 1) {
this.businessTable.current -= 1; this.businessTable.page -= 1;
this.getBusinessListData(); this.getBusinessListData();
} }
this.businessTable.total = data.pageInfo.totalResult; this.businessTable.total = data.pageInfo.totalResult;
...@@ -294,7 +294,7 @@ export default { ...@@ -294,7 +294,7 @@ export default {
// 站点业务搜索 // 站点业务搜索
onSiteBusinessSearch() { onSiteBusinessSearch() {
this.siteBusinessTable.current = 1; this.siteBusinessTable.page = 1;
this.getSiteBusinessData(); this.getSiteBusinessData();
}, },
// 删除站点业务 // 删除站点业务
...@@ -401,7 +401,7 @@ export default { ...@@ -401,7 +401,7 @@ export default {
}, },
// 搜索一体化业务 // 搜索一体化业务
async onSearch() { async onSearch() {
this.businessTable.current = 1; this.businessTable.page = 1;
this.getBusinessListData(); this.getBusinessListData();
}, },
// 一体化业务加入站点 // 一体化业务加入站点
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
:columns="siteMatterTable.columns" :columns="siteMatterTable.columns"
:data="siteMatterTable.data" :data="siteMatterTable.data"
:pageSize.sync="siteMatterTable.size" :pageSize.sync="siteMatterTable.size"
:current.sync="siteMatterTable.current" :page.sync="siteMatterTable.page"
:total="siteMatterTable.total" :total="siteMatterTable.total"
:loading="siteMatterTable.loading" :loading="siteMatterTable.loading"
size="middle" size="middle"
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
:columns="baseMatterTable.columns" :columns="baseMatterTable.columns"
:data="baseMatterTable.data" :data="baseMatterTable.data"
:pageSize.sync="baseMatterTable.size" :pageSize.sync="baseMatterTable.size"
:current.sync="baseMatterTable.current" :page.sync="baseMatterTable.page"
:total="baseMatterTable.total" :total="baseMatterTable.total"
:loading="baseMatterTable.loading" :loading="baseMatterTable.loading"
size="middle" size="middle"
...@@ -270,7 +270,7 @@ export default { ...@@ -270,7 +270,7 @@ export default {
data: [], data: [],
total: 0, total: 0,
size: 10, size: 10,
current: 1, page: 1,
search: { search: {
source: undefined, // 事项来源 source: undefined, // 事项来源
matterName: "", // 事项名称 matterName: "", // 事项名称
...@@ -282,7 +282,7 @@ export default { ...@@ -282,7 +282,7 @@ export default {
width: "50px", width: "50px",
customRender: (text, record, index) => { customRender: (text, record, index) => {
return ( return (
(this.siteMatterTable.current - 1) * this.siteMatterTable.size + (this.siteMatterTable.page - 1) * this.siteMatterTable.size +
index + index +
1 1
); );
...@@ -322,7 +322,7 @@ export default { ...@@ -322,7 +322,7 @@ export default {
data: [], data: [],
total: 0, total: 0,
size: 10, size: 10,
current: 1, page: 1,
search: { search: {
source: undefined, // 事项来源 source: undefined, // 事项来源
matterName: "", // 事项名称 matterName: "", // 事项名称
...@@ -334,7 +334,7 @@ export default { ...@@ -334,7 +334,7 @@ export default {
width: "50px", width: "50px",
customRender: (text, record, index) => { customRender: (text, record, index) => {
return ( return (
(this.baseMatterTable.current - 1) * this.baseMatterTable.size + (this.baseMatterTable.page - 1) * this.baseMatterTable.size +
index + index +
1 1
); );
...@@ -397,7 +397,7 @@ export default { ...@@ -397,7 +397,7 @@ export default {
async getMatterSiteData() { async getMatterSiteData() {
this.siteMatterTable.loading = true; this.siteMatterTable.loading = true;
let res = await getSiteMatterList({ let res = await getSiteMatterList({
page: this.siteMatterTable.current, page: this.siteMatterTable.page,
size: this.siteMatterTable.size, size: this.siteMatterTable.size,
siteId: this.siteId, siteId: this.siteId,
source: this.siteMatterTable.search.source, source: this.siteMatterTable.search.source,
...@@ -406,8 +406,8 @@ export default { ...@@ -406,8 +406,8 @@ export default {
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { pageInfo, data } = res.data.data; let { pageInfo, data } = res.data.data;
if (!data.length && this.siteMatterTable.current > 1) { if (!data.length && this.siteMatterTable.page > 1) {
this.siteMatterTable.current -= 1; this.siteMatterTable.page -= 1;
this.getMatterSiteData(); this.getMatterSiteData();
} }
this.siteMatterTable.total = pageInfo.totalResult; this.siteMatterTable.total = pageInfo.totalResult;
...@@ -420,7 +420,7 @@ export default { ...@@ -420,7 +420,7 @@ export default {
this.baseMatterTable.loading = true; this.baseMatterTable.loading = true;
let res = await getMatterListSubList({ let res = await getMatterListSubList({
siteId: this.siteId, siteId: this.siteId,
page: this.baseMatterTable.current, page: this.baseMatterTable.page,
size: this.baseMatterTable.size, size: this.baseMatterTable.size,
matterName: `%${this.baseMatterTable.search.matterName}%`, matterName: `%${this.baseMatterTable.search.matterName}%`,
source: this.baseMatterTable.search.source, source: this.baseMatterTable.search.source,
...@@ -428,8 +428,8 @@ export default { ...@@ -428,8 +428,8 @@ export default {
}); });
if (res.data.code === 1) { if (res.data.code === 1) {
let { pageInfo, data, dict } = res.data.data; let { pageInfo, data, dict } = res.data.data;
if (!data.length && this.baseMatterTable.current > 1) { if (!data.length && this.baseMatterTable.page > 1) {
this.baseMatterTable.current -= 1; this.baseMatterTable.page -= 1;
this.getMatterListData(); this.getMatterListData();
} }
this.baseMatterTable.data = data; this.baseMatterTable.data = data;
...@@ -440,7 +440,7 @@ export default { ...@@ -440,7 +440,7 @@ export default {
}, },
// 站点事项搜索 // 站点事项搜索
onSearchSiteMatter() { onSearchSiteMatter() {
this.siteMatterTable.current = 1; this.siteMatterTable.page = 1;
this.getMatterSiteData(); this.getMatterSiteData();
}, },
// 左边移除站点事项 // 左边移除站点事项
...@@ -508,7 +508,7 @@ export default { ...@@ -508,7 +508,7 @@ export default {
}, },
// 基础事项搜索 // 基础事项搜索
onSearchBaseMatter() { onSearchBaseMatter() {
this.baseMatterTable.current = 1; this.baseMatterTable.page = 1;
this.getMatterListData(); this.getMatterListData();
}, },
// 加入 // 加入
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
:columns="siteBusinessTable.columns" :columns="siteBusinessTable.columns"
:data="siteBusinessTable.data" :data="siteBusinessTable.data"
:pageSize.sync="siteBusinessTable.size" :pageSize.sync="siteBusinessTable.size"
:current.sync="siteBusinessTable.current" :page.sync="siteBusinessTable.page"
:total="siteBusinessTable.total" :total="siteBusinessTable.total"
:loading="siteBusinessTable.loading" :loading="siteBusinessTable.loading"
size="middle" size="middle"
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
:columns="siteMatterTable.columns" :columns="siteMatterTable.columns"
:data="siteMatterTable.data" :data="siteMatterTable.data"
:pageSize.sync="siteMatterTable.size" :pageSize.sync="siteMatterTable.size"
:current.sync="siteMatterTable.current" :page.sync="siteMatterTable.page"
:total="siteMatterTable.total" :total="siteMatterTable.total"
:loading="siteMatterTable.loading" :loading="siteMatterTable.loading"
size="middle" size="middle"
...@@ -274,7 +274,7 @@ export default { ...@@ -274,7 +274,7 @@ export default {
data: [], data: [],
total: 0, total: 0,
size: 10, size: 10,
current: 1, page: 1,
search: { search: {
siteBusinessName: "", // 站点业务名称 siteBusinessName: "", // 站点业务名称
}, },
...@@ -284,7 +284,7 @@ export default { ...@@ -284,7 +284,7 @@ export default {
width: "50px", width: "50px",
customRender: (text, record, index) => { customRender: (text, record, index) => {
return ( return (
(this.siteBusinessTable.current - 1) * (this.siteBusinessTable.page - 1) *
this.siteBusinessTable.size + this.siteBusinessTable.size +
index + index +
1 1
...@@ -312,7 +312,7 @@ export default { ...@@ -312,7 +312,7 @@ export default {
data: [], data: [],
total: 0, total: 0,
size: 10, size: 10,
current: 1, page: 1,
search: { search: {
deptCode: undefined, // 部门编码 deptCode: undefined, // 部门编码
matterName: "", // 事项名称 matterName: "", // 事项名称
...@@ -323,7 +323,7 @@ export default { ...@@ -323,7 +323,7 @@ export default {
width: "50px", width: "50px",
customRender: (text, record, index) => { customRender: (text, record, index) => {
return ( return (
(this.siteMatterTable.current - 1) * this.siteMatterTable.size + (this.siteMatterTable.page - 1) * this.siteMatterTable.size +
index + index +
1 1
); );
...@@ -403,15 +403,15 @@ export default { ...@@ -403,15 +403,15 @@ export default {
async getBusinessMatterData() { async getBusinessMatterData() {
this.siteBusinessTable.loading = true; this.siteBusinessTable.loading = true;
let res = await getBusinesslistData({ let res = await getBusinesslistData({
page: this.siteBusinessTable.current, page: this.siteBusinessTable.page,
size: this.siteBusinessTable.size, size: this.siteBusinessTable.size,
siteId: Number(this.siteId), siteId: Number(this.siteId),
siteBusinessName: `%${this.siteBusinessTable.search.siteBusinessName}%`, siteBusinessName: `%${this.siteBusinessTable.search.siteBusinessName}%`,
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { total, data } = res.data.data; let { total, data } = res.data.data;
if (!data.length && this.siteBusinessTable.current > 1) { if (!data.length && this.siteBusinessTable.page > 1) {
this.siteBusinessTable.current -= 1; this.siteBusinessTable.page -= 1;
this.getBusinessMatterData(); this.getBusinessMatterData();
} }
this.siteBusinessTable.total = total; this.siteBusinessTable.total = total;
...@@ -457,7 +457,7 @@ export default { ...@@ -457,7 +457,7 @@ export default {
async getMatterSiteData() { async getMatterSiteData() {
this.siteMatterTable.loading = true; this.siteMatterTable.loading = true;
let res = await getSiteMatterList({ let res = await getSiteMatterList({
page: this.siteMatterTable.current, page: this.siteMatterTable.page,
size: this.siteMatterTable.size, size: this.siteMatterTable.size,
matterName: `%${this.siteMatterTable.search.matterName}%`, matterName: `%${this.siteMatterTable.search.matterName}%`,
siteId: this.siteId, siteId: this.siteId,
...@@ -465,8 +465,8 @@ export default { ...@@ -465,8 +465,8 @@ export default {
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { pageInfo, data } = res.data.data; let { pageInfo, data } = res.data.data;
if (!data.length && this.siteMatterTable.current > 1) { if (!data.length && this.siteMatterTable.page > 1) {
this.siteMatterTable.current -= 1; this.siteMatterTable.page -= 1;
this.getMatterSiteData(); this.getMatterSiteData();
} }
this.siteMatterTable.total = pageInfo.totalResult; this.siteMatterTable.total = pageInfo.totalResult;
...@@ -477,7 +477,7 @@ export default { ...@@ -477,7 +477,7 @@ export default {
// 站点关联业务列表搜索 // 站点关联业务列表搜索
async onSiteBusinessSearch() { async onSiteBusinessSearch() {
this.siteBusinessTable.current = 1; this.siteBusinessTable.page = 1;
this.getBusinessMatterData(); this.getBusinessMatterData();
}, },
...@@ -617,7 +617,7 @@ export default { ...@@ -617,7 +617,7 @@ export default {
}, },
// 站点事项搜索 // 站点事项搜索
onSearchSiteMatter() { onSearchSiteMatter() {
this.siteMatterTable.current = 1; this.siteMatterTable.page = 1;
this.getMatterSiteData(); this.getMatterSiteData();
}, },
// 关联 // 关联
......
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