From dd3974663eb71fcddbc45f5361fd4512e6dad91a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 05 八月 2025 11:30:58 +0800
Subject: [PATCH] no message
---
zy-asrs-admin/src/components/order/order/order.vue | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/order.vue b/zy-asrs-admin/src/components/order/order/order.vue
index d23db87..b2cc644 100644
--- a/zy-asrs-admin/src/components/order/order/order.vue
+++ b/zy-asrs-admin/src/components/order/order/order.vue
@@ -25,12 +25,14 @@
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
+const orderType = ref(null)
const editChild = ref(null)
const showOrderDetlChild = ref(null)
const state = reactive({
selectedRowKeys: [],
loading: false,
+ orderSettle: 1,
});
let tableData = ref([]);
@@ -158,12 +160,14 @@
current: currentPage,
pageSize: pageSize,
condition: searchInput.value,
+ orderType: orderType.value,
+ orderSettle: state.orderSettle,
+
}).then((resp) => {
let result = resp.data;
if (result.code == 200) {
let data = result.data;
tableData.value = data;
-
state.loading = false;
} else if (result.code === 401) {
message.error(result.msg);
@@ -224,6 +228,8 @@
const onSearch = () => {
// console.log('search');
+ currentPage = 1;
+
getPage()
}
@@ -289,8 +295,21 @@
<EditView ref="editChild" @tableReload="handleTableReload"
:ioModel="ioModel == 'in' ? 1 : ioModel == 'out' ? 2 : null" />
<div class="table-header">
- <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
- style="width: 200px;" @search="onSearch" />
+ <div style="margin-left : 10px;">
+ <a-select v-model:value="orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍗曟嵁绫诲瀷')"
+ :options="[
+ { label: '鍏ㄩ儴', value: null },{ label: '鎵嬪姩鍏ュ簱鍗�', value: 1 }, { label: '鎵嬪姩鍑哄簱鍗�', value: 2 },]" style="width: 160px;margin-right: 10px;">
+ </a-select>
+ <a-select v-model:value="state.orderSettle" :placeholder="formatMessage('page.locDetl.orderNo.input', '璁㈠崟鐘舵��')"
+ :options="[
+ { label: '鍏ㄩ儴', value: null },
+ { label: '鍒濆鍖�', value: 1 }, { label: '寰呭鐞�', value: 2 },{ label: '鐢熸垚娉㈡', value: 3 }, { label: '浣滀笟涓�', value: 4 },
+ { label: '宸插彇娑�', value: 5 }, { label: '宸插畬鎴�', value: 6 },{ label: '鍑嗗鍙栨秷', value: 7 }, { label: '涓婃姤瀹屾垚', value: 8 },
+ ]" style="width: 160px;margin-right: 10px;">
+ </a-select>
+ <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
+ style="width: 200px;" @search="onSearch" />
+ </div>
<div class="table-header-right">
<a-dropdown>
<template #overlay>
@@ -304,7 +323,6 @@
{{ formatMessage('page.order.import', '鍗曟嵁瀵煎叆') }}
</a-upload>
</a-menu-item>
-
<a-menu-item key="export">
<DownloadOutlined />
{{ formatMessage('page.order.export.template', '瀵煎嚭妯℃澘') }}
@@ -323,15 +341,16 @@
<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 }"
- :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn" :loading="state.loading">
+ :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="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