This commit is contained in:
zlwu committed 2026-07-22 21:26:33 +08:00
1 parent aff71d296b
commit 68d96f87ff
34 files changed
+19587 -16249

No files matched your search

@@ -3,7 +3,7 @@
<el-dialog
v-model="innerVisible"
:title="dialogTitle"
width="1680px"
width="100%"
align-center
destroy-on-close
append-to-body
@@ -15,6 +15,39 @@
@opened="handleOpened"
>
<div class="pl-plan-form-body">
<section class="pl-plan-form-section">
<div class="pl-plan-form-section-head">
<h3 class="pl-plan-form-section-title">合同信息</h3>
<div class="pl-plan-form-section-actions">
<el-button
v-if="contractSnapshot"
class="btn-ghost"
@click="handleViewContract"
>
<el-icon><View /></el-icon>查看合同
</el-button>
<el-button class="btn-main" type="primary" @click="contractSelectorVisible = true">
<el-icon><Search /></el-icon>选择合同
</el-button>
</div>
</div>
<p v-if="!contractSnapshot" class="pl-plan-form-empty-hint">请选择 CRM 合同,系统将自动带入合同与产品信息</p>
<template v-else>
<ViewKvGrid :fields="contractBasicFields" :columns="5" />
<h4 class="pl-plan-subtitle">合同产品预览</h4>
<p class="pl-plan-form-empty-hint">点击「选择」将合同产品加入下方产品信息;已添加的产品不可重复选择</p>
<PlPlanFormProductTable
:products="contractProductRows"
show-select
:selected-product-ids="selectedPlanProductIds"
@select="handleSelectContractProduct"
/>
</template>
</section>
<section class="pl-plan-form-section">
<h3 class="pl-plan-form-section-title">基础信息</h3>
<el-form ref="basicFormRef" :model="formData" :rules="basicRules" label-position="right" label-width="100px" class="pl-dialog-form">
@@ -48,42 +81,6 @@
</el-form>
</section>
<section class="pl-plan-form-section">
<div class="pl-plan-form-section-head">
<h3 class="pl-plan-form-section-title">合同信息</h3>
<div class="pl-plan-form-section-actions">
<el-button
v-if="contractSnapshot"
class="btn-ghost"
@click="handleViewContract"
>
<el-icon><View /></el-icon>查看合同
</el-button>
<el-button class="btn-main" type="primary" @click="contractSelectorVisible = true">
<el-icon><Search /></el-icon>选择合同
</el-button>
</div>
</div>
<p v-if="!contractSnapshot" class="pl-plan-form-empty-hint">请选择 CRM 合同,系统将自动带入合同与产品信息</p>
<template v-else>
<div class="pl-plan-contract-kv-rows">
<ViewKvTable :fields="contractBasicRow1Fields" mode="triple" />
<ViewKvTable :fields="contractBasicRow2Fields" mode="triple" />
</div>
<h4 class="pl-plan-subtitle">合同产品预览</h4>
<p class="pl-plan-form-empty-hint">点击「选择」将合同产品加入下方产品信息;已添加的产品不可重复选择</p>
<PlPlanFormProductTable
:products="contractProductRows"
show-select
:selected-product-ids="selectedPlanProductIds"
@select="handleSelectContractProduct"
/>
</template>
</section>
<section class="pl-plan-form-section">
<h3 class="pl-plan-form-section-title">产品信息</h3>
<PlPlanFormProductTable
@@ -264,7 +261,7 @@ import { getContract } from '@/api/crm/contract'
import type { ContractVO } from '@/api/crm/contract/types'
import { carrierApi, planApi, transportApi, vehicleApi, type Carrier, type Plan, type PlanProduct, type PlanUpdatePayload, type Vehicle, type VehiclePersonnelRow } from '@/api/pl'
import ContractSelector from '@/components/business/contract-selector/index.vue'
import ViewKvTable from '@/components/business/system-view-dialog/ViewKvTable.vue'
import ViewKvGrid from '@/components/business/system-view-dialog/ViewKvGrid.vue'
import type { ViewField } from '@/components/business/system-view-dialog/types'
import PlVehicleSummaryStrip from '@/components/business/pl-vehicle-summary-strip/index.vue'
import PlVehicleViewDialog from '@/components/business/pl-vehicle-view-dialog/index.vue'
@@ -445,16 +442,12 @@ function buildContractBasicFields(contract: ContractVO): ViewField[] {
]
}
const contractBasicFieldRows = computed(() => {
const contractBasicFields = computed(() => {
const contract = contractSnapshot.value
if (!contract) return { row1: [] as ViewField[], row2: [] as ViewField[] }
const fields = buildContractBasicFields(contract)
return { row1: fields.slice(0, 3), row2: fields.slice(3, 6) }
if (!contract) return [] as ViewField[]
return buildContractBasicFields(contract)
})
const contractBasicRow1Fields = computed(() => contractBasicFieldRows.value.row1)
const contractBasicRow2Fields = computed(() => contractBasicFieldRows.value.row2)
/** 合同产品预览:固定展示合同原始明细,与下方可编辑的计划产品分离 */
const contractProductRows = computed<PlanFormProductRow[]>(() =>
mapContractProducts(contractSnapshot.value?.products)
@@ -1028,25 +1021,6 @@ async function handleSubmit(mode: 'save' | 'saveAndArrange' = 'save') {
color: #64748b;
}
.pl-plan-contract-kv-rows {
:deep(.view-kv-table-wrap) {
border-radius: 0;
}
:deep(.view-kv-table-wrap:first-child) {
border-radius: 8px 8px 0 0;
}
:deep(.view-kv-table-wrap:last-child) {
border-radius: 0 0 8px 8px;
border-top: none;
}
:deep(.view-kv-table-wrap:only-child) {
border-radius: 8px;
}
}
.pl-plan-kv-grid {
display: grid;
grid-template-columns: repeat(4, minmax(0, 1fr));
@@ -1192,7 +1166,8 @@ async function handleSubmit(mode: 'save' | 'saveAndArrange' = 'save') {
<style lang="scss">
.el-dialog.pl-plan-form-dialog.dialog-form-layout {
width: min(1680px, calc(100vw - 80px)) !important;
width: 100% !important;
max-width: calc(100vw - 48px);
max-height: var(--dialog-max-height, calc(100vh - 40px));
}
@@ -3,7 +3,7 @@
<el-dialog
v-model="innerVisible"
:title="dialogTitle"
width="1680px"
width="100%"
align-center
destroy-on-close
append-to-body
@@ -149,7 +149,8 @@ defineExpose({ reload })
<style lang="scss">
.el-dialog.pl-plan-view-dialog.dialog-form-layout {
width: min(1680px, calc(100vw - 80px)) !important;
width: 100% !important;
max-width: calc(100vw - 48px);
height: var(--dialog-max-height, calc(100vh - 40px));
max-height: var(--dialog-max-height, calc(100vh - 40px));
}
@@ -3,30 +3,30 @@
<div v-loading="loading" class="pl-plan-view-tabs" :class="{ 'is-embedded': embedded }">
<el-tabs v-model="activeTab" class="pl-plan-view-tabs__nav">
<el-tab-pane label="计划概况" name="overview">
<section class="pl-plan-form-section">
<section class="pl-plan-form-section pl-plan-form-section--plain">
<h3 class="pl-plan-form-section-title">基础信息</h3>
<ViewKvTable :fields="overviewBasicViewFields" mode="quint" />
</section>
<section class="pl-plan-form-section">
<section class="pl-plan-form-section pl-plan-form-section--plain">
<h3 class="pl-plan-form-section-title">产品信息</h3>
<p v-if="!productRows.length && !loading" class="pl-plan-form-empty-hint">暂无产品明细</p>
<PlPlanFormProductTable v-else :products="productRows" show-actual-qty />
</section>
<section class="pl-plan-form-section">
<section class="pl-plan-form-section pl-plan-form-section--plain">
<h3 class="pl-plan-form-section-title">危化品证书信息</h3>
<PlPlanHazardCertViewTable :products="hazardProducts" />
</section>
<section class="pl-plan-form-section">
<section class="pl-plan-form-section pl-plan-form-section--plain">
<h3 class="pl-plan-form-section-title">备注</h3>
<p class="pl-plan-view-remark">{{ plan?.remark || '—' }}</p>
</section>
</el-tab-pane>
<el-tab-pane label="运输信息" name="transport">
<section v-if="showArrangeLinks" class="pl-plan-form-section pl-plan-arrange-links">
<section v-if="showArrangeLinks" class="pl-plan-form-section pl-plan-form-section--plain pl-plan-arrange-links">
<h3 class="pl-plan-form-section-title">运输链接</h3>
<div class="pl-arrange-link-row">
<span class="pl-arrange-link-label">司机链接</span>
@@ -65,8 +65,8 @@
</p>
</section>
<section class="pl-plan-form-section">
<h3 class="pl-plan-form-section-title">车辆与承运</h3>
<section class="pl-plan-form-section pl-plan-form-section--plain">
<h3 class="pl-plan-form-section-title">车辆信息</h3>
<PlVehicleSummaryStrip
v-if="vehicleBundle"
:detail="vehicleBundle.detail"
@@ -75,11 +75,12 @@
@view="vehicleViewVisible = true"
/>
<p v-else-if="!loading" class="pl-plan-form-empty-hint">暂无车辆信息</p>
</section>
<h4 class="pl-plan-subtitle">物流节点</h4>
<section class="pl-plan-form-section pl-plan-form-section--plain">
<h3 class="pl-plan-form-section-title">物流节点</h3>
<div class="parties-row">
<div class="party-panel">
<div class="party-panel__title">取货信息</div>
<div class="party-panel party-panel--plain">
<ViewKvTable :fields="pickupViewFields" mode="quad" />
</div>
@@ -104,99 +105,112 @@
</span>
</div>
<div class="party-panel">
<div class="party-panel__title">送货信息</div>
<div class="party-panel party-panel--plain">
<ViewKvTable :fields="deliveryViewFields" mode="quad" />
</div>
</div>
</section>
<h4 class="pl-plan-subtitle">运费信息</h4>
<ViewKvTable :fields="freightViewFields" mode="quad" />
<section class="pl-plan-form-section pl-plan-form-section--plain">
<h3 class="pl-plan-form-section-title">运费信息</h3>
<ViewKvTable :fields="freightViewFields" mode="sept" />
</section>
<div class="pl-plan-feedback-region">
<div class="pl-plan-feedback-region__head">
<h4 class="pl-plan-feedback-region__title">司机回传信息</h4>
<el-button
v-if="feedbackEditable"
class="btn-op-item"
:disabled="!canEditDriverFeedback"
@click="openDriverFeedbackDialog"
<section class="pl-plan-form-section pl-plan-form-section--plain">
<div class="pl-plan-form-section-head">
<h3 class="pl-plan-form-section-title">司机回传信息</h3>
<el-button
v-if="feedbackEditable"
class="btn-op-item"
:disabled="!canEditDriverFeedback"
@click="openDriverFeedbackDialog"
>
<el-icon><Edit /></el-icon>
{{ hasDriverFeedback ? '编辑' : '补充' }}
</el-button>
</div>
<p v-if="!hasDriverFeedback" class="pl-plan-form-empty-hint">暂无司机回传</p>
<div v-else class="view-subtable-wrap">
<el-table :data="driverFeedbackTableRows" class="view-subtable list-table" stripe>
<el-table-column
type="index"
label="序号"
min-width="68"
align="center"
header-align="center"
/>
<el-table-column
prop="feedbackTime"
label="回传时间"
min-width="160"
align="center"
/>
<el-table-column
prop="feedbackQty"
label="回传数量"
min-width="100"
align="center"
>
<el-icon><Edit /></el-icon>
{{ hasDriverFeedback ? '编辑' : '补充' }}
</el-button>
</div>
<p v-if="!hasDriverFeedback" class="pl-plan-form-empty-hint">暂无司机回传</p>
<div v-else class="view-subtable-wrap">
<el-table :data="driverFeedbackTableRows" class="view-subtable list-table" stripe>
<el-table-column
type="index"
label="序号"
min-width="68"
align="center"
header-align="center"
/>
<el-table-column
prop="feedbackTime"
label="回传时间"
min-width="160"
align="center"
/>
<el-table-column
prop="feedbackQty"
label="回传数量"
min-width="100"
align="center"
>
<template #default="{ row }">
{{ row.feedbackQty ?? '—' }}
</template>
</el-table-column>
<el-table-column
prop="feedbackRemark"
label="回传备注"
min-width="180"
show-overflow-tooltip
/>
<el-table-column label="回传附件" min-width="140" align="center" header-align="center">
<template #default="{ row }">
<div v-if="row.feedbackImages" class="pl-plan-feedback-table__attachment">
<AttachmentUploadField :model-value="row.feedbackImages" disabled compact />
</div>
<span v-else class="pl-plan-feedback-table__empty-cell">—</span>
</template>
<template #default="{ row }">
{{ row.feedbackQty ?? '—' }}
</template>
</el-table-column>
<el-table-column
prop="feedbackRemark"
label="回传备注"
min-width="180"
show-overflow-tooltip
/>
<el-table-column label="回传附件" min-width="140" align="center" header-align="center">
<template #default="{ row }">
<div v-if="row.feedbackImages" class="pl-plan-feedback-table__attachment">
<AttachmentUploadField :model-value="row.feedbackImages" disabled compact />
</div>
<span v-else class="pl-plan-feedback-table__empty-cell">—</span>
</template>
</el-table-column>
</el-table>
</div>
</section>
<section class="pl-plan-form-section pl-plan-form-section--plain">
<div class="pl-plan-form-section-head">
<h3 class="pl-plan-form-section-title">
{{ ioOrder ? (ioOrder.kind === 'inbound' ? '入库单回传' : '出库单回传') : '现场回传信息' }}
</h3>
<el-button
v-if="ioOrder?.siteUrl"
class="btn-op-item"
@click="copyArrangeSiteUrl(ioOrder.siteUrl)"
>
<el-icon><CopyDocument /></el-icon>
复制现场链接
</el-button>
</div>
<!-- 新链路:入库/出库单权威展示 -->
<template v-if="ioOrder">
<ViewKvTable :fields="ioOrderViewFields" mode="quint" />
<div class="view-subtable-wrap" style="margin-top: 12px">
<el-table :data="ioOrder.items || []" class="view-subtable list-table" stripe>
<el-table-column type="index" label="序号" min-width="68" align="center" />
<el-table-column prop="productNo" label="产品编码" min-width="110" show-overflow-tooltip />
<el-table-column prop="productName" label="产品名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="specification" label="型号/规格" min-width="100" show-overflow-tooltip />
<el-table-column label="单位" min-width="72" align="center">
<template #default="{ row }">{{ row.unitLabel || row.unit || '—' }}</template>
</el-table-column>
<el-table-column prop="planQty" label="计划数量" min-width="100" align="right" />
<el-table-column prop="actualQty" label="实际数量" min-width="100" align="right" />
<el-table-column prop="packageSpec" label="包装规格" min-width="110" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
</el-table>
</div>
</div>
<div class="pl-plan-feedback-region">
<h4 class="pl-plan-feedback-region__title">
{{ ioOrder ? (ioOrder.kind === 'inbound' ? '入库单回传' : '出库单回传') : '现场回传信息' }}
</h4>
<!-- 新链路:入库/出库单权威展示 -->
<template v-if="ioOrder">
<ViewKvTable :fields="ioOrderViewFields" mode="quint" />
<div class="view-subtable-wrap" style="margin-top: 12px">
<el-table :data="ioOrder.items || []" class="view-subtable list-table" stripe>
<el-table-column type="index" label="序号" min-width="68" align="center" />
<el-table-column prop="productNo" label="产品编号" min-width="110" show-overflow-tooltip />
<el-table-column prop="productName" label="产品名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="specification" label="型号/规格" min-width="100" show-overflow-tooltip />
<el-table-column label="单位" min-width="72" align="center">
<template #default="{ row }">{{ row.unitLabel || row.unit || '—' }}</template>
</el-table-column>
<el-table-column prop="planQty" label="计划数量" min-width="100" align="right" />
<el-table-column prop="actualQty" label="实际数量" min-width="100" align="right" />
<el-table-column prop="packageSpec" label="包装规格" min-width="110" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
</el-table>
</div>
<div style="margin-top: 12px">
<div class="pl-plan-io-site-meta">
<div class="pl-plan-io-site-meta__item">
<p class="pl-plan-form-empty-hint" style="margin-bottom: 6px">现场备注</p>
<p class="pl-plan-view-remark">{{ ioOrder.siteFeedbackRemark || '—' }}</p>
</div>
<div style="margin-top: 12px">
<div class="pl-plan-io-site-meta__item">
<p class="pl-plan-form-empty-hint" style="margin-bottom: 6px">现场附件</p>
<AttachmentUploadField
v-if="ioOrderImageCsv"
@@ -206,70 +220,68 @@
/>
<span v-else class="pl-plan-feedback-table__empty-cell">—</span>
</div>
<div style="margin-top: 12px; display: flex; gap: 8px">
<el-button v-if="feedbackEditable && ioOrder.status !== 'voided'" @click="openIoOrderEditDialog">
<el-icon><Edit /></el-icon>
{{ ioOrderHasFeedback ? '编辑' : '补充' }}
</el-button>
<el-button v-if="ioOrder.siteUrl" @click="copyArrangeSiteUrl(ioOrder.siteUrl)">
<el-icon><CopyDocument /></el-icon>
复制现场链接
</el-button>
</div>
</template>
<!-- 旧链路:按产品现场 link -->
<template v-else>
<p v-if="!siteInventoryRows.length && !loading" class="pl-plan-form-empty-hint">
暂无现场链接
</p>
<div v-else class="view-subtable-wrap">
<el-table :data="siteFeedbackTableRows" class="view-subtable list-table" stripe>
<el-table-column type="index" label="序号" min-width="68" align="center" />
<el-table-column prop="productName" label="产品" min-width="140" show-overflow-tooltip />
<el-table-column prop="siteFeedbackTime" label="保存时间" min-width="160" align="center" />
<el-table-column label="业务类型" min-width="100" align="center">
<template #default="{ row }">
<el-tag
v-if="row.businessType && row.businessType !== '—'"
:type="businessTypeTagType(row.businessType)"
size="small"
>
{{ row.businessType }}
</el-tag>
<span v-else class="pl-plan-feedback-table__empty-cell">—</span>
</template>
</el-table-column>
<el-table-column prop="siteFeedbackRemark" label="现场备注" min-width="160" show-overflow-tooltip />
<el-table-column label="现场附件" min-width="140" align="center">
<template #default="{ row }">
<div v-if="row.siteFeedbackImages" class="pl-plan-feedback-table__attachment">
<AttachmentUploadField :model-value="row.siteFeedbackImages" disabled compact />
</div>
<span v-else class="pl-plan-feedback-table__empty-cell">—</span>
</template>
</el-table-column>
<el-table-column label="操作" min-width="240" align="center" fixed="right">
<template #default="{ row }">
<el-button
v-if="feedbackEditable"
class="btn-op-item"
@click="openSiteFeedbackDialog(row)"
>
<el-icon><Edit /></el-icon>
{{ rowHasSiteFeedback(row) ? '编辑' : '补充' }}
</el-button>
<el-button class="btn-op-item" @click="copySiteSummaryForRow(row.sourceRow)">
<el-icon><CopyDocument /></el-icon>
复制给现场
</el-button>
</template>
</el-table-column>
</el-table>
</div>
</template>
</div>
</div>
<div v-if="feedbackEditable && ioOrder.status !== 'voided'" style="margin-top: 12px">
<el-button @click="openIoOrderEditDialog">
<el-icon><Edit /></el-icon>
{{ ioOrderHasFeedback ? '编辑' : '补充' }}
</el-button>
</div>
</template>
<!-- 旧链路:按产品现场 link -->
<template v-else>
<p v-if="!siteInventoryRows.length && !loading" class="pl-plan-form-empty-hint">
暂无现场链接
</p>
<div v-else class="view-subtable-wrap">
<el-table :data="siteFeedbackTableRows" class="view-subtable list-table" stripe>
<el-table-column type="index" label="序号" min-width="68" align="center" />
<el-table-column prop="productName" label="产品" min-width="140" show-overflow-tooltip />
<el-table-column prop="siteFeedbackTime" label="保存时间" min-width="160" align="center" />
<el-table-column label="业务类型" min-width="100" align="center">
<template #default="{ row }">
<el-tag
v-if="row.businessType && row.businessType !== '—'"
:type="businessTypeTagType(row.businessType)"
size="small"
>
{{ row.businessType }}
</el-tag>
<span v-else class="pl-plan-feedback-table__empty-cell">—</span>
</template>
</el-table-column>
<el-table-column prop="siteFeedbackRemark" label="现场备注" min-width="160" show-overflow-tooltip />
<el-table-column label="现场附件" min-width="140" align="center">
<template #default="{ row }">
<div v-if="row.siteFeedbackImages" class="pl-plan-feedback-table__attachment">
<AttachmentUploadField :model-value="row.siteFeedbackImages" disabled compact />
</div>
<span v-else class="pl-plan-feedback-table__empty-cell">—</span>
</template>
</el-table-column>
<el-table-column label="操作" min-width="240" align="center" fixed="right">
<template #default="{ row }">
<el-button
v-if="feedbackEditable"
class="btn-op-item"
@click="openSiteFeedbackDialog(row)"
>
<el-icon><Edit /></el-icon>
{{ rowHasSiteFeedback(row) ? '编辑' : '补充' }}
</el-button>
<el-button class="btn-op-item" @click="copySiteSummaryForRow(row.sourceRow)">
<el-icon><CopyDocument /></el-icon>
复制给现场
</el-button>
</template>
</el-table-column>
</el-table>
</div>
</template>
</section>
<h4 class="pl-plan-subtitle">地磅单信息</h4>
<section class="pl-plan-form-section pl-plan-form-section--plain">
<h3 class="pl-plan-form-section-title">地磅单信息</h3>
<p v-if="!dibangPlanRows.length && !loading" class="pl-plan-form-empty-hint"
>暂无关联地磅单</p
>
@@ -293,7 +305,7 @@
</div>
</div>
<ViewKvTable :fields="dibangBasicViewFields(row)" mode="quad" />
<ViewKvTable :fields="dibangBasicViewFields(row)" mode="hex" />
<template v-if="row.weighing">
<h5 class="pl-plan-dibang-weighing-title">地磅单</h5>
@@ -399,7 +411,7 @@
</el-tab-pane>
<el-tab-pane label="合同信息" name="contract">
<section class="pl-plan-form-section">
<section class="pl-plan-form-section pl-plan-form-section--plain">
<p v-if="!contractSnapshot" class="pl-plan-form-empty-hint">暂无关联合同信息</p>
<template v-else>
<div class="pl-plan-form-section-head">
@@ -488,7 +500,7 @@
<el-form v-if="ioOrderEditForm" label-position="top">
<el-form-item label="产品实际数量">
<el-table :data="ioOrderEditForm.items || []" size="small" border>
<el-table-column prop="productNo" label="产品编号" min-width="110" show-overflow-tooltip />
<el-table-column prop="productNo" label="产品编码" min-width="110" show-overflow-tooltip />
<el-table-column prop="productName" label="产品名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="specification" label="型号/规格" min-width="100" show-overflow-tooltip />
<el-table-column label="单位" min-width="72" align="center">
@@ -649,6 +661,7 @@
voided: '已作废'
}
const status = ioOrder.value.status
// 出库/入库单回传:取送货与「最近提交」与上方物流节点重复,不在此展示
return [
{ label: '单号', value: ioOrder.value.orderNo },
{
@@ -659,21 +672,7 @@
},
{ label: '计划号', value: ioOrder.value.planNo },
{ label: '车牌', value: ioOrder.value.vehicleNo },
{ label: '往来单位', value: ioOrder.value.partnerCompany },
{
label: '最近提交',
value: formatDateTime(ioOrder.value.siteFeedbackTime) || '—'
},
{ label: '取货地址', value: ioOrder.value.pickupAddress, span: 'full' },
{ label: '取货时间', value: formatDateTime(ioOrder.value.pickupTime) || '—' },
{ label: '取货注意事项', value: ioOrder.value.pickupNotes, span: 'full' },
{
label: '送货地址',
value: ioOrder.value.destinationAddress || ioOrder.value.destinationName,
span: 'full'
},
{ label: '送达时间', value: formatDateTime(ioOrder.value.deliveryTime) || '—' },
{ label: '送货注意事项', value: ioOrder.value.destinationNotes, span: 'full' }
{ label: '往来单位', value: ioOrder.value.partnerCompany }
]
})
@@ -756,20 +755,23 @@
function dibangBasicViewFields(row: PlPlanTransportDibangRow): ViewField[] {
const businessType = row.inventory?.businessType
// long: false — 强制六字段同一行展示,避免往来单位等长文案自动折行
return [
{ label: '出入库单号', value: row.inventory?.batchNo || row.link.batchNo },
{ label: '出入库单号', value: row.inventory?.batchNo || row.link.batchNo, long: false },
{
label: '业务类型',
value: businessType,
tagType: businessType ? businessTypeTagType(businessType) : undefined
tagType: businessType ? businessTypeTagType(businessType) : undefined,
long: false
},
{ label: '往来单位', value: row.inventory?.partnerCompany },
{ label: '往来单位', value: row.inventory?.partnerCompany, long: false },
{
label: '车牌号',
value: row.inventory?.vehicleNo || plan.value?.licensePlate || transport.value?.licensePlate
value: row.inventory?.vehicleNo || plan.value?.licensePlate || transport.value?.licensePlate,
long: false
},
{ label: '产品', value: row.inventory?.product || row.link.productName },
{ label: '数量(吨)', value: row.inventory?.quantity }
{ label: '产品', value: row.inventory?.product || row.link.productName, long: false },
{ label: '数量(吨)', value: row.inventory?.quantity, long: false }
]
}
@@ -976,28 +978,33 @@
const unit = freightUnitLabel.value
const isByWeight = hasFreight && displayFreightType.value === 'by_weight'
// long: false — 强制七字段同一行展示
return [
{ label: '是否有运输费用', value: getPlYesNoLabel(plan.value?.hasFreight) },
{ label: '运输公里数', value: hasFreight ? displayDistanceKm.value : '—' },
{ label: '是否有运输费用', value: getPlYesNoLabel(plan.value?.hasFreight), long: false },
{ label: '运输公里数', value: hasFreight ? displayDistanceKm.value : '—', long: false },
{
label: '运费计算方式',
value: hasFreight ? getPlFreightTypeLabel(displayFreightType.value) : '—'
value: hasFreight ? getPlFreightTypeLabel(displayFreightType.value) : '—',
long: false
},
{
label: `运输量(${unit})`,
value: isByWeight ? displayTransportQty.value : '—'
value: isByWeight ? displayTransportQty.value : '—',
long: false
},
{
label: `运输单价(元/${unit})`,
value: isByWeight ? displayFreightPrice.value : '—',
money: isByWeight
money: isByWeight,
long: false
},
{
label: '运费金额(元)',
value: hasFreight ? displayFreightAmount.value : '—',
money: hasFreight
money: hasFreight,
long: false
},
{ label: '是否开票', value: hasFreight ? displayHasInvoiceLabel.value : '—' }
{ label: '是否开票', value: hasFreight ? displayHasInvoiceLabel.value : '—', long: false }
]
})
@@ -1124,6 +1131,13 @@
& + & {
margin-top: 12px;
}
&--plain {
padding: 0;
border: none;
border-radius: 0;
background: transparent;
}
}
.pl-plan-form-section-head {
@@ -1251,6 +1265,13 @@
border: 1px solid var(--border, #d9e8e2);
border-radius: 10px;
background: #fff;
&--plain {
padding: 0;
border: none;
border-radius: 0;
background: transparent;
}
}
.party-panel__title {
@@ -1330,6 +1351,23 @@
background: #f8fafc;
}
.pl-plan-io-site-meta {
display: grid;
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
gap: 16px 24px;
margin-top: 12px;
}
.pl-plan-io-site-meta__item {
min-width: 0;
}
@media (max-width: 720px) {
.pl-plan-io-site-meta {
grid-template-columns: 1fr;
}
}
.pl-plan-feedback-region__head {
display: flex;
align-items: center;
@@ -1352,14 +1390,14 @@
line-height: 1;
}
.pl-plan-feedback-region .view-subtable-wrap {
.pl-plan-form-section .view-subtable-wrap {
border: 1px solid #e2e8f0;
border-radius: 8px;
overflow: hidden;
background: #fff;
}
.pl-plan-feedback-region .view-subtable-wrap :deep(.el-table.view-subtable) {
.pl-plan-form-section .view-subtable-wrap :deep(.el-table.view-subtable) {
--el-table-header-bg-color: #f8fafc;
--el-table-header-text-color: #1e293b;
--el-table-border-color: #e2e8f0;
@@ -56,6 +56,10 @@
&--cols-4 {
grid-template-columns: repeat(4, minmax(0, 1fr));
}
&--cols-5 {
grid-template-columns: repeat(5, minmax(0, 1fr));
}
}
.view-kv {
@@ -102,14 +106,16 @@
}
@media (max-width: 1100px) {
.view-kv-grid--cols-4 {
.view-kv-grid--cols-4,
.view-kv-grid--cols-5 {
grid-template-columns: repeat(3, minmax(0, 1fr));
}
}
@media (max-width: 900px) {
.view-kv-grid--cols-3,
.view-kv-grid--cols-4 {
.view-kv-grid--cols-4,
.view-kv-grid--cols-5 {
grid-template-columns: repeat(2, minmax(0, 1fr));
}
}
@@ -117,7 +123,8 @@
@media (max-width: 640px) {
.view-kv-grid,
.view-kv-grid--cols-3,
.view-kv-grid--cols-4 {
.view-kv-grid--cols-4,
.view-kv-grid--cols-5 {
grid-template-columns: 1fr;
}
@@ -96,7 +96,7 @@
</template>
</tr>
</template>
<template v-else>
<template v-else-if="mode === 'quint'">
<tr
v-for="(row, idx) in quintRows"
:key="quintRowKey(row, idx)"
@@ -124,6 +124,62 @@
</template>
</tr>
</template>
<template v-else-if="mode === 'hex'">
<tr
v-for="(row, idx) in hexRows"
:key="hexRowKey(row, idx)"
:class="{ 'row-long': row.type === 'long' }"
>
<template v-if="row.type === 'long'">
<th>{{ row.field.label }}</th>
<td colspan="11">
<ViewKvTableCell :field="row.field" />
</td>
</template>
<template v-else>
<template v-for="(field, fi) in row.fields" :key="field.label">
<th>{{ field.label }}</th>
<td
:colspan="
fi === row.fields.length - 1 && row.fields.length < 6
? (6 - row.fields.length) * 2 + 1
: undefined
"
>
<ViewKvTableCell :field="field" />
</td>
</template>
</template>
</tr>
</template>
<template v-else>
<tr
v-for="(row, idx) in septRows"
:key="septRowKey(row, idx)"
:class="{ 'row-long': row.type === 'long' }"
>
<template v-if="row.type === 'long'">
<th>{{ row.field.label }}</th>
<td colspan="13">
<ViewKvTableCell :field="row.field" />
</td>
</template>
<template v-else>
<template v-for="(field, fi) in row.fields" :key="field.label">
<th>{{ field.label }}</th>
<td
:colspan="
fi === row.fields.length - 1 && row.fields.length < 7
? (7 - row.fields.length) * 2 + 1
: undefined
"
>
<ViewKvTableCell :field="field" />
</td>
</template>
</template>
</tr>
</template>
</tbody>
</table>
</div>
@@ -136,23 +192,27 @@
import ViewKvTableCell from './ViewKvTableCell.vue'
import {
buildViewKvTableDualRows,
buildViewKvTableHexRows,
buildViewKvTableQuadRows,
buildViewKvTableQuintRows,
buildViewKvTableSeptRows,
buildViewKvTableTripleRows,
getViewFieldDisplayText,
isViewFieldFullSpan,
isViewFieldLong,
type ViewKvTableHexRow,
type ViewKvTableQuadRow,
type ViewKvTableQuintRow,
type ViewKvTableRow,
type ViewKvTableSeptRow,
type ViewKvTableTripleRow
} from '@/utils/view-field-layout'
const props = withDefaults(
defineProps<{
fields: ViewField[]
/** pair:一行一组;dual:一行两组(四列);triple:一行三组(六列);quad:一行四组(八列);quint:一行五组(十列) */
mode?: 'pair' | 'dual' | 'triple' | 'quad' | 'quint'
/** pair:一行一组;dual:两组;triple:三组;quad:四组;quint:五组;hex:六组;sept:七组 */
mode?: 'pair' | 'dual' | 'triple' | 'quad' | 'quint' | 'hex' | 'sept'
}>(),
{
mode: 'pair'
@@ -163,6 +223,8 @@
const tripleRows = computed(() => buildViewKvTableTripleRows(props.fields, formatViewValue))
const quadRows = computed(() => buildViewKvTableQuadRows(props.fields, formatViewValue))
const quintRows = computed(() => buildViewKvTableQuintRows(props.fields, formatViewValue))
const hexRows = computed(() => buildViewKvTableHexRows(props.fields, formatViewValue))
const septRows = computed(() => buildViewKvTableSeptRows(props.fields, formatViewValue))
const emit = defineEmits<{
(e: 'field-view', field: ViewField): void
@@ -194,6 +256,16 @@
if (row.type === 'long') return row.field.label
return row.fields.map((f) => f.label).join('-') || String(idx)
}
function hexRowKey(row: ViewKvTableHexRow, idx: number) {
if (row.type === 'long') return row.field.label
return row.fields.map((f) => f.label).join('-') || String(idx)
}
function septRowKey(row: ViewKvTableSeptRow, idx: number) {
if (row.type === 'long') return row.field.label
return row.fields.map((f) => f.label).join('-') || String(idx)
}
</script>
<style scoped lang="scss">
@@ -309,4 +381,36 @@
.view-kv-table--quint tr.row-long td {
width: auto;
}
.view-kv-table--hex th {
width: 5.5%;
}
.view-kv-table--hex td {
width: 11.2%;
}
.view-kv-table--hex tr.row-long th {
width: 5.5%;
}
.view-kv-table--hex tr.row-long td {
width: auto;
}
.view-kv-table--sept th {
width: 5%;
}
.view-kv-table--sept td {
width: 9.3%;
}
.view-kv-table--sept tr.row-long th {
width: 5%;
}
.view-kv-table--sept tr.row-long td {
width: auto;
}
</style>
@@ -31,7 +31,7 @@ export interface ViewField {
}
export type ViewFieldLayout = 'grid' | 'table'
export type ViewTableMode = 'pair' | 'dual' | 'triple' | 'quad' | 'quint'
export type ViewTableMode = 'pair' | 'dual' | 'triple' | 'quad' | 'quint' | 'hex' | 'sept'
export interface ViewFieldGroup {
title?: string