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/materialstock/components/stock-adjust-modal.vue |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/views/wls/materialstock/components/stock-adjust-modal.vue b/src/views/wls/materialstock/components/stock-adjust-modal.vue
index 734da3e..dbdc817 100644
--- a/src/views/wls/materialstock/components/stock-adjust-modal.vue
+++ b/src/views/wls/materialstock/components/stock-adjust-modal.vue
@@ -100,6 +100,7 @@
   }
   // 娓呯┖鎵规鐩稿叧鍊�
   await formApi.setFieldValue('batchCode', undefined);
+  await formApi.setFieldValue('reelNo', undefined);
   await formApi.setFieldValue('batchId', undefined);
   await formApi.setFieldValue('produceDate', undefined);
   await formApi.setFieldValue('expireDate', undefined);
@@ -269,6 +270,16 @@
       },
       // 鏍规嵁閰嶇疆鍐冲畾鏄惁蹇呭~
       rules: z.string().optional(),
+    },
+    {
+      fieldName: 'reelNo',
+      label: '鐩樺彿',
+      component: 'Input',
+      componentProps: { placeholder: '鎵嬪伐濉啓鏂版壒娆$洏鍙凤紝鐣欑┖琛ㄧず鏃犵洏鍙�', maxlength: 128 },
+      dependencies: {
+        triggerFields: ['operateType', 'batchId'],
+        show: () => operateType.value === 1 && !hasExistingBatch.value,
+      },
     },
     // 鐢熶骇鏃ユ湡锛堟牴鎹壒娆¢厤缃樉绀猴紝浠呭叆搴擄級
     {
@@ -519,6 +530,7 @@
         areaId: values.areaId,
         batchId: values.batchId,
         batchCode: values.batchCode,
+        reelNo: values.batchId ? undefined : values.reelNo?.trim() || undefined,
         produceDate: values.produceDate,
         expireDate: values.expireDate,
         receiptDate: values.receiptDate,

--
Gitblit v1.9.3