From 46624ce480a3c14da21f39cc4ad5f7eecea2bb1e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 17 九月 2026 16:24:28 +0800
Subject: [PATCH] feat(mes): 优化生产批次和袋码管理功能
---
src/views/basicData/mdm/index.vue | 97 ++++++++++++++++++------------------------------
1 files changed, 36 insertions(+), 61 deletions(-)
diff --git a/src/views/basicData/mdm/index.vue b/src/views/basicData/mdm/index.vue
index 4cc1c42..3a02fe0 100644
--- a/src/views/basicData/mdm/index.vue
+++ b/src/views/basicData/mdm/index.vue
@@ -1,14 +1,13 @@
<script lang="ts" setup>
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MdmItemApi } from '#/api/mdm/item';
-import type { MesMdItemTypeApi } from '#/api/mes/md/item/type';
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
import { confirm, Page, useVbenModal } from '#/packages/effects/common-ui/src';
import { downloadFileFromBlobPart, isEmpty } from '#/packages/utils/src';
-import { message, Tag } from 'ant-design-vue';
+import { message, Switch, Tag } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -17,8 +16,8 @@
// exportItem,
getItemPage,
updateItemStatus,
+ updateItemSync,
} from '#/api/mdm/item';
-import { getItemTypeSimpleList } from '#/api/mes/md/item/type';
import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data';
@@ -31,44 +30,6 @@
destroyOnClose: true,
});
-// 鍒嗙被鍒楄〃缂撳瓨
-const categoryList = ref<MesMdItemTypeApi.ItemType[]>([]);
-
-const TAG_COLORS = [
- 'green',
- 'orange',
- 'blue',
- 'purple',
- 'cyan',
- 'magenta',
- 'geekblue',
- 'volcano',
- 'gold',
- 'lime',
-] as const;
-
-/** 鍒嗙被ID 鈫� 棰滆壊鏄犲皠锛堝熀浜庡垎绫诲湪鍒楄〃涓殑绱㈠紩寰幆鍒嗛厤锛� */
-const categoryColorMap = computed(() => {
- const map = new Map<number, string>();
- categoryList.value.forEach((item, index) => {
- map.set(item.id!, TAG_COLORS[index % TAG_COLORS.length]!);
- });
- return map;
-});
-
-/** 鑾峰彇鍒嗙被Tag棰滆壊 */
-function getCategoryColor(categoryId?: number): string {
- if (!categoryId) return '';
- return categoryColorMap.value.get(categoryId) || '';
-}
-
-/** 鑾峰彇鍒嗙被鍚嶇О */
-function getCategoryName(categoryId?: number) {
- if (!categoryId || !categoryList.value.length) return '';
- const category = categoryList.value.find((item) => item.id === categoryId);
- return category?.name || '';
-}
-
/** 鍒锋柊琛ㄦ牸 */
function handleRefresh() {
gridApi.query();
@@ -77,20 +38,20 @@
/** 瀵煎嚭琛ㄦ牸 */
// async function handleExport() {
// const data = await exportItem(await gridApi.formApi.getValues());
-// downloadFileFromBlobPart({ fileName: '鐗╂枡.xls', source: data });
+// downloadFileFromBlobPart({ fileName: '鍝佺.xls', source: data });
// }
-/** 鍒涘缓鐗╂枡 */
+/** 鍒涘缓鍝佺 */
function handleCreate() {
formModalApi.setData(null).open();
}
-/** 缂栬緫鐗╂枡 */
+/** 缂栬緫鍝佺 */
function handleEdit(row: MdmItemApi.Item) {
formModalApi.setData(row).open();
}
-/** 鍒犻櫎鐗╂枡 */
+/** 鍒犻櫎鍝佺 */
async function handleDelete(row: MdmItemApi.Item) {
const hideLoading = message.loading({
content: $t('ui.actionMessage.deleting', [row.name]),
@@ -105,7 +66,7 @@
}
}
-/** 鎵归噺鍒犻櫎鐗╂枡 */
+/** 鎵归噺鍒犻櫎鍝佺 */
async function handleDeleteBatch() {
await confirm($t('ui.actionMessage.deleteBatchConfirm'));
const hideLoading = message.loading({
@@ -138,6 +99,23 @@
}
}
+const syncingId = ref<number | null>(null);
+
+/** 鍒囨崲鍚屾鐘舵�侊細鍏抽棴寮�鍏充細浠� MES 鍒犻櫎鍝佺锛岄渶纭 */
+async function handleSyncChange(row: MdmItemApi.Item, checked: boolean) {
+ if (!checked) {
+ await confirm('鍏抽棴鍚屾灏嗕粠 MES 鍒犻櫎璇ュ搧绉嶅強鍏宠仈閰嶇疆锛圔OM/SOP/SIP/鎵规閰嶇疆锛夛紝纭缁х画锛�');
+ }
+ syncingId.value = row.id!;
+ try {
+ await updateItemSync(row.id!, checked);
+ message.success(checked ? '宸插悓姝ュ埌 MES' : '宸插彇娑堝悓姝�');
+ handleRefresh();
+ } finally {
+ syncingId.value = null;
+ }
+}
+
const checkedIds = ref<number[]>([]);
function handleRowCheckboxChange({
records,
@@ -158,14 +136,6 @@
proxyConfig: {
ajax: {
query: async ({ page }, formValues) => {
- // 鍔犺浇鍒嗙被鍒楄〃锛堢敤浜庢樉绀哄垎绫诲悕绉帮級
- if (!categoryList.value.length) {
- try {
- categoryList.value = await getItemTypeSimpleList();
- } catch {
- categoryList.value = [];
- }
- }
return await getItemPage({
pageNo: page.currentPage,
pageSize: page.pageSize,
@@ -193,12 +163,12 @@
<template>
<Page auto-content-height>
<FormModal @success="handleRefresh" />
- <Grid table-title="鐗╂枡鍒楄〃">
+ <Grid table-title="鍝佺鍒楄〃">
<template #toolbar-tools>
<TableAction
:actions="[
{
- label: $t('ui.actionTitle.create', ['鐗╂枡']),
+ label: $t('ui.actionTitle.create', ['鍝佺']),
type: 'primary',
icon: ACTION_ICON.ADD,
auth: ['mdm:item:create'],
@@ -223,14 +193,19 @@
]"
/>
</template>
- <template #categoryName="{ row }">
- <Tag v-if="getCategoryColor(row.categoryId)" :color="getCategoryColor(row.categoryId)">{{ getCategoryName(row.categoryId) }}</Tag>
- <span v-else>{{ getCategoryName(row.categoryId) }}</span>
- </template>
<template #isBatchManaged="{ row }">
<Tag v-if="row.isBatchManaged" color="success">鏄�</Tag>
<Tag v-else>鍚�</Tag>
</template>
+ <template #syncedMes="{ row }">
+ <Switch
+ :checked="row.syncedMes"
+ :loading="syncingId === row.id"
+ checkedChildren="宸插悓姝�"
+ unCheckedChildren="鏈悓姝�"
+ @change="handleSyncChange(row, $event)"
+ />
+ </template>
<template #actions="{ row }">
<TableAction
:actions="[
--
Gitblit v1.9.3