From 51e8cd35fa6c2ceca2e8e4dd89ded47fa151f0fd Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 29 Mar 2026 23:08:48 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=80=89=E6=8B=A9=E5=99=A8=E5=92=8C=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E6=98=8E=E7=BB=86=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整库存选择器为下拉选择组件，支持前端过滤，提升用户体验。更新退货明细表单，增加库存记录选择，优化表单布局，确保信息展示更为清晰。
---
 src/api/mes/wm/batch/index.ts                 |  5 ++
 src/api/mes/wm/returnvendor/detail/index.ts   |  2 +-
 src/api/mes/wm/returnvendor/line/index.ts     |  1 +
 .../mes/wm/batch/components/WmBatchSelect.vue | 81 +++++++++++++++++++
 .../wm/returnvendor/ReturnVendorLineList.vue  | 18 ++++-
 5 files changed, 104 insertions(+), 3 deletions(-)
 create mode 100644 src/views/mes/wm/batch/components/WmBatchSelect.vue

diff --git a/src/api/mes/wm/batch/index.ts b/src/api/mes/wm/batch/index.ts
index c7a0f54d1..d5bdcd941 100644
--- a/src/api/mes/wm/batch/index.ts
+++ b/src/api/mes/wm/batch/index.ts
@@ -52,5 +52,10 @@ export const BatchApi = {
   // 向后追溯
   getBackwardList: async (code: string) => {
     return await request.get({ url: `/mes/wm/batch/backward-list`, params: { code } })
+  },
+
+  // 获取批次精简列表（主要用于前端下拉）
+  getBatchSimpleList: async () => {
+    return await request.get({ url: `/mes/wm/batch/simple-list` })
   }
 }
diff --git a/src/api/mes/wm/returnvendor/detail/index.ts b/src/api/mes/wm/returnvendor/detail/index.ts
index de4d7a1b0..a84a13860 100644
--- a/src/api/mes/wm/returnvendor/detail/index.ts
+++ b/src/api/mes/wm/returnvendor/detail/index.ts
@@ -5,7 +5,7 @@ export interface WmReturnVendorDetailVO {
   id?: number
   returnId: number
   lineId: number
-  materialStockId: number
+  materialStockId?: number
   itemId: number
   quantity: number
   batchId?: number
diff --git a/src/api/mes/wm/returnvendor/line/index.ts b/src/api/mes/wm/returnvendor/line/index.ts
index b8715d2c2..8e7ac688c 100644
--- a/src/api/mes/wm/returnvendor/line/index.ts
+++ b/src/api/mes/wm/returnvendor/line/index.ts
@@ -11,6 +11,7 @@ export interface WmReturnVendorLineVO {
   unitMeasureName?: string
   quantity: number
   batchId?: number
+  batchCode?: string
   remark?: string
 }
 
diff --git a/src/views/mes/wm/batch/components/WmBatchSelect.vue b/src/views/mes/wm/batch/components/WmBatchSelect.vue
new file mode 100644
index 000000000..be8aacaf4
--- /dev/null
+++ b/src/views/mes/wm/batch/components/WmBatchSelect.vue
@@ -0,0 +1,81 @@
+<!-- MES 批次选择器：一次加载全量，前端过滤（支持 code） -->
+<template>
+  <el-select
+    v-model="selectValue"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    :clearable="clearable"
+    filterable
+    :filter-method="handleFilter"
+    class="!w-1/1"
+    @change="handleChange"
+  >
+    <el-option v-for="item in filteredList" :key="item.id" :label="item.code" :value="item.id">
+      <div class="flex items-center gap-8px">
+        <span>{{ item.code }}</span>
+        <el-tag v-if="item.itemCode" size="small" type="info" class="ml-4px">
+          {{ item.itemCode }}
+        </el-tag>
+      </div>
+    </el-option>
+  </el-select>
+</template>
+
+<script setup lang="ts">
+import { BatchApi, BatchVO } from '@/api/mes/wm/batch'
+
+defineOptions({ name: 'WmBatchSelect' })
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number
+    disabled?: boolean
+    clearable?: boolean
+    placeholder?: string
+  }>(),
+  {
+    disabled: false,
+    clearable: true,
+    placeholder: '请选择批次'
+  }
+)
+
+const emit = defineEmits<{
+  'update:modelValue': [value: number | undefined]
+  change: [item: BatchVO | undefined]
+}>()
+
+const allList = ref<BatchVO[]>([])
+const filteredList = ref<BatchVO[]>([])
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val)
+})
+
+/** 前端过滤（code） */
+const handleFilter = (query: string) => {
+  if (!query) {
+    filteredList.value = allList.value
+    return
+  }
+  const keyword = query.toLowerCase()
+  filteredList.value = allList.value.filter(
+    (item) =>
+      item.code?.toLowerCase().includes(keyword) ||
+      item.itemCode?.toLowerCase().includes(keyword)
+  )
+}
+
+/** 选中变化 */
+const handleChange = (val: number | undefined) => {
+  const item = allList.value.find((o) => o.id === val)
+  emit('change', item)
+}
+
+/** 加载批次列表 */
+onMounted(async () => {
+  allList.value = await BatchApi.getBatchSimpleList()
+  filteredList.value = allList.value
+})
+</script>
diff --git a/src/views/mes/wm/returnvendor/ReturnVendorLineList.vue b/src/views/mes/wm/returnvendor/ReturnVendorLineList.vue
index 9a2fb2fd2..aa9b05b75 100644
--- a/src/views/mes/wm/returnvendor/ReturnVendorLineList.vue
+++ b/src/views/mes/wm/returnvendor/ReturnVendorLineList.vue
@@ -32,7 +32,7 @@
       <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
       <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
       <el-table-column label="退货数量" align="center" prop="quantity" width="100" />
-      <el-table-column label="批次号" align="center" prop="batchId" width="80" />
+      <el-table-column label="批次号" align="center" prop="batchCode" width="150" />
       <el-table-column
         v-if="isUpdate || isStock"
         label="操作"
@@ -93,7 +93,11 @@
             />
           </el-form-item>
         </el-col>
-        <!-- TODO @芋艿：这里差一个批次号的选择器；【暂不处理】 -->
+        <el-col :span="8">
+          <el-form-item label="批次号" prop="batchId">
+            <WmBatchSelect v-model="formData.batchId" @change="handleBatchChange" />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
         <el-col :span="24">
@@ -120,6 +124,7 @@
 <script setup lang="ts">
 import { WmReturnVendorLineApi, WmReturnVendorLineVO } from '@/api/mes/wm/returnvendor/line'
 import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
+import WmBatchSelect from '@/views/mes/wm/batch/components/WmBatchSelect.vue'
 import ReturnVendorDetailList from './ReturnVendorDetailList.vue'
 import ReturnVendorDetailForm from './ReturnVendorDetailForm.vue'
 
@@ -179,6 +184,8 @@ const formData = ref({
   returnId: undefined as number | undefined,
   itemId: undefined,
   quantity: undefined,
+  batchId: undefined as number | undefined,
+  batchCode: undefined as string | undefined,
   remark: undefined
 })
 const formRules = reactive({
@@ -194,6 +201,11 @@ const handleItemChange = (item: any) => {
   }
 }
 
+/** 批次选中回调，同步 batchCode */
+const handleBatchChange = (batch: any) => {
+  formData.value.batchCode = batch?.code
+}
+
 /** 打开表单弹窗 */
 const openForm = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -240,6 +252,8 @@ const resetForm = () => {
     returnId: undefined,
     itemId: undefined,
     quantity: undefined,
+    batchId: undefined,
+    batchCode: undefined,
     remark: undefined
   }
   formRef.value?.resetFields()