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/components/order/order/orderIn.vue | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/orderIn.vue b/zy-asrs-admin/src/components/order/order/orderIn.vue
index c8fd6d6..d93b74e 100644
--- a/zy-asrs-admin/src/components/order/order/orderIn.vue
+++ b/zy-asrs-admin/src/components/order/order/orderIn.vue
@@ -1,5 +1,5 @@
<script setup>
-import {getCurrentInstance, ref, computed, reactive, defineProps, nextTick} from 'vue';
+import { getCurrentInstance, ref, computed, reactive, defineProps, nextTick } from 'vue';
import { useRouter } from "vue-router";
import { get, post, postBlob, postForm } from '@/utils/request.js'
import { message, Modal } from 'ant-design-vue';
@@ -14,10 +14,12 @@
UploadOutlined,
DownloadOutlined,
} from "@ant-design/icons-vue";
+import { filters } from 'pixi.js';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
-
+const orderBy = ref({});
+const order = ref("")
const props = defineProps({
ioModel: null
})
@@ -60,6 +62,7 @@
dataIndex: 'orderTime',
width: 180,
ellipsis: true,
+ sorter: true,
...getColumnSearchProps('orderTime'),
},
{
@@ -145,14 +148,26 @@
state.selectedRowKeys = [];
}, 1000);
};
+
const onSelectChange = selectedRowKeys => {
// 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: sorter.field }
+ } else if (sorter?.order == "descend") {
+ orderBy.__v_raw = { order: "desc", field: sorter.field }
+ }
+ }
+
+ getPage()
+}
+
function getPage() {
state.loading = true;
-
let apiUrl = '/api/order/page';
if (props.ioModel == 'in') {
apiUrl = '/api/order/in/page';
@@ -161,6 +176,7 @@
}
post(apiUrl, {
+ orderBy: orderBy?.__v_raw,
current: currentPage,
pageSize: pageSize,
condition: searchInput.value,
@@ -254,7 +270,7 @@
};
const onSearch = () => {
- currentPage = 1;
+ currentPage = 1;
getPage()
}
@@ -343,13 +359,15 @@
<div>
<a-input v-model:value="searchParam.orderNo" :placeholder="formatMessage('page.order.orderNo.input', '璇疯緭鍏ヨ鍗曠紪鍙�')"
style="width: 140px;margin-right: 10px;" />
- <a-select v-model:value="searchParam.orderSettle" :placeholder="formatMessage('page.order.orderSettle.select', '璇烽�夋嫨鍗曟嵁鐘舵��')"
- style="width: 140px;margin-right: 10px;" show-search allowClear :options="orderSettleQueryList" optionFilterProp="label"
- optionLabelProp="label">
+ <a-select v-model:value="searchParam.orderSettle"
+ :placeholder="formatMessage('page.order.orderSettle.select', '璇烽�夋嫨鍗曟嵁鐘舵��')"
+ style="width: 140px;margin-right: 10px;" show-search allowClear :options="orderSettleQueryList"
+ optionFilterProp="label" optionLabelProp="label">
</a-select>
- <a-select v-model:value="searchParam.orderType" :placeholder="formatMessage('page.order.orderType.select', '璇烽�夋嫨鍗曟嵁绫诲瀷')"
- style="width: 140px;margin-right: 10px;" show-search allowClear :options="orderTypeQueryList" optionFilterProp="label"
- optionLabelProp="label">
+ <a-select v-model:value="searchParam.orderType"
+ :placeholder="formatMessage('page.order.orderType.select', '璇烽�夋嫨鍗曟嵁绫诲瀷')"
+ style="width: 140px;margin-right: 10px;" show-search allowClear :options="orderTypeQueryList"
+ optionFilterProp="label" optionLabelProp="label">
</a-select>
<a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
@@ -386,20 +404,20 @@
</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 }"
+ @change="handleTableChange" :pagination="{ total: tableData.total, onChange: onPageChange }"
:scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn"
:loading="state.loading">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
<a-button type="link" primary @click="showDetl(record)">{{ formatMessage('page.order.orderDetl', '璁㈠崟鏄庣粏')
- }}</a-button>
+ }}</a-button>
<a-button type="link" primary @click="handlePrint(record)">{{ formatMessage('page.order.orderDetl',
- '鎵撳嵃璁㈠崟')
- }}</a-button>
+ '鎵撳嵃璁㈠崟')
+ }}</a-button>
<a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button>
<a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
- }}</a-button>
+ }}</a-button>
</div>
</template>
</template>
--
Gitblit v1.9.1