From fcbb4059f11d1e2b320d581bf6f960d9965142c6 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 08 七月 2025 08:58:18 +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/order/orderDetlLog/index.vue | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-admin/src/views/order/orderDetlLog/index.vue b/zy-asrs-admin/src/views/order/orderDetlLog/index.vue
index 15260b5..0a99690 100644
--- a/zy-asrs-admin/src/views/order/orderDetlLog/index.vue
+++ b/zy-asrs-admin/src/views/order/orderDetlLog/index.vue
@@ -20,6 +20,8 @@
const state = reactive({
selectedRowKeys: [],
loading: false,
+ orderType: 1
+
});
let tableData = ref([]);
@@ -53,6 +55,13 @@
...getColumnSearchProps('anfme'),
},
{
+ title: formatMessage('db.man_order_log.order_type', '鍗曟嵁绫诲瀷'),
+ dataIndex: 'orderType$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderType$'),
+ },
+ {
title: formatMessage('db.man_order_detl_log.qty', '宸插畬鎴愭暟閲�'),
dataIndex: 'qty',
width: 140,
@@ -72,6 +81,13 @@
width: 140,
ellipsis: true,
...getColumnSearchProps('matId$'),
+ },
+ {
+ title: formatMessage('db.man_order_detl.maktx', '鐗╂枡鍚嶇О'),
+ dataIndex: 'maktx',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('maktx'),
},
{
title: formatMessage('db.man_order_detl_log.batch', '鎵瑰彿'),
@@ -152,6 +168,7 @@
post('/api/orderDetlLog/page', {
current: currentPage,
pageSize: pageSize,
+ orderType: state.orderType,
condition: searchInput.value
}).then((resp) => {
let result = resp.data;
@@ -237,8 +254,14 @@
<div>
<EditView ref="editChild" @tableReload="handleTableReload" />
<div class="table-header">
- <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
- style="width: 200px;" @search="onSearch" />
+ <div>
+ <a-select v-model:value="state.orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '璇烽�夋嫨鍗曟嵁绫诲瀷')"
+ :options="[
+ { label: '鎵嬪姩鍏ュ簱鍗�', value: 1 }, { label: '鎵嬪姩鍑哄簱鍗�', value: 2 },]" style="width: 160px;margin: 0 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-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
<a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
@@ -247,13 +270,14 @@
<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="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