From a2448a582f2baeabf32c4f8dd8ab447feb2538e6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 10:25:21 +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 | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx
index f3fb82f..04e4add 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Controllers/WorkPlanDrawer.tsx
@@ -14,6 +14,10 @@
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import {
+ BOOLEAN_OPTIONS_AddEdit
+} from '@/utils/commonOptionConstants';
export const useWorkPlanDrawer = (props: any, ctx?: any) => {
const workPlanDrawer = injectModel<WorkPlanDrawer>('workPlanDrawer')
@@ -304,11 +308,25 @@
placeholder: '璇疯緭鍏ヨ澶囦唬鐮�',
},
{
- label: '宸ヤ欢鍚嶇О',
- prop: 'workpieceName',
+ label: '浜х嚎缂栫爜',
+ prop: 'prodLineCode',
el: 'input',
//disabled: disabled,
- placeholder: '璇疯緭鍏ュ伐浠跺悕绉�',
+ placeholder: '璇疯緭鍏ヤ骇绾跨紪鐮�',
+ },
+ {
+ label: '鑸瑰彿',
+ prop: 'shipNumber',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヨ埞鍙�',
+ },
+ {
+ label: '椤圭洰鍙�',
+ prop: 'projectNumber',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ラ」鐩彿',
},
{
label: '宸ュ簭鍚嶇О',
@@ -497,7 +515,9 @@
productCode: formData.value.productCode,
workstationCode: formData.value.workstationCode,
equipmentCode: formData.value.equipmentCode,
-workpieceName: formData.value.workpieceName,
+prodLineCode: formData.value.prodLineCode,
+shipNumber: formData.value.shipNumber,
+projectNumber: formData.value.projectNumber,
processName: formData.value.processName,
pipeFittingCode: formData.value.pipeFittingCode,
preSerialNumber: formData.value.preSerialNumber,
@@ -582,7 +602,9 @@
productCode: res.productCode,
workstationCode: res.workstationCode,
equipmentCode: res.equipmentCode,
-workpieceName: res.workpieceName,
+prodLineCode: res.prodLineCode,
+shipNumber: res.shipNumber,
+projectNumber: res.projectNumber,
processName: res.processName,
pipeFittingCode: res.pipeFittingCode,
preSerialNumber: res.preSerialNumber,
--
Gitblit v1.9.3