From c0b871d491731e4b32f3c9249770c1d4aee4f7f5 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 10:47:37 +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/order.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/order.vue b/zy-asrs-admin/src/components/order/order/order.vue
index 8b26812..e97fd03 100644
--- a/zy-asrs-admin/src/components/order/order/order.vue
+++ b/zy-asrs-admin/src/components/order/order/order.vue
@@ -32,6 +32,7 @@
const state = reactive({
selectedRowKeys: [],
loading: false,
+ orderSettle: 1,
});
let tableData = ref([]);
@@ -160,13 +161,13 @@
pageSize: pageSize,
condition: searchInput.value,
orderType: orderType.value,
+ orderSettle: state.orderSettle,
+
}).then((resp) => {
let result = resp.data;
if (result.code == 200) {
- console.log('--------->')
let data = result.data;
tableData.value = data;
-
state.loading = false;
} else if (result.code === 401) {
message.error(result.msg);
@@ -292,9 +293,17 @@
<EditView ref="editChild" @tableReload="handleTableReload"
:ioModel="ioModel == 'in' ? 1 : ioModel == 'out' ? 2 : null" />
<div class="table-header">
- <div style="margin-left : 10px;">
- <a-select v-model:value="orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍗曟嵁绫诲瀷')" :options="[
- { label: '鎵嬪姩鍏ュ簱鍗�', value: 1 }, { label: '鎵嬪姩鍑哄簱鍗�', value: 2 }, ]" style="width: 160px;margin-right: 10px;">
+ <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" />
@@ -312,7 +321,6 @@
{{ formatMessage('page.order.import', '鍗曟嵁瀵煎叆') }}
</a-upload>
</a-menu-item>
-
<a-menu-item key="export">
<DownloadOutlined />
{{ formatMessage('page.order.export.template', '瀵煎嚭妯℃澘') }}
--
Gitblit v1.9.1