分页参数,接口返回字段对接修改

This commit is contained in:
cuiyouliang 2025-06-09 11:04:22 +08:00
parent f2a088f82a
commit 44e2f5cafd
11 changed files with 67 additions and 62 deletions

View File

@ -109,7 +109,7 @@
</template>
</el-table-column>
</el-table>
<pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</div>
<!-- <SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>-->
@ -254,11 +254,11 @@ export default {
this.loading = true;
const { pageNum, pageSize } = this.queryParams;
const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
const pageReq = { page: pageNum - 1, size: pageSize };
const pageReq = { current: pageNum - 1, size: pageSize };
listOmsAftersale(query, pageReq).then((response) => {
const { content, totalElements } = response;
this.omsAftersaleList = content;
this.total = totalElements;
const { records, total } = response.data || {};
this.omsAftersaleList = records;
this.total = total;
this.loading = false;
});
},

View File

@ -137,11 +137,11 @@ export default {
this.loading = true;
const { pageNum, pageSize } = this.queryParams;
const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
const pageReq = { page: pageNum - 1, size: pageSize };
const pageReq = { current: pageNum - 1, size: pageSize };
listOmsAftersaleItem(query, pageReq).then((response) => {
const { content, totalElements } = response;
this.omsAftersaleItemList = content;
this.total = totalElements;
const { records, total } = response.data || {};
this.omsAftersaleItemList = records;
this.total = total;
this.loading = false;
});
},

View File

@ -131,18 +131,16 @@
<div v-if="scope.row.deliveryTime">发货时间{{ parseTime(scope.row.deliveryTime, '') }}</div>
</template>
</el-table-column>
<el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right">
<el-table-column label="订单编号" prop="orderSn" width="120" fixed="right">
<template v-slot="scope">
<div style="float: right">
<el-link type="text" icon="Copy" link @click="copy(scope.row.orderSn)" :underline="false">
{{ scope.row.orderSn }}
<!-- <el-link-->
<!-- size="small"-->
<!-- icon="el-icon-document-copy"-->
<!-- @click="copyOrderSn(scope.row.orderSn)"-->
<!-- ></el-link>-->
<el-link @click="copy(scope.row.orderSn)" :underline="false"><i class="el-icon-document-copy el-icon--right"></i></el-link>
</div>
<div style="float: right">
<el-icon><CopyDocument /></el-icon>
</el-link>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" width="220" fixed="right">
<template v-slot="scope">
<el-button size="small" type="text" @click="goDetail(scope.row)" v-hasPermi="['oms:order:query']">详情 </el-button>
<el-button size="small" type="text" @click="showLog(scope.row.id)" v-hasPermi="['oms:order:log']">日志 </el-button>
<el-button
@ -152,11 +150,10 @@
:disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3"
>发货
</el-button>
</div>
</template>
</el-table-column>
</el-table>
<pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @size-change="getList" @current-change="getList" />
<pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 发货对话框 -->
<el-dialog :title="deliveryObj.title" v-model="deliveryObj.open" width="500px" append-to-body>
<el-form ref="deliveryForm" :model="deliveryObj.form" :rules="deliveryObj.rules" label-width="100px">

View File

@ -121,11 +121,11 @@ export default {
this.loading = true;
const { pageNum, pageSize } = this.queryParams;
const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
const pageReq = { page: pageNum - 1, size: pageSize };
const pageReq = { current: pageNum - 1, size: pageSize };
listOmsOrderDeliveryHistory(query, pageReq).then((response) => {
const { content, totalElements } = response;
this.omsOrderDeliveryHistoryList = content;
this.total = totalElements;
const { records, total } = response.data || {};
this.omsOrderDeliveryHistoryList = records;
this.total = total;
this.loading = false;
});
},

View File

@ -209,11 +209,11 @@ export default {
this.loading = true;
const { pageNum, pageSize } = this.queryParams;
const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
const pageReq = { page: pageNum - 1, size: pageSize };
const pageReq = { current: pageNum - 1, size: pageSize };
listOmsOrderItem(query, pageReq).then((response) => {
const { content, totalElements } = response;
this.omsOrderItemList = content;
this.total = totalElements;
const { records, total } = response.data || {};
this.omsOrderItemList = records;
this.total = total;
this.loading = false;
});
},

View File

@ -136,9 +136,9 @@ export default {
const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
const pageReq = { page: pageNum - 1, size: pageSize };
listOmsOrderOperateHistory(query, pageReq).then((response) => {
const { content, totalElements } = response;
this.omsOrderOperateHistoryList = content;
this.total = totalElements;
const { records, total } = response.data || {};
this.omsOrderOperateHistoryList = records;
this.total = total;
this.loading = false;
});
},

View File

@ -217,11 +217,11 @@ export default {
this.loading = true;
const { pageNum, pageSize } = this.queryParams;
const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
const pageReq = { page: pageNum - 1, size: pageSize };
const pageReq = { current: pageNum - 1, size: pageSize };
listOmsWechatPaymentHistory(query, pageReq).then((response) => {
const { content, totalElements } = response;
this.omsWechatPaymentHistoryList = content;
this.total = totalElements;
const { records, total } = response.data || {};
this.omsWechatPaymentHistoryList = records;
this.total = total;
this.loading = false;
});
},

View File

@ -41,7 +41,7 @@
</el-table-column>
</el-table>
<pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改品牌管理对话框 -->
<el-dialog :title="title" v-model="open" width="50%" append-to-body>
@ -120,11 +120,11 @@ export default {
this.loading = true;
const { pageNum, pageSize } = this.queryParams;
const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
const pageReq = { page: pageNum - 1, size: pageSize };
const pageReq = { current: pageNum - 1, size: pageSize };
listPmsBrand(query, pageReq).then((response) => {
const { content, totalElements } = response;
this.pmsBrandList = content;
this.total = totalElements;
const { records, total } = response.data || {};
this.pmsBrandList = records;
this.total = total;
this.loading = false;
});
},

View File

@ -67,7 +67,7 @@
</el-table-column>
</el-table>
<pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</div>
<!-- <SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>-->
</div>
@ -155,11 +155,11 @@ export default {
this.loading = true;
const { pageNum, pageSize } = this.queryParams;
const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
const pageReq = { page: pageNum - 1, size: pageSize };
const pageReq = { current: pageNum - 1, size: pageSize };
listPmsProduct(query, pageReq).then((response) => {
const { content, totalElements } = response;
this.pmsProductList = content;
this.total = totalElements;
const { records, total } = response.data || {};
this.pmsProductList = records;
this.total = total;
this.loading = false;
});
},

View File

@ -47,7 +47,7 @@
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改商品分类对话框 -->
<el-dialog :title="title" v-model="open" width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="108px">
@ -101,6 +101,8 @@ export default {
loading: true,
//
exportLoading: false,
//
total: 0,
//
ids: [],
//
@ -117,6 +119,8 @@ export default {
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
parentId: null,
nameLike: null,
level: null,
@ -136,9 +140,13 @@ export default {
/** 查询商品分类列表 */
getList() {
this.loading = true;
const query = { ...this.queryParams };
listPmsProductCategory(query).then((rows) => {
this.pmsProductCategoryList = rows;
const { pageNum, pageSize } = this.queryParams;
const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
const pageReq = { current: pageNum - 1, size: pageSize };
listPmsProductCategory(query, pageReq).then((response) => {
const { records, total } = response.data || {};
this.pmsProductCategoryList = records;
this.total = total
this.loading = false;
});
},

View File

@ -127,9 +127,9 @@ export default {
const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
const pageReq = { page: pageNum - 1, size: pageSize };
listPmsSku(query, pageReq).then((response) => {
const { content, totalElements } = response;
this.pmsSkuList = content;
this.total = totalElements;
const { records, total } = response.data || {};
this.pmsSkuList = records;
this.total = total;
this.loading = false;
});
},