From bb79260cbeeac88cfbadc9606eea57002e8945bc Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 17 四月 2025 09:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
eims-ui/apps/web-antd/src/views/eims/spare-in/index.vue | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/eims-ui/apps/web-antd/src/views/eims/spare-in/index.vue b/eims-ui/apps/web-antd/src/views/eims/spare-in/index.vue
index 7a054c4..f2f8183 100644
--- a/eims-ui/apps/web-antd/src/views/eims/spare-in/index.vue
+++ b/eims-ui/apps/web-antd/src/views/eims/spare-in/index.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { Recordable } from '@vben/types';
-import { onMounted } from 'vue';
+import { onMounted, ref } from 'vue';
import { Page, useVbenDrawer, type VbenFormProps } from '@vben/common-ui';
import { $t } from '@vben/locales';
@@ -16,6 +16,9 @@
import { columns, querySchema } from './data';
import drawer from './spare-in-drawer.vue';
+import { columns as inoutCol } from '#/views/eims/spare-inoutdt/data';
+import { listSpareInoutdt } from '#/api/eims/spare-inoutdt';
+import BasisSubTable from '#/views/eims/components/basis-sub-table.vue';
const formOptions: VbenFormProps = {
commonConfig: {
@@ -69,12 +72,16 @@
},
id: 'spre-inout-index'
};
-
+const inoutId = ref<string>();
const [BasicTable, tableApi] = useVbenVxeGrid({
formOptions,
gridOptions,
gridEvents: {
- sortChange: (sortParams) => vxeSortEvent(tableApi, sortParams)
+ sortChange: (sortParams) => vxeSortEvent(tableApi, sortParams),
+ cellClick: (e: any) => {
+ const { row } = e;
+ inoutId.value = row.id;
+ }
}
});
@@ -190,8 +197,8 @@
<template>
<Page :auto-content-height="true">
- <div class="flex h-full gap-[8px]">
- <BasicTable class="flex-1 overflow-hidden" table-title="澶囦欢鍏ュ簱鍗曞垪琛�">
+ <div class="flex h-full gap-[8px] flex-col">
+ <BasicTable class="h-2/3" table-title="澶囦欢鍏ュ簱鍗曞垪琛�">
<template #toolbar-tools>
<Space>
<a-button v-access:code="['eims:spareInout:export']" @click="handleDownloadExcel">
@@ -231,6 +238,14 @@
</Space>
</template>
</BasicTable>
+ <BasisSubTable
+ :columns="inoutCol"
+ :list-api="listSpareInoutdt"
+ :req-value="inoutId"
+ class="h-1/3"
+ req-key="inoutId"
+ title="鍏ュ簱鏄庣粏"
+ />
</div>
<Drawer @reload="tableApi.query()" />
</Page>
--
Gitblit v1.9.3