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 || '',