Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-06-04 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6

 PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx

@@ -18,7 +18,8 @@
import {   
  BOOLEAN_OPTIONS_AddEdit  
} from '@/utils/commonOptionConstants';  
 
// 引入公共表单工具文件   
import { extractFormDataForOnConfirm,extractAndAssignFormData } from '@/utils/myformUtils';  
export const useWorkPlanDrawer = (props: any, ctx?: any) => { 
  const workPlanDrawer = injectModel<WorkPlanDrawer>('workPlanDrawer') 
  /** 
@@ -89,6 +90,48 @@
              rules: [{required: true, message: '任务编码不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '管段编码', 
                   prop: 'pipeSpecCode', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入管段编码', 
                }, 
                { 
                   label: '管段名称', 
                   prop: 'pipeSectionName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入管段名称', 
                }, 
                { 
                   label: '管段型号', 
                   prop: 'pipeSpecMode', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入管段型号', 
                }, 
                { 
                   label: '工序名称', 
                   prop: 'processName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入工序名称', 
                }, 
                { 
                   label: '船号', 
                   prop: 'shipNumber', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入船号', 
                }, 
                { 
                   label: '项目号', 
                   prop: 'projectNumber', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入项目号', 
                }, 
                { 
                   label: '计划状态', 
                   prop: 'workPlanStatus', 
                   el: 'select', 
@@ -107,6 +150,13 @@
                   //disabled: disabled, 
                   placeholder: '请输入叫料状态', 
              rules: [{required: true, message: '叫料状态不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '工艺流向编号', 
                   prop: 'processRouteNumber', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入工艺流向编号', 
                }, 
                { 
                   label: '原料标识', 
@@ -315,27 +365,6 @@
                   placeholder: '请输入产线编码', 
                }, 
                { 
                   label: '船号', 
                   prop: 'shipNumber', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入船号', 
                }, 
                { 
                   label: '项目号', 
                   prop: 'projectNumber', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入项目号', 
                }, 
                { 
                   label: '工序名称', 
                   prop: 'processName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入工序名称', 
                }, 
                { 
                   label: '管件编码', 
                   prop: 'pipeFittingCode', 
                   el: 'input', 
@@ -348,20 +377,6 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入顺序号', 
                }, 
                { 
                   label: '管段编码', 
                   prop: 'pipeSpecCode', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入管段编码', 
                }, 
                { 
                   label: '管段名称', 
                   prop: 'pipeSectionName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入管段名称', 
                }, 
                { 
                   label: '外径(mm)', 
@@ -403,13 +418,6 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入材质', 
                }, 
                { 
                   label: '工艺流向编号', 
                   prop: 'processRouteNumber', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入工艺流向编号', 
                }, 
                { 
                   label: '计划开始时间', 
@@ -494,45 +502,7 @@
   */ 
  const onConfirm = async () => { 
    await formRef.value?.validate() 
    const data = { 
      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 workPlanDrawer.addWorkPlan(data) 
    } else { 
@@ -581,46 +551,7 @@
    if (current.value) { 
      const res = await workPlanDrawer.getWorkPlanDetail(current.value) 
 
      formData.value = { 
        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 {