From 77e25ce9d856c1f0b03a662eefb7c8076e2e1ea4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 2 Mar 2026 13:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E5=AD=97=E6=AE=B5=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/wm/productsales/index.ts          |  1 -
 src/api/mes/wm/salesnotice/index.ts           |  5 ++
 .../mes/wm/productsales/ProductSalesForm.vue  | 12 ---
 src/views/mes/wm/productsales/index.vue       |  1 -
 .../components/WmSalesNoticeSelect.vue        | 82 +++++++++++++++++++
 5 files changed, 87 insertions(+), 14 deletions(-)
 create mode 100644 src/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue

diff --git a/src/api/mes/wm/productsales/index.ts b/src/api/mes/wm/productsales/index.ts
index 44504922b..6cc9892c4 100644
--- a/src/api/mes/wm/productsales/index.ts
+++ b/src/api/mes/wm/productsales/index.ts
@@ -11,7 +11,6 @@ export interface WmProductSalesVO {
   shipmentDate: string
   contactName: string
   contactTelephone: string
-  contactAddress: string
   status: number
   remark: string
   createTime: string
diff --git a/src/api/mes/wm/salesnotice/index.ts b/src/api/mes/wm/salesnotice/index.ts
index 01ff36ceb..059d11e61 100644
--- a/src/api/mes/wm/salesnotice/index.ts
+++ b/src/api/mes/wm/salesnotice/index.ts
@@ -51,5 +51,10 @@ export const WmSalesNoticeApi = {
   // 导出发货通知单 Excel
   exportSalesNotice: async (params: any) => {
     return await request.download({ url: '/mes/wm/sales-notice/export-excel', params })
+  },
+
+  // 获取发货通知单精简列表
+  getSalesNoticeSimpleList: async (status?: number) => {
+    return await request.get({ url: '/mes/wm/sales-notice/simple-list', params: { status } })
   }
 }
diff --git a/src/views/mes/wm/productsales/ProductSalesForm.vue b/src/views/mes/wm/productsales/ProductSalesForm.vue
index 42c11ecc1..4c7b8ed19 100644
--- a/src/views/mes/wm/productsales/ProductSalesForm.vue
+++ b/src/views/mes/wm/productsales/ProductSalesForm.vue
@@ -87,16 +87,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <!-- TODO @AI：前后端，都删除掉 contactAddress 字段 -->
-          <el-form-item label="收货地址" prop="contactAddress">
-            <el-input
-              v-model="formData.contactAddress"
-              placeholder="请输入收货地址"
-              :disabled="isHeaderReadonly"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
@@ -172,7 +162,6 @@ const formData = ref({
   salesDate: undefined,
   contactName: undefined,
   contactTelephone: undefined,
-  contactAddress: undefined,
   carrier: undefined,
   shippingNumber: undefined,
   remark: undefined
@@ -272,7 +261,6 @@ const resetForm = () => {
     salesDate: undefined,
     contactName: undefined,
     contactTelephone: undefined,
-    contactAddress: undefined,
     carrier: undefined,
     shippingNumber: undefined,
     remark: undefined
diff --git a/src/views/mes/wm/productsales/index.vue b/src/views/mes/wm/productsales/index.vue
index 35b87f7cc..5988d5712 100644
--- a/src/views/mes/wm/productsales/index.vue
+++ b/src/views/mes/wm/productsales/index.vue
@@ -92,7 +92,6 @@
       <el-table-column label="客户名称" align="center" prop="clientName" min-width="120" />
       <el-table-column label="收货人" align="center" prop="contactName" min-width="100" />
       <el-table-column label="联系方式" align="center" prop="contactTelephone" min-width="120" />
-      <el-table-column label="收货地址" align="center" prop="contactAddress" min-width="180" show-overflow-tooltip />
       <el-table-column label="承运商" align="center" prop="carrier" min-width="120" />
       <el-table-column label="运输单号" align="center" prop="shippingNumber" min-width="160" />
       <el-table-column
diff --git a/src/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue b/src/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue
new file mode 100644
index 000000000..bdd60f7c2
--- /dev/null
+++ b/src/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue
@@ -0,0 +1,82 @@
+<!-- MES 发货通知单选择器：纯下拉，前端过滤（支持 noticeCode、noticeName） -->
+<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.noticeName" :value="item.id">
+      <div class="flex items-center gap-8px">
+        <span>{{ item.noticeName }}</span>
+        <el-tag v-if="item.noticeCode" size="small" type="info" class="ml-4px">
+          编号: {{ item.noticeCode }}
+        </el-tag>
+      </div>
+    </el-option>
+  </el-select>
+</template>
+
+<script setup lang="ts">
+import { WmSalesNoticeApi, WmSalesNoticeVO } from '@/api/mes/wm/salesnotice'
+
+defineOptions({ name: 'WmSalesNoticeSelect' })
+
+const props = withDefaults(
+  defineProps<{
+    modelValue?: number
+    disabled?: boolean
+    clearable?: boolean
+    placeholder?: string
+    status?: number
+  }>(),
+  {
+    disabled: false,
+    clearable: true,
+    placeholder: '请选择发货通知单'
+  }
+)
+
+const emit = defineEmits<{
+  'update:modelValue': [value: number | undefined]
+  change: [item: WmSalesNoticeVO | undefined]
+}>()
+
+const allList = ref<WmSalesNoticeVO[]>([])
+const filteredList = ref<WmSalesNoticeVO[]>([])
+
+const selectValue = computed({
+  get: () => props.modelValue,
+  set: (val) => emit('update:modelValue', val)
+})
+
+/** 前端过滤（noticeCode + noticeName） */
+const handleFilter = (query: string) => {
+  if (!query) {
+    filteredList.value = allList.value
+    return
+  }
+  const keyword = query.toLowerCase()
+  filteredList.value = allList.value.filter(
+    (item) =>
+      item.noticeName?.toLowerCase().includes(keyword) ||
+      item.noticeCode?.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 WmSalesNoticeApi.getSalesNoticeSimpleList(props.status)
+  filteredList.value = allList.value
+})
+</script>