From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx | 175 +++++++++++++++++----------------------------------------
1 files changed, 53 insertions(+), 122 deletions(-)
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx
index 04e4add..6f55d90 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx
+++ b/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 {
--
Gitblit v1.9.3