From 78caa769e452f63288743b8997f7b4c21bb06ce5 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:38 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑

---
 src/views/wls/materialstock/data.ts |  109 +++++++++---------------------------------------------
 1 files changed, 18 insertions(+), 91 deletions(-)

diff --git a/src/views/wls/materialstock/data.ts b/src/views/wls/materialstock/data.ts
index aacee75..398a665 100644
--- a/src/views/wls/materialstock/data.ts
+++ b/src/views/wls/materialstock/data.ts
@@ -9,11 +9,7 @@
 
 import { MdItemSelect } from '#/views/mes/md/item/components';
 
-import {
-  WmWarehouseAreaSelect,
-  WmWarehouseLocationSelect,
-  WmWarehouseSelect,
-} from '../warehouse/components';
+import { WmWarehouseSelect } from '../warehouse/components';
 
 /** 鍒楄〃鐨勬悳绱㈣〃鍗� */
 export function useGridFormSchema(): VbenFormSchema[] {
@@ -44,24 +40,6 @@
       },
     },
     {
-      fieldName: 'locationId',
-      label: '搴撳尯',
-      component: markRaw(WmWarehouseLocationSelect),
-      dependencies: {
-        triggerFields: ['warehouseId'],
-        componentProps: (values) => ({
-          warehouseId: values.warehouseId,
-          placeholder: '璇烽�夋嫨搴撳尯',
-        }),
-        // 浠撳簱鍒囨崲鏃舵竻绌哄簱鍖猴紝閬垮厤鏃у簱鍖烘潯浠舵畫鐣�
-        trigger: (values, formApi) => {
-          if (values.locationId !== undefined) {
-            void formApi.setFieldValue('locationId', undefined);
-          }
-        },
-      },
-    },
-    {
       fieldName: 'stockState',
       label: '搴撳瓨鐘舵��',
       component: 'Select',
@@ -70,10 +48,16 @@
         options: [
           { label: '鏆傚瓨搴擄紙寰呰川妫�锛�', value: 10 },
           { label: '鍚堟牸搴擄紙姝e紡搴撳瓨锛�', value: 20 },
-          { label: '宸插嚭搴擄紙閿�鍞墸鍑忥級', value: 30 },
+          { label: '宸插嚭搴�', value: 30 },
         ],
         placeholder: '璇烽�夋嫨搴撳瓨鐘舵��',
       },
+    },
+    {
+      fieldName: 'includeZero',
+      label: '闆跺簱瀛樿褰�',
+      component: 'Select',
+      componentProps: { allowClear: true, placeholder: '榛樿涓嶆樉绀�', options: [{ label: '鍖呭惈闆跺簱瀛�', value: true }] },
     },
     {
       fieldName: 'frozen',
@@ -113,7 +97,12 @@
     },
     {
       field: 'specification',
-      title: '瑙勬牸鍨嬪彿',
+      title: '瑙勬牸',
+      minWidth: 120,
+    },
+    {
+      field: 'itemTypeName',
+      title: '绫诲埆',
       minWidth: 120,
     },
     {
@@ -172,11 +161,6 @@
       },
     },
     {
-      field: 'unitMeasureName',
-      title: '鍗曚綅',
-      width: 80,
-    },
-    {
       field: 'batchCode',
       title: '鎵规鍙�',
       minWidth: 140,
@@ -191,17 +175,6 @@
       field: 'warehouseName',
       title: '浠撳簱',
       minWidth: 100,
-    },
-    {
-      field: 'locationName',
-      title: '搴撳尯',
-      minWidth: 100,
-    },
-    {
-      field: 'areaName',
-      title: '搴撲綅',
-      minWidth: 100,
-      slots: { default: 'areaName' },
     },
     {
       field: 'receiptTime',
@@ -271,42 +244,6 @@
         placeholder: '璇烽�夋嫨浠撳簱',
       },
     },
-    {
-      fieldName: 'locationId',
-      label: '搴撳尯',
-      component: markRaw(WmWarehouseLocationSelect),
-      dependencies: {
-        triggerFields: ['warehouseId'],
-        componentProps: (values) => ({
-          warehouseId: values.warehouseId,
-          placeholder: '璇烽�夋嫨搴撳尯',
-        }),
-        // 浠撳簱鍒囨崲鏃舵竻绌哄簱鍖�
-        trigger: (values, formApi) => {
-          if (values.locationId !== undefined) {
-            void formApi.setFieldValue('locationId', undefined);
-          }
-        },
-      },
-    },
-    {
-      fieldName: 'areaId',
-      label: '搴撲綅',
-      component: markRaw(WmWarehouseAreaSelect),
-      dependencies: {
-        triggerFields: ['warehouseId', 'locationId'],
-        componentProps: (values) => ({
-          locationId: values.locationId,
-          placeholder: '璇烽�夋嫨搴撲綅',
-        }),
-        // 浠撳簱鎴栧簱鍖哄垏鎹㈡椂娓呯┖搴撲綅
-        trigger: (values, formApi) => {
-          if (values.areaId !== undefined) {
-            void formApi.setFieldValue('areaId', undefined);
-          }
-        },
-      },
-    },
   ];
 }
 
@@ -331,13 +268,13 @@
     },
     {
       field: 'specification',
-      title: '瑙勬牸鍨嬪彿',
+      title: '瑙勬牸',
       minWidth: 120,
     },
     {
-      field: 'unitMeasureName',
-      title: '鍗曚綅',
-      width: 80,
+      field: 'itemTypeName',
+      title: '绫诲埆',
+      minWidth: 120,
     },
     {
       field: 'batchCode',
@@ -347,16 +284,6 @@
     {
       field: 'warehouseName',
       title: '浠撳簱',
-      minWidth: 100,
-    },
-    {
-      field: 'locationName',
-      title: '搴撳尯',
-      minWidth: 100,
-    },
-    {
-      field: 'areaName',
-      title: '搴撲綅',
       minWidth: 100,
     },
     {

--
Gitblit v1.9.3