From f5851974b861a20182c06d6f891fd427b1414209 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 15:21:19 +0800
Subject: [PATCH] 优化

---
 PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx |   86 ++-----------------------------------------
 1 files changed, 4 insertions(+), 82 deletions(-)

diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx
index 77fb5f5..23527b4 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Controllers/WorkTaskDrawer.tsx
@@ -18,7 +18,8 @@
 import {   
   BOOLEAN_OPTIONS_AddEdit  
 } from '@/utils/commonOptionConstants';  
- 
+// 寮曞叆鍏叡琛ㄥ崟宸ュ叿鏂囦欢   
+import { extractFormDataForOnConfirm,extractAndAssignFormData } from '@/utils/myformUtils';  
 export const useWorkTaskDrawer = (props: any, ctx?: any) => { 
   const workTaskDrawer = injectModel<WorkTaskDrawer>('workTaskDrawer') 
   /** 
@@ -502,46 +503,7 @@
    */ 
   const onConfirm = async () => { 
     await formRef.value?.validate() 
-    const data = { 
-      son_TaskCode: formData.value.son_TaskCode, 
-taskCode: formData.value.taskCode, 
-workPlanStatus: formData.value.workPlanStatus, 
-callMaterialStatus: formData.value.callMaterialStatus, 
-dataIdentifier: formData.value.dataIdentifier, 
-materialMode: formData.value.materialMode, 
-length: formData.value.length, 
-markingContent: formData.value.markingContent, 
-markingPosition: formData.value.markingPosition, 
-cuttingPosition: formData.value.cuttingPosition, 
-quantity: formData.value.quantity, 
-flangeThickness: formData.value.flangeThickness, 
-flangeInnerDiameter: formData.value.flangeInnerDiameter, 
-weldingHeatInput: formData.value.weldingHeatInput, 
-pipeAllowableStress: formData.value.pipeAllowableStress, 
-pipeDiameter: formData.value.pipeDiameter, 
-pipeWallThickness: formData.value.pipeWallThickness, 
-factoryCode: formData.value.factoryCode, 
-productCode: formData.value.productCode, 
-workstationCode: formData.value.workstationCode, 
-equipmentCode: formData.value.equipmentCode, 
-prodLineCode: formData.value.prodLineCode, 
-shipNumber: formData.value.shipNumber, 
-projectNumber: formData.value.projectNumber, 
-processName: formData.value.processName, 
-pipeFittingCode: formData.value.pipeFittingCode, 
-preSerialNumber: formData.value.preSerialNumber, 
-pipeSpecCode: formData.value.pipeSpecCode, 
-pipeSectionName: formData.value.pipeSectionName, 
-outerDiameter: formData.value.outerDiameter, 
-thickness: formData.value.thickness, 
-material: formData.value.material, 
-processRouteNumber: formData.value.processRouteNumber, 
-plannedStartTime: formData.value.plannedStartTime, 
-plannedEndTime: formData.value.plannedEndTime, 
-teamInfo: formData.value.teamInfo, 
-timestamp: formData.value.timestamp, 
-remark: formData.value.remark,  
-    } 
+    const data=extractFormDataForOnConfirm(formData); 
     if (!current.value) { 
       await workTaskDrawer.addWorkTask(data) 
     } else { 
@@ -590,47 +552,7 @@
     if (current.value) { 
       const res = await workTaskDrawer.getWorkTaskDetail(current.value) 
  
-      formData.value = { 
-        son_TaskCode: res.son_TaskCode, 
-taskCode: res.taskCode, 
-workPlanStatus: res.workPlanStatus, 
-callMaterialStatus: res.callMaterialStatus, 
-dataIdentifier: res.dataIdentifier, 
-materialMode: res.materialMode, 
-length: res.length, 
-markingContent: res.markingContent, 
-markingPosition: res.markingPosition, 
-cuttingPosition: res.cuttingPosition, 
-quantity: res.quantity, 
-flangeThickness: res.flangeThickness, 
-flangeInnerDiameter: res.flangeInnerDiameter, 
-weldingHeatInput: res.weldingHeatInput, 
-pipeAllowableStress: res.pipeAllowableStress, 
-pipeDiameter: res.pipeDiameter, 
-pipeWallThickness: res.pipeWallThickness, 
-factoryCode: res.factoryCode, 
-productCode: res.productCode, 
-workstationCode: res.workstationCode, 
-equipmentCode: res.equipmentCode, 
-prodLineCode: res.prodLineCode, 
-shipNumber: res.shipNumber, 
-projectNumber: res.projectNumber, 
-processName: res.processName, 
-pipeFittingCode: res.pipeFittingCode, 
-preSerialNumber: res.preSerialNumber, 
-pipeSpecCode: res.pipeSpecCode, 
-pipeSectionName: res.pipeSectionName, 
-outerDiameter: res.outerDiameter, 
-thickness: res.thickness, 
-material: res.material, 
-processRouteNumber: res.processRouteNumber, 
-plannedStartTime: res.plannedStartTime, 
-plannedEndTime: res.plannedEndTime, 
-teamInfo: res.teamInfo, 
-timestamp: res.timestamp, 
-remark: res.remark,  
-        id: res.id, 
-      } 
+      extractAndAssignFormData(res,formData); 
       disabled.value = true 
       updateCheckData() 
     } else { 

--
Gitblit v1.9.3