From 02e940df9b5a09d66a81c065722cde0e7606816d Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 5 Mar 2025 11:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 11 +++++++----
src/api/waybill/WaybillOrderList.js | 2 +-
.../basicdata/warehouse/defaultShipper.vue | 18 +++++++++---------
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/index.html b/index.html
index 17179eb7..2a4ece85 100644
--- a/index.html
+++ b/index.html
@@ -60,7 +60,7 @@
};
</script>
- <script>
+ <!-- <script>
const initWebMap = () => {
const keyArr = ['f003ec4feb3fcc4cf0742e94f569fd33', 'e162844c0ee510af1b6480bd64eb66f7'];
const random = Math.random() * 10;
@@ -82,15 +82,18 @@
};
initWebMap();
- </script>
+ </script> -->
<!-- <script
type="text/javascript"
src="https://webapi.amap.com/maps?v=1.4.15&key=f003ec4feb3fcc4cf0742e94f569fd33&plugin=AMap.PlaceSearch,AMap.Geocoder,Map3D,ElasticMarker,AMap.Driving,AMap.TruckDriving"
></script> -->
- <!-- <script type="text/javascript" src='https://webapi.amap.com/maps?v=2.0&key=f003ec4feb3fcc4cf0742e94f569fd33&plugin=AMap.PlaceSearch,AMap.Geocoder,Map3D,ElasticMarker,AMap.Driving,'></script>-->
+ <script
+ type="text/javascript"
+ src="https://webapi.amap.com/maps?v=2.0&key=f003ec4feb3fcc4cf0742e94f569fd33&plugin=AMap.PlaceSearch,AMap.Geocoder,Map3D,ElasticMarker,AMap.Driving,"
+ ></script>
- <!-- <script src="//webapi.amap.com/ui/1.1/main.js"></script> -->
+ <script src="//webapi.amap.com/ui/1.1/main.js"></script>
<script
type="text/javascript"
src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=FpjVxjf9nGo47eLj9I0ZuUvSZm1wGGqr"
diff --git a/src/api/waybill/WaybillOrderList.js b/src/api/waybill/WaybillOrderList.js
index 74f9f3bc..94626765 100644
--- a/src/api/waybill/WaybillOrderList.js
+++ b/src/api/waybill/WaybillOrderList.js
@@ -98,7 +98,7 @@ export const postUpdateWaybillTypeService = data => {
*/
export const postFindZeroWaybillLabelInfo = data => {
return request({
- url: '/apilogpm-trunkline/openOrder/findZeroWaybillLabelInfo',
+ url: '/api/logpm-trunkline/openOrder/findZeroWaybillLabelInfo',
method: 'post',
data,
});
diff --git a/src/views/basicdata/warehouse/defaultShipper.vue b/src/views/basicdata/warehouse/defaultShipper.vue
index 7e3570f9..cc207e5e 100644
--- a/src/views/basicdata/warehouse/defaultShipper.vue
+++ b/src/views/basicdata/warehouse/defaultShipper.vue
@@ -95,9 +95,9 @@
background
@size-change="sizeChange"
@current-change="currentChange"
- :current-page="page.current"
+ :current-page="page.gageNum"
:page-sizes="[30, 50, 80, 120, 5000]"
- :page-size="page.size"
+ :page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
@@ -277,8 +277,8 @@ const details = reactive<any>({
drawerShow: false,
/** 分页参数 */
page: {
- current: 1,
- size: 30,
+ gageNum: 1,
+ pageSize: 30,
total: 0,
},
/** 列表Dom节点 */
@@ -340,7 +340,7 @@ const onLoad = async (params = {}) => {
};
const initOnLoad = (params = {}) => {
- details.page.current = 1;
+ details.page.pageNum = 1;
details.page.total = 0;
onLoad(params);
};
@@ -368,7 +368,7 @@ const handleData = (key, res) => {
// 获取字典数据
const initData = async () => {
try {
- details.page.current = 1;
+ details.page.pageNum = 1;
details.loadingObj.pageLoading = true;
@@ -406,7 +406,7 @@ const searchChange = () => {
/** 清空表单 */
const searchReset = () => {
details.query = {};
- details.page.current = 1;
+ details.page.pageNum = 1;
handleClearTableQuery(details.columnList);
initOnLoad();
};
@@ -455,13 +455,13 @@ const selectionChange = (list: any) => {
/** 每页数量改变执行的回调 */
const sizeChange = (size: number) => {
- details.page.size = size;
+ details.page.pageSize = size;
initOnLoad();
};
/** 页码改变执行的回调 */
const currentChange = current => {
- details.page.current = current;
+ details.page.pageNum = current;
onLoad();
};