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/components/move-modal.vue |   72 +----------------------------------
 1 files changed, 3 insertions(+), 69 deletions(-)

diff --git a/src/views/wls/materialstock/components/move-modal.vue b/src/views/wls/materialstock/components/move-modal.vue
index 582726a..48f30a2 100644
--- a/src/views/wls/materialstock/components/move-modal.vue
+++ b/src/views/wls/materialstock/components/move-modal.vue
@@ -11,11 +11,7 @@
 import { z } from '#/adapter/form';
 import { useVbenForm } from '#/adapter/form';
 import { moveMaterialStock } from '#/api/mes/wm/materialstock';
-import {
-  WmWarehouseAreaSelect,
-  WmWarehouseLocationSelect,
-  WmWarehouseSelect,
-} from '#/views/wls/warehouse/components';
+import { WmWarehouseSelect } from '#/views/wls/warehouse/components';
 
 defineOptions({ name: 'WmStockMoveModal' });
 
@@ -50,18 +46,6 @@
       componentProps: { disabled: true },
     },
     {
-      fieldName: 'locationName',
-      label: '褰撳墠搴撳尯',
-      component: 'Input',
-      componentProps: { disabled: true },
-    },
-    {
-      fieldName: 'areaName',
-      label: '褰撳墠搴撲綅',
-      component: 'Input',
-      componentProps: { disabled: true },
-    },
-    {
       fieldName: 'quantity',
       label: '褰撳墠鏁伴噺',
       component: 'InputNumber',
@@ -73,52 +57,6 @@
       component: markRaw(WmWarehouseSelect),
       componentProps: {
         placeholder: '璇烽�夋嫨鐩爣浠撳簱',
-        onChange: async () => {
-          await formApi.setFieldValue('toLocationId', undefined);
-          await formApi.setFieldValue('toAreaId', undefined);
-        },
-      },
-      rules: 'selectRequired',
-    },
-    {
-      fieldName: 'toLocationId',
-      label: '鐩爣搴撳尯',
-      component: markRaw(WmWarehouseLocationSelect),
-      componentProps: { placeholder: '璇烽�夋嫨鐩爣搴撳尯' },
-      dependencies: {
-        triggerFields: ['toWarehouseId'],
-        componentProps: (values) => ({
-          warehouseId: values.toWarehouseId,
-          placeholder: '璇烽�夋嫨鐩爣搴撳尯',
-          onChange: async () => {
-            await formApi.setFieldValue('toAreaId', undefined);
-          },
-        }),
-        trigger: (values, api) => {
-          if (values.toLocationId !== undefined) {
-            void api.setFieldValue('toLocationId', undefined);
-            void api.setFieldValue('toAreaId', undefined);
-          }
-        },
-      },
-      rules: 'selectRequired',
-    },
-    {
-      fieldName: 'toAreaId',
-      label: '鐩爣搴撲綅',
-      component: markRaw(WmWarehouseAreaSelect),
-      componentProps: { placeholder: '璇烽�夋嫨鐩爣搴撲綅' },
-      dependencies: {
-        triggerFields: ['toLocationId'],
-        componentProps: (values) => ({
-          locationId: values.toLocationId,
-          placeholder: '璇烽�夋嫨鐩爣搴撲綅',
-        }),
-        trigger: (values, api) => {
-          if (values.toAreaId !== undefined) {
-            void api.setFieldValue('toAreaId', undefined);
-          }
-        },
       },
       rules: 'selectRequired',
     },
@@ -179,8 +117,8 @@
       return;
     }
 
-    if (row.warehouseId === values.toWarehouseId && row.locationId === values.toLocationId && row.areaId === values.toAreaId) {
-      message.error('鐩爣搴撲綅涓庡綋鍓嶅簱浣嶇浉鍚岋紝涓嶅厑璁哥Щ搴�');
+    if (row.warehouseId === values.toWarehouseId) {
+      message.error('鐩爣浠撳簱涓庡綋鍓嶄粨搴撶浉鍚岋紝涓嶅厑璁哥Щ搴�');
       return;
     }
 
@@ -190,8 +128,6 @@
         materialStockId: row.id,
         quantity: moveQuantity,
         remark: values.remark,
-        toAreaId: values.toAreaId,
-        toLocationId: values.toLocationId,
         toWarehouseId: values.toWarehouseId,
       });
       message.success('绉诲簱鎴愬姛');
@@ -217,11 +153,9 @@
     }
 
     await formApi.setValues({
-      areaName: data.areaName,
       batchCode: data.batchCode,
       itemCode: data.itemCode,
       itemName: data.itemName,
-      locationName: data.locationName,
       quantity: data.quantity,
       warehouseName: data.warehouseName,
     });

--
Gitblit v1.9.3