From d08413a68eaabda4a1d99c8273bf65a1b8552d16 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 30 May 2026 20:38:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(mes):=20=E4=BF=AE=E6=94=B9=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E7=BB=84=E4=BB=B6=E4=BB=A5=E4=BD=BF=E7=94=A8=E6=95=B4?=
 =?UTF-8?q?=E6=95=B0=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=AD=97=E5=85=B8=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/wm/miscissue/index.ts               |  2 +-
 src/views/mes/wm/miscissue/MiscIssueForm.vue    |  4 ++--
 src/views/mes/wm/miscissue/index.vue            |  4 ++--
 .../plan/StockTakingPlanParamList.vue           | 17 ++++++++++-------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/api/mes/wm/miscissue/index.ts b/src/api/mes/wm/miscissue/index.ts
index fba95d2b8..72ce2e3f2 100644
--- a/src/api/mes/wm/miscissue/index.ts
+++ b/src/api/mes/wm/miscissue/index.ts
@@ -5,7 +5,7 @@ export interface WmMiscIssueVO {
   id: number
   code: string
   name: string
-  type: string
+  type: number
   sourceDocType: string
   sourceDocId: number
   sourceDocCode: string
diff --git a/src/views/mes/wm/miscissue/MiscIssueForm.vue b/src/views/mes/wm/miscissue/MiscIssueForm.vue
index cc4d30c58..036fa510e 100644
--- a/src/views/mes/wm/miscissue/MiscIssueForm.vue
+++ b/src/views/mes/wm/miscissue/MiscIssueForm.vue
@@ -40,7 +40,7 @@
               :disabled="isHeaderReadonly"
             >
               <el-option
-                v-for="dict in getStrDictOptions(DICT_TYPE.MES_WM_MISC_ISSUE_TYPE)"
+                v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_MISC_ISSUE_TYPE)"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -120,7 +120,7 @@
 </template>
 
 <script setup lang="ts">
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { WmMiscIssueApi, WmMiscIssueVO } from '@/api/mes/wm/miscissue'
 import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
 import MiscIssueLineList from './MiscIssueLineList.vue'
diff --git a/src/views/mes/wm/miscissue/index.vue b/src/views/mes/wm/miscissue/index.vue
index 3ca9e5755..307f22a59 100644
--- a/src/views/mes/wm/miscissue/index.vue
+++ b/src/views/mes/wm/miscissue/index.vue
@@ -35,7 +35,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.MES_WM_MISC_ISSUE_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_MISC_ISSUE_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -195,7 +195,7 @@
 
 <script setup lang="ts">
 import { dateFormatter2 } from '@/utils/formatTime'
-import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import download from '@/utils/download'
 import { WmMiscIssueApi, WmMiscIssueVO } from '@/api/mes/wm/miscissue'
 import MiscIssueForm from './MiscIssueForm.vue'
diff --git a/src/views/mes/wm/stocktaking/plan/StockTakingPlanParamList.vue b/src/views/mes/wm/stocktaking/plan/StockTakingPlanParamList.vue
index 2d53c0a81..564c65ac4 100644
--- a/src/views/mes/wm/stocktaking/plan/StockTakingPlanParamList.vue
+++ b/src/views/mes/wm/stocktaking/plan/StockTakingPlanParamList.vue
@@ -118,13 +118,12 @@
             </template>
             <template v-else-if="formData.type === MesWmStockTakingParamTypeEnum.QUALITY_STATUS">
               <el-select
-                v-model="formData.valueCode"
+                v-model="qualityStatusValue"
                 placeholder="请选择质量状态"
                 class="!w-full"
-                @change="handleQualityStatusChange"
               >
                 <el-option
-                  v-for="dict in getStrDictOptions(DICT_TYPE.MES_WM_QUALITY_STATUS)"
+                  v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_QUALITY_STATUS)"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
@@ -148,7 +147,7 @@
 </template>
 
 <script setup lang="ts">
-import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import {
   StockTakingPlanParamApi,
   type StockTakingPlanParamVO
@@ -219,6 +218,10 @@ const formData = ref<StockTakingPlanParamVO>({
   valueName: '',
   remark: ''
 })
+const qualityStatusValue = computed({
+  get: () => (formData.value.valueCode ? Number(formData.value.valueCode) : undefined),
+  set: (val?: number) => handleQualityStatusChange(val)
+})
 const formRules = reactive({
   type: [{ required: true, message: '请选择条件类型', trigger: 'change' }],
   valueId: [
@@ -331,11 +334,11 @@ const handleBatchChange = (batch?: any) => {
 }
 
 /** 质量状态选择器变化 */
-const handleQualityStatusChange = (val: string) => {
-  const dictOptions = getStrDictOptions(DICT_TYPE.MES_WM_QUALITY_STATUS)
+const handleQualityStatusChange = (val?: number) => {
+  const dictOptions = getIntDictOptions(DICT_TYPE.MES_WM_QUALITY_STATUS)
   const selected = dictOptions.find((d) => d.value === val)
   formData.value.valueId = undefined // 质量状态无实体 ID
-  formData.value.valueCode = val
+  formData.value.valueCode = val == null ? '' : String(val)
   formData.value.valueName = selected?.label || ''
 }