Browse Source

修复部分bug

dev
qb 4 weeks ago
parent
commit
02e940df9b
  1. 11
      index.html
  2. 2
      src/api/waybill/WaybillOrderList.js
  3. 18
      src/views/basicdata/warehouse/defaultShipper.vue

11
index.html

@ -60,7 +60,7 @@
}; };
</script> </script>
<script> <!-- <script>
const initWebMap = () => { const initWebMap = () => {
const keyArr = ['f003ec4feb3fcc4cf0742e94f569fd33', 'e162844c0ee510af1b6480bd64eb66f7']; const keyArr = ['f003ec4feb3fcc4cf0742e94f569fd33', 'e162844c0ee510af1b6480bd64eb66f7'];
const random = Math.random() * 10; const random = Math.random() * 10;
@ -82,15 +82,18 @@
}; };
initWebMap(); initWebMap();
</script> </script> -->
<!-- <script <!-- <script
type="text/javascript" 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" 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> -->
<!-- <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 <script
type="text/javascript" type="text/javascript"
src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=FpjVxjf9nGo47eLj9I0ZuUvSZm1wGGqr" src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=FpjVxjf9nGo47eLj9I0ZuUvSZm1wGGqr"

2
src/api/waybill/WaybillOrderList.js

@ -98,7 +98,7 @@ export const postUpdateWaybillTypeService = data => {
*/ */
export const postFindZeroWaybillLabelInfo = data => { export const postFindZeroWaybillLabelInfo = data => {
return request({ return request({
url: '/apilogpm-trunkline/openOrder/findZeroWaybillLabelInfo', url: '/api/logpm-trunkline/openOrder/findZeroWaybillLabelInfo',
method: 'post', method: 'post',
data, data,
}); });

18
src/views/basicdata/warehouse/defaultShipper.vue

@ -95,9 +95,9 @@
background background
@size-change="sizeChange" @size-change="sizeChange"
@current-change="currentChange" @current-change="currentChange"
:current-page="page.current" :current-page="page.gageNum"
:page-sizes="[30, 50, 80, 120, 5000]" :page-sizes="[30, 50, 80, 120, 5000]"
:page-size="page.size" :page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="page.total" :total="page.total"
> >
@ -277,8 +277,8 @@ const details = reactive<any>({
drawerShow: false, drawerShow: false,
/** 分页参数 */ /** 分页参数 */
page: { page: {
current: 1, gageNum: 1,
size: 30, pageSize: 30,
total: 0, total: 0,
}, },
/** 列表Dom节点 */ /** 列表Dom节点 */
@ -340,7 +340,7 @@ const onLoad = async (params = {}) => {
}; };
const initOnLoad = (params = {}) => { const initOnLoad = (params = {}) => {
details.page.current = 1; details.page.pageNum = 1;
details.page.total = 0; details.page.total = 0;
onLoad(params); onLoad(params);
}; };
@ -368,7 +368,7 @@ const handleData = (key, res) => {
// //
const initData = async () => { const initData = async () => {
try { try {
details.page.current = 1; details.page.pageNum = 1;
details.loadingObj.pageLoading = true; details.loadingObj.pageLoading = true;
@ -406,7 +406,7 @@ const searchChange = () => {
/** 清空表单 */ /** 清空表单 */
const searchReset = () => { const searchReset = () => {
details.query = {}; details.query = {};
details.page.current = 1; details.page.pageNum = 1;
handleClearTableQuery(details.columnList); handleClearTableQuery(details.columnList);
initOnLoad(); initOnLoad();
}; };
@ -455,13 +455,13 @@ const selectionChange = (list: any) => {
/** 每页数量改变执行的回调 */ /** 每页数量改变执行的回调 */
const sizeChange = (size: number) => { const sizeChange = (size: number) => {
details.page.size = size; details.page.pageSize = size;
initOnLoad(); initOnLoad();
}; };
/** 页码改变执行的回调 */ /** 页码改变执行的回调 */
const currentChange = current => { const currentChange = current => {
details.page.current = current; details.page.pageNum = current;
onLoad(); onLoad();
}; };

Loading…
Cancel
Save