From ac45194a5ff830a0f355a76a202e1d4f1d15a35b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 26 九月 2024 13:07:15 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/loc/locDetl/index.vue | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index df7c012..d73ec77 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -15,7 +15,19 @@
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
+const searchParam = ref({
+ locNo: null,
+ matnr: null,
+ orderNo: null,
+ batch: null,
+})
const editChild = ref(null)
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+ columns: [],
+});
let tableData = ref([]);
getColumns();
@@ -26,11 +38,7 @@
handleResizeColumn,
} = useTableSearch();
-const state = reactive({
- selectedRowKeys: [],
- loading: false,
- columns: [],
-});
+
const hasSelected = computed(() => state.selectedRowKeys.length > 0);
const start = () => {
state.loading = true;
@@ -46,13 +54,13 @@
};
state.columns = [
- {
- title: formatMessage('db.man_loc_detl.loc_id', '搴撲綅'),
- dataIndex: 'locId$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('locId$'),
- },
+ // {
+ // title: formatMessage('db.man_loc_detl.loc_id', '搴撲綅'),
+ // dataIndex: 'locId$',
+ // width: 140,
+ // ellipsis: true,
+ // ...getColumnSearchProps('locId$'),
+ // },
{
title: formatMessage('db.man_loc_detl.loc_no', '搴撲綅鍙�'),
dataIndex: 'locNo',
@@ -178,15 +186,19 @@
}
function getPage() {
+ state.loading = true;
post('/api/locDetl/page', {
current: currentPage,
pageSize: pageSize,
- condition: searchInput.value
+ condition: searchInput.value,
+ _param: searchParam.value,
}).then((resp) => {
let result = resp.data;
if (result.code == 200) {
let data = result.data;
tableData.value = data;
+
+ state.loading = false;
} else if (result.code === 401) {
message.error(result.msg);
logout()
@@ -262,8 +274,19 @@
<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.locNo" :placeholder="formatMessage('page.locDetl.locNo.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.orderNo" :placeholder="formatMessage('page.locDetl.orderNo.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-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>
@@ -272,7 +295,8 @@
<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="state.columns" @resizeColumn="handleResizeColumn">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="state.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;">
--
Gitblit v1.9.1