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

src/views/oms/aftersale/index.vue

@@ -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;
+        const { records, total } = response.data || {};
-        this.omsAftersaleList = content;
+        this.omsAftersaleList = records;
-        this.total = totalElements;
+        this.total = total;
         this.loading = false;
       });
     },

src/views/oms/aftersaleItem/index.vue

@@ -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;
+        const { records, total } = response.data || {};
-        this.omsAftersaleItemList = content;
+        this.omsAftersaleItemList = records;
-        this.total = totalElements;
+        this.total = total;
         this.loading = false;
       });
     },

src/views/oms/order/index.vue

@@ -131,32 +131,29 @@
           <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-->
+            <el-icon><CopyDocument /></el-icon>
-            <!--              size="small"-->
+          </el-link>
-            <!--              icon="el-icon-document-copy"-->
+        </template>
-            <!--              @click="copyOrderSn(scope.row.orderSn)"-->
+      </el-table-column>
-            <!--            ></el-link>-->
+      <el-table-column label="操作" class-name="small-padding fixed-width" width="220" fixed="right">
-            <el-link @click="copy(scope.row.orderSn)" :underline="false"><i class="el-icon-document-copy el-icon--right"></i></el-link>
+        <template v-slot="scope">
-          </div>
+          <el-button size="small" type="text" @click="goDetail(scope.row)" v-hasPermi="['oms:order:query']">详情 </el-button>
-          <div style="float: right">
+          <el-button size="small" type="text" @click="showLog(scope.row.id)" v-hasPermi="['oms:order:log']">日志 </el-button>
-            <el-button size="small" type="text" @click="goDetail(scope.row)" v-hasPermi="['oms:order:query']">详情 </el-button>
+          <el-button
-            <el-button size="small" type="text" @click="showLog(scope.row.id)" v-hasPermi="['oms:order:log']">日志 </el-button>
+            size="small"
-            <el-button
+            type="text"
-              size="small"
+            @click="handleDelivery(scope.row)"
-              type="text"
+            :disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3"
-              @click="handleDelivery(scope.row)"
+            >发货
-              :disabled="scope.row.status !== 1 && scope.row.status !== 2 && scope.row.status !== 3"
+          </el-button>
-              >发货
-            </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">

src/views/oms/orderDeliveryHistory/index.vue

@@ -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;
+        const { records, total } = response.data || {};
-        this.omsOrderDeliveryHistoryList = content;
+        this.omsOrderDeliveryHistoryList = records;
-        this.total = totalElements;
+        this.total = total;
         this.loading = false;
       });
     },

src/views/oms/orderItem/index.vue

@@ -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;
+        const { records, total } = response.data || {};
-        this.omsOrderItemList = content;
+        this.omsOrderItemList = records;
-        this.total = totalElements;
+        this.total = total;
         this.loading = false;
       });
     },

src/views/oms/orderOperateHistory/index.vue

@@ -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;
+        const { records, total } = response.data || {};
-        this.omsOrderOperateHistoryList = content;
+        this.omsOrderOperateHistoryList = records;
-        this.total = totalElements;
+        this.total = total;
         this.loading = false;
       });
     },

src/views/oms/wechatPaymentHistory/index.vue

@@ -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;
+        const { records, total } = response.data || {};
-        this.omsWechatPaymentHistoryList = content;
+        this.omsWechatPaymentHistoryList = records;
-        this.total = totalElements;
+        this.total = total;
         this.loading = false;
       });
     },

src/views/pms/brand/index.vue

@@ -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;
+        const { records, total } = response.data || {};
-        this.pmsBrandList = content;
+        this.pmsBrandList = records;
-        this.total = totalElements;
+        this.total = total;
         this.loading = false;
       });
     },

src/views/pms/product/index.vue

@@ -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;
+        const { records, total } = response.data || {};
-        this.pmsProductList = content;
+        this.pmsProductList = records;
-        this.total = totalElements;
+        this.total = total;
         this.loading = false;
       });
     },

src/views/pms/productCategory/index.vue

@@ -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 };
+      const { pageNum, pageSize } = this.queryParams;
-      listPmsProductCategory(query).then((rows) => {
+      const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
-        this.pmsProductCategoryList = rows;
+      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;
       });
     },

src/views/pms/sku/index.vue

@@ -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;
+        const { records, total } = response.data || {};
-        this.pmsSkuList = content;
+        this.pmsSkuList = records;
-        this.total = totalElements;
+        this.total = total;
         this.loading = false;
       });
     },