diff --git a/src/option/business/shipping-template.js b/src/option/business/shipping-template.js
index 8ca887e..bc31478 100644
--- a/src/option/business/shipping-template.js
+++ b/src/option/business/shipping-template.js
@@ -12,8 +12,12 @@ export const config = {
exportName: '发货模板',
enableAllDept: false,
enableProjectSelect: true,
+ excludeVoidedProjects: true,
enableAttachmentTable: true,
enableTransportPlanForm: true,
+ enableShippingTemplateFreight: true,
+ editableRoadAddress: true,
+ fixedTransportAddressType: true,
enableTemplateCodePreview: true,
attachmentTitle: '附件',
defaultForm: {
@@ -178,6 +182,7 @@ export const option = {
labelWidth: '0px',
className: 'business-crud-page__full-form-item',
},
+ { label: '运费信息', prop: 'freightJson', hide: true, display: false },
{
label: '',
prop: 'attachmentTitle',
diff --git a/src/option/business/transport-plan.js b/src/option/business/transport-plan.js
index cda3ed3..39b2d18 100644
--- a/src/option/business/transport-plan.js
+++ b/src/option/business/transport-plan.js
@@ -97,7 +97,7 @@ const formatGoodsInfo = row => {
const text = Object.entries(groups)
.map(([unit, group]) => {
const quantity = `${formatGoodsQuantity(group.quantity)}${unit}`;
- return `${group.typeName}等${group.count}中货物 | ${quantity}`;
+ return `${group.typeName}等${group.count}种货物 | ${quantity}`;
})
.join('; ');
diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue
index ab6ae76..5bdd4b7 100644
--- a/src/views/business/components/business-crud-page.vue
+++ b/src/views/business/components/business-crud-page.vue
@@ -104,6 +104,40 @@
+
+
+ {{ truncateTransportPlanText(formatTransportPlanGoodsInfo(row), 10) }}
+
+ {{ row.goodsInfo || '-' }}
+
+
+
+
+ {{ formatTransportPlanDistrictAddress(row.departureAddress) }}
+
+ {{ row.departureAddress || '-' }}
+
+
+
+
+ {{ formatTransportPlanDistrictAddress(row.arrivalAddress) }}
+
+ {{ row.arrivalAddress || '-' }}
+
+
基本信息
@@ -245,25 +279,36 @@
v-model="form.departureName"
readonly
:placeholder="transportStationNamePlaceholder"
- :suffix-icon="transportStationMode ? Search : undefined"
:disabled="transportAddressSelectDisabled"
@click="openTransportPrimaryAddressPicker('departure')"
- />
+ >
+
+
+
+
+
+
+ @click="handleTransportSecondaryAddressInputClick('departure')"
+ >
+
+
+
+
+
+
联系人
@@ -283,25 +328,36 @@
v-model="form.arrivalName"
readonly
:placeholder="transportStationNamePlaceholder"
- :suffix-icon="transportStationMode ? Search : undefined"
:disabled="transportAddressSelectDisabled"
@click="openTransportPrimaryAddressPicker('arrival')"
- />
+ >
+
+
+
+
+
+
+ @click="handleTransportSecondaryAddressInputClick('arrival')"
+ >
+
+
+
+
+
+
联系人
@@ -1235,9 +1291,150 @@
-
+
运输数量合计:{{ transportCargoQuantityTotal }}
+
+
+ 运费信息{{ transportMode === 'road' ? '(公路)' : '' }}
+
+
+
+
+
+ handleShippingTemplateFreightNumberInput(row, 'unitPrice', value)"
+ >
+
+ visible && loadTaskFeeUnitOptions()"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ shippingTemplateCurrencyLabel }}
+
+
+
+
+
+ {{ shippingTemplateCurrencyLabel }}
+
+
+
+ handleShippingTemplateFreightNumberInput(shippingTemplateFreight, 'otherFreightAmount', value)"
+ >
+ {{ shippingTemplateCurrencyLabel }}
+
+
+
+ visible && loadShippingTemplateCurrencyOptions()"
+ >
+
+
+
+
+
+
+
+ handleShippingTemplateFreightNumberInput(shippingTemplateFreight, 'freightAmount', value)"
+ >
+ {{ shippingTemplateCurrencyLabel }}
+
+
+
+
+
+
+ handleShippingTemplateFreightNumberInput(shippingTemplateFreight, 'otherFreightAmount', value)"
+ >
+ {{ shippingTemplateCurrencyLabel }}
+
+
+
+ visible && loadShippingTemplateCurrencyOptions()"
+ >
+
+
+
+
+
@@ -1653,6 +1850,21 @@
+
-
-
- 将 Excel 文件拖到此处,或点击上传
-
-
- 按货物信息表头读取:货物名称、货物类型、数量、数量单位、包装、品牌、规格、型号、物料编码、设备编码、备注
-
-
-
+
+
+ 上传
+
+ 支持.xlsx、.xls的文件格式,单个文件大小限制50M
+
+
+
点击下载模板
+
关闭
+
+
+
+
+
+
+
+
+ {{ formatShippingTemplateProcessNodes(row.includedNodes) }}
+
+
+
+
+
+
+ {{ Number(row.status) === 1 ? '启用' : '停用' }}
+
+
+
+
+
+
+ 关闭
+
+
+
@@ -3669,7 +3913,7 @@