From 111e559e11137ba87db3ff978db933170b7cb158 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 05 七月 2025 15:58:06 +0800
Subject: [PATCH] no message

---
 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 b5f3a32..8b26812 100644
--- a/zy-asrs-admin/src/components/order/order/order.vue
+++ b/zy-asrs-admin/src/components/order/order/order.vue
@@ -25,6 +25,7 @@
 let currentPage = 1;
 let pageSize = 10;
 const searchInput = ref("")
+const orderType = ref(null)
 const editChild = ref(null)
 const showOrderDetlChild = ref(null)
 
@@ -158,10 +159,11 @@
     current: currentPage,
     pageSize: pageSize,
     condition: searchInput.value,
+    orderType: orderType.value,
   }).then((resp) => {
     let result = resp.data;
     if (result.code == 200) {
-        console.log('--------->')
+      console.log('--------->')
       let data = result.data;
       tableData.value = data;
 
@@ -290,8 +292,13 @@
     <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: 1 }, { label: '鎵嬪姩鍑哄簱鍗�', value: 2 }, ]" 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>
@@ -324,15 +331,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