diff --git a/src/views/modules/sampleTracking/projectProofTracking.vue b/src/views/modules/sampleTracking/projectProofTracking.vue index 10e105f..e5d484a 100644 --- a/src/views/modules/sampleTracking/projectProofTracking.vue +++ b/src/views/modules/sampleTracking/projectProofTracking.vue @@ -938,10 +938,11 @@ -
- 试验申请数量:{{ getApplyQuantityDisplayText(oneKeySelectedApplyOption.applyQuantity) }} -
+ +
+ 试验申请数量:{{ getApplyQuantityDisplayText(oneKeySelectedApplyOption.applyQuantity) }} +
@@ -1112,10 +1113,11 @@ -
- 试验申请数量:{{ getApplyQuantityDisplayText(proofDialogSelectedApplyOption.applyQuantity) }} -
+ +
+ 试验申请数量:{{ getApplyQuantityDisplayText(proofDialogSelectedApplyOption.applyQuantity) }} +
@@ -5645,19 +5647,19 @@ export default { oriProjectId: project.oriProjectId || '', projectCategory: project.projectCategory || part.projectCategory || current.projectCategory || '', cProjectRegion: project.cProjectRegion || current.cProjectRegion || '', - projectManager: project.projectManager || part.projectManager || current.projectManager || '', - projectOwner: project.projectOwner || part.projectOwner || current.projectOwner || '', - cQualityEngineer1: project.cQualityEngineer1 || part.cQualityEngineer1 || '', - cQualityEngineer2: project.cQualityEngineer2 || part.cQualityEngineer2 || '', - cQualityEngineer3: project.cQualityEngineer3 || part.cQualityEngineer3 || '', - cQualityEngineer4: project.cQualityEngineer4 || part.cQualityEngineer4 || '', - cQualityEngineer5: project.cQualityEngineer5 || part.cQualityEngineer5 || '', - cQualityEngineer6: project.cQualityEngineer6 || part.cQualityEngineer6 || '', - cManufactureEngineer: project.cManufactureEngineer || part.cManufactureEngineer || '', - docEngineer: project.docEngineer || part.docEngineer || '', - docEngineer2: project.docEngineer2 || part.docEngineer2 || '', - ipqcHardTag: project.ipqcHardTag || part.ipqcHardTag || '', - cQualityEngineer7: project.cQualityEngineer7 || part.cQualityEngineer7 || '', + projectManager: part.projectManager || current.projectManager || '', + projectOwner: part.projectOwner || current.projectOwner || '', + cQualityEngineer1: part.cQualityEngineer1 || '', + cQualityEngineer2: part.cQualityEngineer2 || '', + cQualityEngineer3: part.cQualityEngineer3 || '', + cQualityEngineer4: part.cQualityEngineer4 || '', + cQualityEngineer5: part.cQualityEngineer5 || '', + cQualityEngineer6: part.cQualityEngineer6 || '', + cManufactureEngineer: part.cManufactureEngineer || '', + docEngineer: part.docEngineer || '', + docEngineer2: part.docEngineer2 || '', + ipqcHardTag: part.ipqcHardTag || '', + cQualityEngineer7: part.cQualityEngineer7 || '', partType: part.partType || '', dry_wet_type: part.dry_wet_type || part.dryWetType || current.dry_wet_type || current.dryWetType || '', partStatus: part.status || part.partStatus || '草稿', @@ -7268,14 +7270,16 @@ export default { margin-bottom: 10px; } +/* 独立占位,避免被固定高度的表单项内容区挤出后盖住下一行。 */ .apply-qty-reference { - margin-top: 6px; - padding: 4px 8px; + padding: 2px 8px; border-radius: 4px; background: #ecf5ff; color: #3d77b1; font-size: 12px; line-height: 18px; + box-sizing: border-box; + word-break: break-word; } .big-label a { @@ -7408,7 +7412,7 @@ export default { min-width: 74px; text-align: center; color: #606266; - margin-right: 32px; + margin-right: 26px; } .process-date-display--editable {