From 9518ee94bf232c771edd97e2c6a00ba5d7f18242 Mon Sep 17 00:00:00 2001 From: 朱桂飞 <zhuguifei@zhuguifeideMacBook-Air.local> Date: 星期五, 14 二月 2025 12:48:38 +0800 Subject: [PATCH] 修复盘点明细已盘未盘计数bug --- eims-ui/apps/web-antd/src/views/eims/inventory-detail/index.vue | 48 ++++++++++++++++++------------------------------ 1 files changed, 18 insertions(+), 30 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..6e35041 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,15 +102,15 @@ const data0 = data.filter((item) => { return item.status === '' || item.status === null || item.status === '0'; }); - if (data0 !== null && data0.length > 0) { - noCheck.value = `鏈洏(${data0.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)`; } - const data1 = data.filter((item) => { - return item.status !== '' && item.status !== null && item.status === '1'; - }); - if (data1 !== null && data1.length > 0) { - check.value = `宸茬洏(${data1.length})`; - } + }); } } @@ -163,25 +163,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> @@ -189,7 +182,8 @@ <template> <Page :auto-content-height="true"> <div class="flex h-full gap-[8px]"> - <EquTypeTree v-model:select-dept-id="selectTypeId" class="w-[260px]" @reload="() => tableApi.reload()" @select="() => tableApi.reload()" /> + <EquTypeTree v-model:select-dept-id="selectTypeId" class="w-[260px]" @reload="() => tableApi.reload()" + @select="() => tableApi.reload()" /> <BasicTable class="flex-1 overflow-hidden" table-title="鐩樼偣鏄庣粏鍒楄〃"> <template #toolbar-tools> <Space> @@ -212,23 +206,17 @@ <template #action="{ row }"> <Space> - <ghost-button :disabled="!isSuperAdmin" v-access:code="['eims:inventory:edit']" @click.stop="handleEdit(row)"> + <ghost-button :disabled="!isSuperAdmin" v-access:code="['eims:inventory: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 :disabled="!isSuperAdmin" danger v-access:code="['eims:inventory:remove']" @click.stop=""> {{ $t('pages.common.delete') }} </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