From db2c3d7fe3d1e89b49b9628f408ba883dc75dc51 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 17:11:43 +0800
Subject: [PATCH] no message
---
zy-asrs-admin/src/views/log/viewWorkIn/index.vue | 47 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-admin/src/views/log/viewWorkIn/index.vue b/zy-asrs-admin/src/views/log/viewWorkIn/index.vue
index 7f3d506..948b846 100644
--- a/zy-asrs-admin/src/views/log/viewWorkIn/index.vue
+++ b/zy-asrs-admin/src/views/log/viewWorkIn/index.vue
@@ -14,6 +14,14 @@
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
+const searchParam = ref({
+ createTime: null,
+ targetLoc: null,
+ matnr: null,
+ maktx: null,
+ batch: null,
+ barcode: null,
+})
const editChild = ref(null)
const state = reactive({
@@ -31,6 +39,13 @@
} = useTableSearch();
state.columns = [
+ {
+ title: formatMessage('db.view_work_in.matnr', '鍏ュ簱鍗曞彿'),
+ dataIndex: 'orderNo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('orderNo'),
+ },
{
title: formatMessage('db.view_work_in.create_time', '鍏ュ簱鏃ユ湡'),
dataIndex: 'createTime$',
@@ -102,7 +117,8 @@
post('/api/viewWorkIn/page', {
current: currentPage,
pageSize: pageSize,
- condition: searchInput.value
+ condition: searchInput.value,
+ _param: searchParam.value,
}).then((resp) => {
let result = resp.data;
if (result.code == 200) {
@@ -150,7 +166,8 @@
const handleExport = async (intl) => {
postBlob('/api/viewWorkIn/export', {
- condition: searchInput.value
+ condition: searchInput.value,
+ _param: searchParam.value,
}).then(result => {
const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
@@ -183,13 +200,27 @@
<template>
<div>
- <div class="table-header">
- <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
- style="width: 200px;" @search="onSearch" />
- <div class="table-header-right">
- <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
- </div>
+ <div class="table-header">
+ <div>
+ <a-input v-model:value="searchParam.createTime" :placeholder="formatMessage('page.locDetl.createTime.input', '鍏ュ簱鏃ユ湡')"
+ style="width: 140px;margin-right: 10px;"/>
+ <a-input v-model:value="searchParam.targetLoc" :placeholder="formatMessage('page.locDetl.targetLoc.input', '搴撲綅鍙�')"
+ style="width: 140px;margin-right: 10px;"/>
+ <a-input v-model:value="searchParam.matnr" :placeholder="formatMessage('page.locDetl.matnr.input', '鍟嗗搧缂栧彿')"
+ style="width: 140px;margin-right: 10px;"/>
+ <a-input v-model:value="searchParam.maktx" :placeholder="formatMessage('page.locDetl.maktx.input', '鍟嗗搧鍚嶇О')"
+ style="width: 140px;margin-right: 10px;"/>
+ <a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.locDetl.batch.input', '鎵规')"
+ style="width: 140px;margin-right: 10px;"/>
+ <a-input v-model:value="searchParam.barcode" :placeholder="formatMessage('page.locDetl.barcode.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="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
+ </div>
+ </div>
<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 }"
--
Gitblit v1.9.1