diff --git a/src/views/modules/sampleTracking/projectProofTracking.vue b/src/views/modules/sampleTracking/projectProofTracking.vue index d645eff..7fc8aac 100644 --- a/src/views/modules/sampleTracking/projectProofTracking.vue +++ b/src/views/modules/sampleTracking/projectProofTracking.vue @@ -541,9 +541,15 @@ - - - + + + + @@ -560,20 +566,17 @@ - - - - + + + +
+ 试验申请数量参考:{{ getApplyQuantityDisplayText(oneKeySelectedApplyOption.applyQuantity) }} +
- +
@@ -676,8 +679,14 @@
- - + + + @@ -703,14 +712,11 @@ - - - + + +
+ 试验申请数量:{{ getApplyQuantityDisplayText(proofDialogSelectedApplyOption.applyQuantity) }} +
@@ -726,7 +732,7 @@ - +
@@ -1144,6 +1150,24 @@ export default { } const visibleColumns = this.processColumns.filter(item => visibleCodes.indexOf(item.code) > -1) return visibleColumns.length > 0 ? visibleColumns : this.processColumns + }, + oneKeySelectedApplyOption () { + const selectedApplyNo = this.oneKeyForm && !this.isBlankValue(this.oneKeyForm.proofingNo) + ? String(this.oneKeyForm.proofingNo).trim() + : '' + if (!selectedApplyNo) { + return null + } + return this.oneKeyProofingApplyOptions.find(item => item && item.applyNo === selectedApplyNo) || null + }, + proofDialogSelectedApplyOption () { + const selectedApplyNo = this.proofDialogData && !this.isBlankValue(this.proofDialogData.proofingNo) + ? String(this.proofDialogData.proofingNo).trim() + : '' + if (!selectedApplyNo) { + return null + } + return this.proofDialogApplyOptions.find(item => item && item.applyNo === selectedApplyNo) || null } }, methods: { @@ -2137,6 +2161,12 @@ export default { isBlankValue (value) { return value == null || String(value).trim() === '' }, + getApplyQuantityDisplayText (applyQuantity) { + if (this.isBlankValue(applyQuantity)) { + return '未维护' + } + return String(applyQuantity).trim() + }, normalizeProjectNo (projectNo) { if (this.isBlankValue(projectNo)) { return '' @@ -2181,7 +2211,8 @@ export default { optionMap[applyNo] = true optionRows.push({ applyNo: applyNo, - expectedFinishDate: this.formatDate(item.expectedFinishDate) + expectedFinishDate: this.formatDate(item.expectedFinishDate), + applyQuantity: this.isBlankValue(item.quantityReq) ? '' : String(item.quantityReq).trim() }) }) return optionRows @@ -2238,7 +2269,8 @@ export default { // 历史记录可能早于 ERF 规范化,保留原打样单号避免编辑场景被强制清空。 nextOptions.unshift({ applyNo: currentProofingNo, - expectedFinishDate: this.formatDate(this.oneKeyForm.requiredDeliveryDate) + expectedFinishDate: this.formatDate(this.oneKeyForm.requiredDeliveryDate), + applyQuantity: '' }) } if (!hasCurrent && !keepCurrentIfMissing) { @@ -3559,6 +3591,16 @@ export default { margin-bottom: 10px; } +.apply-qty-reference { + margin-top: 6px; + padding: 4px 8px; + border-radius: 4px; + background: #ecf5ff; + color: #2667a8; + font-size: 12px; + line-height: 18px; +} + .big-label a { color: #35b4b4; }