From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-admin/src/views/out/wave/index.vue | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-admin/src/views/out/wave/index.vue b/zy-asrs-admin/src/views/out/wave/index.vue
index aac8b81..e467f3c 100644
--- a/zy-asrs-admin/src/views/out/wave/index.vue
+++ b/zy-asrs-admin/src/views/out/wave/index.vue
@@ -16,6 +16,11 @@
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
+const searchParam = ref({
+ waveNo: null,
+ matnr: null,
+ batch: null,
+})
const editChild = ref(null)
const orderOutWavePreviewChild = ref(null);
@@ -133,7 +138,8 @@
post('/api/wave/page', {
current: currentPage,
pageSize: pageSize,
- condition: searchInput.value
+ condition: searchInput.value,
+ _param: searchParam.value,
}).then((resp) => {
let result = resp.data;
if (result.code == 200) {
@@ -300,8 +306,17 @@
<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-input v-model:value="searchParam.waveNo" :placeholder="formatMessage('page.wave.waveNo.input', '璇疯緭鍏ユ尝娆″彿')"
+ style="width: 140px;margin-right: 10px;" />
+ <a-input v-model:value="searchParam.matnr" :placeholder="formatMessage('page.wave.matnr.input', '璇疯緭鍏ュ晢鍝佺紪鍙�')"
+ style="width: 140px;margin-right: 10px;" />
+ <a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.wave.batch.input', '璇疯緭鍏ユ壒鍙�')"
+ style="width: 140px;margin-right: 10px;" />
+
+ <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>
@@ -313,10 +328,11 @@
<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="handleGenerateOut(record.waveId)">{{
- formatMessage('page.generateOut',
- '鐢熸垚鍑哄簱浠诲姟')
- }}</a-button>
+ <a-button type="link" primary :disabled="record.waveStatus != 0"
+ @click="handleGenerateOut(record.waveId)">{{
+ formatMessage('page.generateOut',
+ '鐢熸垚鍑哄簱浠诲姟')
+ }}</a-button>
<a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.cancel', '鍙栨秷')
}}</a-button>
</div>
--
Gitblit v1.9.1