From 1e65e680519a32480219e1866baa245df1a8fd17 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 09 八月 2025 16:19:36 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-admin/src/views/loc/locDetl/index.vue | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 66a2c7c..2afcbdc 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -14,6 +14,7 @@
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
+const orderBy = ref({});
const searchParam = ref({
locNo: null,
matnr: null,
@@ -52,6 +53,19 @@
// console.log('selectedRowKeys changed: ', selectedRowKeys);
state.selectedRowKeys = selectedRowKeys;
};
+
+
+const handleTableChange = (pagination, filters, sorter) => {
+ if (sorter != null) {
+ if (sorter?.order == "ascend") {
+ orderBy.__v_raw = { order: "asc", field: "createTime" }
+ } else if (sorter?.order == "descend") {
+ orderBy.__v_raw = { order: "desc", field: "createTime" }
+ }
+ }
+
+ getPage()
+}
state.columns = [
// {
@@ -136,6 +150,7 @@
dataIndex: 'dewell$',
width: 140,
ellipsis: true,
+ sorter: true,
...getColumnSearchProps('dewell$'),
},
{
@@ -236,6 +251,7 @@
function getPage() {
state.loading = true;
post('/api/locDetl/page', {
+ orderBy: orderBy.__v_raw,
current: currentPage,
pageSize: pageSize,
condition: searchInput.value,
@@ -245,7 +261,6 @@
if (result.code == 200) {
let data = result.data;
tableData.value = data;
-
state.loading = false;
} else if (result.code === 401) {
message.error(result.msg);
@@ -277,7 +292,6 @@
post('/api/out/locs/stock', params).then(resp => {
let result = resp.data;
if (result.code === 200) {
- console.log(result);
message.success(result.msg);
} else {
message.error(result.msg);
@@ -333,7 +347,6 @@
};
const onSearch = () => {
- // console.log('search');
currentPage = 1;
getPage()
}
@@ -348,12 +361,15 @@
getPage()
}
+const total = computed(() => tableData.value?.records?.reduce((sum, item) => sum + item.anfme, 0))
+
</script>
<script>
export default {
- name: '搴撳瓨鏄庣粏'
+ name: '搴撳瓨鏄庣粏',
}
+
</script>
<template>
@@ -372,9 +388,10 @@
style="width: 140px;margin-right: 10px;" />
<a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.locDetl.batch.input', '璇疯緭鍏ユ壒鍙�')"
style="width: 140px;margin-right: 10px;" />
- <a-select v-model:value="searchParam.orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '浠撳簱绫诲瀷')"
- :options="[
- { label: '鍏ㄩ儴', value: null }, { label: '绔嬪簱', value: 1 }, { label: '骞冲簱', value: 2 }]" style="width: 140px;margin-right: 10px;">
+ <a-select v-model:value="searchParam.orderType"
+ :placeholder="formatMessage('page.locDetl.orderNo.input', '浠撳簱绫诲瀷')" :options="[
+ { label: '鍏ㄩ儴', value: null }, { label: '绔嬪簱', value: 1 }, { label: '骞冲簱', value: 2 }]"
+ style="width: 140px;margin-right: 10px;">
</a-select>
<a-select v-model:value="searchParam.tagId" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍝佺被')"
:options="[
@@ -394,7 +411,7 @@
</div>
<a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
:data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
- :pagination="{ total: tableData.total, onChange: onPageChange }"
+ :pagination="{ total: tableData.total, onChange: onPageChange }" @change="handleTableChange"
:scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="state.columns" @resizeColumn="handleResizeColumn"
:loading="state.loading">
<template #bodyCell="{ column, text, record }">
@@ -406,6 +423,11 @@
</div>
</template>
</template>
+ <template #footer>
+ <div>
+ <span>褰撳墠椤垫�婚噺锛歿{ total }}</span>
+ </div>
+ </template>
</a-table>
</div>
</template>
--
Gitblit v1.9.1