From c1b698e7cb6be3d065b57d30d112db273534ac6a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 15:58:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_南通_苏珩' into dev_南通_苏珩

---
 src/views/wls/productsales/data.ts |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/views/wls/productsales/data.ts b/src/views/wls/productsales/data.ts
index e0fc891..6b96d22 100644
--- a/src/views/wls/productsales/data.ts
+++ b/src/views/wls/productsales/data.ts
@@ -473,8 +473,27 @@
 export function useLineFormSchema(
   hasNotice: boolean,
   formApi?: VbenFormApi,
+  orderItems: import('#/api/erp/sale/order').ErpSaleOrderApi.SaleOrderItem[] = [],
 ): VbenFormSchema[] {
   return [
+    {
+      fieldName: 'saleOrderItemId',
+      label: '閿�鍞鍗曟槑缁�',
+      component: 'Select',
+      componentProps: {
+        placeholder: '璇烽�夋嫨閿�鍞鍗曟槑缁嗗強鐩樺彿',
+        options: orderItems.map((item) => ({
+          label: `${item.productName || ''}锛堢洏鍙凤細${item.reelNo || '鏈~鍐�'}锛塦,
+          value: item.id,
+        })),
+        onChange: async (id?: number) => {
+          const item = orderItems.find((entry) => entry.id === id);
+          await formApi?.setFieldValue('itemId', item?.productId);
+        },
+      },
+      dependencies: { triggerFields: ['noticeId'], if: () => !hasNotice },
+      rules: 'selectRequired',
+    },
     {
       fieldName: 'noticeId',
       component: 'Input',
@@ -515,9 +534,9 @@
       },
       rules: 'selectRequired',
       dependencies: {
-        triggerFields: ['noticeLineId'],
+        triggerFields: ['noticeLineId', 'saleOrderItemId'],
         componentProps: (values) => ({
-          disabled: !!values.noticeLineId,
+          disabled: !!values.noticeLineId || !!values.saleOrderItemId,
           placeholder: '璇烽�夋嫨浜у搧',
         }),
       },
@@ -659,7 +678,7 @@
         triggerFields: ['itemId', 'batchId'],
         componentProps: (values) => ({
           batchId: values.batchId,
-          itemId: values.itemId,
+          mdmItemId: values.itemId,
         }),
       },
     },

--
Gitblit v1.9.3