|
|
@@ -116,13 +116,14 @@
|
|
|
:products="loadView.products"
|
|
|
compact
|
|
|
show-stop-actual-qty
|
|
|
- :show-stop-archive-price="showArchiveIoFields"
|
|
|
+ :show-stop-archive-price="effectiveShowArchivePrice"
|
|
|
stop-archive-mode="load"
|
|
|
/>
|
|
|
<p v-else class="pl-plan-form-empty-hint">暂无装货产品</p>
|
|
|
<PlPlanArchiveBrandViewBlock
|
|
|
v-if="showArchiveIoFields"
|
|
|
:items="loadArchiveBrandItems"
|
|
|
+ :show-price="effectiveShowArchivePrice"
|
|
|
/>
|
|
|
<PlPlanStopFeedbackPanel
|
|
|
v-if="showStopFeedback && !feedbackMirrorTo"
|
|
|
@@ -200,13 +201,14 @@
|
|
|
:products="delivery.products"
|
|
|
compact
|
|
|
show-stop-actual-qty
|
|
|
- :show-stop-archive-price="showArchiveIoFields"
|
|
|
+ :show-stop-archive-price="effectiveShowArchivePrice"
|
|
|
stop-archive-mode="delivery"
|
|
|
/>
|
|
|
<p v-else class="pl-plan-form-empty-hint">暂无送货产品</p>
|
|
|
<PlPlanArchiveBrandViewBlock
|
|
|
v-if="showArchiveIoFields"
|
|
|
:items="deliveryArchiveBrandItems(delivery, index)"
|
|
|
+ :show-price="effectiveShowArchivePrice"
|
|
|
/>
|
|
|
<PlPlanStopFeedbackPanel
|
|
|
v-if="showStopFeedback && !feedbackMirrorTo"
|
|
|
@@ -492,8 +494,10 @@
|
|
|
hideNav?: boolean
|
|
|
/** 受控当前 Tab:overview / transport */
|
|
|
tab?: string
|
|
|
- /** 仅运输计划归档:展示入库/出库单价与金额 */
|
|
|
+ /** 仅运输计划归档:展示入库/出库数量(及默认跟随的价格) */
|
|
|
showArchiveIoFields?: boolean
|
|
|
+ /** 归档查看:展示单价与金额;未传时跟随 showArchiveIoFields */
|
|
|
+ showArchivePriceFields?: boolean
|
|
|
/** 司机/出库单回传「实际数量」后展示仅供参考说明 */
|
|
|
showActualQtyDisclaimer?: boolean
|
|
|
/** 计划概况产品表:展示入库/出库数量(不含单价与金额) */
|
|
|
@@ -509,11 +513,16 @@
|
|
|
hideNav: false,
|
|
|
tab: undefined,
|
|
|
showArchiveIoFields: false,
|
|
|
+ showArchivePriceFields: undefined,
|
|
|
showActualQtyDisclaimer: false,
|
|
|
showInboundOutboundQty: false
|
|
|
}
|
|
|
)
|
|
|
|
|
|
+ const effectiveShowArchivePrice = computed(
|
|
|
+ () => props.showArchivePriceFields ?? props.showArchiveIoFields
|
|
|
+ )
|
|
|
+
|
|
|
const emit = defineEmits<{
|
|
|
'update:tab': [value: string]
|
|
|
}>()
|
|
|
@@ -1383,6 +1392,7 @@
|
|
|
const feedbackBlocksBind = computed(() => ({
|
|
|
feedbackEditable: props.feedbackEditable,
|
|
|
showArchiveIoFields: props.showArchiveIoFields,
|
|
|
+ showArchivePriceFields: effectiveShowArchivePrice.value,
|
|
|
showActualQtyDisclaimer: props.showActualQtyDisclaimer,
|
|
|
loading: loading.value,
|
|
|
canEditDriverFeedback: canEditDriverFeedback.value,
|
|
|
@@ -1487,9 +1497,10 @@
|
|
|
const hasFreight = plan.value?.hasFreight === 1
|
|
|
const unit = freightUnitLabel.value
|
|
|
const isByWeight = hasFreight && displayFreightType.value === 'by_weight'
|
|
|
+ const hideArchiveMoney = props.showArchiveIoFields && !effectiveShowArchivePrice.value
|
|
|
|
|
|
// long: false — 强制七字段同一行展示
|
|
|
- return [
|
|
|
+ const fields: ViewField[] = [
|
|
|
{ label: '是否有运输费用', value: getPlYesNoLabel(plan.value?.hasFreight), long: false },
|
|
|
{ label: '运输公里数', value: hasFreight ? displayDistanceKm.value : '—', long: false },
|
|
|
{
|
|
|
@@ -1501,25 +1512,32 @@
|
|
|
label: `运输量(${unit})`,
|
|
|
value: isByWeight ? displayTransportQty.value : '—',
|
|
|
long: false
|
|
|
- },
|
|
|
- {
|
|
|
- label: `运输单价(元/${unit})`,
|
|
|
- value: isByWeight ? displayFreightPrice.value : '—',
|
|
|
- money: isByWeight,
|
|
|
- long: false
|
|
|
- },
|
|
|
- {
|
|
|
- label: '运费金额(元)',
|
|
|
- value: hasFreight ? displayFreightAmount.value : '—',
|
|
|
- money: hasFreight,
|
|
|
- long: false
|
|
|
- },
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ if (!hideArchiveMoney) {
|
|
|
+ fields.push(
|
|
|
+ {
|
|
|
+ label: `运输单价(元/${unit})`,
|
|
|
+ value: isByWeight ? displayFreightPrice.value : '—',
|
|
|
+ money: isByWeight,
|
|
|
+ long: false
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '运费金额(元)',
|
|
|
+ value: hasFreight ? displayFreightAmount.value : '—',
|
|
|
+ money: hasFreight,
|
|
|
+ long: false
|
|
|
+ }
|
|
|
+ )
|
|
|
+ }
|
|
|
+ fields.push(
|
|
|
{ label: '是否开票', value: hasFreight ? displayHasInvoiceLabel.value : '—', long: false },
|
|
|
{
|
|
|
label: '运费备注',
|
|
|
value: hasFreight ? plan.value?.freightRemark?.trim() || '—' : '—'
|
|
|
}
|
|
|
- ]
|
|
|
+ )
|
|
|
+ return fields
|
|
|
})
|
|
|
|
|
|
/** 危化证区域展示 CRM 标准名(productRows 已回填 standardProductName;库内 productName 可能是别名) */
|