From 8138e9fa934121b63c00ac5c7cbd941935faef72 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 3 Mar 2026 19:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=9D=82=E9=A1=B9=E7=B1=BB=E5=9E=8B=E4=B8=BA=E6=95=B4=E6=95=B0?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将杂项类型字段从字符串更改为整数，以支持新的枚举类型。同时，新增杂项出库明细的服务接口和实现，提供对明细的增删改查功能，提升系统的灵活性和可维护性。
---
 src/api/mes/wm/miscreceipt/index.ts           |  2 +-
 src/utils/dict.ts                             |  1 +
 .../mes/wm/miscissue/MiscIssueLineList.vue    | 21 -------------------
 .../mes/wm/miscreceipt/MiscReceiptForm.vue    |  4 ++--
 src/views/mes/wm/miscreceipt/index.vue        |  2 +-
 5 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/api/mes/wm/miscreceipt/index.ts b/src/api/mes/wm/miscreceipt/index.ts
index a3a0ffdd9..e5c858159 100644
--- a/src/api/mes/wm/miscreceipt/index.ts
+++ b/src/api/mes/wm/miscreceipt/index.ts
@@ -5,7 +5,7 @@ export interface WmMiscReceiptVO {
   id: number
   code: string
   name: string
-  type: string
+  type: number
   sourceDocId: number
   sourceDocCode: string
   sourceDocType: string
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index bd9c59d3a..c24e1596f 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -306,4 +306,5 @@ export enum DICT_TYPE {
   MES_WM_PRODUCT_SALES_STATUS = 'mes_wm_product_sales_status', // MES 销售出库单状态
   MES_SALES_NOTICE_STATUS = 'mes_sales_notice_status', // MES 发货通知单状态
   MES_WM_MISC_ISSUE_TYPE = 'mes_wm_misc_issue_type', // MES 杂项单类型
+  MES_WM_MISC_RECEIPT_TYPE = 'mes_wm_misc_receipt_type', // MES 杂项单类型
 }
diff --git a/src/views/mes/wm/miscissue/MiscIssueLineList.vue b/src/views/mes/wm/miscissue/MiscIssueLineList.vue
index cc43836a0..eed86c86c 100644
--- a/src/views/mes/wm/miscissue/MiscIssueLineList.vue
+++ b/src/views/mes/wm/miscissue/MiscIssueLineList.vue
@@ -12,17 +12,6 @@
       border
       :row-key="(row: any) => row.id"
     >
-      <el-table-column type="expand">
-        <template #default="scope">
-          <MiscIssueDetailList
-            :ref="(el: any) => setDetailListRef(scope.row.id, el)"
-            :issue-id="props.issueId"
-            :line-id="scope.row.id"
-            :item-id="scope.row.itemId"
-            :form-type="props.formType"
-          />
-        </template>
-      </el-table-column>
       <el-table-column label="物料编码" align="center" prop="itemCode" min-width="120" />
       <el-table-column label="物料名称" align="center" prop="itemName" min-width="140" />
       <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
@@ -275,16 +264,6 @@ const resetForm = () => {
   formRef.value?.resetFields()
 }
 
-// ==================== 展开行：出库明细 ====================
-const detailListRefs = ref<Record<number, InstanceType<typeof MiscIssueDetailList>>>({})
-
-/** 缓存子组件 ref */
-const setDetailListRef = (lineId: number, el: any) => {
-  if (el) {
-    detailListRefs.value[lineId] = el
-  }
-}
-
 /** 初始化 */
 onMounted(async () => {
   await getList()
diff --git a/src/views/mes/wm/miscreceipt/MiscReceiptForm.vue b/src/views/mes/wm/miscreceipt/MiscReceiptForm.vue
index 656af515c..8607653d2 100644
--- a/src/views/mes/wm/miscreceipt/MiscReceiptForm.vue
+++ b/src/views/mes/wm/miscreceipt/MiscReceiptForm.vue
@@ -43,7 +43,7 @@
               :disabled="isHeaderReadonly"
             >
               <el-option
-                v-for="dict in getStrDictOptions(DICT_TYPE.MES_WM_MISC_RECEIPT_TYPE)"
+                v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_MISC_RECEIPT_TYPE)"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -113,7 +113,7 @@
 
 <script setup lang="ts">
 import { generateRandomStr } from '@/utils'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { WmMiscReceiptApi, WmMiscReceiptVO } from '@/api/mes/wm/miscreceipt'
 import MiscReceiptLineList from './MiscReceiptLineList.vue'
 
diff --git a/src/views/mes/wm/miscreceipt/index.vue b/src/views/mes/wm/miscreceipt/index.vue
index 61037c969..7c8213164 100644
--- a/src/views/mes/wm/miscreceipt/index.vue
+++ b/src/views/mes/wm/miscreceipt/index.vue
@@ -35,7 +35,7 @@
         >
           <!-- TODO @AI：需呀在 DICT_TYPE 枚举下； -->
           <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.MES_WM_MISC_RECEIPT_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_MISC_RECEIPT_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"