From 6c0b0dd81a98a3163e45f1b5b5417e02af165fd8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 29 八月 2026 10:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/mes/pro/task/modules/task-form.vue |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/pro/task/modules/task-form.vue b/src/views/mes/pro/task/modules/task-form.vue
index d1c5802..acb2de8 100644
--- a/src/views/mes/pro/task/modules/task-form.vue
+++ b/src/views/mes/pro/task/modules/task-form.vue
@@ -85,6 +85,8 @@
     let wid: number | undefined;
 
     if (data?.id) {
+      // 缂栬緫妯″紡锛氬厛璁剧疆琛ㄥ崟 schema锛屽啀鍥炲~浠诲姟鏁版嵁锛岄伩鍏嶅瓧娈垫湭寤虹珛鏃� setValues 涓㈠け
+      formApi.setState({ schema: useTaskFormSchema(formApi, workOrderQuantity) });
       modalApi.lock();
       try {
         formData.value = await getTask(data.id);
@@ -104,14 +106,14 @@
       };
       wid = data.workOrderId;
       workOrderQuantity.value = data.quantity;
+      // 鏂板妯″紡锛氬厛璁剧疆琛ㄥ崟 schema锛屽啀璁剧疆鍒濆鍊�
+      formApi.setState({ schema: useTaskFormSchema(formApi, workOrderQuantity) });
       await formApi.setValues({
         colorCode: data.colorCode || '#00AEF3',
         duration: 1,
         quantity: data.quantity,
       });
     }
-
-    formApi.setState({ schema: useTaskFormSchema(formApi, workOrderQuantity) });
   },
 });
 </script>

--
Gitblit v1.9.3