From 06c4e59fa35c1b9e74da9cf3d081e78c13d17e20 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期一, 14 七月 2025 06:36:36 +0800
Subject: [PATCH] no message
---
zy-asrs-admin/src/views/base/loc/index.vue | 1 -
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java | 10 +++++-----
zy-asrs-admin/src/views/base/taskType/index.vue | 2 ++
zy-asrs-admin/src/components/mat/matQuery/index.vue | 1 +
zy-asrs-admin/src/views/base/orderType/index.vue | 2 ++
zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue | 12 ++++++++++--
6 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue b/zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue
index 6e27d01..88b8cfa 100644
--- a/zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue
+++ b/zy-asrs-admin/src/components/locDetl/selectLocDetl/index.vue
@@ -194,6 +194,12 @@
}
}
+const onPageChange = (page, size) => {
+ currentPage = page;
+ pageSize = size;
+ getPage();
+}
+
function getPage() {
state.loading = true;
@@ -205,7 +211,7 @@
let result = resp.data;
if (result.code == 200) {
let data = result.data;
- tableData.value = data.records;
+ tableData.value = data;
state.loading = false;
} else if (result.code === 401) {
@@ -243,6 +249,7 @@
}
const onSearch = () => {
+ currentPage = 1;
getPage()
}
@@ -281,7 +288,8 @@
style="width: 200px;" @search="onSearch" />
</div>
<a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
- :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id" :scroll="{ y: 768 }"
+ :pagination="{ total: tableData.total, onChange: onPageChange }"
+ :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id" :scroll="{ y: 768 }"
:columns="state.columns" :loading="state.loading">
</a-table>
</a-modal>
diff --git a/zy-asrs-admin/src/components/mat/matQuery/index.vue b/zy-asrs-admin/src/components/mat/matQuery/index.vue
index 4dc91f2..25da040 100644
--- a/zy-asrs-admin/src/components/mat/matQuery/index.vue
+++ b/zy-asrs-admin/src/components/mat/matQuery/index.vue
@@ -336,6 +336,7 @@
}
const onSearch = () => {
+ currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/loc/index.vue b/zy-asrs-admin/src/views/base/loc/index.vue
index 59b6477..6ee7b1d 100644
--- a/zy-asrs-admin/src/views/base/loc/index.vue
+++ b/zy-asrs-admin/src/views/base/loc/index.vue
@@ -245,7 +245,6 @@
};
const onSearch = () => {
- // console.log('search');
currentPage = 1;
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/orderType/index.vue b/zy-asrs-admin/src/views/base/orderType/index.vue
index d73c571..ec8924b 100644
--- a/zy-asrs-admin/src/views/base/orderType/index.vue
+++ b/zy-asrs-admin/src/views/base/orderType/index.vue
@@ -188,6 +188,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
// console.log('search');
getPage()
}
diff --git a/zy-asrs-admin/src/views/base/taskType/index.vue b/zy-asrs-admin/src/views/base/taskType/index.vue
index bcd59cd..48ce1b5 100644
--- a/zy-asrs-admin/src/views/base/taskType/index.vue
+++ b/zy-asrs-admin/src/views/base/taskType/index.vue
@@ -174,6 +174,8 @@
};
const onSearch = () => {
+ currentPage = 1;
+
// console.log('search');
getPage()
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
index 6c98627..bd1e650 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
@@ -67,11 +67,11 @@
PageParam<ViewLocDetl, BaseParam> pageParam = new PageParam<>(baseParam, ViewLocDetl.class);
QueryWrapper<ViewLocDetl> queryWrapper = pageParam.buildWrapper(true);
- List<Long> locIds = locService.listBySts(LocStsType.F.val());
- if (locIds.isEmpty()) {
- locIds.add(-1L);
- }
- queryWrapper.in("loc_id", locIds);
+// List<Long> locIds = locService.listBySts(LocStsType.F.val());
+// if (locIds.isEmpty()) {
+// locIds.add(-1L);
+// }
+// queryWrapper.in("loc_id", locIds);
PageParam<ViewLocDetl, BaseParam> data = locDetlService.getPage(pageParam, queryWrapper);
return R.ok().add(data);
}
--
Gitblit v1.9.1