From fecaf0050852d71e42444e2216a8844474f0de29 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期五, 10 四月 2026 14:18:20 +0800
Subject: [PATCH] fix: 1.储丝单柜卷包产量处理包装机换班后产量不清零导致重复计算问题（2026.04.04后数据新增dac_up_time生效） 2.前端请求超时时间修改为20s
---
ruoyi-plus-soybean/src/views/qm/std/index.vue | 337 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 186 insertions(+), 151 deletions(-)
diff --git a/ruoyi-plus-soybean/src/views/qm/std/index.vue b/ruoyi-plus-soybean/src/views/qm/std/index.vue
old mode 100644
new mode 100755
index f4f6b03..8e719ae
--- a/ruoyi-plus-soybean/src/views/qm/std/index.vue
+++ b/ruoyi-plus-soybean/src/views/qm/std/index.vue
@@ -11,15 +11,18 @@
import ButtonIcon from '@/components/custom/button-icon.vue';
import StdOperateDrawer from './modules/std-operate-drawer.vue';
import StdSearch from './modules/std-search.vue';
+import StdSubTable from './modules/std-sub-table.vue';
defineOptions({
name: 'StdList'
});
-
const appStore = useAppStore();
const { download } = useDownload();
const { hasAuth } = useAuth();
+
+const selectedStdId = ref<CommonType.IdType | null>(null);
+const selectedStdCode = ref<string>('');
const searchParams = ref<Api.Qm.StdSearchParams>({
pageNum: 1,
@@ -37,127 +40,131 @@
const { columns, columnChecks, data, getData, getDataByPage, loading, mobilePagination, scrollX } =
useNaivePaginatedTable({
- api: () => fetchGetStdList(searchParams.value),
- transform: response => defaultTransform(response),
- onPaginationParamsChange: params => {
- searchParams.value.pageNum = params.page;
- searchParams.value.pageSize = params.pageSize;
- },
- columns: () => [
- {
- type: 'selection',
- align: 'center',
- width: 48
+ api: () => fetchGetStdList(searchParams.value),
+ transform: response => defaultTransform(response),
+ onPaginationParamsChange: params => {
+ searchParams.value.pageNum = params.page;
+ searchParams.value.pageSize = params.pageSize;
},
- {
- key: 'index',
- title: $t('common.index'),
- align: 'center',
- width: 64,
- render: (_, index) => index + 1
- },
+ columns: () => [
+ {
+ type: 'selection',
+ align: 'center',
+ width: 48
+ },
+ {
+ key: 'index',
+ title: $t('common.index'),
+ align: 'center',
+ width: 64,
+ render: (_, index) => index + 1
+ },
- {
- key: 'stdCode',
- title: '瑙勭▼浠ｇ爜',
- align: 'center',
- width: 200
- },
- {
- key: 'stdName',
- title: '瑙勭▼鍚嶇О',
- align: 'center',
- width: 300
- },
- {
- key: 'category',
- title: '鐗╂枡绫诲瀷',
- align: 'center',
- minWidth: 120,
- render: row => {
- const v = String(row?.category ?? '');
- return v === '0' ? '鎴愬搧' : v === '1' ? '杈呮枡' : v;
- }
- },
- {
- key: 'cdate',
- title: '鍒涘缓鏃堕棿',
- align: 'center',
- minWidth: 120,
- render: row => (row.cdate ? dayjs(row.cdate).format('YYYY-MM-DD') : '')
- },
- {
- key: 'ver',
- title: '鐗堟湰鍙�',
- align: 'center',
- minWidth: 120
- },
- {
- key: 'enable',
- title: '鍚敤鏍囪瘑',
- align: 'center',
- minWidth: 120,
- render: row => {
- const v = String(row?.enable ?? '');
- return v === '0' ? '鍋滅敤' : v === '1' ? '鍚敤' : v;
- }
- },
- {
- key: 'operate',
- title: $t('common.operate'),
- align: 'center',
- fixed: 'right',
- width: 130,
- render: row => {
- const divider = () => {
- if (!hasAuth('qm:std:edit') || !hasAuth('qm:std:remove')) {
- return null;
- }
- return <NDivider vertical />;
- };
+ {
+ key: 'stdCode',
+ title: '瑙勭▼浠ｇ爜',
+ align: 'center',
+ width: 200
+ },
+ {
+ key: 'stdName',
+ title: '瑙勭▼鍚嶇О',
+ align: 'center',
+ width: 300
+ },
+ {
+ key: 'category',
+ title: '鐗╂枡绫诲瀷',
+ align: 'center',
+ minWidth: 120,
+ render: row => {
+ const v = String(row?.category ?? '');
+ if (v === '0') return '鎴愬搧';
+ if (v === '1') return '杈呮枡';
+ return v;
+ }
+ },
+ {
+ key: 'cdate',
+ title: '鍒涘缓鏃堕棿',
+ align: 'center',
+ minWidth: 120,
+ render: row => (row.cdate ? dayjs(row.cdate).format('YYYY-MM-DD') : '')
+ },
+ {
+ key: 'ver',
+ title: '鐗堟湰鍙�',
+ align: 'center',
+ minWidth: 120
+ },
+ {
+ key: 'enable',
+ title: '鍚敤鏍囪瘑',
+ align: 'center',
+ minWidth: 120,
+ render: row => {
+ const v = String(row?.enable ?? '');
+ if (v === '0') return '鍋滅敤';
+ if (v === '1') return '鍚敤';
+ return v;
+ }
+ },
+ {
+ key: 'operate',
+ title: $t('common.operate'),
+ align: 'center',
+ fixed: 'right',
+ width: 130,
+ render: row => {
+ const divider = () => {
+ if (!hasAuth('qm:std:edit') || !hasAuth('qm:std:remove')) {
+ return null;
+ }
+ return <NDivider vertical />;
+ };
- const editBtn = () => {
- if (!hasAuth('qm:std:edit')) {
- return null;
- }
+ const editBtn = () => {
+ if (!hasAuth('qm:std:edit')) {
+ return null;
+ }
+ return (
+ <ButtonIcon
+ text
+ type="primary"
+ icon="material-symbols:drive-file-rename-outline-outline"
+ tooltipContent={$t('common.edit')}
+ onClick={() => edit(row.id)}
+ />
+ );
+ };
+
+ const deleteBtn = () => {
+ if (!hasAuth('qm:std:remove')) {
+ return null;
+ }
+ return (
+ <ButtonIcon
+ text
+ type="error"
+ icon="material-symbols:delete-outline"
+ tooltipContent={$t('common.delete')}
+ popconfirmContent={$t('common.confirmDelete')}
+ onPositiveClick={() => handleDelete(row.id)}
+ />
+ );
+ };
+
return (
- <ButtonIcon
- text
- type="primary"
- icon="material-symbols:drive-file-rename-outline-outline"
- tooltipContent={$t('common.edit')}
- onClick={() => edit(row.id)}
- />
+ <div class="flex-center gap-8px">
+ {editBtn()}
+ {divider()}
+ {deleteBtn()}
+ </div>
);
- };
-
- const deleteBtn = () => {
- if (!hasAuth('qm:std:remove')) {
- return null;
- }
- return (
- <ButtonIcon
- text
- type="error"
- icon="material-symbols:delete-outline"
- tooltipContent={$t('common.delete')}
- popconfirmContent={$t('common.confirmDelete')}
- onPositiveClick={() => handleDelete(row.id)}
- />
- );
- };
-
- return (
- <div class="flex-center gap-8px">
- {editBtn()}
- {divider()}
- {deleteBtn()}
- </div>
- );
+ }
}
- }
- ]
-});
+ ]
+ });
const { drawerVisible, operateType, editingData, handleAdd, handleEdit, checkedRowKeys, onBatchDeleted, onDeleted } =
useTableOperate(data, 'id', getData);
@@ -183,47 +190,75 @@
function handleExport() {
download('/qm/std/export', searchParams.value, `鍒ゅ畾瑙勭▼_${new Date().getTime()}.xlsx`);
}
+
+function handleRowClick(row: any) {
+ return {
+ onClick: (e: MouseEvent) => {
+ const target = e.target as HTMLElement | null;
+ if (target?.closest('.n-checkbox') || target?.closest('.n-button') || target?.closest('a')) return;
+ selectedStdId.value = row.id;
+ selectedStdCode.value = row.stdCode;
+ },
+ style: 'cursor: pointer;'
+ };
+}
</script>
<template>
<div class="min-h-500px flex-col-stretch gap-16px overflow-hidden lt-sm:overflow-auto">
<StdSearch v-model:model="searchParams" @search="getDataByPage" />
- <NCard title="鍒ゅ畾瑙勭▼鍒楄〃" :bordered="false" size="small" class="card-wrapper sm:flex-1-hidden">
- <template #header-extra>
- <TableHeaderOperation
- v-model:columns="columnChecks"
- :disabled-delete="checkedRowKeys.length === 0"
- :loading="loading"
- :show-add="hasAuth('qm:std:add')"
- :show-delete="hasAuth('qm:std:remove')"
- :show-export="hasAuth('qm:std:export')"
- @add="handleAdd"
- @delete="handleBatchDelete"
- @export="handleExport"
- @refresh="getData"
- />
- </template>
- <NDataTable
- v-model:checked-row-keys="checkedRowKeys"
- :columns="columns"
- :data="data"
+ <div class="std-content-area relative flex-col-stretch gap-16px sm:flex-1-hidden">
+ <NCard
+ title="鍒ゅ畾瑙勭▼鍒楄〃"
+ :bordered="false"
size="small"
- :flex-height="!appStore.isMobile"
- :scroll-x="scrollX"
- :loading="loading"
- remote
- :row-key="row => row.id"
- :pagination="mobilePagination"
- class="sm:h-full"
- />
- <StdOperateDrawer
- v-model:visible="drawerVisible"
- :operate-type="operateType"
- :row-data="editingData"
- @submitted="getDataByPage"
- />
- </NCard>
+ class="flex-col-stretch card-wrapper sm:flex-1-hidden"
+ :content-style="{ flex: 1, overflow: 'hidden', display: 'flex', flexDirection: 'column' }"
+ >
+ <template #header-extra>
+ <TableHeaderOperation
+ v-model:columns="columnChecks"
+ :disabled-delete="checkedRowKeys.length === 0"
+ :loading="loading"
+ :show-add="hasAuth('qm:std:add')"
+ :show-delete="hasAuth('qm:std:remove')"
+ :show-export="hasAuth('qm:std:export')"
+ @add="handleAdd"
+ @delete="handleBatchDelete"
+ @export="handleExport"
+ @refresh="getData"
+ />
+ </template>
+ <NDataTable
+ v-model:checked-row-keys="checkedRowKeys"
+ :columns="columns"
+ :data="data"
+ size="small"
+ :flex-height="!appStore.isMobile"
+ :scroll-x="scrollX"
+ :loading="loading"
+ remote
+ :row-key="row => row.id"
+ :pagination="mobilePagination"
+ :row-props="handleRowClick"
+ class="flex-1-hidden"
+ />
+ <StdOperateDrawer
+ v-model:visible="drawerVisible"
+ :operate-type="operateType"
+ :row-data="editingData"
+ @submitted="getDataByPage"
+ />
+ </NCard>
+ <StdSubTable :std-id="selectedStdId" :std-code="selectedStdCode" class="sm:flex-1-hidden" />
+ </div>
</div>
</template>
-<style scoped></style>
+<style scoped>
+:deep(.n-data-table-th),
+:deep(.n-data-table-td) {
+ padding: 4px 6px;
+ overflow: hidden;
+}
+</style>
--
Gitblit v1.9.3