diff --git a/src/option/base/common-address.js b/src/option/base/common-address.js
index ea43503..4f431ca 100644
--- a/src/option/base/common-address.js
+++ b/src/option/base/common-address.js
@@ -33,8 +33,6 @@ export const createOption = () => ({
     {
       label: '地址名称',
       prop: 'addressName',
-      search: true,
-      searchOrder: 8,
       span: 24,
       minWidth: 150,
       showOverflowTooltip: true,
@@ -58,8 +56,6 @@ export const createOption = () => ({
       prop: 'addressType',
       type: 'select',
       formslot: true,
-      search: true,
-      searchOrder: 7,
       span: 24,
       minWidth: 140,
       dicData: addressTypeOptions,
@@ -76,8 +72,6 @@ export const createOption = () => ({
     {
       label: '详细地址',
       prop: 'detailAddress',
-      search: true,
-      searchOrder: 5,
       formslot: true,
       type: 'textarea',
       minRows: 3,
@@ -108,8 +102,6 @@ export const createOption = () => ({
     {
       label: '行政区划',
       prop: 'regionName',
-      search: true,
-      searchOrder: 4,
       display: false,
       minWidth: 150,
       rules: [{ required: true, message: '请选择行政区划', trigger: 'change' }],
@@ -117,8 +109,6 @@ export const createOption = () => ({
     {
       label: '联系人',
       prop: 'contactName',
-      search: true,
-      searchOrder: 2,
       minWidth: 110,
       placeholder: '请输入',
       maxlength: 50,
@@ -127,12 +117,14 @@ export const createOption = () => ({
     {
       label: '联系方式',
       prop: 'contactPhone',
-      search: true,
-      searchOrder: 1,
       minWidth: 130,
       placeholder: '请输入',
       maxlength: 20,
-      rules: [{ max: 20, message: '联系方式不能超过20个字', trigger: 'blur' }],
+      formslot: true,
+      rules: [
+        { max: 20, message: '联系方式不能超过20个字', trigger: 'blur' },
+        { pattern: /^\d*$/, message: '联系方式只能输入数字', trigger: 'blur' },
+      ],
     },
     {
       label: '组织',
@@ -216,8 +208,6 @@ export const createOption = () => ({
     {
       label: '站点编码',
       prop: 'siteCode',
-      search: true,
-      searchOrder: 6,
       hide: true,
       addDisplay: false,
       editDisplay: false,
@@ -226,11 +216,121 @@ export const createOption = () => ({
       label: '组织',
       prop: 'deptId',
       type: 'select',
-      search: true,
-      searchOrder: 3,
       hide: true,
       display: false,
       dicData: [],
     },
+    // 搜索字段与表格、表单字段独立，避免筛选配置影响数据展示和编辑布局。
+    {
+      label: '地址名称',
+      prop: 'searchAddressName',
+      searchProp: 'addressName',
+      search: true,
+      searchOrder: 8,
+      searchPlaceholder: '请输入',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '类型',
+      prop: 'searchAddressType',
+      searchProp: 'addressType',
+      type: 'select',
+      searchType: 'select',
+      search: true,
+      searchOrder: 7,
+      searchPlaceholder: '请选择',
+      dicData: addressTypeOptions,
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '详细地址',
+      prop: 'searchDetailAddress',
+      searchProp: 'detailAddress',
+      search: true,
+      searchOrder: 6,
+      searchPlaceholder: '请输入',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '行政区划',
+      prop: 'searchRegionName',
+      searchProp: 'regionName',
+      search: true,
+      searchOrder: 5,
+      searchPlaceholder: '请输入',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '站点编码',
+      prop: 'searchSiteCode',
+      searchProp: 'siteCode',
+      search: true,
+      searchOrder: 4,
+      searchPlaceholder: '请输入',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '组织',
+      prop: 'searchDeptId',
+      searchProp: 'deptId',
+      type: 'select',
+      searchType: 'select',
+      search: true,
+      searchOrder: 3,
+      searchPlaceholder: '请选择',
+      dicData: [],
+      filterable: true,
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '联系人',
+      prop: 'searchContactName',
+      searchProp: 'contactName',
+      search: true,
+      searchOrder: 2,
+      searchPlaceholder: '请输入',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '联系方式',
+      prop: 'searchContactPhone',
+      searchProp: 'contactPhone',
+      search: true,
+      searchOrder: 1,
+      searchPlaceholder: '请输入',
+      hide: true,
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
   ],
 });
diff --git a/src/option/business/common-cargo.js b/src/option/business/common-cargo.js
index e0e3410..644f316 100644
--- a/src/option/business/common-cargo.js
+++ b/src/option/business/common-cargo.js
@@ -75,6 +75,7 @@ export const option = createCrudOption([
     display: false,
     addDisplay: false,
     editDisabled: true,
+    minWidth: 180,
   },
   // 搜索字段与表格、表单字段独立，避免筛选配置影响数据展示和编辑布局。
   {
@@ -169,31 +170,20 @@ export const option = createCrudOption([
     viewDisplay: false,
   },
   {
-    label: '包装品牌',
-    prop: 'packageBrand',
-    slot: true,
-    minWidth: 150,
-    addDisplay: false,
-    editDisplay: false,
-    viewDisplay: false,
+    label: '包装',
+    prop: 'packageType',
+    type: 'select',
+    dicData: packageOptions,
+    minWidth: 100,
   },
   {
     label: '品牌',
     prop: 'brand',
     search: false,
-    hide: true,
     minWidth: 120,
     placeholder: '请输入',
     rules: textRule('品牌', 50),
   },
-  {
-    label: '包装',
-    prop: 'packageType',
-    type: 'select',
-    dicData: packageOptions,
-    hide: true,
-    minWidth: 100,
-  },
   {
     label: '规格',
     prop: 'specification',
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 8ab8982..54e27a8 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/option/business/waybill-manage.js b/src/option/business/waybill-manage.js
index fb9b1fe..5c07a81 100644
--- a/src/option/business/waybill-manage.js
+++ b/src/option/business/waybill-manage.js
@@ -32,6 +32,23 @@ const parseJsonArray = value => {
   }
 };
 
+const hasProcessConfig = value => {
+  if (isEmpty(value)) return false;
+  if (typeof value !== 'string') {
+    return Array.isArray(value) ? value.length > 0 : typeof value === 'object';
+  }
+  const text = value.trim();
+  if (!text) return false;
+  try {
+    const result = JSON.parse(text);
+    return Array.isArray(result)
+      ? result.length > 0
+      : Boolean(result && Object.keys(result).length);
+  } catch (error) {
+    return true;
+  }
+};
+
 const getFirstValue = (row, props) => {
   const prop = props.find(item => !isEmpty(row[item]));
   return prop ? row[prop] : '';
@@ -96,6 +113,11 @@ export const config = {
   exportUrl: '/blade-transport/waybill-manage/export-waybill-manage',
   exportName: '运单管理',
   importUrl: '/blade-transport/waybill-manage/import-waybill-manage',
+  defaultForm: {
+    carrierType: '承运商',
+    quantityUnit: '吨',
+    priceUnit: '元/吨',
+  },
   enableAllDept: false,
   enableProjectSelect: true,
   templateCreateTarget: 'waybill-manage',
@@ -103,6 +125,13 @@ export const config = {
   enableShippingPlanSelect: true,
   enableShippingInfoForm: true,
   enableTaskInfoForm: true,
+  enableWaybillFooterFreightSummary: true,
+  enableDraftSave: true,
+  saveAsDraft: true,
+  skipDraftValidation: true,
+  draftStatusProp: 'businessStatus',
+  draftStatus: 'draft',
+  draftSaveText: '暂存',
   batchDelete: false,
   actionButtonLikeSearch: true,
   createText: '新建运单',
@@ -118,6 +147,16 @@ export const config = {
   actions: ['copy', 'cancel', 'reassign', 'complete', 'batchComplete'],
   statusProp: 'businessStatus',
   statusTextProp: 'businessStatusName',
+  formatStatus(row, prop, defaultText) {
+    if (
+      prop === 'businessStatus' &&
+      row.businessStatus === 'pending' &&
+      !hasProcessConfig(row.processJson)
+    ) {
+      return '进行中';
+    }
+    return defaultText;
+  },
   deleteStatus: ['draft'],
   editStatus: ['draft', 'pending'],
 };
diff --git a/src/views/base/common-address.vue b/src/views/base/common-address.vue
index 9c34efd..2fae585 100644
--- a/src/views/base/common-address.vue
+++ b/src/views/base/common-address.vue
@@ -195,6 +195,17 @@
           />
         </div>
       </template>
+
+      <template #contactPhone-form>
+        <el-input
+          v-model="form.contactPhone"
+          :disabled="dialogReadonly"
+          inputmode="numeric"
+          maxlength="20"
+          placeholder="请输入"
+          @input="handleContactPhoneInput"
+        />
+      </template>
     </avue-crud>
 
     <el-dialog
@@ -326,7 +337,7 @@ export default {
     initDeptTree() {
       getDeptTree(this.userInfo.tenantId).then(res => {
         this.deptOptions = this.flattenDept(res.data.data || []);
-        const deptColumn = this.findColumn(this.option.column, 'deptId');
+        const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
         deptColumn.dicData = this.deptOptions;
       });
     },
@@ -736,6 +747,9 @@ export default {
       const numberValue = Number(value);
       return Number.isFinite(numberValue) ? numberValue.toFixed(6) : '';
     },
+    handleContactPhoneInput(value) {
+      this.form.contactPhone = String(value || '').replace(/\D/g, '');
+    },
     normalizeRow(row) {
       const trimValue = value => String(value || '').trim();
       const submitRow = {
@@ -820,6 +834,10 @@ export default {
         this.$message.warning('联系方式不能超过20个字');
         return false;
       }
+      if (row.contactPhone && !/^\d+$/.test(row.contactPhone)) {
+        this.$message.warning('联系方式只能输入数字');
+        return false;
+      }
       if (row.remark && row.remark.length > 200) {
         this.$message.warning('备注不能超过200个字');
         return false;
diff --git a/src/views/business/common-cargo.vue b/src/views/business/common-cargo.vue
index 574ae20..a564991 100644
--- a/src/views/business/common-cargo.vue
+++ b/src/views/business/common-cargo.vue
@@ -108,14 +108,18 @@
 
       <template #cargoCode-form>
         <el-input
-          v-model="form.cargoCode"
+          :model-value="getCargoCodeSuffix()"
           clearable
-          maxlength="20"
+          :maxlength="getCargoCodeMaxLength()"
           show-word-limit
           placeholder="请输入"
           :disabled="dialogReadonly || dialogType === 'edit'"
           @input="handleCargoCodeInput"
-        />
+        >
+          <template v-if="getCargoCodePrefix()" #prepend>
+            {{ getCargoCodePrefix() }}
+          </template>
+        </el-input>
       </template>
 
       <template #cargoValue-form>
@@ -143,10 +147,6 @@
         </div>
       </template>
 
-      <template #packageBrand="{ row }">
-        {{ [row.packageType, row.brand].filter(Boolean).join(' / ') || '-' }}
-      </template>
-
       <template #menu="{ row, index }">
         <el-link
           type="primary"
@@ -357,6 +357,14 @@ export default {
         ? String(this.form.secondCargoTypeCode).slice(0, 4)
         : '';
     },
+    getCargoCodeSuffix() {
+      const prefix = this.getCargoCodePrefix();
+      const cargoCode = String(this.form.cargoCode || '');
+      return prefix && cargoCode.startsWith(prefix) ? cargoCode.slice(prefix.length) : cargoCode;
+    },
+    getCargoCodeMaxLength() {
+      return 20 - this.getCargoCodePrefix().length;
+    },
     syncCargoCodePrefix() {
       const prefix = this.getCargoCodePrefix();
       const current = String(this.form.cargoCode || '').replace(/\D/g, '');
@@ -369,13 +377,10 @@ export default {
     },
     handleCargoCodeInput(value) {
       const prefix = this.getCargoCodePrefix();
-      const input = String(value || '').replace(/\D/g, '');
-      if (!prefix) {
-        this.form.cargoCode = input.slice(0, 20);
-        return;
-      }
-      const suffix = input.startsWith(prefix) ? input.slice(prefix.length) : input;
-      this.form.cargoCode = `${prefix}${suffix}`.slice(0, 20);
+      const suffix = String(value || '')
+        .replace(/\D/g, '')
+        .slice(0, this.getCargoCodeMaxLength());
+      this.form.cargoCode = `${prefix}${suffix}`;
     },
     handleCargoValueInput(value) {
       const raw = String(value || '').replace(/[^\d.]/g, '');
diff --git a/src/views/business/common-route.vue b/src/views/business/common-route.vue
index a99e45d..4f7d88e 100644
--- a/src/views/business/common-route.vue
+++ b/src/views/business/common-route.vue
@@ -394,6 +394,7 @@ export default {
     },
   },
   created() {
+    this.applyDefaultDeptSearch();
     this.initDeptTree();
   },
   methods: {
@@ -434,6 +435,18 @@ export default {
     defaultDeptId() {
       return (this.userInfo && (this.userInfo.deptId || this.userInfo.dept_id)) || '';
     },
+    applyDefaultDeptSearch() {
+      const deptId = this.defaultDeptId();
+      const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
+      if (!deptId || !deptColumn) return;
+      deptColumn.searchValue = deptId;
+      this.query = { ...this.query, deptId };
+      this.$nextTick(() => {
+        if (this.$refs.crud?.searchForm) {
+          this.$refs.crud.searchForm.searchDeptId = deptId;
+        }
+      });
+    },
     resetAddressQuery() {
       this.addressQuery = {
         addressName: '',
@@ -883,8 +896,9 @@ export default {
     },
     searchReset() {
       this.query = {};
+      this.applyDefaultDeptSearch();
       this.page.currentPage = 1;
-      this.onLoad(this.page);
+      this.onLoad(this.page, this.query);
     },
     searchChange(params, done) {
       this.query = params;
diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue
index 70e3b4d..1646aa5 100644
--- a/src/views/business/components/business-crud-page.vue
+++ b/src/views/business/components/business-crud-page.vue
@@ -104,6 +104,40 @@
         </el-tag>
       </template>
 
+      <template #goodsInfo="{ row }">
+        <el-tooltip
+          v-if="isTransportPlanPage"
+          :content="formatTransportPlanGoodsInfo(row)"
+          placement="top"
+          :disabled="formatTransportPlanGoodsInfo(row).length <= 10"
+        >
+          <span>{{ truncateTransportPlanText(formatTransportPlanGoodsInfo(row), 10) }}</span>
+        </el-tooltip>
+        <span v-else>{{ row.goodsInfo || '-' }}</span>
+      </template>
+
+      <template #departureAddress="{ row }">
+        <el-tooltip
+          v-if="isTransportPlanPage"
+          :content="row.departureAddress || '-'"
+          placement="top"
+        >
+          <span>{{ formatTransportPlanDistrictAddress(row.departureAddress) }}</span>
+        </el-tooltip>
+        <span v-else>{{ row.departureAddress || '-' }}</span>
+      </template>
+
+      <template #arrivalAddress="{ row }">
+        <el-tooltip
+          v-if="isTransportPlanPage"
+          :content="row.arrivalAddress || '-'"
+          placement="top"
+        >
+          <span>{{ formatTransportPlanDistrictAddress(row.arrivalAddress) }}</span>
+        </el-tooltip>
+        <span v-else>{{ row.arrivalAddress || '-' }}</span>
+      </template>
+
       <template #basicInfoTitle-form>
         <div class="dialog-section-title">基本信息</div>
       </template>
@@ -245,25 +279,36 @@
             v-model="form.departureName"
             readonly
             :placeholder="transportStationNamePlaceholder"
-            :suffix-icon="transportStationMode ? Search : undefined"
             :disabled="transportAddressSelectDisabled"
             @click="openTransportPrimaryAddressPicker('departure')"
-          />
+          >
+            <template v-if="transportStationMode" #suffix>
+              <el-icon class="business-crud-page__map-suffix" @click.stop="openTransportSecondaryAddressPicker('departure')">
+                <Search />
+              </el-icon>
+            </template>
+          </el-input>
           <el-input
             v-model="form.departureAddress"
-            readonly
+            :readonly="transportStationMode || !config.editableRoadAddress"
             :placeholder="transportAddressDetailPlaceholder"
-            :suffix-icon="transportStationMode ? undefined : Location"
+            :suffix-icon="transportStationMode || config.editableRoadAddress ? undefined : Location"
             :disabled="transportAddressSelectDisabled"
-            @click="openTransportSecondaryAddressPicker('departure')"
-          />
+            @click="handleTransportSecondaryAddressInputClick('departure')"
+          >
+            <template v-if="!transportStationMode && config.editableRoadAddress" #suffix>
+              <el-icon class="business-crud-page__map-suffix" @click.stop="openTransportMapDialog('departure')">
+                <Location />
+              </el-icon>
+            </template>
+          </el-input>
           <el-tooltip content="选择常用地址" placement="top">
             <el-button
               type="primary"
               :icon="List"
               link
               :disabled="transportAddressSelectDisabled"
-              @click="openTransportAddressDialog('departure')"
+              @click="openTransportAddressPicker('departure')"
             />
           </el-tooltip>
           <span class="business-crud-page__route-label">联系人</span>
@@ -283,25 +328,36 @@
             v-model="form.arrivalName"
             readonly
             :placeholder="transportStationNamePlaceholder"
-            :suffix-icon="transportStationMode ? Search : undefined"
             :disabled="transportAddressSelectDisabled"
             @click="openTransportPrimaryAddressPicker('arrival')"
-          />
+          >
+            <template v-if="transportStationMode" #suffix>
+              <el-icon class="business-crud-page__map-suffix" @click.stop="openTransportSecondaryAddressPicker('arrival')">
+                <Search />
+              </el-icon>
+            </template>
+          </el-input>
           <el-input
             v-model="form.arrivalAddress"
-            readonly
+            :readonly="transportStationMode || !config.editableRoadAddress"
             :placeholder="transportAddressDetailPlaceholder"
-            :suffix-icon="transportStationMode ? undefined : Location"
+            :suffix-icon="transportStationMode || config.editableRoadAddress ? undefined : Location"
             :disabled="transportAddressSelectDisabled"
-            @click="openTransportSecondaryAddressPicker('arrival')"
-          />
+            @click="handleTransportSecondaryAddressInputClick('arrival')"
+          >
+            <template v-if="!transportStationMode && config.editableRoadAddress" #suffix>
+              <el-icon class="business-crud-page__map-suffix" @click.stop="openTransportMapDialog('arrival')">
+                <Location />
+              </el-icon>
+            </template>
+          </el-input>
           <el-tooltip content="选择常用地址" placement="top">
             <el-button
               type="primary"
               :icon="List"
               link
               :disabled="transportAddressSelectDisabled"
-              @click="openTransportAddressDialog('arrival')"
+              @click="openTransportAddressPicker('arrival')"
             />
           </el-tooltip>
           <span class="business-crud-page__route-label">联系人</span>
@@ -312,19 +368,19 @@
       </template>
 
       <template #taskInfoTitle-form>
-        <div class="dialog-section-title">任务信息</div>
+        <div class="dialog-section-title dialog-section-title--action">
+          <span>任务信息</span>
+          <el-segmented
+            v-model="form.taskEntryMode"
+            :options="taskEntryModeOptions"
+            :disabled="dialogReadonly"
+            @change="handleTaskEntryModeChange"
+          />
+        </div>
       </template>
 
       <template #taskInfoForm-form>
         <div class="business-crud-page__task">
-          <div class="business-crud-page__task-toolbar">
-            <el-segmented
-              v-model="form.taskEntryMode"
-              :options="taskEntryModeOptions"
-              :disabled="dialogReadonly"
-              @change="handleTaskEntryModeChange"
-            />
-          </div>
           <div v-if="isTaskFullMode" class="business-crud-page__task-full">
             <div class="business-crud-page__subsection">
               <div
@@ -607,6 +663,7 @@
                       v-model="form.driverPhone"
                       placeholder="请输入"
                       clearable
+                      maxlength="20"
                       :disabled="dialogReadonly"
                     />
                   </el-form-item>
@@ -615,21 +672,67 @@
                       v-model="form.vehicleNo"
                       placeholder="请输入"
                       clearable
+                      maxlength="30"
                       :disabled="dialogReadonly"
                     />
                   </el-form-item>
                 </div>
                 <div class="business-crud-page__task-row">
+                  <el-form-item
+                    v-if="isRoadTransport"
+                    label="挂车车牌号"
+                    class="business-crud-page__task-span-1"
+                  >
+                    <el-input
+                      v-model="form.trailerVehicleNo"
+                      placeholder="请输入"
+                      clearable
+                      maxlength="30"
+                      :disabled="dialogReadonly"
+                    />
+                  </el-form-item>
+                  <el-form-item
+                    v-if="isRoadTransport"
+                    label="押运人"
+                    class="business-crud-page__task-span-1"
+                  >
+                    <el-input
+                      v-model="form.escortName"
+                      placeholder="请输入"
+                      clearable
+                      maxlength="20"
+                      :disabled="dialogReadonly"
+                    />
+                  </el-form-item>
+                  <el-form-item
+                    v-if="isRoadTransport"
+                    label="押运人手机号"
+                    class="business-crud-page__task-span-1"
+                  >
+                    <el-input
+                      v-model="form.escortPhone"
+                      placeholder="请输入"
+                      clearable
+                      maxlength="20"
+                      :disabled="dialogReadonly"
+                    />
+                  </el-form-item>
                   <el-form-item label="里程(km)" class="business-crud-page__task-span-1">
                     <el-input
                       v-model="form.mileage"
                       placeholder="请输入"
                       clearable
+                      maxlength="10"
                       :disabled="dialogReadonly"
-                      @input="value => handleTaskNumberInput('mileage', value)"
+                      @input="handleTaskMileageInput"
                     />
                   </el-form-item>
-                  <el-form-item label="预计发货日期" class="business-crud-page__task-span-1">
+                </div>
+                <div class="business-crud-page__task-row">
+                  <el-form-item
+                    :label="isRoadTransport ? '计划发货日期' : '预计发货日期'"
+                    class="business-crud-page__task-span-1"
+                  >
                     <el-date-picker
                       v-model="form.estimatedStartTime"
                       type="date"
@@ -639,7 +742,10 @@
                       :disabled="dialogReadonly"
                     />
                   </el-form-item>
-                  <el-form-item label="预计完成日期" class="business-crud-page__task-span-1">
+                  <el-form-item
+                    :label="isRoadTransport ? '计划完成日期' : '预计完成日期'"
+                    class="business-crud-page__task-span-1"
+                  >
                     <el-date-picker
                       v-model="form.estimatedEndTime"
                       type="date"
@@ -668,7 +774,11 @@
               </div>
               <template v-else>
                 <div class="business-crud-page__task-row">
-                  <el-form-item label="司机" class="business-crud-page__task-span-1">
+                  <el-form-item
+                    label="司机"
+                    :required="isRoadTransport"
+                    class="business-crud-page__task-span-1"
+                  >
                     <el-select
                       v-model="form.driverName"
                       placeholder="请输入"
@@ -690,11 +800,12 @@
                       />
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="司机手机号" required class="business-crud-page__task-span-1">
+                  <el-form-item label="手机号" required class="business-crud-page__task-span-1">
                     <el-input
                       v-model="form.driverPhone"
                       placeholder="请输入"
                       clearable
+                      maxlength="20"
                       :disabled="dialogReadonly"
                     />
                   </el-form-item>
@@ -703,6 +814,7 @@
                       v-model="form.vehicleNo"
                       placeholder="请输入"
                       clearable
+                      maxlength="30"
                       :disabled="dialogReadonly"
                     />
                   </el-form-item>
@@ -711,6 +823,7 @@
                       v-model="form.trailerVehicleNo"
                       placeholder="请输入"
                       clearable
+                      maxlength="30"
                       :disabled="dialogReadonly"
                     />
                   </el-form-item>
@@ -721,6 +834,7 @@
                       v-model="form.escortName"
                       placeholder="请输入"
                       clearable
+                      maxlength="20"
                       :disabled="dialogReadonly"
                     />
                   </el-form-item>
@@ -729,6 +843,7 @@
                       v-model="form.escortPhone"
                       placeholder="请输入"
                       clearable
+                      maxlength="20"
                       :disabled="dialogReadonly"
                     />
                   </el-form-item>
@@ -737,13 +852,17 @@
                       v-model="form.mileage"
                       placeholder="请输入"
                       clearable
+                      maxlength="10"
                       :disabled="dialogReadonly"
-                      @input="value => handleTaskNumberInput('mileage', value)"
+                      @input="handleTaskMileageInput"
                     />
                   </el-form-item>
                 </div>
                 <div class="business-crud-page__task-row">
-                  <el-form-item label="预计发货日期" class="business-crud-page__task-span-1">
+                  <el-form-item
+                    :label="isRoadTransport ? '计划发货日期' : '预计发货日期'"
+                    class="business-crud-page__task-span-1"
+                  >
                     <el-date-picker
                       v-model="form.estimatedStartTime"
                       type="date"
@@ -753,7 +872,10 @@
                       :disabled="dialogReadonly"
                     />
                   </el-form-item>
-                  <el-form-item label="预计完成日期" class="business-crud-page__task-span-1">
+                  <el-form-item
+                    :label="isRoadTransport ? '计划完成日期' : '预计完成日期'"
+                    class="business-crud-page__task-span-1"
+                  >
                     <el-date-picker
                       v-model="form.estimatedEndTime"
                       type="date"
@@ -910,7 +1032,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="司机">
+            <el-form-item label="司机" :required="isRoadTransport && form.carrierType === '自运'">
               <el-select
                 v-model="form.driverName"
                 placeholder="请选择或输入司机"
@@ -936,6 +1058,7 @@
                 v-model="form.driverPhone"
                 placeholder="请输入手机号"
                 clearable
+                maxlength="20"
                 :disabled="dialogReadonly"
               />
             </el-form-item>
@@ -944,6 +1067,34 @@
                 v-model="form.vehicleNo"
                 placeholder="请输入车牌号"
                 clearable
+                maxlength="30"
+                :disabled="dialogReadonly"
+              />
+            </el-form-item>
+            <el-form-item v-if="isRoadTransport" label="挂车车牌号">
+              <el-input
+                v-model="form.trailerVehicleNo"
+                placeholder="请输入挂车车牌号"
+                clearable
+                maxlength="30"
+                :disabled="dialogReadonly"
+              />
+            </el-form-item>
+            <el-form-item v-if="isRoadTransport" label="押运人">
+              <el-input
+                v-model="form.escortName"
+                placeholder="请输入押运人"
+                clearable
+                maxlength="20"
+                :disabled="dialogReadonly"
+              />
+            </el-form-item>
+            <el-form-item v-if="isRoadTransport" label="押运人手机号">
+              <el-input
+                v-model="form.escortPhone"
+                placeholder="请输入押运人手机号"
+                clearable
+                maxlength="20"
                 :disabled="dialogReadonly"
               />
             </el-form-item>
@@ -1022,16 +1173,17 @@
                 </template>
               </el-input>
             </el-form-item>
-            <el-form-item label="里程（公里）">
+            <el-form-item label="里程(km)">
               <el-input
                 v-model="form.mileage"
                 placeholder="请输入里程"
                 clearable
+                maxlength="10"
                 :disabled="dialogReadonly"
-                @input="value => handleTaskNumberInput('mileage', value)"
+                @input="handleTaskMileageInput"
               />
             </el-form-item>
-            <el-form-item label="预计发货日期">
+            <el-form-item :label="isRoadTransport ? '计划发货日期' : '预计发货日期'">
               <el-date-picker
                 v-model="form.estimatedStartTime"
                 type="date"
@@ -1041,7 +1193,7 @@
                 :disabled="dialogReadonly"
               />
             </el-form-item>
-            <el-form-item label="预计完成日期">
+            <el-form-item :label="isRoadTransport ? '计划完成日期' : '预计完成日期'">
               <el-date-picker
                 v-model="form.estimatedEndTime"
                 type="date"
@@ -1235,9 +1387,150 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="business-crud-page__cargo-total">
+          <div v-if="!shippingTemplateFreightVisible" class="business-crud-page__cargo-total">
             运输数量合计：{{ transportCargoQuantityTotal }}
           </div>
+          <section v-if="shippingTemplateFreightVisible" class="business-crud-page__freight-section">
+            <div class="dialog-section-title">
+              运费信息{{ transportMode === 'road' ? '（公路）' : '' }}
+            </div>
+            <template v-if="transportMode === 'road'">
+              <el-form
+                :model="shippingTemplateFreight"
+                label-position="right"
+                label-width="auto"
+                class="business-crud-page__freight-form business-crud-page__freight-form--road"
+              >
+                <template v-for="(row, index) in shippingTemplateFreight.freightItems" :key="index">
+                  <el-form-item :label="`单价${index + 1}`">
+                    <el-input
+                      v-model="row.unitPrice"
+                      placeholder="请输入"
+                      :disabled="dialogReadonly"
+                      @input="value => handleShippingTemplateFreightNumberInput(row, 'unitPrice', value)"
+                    >
+                      <template #append>
+                        <el-select
+                          v-model="row.priceUnit"
+                          class="business-crud-page__append-select"
+                          placeholder="单位"
+                          :disabled="dialogReadonly"
+                          @visible-change="visible => visible && loadTaskFeeUnitOptions()"
+                        >
+                          <el-option
+                            v-for="item in taskFeeUnitOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                          />
+                        </el-select>
+                      </template>
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item :label="`数量合计${index + 1}`">
+                    <el-input :model-value="shippingTemplateRoadFreightQuantity(index)" disabled>
+                      <template #append>
+                        <el-select
+                          :model-value="transportCargoRows[index]?.quantityUnit"
+                          class="business-crud-page__append-select"
+                          placeholder="单位"
+                          disabled
+                        >
+                          <el-option
+                            :label="transportCargoRows[index]?.quantityUnit || '单位'"
+                            :value="transportCargoRows[index]?.quantityUnit || ''"
+                          />
+                        </el-select>
+                      </template>
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item :label="`运费${index + 1}`">
+                    <el-input :model-value="shippingTemplateRoadFreightAmount(row, index)" disabled>
+                      <template #suffix>{{ shippingTemplateCurrencyLabel }}</template>
+                    </el-input>
+                  </el-form-item>
+                </template>
+                <el-form-item label="运费合计">
+                  <el-input :model-value="shippingTemplateRoadFreightTotal" disabled>
+                    <template #suffix>{{ shippingTemplateCurrencyLabel }}</template>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="其他运费合计">
+                  <el-input
+                    v-model="shippingTemplateFreight.otherFreightAmount"
+                    placeholder="请输入"
+                    :disabled="dialogReadonly"
+                    @input="value => handleShippingTemplateFreightNumberInput(shippingTemplateFreight, 'otherFreightAmount', value)"
+                  >
+                    <template #suffix>{{ shippingTemplateCurrencyLabel }}</template>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="币种">
+                  <el-select
+                    v-model="shippingTemplateFreight.currency"
+                    placeholder="请选择"
+                    clearable
+                    :disabled="dialogReadonly"
+                    @visible-change="visible => visible && loadShippingTemplateCurrencyOptions()"
+                  >
+                    <el-option
+                      v-for="item in shippingTemplateCurrencyOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-form>
+            </template>
+            <el-form
+              v-else
+              :model="shippingTemplateFreight"
+              label-position="right"
+              label-width="auto"
+              class="business-crud-page__freight-form business-crud-page__freight-form--non-road"
+            >
+              <el-form-item label="运费">
+                <el-input
+                  v-model="shippingTemplateFreight.freightAmount"
+                  placeholder="请输入"
+                  :disabled="dialogReadonly"
+                  @input="value => handleShippingTemplateFreightNumberInput(shippingTemplateFreight, 'freightAmount', value)"
+                >
+                  <template #suffix>{{ shippingTemplateCurrencyLabel }}</template>
+                </el-input>
+              </el-form-item>
+              <el-form-item label="数量">
+                <el-input :model-value="transportCargoQuantityTotal" disabled />
+              </el-form-item>
+              <el-form-item label="其他运费合计">
+                <el-input
+                  v-model="shippingTemplateFreight.otherFreightAmount"
+                  placeholder="请输入"
+                  :disabled="dialogReadonly"
+                  @input="value => handleShippingTemplateFreightNumberInput(shippingTemplateFreight, 'otherFreightAmount', value)"
+                >
+                  <template #suffix>{{ shippingTemplateCurrencyLabel }}</template>
+                </el-input>
+              </el-form-item>
+              <el-form-item label="币种">
+                <el-select
+                  v-model="shippingTemplateFreight.currency"
+                  placeholder="请选择"
+                  clearable
+                  :disabled="dialogReadonly"
+                  @visible-change="visible => visible && loadShippingTemplateCurrencyOptions()"
+                >
+                  <el-option
+                    v-for="item in shippingTemplateCurrencyOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </section>
         </div>
       </template>
 
@@ -1653,6 +1946,21 @@
       </template>
 
       <template #menu-form-before>
+        <div
+          v-if="showFooterFreightSummary && !dialogReadonly"
+          class="business-crud-page__shipping-template-footer-summary"
+        >
+          <span>
+            运费合计：<strong>￥{{ formatFooterFreightTotal }}</strong>
+          </span>
+          <el-link
+            type="primary"
+            :disabled="!form.projectId"
+            @click="openShippingTemplateProcessConfig"
+          >
+            查看过程配置
+          </el-link>
+        </div>
         <el-button
           v-if="config.enableDraftSave && !dialogReadonly"
           type="primary"
@@ -1660,7 +1968,7 @@
           :loading="draftSaveLoading"
           @click="handleDraftSave"
         >
-          保存
+          {{ config.draftSaveText || '保存' }}
         </el-button>
       </template>
 
@@ -2208,18 +2516,21 @@
           </div>
         </div>
 
-        <section-card title="待调度列表">
+        <section-card>
+          <template #title>
+            <span>待调度列表</span>
+            <span class="business-crud-page__dispatch-list-summary">
+              {{ dispatchSummaryText }}
+            </span>
+          </template>
           <template #extra>
             <el-button
               type="primary"
-              :disabled="dispatchSummaryRemainingQuantity <= 0"
+              :disabled="!dispatchHasRemainingQuantity"
               @click="handleDispatchAddRow"
             >
               新增
             </el-button>
-            <span class="business-crud-page__dispatch-list-summary">
-              {{ dispatchSummaryText }}
-            </span>
           </template>
           <el-table
             :data="dispatchRows"
@@ -3320,6 +3631,7 @@
                   clearable
                   filterable
                   placeholder="请选择"
+                  :disabled="!!getTransportFixedAddressType()"
                 >
                   <el-option
                     v-for="item in addressTypeOptions"
@@ -3402,7 +3714,7 @@
     </el-dialog>
 
     <el-dialog
-      title="选择站点"
+      :title="`选择${transportStationTypeLabel || '站点'}`"
       append-to-body
       v-model="transportStationBox"
       width="1180px"
@@ -3631,28 +3943,59 @@
     </el-dialog>
 
     <el-dialog title="导入货物" append-to-body v-model="cargoImportBox" width="560px">
-      <el-upload
-        drag
-        action="#"
-        accept=".xls,.xlsx"
-        :auto-upload="false"
-        :show-file-list="false"
-        :disabled="cargoImportLoading"
-        :on-change="handleCargoImportFileChange"
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将 Excel 文件拖到此处，或点击上传</div>
-        <template #tip>
-          <div class="el-upload__tip">
-            按货物信息表头读取：货物名称、货物类型、数量、数量单位、包装、品牌、规格、型号、物料编码、设备编码、备注
-          </div>
-        </template>
-      </el-upload>
+      <div class="business-crud-page__cargo-import">
+        <el-upload
+          action="#"
+          accept=".xls,.xlsx"
+          :auto-upload="false"
+          :show-file-list="false"
+          :disabled="cargoImportLoading"
+          :on-change="handleCargoImportFileChange"
+        >
+          <el-button type="primary" :loading="cargoImportLoading">上传</el-button>
+          <template #tip>
+            <div class="el-upload__tip">支持.xlsx、.xls的文件格式，单个文件大小限制50M</div>
+          </template>
+        </el-upload>
+        <el-button type="primary" @click="handleCargoImportTemplate">点击下载模板</el-button>
+      </div>
       <template #footer>
         <el-button @click="cargoImportBox = false">关闭</el-button>
       </template>
     </el-dialog>
 
+    <el-dialog
+      v-model="shippingTemplateProcessConfigBox"
+      title="过程配置"
+      append-to-body
+      width="980px"
+      class="business-crud-page__process-config-dialog"
+    >
+      <div v-loading="shippingTemplateProcessConfigLoading">
+        <el-table :data="shippingTemplateProcessConfigRows" border empty-text="当前项目暂无过程配置">
+          <el-table-column prop="configCode" label="配置编号" min-width="160" />
+          <el-table-column prop="configName" label="配置名称" min-width="180" />
+          <el-table-column prop="projectNames" label="项目" min-width="220" />
+          <el-table-column label="过程节点" min-width="260">
+            <template #default="{ row }">
+              {{ formatShippingTemplateProcessNodes(row.includedNodes) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="defaultFinishDays" label="默认完成时限（天）" width="160" />
+          <el-table-column label="状态" width="100" align="center">
+            <template #default="{ row }">
+              <el-tag :type="Number(row.status) === 1 ? 'success' : 'info'">
+                {{ Number(row.status) === 1 ? '启用' : '停用' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <template #footer>
+        <el-button type="primary" @click="shippingTemplateProcessConfigBox = false">关闭</el-button>
+      </template>
+    </el-dialog>
+
     <el-dialog :title="`${config.title}导入`" append-to-body v-model="excelBox" width="555px">
       <avue-form :option="excelOptionConfig" v-model="excelForm">
         <template #excelTemplate>
@@ -3666,7 +4009,7 @@
 </template>
 
 <script>
-import { exportBlob } from '@/api/common';
+import { exportBlob, importBlob } from '@/api/common';
 import { getList as getCommonAddressList } from '@/api/base/common-address';
 import { getList as getAirportMasterList } from '@/api/base/airport-master';
 import { getList as getCargoTypeList } from '@/api/base/cargo-type';
@@ -3679,9 +4022,11 @@ import { getList as getContractList } from '@/api/business/contract-manage';
 import { getList as getProjectList } from '@/api/business/project-apply';
 import { getList as getCommonRouteList } from '@/api/business/common-route';
 import { getList as getTransportPlanList } from '@/api/business/transport-plan';
+import { getList as getProcessConfigList } from '@/api/business/process-config';
 import { getList as getCarrierCustomerList } from '@/api/vehicle/customer-archive';
 import { getList as getDriverList } from '@/api/transportCapacity/driver';
 import { getDictionary } from '@/api/system/dictbiz';
+import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDeptTree } from '@/api/system/dept';
 import { addressTypeOptions } from '@/option/base/common-address';
 import { packageOptions } from '@/option/business/common';
@@ -3801,6 +4146,18 @@ const defaultTransportCargo = () => ({
   remark: '',
 });
 
+const defaultShippingTemplateFreight = () => ({
+  currency: '',
+  otherFreightAmount: '',
+  freightAmount: '',
+  freightItems: [],
+});
+
+const defaultShippingTemplateFreightItem = () => ({
+  unitPrice: '',
+  priceUnit: '',
+});
+
 const defaultDispatchRow = () => ({
   taskEntryMode: 'simple',
   transportType: '',
@@ -3950,6 +4307,12 @@ export default {
       attachmentRows: [],
       contractFileRows: [],
       transportCargoRows: [],
+      shippingTemplateFreight: defaultShippingTemplateFreight(),
+      shippingTemplateCurrencyOptions: [],
+      shippingTemplateCurrencyLoading: false,
+      shippingTemplateProcessConfigBox: false,
+      shippingTemplateProcessConfigLoading: false,
+      shippingTemplateProcessConfigRows: [],
       transportRouteBox: false,
       transportRouteLoading: false,
       transportRouteQuery: {},
@@ -4125,6 +4488,10 @@ export default {
       this.loadTaskFeeUnitOptions();
       this.ensureBillingCargoTypeOptions();
     }
+    if (this.config.enableShippingTemplateFreight) {
+      this.loadShippingTemplateCurrencyOptions();
+      this.loadTaskFeeUnitOptions();
+    }
     this.consumeTemplateCreatePayload();
   },
   computed: {
@@ -4137,6 +4504,12 @@ export default {
     detailSections() {
       return this.config.detailSections || [];
     },
+    isTransportPlanPage() {
+      return this.config.permission === 'transport_plan';
+    },
+    isRoadTransport() {
+      return this.config.permission === 'waybill_manage' && this.transportMode === 'road';
+    },
     transportPlanImportDuplicateCount() {
       return this.transportPlanImportRows.filter(row => row._duplicate).length;
     },
@@ -4208,50 +4581,50 @@ export default {
         .join('; ');
       return cargoInfo || this.dispatchRow.goodsInfo || '';
     },
-    dispatchSummaryTotalQuantity() {
-      const goodsQuantity = this.dispatchPlanGoodsRows.reduce(
-        (total, row) =>
-          total +
-          this.parseDispatchQuantity(row.quantity || row.cargoQuantity || row.goodsQuantity),
-        0
-      );
-      if (goodsQuantity > 0) return goodsQuantity;
-      return this.parseDispatchQuantity(
-        this.dispatchRow.totalQuantity ||
-          this.dispatchRow.totalCargoQuantity ||
-          this.dispatchRow.quantity
-      );
+    dispatchSummaryItems() {
+      const summaryMap = new Map();
+      const addQuantity = (unit, field, quantity) => {
+        const normalizedUnit = unit || '吨';
+        if (!summaryMap.has(normalizedUnit)) {
+          summaryMap.set(normalizedUnit, { unit: normalizedUnit, total: 0, assigned: 0 });
+        }
+        summaryMap.get(normalizedUnit)[field] += this.parseDispatchQuantity(quantity);
+      };
+      const goodsRows = this.dispatchPlanGoodsRows.length
+        ? this.dispatchPlanGoodsRows
+        : [this.dispatchRow];
+
+      goodsRows.forEach(row => {
+        addQuantity(
+          this.getDispatchQuantityUnit(row),
+          'total',
+          row.quantity ||
+            row.cargoQuantity ||
+            row.goodsQuantity ||
+            row.totalQuantity ||
+            row.totalCargoQuantity
+        );
+      });
+      this.dispatchRows.forEach(row => {
+        addQuantity(this.getDispatchQuantityUnit(row), 'assigned', row.quantity);
+      });
+
+      return Array.from(summaryMap.values()).map(item => ({
+        ...item,
+        remaining: Math.max(item.total - item.assigned, 0),
+      }));
     },
-    dispatchSummaryAssignedQuantity() {
-      return this.dispatchRows.reduce(
-        (total, row) => total + this.parseDispatchQuantity(row.quantity),
-        0
-      );
-    },
-    dispatchSummaryRemainingQuantity() {
-      const total = this.dispatchSummaryTotalQuantity;
-      const assigned = this.dispatchSummaryAssignedQuantity;
-      const remain = total - assigned;
-      return remain > 0 ? remain : 0;
-    },
-    dispatchSummaryUnit() {
-      const unitRow = this.dispatchPlanGoodsRows.find(
-        row => row.quantityUnit || row.goodsQuantityUnit || row.unit
-      );
-      return (
-        unitRow?.quantityUnit ||
-        unitRow?.goodsQuantityUnit ||
-        unitRow?.unit ||
-        this.dispatchRow.quantityUnit ||
-        this.dispatchRows.find(row => row.quantityUnit)?.quantityUnit ||
-        '吨'
-      );
+    dispatchHasRemainingQuantity() {
+      return this.dispatchSummaryItems.some(item => item.remaining > 0);
     },
     dispatchSummaryText() {
-      const total = this.formatDispatchQuantity(this.dispatchSummaryTotalQuantity);
-      const assigned = this.formatDispatchQuantity(this.dispatchSummaryAssignedQuantity);
-      const remain = this.formatDispatchQuantity(this.dispatchSummaryRemainingQuantity);
-      return `共${total}${this.dispatchSummaryUnit} | 已调度 ${assigned}${this.dispatchSummaryUnit}，剩余${remain}${this.dispatchSummaryUnit}`;
+      const formatSummary = field =>
+        this.dispatchSummaryItems
+          .map(item => `${this.formatDispatchQuantity(item[field])}${item.unit}`)
+          .join('、');
+      return `共${formatSummary('total')} | 已调度 ${formatSummary('assigned')}，剩余${formatSummary(
+        'remaining'
+      )}`;
     },
     dispatchAttachmentRows() {
       return this.parseJsonArray(this.dispatchRow.attachmentsJson);
@@ -4442,6 +4815,51 @@ export default {
       }, 0);
       return Number.isInteger(total) ? String(total) : total.toFixed(2);
     },
+    shippingTemplateFreightVisible() {
+      return (
+        this.config.enableShippingTemplateFreight === true && this.form.templateType === '运单'
+      );
+    },
+    shippingTemplateCurrencyLabel() {
+      const currency = this.shippingTemplateFreight.currency;
+      if (!currency) return '';
+      const option = this.shippingTemplateCurrencyOptions.find(item => item.value === currency);
+      return option?.label || currency;
+    },
+    shippingTemplateRoadFreightTotal() {
+      const total = this.shippingTemplateFreight.freightItems.reduce(
+        (sum, item, index) => sum + Number(this.shippingTemplateRoadFreightAmount(item, index) || 0),
+        0
+      );
+      return this.formatShippingTemplateFreightNumber(total);
+    },
+    shippingTemplateFooterFreightTotal() {
+      const freightAmount =
+        this.transportMode === 'road'
+          ? Number(this.shippingTemplateRoadFreightTotal || 0)
+          : Number(this.shippingTemplateFreight.freightAmount || 0);
+      return freightAmount + Number(this.shippingTemplateFreight.otherFreightAmount || 0);
+    },
+    waybillFooterFreightTotal() {
+      return Number(this.taskFreightAmount || 0) + Number(this.form.otherFeeTotal || 0);
+    },
+    showFooterFreightSummary() {
+      return (
+        this.config.enableShippingTemplateFreight === true ||
+        this.config.enableWaybillFooterFreightSummary === true
+      );
+    },
+    footerFreightTotal() {
+      return this.config.enableShippingTemplateFreight === true
+        ? this.shippingTemplateFooterFreightTotal
+        : this.waybillFooterFreightTotal;
+    },
+    formatFooterFreightTotal() {
+      return this.footerFreightTotal.toLocaleString('zh-CN', {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      });
+    },
     transportAddressSelectDisabled() {
       return this.dialogReadonly || this.isBillingFieldEmpty(this.form.transportType);
     },
@@ -4477,6 +4895,7 @@ export default {
       if (!this.shippingInfoFormEnabled || this.suppressTransportTypeClear) return;
       if (String(value ?? '') === String(oldValue ?? '')) return;
       this.handleTransportTypeChange(value);
+      this.syncShippingTemplateFreightItems();
     },
   },
   methods: {
@@ -4487,6 +4906,31 @@ export default {
       };
       return applyTableMenuWidth(nextOption, menuButtonCount);
     },
+    formatTransportPlanGoodsInfo(row = {}) {
+      if (row.goodsInfo) return String(row.goodsInfo);
+      const goodsRows = this.parseJsonArray(row.goodsJson);
+      return goodsRows
+        .map(item => item.cargoType || item.goodsType || item.cargoName || item.goodsName || '')
+        .filter(Boolean)
+        .join('/');
+    },
+    truncateTransportPlanText(value, length = 10) {
+      const text = String(value || '');
+      return text.length > length ? `${text.slice(0, length)}...` : text || '-';
+    },
+    formatTransportPlanDistrictAddress(value) {
+      const text = String(value || '').trim();
+      if (!text) return '-';
+      const cityIndex = text.indexOf('市');
+      const districtStart = cityIndex > -1 ? cityIndex + 1 : 0;
+      const districtMatch = text
+        .slice(districtStart)
+        .match(/(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)/);
+      if (districtMatch) {
+        return text.slice(0, districtStart + districtMatch.index + districtMatch[0].length);
+      }
+      return cityIndex > -1 ? text.slice(0, cityIndex + 1) : text;
+    },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
     },
@@ -4725,13 +5169,15 @@ export default {
         });
     },
     displayStatus(row, prop) {
+      const formatStatus = this.config.formatStatus;
       const textProp = prop === this.config.statusProp ? this.config.statusTextProp : '';
-      if (textProp && row[textProp]) {
-        return row[textProp];
-      }
       const column = this.findColumn(this.option.column, prop);
       const item = column && (column.dicData || []).find(dic => dic.value === row[prop]);
-      return item ? item.label : row[prop] || '未知';
+      const defaultText =
+        textProp && row[textProp] ? row[textProp] : item ? item.label : row[prop] || '未知';
+      return typeof formatStatus === 'function'
+        ? formatStatus(row, prop, defaultText)
+        : defaultText;
     },
     syncContractNoDisabled(type) {
       if (!this.config.enableContractForm) return;
@@ -4895,12 +5341,17 @@ export default {
     },
     normalizeRow(row, saveAsDraft = false) {
       const submitRow = { ...row };
+      const skipValidation = saveAsDraft && this.config.skipDraftValidation === true;
       if (this.config.enableTransportPlanForm) {
-        if (!this.validateTransportPlanForm(submitRow)) return false;
+        if (!skipValidation && !this.validateTransportPlanForm(submitRow)) return false;
         submitRow.goodsJson = JSON.stringify(this.transportCargoRows);
+        if (this.config.enableShippingTemplateFreight) {
+          if (!skipValidation && !this.validateShippingTemplateFreight()) return false;
+          submitRow.freightJson = this.serializeShippingTemplateFreight();
+        }
       }
       if (this.taskInfoFormEnabled) {
-        if (!this.validateTaskInfoForm(submitRow)) return false;
+        if (!skipValidation && !this.validateTaskInfoForm(submitRow)) return false;
         this.syncTaskInfoToRow(submitRow);
       }
       if (this.config.enableAttachmentTable) {
@@ -4913,7 +5364,9 @@ export default {
         submitRow.billingPlanJson = JSON.stringify(this.billingPlanRows);
       }
       if (this.config.enableSettlementRule) {
-        if (this.settlementRuleEnabled && !this.validateSettlementRule()) return false;
+        if (!skipValidation && this.settlementRuleEnabled && !this.validateSettlementRule()) {
+          return false;
+        }
         submitRow.settlementRuleJson = JSON.stringify(this.normalizeSettlementRule());
       }
       if (this.config.enableReconciliation) {
@@ -4923,7 +5376,7 @@ export default {
         submitRow.changeRecordJson = JSON.stringify(this.changeRecordRows);
       }
       if (this.config.saveAsDraft && saveAsDraft) {
-        submitRow.approvalStatus = 'draft';
+        submitRow[this.config.draftStatusProp || 'approvalStatus'] = this.config.draftStatus || 'draft';
       }
       delete submitRow.basicInfoTitle;
       delete submitRow.templateInfoTitle;
@@ -4977,6 +5430,142 @@ export default {
       }
       return true;
     },
+    loadShippingTemplateCurrencyOptions() {
+      if (this.shippingTemplateCurrencyOptions.length || this.shippingTemplateCurrencyLoading) {
+        return Promise.resolve(this.shippingTemplateCurrencyOptions);
+      }
+      this.shippingTemplateCurrencyLoading = true;
+      return getSystemDictionary({ code: 'currency_type' })
+        .then(res => {
+          this.shippingTemplateCurrencyOptions = this.normalizeDictOptions(res.data?.data || []);
+          const cny = this.shippingTemplateCurrencyOptions.find(item =>
+            ['CNY', '人民币', 'RMB'].includes(String(item.value).toUpperCase())
+          );
+          if (!this.shippingTemplateFreight.currency) {
+            this.shippingTemplateFreight.currency = (cny || this.shippingTemplateCurrencyOptions[0])?.value || '';
+          }
+          return this.shippingTemplateCurrencyOptions;
+        })
+        .finally(() => {
+          this.shippingTemplateCurrencyLoading = false;
+        });
+    },
+    initShippingTemplateFreight() {
+      if (!this.config.enableShippingTemplateFreight) return;
+      const freight = this.parseJsonObject(this.form.freightJson);
+      this.shippingTemplateFreight = {
+        ...defaultShippingTemplateFreight(),
+        ...freight,
+        freightItems: (freight.freightItems || []).map(item => ({
+          ...defaultShippingTemplateFreightItem(),
+          ...item,
+        })),
+      };
+      this.syncShippingTemplateFreightItems();
+      this.loadShippingTemplateCurrencyOptions();
+    },
+    syncShippingTemplateFreightItems() {
+      if (!this.config.enableShippingTemplateFreight || this.transportMode !== 'road') return;
+      const rows = this.shippingTemplateFreight.freightItems || [];
+      this.shippingTemplateFreight.freightItems = this.transportCargoRows.map((_, index) => ({
+        ...defaultShippingTemplateFreightItem(),
+        ...(rows[index] || {}),
+      }));
+    },
+    handleShippingTemplateFreightNumberInput(row, prop, value) {
+      const text = String(value || '').replace(/[^\d.]/g, '');
+      const parts = text.split('.');
+      row[prop] =
+        parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
+    },
+    shippingTemplateRoadFreightQuantity(index) {
+      return this.formatShippingTemplateFreightNumber(this.transportCargoRows[index]?.quantity || 0);
+    },
+    shippingTemplateRoadFreightAmount(item, index) {
+      const amount = Number(item?.unitPrice || 0) * Number(this.transportCargoRows[index]?.quantity || 0);
+      return this.formatShippingTemplateFreightNumber(amount);
+    },
+    formatShippingTemplateFreightNumber(value) {
+      const number = Number(value || 0);
+      if (!Number.isFinite(number)) return '';
+      return Number(number.toFixed(2)).toString();
+    },
+    serializeShippingTemplateFreight() {
+      if (this.form.templateType !== '运单') return '';
+      const freight = {
+        currency: this.shippingTemplateFreight.currency || '',
+        otherFreightAmount: this.shippingTemplateFreight.otherFreightAmount || '',
+      };
+      if (this.transportMode === 'road') {
+        freight.totalFreightAmount = this.shippingTemplateRoadFreightTotal;
+        freight.freightItems = this.shippingTemplateFreight.freightItems.map((item, index) => ({
+          cargoIndex: index,
+          unitPrice: item.unitPrice || '',
+          priceUnit: item.priceUnit || '',
+          quantity: this.shippingTemplateRoadFreightQuantity(index),
+          freightAmount: this.shippingTemplateRoadFreightAmount(item, index),
+        }));
+      } else {
+        freight.quantity = this.transportCargoQuantityTotal;
+        freight.freightAmount = this.shippingTemplateFreight.freightAmount || '';
+      }
+      return JSON.stringify(freight);
+    },
+    validateShippingTemplateFreight() {
+      if (!this.shippingTemplateFreightVisible) return true;
+      if (!this.shippingTemplateFreight.currency) {
+        this.$message.warning('请选择币种');
+        return false;
+      }
+      if (this.transportMode === 'road') {
+        const invalid = this.shippingTemplateFreight.freightItems.findIndex(
+          item => Number(item.unitPrice || 0) < 0
+        );
+        if (invalid > -1) {
+          this.$message.warning(`第${invalid + 1}条货物单价不能小于0`);
+          return false;
+        }
+        const missingPriceUnit = this.shippingTemplateFreight.freightItems.findIndex(
+          item => !item.priceUnit
+        );
+        if (missingPriceUnit > -1) {
+          this.$message.warning(`请选择第${missingPriceUnit + 1}条货物的计价单位`);
+          return false;
+        }
+      } else if (Number(this.shippingTemplateFreight.freightAmount || 0) < 0) {
+        this.$message.warning('运费不能小于0');
+        return false;
+      }
+      if (Number(this.shippingTemplateFreight.otherFreightAmount || 0) < 0) {
+        this.$message.warning('其他运费合计不能小于0');
+        return false;
+      }
+      return true;
+    },
+    openShippingTemplateProcessConfig() {
+      if (!this.form.projectId || this.shippingTemplateProcessConfigLoading) return;
+      this.shippingTemplateProcessConfigBox = true;
+      this.shippingTemplateProcessConfigLoading = true;
+      getProcessConfigList(1, 100, { projectIds: this.form.projectId })
+        .then(res => {
+          this.shippingTemplateProcessConfigRows = extractRecords(res).filter(row => {
+            const projectIds = String(row.projectIds || '')
+              .split(',')
+              .map(item => item.trim());
+            return projectIds.includes(String(this.form.projectId));
+          });
+        })
+        .finally(() => {
+          this.shippingTemplateProcessConfigLoading = false;
+        });
+    },
+    formatShippingTemplateProcessNodes(nodes) {
+      if (Array.isArray(nodes)) return nodes.join('、');
+      return String(nodes || '')
+        .split(',')
+        .filter(Boolean)
+        .join('、');
+    },
     stopSubmitLoading(loading) {
       if (typeof loading === 'function') {
         loading();
@@ -5151,7 +5740,7 @@ export default {
       this.draftSaveLoading = true;
       request(submitRow)
         .then(() => {
-          this.$message.success('保存成功');
+          this.$message.success(`${this.config.draftSaveText || '保存'}成功`);
           this.onLoad(this.page, this.query);
           this.closeCrudDialog();
         })
@@ -5232,6 +5821,7 @@ export default {
           this.clearShippingPlan();
         }
         this.transportCargoRows = [];
+        this.shippingTemplateFreight = defaultShippingTemplateFreight();
         this.billingPlanRows = [];
         this.settlementRuleForm = defaultSettlementRule();
         this.reconciliationForm = defaultReconciliation();
@@ -5329,6 +5919,15 @@ export default {
       const number = Number(match[0]);
       return Number.isFinite(number) ? number : 0;
     },
+    getDispatchQuantityUnit(row = {}) {
+      return row.quantityUnit || row.goodsQuantityUnit || row.unit || '吨';
+    },
+    getDispatchSummaryItem(unit) {
+      return this.dispatchSummaryItems.find(item => item.unit === unit);
+    },
+    getDispatchRemainingQuantity(unit) {
+      return this.getDispatchSummaryItem(unit)?.remaining || 0;
+    },
     formatDispatchQuantity(value) {
       const number = Number(value || 0);
       if (!Number.isFinite(number)) return '0';
@@ -5340,7 +5939,9 @@ export default {
       this.projectLoading = true;
       getProjectList(1, 9999, this.config.projectQueryParams || {})
         .then(res => {
-          this.projectOptions = extractRecords(res);
+          this.projectOptions = extractRecords(res).filter(
+            item => !this.config.excludeVoidedProjects || item.approvalStatus !== 'voided'
+          );
           this.syncCurrentProjectOption();
         })
         .finally(() => {
@@ -5349,6 +5950,7 @@ export default {
     },
     syncCurrentProjectOption() {
       if (!this.form.projectId || !this.form.projectName) return;
+      if (this.config.excludeVoidedProjects) return;
       const exists = this.projectOptions.some(
         item => String(item.id) === String(this.form.projectId)
       );
@@ -5588,10 +6190,10 @@ export default {
       this.form.model = this.form.model || taskInfo.model || goodsInfo.model || '';
       this.form.quantity = this.form.quantity || taskInfo.quantity || goodsInfo.quantity || '';
       this.form.quantityUnit =
-        this.form.quantityUnit || taskInfo.quantityUnit || goodsInfo.quantityUnit || '';
+        this.form.quantityUnit || taskInfo.quantityUnit || goodsInfo.quantityUnit || '吨';
       this.form.mileage = this.form.mileage || taskInfo.mileage || goodsInfo.mileage || '';
       this.form.unitPrice = this.form.unitPrice || taskInfo.unitPrice || goodsInfo.unitPrice || '';
-      this.form.priceUnit = this.form.priceUnit || taskInfo.priceUnit || goodsInfo.priceUnit || '';
+      this.form.priceUnit = this.form.priceUnit || taskInfo.priceUnit || goodsInfo.priceUnit || '元/吨';
       this.form.otherFeeTotal =
         this.form.otherFeeTotal || taskInfo.otherFeeTotal || goodsInfo.otherFeeTotal || '';
       this.form.estimatedStartTime =
@@ -5639,9 +6241,9 @@ export default {
     loadTaskCarrierOptions() {
       if (!this.taskInfoFormEnabled || this.taskCarrierLoading) return Promise.resolve([]);
       this.taskCarrierLoading = true;
-      return getCarrierCustomerList(1, 9999, { customerType: '承运商' })
+      return getCarrierCustomerList(1, 9999, { customerType: '承运商', status: 1 })
         .then(res => {
-          this.taskCarrierOptions = extractRecords(res);
+          this.taskCarrierOptions = extractRecords(res).filter(item => Number(item.status) === 1);
           return this.taskCarrierOptions;
         })
         .finally(() => {
@@ -5835,6 +6437,11 @@ export default {
     handleTaskNumberInput(prop, value) {
       this.form[prop] = this.normalizeTaskNumber(value);
     },
+    handleTaskMileageInput(value) {
+      this.form.mileage = this.isRoadTransport
+        ? String(value || '').replace(/\D/g, '').slice(0, 10)
+        : this.normalizeTaskNumber(value);
+    },
     normalizeTaskNumber(value) {
       const text = String(value || '').replace(/[^\d.]/g, '');
       const parts = text.split('.');
@@ -5880,6 +6487,9 @@ export default {
         requiredFields.push(['carrierName', '承运商']);
       }
       if (row.carrierType === '自运') {
+        if (this.isRoadTransport) {
+          requiredFields.push(['driverName', '司机']);
+        }
         requiredFields.push(['driverPhone', '手机号']);
       }
       const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
@@ -5891,8 +6501,10 @@ export default {
         ['quantity', '数量'],
         ['mileage', '里程'],
         ['unitPrice', '单价'],
-        ['otherFeeTotal', '其他运费合计'],
       ];
+      if (this.isTaskFullMode) {
+        numberFields.push(['otherFeeTotal', '其他运费合计']);
+      }
       const invalidField = numberFields.find(([prop]) => {
         const value = row[prop];
         return value !== undefined && value !== null && value !== '' && Number(value) < 0;
@@ -5901,6 +6513,27 @@ export default {
         this.$message.warning(`${invalidField[1]}不能小于0`);
         return false;
       }
+      if (this.isRoadTransport) {
+        const invalidLengthField = [
+          ['driverName', '司机', 20],
+          ['driverPhone', '手机号', 20],
+          ['vehicleNo', '车牌号', 30],
+          ['trailerVehicleNo', '挂车车牌号', 30],
+          ['escortName', '押运人', 20],
+          ['escortPhone', '押运人手机号', 20],
+        ].find(([prop, , max]) => String(row[prop] || '').length > max);
+        if (invalidLengthField) {
+          this.$message.warning(`${invalidLengthField[1]}不能超过${invalidLengthField[2]}个字符`);
+          return false;
+        }
+        if (
+          row.mileage &&
+          (!/^\d{1,10}$/.test(String(row.mileage)) || Number(row.mileage) <= 0)
+        ) {
+          this.$message.warning('里程必须为不超过10位的正整数');
+          return false;
+        }
+      }
       if (
         row.estimatedStartTime &&
         row.estimatedEndTime &&
@@ -5998,6 +6631,7 @@ export default {
       this.transportCargoRows = this.parseJsonArray(this.form.goodsJson).map(row =>
         this.normalizeTransportCargoRow(row)
       );
+      this.initShippingTemplateFreight();
       this.syncTransportCargoJson();
       this.syncCurrentContractOption();
       this.restoreTransportCargoTypePaths();
@@ -6051,9 +6685,13 @@ export default {
       } else {
         this.transportCargoRows.push(nextRow);
       }
+      this.syncShippingTemplateFreightItems();
       this.syncTransportCargoJson();
     },
     removeTransportCargoRow(index) {
+      if (this.config.enableShippingTemplateFreight && this.transportMode === 'road') {
+        this.shippingTemplateFreight.freightItems.splice(index, 1);
+      }
       this.transportCargoRows.splice(index, 1);
       if (
         !this.transportCargoRows.length &&
@@ -6061,6 +6699,7 @@ export default {
       ) {
         this.transportCargoRows.push(this.normalizeTransportCargoRow());
       }
+      this.syncShippingTemplateFreightItems();
       this.syncTransportCargoJson();
     },
     handleTransportCargoQuantityInput(row, value) {
@@ -6068,6 +6707,7 @@ export default {
       const parts = text.split('.');
       row.quantity =
         parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 3)}` : parts[0];
+      this.syncShippingTemplateFreightItems();
       this.syncTransportCargoJson();
     },
     handleTransportCargoTypeChange(row, value) {
@@ -6204,6 +6844,11 @@ export default {
       }
       this.openTransportMapDialog(target);
     },
+    handleTransportSecondaryAddressInputClick(target) {
+      if (this.transportStationMode || !this.config.editableRoadAddress) {
+        this.openTransportSecondaryAddressPicker(target);
+      }
+    },
     ensureTransportTypeBeforeAddress() {
       if (!this.shippingInfoFormEnabled || !this.isBillingFieldEmpty(this.form.transportType)) {
         return true;
@@ -6378,10 +7023,31 @@ export default {
       if (!this.ensureTransportTypeBeforeAddress()) return;
       this.transportAddressTarget = target;
       this.transportAddressSelected = null;
-      this.transportAddressQuery = {};
+      this.resetTransportAddressQuery();
       this.transportAddressPage.currentPage = 1;
       this.transportAddressBox = true;
     },
+    openTransportAddressPicker(target) {
+      if (this.transportStationMode) {
+        this.openTransportStationDialog(target);
+        return;
+      }
+      this.openTransportAddressDialog(target);
+    },
+    resetTransportAddressQuery() {
+      const addressType = this.getTransportFixedAddressType();
+      this.transportAddressQuery = addressType ? { addressType } : {};
+    },
+    getTransportFixedAddressType() {
+      if (!this.config.fixedTransportAddressType) return '';
+      const typeMap = {
+        road: '常规地址',
+        rail: '铁路车站',
+        water: '港口/码头',
+        air: '空港机场',
+      };
+      return typeMap[this.transportMode] || '';
+    },
     loadTransportAddressList() {
       this.transportAddressLoading = true;
       getCommonAddressList(
@@ -6406,7 +7072,7 @@ export default {
       this.loadTransportAddressList();
     },
     handleTransportAddressReset() {
-      this.transportAddressQuery = {};
+      this.resetTransportAddressQuery();
       this.transportAddressPage.currentPage = 1;
       this.loadTransportAddressList();
     },
@@ -6809,44 +7475,26 @@ export default {
     async handleCargoImportFileChange(file) {
       const rawFile = file.raw;
       if (!rawFile) return;
+      if (!/\.(xls|xlsx)$/i.test(rawFile.name || '')) {
+        this.$message.warning('请上传 .xlsx、.xls 格式文件');
+        return;
+      }
+      if (rawFile.size > 50 * 1024 * 1024) {
+        this.$message.warning('单个文件大小不能超过50M');
+        return;
+      }
       this.cargoImportLoading = true;
       try {
-        const ExcelJSModule = await import('exceljs');
-        const ExcelJS = ExcelJSModule.default || ExcelJSModule;
-        const workbook = new ExcelJS.Workbook();
-        await workbook.xlsx.load(await rawFile.arrayBuffer());
-        const worksheet = workbook.worksheets[0];
-        const headerRow = worksheet.getRow(1);
-        const headerMap = {};
-        headerRow.eachCell((cell, colNumber) => {
-          headerMap[String(cell.value || '').trim()] = colNumber;
-        });
-        const fieldMap = {
-          货物名称: 'cargoName',
-          货物类型: 'cargoType',
-          数量: 'quantity',
-          数量单位: 'quantityUnit',
-          包装: 'packageType',
-          品牌: 'brand',
-          规格: 'specification',
-          型号: 'model',
-          物料编码: 'materialCode',
-          设备编码: 'deviceCode',
-          备注: 'remark',
-        };
-        const rows = [];
-        worksheet.eachRow((row, rowNumber) => {
-          if (rowNumber === 1) return;
-          const nextRow = defaultTransportCargo();
-          Object.entries(fieldMap).forEach(([label, prop]) => {
-            const columnIndex = headerMap[label];
-            if (!columnIndex) return;
-            nextRow[prop] = String(row.getCell(columnIndex).value || '').trim();
-          });
-          if (Object.values(nextRow).some(value => String(value || '').trim())) {
-            rows.push(nextRow);
-          }
-        });
+        const res = await importBlob('/blade-transport/shipping-template/import-goods', rawFile);
+        const contentType = res.headers['content-type'] || res.data.type || '';
+        if (contentType.includes('application/vnd.ms-excel')) {
+          downloadXls(res.data, `发货模板货物导入失败明细${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
+          this.$message.warning('部分数据导入失败，已下载失败明细');
+          return;
+        }
+        const result = JSON.parse(await res.data.text());
+        if (result.code !== 200) throw new Error(result.msg || '货物导入失败');
+        const rows = result.data || [];
         if (!rows.length) {
           this.$message.warning('未读取到货物数据');
           return;
@@ -6861,6 +7509,11 @@ export default {
         this.cargoImportLoading = false;
       }
     },
+    handleCargoImportTemplate() {
+      exportBlob('/blade-transport/shipping-template/export-goods-template').then(res => {
+        downloadXls(res.data, '发货模板货物导入模板.xlsx');
+      });
+    },
     loadOrganizationOptions() {
       if (!this.config.enableOrganizationSelect || this.organizationLoading) return;
       this.organizationLoading = true;
@@ -8394,17 +9047,51 @@ export default {
       };
     },
     formatDispatchCargoInfo(plan = {}, item = {}) {
-      const cargoName = item.cargoName || item.goodsName || plan.cargoName || '';
-      const cargoType = item.cargoType || item.goodsType || plan.cargoType || '';
-      const quantity = item.quantity || item.cargoQuantity || item.goodsQuantity || '';
-      const unit = item.quantityUnit || item.goodsQuantityUnit || item.unit || '';
-      const quantityText = quantity ? `${quantity}${unit}` : '';
-      return (
-        [cargoName, cargoType, quantityText].filter(Boolean).join(' - ') || plan.goodsInfo || ''
-      );
+      const goodsRows = this.parseJsonArray(plan.goodsJson);
+      const sourceRows = goodsRows.length ? goodsRows : [item];
+      const groups = sourceRows.reduce((result, goods = {}) => {
+        const cargoType =
+          goods.cargoType ||
+          goods.secondCargoTypeName ||
+          goods.secondCargoType ||
+          goods.goodsType ||
+          goods.type ||
+          plan.cargoType ||
+          '货物';
+        const unit = this.getDispatchQuantityUnit(goods);
+        if (!result[unit]) {
+          result[unit] = {
+            cargoType,
+            count: 0,
+            quantity: 0,
+            unit,
+          };
+        }
+        result[unit].count += 1;
+        result[unit].quantity += this.parseDispatchQuantity(
+          goods.quantity || goods.cargoQuantity || goods.goodsQuantity
+        );
+        return result;
+      }, {});
+
+      const cargoInfo = Object.values(groups)
+        .map(
+          group =>
+            `${group.cargoType}等${group.count}种货物 | ${this.formatDispatchQuantity(
+              group.quantity
+            )}${group.unit || ''}`
+        )
+        .join('；');
+      return cargoInfo || plan.goodsInfo || '';
     },
     openDispatchItemDialog(index = -1, row = defaultDispatchRow()) {
-      const defaultGoods = this.dispatchPlanGoodsRows[0] || {};
+      const defaultSummaryItem =
+        this.dispatchSummaryItems.find(item => item.remaining > 0) || this.dispatchSummaryItems[0];
+      const defaultGoods =
+        this.dispatchPlanGoodsRows.find(
+          item => this.getDispatchQuantityUnit(item) === defaultSummaryItem?.unit
+        ) || this.dispatchPlanGoodsRows[0] || {};
+      const defaultUnit = defaultSummaryItem?.unit || this.getDispatchQuantityUnit(defaultGoods);
       const baseRow = {
         ...defaultDispatchRow(),
         transportType: this.dispatchRow.transportType || '',
@@ -8418,8 +9105,8 @@ export default {
         quantity:
           index >= 0
             ? defaultGoods.quantity || ''
-            : this.formatDispatchQuantity(this.dispatchSummaryRemainingQuantity),
-        quantityUnit: defaultGoods.quantityUnit || '吨',
+            : this.formatDispatchQuantity(this.getDispatchRemainingQuantity(defaultUnit)),
+        quantityUnit: defaultUnit,
         specification: defaultGoods.specification || '',
         model: defaultGoods.model || '',
         packageType: defaultGoods.packageType || '',
@@ -8508,17 +9195,18 @@ export default {
         ...this.dispatchItemForm,
         attachmentsJson: JSON.stringify(this.dispatchItemAttachmentRows),
       };
+      const quantityUnit = this.getDispatchQuantityUnit(nextRow);
       const otherDispatchedQuantity = this.dispatchRows.reduce((total, row, index) => {
-        if (index === this.dispatchItemIndex) return total;
+        if (index === this.dispatchItemIndex || this.getDispatchQuantityUnit(row) !== quantityUnit) {
+          return total;
+        }
         return total + this.parseDispatchQuantity(row.quantity);
       }, 0);
       const currentQuantity = this.parseDispatchQuantity(nextRow.quantity);
-      const totalQuantity = this.dispatchSummaryTotalQuantity;
+      const totalQuantity = this.getDispatchSummaryItem(quantityUnit)?.total || 0;
       if (totalQuantity > 0 && otherDispatchedQuantity + currentQuantity > totalQuantity) {
         this.$message.warning(
-          `已调度数量合计不能超过总数量${this.formatDispatchQuantity(totalQuantity)}${
-            this.dispatchSummaryUnit
-          }`
+          `已调度${quantityUnit}合计不能超过总数量${this.formatDispatchQuantity(totalQuantity)}${quantityUnit}`
         );
         return;
       }
@@ -8547,7 +9235,7 @@ export default {
       });
     },
     handleDispatchAddRow() {
-      if (this.dispatchSummaryRemainingQuantity <= 0) {
+      if (!this.dispatchHasRemainingQuantity) {
         this.$message.warning('剩余数量为0，不能新增调度明细');
         return;
       }
@@ -8649,7 +9337,7 @@ export default {
     },
     submitDispatch(mode) {
       this.dispatchSaving = mode;
-      const shouldCompletePlan = mode === 'submit' && this.dispatchSummaryRemainingQuantity <= 0;
+      const shouldCompletePlan = mode === 'submit' && !this.dispatchHasRemainingQuantity;
       this.api
         .dispatch(this.buildDispatchPayload(mode))
         .then(() => {
@@ -8837,12 +9525,6 @@ export default {
     width: 100%;
   }
 
-  &__task-toolbar {
-    display: flex;
-    justify-content: flex-end;
-    margin-bottom: 16px;
-  }
-
   &__task-form {
     display: grid;
     grid-template-columns: repeat(4, minmax(0, 1fr));
@@ -9040,6 +9722,15 @@ export default {
     white-space: nowrap;
   }
 
+  &__map-suffix {
+    cursor: pointer;
+    color: #909399;
+
+    &:hover {
+      color: #409eff;
+    }
+  }
+
   &__cargo-wrap {
     display: block;
     width: 100%;
@@ -9047,6 +9738,20 @@ export default {
     overflow-x: auto;
   }
 
+  &__cargo-import {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 56px;
+    padding: 12px 0 8px;
+
+    :deep(.el-upload__tip) {
+      margin: 16px 0 0;
+      color: #606266;
+      font-size: 16px;
+    }
+  }
+
   &__cargo-table {
     width: 100%;
     min-width: 1870px;
@@ -9115,6 +9820,87 @@ export default {
     font-weight: 600;
   }
 
+  &__freight-section {
+    margin-top: 20px;
+  }
+
+  &__freight-table {
+    width: 100%;
+
+    :deep(.el-table__header th) {
+      background: #f5f7fa;
+      color: #303133;
+      font-weight: 600;
+    }
+
+    :deep(.el-table__cell) {
+      border-color: #eff1f7;
+    }
+
+    :deep(.el-input),
+    :deep(.el-select) {
+      width: 100%;
+    }
+  }
+
+  &__freight-summary {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 16px;
+  }
+
+  &__freight-form {
+    display: grid;
+    grid-template-columns: repeat(3, minmax(220px, 1fr));
+    gap: 16px 24px;
+    width: min(100%, 920px);
+
+    :deep(.el-form-item) {
+      margin-bottom: 0;
+    }
+
+    :deep(.el-input),
+    :deep(.el-select) {
+      width: 100%;
+    }
+
+    &--non-road {
+      width: 100%;
+      grid-template-columns: repeat(4, minmax(220px, 1fr));
+    }
+  }
+
+  &__shipping-template-footer-summary {
+    position: absolute;
+    left: 16px;
+    bottom: 10px;
+    display: inline-flex;
+    align-items: center;
+    gap: 24px;
+    height: 28px;
+    color: #303133;
+    font-size: 13px;
+
+    strong {
+      margin-left: 4px;
+      font-size: 15px;
+    }
+
+    :deep(.el-link) {
+      font-size: 13px;
+    }
+  }
+
+  &__process-config-dialog {
+    :deep(.el-table__cell) {
+      border-color: #eff1f7;
+    }
+
+    :deep(.el-table__row:nth-child(even) td) {
+      background: #fafafa;
+    }
+  }
+
   &__dialog-search {
     padding: 12px 12px 4px;
     margin-bottom: 12px;
@@ -9159,6 +9945,16 @@ export default {
     :deep(.el-select) {
       width: 100%;
     }
+
+    &--road {
+      grid-template-columns: repeat(3, minmax(0, 1fr));
+      column-gap: 56px;
+      row-gap: 16px;
+
+      :deep(.business-crud-page__append-select) {
+        width: 128px;
+      }
+    }
   }
 
   &__dialog-pagination {
diff --git a/src/views/business/process-config.vue b/src/views/business/process-config.vue
index c233f51..69676b2 100644
--- a/src/views/business/process-config.vue
+++ b/src/views/business/process-config.vue
@@ -527,6 +527,7 @@ export default {
   created() {
     this.resetNodeRows();
     this.loadProjectOptions('');
+    this.applyDefaultDeptSearch();
     this.initDeptOptions();
   },
   methods: {
@@ -545,6 +546,21 @@ export default {
         }
       });
     },
+    defaultDeptId() {
+      return (this.userInfo && (this.userInfo.deptId || this.userInfo.dept_id)) || '';
+    },
+    applyDefaultDeptSearch() {
+      const deptId = this.defaultDeptId();
+      const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
+      if (!deptId || !deptColumn) return;
+      deptColumn.searchValue = deptId;
+      this.query = { ...this.query, deptId };
+      this.$nextTick(() => {
+        if (this.$refs.crud?.searchForm) {
+          this.$refs.crud.searchForm.searchDeptId = deptId;
+        }
+      });
+    },
     flattenDept(tree, level = 0) {
       return tree.flatMap(item => [
         {
@@ -953,8 +969,9 @@ export default {
     },
     searchReset() {
       this.query = {};
+      this.applyDefaultDeptSearch();
       this.page.currentPage = 1;
-      this.onLoad(this.page);
+      this.onLoad(this.page, this.query);
     },
     searchChange(params, done) {
       this.query = params;
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 883e20e..f88a490 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -1015,7 +1015,7 @@
                   v-for="item in scoreQuantificationOptions"
                   :key="item.id"
                   :label="item.name"
-                  :value="item.id"
+                  :value="String(item.id)"
                 />
               </el-select>
             </el-form-item>
@@ -1961,14 +1961,14 @@ export default {
     },
     initScoreQuantificationOptions() {
       this.scoreQuantificationLoading = true;
-      getCreditScoreQuantificationList(1, 9999, { status: 1 })
+      return getCreditScoreQuantificationList(1, 9999, { status: 1 })
         .then(res => {
           const data = res.data.data || {};
           const records = Array.isArray(data) ? data : data.records || [];
           this.scoreQuantificationOptions = records
             .filter(item => Number(item.status) === 1)
             .map(item => ({
-              id: item.id,
+              id: String(item.id),
               name: item.name || item.configName || item.title || item.id,
             }));
         })
@@ -1976,6 +1976,21 @@ export default {
           this.scoreQuantificationLoading = false;
         });
     },
+    ensureScoreQuantificationOption(quantificationId) {
+      if (!quantificationId) return Promise.resolve();
+      const id = String(quantificationId);
+      if (this.scoreQuantificationOptions.some(item => String(item.id) === id)) {
+        return Promise.resolve();
+      }
+      return getCreditScoreQuantificationDetail(quantificationId).then(res => {
+        const item = res.data.data || {};
+        if (!item.id) return;
+        this.scoreQuantificationOptions.push({
+          id: String(item.id),
+          name: item.name || item.configName || item.title || String(item.id),
+        });
+      });
+    },
     loadDictOptions(code, target, fallback = [], callback) {
       getDictionary({ code }).then(res => {
         const options = (res.data.data || []).map(item => ({
@@ -2022,6 +2037,7 @@ export default {
       const deptNames = deptIds
         .map(id => this.deptOptions.find(item => String(item.value) === String(id))?.rawLabel)
         .filter(Boolean);
+      this.archiveForm.deptId = deptIds;
       this.archiveForm.deptIds = deptIds.join(',');
       this.archiveForm.deptName = deptNames.join(',');
       this.$refs.archiveForm?.validateField('deptName');
@@ -2692,6 +2708,7 @@ export default {
         attachments: [],
         details: [],
         ...score,
+        quantificationId: score.quantificationId ? String(score.quantificationId) : '',
         tempApplyCreditLimit: this.normalizeOptionalAmount(score.tempApplyCreditLimit),
         attachments: score.attachments || this.parseAttachments(score.proofAttachments),
         details: score.details || [],
@@ -2808,7 +2825,7 @@ export default {
         .map(id => this.deptOptions.find(item => String(item.value) === String(id))?.rawLabel)
         .filter(Boolean);
       archive.deptIds = deptIds.join(',');
-      archive.deptId = deptIds.length ? deptIds[0] : '';
+      archive.deptId = deptIds.length ? Number(deptIds[0]) : null;
       archive.deptName = deptNames.length ? deptNames.join(',') : archive.deptName;
       archive.registeredAddress = this.formatArchiveAddress(archive);
       delete archive.registeredRegionPath;
@@ -2885,9 +2902,10 @@ export default {
       this.scoreAttachmentFiles = JSON.parse(JSON.stringify(this.currentScore.attachments || []));
       this.expandedScoreCategoryKeys = [];
       this.scoreBox = true;
-      if (!this.scoreQuantificationOptions.length) {
-        this.initScoreQuantificationOptions();
-      }
+      const loadOptions = this.scoreQuantificationOptions.length
+        ? Promise.resolve()
+        : this.initScoreQuantificationOptions();
+      loadOptions.then(() => this.ensureScoreQuantificationOption(this.currentScore.quantificationId));
     },
     resetScoreDialog() {
       this.scoreRecordIndex = -1;