From 6ebcfebf58fe23ea401de1050b15ba85e41763a9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 17 十月 2026 18:36:52 +0800
Subject: [PATCH] feat(wls): 仓储物流单据跨模块关联字段改为手工填写

---
 src/views/wls/returnsales/data.ts |   92 +++++++++++++++++++++++++++++----------------
 1 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/src/views/wls/returnsales/data.ts b/src/views/wls/returnsales/data.ts
index 4c983da..b139e54 100644
--- a/src/views/wls/returnsales/data.ts
+++ b/src/views/wls/returnsales/data.ts
@@ -1,3 +1,4 @@
+import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MesWmReturnSalesApi } from '#/api/mes/wm/returnsales';
@@ -12,9 +13,7 @@
 import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
-import CrmCustomerSelect from '#/components/crm-customer-select.vue';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
-import { ErpSaleOrderSelect } from '#/views/erp/sale/order/components';
 import { MdItemSelect } from '#/views/mes/md/item/components';
 import { WmBatchSelect } from '#/views/wls/batch/components';
 import {
@@ -89,37 +88,20 @@
     },
     {
       fieldName: 'salesOrderCode',
-      component: 'Input',
-      dependencies: {
-        triggerFields: [''],
-        show: () => false,
-      },
-    },
-    {
-      fieldName: 'saleOrderId',
       label: '閿�鍞鍗曞彿',
-      component: markRaw(ErpSaleOrderSelect),
+      component: 'Input',
       componentProps: {
-        placeholder: '璇烽�夋嫨閿�鍞鍗�',
-        onChange: (item: any) => {
-          if (formApi) {
-            formApi.setFieldValue('salesOrderCode', item?.no ?? '');
-            if (item?.customerId) {
-              formApi.setFieldValue('clientId', item.customerId);
-            }
-          }
-        },
+        placeholder: '璇疯緭鍏ラ攢鍞鍗曞彿',
       },
-      rules: 'selectRequired',
     },
     {
-      fieldName: 'clientId',
+      fieldName: 'clientName',
       label: '瀹㈡埛',
-      component: markRaw(CrmCustomerSelect),
+      component: 'Input',
       componentProps: {
-        placeholder: '璇烽�夋嫨瀹㈡埛',
+        placeholder: '璇疯緭鍏ュ鎴峰悕绉�',
       },
-      rules: 'selectRequired',
+      rules: 'required',
     },
     {
       fieldName: 'returnDate',
@@ -129,7 +111,7 @@
         class: '!w-full',
         format: 'YYYY-MM-DD',
         placeholder: '璇烽�夋嫨閫�璐ф棩鏈�',
-        valueFormat: 'x',
+        valueFormat: 'YYYY-MM-DD',
       },
       rules: 'required',
     },
@@ -188,11 +170,12 @@
       },
     },
     {
-      fieldName: 'clientId',
+      fieldName: 'clientName',
       label: '瀹㈡埛',
-      component: markRaw(CrmCustomerSelect),
+      component: 'Input',
       componentProps: {
-        placeholder: '璇烽�夋嫨瀹㈡埛',
+        allowClear: true,
+        placeholder: '璇疯緭鍏ュ鎴峰悕绉�',
       },
     },
     {
@@ -342,15 +325,32 @@
 export function useLineFormSchema(
   clientId?: number,
   salesOrderCode?: string,
+  items?: ErpSaleOrderApi.SaleOrderItem[],
+  onItemChange?: (item: ErpSaleOrderApi.SaleOrderItem | undefined) => void,
 ): VbenFormSchema[] {
+  const hasItems = items && items.length > 0;
   return [
     {
       fieldName: 'itemId',
       label: '鐗╂枡',
-      component: markRaw(MdItemSelect),
-      componentProps: {
-        placeholder: '璇烽�夋嫨鐗╂枡',
-      },
+      component: hasItems ? 'Select' : markRaw(MdItemSelect),
+      componentProps: hasItems
+        ? {
+            placeholder: '璇烽�夋嫨鐗╂枡',
+            options: items.map((item) => ({
+              label: `${item.productName || ''}锛�${item.productBarCode || ''}锛塦,
+              value: item.productId,
+            })),
+            showSearch: true,
+            onChange: (value: number | undefined) => {
+              const selected = items.find((i) => i.productId === value);
+              onItemChange?.(selected);
+            },
+          }
+        : {
+            placeholder: '璇烽�夋嫨鐗╂枡',
+            productIds: [],
+          },
       rules: 'selectRequired',
     },
     {
@@ -363,6 +363,30 @@
         placeholder: '璇疯緭鍏ラ��璐ф暟閲�',
         precision: 2,
       },
+      dependencies: {
+        triggerFields: ['itemId'],
+        componentProps: (values) => {
+          const selected = items?.find((i) => i.productId === values.itemId);
+          return {
+            class: '!w-full',
+            max: selected?.count ?? undefined,
+            min: 0,
+            placeholder: '璇疯緭鍏ラ��璐ф暟閲�',
+            precision: 2,
+          };
+        },
+        rules: (values) => {
+          const selected = items?.find((i) => i.productId === values.itemId);
+          const max = selected?.count;
+          if (max !== undefined && max !== null) {
+            return z
+              .number({ message: '璇疯緭鍏ラ��璐ф暟閲�' })
+              .min(0)
+              .max(max, `鍙��璐ф暟閲忎笉鑳借秴杩� ${max}`);
+          }
+          return z.number({ message: '璇疯緭鍏ラ��璐ф暟閲�' }).min(0);
+        },
+      },
       rules: 'required',
     },
     {
@@ -371,6 +395,7 @@
       component: markRaw(WmBatchSelect),
       componentProps: {
         clientId,
+        disabled: true,
         placeholder: '璇烽�夋嫨鎵规',
         salesOrderCode,
       },
@@ -378,6 +403,7 @@
         triggerFields: ['itemId'],
         componentProps: (values) => ({
           clientId,
+          disabled: true,
           itemId: values.itemId,
           placeholder: '璇烽�夋嫨鎵规',
           salesOrderCode,

--
Gitblit v1.9.3