From 00cf6c13531447af59a8d2121bbfb1a3a1f68c0d Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 06 六月 2025 09:15:29 +0800
Subject: [PATCH] Merge branch 'main' of http://lanpucloud.cn:1111/r/eims-master
---
eims-ui/apps/web-antd/src/views/eims/inventory-detail/index.vue | 38 +++++++++++---------------------------
1 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/eims-ui/apps/web-antd/src/views/eims/inventory-detail/index.vue b/eims-ui/apps/web-antd/src/views/eims/inventory-detail/index.vue
index d8fdaae..ed4f20c 100644
--- a/eims-ui/apps/web-antd/src/views/eims/inventory-detail/index.vue
+++ b/eims-ui/apps/web-antd/src/views/eims/inventory-detail/index.vue
@@ -29,7 +29,7 @@
// 鏈洏鐐�
const noCheck = ref<string>('鏈洏');
// 鏌ヨ娣诲姞鐩樼偣鏍囪杩囨护
-const checkFilter = ref<string>();
+const checkFilter = ref<string>('');
const formOptions: VbenFormProps = {
commonConfig: {
@@ -42,7 +42,7 @@
wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
handleReset: async () => {
selectTypeId.value = [];
- checkFilter.value = undefined;
+ checkFilter.value = '';
// eslint-disable-next-line no-use-before-define
const { formApi, reload } = tableApi;
await formApi.resetForm();
@@ -102,14 +102,13 @@
const data0 = data.filter((item) => {
return item.status === '' || item.status === null || item.status === '0';
});
- if (data0 !== null && data0.length > 0) {
- noCheck.value = `鏈洏(${data0.length})`;
- }
- const data1 = data.filter((item) => {
- return item.status !== '' && item.status !== null && item.status === '1';
- });
- if (data1 !== null && data1.length > 0) {
- check.value = `宸茬洏(${data1.length})`;
+ // 涓嶇偣鍑诲凡鐩樺拰鏈洏鏃舵墠鏇存柊宸茬洏鍜屾湭鐩樼殑缁熻鏁版嵁
+ if (checkFilter.value === '') {
+ noCheck.value = data0 !== null && data0.length > 0 ? `鏈洏(${data0.length})` : `鏈洏(0)`;
+ const data1 = data.filter((item) => {
+ return item.status !== '' && item.status !== null && item.status === '1';
+ });
+ check.value = data1 !== null && data1.length > 0 ? `宸茬洏(${data1.length})` : `宸茬洏(0)`;
}
});
}
@@ -163,25 +162,18 @@
}
});
}
+
function handleDownloadExcel() {
commonDownloadExcel(inventoryDetailExport, '鐩樼偣鏄庣粏', tableApi.formApi.form.values, {
fieldMappingTime: formOptions.fieldMappingTime
});
}
-function getImportStatus(row: any) {
- const importStatus = row.importStatus === null || row.importStatus;
- return importStatus ? '鏈鍏�' : '宸插鍏�';
-}
-
-function getInventoryFlag(row: any) {
- const inventoryFlag = row.inventoryFlag === null || row.inventoryFlag;
- return inventoryFlag ? '鏈洏鐐�' : '宸茬洏鐐�';
-}
function handleQuery(isChecked: string) {
checkFilter.value = isChecked;
tableApi.query();
}
+
const { hasAccessByRoles } = useAccess();
const isSuperAdmin = computed(() => hasAccessByRoles(['superadmin']));
</script>
@@ -221,14 +213,6 @@
</ghost-button>
</Popconfirm>
</Space>
- </template>
-
- <template #importStatus="{ row }">
- <span>{{ getImportStatus(row) }}</span>
- </template>
-
- <template #inventoryFlag="{ row }">
- <span>{{ getInventoryFlag(row) }}</span>
</template>
</BasicTable>
</div>
--
Gitblit v1.9.3