From d6fd635dc8b27c11aaa07104e49260a69a339f42 Mon Sep 17 00:00:00 2001 From: liangbin <15536829364@163.com> Date: Tue, 3 Feb 2026 10:40:16 +0800 Subject: [PATCH] =?UTF-8?q?refactor(WorkOrderEdit):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E5=B9=B6=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将workResponsible字段统一重命名为supervisorName，并添加supervisorId字段 修复保存草稿和下一步逻辑中作业负责人相关字段的赋值逻辑 --- src/pages/WorkOrderEdit/compoents/BasicsInfo.vue | 2 ++ src/pages/WorkOrderEdit/compoents/WorkNote.vue | 15 ++++++++++----- src/pages/WorkOrderEdit/index.vue | 9 +++++---- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/pages/WorkOrderEdit/compoents/BasicsInfo.vue b/src/pages/WorkOrderEdit/compoents/BasicsInfo.vue index 012ec26..23a6ee8 100644 --- a/src/pages/WorkOrderEdit/compoents/BasicsInfo.vue +++ b/src/pages/WorkOrderEdit/compoents/BasicsInfo.vue @@ -153,6 +153,8 @@ const restoreFormData = (data) => { if (data.Location) formData.value.Location = data.Location; if (data.SpecificAddress) formData.value.SpecificAddress = data.SpecificAddress; if (data.supervisorName) formData.value.supervisorName = data.supervisorName; + if (data.supervisorId) formData.value.supervisorId = data.supervisorId; + if (data.MemberList && Array.isArray(data.MemberList)) { formData.value.MemberList = [...data.MemberList]; } diff --git a/src/pages/WorkOrderEdit/compoents/WorkNote.vue b/src/pages/WorkOrderEdit/compoents/WorkNote.vue index e123d83..838e765 100644 --- a/src/pages/WorkOrderEdit/compoents/WorkNote.vue +++ b/src/pages/WorkOrderEdit/compoents/WorkNote.vue @@ -23,7 +23,7 @@ 作业负责人 - + @@ -372,7 +372,8 @@ const formData = ref({ ticketNumber: '', // 票证编号 projectName: '', // 所属项目 workLocation: '', // 作业地点 - workResponsible: '', // 作业负责人 + supervisorName: '', // 作业负责人 + supervisorId: '', // 作业负责人ID workContent: '', // 作业内容 riskType: '', // 风险类型 }) @@ -395,7 +396,8 @@ const restoreFormData = (data) => { if (data.ticketNumber) formData.value.ticketNumber = data.ticketNumber; if (data.projectName) formData.value.projectName = data.projectName; if (data.workLocation) formData.value.workLocation = data.workLocation; - if (data.workResponsible) formData.value.workResponsible = data.workResponsible; + if (data.supervisorName) formData.value.supervisorName = data.supervisorName; + if (data.supervisorId) formData.value.supervisorId = data.supervisorId; if (data.workContent) formData.value.workContent = data.workContent; if (data.riskType) formData.value.riskType = data.riskType; if (data.period && Array.isArray(data.period) && data.period.length >= 2) { @@ -492,8 +494,11 @@ const initFromBasicsInfo = () => { if (basicsInfo.SpecificAddress && !formData.value.workLocation) { formData.value.workLocation = basicsInfo.SpecificAddress; } - if (basicsInfo.ResponsiblePerson && !formData.value.workResponsible) { - formData.value.workResponsible = basicsInfo.ResponsiblePerson; + if (basicsInfo.supervisorName && !formData.value.supervisorName) { + formData.value.supervisorName = basicsInfo.supervisorName; + } + if (basicsInfo.supervisorId && !formData.value.supervisorId) { + formData.value.supervisorId = basicsInfo.supervisorId; } // 更新成员列表，保留现有的勾选状态 updateMemberListFromBasicsInfo(true); diff --git a/src/pages/WorkOrderEdit/index.vue b/src/pages/WorkOrderEdit/index.vue index 60d7ff0..8f49b07 100644 --- a/src/pages/WorkOrderEdit/index.vue +++ b/src/pages/WorkOrderEdit/index.vue @@ -731,8 +731,8 @@ const saveDraft = () => { const workTicketData = { projectId: allData.value.BasicsInfo.projectId, workLocation: currentStepData.workLocation || allData.value.BasicsInfo.SpecificAddress || '', - supervisorId: allData.value.BasicsInfo.supervisorId || '', - supervisorName: currentStepData.workResponsible || allData.value.BasicsInfo.supervisorName || '', + supervisorId: currentStepData.supervisorId || allData.value.BasicsInfo.supervisorId || '', + supervisorName: currentStepData.supervisorName || allData.value.BasicsInfo.supervisorName || '', supervisorPosition: '', workContent: currentStepData.workContent || '', riskType: currentStepData.riskType || '', @@ -939,6 +939,7 @@ const nextStep = () => { }); return; } + console.log("打印基本信息",basicsData); if (!basicsData.supervisorId) { uni.showToast({ title: '请填写作业负责人', @@ -1299,8 +1300,8 @@ const nextStep = () => { const workTicketData = { projectId: allData.value.BasicsInfo.projectId, // 必填字段 workLocation: workNoteData.workLocation || allData.value.BasicsInfo.SpecificAddress || '', - supervisorId: null, // 作业负责人ID，如果需要可以从成员列表中查找 - supervisorName: workNoteData.workResponsible || allData.value.BasicsInfo.supervisorName || '', + supervisorId: workNoteData.supervisorId || allData.value.BasicsInfo.supervisorId || '', // 作业负责人ID，如果需要可以从成员列表中查找 + supervisorName: workNoteData.supervisorName || allData.value.BasicsInfo.supervisorName || '', supervisorPosition: '', // 作业负责人职位，如果需要可以从用户信息中获取 workContent: workNoteData.workContent || '', riskType: workNoteData.riskType || '',