From 89a5fedfe041ebacb2d81ecae1023b206cd3f353 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 四月 2025 09:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
eims-ui/apps/web-antd/src/views/eims/insp-st/index.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/eims-ui/apps/web-antd/src/views/eims/insp-st/index.vue b/eims-ui/apps/web-antd/src/views/eims/insp-st/index.vue
index 0319a0b..9f7a6cf 100644
--- a/eims-ui/apps/web-antd/src/views/eims/insp-st/index.vue
+++ b/eims-ui/apps/web-antd/src/views/eims/insp-st/index.vue
@@ -255,16 +255,17 @@
const monBtn = ref<any>('primary');
function queryData(type: ViewMode) {
+ // TODO 鏃ヨ鍥惧拰鏈堣鍥惧悗绔凡缁熶竴鏂规硶 鍓嶇鍙垹闄ゆ棩瑙嗗浘澶氫綑閰嶇疆
if (type === ViewMode.Day) {
dayBtn.value = 'primary';
monBtn.value = 'default';
curViewMode.value = ViewMode.Day;
- tableApi.setGridOptions(gridOptions2);
+ // tableApi.setGridOptions(gridOptions2);
} else if (type === ViewMode.Month) {
dayBtn.value = 'default';
monBtn.value = 'primary';
curViewMode.value = ViewMode.Month;
- tableApi.setGridOptions(gridOptions);
+ // tableApi.setGridOptions(gridOptions);
}
tableApi.query();
}
@@ -273,7 +274,7 @@
<template>
<Page :auto-content-height="true">
<div class="flex h-full gap-[8px] flex-col">
- <BasicTable class="h-2/3" table-title="鐐规璁板綍鍒楄〃">
+ <BasicTable class="h-2/3" table-title="鐐规姹囨�诲垪琛�">
<template #toolbar-tools>
<Space>
<Button :type="dayBtn" @click.stop="queryData(ViewMode.Day)">鏃ヨ鍥�</Button>
@@ -300,8 +301,7 @@
<ghost-button v-access:code="['eims:inspectSt:edit']" @click.stop="handleEdit(row)">
{{ $t('pages.common.edit') }}
</ghost-button>
- <Popconfirm :get-popup-container="getVxePopupContainer" placement="left" title="纭鍒犻櫎锛�"
- @confirm="handleDelete(row)">
+ <Popconfirm :get-popup-container="getVxePopupContainer" placement="left" title="纭鍒犻櫎锛�" @confirm="handleDelete(row)">
<ghost-button danger v-access:code="['eims:inspectSt:remove']" @click.stop="">
{{ $t('pages.common.delete') }}
</ghost-button>
@@ -309,8 +309,7 @@
</Space>
</template>
</BasicTable>
- <BasisSubTable :columns="recordCol" :list-api="listInspStRecord" :req-value="recordId" class="h-1/3"
- req-key="inspCode" title="鐐规璁板綍" />
+ <BasisSubTable :columns="recordCol" :list-api="listInspStRecord" :req-value="recordId" class="h-1/3" req-key="inspCode" title="鐐规璁板綍" />
</div>
<InspStDrawer @reload="tableApi.query()" />
</Page>
--
Gitblit v1.9.3