From f5fbd85e262f86270e5f2f6a8870ad13eb7d087d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 11:08:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(mes):=20=E8=BF=81=E7=A7=BB=20wm=20?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=20return-*=20=E7=B3=BB=E5=88=97=EF=BC=88?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wm/batch/components/wm-batch-detail.vue   | 52 +++++++++++++++++++
 .../views/mes/wm/returnissue/modules/form.vue | 28 ++++------
 .../views/mes/wm/returnsales/modules/form.vue | 27 ++++------
 .../mes/wm/returnvendor/modules/form.vue      | 27 ++++------
 .../wm/batch/components/wm-batch-detail.vue   | 51 ++++++++++++++++++
 .../views/mes/wm/returnissue/modules/form.vue | 27 ++++------
 .../views/mes/wm/returnsales/modules/form.vue | 27 ++++------
 .../mes/wm/returnvendor/modules/form.vue      | 27 ++++------
 8 files changed, 169 insertions(+), 97 deletions(-)
 create mode 100644 apps/web-antd/src/views/mes/wm/batch/components/wm-batch-detail.vue
 create mode 100644 apps/web-ele/src/views/mes/wm/batch/components/wm-batch-detail.vue

diff --git a/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-detail.vue b/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-detail.vue
new file mode 100644
index 000000000..2f0dff089
--- /dev/null
+++ b/apps/web-antd/src/views/mes/wm/batch/components/wm-batch-detail.vue
@@ -0,0 +1,52 @@
+<script lang="ts" setup>
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { getBatch } from '#/api/mes/wm/batch';
+import { useDescription } from '#/components/description';
+
+import { useDetailSchema } from '../data';
+
+const detailData = ref<MesWmBatchApi.Batch>(); // 当前批次详情
+
+const [Descriptions] = useDescription({
+  bordered: true,
+  column: 3,
+  schema: useDetailSchema(),
+  useCard: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  showCancelButton: false,
+  showConfirmButton: false,
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      detailData.value = undefined;
+      return;
+    }
+    const data = modalApi.getData<{ id?: number }>();
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      detailData.value = await getBatch(data.id);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+
+defineExpose({
+  open: (id: number) => modalApi.setData({ id }).open(),
+});
+</script>
+
+<template>
+  <Modal title="批次详情" class="w-3/5">
+    <Descriptions class="mx-4" :data="detailData" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue b/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue
index b971108b1..2251ecd48 100644
--- a/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/returnissue/modules/form.vue
@@ -37,25 +37,19 @@ const canSubmit = computed(() => // 是否可提交
   formType.value === 'update' &&
   formData.value?.status === MesWmReturnIssueStatusEnum.PREPARE,
 );
-// TODO @AI：这种标题风格，需要调整对齐
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['生产退料单']);
-    }
-    case 'finish': {
-      return '执行退料';
-    }
-    case 'stock': {
-      return '入库上架';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['生产退料单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['生产退料单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['生产退料单']);
   }
+  if (formType.value === 'stock') {
+    return '入库上架';
+  }
+  if (formType.value === 'finish') {
+    return '执行退料';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['生产退料单'])
+    : $t('ui.actionTitle.create', ['生产退料单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue b/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue
index 18f98fb6b..d329c1d62 100644
--- a/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/returnsales/modules/form.vue
@@ -38,23 +38,18 @@ const canSubmit = computed(() => // 是否可提交
   formData.value?.status === MesWmReturnSalesStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['销售退货单']);
-    }
-    case 'finish': {
-      return '执行退货';
-    }
-    case 'stock': {
-      return '执行上架';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['销售退货单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['销售退货单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['销售退货单']);
   }
+  if (formType.value === 'stock') {
+    return '执行上架';
+  }
+  if (formType.value === 'finish') {
+    return '执行退货';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['销售退货单'])
+    : $t('ui.actionTitle.create', ['销售退货单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue b/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue
index 137cab234..332591901 100644
--- a/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue
+++ b/apps/web-antd/src/views/mes/wm/returnvendor/modules/form.vue
@@ -39,23 +39,18 @@ const canSubmit = computed(() => // 是否可提交
   formData.value?.status === MesWmReturnVendorStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['供应商退货单']);
-    }
-    case 'finish': {
-      return '完成退货';
-    }
-    case 'stock': {
-      return '执行拣货';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['供应商退货单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['供应商退货单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['供应商退货单']);
   }
+  if (formType.value === 'stock') {
+    return '执行拣货';
+  }
+  if (formType.value === 'finish') {
+    return '完成退货';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['供应商退货单'])
+    : $t('ui.actionTitle.create', ['供应商退货单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-detail.vue b/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-detail.vue
new file mode 100644
index 000000000..dc5f483e8
--- /dev/null
+++ b/apps/web-ele/src/views/mes/wm/batch/components/wm-batch-detail.vue
@@ -0,0 +1,51 @@
+<script lang="ts" setup>
+import type { MesWmBatchApi } from '#/api/mes/wm/batch';
+
+import { ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { getBatch } from '#/api/mes/wm/batch';
+import { useDescription } from '#/components/description';
+
+import { useDetailSchema } from '../data';
+
+const detailData = ref<MesWmBatchApi.Batch>(); // 当前批次详情
+
+const [Descriptions] = useDescription({
+  border: true,
+  column: 3,
+  schema: useDetailSchema(),
+});
+
+const [Modal, modalApi] = useVbenModal({
+  showCancelButton: false,
+  showConfirmButton: false,
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      detailData.value = undefined;
+      return;
+    }
+    const data = modalApi.getData<{ id?: number }>();
+    if (!data?.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      detailData.value = await getBatch(data.id);
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+
+defineExpose({
+  open: (id: number) => modalApi.setData({ id }).open(),
+});
+</script>
+
+<template>
+  <Modal title="批次详情" class="w-3/5">
+    <Descriptions class="mx-4" :data="detailData" />
+  </Modal>
+</template>
diff --git a/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue b/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue
index 2cd07a421..b8e4c6d09 100644
--- a/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/returnissue/modules/form.vue
@@ -38,23 +38,18 @@ const canSubmit = computed(() => // 是否可提交
   formData.value?.status === MesWmReturnIssueStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['生产退料单']);
-    }
-    case 'finish': {
-      return '执行退料';
-    }
-    case 'stock': {
-      return '入库上架';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['生产退料单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['生产退料单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['生产退料单']);
   }
+  if (formType.value === 'stock') {
+    return '入库上架';
+  }
+  if (formType.value === 'finish') {
+    return '执行退料';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['生产退料单'])
+    : $t('ui.actionTitle.create', ['生产退料单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue b/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue
index 8b4094bbe..cd34c9798 100644
--- a/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/returnsales/modules/form.vue
@@ -38,23 +38,18 @@ const canSubmit = computed(() => // 是否可提交
   formData.value?.status === MesWmReturnSalesStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['销售退货单']);
-    }
-    case 'finish': {
-      return '执行退货';
-    }
-    case 'stock': {
-      return '执行上架';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['销售退货单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['销售退货单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['销售退货单']);
   }
+  if (formType.value === 'stock') {
+    return '执行上架';
+  }
+  if (formType.value === 'finish') {
+    return '执行退货';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['销售退货单'])
+    : $t('ui.actionTitle.create', ['销售退货单']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue b/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue
index e35ca121b..bf17b4d9a 100644
--- a/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue
+++ b/apps/web-ele/src/views/mes/wm/returnvendor/modules/form.vue
@@ -39,23 +39,18 @@ const canSubmit = computed(() => // 是否可提交
   formData.value?.status === MesWmReturnVendorStatusEnum.PREPARE,
 );
 const getTitle = computed(() => {
-  switch (formType.value) {
-    case 'detail': {
-      return $t('ui.actionTitle.view', ['供应商退货单']);
-    }
-    case 'finish': {
-      return '完成退货';
-    }
-    case 'stock': {
-      return '执行拣货';
-    }
-    case 'update': {
-      return $t('ui.actionTitle.edit', ['供应商退货单']);
-    }
-    default: {
-      return $t('ui.actionTitle.create', ['供应商退货单']);
-    }
+  if (formType.value === 'detail') {
+    return $t('ui.actionTitle.view', ['供应商退货单']);
   }
+  if (formType.value === 'stock') {
+    return '执行拣货';
+  }
+  if (formType.value === 'finish') {
+    return '完成退货';
+  }
+  return formType.value === 'update'
+    ? $t('ui.actionTitle.edit', ['供应商退货单'])
+    : $t('ui.actionTitle.create', ['供应商退货单']);
 });
 
 const [Form, formApi] = useVbenForm({