1、新增结算模块

2、调整业务模块 3、调整客商模块
2026-08-20 06:33:01 +08:00
parent 4199255186
commit fd5b1484e6
59 changed files with 11745 additions and 1104 deletions
@@ -0,0 +1,102 @@
+<template>
+  <el-dialog v-model="visible" :title="readonly ? '计费方案详情' : index < 0 ? '添加计费方案' : '编辑计费方案'" width="92%" append-to-body destroy-on-close>
+    <el-form ref="formRef" :model="draft" :rules="formRules" label-position="right" label-width="auto">
+      <el-row :gutter="20">
+        <el-col :span="8"><el-form-item label="方案名称" prop="planName"><el-input v-model="draft.planName" maxlength="100" :disabled="readonly" /></el-form-item></el-col>
+        <el-col :span="8"><el-form-item label="默认方案"><el-checkbox v-model="draft.defaultPlan" :disabled="readonly">默认方案</el-checkbox></el-form-item></el-col>
+        <el-col :span="24"><el-form-item label="备注"><el-input v-model="draft.remark" maxlength="100" show-word-limit :disabled="readonly" /></el-form-item></el-col>
+      </el-row>
+    </el-form>
+    <div class="rule-head"><el-link v-if="!readonly" type="primary" @click="addRule">+添加规则</el-link></div>
+    <el-table :data="draft.rules" border>
+      <el-table-column type="index" label="序号" width="65" />
+      <el-table-column label="费用类型" width="180"><template #default="{ row }"><el-select v-model="row.feeType" clearable filterable :disabled="readonly" :loading="feeCategoryLoading" @change="value => handleFeeTypeChange(row, value)"><el-option v-for="item in feeCategories" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" /></el-select></template></el-table-column>
+      <el-table-column label="费用项" width="210"><template #default="{ row }"><el-select v-model="row.feeItem" clearable filterable :disabled="readonly || !row.feeType" :loading="feeItemLoadingMap[feeTypeKey(row)]"><el-option v-for="item in feeItemOptions(row)" :key="item.id || item.name || item.englishName" :label="item.name || item.englishName" :value="item.name || item.englishName" /></el-select></template></el-table-column>
+      <el-table-column label="计费要素" width="170"><template #default="{ row }"><el-select v-model="row.billingElement" :disabled="readonly" placeholder="请选择" @change="handleElementChange(row)"><el-option v-for="item in billingElements" :key="item" :label="item" :value="item" /></el-select></template></el-table-column>
+      <el-table-column label="计费类型" width="180"><template #default="{ row }"><el-select v-model="row.billingType" :disabled="readonly || !row.billingElement" placeholder="请选择" @change="handleTypeChange(row)"><el-option v-for="item in billingTypes(row)" :key="item" :label="item" :value="item" /></el-select></template></el-table-column>
+      <el-table-column label="计费单位" width="150"><template #default="{ row }"><el-select v-model="row.billingUnit" clearable filterable :disabled="readonly" :loading="unitLoading"><el-option v-for="item in unitOptions" :key="item.id || item.dictKey || item.dictValue" :label="item.dictValue" :value="item.dictValue" /></el-select></template></el-table-column>
+      <el-table-column label="单价（元）" width="180"><template #default="{ row }"><div v-if="usesRangeUnitPrice(row)" class="limit-list"><el-input v-for="(item, rangeIndex) in getRanges(row)" :key="rangeIndex" v-model="item.unitPrice" :disabled="readonly" placeholder="请输入单价" @input="value => rangeUnitPriceInput(row, rangeIndex, value)" /></div><el-input v-else v-model="row.unitPrice" :disabled="readonly" @input="value => decimalInput(row, 'unitPrice', value)" /></template></el-table-column>
+      <el-table-column label="计费要素下限" width="250"><template #default="{ row }"><div class="limit-list"><el-input v-for="(item, rangeIndex) in getRanges(row)" :key="rangeIndex" v-model="item.lowerLimit" :disabled="!canEditLimit(row)" :placeholder="canEditLimit(row) ? '请输入下限' : '无需配置'" @input="value => limitInput(row, rangeIndex, 'lowerLimit', value)" /></div></template></el-table-column>
+      <el-table-column label="计费要素上限" width="270"><template #default="{ row }"><div class="limit-list"><div v-for="(item, rangeIndex) in getRanges(row)" :key="rangeIndex" class="limit-row"><el-input v-model="item.upperLimit" :disabled="!canEditLimit(row)" :placeholder="canEditLimit(row) ? '请输入上限' : '无需配置'" @input="value => limitInput(row, rangeIndex, 'upperLimit', value)" /><el-link v-if="canEditLimit(row)" type="primary" @click="addRange(row, rangeIndex)">添加</el-link><el-link v-if="canEditLimit(row) && getRanges(row).length > 1" type="danger" @click="removeRange(row, rangeIndex)">删除</el-link></div></div></template></el-table-column>
+      <el-table-column label="保底计费重量" width="240"><template #default="{ row }"><el-input v-model="row.minimumBillingWeight" :disabled="!canEditMinimum(row)" :placeholder="canEditMinimum(row) ? '实际计量值小于保底数值时按保底计费' : '仅按重量、按吨·公里可填写'" @input="value => decimalInput(row, 'minimumBillingWeight', value)" /></template></el-table-column>
+      <el-table-column label="备注" width="180"><template #default="{ row }"><el-input v-model="row.remark" maxlength="100" show-word-limit :disabled="readonly" /></template></el-table-column>
+      <el-table-column label="操作" width="250" fixed="right"><template #default="{ row, $index }"><el-link type="primary" @click="openMatch(row, $index)">{{ readonly ? '查看匹配条件' : '设置匹配条件' }}</el-link><el-link v-if="!readonly" type="primary" @click="copyRule(row)">复制</el-link><el-link v-if="!readonly" type="danger" @click="removeRule($index)">删除</el-link></template></el-table-column>
+    </el-table>
+    <template #footer><el-button v-if="readonly" type="primary" @click="visible = false">关闭</el-button><template v-else><el-button @click="visible = false">取消</el-button><el-button type="primary" @click="save">提交</el-button></template></template>
+  </el-dialog>
+
+  <el-dialog v-model="matchVisible" title="设置匹配条件" append-to-body width="720px">
+    <el-form :model="matchForm" label-position="right" label-width="90px">
+      <el-row :gutter="48">
+        <el-col :span="12"><el-form-item label="起运地"><el-cascader v-model="matchForm.originPath" :options="regionOptions" :props="regionProps" :placeholder="matchForm.origin || '请选择起运地'" :loading="regionLoading" :disabled="readonly" clearable filterable @visible-change="v => v && ensureRegions()" @change="v => matchRegionChange('origin', v)" /></el-form-item></el-col>
+        <el-col :span="12"><el-form-item label="目的地"><el-cascader v-model="matchForm.destinationPath" :options="regionOptions" :props="regionProps" :placeholder="matchForm.destination || '请选择目的地'" :loading="regionLoading" :disabled="readonly" clearable filterable @visible-change="v => v && ensureRegions()" @change="v => matchRegionChange('destination', v)" /></el-form-item></el-col>
+        <el-col :span="12"><el-form-item label="运输方式"><el-select v-model="matchForm.transportMode" :disabled="readonly" clearable><el-option label="公路" value="公路" /><el-option label="铁路" value="铁路" /><el-option label="水路" value="水路" /></el-select></el-form-item></el-col>
+        <el-col :span="12"><el-form-item label="货物类型"><el-cascader v-model="matchForm.cargoTypePath" :options="cargoOptions" :props="cargoProps" :placeholder="matchForm.cargoType || '请选择货物类型'" :loading="cargoLoading" :disabled="readonly" clearable filterable :filter-method="filterCargo" @visible-change="v => v && ensureCargo()" @change="matchCargoChange" /></el-form-item></el-col>
+      </el-row>
+    </el-form>
+    <template #footer><el-button v-if="readonly" type="primary" @click="matchVisible = false">关闭</el-button><template v-else><el-button @click="matchVisible = false">取消</el-button><el-button type="primary" @click="saveMatch">保存</el-button></template></template>
+  </el-dialog>
+</template>
+
+<script>
+import { getList as getCargoTypeList } from '@/api/base/cargo-type';
+import { getList as getFeeItemList } from '@/api/base/fee-item';
+import { getLazyTree as getRegionLazyTree } from '@/api/base/region';
+import { getDictionary } from '@/api/system/dictbiz';
+
+const clone = value => JSON.parse(JSON.stringify(value));
+const defaultRule = () => ({ feeType: '', feeItem: '', billingElement: '', billingType: '', billingUnit: '', unitPrice: '', lowerLimit: '', upperLimit: '', limitRanges: [{ lowerLimit: '', upperLimit: '', unitPrice: '' }], minimumBillingWeight: '', remark: '', matchCondition: { origin: '', originCode: '', originPath: [], destination: '', destinationCode: '', destinationPath: [], transportMode: '', cargoType: '', cargoTypeCode: '', cargoTypePath: [] } });
+
+export default {
+  props: { modelValue: Boolean, value: { type: Object, default: () => ({}) }, index: { type: Number, default: -1 }, readonly: Boolean },
+  emits: ['update:modelValue', 'save'],
+  data() { return { draft: this.normalizePlan(this.value), feeCategories: [], feeCategoryLoading: false, feeItems: {}, feeItemLoadingMap: {}, unitOptions: [], unitLoading: false, billingElements: ['按重量', '按体积', '按车辆', '按里程', '按吨·公里', '固定金额（整单一口价）', '按数量'], typeMap: { 按重量: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'], 按体积: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'], 按车辆: ['固定单价'], 按里程: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'], '按吨·公里': ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'], '固定金额（整单一口价）': ['固定一口价'], 按数量: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'] }, matchVisible: false, matchIndex: -1, matchForm: defaultRule().matchCondition, regionOptions: [], regionLoading: false, regionRequest: null, cargoOptions: [], cargoFlatOptions: [], cargoLoading: false, cargoRequest: null, formRules: { planName: [{ required: true, message: '请输入方案名称', trigger: 'blur' }] } }; },
+  computed: { visible: { get() { return this.modelValue; }, set(value) { this.$emit('update:modelValue', value); } }, regionProps() { return { label: 'title', value: 'id', children: 'children', leaf: 'leaf', emitPath: true }; }, cargoProps() { return { label: 'cargoName', value: 'id', children: 'children', disabled: (data, node) => node.level === 1, leaf: 'leaf', checkStrictly: true, emitPath: true }; } },
+  mounted() { this.loadDictionaries(); },
+  watch: { value: { deep: true, handler(value) { if (this.modelValue) { this.draft = this.normalizePlan(value); this.loadRuleItems(); } } } },
+  methods: {
+    normalizePlan(value = {}) { const plan = { planName: '', defaultPlan: false, remark: '', ...clone(value || {}) }; plan.rules = (value?.rules?.length ? value.rules : [defaultRule()]).map(rule => this.normalizeRule(rule)); return plan; },
+    normalizeRule(rule = {}) { const next = { ...defaultRule(), ...clone(rule) }; next.limitRanges = this.normalizeRanges(next); this.syncLegacyLimit(next); next.matchCondition = { ...defaultRule().matchCondition, ...(rule.matchCondition || {}) }; return next; },
+    normalizeRanges(row) { const ranges = Array.isArray(row.limitRanges) ? row.limitRanges.map(item => ({ lowerLimit: item?.lowerLimit ?? '', upperLimit: item?.upperLimit ?? '', unitPrice: item?.unitPrice === undefined || item?.unitPrice === '' ? row.unitPrice ?? '' : item.unitPrice })).filter(item => item.lowerLimit !== '' || item.upperLimit !== '' || item.unitPrice !== '') : []; if (!ranges.length && (row.lowerLimit !== '' || row.upperLimit !== '' || row.unitPrice !== '')) ranges.push({ lowerLimit: row.lowerLimit ?? '', upperLimit: row.upperLimit ?? '', unitPrice: row.unitPrice ?? '' }); return ranges.length ? ranges : [{ lowerLimit: '', upperLimit: '', unitPrice: '' }]; },
+    syncLegacyLimit(row) { const first = row.limitRanges?.[0] || {}; row.lowerLimit = first.lowerLimit || ''; row.upperLimit = first.upperLimit || ''; if (this.usesRangeUnitPrice(row)) row.unitPrice = first.unitPrice || ''; },
+    loadDictionaries() { this.feeCategoryLoading = true; getDictionary({ code: 'fee_category' }).then(res => { this.feeCategories = res.data?.data || []; this.loadRuleItems(); }).finally(() => { this.feeCategoryLoading = false; }); this.unitLoading = true; getDictionary({ code: 'unit_fee' }).then(res => { this.unitOptions = res.data?.data || []; }).finally(() => { this.unitLoading = false; }); },
+    feeTypeKey(row) { const option = this.feeCategories.find(item => String(item.dictKey) === String(row.feeType) || String(item.dictValue) === String(row.feeType)); return option?.dictKey || row.feeType || ''; },
+    feeItemOptions(row) { return this.feeItems[this.feeTypeKey(row)] || []; },
+    loadRuleItems() { (this.draft.rules || []).forEach(row => this.loadFeeItems(row.feeType)); },
+    loadFeeItems(value) { const key = this.feeTypeKey({ feeType: value }); if (!key || this.feeItems[key]) return; this.feeItemLoadingMap[key] = true; getFeeItemList(1, 9999, { feeCategory: key }).then(res => { const data = res?.data?.data || res?.data || {}; this.feeItems[key] = Array.isArray(data) ? data : (data.records || []); }).finally(() => { this.feeItemLoadingMap[key] = false; }); },
+    handleFeeTypeChange(row, value) { row.feeType = this.feeTypeKey({ feeType: value }); row.feeItem = ''; this.loadFeeItems(row.feeType); },
+    billingTypes(row) { return this.typeMap[row.billingElement] || []; },
+    handleElementChange(row) { if (!this.billingTypes(row).includes(row.billingType)) row.billingType = ''; if (!this.canEditMinimum(row)) row.minimumBillingWeight = ''; this.handleTypeChange(row); },
+    handleTypeChange(row) { if (!this.canEditLimit(row)) { row.limitRanges = [{ lowerLimit: '', upperLimit: '', unitPrice: '' }]; row.lowerLimit = ''; row.upperLimit = ''; } else { row.limitRanges = this.normalizeRanges(row); this.syncLegacyLimit(row); } },
+    canEditLimit(row) { return !this.readonly && Boolean(row.billingElement) && Boolean(row.billingType) && (row.billingType.includes('区间') || row.billingType.includes('阶梯')); },
+    usesRangeUnitPrice(row) { return ['区间单价', '阶梯单价'].includes(row.billingType); },
+    canEditMinimum(row) { return !this.readonly && ['按重量', '按吨·公里'].includes(row.billingElement); },
+    getRanges(row) { return Array.isArray(row.limitRanges) && row.limitRanges.length ? row.limitRanges : [{ lowerLimit: '', upperLimit: '', unitPrice: '' }]; },
+    addRange(row, index) { row.limitRanges = this.getRanges(row); row.limitRanges.splice(index + 1, 0, { lowerLimit: '', upperLimit: '', unitPrice: '' }); },
+    removeRange(row, index) { row.limitRanges = this.getRanges(row); row.limitRanges.splice(index, 1); if (!row.limitRanges.length) row.limitRanges.push({ lowerLimit: '', upperLimit: '', unitPrice: '' }); this.syncLegacyLimit(row); },
+    limitInput(row, index, prop, value) { row.limitRanges = this.getRanges(row); const text = String(value || '').replace(/[^\d.]/g, ''); const parts = text.split('.'); row.limitRanges[index][prop] = parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0]; this.syncLegacyLimit(row); },
+    decimalInput(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]; },
+    rangeUnitPriceInput(row, index, value) { row.limitRanges = this.getRanges(row); const target = { value }; this.decimalInput(target, 'value', value); row.limitRanges[index].unitPrice = target.value; if (index === 0) row.unitPrice = target.value; },
+    addRule() { this.draft.rules.push(defaultRule()); },
+    copyRule(row) { const next = clone(row); this.draft.rules.push(this.normalizeRule(next)); this.loadFeeItems(next.feeType); },
+    removeRule(index) { this.draft.rules.splice(index, 1); if (!this.draft.rules.length) this.addRule(); },
+    validateRules() { const groups = {}; const feeItemSet = new Set(); const required = [['feeType', '费用类型'], ['feeItem', '费用项'], ['billingElement', '计费要素'], ['billingType', '计费类型'], ['billingUnit', '计费单位']]; for (const [i, row] of this.draft.rules.entries()) { const empty = required.find(([key]) => row[key] === undefined || row[key] === null || String(row[key]).trim() === ''); if (empty) { this.$message.warning(`第${i + 1}行${empty[1]}不能为空`); return false; } const feeItem = String(row.feeItem).trim(); if (feeItemSet.has(feeItem)) { this.$message.warning(`费用项“${feeItem}”不能重复`); return false; } feeItemSet.add(feeItem); if (!this.usesRangeUnitPrice(row) && (row.unitPrice === undefined || row.unitPrice === null || String(row.unitPrice).trim() === '')) { this.$message.warning(`第${i + 1}行单价不能为空`); return false; } if (!this.billingTypes(row).includes(row.billingType)) { this.$message.warning('请选择计费要素对应的计费类型'); return false; } if (!this.canEditLimit(row)) continue; const key = row.billingElement; groups[key] = groups[key] || []; for (const range of this.getRanges(row)) { const lower = Number(range.lowerLimit); const upper = Number(range.upperLimit); if (range.lowerLimit === '' || range.upperLimit === '' || Number.isNaN(lower) || Number.isNaN(upper)) { this.$message.warning('请完整填写计费要素上下限'); return false; } if (this.usesRangeUnitPrice(row) && (range.unitPrice === undefined || range.unitPrice === null || String(range.unitPrice).trim() === '')) { this.$message.warning('请为每组计费要素区间填写单价'); return false; } if (lower > upper) { this.$message.warning('计费要素下限不能大于上限'); return false; } groups[key].push({ lower, upper }); } } return this.validateRangeGroups(groups); },
+    validateRangeGroups(groups) { const precision = 0.000001; for (const [element, ranges] of Object.entries(groups)) { const sorted = [...ranges].sort((a, b) => a.lower - b.lower || a.upper - b.upper); for (let i = 1; i < sorted.length; i += 1) { if (sorted[i].lower < sorted[i - 1].upper - precision) { this.$message.warning(`${element}的计费要素区间不能重叠`); return false; } if (sorted[i].lower > sorted[i - 1].upper + precision) { this.$message.warning(`${element}的计费要素区间必须连续，不能存在间隙`); return false; } } } return true; },
+    save() { this.$refs.formRef.validate(valid => { if (!valid || !this.validateRules()) return; const plan = clone(this.draft); plan.rules = plan.rules.map(rule => { const ranges = this.canEditLimit(rule) ? this.getRanges(rule) : []; return { ...rule, unitPrice: this.usesRangeUnitPrice(rule) ? ranges[0]?.unitPrice || '' : rule.unitPrice, limitRanges: ranges, lowerLimit: ranges[0]?.lowerLimit || '', upperLimit: ranges[0]?.upperLimit || '', minimumBillingWeight: this.canEditMinimum(rule) ? rule.minimumBillingWeight : '' }; }); this.$emit('save', plan, this.index); this.visible = false; }); },
+    openMatch(row, index) { this.matchIndex = index; this.matchForm = { ...defaultRule().matchCondition, ...(row.matchCondition || {}) }; this.matchVisible = true; this.ensureRegions(); this.ensureCargo().then(() => { const path = this.resolveCargoPath(this.matchForm); if (path.length) this.matchCargoChange(path); }); },
+    ensureRegions() { if (this.regionOptions.length) return Promise.resolve(this.regionOptions); if (this.regionRequest) return this.regionRequest; this.regionLoading = true; this.regionRequest = getRegionLazyTree().then(res => { const raw = res.data?.data || []; this.regionOptions = this.normalizeRegionTree(raw); return this.regionOptions; }).finally(() => { this.regionLoading = false; this.regionRequest = null; }); return this.regionRequest; },
+    normalizeRegionTree(list) { const map = new Map(); const flat = []; const walk = items => (items || []).forEach(item => { flat.push({ ...item, children: undefined }); if (item.children?.length) walk(item.children); }); walk(list); flat.forEach(item => map.set(String(item.id ?? item.code ?? item.value), { ...item, id: String(item.id ?? item.code ?? item.value), parentId: String(item.parentId ?? item.parentCode ?? ''), children: [] })); const roots = []; map.forEach(node => { const parent = map.get(node.parentId); if (parent && parent !== node) parent.children.push(node); else roots.push(node); }); const china = roots.find(item => ['中国', '中华人民共和国'].includes(item.title || item.name)); const source = china?.children?.length ? china.children : roots; const normalize = (node, level) => ({ ...node, title: node.title || node.name || '', leaf: level === 2, children: level === 1 ? (node.children || []).map(child => normalize(child, 2)) : undefined }); return source.map(node => normalize(node, 1)); },
+    regionLabels(path) { let options = this.regionOptions; const labels = []; (path || []).forEach(value => { const option = options.find(item => String(item.id) === String(value)); if (option) { labels.push(option.title || option.name || ''); options = option.children || []; } }); return labels; },
+    matchRegionChange(prop, value) { const path = Array.isArray(value) && value.length >= 2 ? value.slice(0, 2) : []; this.matchForm[`${prop}Path`] = path; const labels = this.regionLabels(path); this.matchForm[prop] = labels.join(''); this.matchForm[`${prop}Code`] = path.length ? String(path[path.length - 1]) : ''; },
+    ensureCargo() { if (this.cargoOptions.length) return Promise.resolve(this.cargoOptions); if (this.cargoRequest) return this.cargoRequest; this.cargoLoading = true; this.cargoRequest = getCargoTypeList(1, 9999).then(res => { const data = res?.data?.data || res?.data || {}; const records = Array.isArray(data) ? data : (data.records || []); this.cargoOptions = this.buildCargoTree(records); this.cargoFlatOptions = this.flatten(this.cargoOptions); return this.cargoOptions; }).finally(() => { this.cargoLoading = false; this.cargoRequest = null; }); return this.cargoRequest; },
+    buildCargoTree(records) { const flat = []; const walk = items => (items || []).forEach(item => { flat.push(item); if (item.children?.length) walk(item.children); }); walk(records); const map = new Map(); flat.forEach(item => { const id = String(item.id ?? item.cargoCode ?? item.code); map.set(id, { ...item, id, cargoName: item.cargoName || item.name || item.typeName || '', parentId: String(item.parentId ?? item.parentCode ?? ''), children: [] }); }); const roots = []; map.forEach(node => { const parent = map.get(node.parentId); if (parent && parent !== node && Number(node.typeLevel) !== 1) parent.children.push(node); else roots.push(node); }); const normalize = (node, level, parent = []) => { const path = [...parent, node.id]; const children = level === 1 ? node.children.map(item => normalize(item, 2, path)) : []; return { ...node, path, leaf: level === 2, children: children.length ? children : undefined }; }; return roots.map(node => normalize(node, 1)); },
+    flatten(list) { const result = []; const walk = items => (items || []).forEach(item => { result.push(item); if (item.children?.length) walk(item.children); }); walk(list); return result; },
+    filterCargo(node, keyword) { const text = String(keyword || '').trim(); return !text || String(node.label || node.text || node.cargoName || '').includes(text); },
+    cargoLabels(path) { let options = this.cargoOptions; const labels = []; (path || []).forEach(value => { const option = options.find(item => String(item.id) === String(value)); if (option) { labels.push(option.cargoName || ''); options = option.children || []; } }); return labels; },
+    matchCargoChange(value) { const path = Array.isArray(value) && value.length >= 2 ? value.slice(0, 2).map(item => String(item)) : []; const item = this.cargoFlatOptions.find(option => String(option.id) === String(path[1]) && option.path?.length >= 2); this.matchForm.cargoTypePath = path; this.matchForm.cargoType = item ? this.cargoLabels(path).join('/') : ''; this.matchForm.cargoTypeCode = item ? item.cargoCode || item.code || item.id : ''; },
+    resolveCargoPath(condition) { if (Array.isArray(condition.cargoTypePath) && condition.cargoTypePath.length >= 2) return condition.cargoTypePath; const item = this.cargoFlatOptions.find(option => option.path?.length >= 2 && (String(option.cargoCode || option.code || option.id) === String(condition.cargoTypeCode) || option.cargoName === condition.cargoType)); return item?.path || []; },
+    saveMatch() { const row = this.draft.rules[this.matchIndex]; if (row) { this.matchRegionChange('origin', this.matchForm.originPath); this.matchRegionChange('destination', this.matchForm.destinationPath); this.matchCargoChange(this.matchForm.cargoTypePath); row.matchCondition = clone(this.matchForm); } this.matchVisible = false; },
+  },
+};
+</script>
+<style scoped>.rule-head { margin: 12px 0; }.limit-list { display: flex; flex-direction: column; gap: 8px; }.limit-row { display: flex; align-items: center; gap: 8px; }.limit-row .el-input { flex: 1; }</style>
@@ -144,7 +144,7 @@ export default {
 .segment-detail__header-right { display: flex; align-items: center; gap: 12px; }
 .segment-index { display: inline-flex; width: 36px; height: 36px; align-items: center; justify-content: center; border-radius: 50%; background: #2088ee; color: #fff; font-size: 20px; font-weight: 500; }
 .segment-execution { padding-top: 12px; }
-.segment-stats { display: flex; gap: 72px; padding: 4px 0 24px; div { display: flex; flex-direction: column; gap: 8px; } span { color: #8a9bb8; font-size: 14px; } strong { color: #1f2d3d; font-size: 32px; line-height: 1; } small { margin-left: 6px; color: #8a9bb8; font-size: 16px; font-weight: 400; } .dispatched { color: #16a34a; } .remaining { color: #f59e0b; } }
+.segment-stats { display: flex; gap: 72px; padding: 4px 0 24px; div { display: flex; flex-direction: column; gap: 8px; } span { color: #8a9bb8; font-size: 14px; } strong { color: #1f2d3d; font-size: 32px; line-height: 1; } small { margin-left: 6px; color: #8a9bb8; font-size: 16px; font-weight: 400; } .dispatched { color: #409eff; } .remaining { color: #f56c6c; } }
 .waybill-table { :deep(th.el-table__cell) { background: #f5f7fa; color: #60738f; } }
 .transport-plan-detail { margin-top: 20px; h4 { margin: 0 0 12px; padding-left: 12px; border-left: 4px solid #409eff; font-size: 15px; } }
 .master-goods-card { margin-bottom: 8px; border: 1px solid #eff1f7; background: #fff; }
@@ -12,8 +12,8 @@
          <div><dt>客户</dt><dd>{{ master.customerName || '-' }}</dd></div>
          <div><dt>合同编号</dt><dd>{{ master.contractNo || '-' }}</dd></div>
          <div><dt>项目</dt><dd>{{ master.projectName || '-' }}</dd></div>
-          <div><dt>货物名称</dt><dd>{{ goodsNames }}</dd></div>
-          <div><dt>货物类型</dt><dd>{{ goodsTypes }}</dd></div>
+          <div><dt>货物名称</dt><dd class="overview-meta__plain-value">{{ goodsNames }}</dd></div>
+          <div><dt>货物类型</dt><dd class="overview-meta__plain-value">{{ goodsTypes }}</dd></div>
          <div><dt>运输周期</dt><dd>{{ dateRange }}</dd></div>
        </dl>
        <div class="route-overview">
@@ -39,7 +39,19 @@
    <section v-for="(route, index) in routes" :key="route.segmentNo" class="dispatch-section" :data-segment="route.segmentNo">
      <header class="segment-header">
        <div>
-          <el-checkbox v-model="route.selected" :label="`${route.segmentNo}：${route.departureName} → ${route.arrivalName}`" />
+          <el-checkbox v-model="route.selected">
+            <span class="segment-checkbox-label">
+              <span>{{ route.segmentNo }}：</span>
+              <el-tooltip
+                :content="`${route.departureName || '-'} → ${route.arrivalName || '-'}`"
+                placement="top"
+              >
+                <span class="segment-checkbox-path"
+                  >{{ route.departureName || '-' }} → {{ route.arrivalName || '-' }}</span
+                >
+              </el-tooltip>
+            </span>
+          </el-checkbox>
        </div>
        <div>总量 {{ formatQuantity(totalQuantity) }}，已调度 <em>{{ formatQuantity(dispatchedQuantity(route)) }}</em>，剩余 <em>{{ formatQuantity(remaining(route)) }}</em></div>
      </header>
@@ -49,13 +61,6 @@
            <el-col :span="8">
              <el-form-item label="运输方式" required class="transport-type-field"><el-input :model-value="route.transportType" readonly /></el-form-item>
            </el-col>
-            <el-col v-if="isRoad(route)" :span="8">
-              <el-form-item label="单据类型" required>
-                <el-radio-group v-model="route.documentType">
-                  <el-radio value="计划单">计划单</el-radio><el-radio value="运单">运单</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
          </el-row>
          <el-row :gutter="16">
            <el-col :span="12">
@@ -78,8 +83,8 @@
        <div class="goods-heading"><h3>货物信息</h3><div><el-link type="primary" @click="addGoods(route)">新增货物</el-link></div></div>
        <el-table :data="route.goods" border class="goods-table">
          <el-table-column type="index" label="序号" width="64" />
-          <el-table-column label="货物类型" min-width="180"><template #default="{ row }"><el-cascader v-model="row.cargoTypePath" :options="cargoTypeOptions" :props="cargoTypeCascaderProps" placeholder="请选择货物类型" clearable filterable @change="value => handleCargoTypeChange(route, row, value)" /></template></el-table-column>
-          <el-table-column label="货物名称" min-width="180"><template #default="{ row }"><el-select v-model="row.sourceIndex" placeholder="请选择总单货物" @change="selectGoods(route, row)"><el-option v-for="item in masterGoodsByCargoType(row)" :key="item.sourceIndex" :label="item.cargoName" :value="item.sourceIndex" /></el-select></template></el-table-column>
+          <el-table-column label="货物类型" min-width="180"><template #default="{ row }"><el-cascader v-model="row.cargoTypePath" class="goods-table__cargo-type" :options="cargoTypeOptions" :props="cargoTypeCascaderProps" placeholder="请选择货物类型" clearable filterable @change="value => handleCargoTypeChange(route, row, value)" /></template></el-table-column>
+          <el-table-column label="货物名称" min-width="180"><template #default="{ row }"><el-select v-model="row.sourceIndex" class="goods-table__cargo-name" placeholder="请选择总单货物" @change="selectGoods(route, row)"><el-option v-for="item in masterGoodsByCargoType(row)" :key="item.sourceIndex" :label="item.cargoName" :value="item.sourceIndex" /></el-select></template></el-table-column>
          <el-table-column prop="remainingQuantity" column-key="remainingQuantity" label="剩余数量" width="150" class-name="goods-table__remaining"><template #default="{ row }">{{ formatQuantity(goodsRemainingQuantity(route, row)) }}</template></el-table-column>
          <el-table-column prop="dispatchQuantity" column-key="dispatchQuantity" label="本次数量" width="200" class-name="goods-table__dispatch"><template #default="{ row }"><el-input :model-value="row.dispatchQuantity" inputmode="decimal" placeholder="请输入" @input="value => handleDispatchQuantityInput(route, row, value)" /></template></el-table-column>
          <el-table-column prop="quantityUnit" label="数量单位" width="110" />
@@ -95,14 +100,14 @@
        <el-form :model="route" label-position="right" label-width="auto" class="dispatch-form freight-form">
          <el-row v-for="(item, index) in route.freightItems" :key="item.sourceIndex" :gutter="16">
            <el-col :span="6">
-              <el-form-item :label="`单价${index + 1}`" required>
+              <el-form-item :label="`单价${index + 1}`">
                <el-input :model-value="item.unitPrice" inputmode="decimal" placeholder="请输入" @input="value => handleFreightUnitPriceInput(item, value)">
                  <template #append><el-select v-model="item.priceUnit" class="freight-unit-select"><el-option label="元/吨" value="元/吨" /><el-option label="元/件" value="元/件" /><el-option label="元/方" value="元/方" /></el-select></template>
                </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">
-              <el-form-item :label="`数量${index + 1}`" required>
+              <el-form-item :label="`数量${index + 1}`">
                <el-input :model-value="formatQuantity(item.quantity)" readonly>
                  <template #append><el-select v-model="item.quantityUnit" class="freight-unit-select" @change="value => handleFreightQuantityUnitChange(route, item, value)"><el-option v-for="unit in quantityUnitOptions" :key="unit" :label="unit" :value="unit" /></el-select></template>
                </el-input>
@@ -142,7 +147,7 @@
                <el-col :span="6"><el-form-item label="箱号" required><el-input v-model="route.containerNo" placeholder="请输入" /></el-form-item></el-col>
                <el-col :span="6"><el-form-item label="舱位" required><el-input v-model="route.cabinNo" placeholder="请输入" /></el-form-item></el-col>
              </template>
-              <el-col :span="6"><el-form-item label="里程(km)" required><el-input :model-value="route.mileage" inputmode="numeric" maxlength="10" placeholder="请输入" @input="value => handleMileageInput(route, value)" /></el-form-item></el-col>
+              <el-col :span="6"><el-form-item label="里程(km)"><el-input :model-value="route.mileage" inputmode="numeric" maxlength="10" placeholder="请输入" @input="value => handleMileageInput(route, value)" /></el-form-item></el-col>
              <el-col :span="6"><el-form-item label="备注"><el-input v-model="route.remark" maxlength="200" show-word-limit placeholder="请输入" /></el-form-item></el-col>
            </el-row>
          </el-form>
@@ -433,9 +438,7 @@ export default {
    validateFreightItems(route) {
      for (const [index, item] of (route.freightItems || []).entries()) {
        const fields = [
-          ['unitPrice', '单价'],
          ['priceUnit', '单价单位'],
-          ['quantity', '数量'],
          ['quantityUnit', '数量单位'],
        ];
        const emptyField = fields.find(
@@ -590,10 +593,10 @@ export default {
      if (!this.validateRoutePhones(route)) return;
      if (route.documentType === '运单') {
        if (this.isRoad(route)) {
-          if (route.carrierType === '承运商' && (!route.carrierName || !route.vehicleNo || !route.mileage)) return this.$message.warning('请填写承运商、车牌号和里程');
-          if (route.carrierType !== '承运商' && (!route.driverName || !route.driverPhone || !route.vehicleNo || !route.trailerVehicleNo || !route.escortName || !route.escortPhone || route.mileage === undefined || route.mileage === null || route.mileage === '')) return this.$message.warning('请补全自运或网货平台的车辆与人员信息');
-        } else if (!route.vehicleNo || !route.captainName || !route.driverPhone || !route.containerNo || !route.cabinNo || route.mileage === undefined || route.mileage === null || route.mileage === '' || (route.carrierType === '承运商' && !route.carrierName)) {
-          return this.$message.warning('请补全非公路运输的承运信息和里程');
+          if (route.carrierType === '承运商' && (!route.carrierName || !route.vehicleNo)) return this.$message.warning('请填写承运商和车牌号');
+          if (route.carrierType !== '承运商' && (!route.driverName || !route.driverPhone || !route.vehicleNo || !route.trailerVehicleNo || !route.escortName || !route.escortPhone)) return this.$message.warning('请补全自运或网货平台的车辆与人员信息');
+        } else if (!route.vehicleNo || !route.captainName || !route.driverPhone || !route.containerNo || !route.cabinNo || (route.carrierType === '承运商' && !route.carrierName)) {
+          return this.$message.warning('请补全非公路运输的承运信息');
        }
      }
      const batchNo = `${route.segmentNo}-${Date.now()}`;
@@ -666,9 +669,13 @@ export default {
 .pending-list-spacer { height: min(436px, calc(100vh - 130px)); }
 .master-overview, .dispatch-section { margin-bottom: 8px; border: 1px solid #eff1f7; background: #fff; }
 .overview-heading, .segment-header, .pending-bar { display: flex; align-items: center; justify-content: space-between; }
+.segment-header :deep(.el-checkbox.is-checked .el-checkbox__label) { font-size: 16px; font-weight: 700; }
+.segment-checkbox-label { display: inline-flex; align-items: center; min-width: 0; }
+.segment-checkbox-path { display: inline-block; white-space: nowrap; }
 .overview-heading { padding: 18px 24px 12px; h2 { display: inline-block; margin: 0 16px 0 0; font-size: 20px; } h2 span { margin: 0 8px; color: #909399; font-weight: 400; } }
 .overview-content { display: grid; grid-template-columns: minmax(400px, .9fr) minmax(620px, 1.6fr); gap: 28px; padding: 8px 24px 20px; }
 .overview-meta { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 18px 24px; margin: 0; dt { margin-bottom: 6px; color: #909399; font-size: 13px; } dd { margin: 0; color: #409eff; font-size: 14px; word-break: break-all; } }
+.overview-meta dd.overview-meta__plain-value { color: #303133; }
 .route-overview { display: flex; align-items: flex-start; justify-content: flex-end; padding-top: 8px; overflow-x: auto; }
 .route-overview__node { display: grid; flex: 0 0 130px; justify-items: center; gap: 6px; text-align: center; strong { font-size: 16px; white-space: nowrap; } small { color: #606266; white-space: nowrap; } }
 .route-badge { display: inline-flex; width: 32px; height: 32px; align-items: center; justify-content: center; border-radius: 4px; background: #67c23a; color: #fff; font-weight: 600; &.start { background: #409eff; } &.end { background: #e6a23c; } }
@@ -679,7 +686,7 @@ export default {
 .transport-type-field :deep(.el-input) { width: 240px; }
 .goods-heading { display: flex; align-items: center; justify-content: space-between; margin: 0 -24px 12px; padding: 14px 24px; border-top: 1px solid #eff1f7; border-bottom: 1px solid #eff1f7; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } span { color: #909399; font-size: 13px; } }
 .freight-heading { margin: 16px 0 12px; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } }
-.goods-table { :deep(th.el-table__cell), :deep(td.el-table__cell) { border-color: #eff1f7; } :deep(.el-table__row--striped td.el-table__cell) { background: #fafafa; } :deep(.goods-table__remaining .cell) { white-space: nowrap; } :deep(.goods-table__dispatch .el-input) { width: 100%; min-width: 0; } }
+.goods-table { :deep(th.el-table__cell), :deep(td.el-table__cell) { border-color: #eff1f7; } :deep(.el-table__row--striped td.el-table__cell) { background: #fafafa; } :deep(.goods-table__remaining .cell) { white-space: nowrap; } :deep(.goods-table__dispatch .el-input) { width: 100%; min-width: 0; } :deep(.goods-table__cargo-type .el-input__inner), :deep(.goods-table__cargo-name .el-select__selected-item) { color: #303133; } }
 .freight-form { :deep(.freight-unit-select) { width: 92px; } }
 .carrier-type-form { margin-top: 16px; }
 .carrier-form { padding-top: 8px; }
@@ -63,7 +63,7 @@
                <div class="route-node-form">
                  <el-form-item label="发货地址" required class="route-address-form-item"
                    ><div class="route-address-inputs"
-                      ><el-input v-model="form.departureName" class="route-address-name" readonly placeholder="发货地址" @click="openAddressMap('departure')" /><el-input v-model="form.departureAddress" class="route-address-detail" readonly placeholder="请输入详细地址" @click="openAddressMap('departure')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="List" @click="openCommonAddress('departure')" /></el-tooltip></div
+                      ><el-cascader v-model="addressRegionPaths.departure" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange('departure', value)" /><el-input v-model="form.departureAddress" class="route-address-detail" readonly placeholder="请输入详细地址" @click="openAddressMap('departure')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="List" @click="openCommonAddress('departure')" /></el-tooltip></div
                  ></el-form-item>
                  <el-form-item label="联系人"
                    ><el-input v-model="form.departureContact" placeholder="请输入"
@@ -74,9 +74,9 @@
                  <el-form-item label="计划开始日期"
                    ><el-date-picker
                      v-model="form.planStartTime"
-                      type="datetime"
-                      format="YYYY-MM-DD HH:mm"
-                      value-format="YYYY-MM-DD HH:mm:ss"
+                      type="date"
+                      format="YYYY-MM-DD"
+                      value-format="YYYY-MM-DD"
                      placeholder="请选择"
                  /></el-form-item>
                </div>
@@ -84,12 +84,12 @@
            </el-step>
            <el-step v-for="(route, index) in form.routes" :key="index">
              <template #icon><span class="route-step-icon route-step-icon--middle">经</span></template>
-              <template #title><div class="route-step-title"><span class="route-segment-label">段{{ index + 1 }}</span><span class="route-title-path">{{ getRouteTitle(index).replace(`段${index + 1}：`, '') }}</span><div class="route-transport-control"><span>运输方式</span><el-select v-model="route.transportType" placeholder="请选择"><el-option v-for="type in transports" :key="type" :label="type" :value="type" /></el-select></div></div></template>
+              <template #title><div class="route-step-title"><span class="route-segment-label">段{{ index + 1 }}</span><el-tooltip :content="getRouteTitle(index).replace(`段${index + 1}：`, '')" placement="top"><span class="route-title-path">{{ formatRouteTitle(getRouteTitle(index), index + 1) }}</span></el-tooltip><div class="route-transport-control"><span>运输方式</span><el-select v-model="route.transportType" placeholder="请选择"><el-option v-for="type in transports" :key="type" :label="type" :value="type" /></el-select></div></div></template>
              <template #description>
                <div class="route-node-form">
                  <el-form-item label="途经地" required class="route-address-form-item"
                    ><div class="route-address-inputs"
-                      ><el-input v-model="route.departureName" class="route-address-name" readonly :disabled="!route.transportType" placeholder="请先选择运输方式" @click="openAddressMap(`route-${index}`)" /><el-input v-model="route.departureAddress" class="route-address-detail" readonly :disabled="!route.transportType" placeholder="请先选择运输方式" @click="openAddressMap(`route-${index}`)" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="List" :disabled="!route.transportType" @click="openCommonAddress(`route-${index}`)" /></el-tooltip></div
+                      ><el-cascader v-model="addressRegionPaths[`route-${index}`]" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="!route.transportType" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange(`route-${index}`, value)" /><el-input v-model="route.departureAddress" class="route-address-detail" readonly :disabled="!route.transportType || !isRoadTransportType(route.transportType)" placeholder="请先选择运输方式" @click="openAddressMap(`route-${index}`)" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="List" :disabled="!route.transportType" @click="openCommonAddress(`route-${index}`)" /></el-tooltip></div
                  ></el-form-item>
                  <el-form-item label="联系人"><el-input v-model="route.departureContact" placeholder="请输入" /></el-form-item>
                  <el-form-item label="联系方式"><div class="route-contact-actions"><el-input v-model="route.departurePhone" placeholder="请输入" /><el-tooltip v-if="index === form.routes.length - 1" content="新增途经点" placement="top"><el-button class="route-action-button" type="primary" link @click="addRoute"><el-icon><CirclePlus /></el-icon></el-button></el-tooltip><el-tooltip content="删除途经点" placement="top"><el-button class="route-action-button" type="danger" link @click="removeRoute(index)"><el-icon><Remove /></el-icon></el-button></el-tooltip></div></el-form-item>
@@ -98,12 +98,12 @@
            </el-step>
            <el-step>
              <template #icon><span class="route-step-icon route-step-icon--end">终</span></template>
-              <template #title><div class="route-step-title"><span class="route-segment-label">段{{ form.routes.length + 1 }}</span><span class="route-title-path">{{ getFinalRouteTitle().replace(`段${form.routes.length + 1}：`, '') }}</span><div class="route-transport-control"><span>运输方式</span><el-select v-model="form.finalTransportType" placeholder="请选择"><el-option v-for="type in transports" :key="type" :label="type" :value="type" /></el-select></div></div></template>
+              <template #title><div class="route-step-title"><span class="route-segment-label">段{{ form.routes.length + 1 }}</span><el-tooltip :content="getFinalRouteTitle().replace(`段${form.routes.length + 1}：`, '')" placement="top"><span class="route-title-path">{{ formatRouteTitle(getFinalRouteTitle(), form.routes.length + 1) }}</span></el-tooltip><div class="route-transport-control"><span>运输方式</span><el-select v-model="form.finalTransportType" placeholder="请选择"><el-option v-for="type in transports" :key="type" :label="type" :value="type" /></el-select></div></div></template>
              <template #description>
                <div class="route-node-form">
                  <el-form-item label="收货地址" required class="route-address-form-item"
                    ><div class="route-address-inputs"
-                      ><el-input v-model="form.arrivalName" class="route-address-name" readonly :disabled="!form.finalTransportType" placeholder="请先选择运输方式" @click="openAddressMap('arrival')" /><el-input v-model="form.arrivalAddress" class="route-address-detail" readonly :disabled="!form.finalTransportType" placeholder="请先选择运输方式" @click="openAddressMap('arrival')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="List" :disabled="!form.finalTransportType" @click="openCommonAddress('arrival')" /></el-tooltip></div
+                      ><el-cascader v-model="addressRegionPaths.arrival" class="route-address-name" :options="regionOptions" :props="regionCascaderProps" :loading="regionLoading" :disabled="!form.finalTransportType" placeholder="请选择省市区" clearable filterable @visible-change="visible => visible && loadRegionOptions()" @change="value => handleAddressRegionChange('arrival', value)" /><el-input v-model="form.arrivalAddress" class="route-address-detail" readonly :disabled="!form.finalTransportType || !isRoadTransportType(form.finalTransportType)" placeholder="请选择省市区" @click="openAddressMap('arrival')" /><el-tooltip content="选择常用地址" placement="top"><el-button class="address-picker-button" type="primary" link :icon="List" :disabled="!form.finalTransportType" @click="openCommonAddress('arrival')" /></el-tooltip></div
                  ></el-form-item>
                  <el-form-item label="联系人"
                    ><el-input v-model="form.arrivalContact" placeholder="请输入" /></el-form-item>
@@ -112,9 +112,9 @@
                  <el-form-item label="计划结束日期"
                    ><el-date-picker
                      v-model="form.planEndTime"
-                      type="datetime"
-                      format="YYYY-MM-DD HH:mm"
-                      value-format="YYYY-MM-DD HH:mm:ss"
+                      type="date"
+                      format="YYYY-MM-DD"
+                      value-format="YYYY-MM-DD"
                      placeholder="请选择"
                  /></el-form-item>
                </div>
@@ -299,6 +299,31 @@
      width="1100px"
      @opened="loadAddressList"
    >
+      <div class="route-dialog__search common-address-dialog__search">
+        <el-form :model="addressQuery" label-position="right" label-width="auto">
+          <el-row :gutter="16">
+            <el-col :span="6">
+              <el-form-item label="地址名称">
+                <el-input v-model="addressQuery.addressName" clearable placeholder="请输入" @keyup.enter="searchAddressList" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="详细地址">
+                <el-input v-model="addressQuery.detailAddress" clearable placeholder="请输入" @keyup.enter="searchAddressList" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="行政区划">
+                <el-input v-model="addressQuery.regionName" clearable placeholder="请输入" @keyup.enter="searchAddressList" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" class="route-dialog__search-actions">
+              <el-button type="primary" @click="searchAddressList">查询</el-button>
+              <el-button @click="resetAddressList">重置</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
      <el-table v-loading="addressLoading" :data="addressRows" border height="360">
        <el-table-column type="index" label="序号" width="70" />
        <el-table-column prop="addressName" label="地址名称" min-width="150" />
@@ -386,10 +411,22 @@
      <div class="address-pagination"><el-pagination v-model:current-page="stationPage.current" v-model:page-size="stationPage.size" :page-sizes="[10, 20, 50]" layout="total, prev, pager, next, sizes" :total="stationPage.total" @size-change="loadStationList" @current-change="loadStationList" /></div>
    </el-dialog>
    <el-dialog v-model="commonCargoVisible" title="选择常用货物" append-to-body width="1100px" @opened="loadCommonCargoList">
-      <el-table v-loading="commonCargoLoading" :data="commonCargoRows" border height="360">
+      <div class="route-dialog__search common-cargo-dialog__search">
+        <el-form :model="commonCargoQuery" label-position="right" label-width="86px">
+          <el-row :gutter="16">
+            <el-col :span="6"><el-form-item label="货物名称"><el-input v-model="commonCargoQuery.cargoName" clearable placeholder="请输入" /></el-form-item></el-col>
+            <el-col :span="6"><el-form-item label="货物类型"><el-cascader v-model="commonCargoQuery.cargoTypePath" :options="cargoTypeOptions" :props="cargoTypeCascaderProps" clearable filterable placeholder="请选择" :loading="cargoTypeLoading" @visible-change="visible => visible && loadCargoTypeOptions()" @change="handleCommonCargoTypeChange" /></el-form-item></el-col>
+            <el-col :span="6"><el-form-item label="规格型号"><el-input v-model="commonCargoQuery.specificationModel" clearable placeholder="请输入" /></el-form-item></el-col>
+            <el-col :span="6" class="route-dialog__search-actions"><el-button type="primary" @click="searchCommonCargoList">查询</el-button><el-button @click="resetCommonCargoList">重置</el-button></el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <el-table v-loading="commonCargoLoading" :data="commonCargoRows" border height="360" @selection-change="handleCommonCargoSelectionChange">
+        <el-table-column type="selection" width="55" align="center" fixed="left" />
        <el-table-column type="index" label="序号" width="70" /><el-table-column prop="cargoName" label="货物名称" min-width="150" /><el-table-column prop="cargoCode" label="货物编号" min-width="130" /><el-table-column prop="firstCargoTypeName" label="一级货物类型" min-width="150" /><el-table-column prop="secondCargoTypeName" label="二级货物类型" min-width="150" /><el-table-column prop="packageType" label="包装" min-width="100" /><el-table-column prop="brand" label="品牌" min-width="120" /><el-table-column prop="specification" label="规格" min-width="120" /><el-table-column prop="model" label="型号" min-width="120" /><el-table-column label="操作" width="100" fixed="right"><template #default="{ row }"><el-link type="primary" @click="selectCommonCargo(row)">选择</el-link></template></el-table-column>
      </el-table>
      <div class="address-pagination"><el-pagination v-model:current-page="commonCargoPage.current" v-model:page-size="commonCargoPage.size" :page-sizes="[10, 20, 50]" layout="total, prev, pager, next, sizes" :total="commonCargoPage.total" @size-change="loadCommonCargoList" @current-change="loadCommonCargoList" /></div>
+      <template #footer><el-button @click="commonCargoVisible = false">关闭</el-button><el-button type="primary" :disabled="!commonCargoSelected.length" @click="confirmCommonCargoSelection">确定</el-button></template>
    </el-dialog>
    <el-dialog v-model="cargoImportVisible" title="导入货物" append-to-body width="560px"><div class="cargo-import"><el-upload action="#" accept=".xls,.xlsx" :auto-upload="false" :show-file-list="false" :disabled="cargoImportLoading" :on-change="handleCargoImport"><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" plain @click="downloadCargoTemplate">点击下载模板</el-button></div><template #footer><el-button @click="cargoImportVisible = false">关闭</el-button></template></el-dialog>
    <el-dialog v-model="routeDialogVisible" title="选择线路" width="1280px" @opened="loadRouteList">
@@ -485,6 +522,7 @@ import { getList as getAirportMasterList } from '@/api/base/airport-master';
 import { getList as getPortTerminalList } from '@/api/base/port-terminal';
 import { getList as getRailwayStationList } from '@/api/base/railway-station';
 import { getList as getCargoTypeList } from '@/api/base/cargo-type';
+import { getLazyTree as getRegionLazyTree } from '@/api/base/region';
 import { getList as getCommonCargoList } from '@/api/business/common-cargo';
 import { exportBlob, importBlob } from '@/api/common';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
@@ -534,7 +572,12 @@ export default {
      addressLoading: false,
      addressTarget: '',
      addressRows: [],
+      addressQuery: {},
      addressPage: { current: 1, size: 10, total: 0 },
+      addressRegionPaths: { departure: [], arrival: [] },
+      regionOptions: [],
+      regionLoading: false,
+      regionRequest: null,
      stationDialogVisible: false,
      stationLoading: false,
      stationQuery: {},
@@ -552,6 +595,8 @@ export default {
      commonCargoVisible: false,
      commonCargoLoading: false,
      commonCargoRows: [],
+      commonCargoQuery: {},
+      commonCargoSelected: [],
      commonCargoPage: { current: 1, size: 10, total: 0 },
      cargoTypeLoading: false,
      cargoTypeOptions: [],
@@ -625,11 +670,19 @@ export default {
        emitPath: true,
      };
    },
+    regionCascaderProps() {
+      return {
+        value: 'id',
+        label: 'title',
+        children: 'children',
+        emitPath: true,
+      };
+    },
  },
    async mounted() {
      this.loading = true;
      try {
-      await Promise.all([this.loadProjects(), this.loadCargoTypeOptions()]);
+      await Promise.all([this.loadProjects(), this.loadCargoTypeOptions(), this.loadRegionOptions()]);
      if (this.id) {
        await this.loadDetail(this.id);
      }
@@ -641,6 +694,118 @@ export default {
    responseData(response) {
      return response?.data?.data || response?.data || response || {};
    },
+    async loadRegionOptions() {
+      if (this.regionOptions.length) return this.regionOptions;
+      if (this.regionRequest) return this.regionRequest;
+      this.regionLoading = true;
+      this.regionRequest = getRegionLazyTree()
+        .then(response => {
+          const data = response?.data?.data || response?.data || response || [];
+          this.regionOptions = this.extractChinaRegionOptions(this.buildRegionTree(data));
+          this.syncAddressRegionPaths();
+          return this.regionOptions;
+        })
+        .finally(() => {
+          this.regionLoading = false;
+          this.regionRequest = null;
+        });
+      return this.regionRequest;
+    },
+    buildRegionTree(regions = []) {
+      const flat = [];
+      const collect = list =>
+        (list || []).forEach(item => {
+          flat.push({ ...item, children: undefined });
+          if (item.children?.length) collect(item.children);
+        });
+      collect(regions);
+      const nodeMap = new Map();
+      flat.forEach(item => {
+        const id = item.id ?? item.code ?? item.value;
+        if (id === undefined || id === null) return;
+        nodeMap.set(String(id), {
+          ...item,
+          id: String(id),
+          parentId: String(item.parentId ?? item.parentCode ?? ''),
+          children: [],
+        });
+      });
+      const roots = [];
+      nodeMap.forEach(node => {
+        const parent = nodeMap.get(node.parentId);
+        if (parent && parent !== node) parent.children.push(node);
+        else roots.push(node);
+      });
+      const normalize = node => {
+        const children = node.children.map(item => normalize(item));
+        return { ...node, title: node.title || node.name || '', children: children.length ? children : undefined, leaf: !children.length };
+      };
+      return roots.map(item => normalize(item));
+    },
+    extractChinaRegionOptions(regions = []) {
+      const china = regions.find(item => ['中国', '中华人民共和国'].includes(item.title));
+      if (china?.children?.length) return china.children;
+      if (regions.length === 1 && regions[0].children?.length) return regions[0].children;
+      return regions;
+    },
+    findRegionPathByName(options = [], regionName = '', parents = []) {
+      const target = String(regionName || '').replace(/\s+/g, '');
+      if (!target) return [];
+      for (const item of options) {
+        const nextParents = [...parents, item];
+        const name = nextParents.map(region => region.title || region.name || '').join('');
+        if (name === target) return nextParents.map(region => region.id);
+        const path = this.findRegionPathByName(item.children, target, nextParents);
+        if (path.length) return path;
+      }
+      return [];
+    },
+    findRegionPathByCode(options = [], regionCode = '', parents = []) {
+      const target = String(regionCode || '').trim();
+      if (!target) return [];
+      for (const item of options) {
+        const nextParents = [...parents, item];
+        if (String(item.id) === target) return nextParents.map(region => region.id);
+        const path = this.findRegionPathByCode(item.children, target, nextParents);
+        if (path.length) return path;
+      }
+      return [];
+    },
+    regionLabels(path = []) {
+      let options = this.regionOptions;
+      const labels = [];
+      path.forEach(value => {
+        const option = options.find(item => String(item.id) === String(value));
+        if (!option) return;
+        labels.push(option.title || option.name || '');
+        options = option.children || [];
+      });
+      return labels;
+    },
+    handleAddressRegionChange(target, value) {
+      const field = this.addressModel(target);
+      const path = Array.isArray(value) ? value.map(item => String(item)) : [];
+      this.addressRegionPaths = { ...this.addressRegionPaths, [target]: path };
+      if (!field) return;
+      const labels = this.regionLabels(path);
+      field.model[field.name] = labels.join('');
+      field.model[field.regionCode] = path.at(-1) || '';
+    },
+    syncAddressRegionPath(target) {
+      const field = this.addressModel(target);
+      if (!field) return;
+      const codePath = this.findRegionPathByCode(this.regionOptions, field.model[field.regionCode]);
+      const path = codePath.length
+        ? codePath
+        : this.findRegionPathByName(this.regionOptions, field.model[field.name]);
+      this.addressRegionPaths = { ...this.addressRegionPaths, [target]: path };
+    },
+    syncAddressRegionPaths() {
+      if (!this.regionOptions.length) return;
+      ['departure', 'arrival', ...this.form.routes.map((route, index) => `route-${index}`)].forEach(target => {
+        this.syncAddressRegionPath(target);
+      });
+    },
    async loadDetail(id) {
      const res = await api.getDetail(id);
      const detail = this.responseData(res);
@@ -652,6 +817,8 @@ export default {
        finalSegment.departureName === detail.arrivalName;
      this.form = {
        ...detail,
+        planStartTime: this.normalizeDateValue(detail.planStartTime),
+        planEndTime: this.normalizeDateValue(detail.planEndTime),
        routes: hasFinalSegment ? routes.slice(0, -1) : routes.length ? routes : [this.createRoute(0)],
        finalTransportType: hasFinalSegment
          ? finalSegment.transportType
@@ -660,6 +827,7 @@ export default {
        attachmentsJson: detail.attachmentsJson || '[]',
        transportOrganizationType: '多式联运',
      };
+      this.syncAddressRegionPaths();
      this.restoreGoodsCargoTypePaths();
      this.attachmentRows = this.parseJsonArray(this.form.attachmentsJson);
      this.selectedAttachmentRows = [];
@@ -675,17 +843,54 @@ export default {
        return [];
      }
    },
+    normalizeDateValue(value) {
+      if (!value) return '';
+      if (value instanceof Date) {
+        const year = value.getFullYear();
+        const month = String(value.getMonth() + 1).padStart(2, '0');
+        const day = String(value.getDate()).padStart(2, '0');
+        return `${year}-${month}-${day}`;
+      }
+      return String(value).replace('T', ' ').slice(0, 10);
+    },
+    getRegionDisplay(target, fallback) {
+      const labels = this.regionLabels(this.addressRegionPaths[target] || []);
+      return labels.length ? labels.join('/') : fallback;
+    },
    getRouteTitle(index) {
      const departureName =
        index === 0
-          ? this.form.departureName || '发货地址'
-          : this.form.routes[index - 1].departureName || '途经地';
-      return `段${index + 1}：${departureName} - ${this.form.routes[index].departureName || '途经地'}`;
+          ? this.getRegionDisplay('departure', this.form.departureName || '发货地址')
+          : this.getRegionDisplay(
+              `route-${index - 1}`,
+              this.form.routes[index - 1].departureName || '途经地'
+            );
+      const arrivalName = this.getRegionDisplay(
+        `route-${index}`,
+        this.form.routes[index].departureName || '途经地'
+      );
+      return `段${index + 1}：${departureName} → ${arrivalName}`;
+    },
+    truncateRouteAddress(value) {
+      const text = String(value || '');
+      return text.length > 6 ? `${text.slice(0, 6)}...` : text;
+    },
+    formatRouteTitle(title, segmentNo) {
+      const fullTitle = String(title || '').replace(`段${segmentNo}：`, '');
+      const separator = ' → ';
+      const separatorIndex = fullTitle.indexOf(separator);
+      if (separatorIndex < 0) return this.truncateRouteAddress(fullTitle);
+      const departure = fullTitle.slice(0, separatorIndex);
+      const arrival = fullTitle.slice(separatorIndex + separator.length);
+      return `${this.truncateRouteAddress(departure)}${separator}${this.truncateRouteAddress(arrival)}`;
    },
    getFinalRouteTitle() {
-      return `段${this.form.routes.length + 1}：${this.lastRouteName} - ${
-        this.form.arrivalName || '收货地址'
-      }`;
+      const departureName = this.getRegionDisplay(
+        `route-${this.form.routes.length - 1}`,
+        this.lastRouteName
+      );
+      const arrivalName = this.getRegionDisplay('arrival', this.form.arrivalName || '收货地址');
+      return `段${this.form.routes.length + 1}：${departureName} → ${arrivalName}`;
    },
    responseRecords(response) {
      const data = response?.data?.data || response?.data || response;
@@ -730,6 +935,7 @@ export default {
              phone: 'departurePhone',
              longitude: 'departureLongitude',
              latitude: 'departureLatitude',
+              regionCode: 'departureRegionCode',
              siteCode: 'departureSiteCode',
            }
          : null;
@@ -743,6 +949,7 @@ export default {
        phone: `${prefix}Phone`,
        longitude: `${prefix}Longitude`,
        latitude: `${prefix}Latitude`,
+        regionCode: `${prefix}RegionCode`,
        siteCode: `${prefix}SiteCode`,
      };
    },
@@ -759,6 +966,10 @@ export default {
      if (type.includes('航空') || type.includes('空运')) return 'air';
      return 'road';
    },
+    isRoadTransportType(type) {
+      const value = String(type || '').trim().toLowerCase();
+      return value === 'road' || value.includes('公路');
+    },
    openCommonAddress(target) {
      this.addressTarget = target;
      if (this.addressTransportMode(target) !== 'road') {
@@ -767,6 +978,7 @@ export default {
        this.stationDialogVisible = true;
        return;
      }
+      this.addressQuery = {};
      this.addressPage.current = 1;
      this.addressDialogVisible = true;
    },
@@ -814,12 +1026,14 @@ export default {
      const target = this.addressModel(this.addressTarget);
      if (!target) return;
      const station = this.normalizeStation(row);
-      target.model[target.name] = station.stationName;
+      target.model[target.name] = station.regionName || station.stationName;
      target.model[target.address] = station.detailAddress;
      target.model[target.longitude] = station.longitude || '';
      target.model[target.latitude] = station.latitude || '';
+      target.model[target.regionCode] = station.regionCode || '';
      target.model[target.siteCode] = station.stationCode;
      this.stationDialogVisible = false;
+      this.syncAddressRegionPath(this.addressTarget);
    },
    async loadAddressList() {
      this.addressLoading = true;
@@ -827,7 +1041,7 @@ export default {
        const response = await getCommonAddressList(
          this.addressPage.current,
          this.addressPage.size,
-          { allDept: 0 }
+          { ...this.addressQuery, allDept: 0 }
        );
        const data = response?.data?.data || response?.data || response || {};
        this.addressRows = data.records || [];
@@ -836,18 +1050,33 @@ export default {
        this.addressLoading = false;
      }
    },
+    searchAddressList() {
+      this.addressPage.current = 1;
+      this.loadAddressList();
+    },
+    resetAddressList() {
+      this.addressQuery = {};
+      this.addressPage.current = 1;
+      this.loadAddressList();
+    },
    selectAddress(row) {
      const target = this.addressModel(this.addressTarget);
      if (!target) return;
-      target.model[target.name] = row.addressName || row.regionName || '';
+      target.model[target.name] = row.regionName || row.addressName || '';
      target.model[target.address] = row.detailAddress || row.address || '';
      target.model[target.contact] = row.contactName || target.model[target.contact] || '';
      target.model[target.phone] = row.contactPhone || target.model[target.phone] || '';
      target.model[target.longitude] = row.longitude || '';
      target.model[target.latitude] = row.latitude || '';
+      target.model[target.regionCode] = row.regionCode || '';
      this.addressDialogVisible = false;
+      this.syncAddressRegionPath(this.addressTarget);
    },
    openAddressMap(target) {
+      if ((target.startsWith('route-') || target === 'arrival') && !this.isRoadTransportType(this.addressTransportType(target))) {
+        this.$message.info('非公路运输地址不能使用地图选择');
+        return;
+      }
      const field = this.addressModel(target);
      if (!field) return;
      this.mapTarget = target;
@@ -855,6 +1084,7 @@ export default {
      this.mapSelected = {
        longitude: field.model[field.longitude] || '',
        latitude: field.model[field.latitude] || '',
+        regionCode: field.model[field.regionCode] || '',
        detailAddress: this.mapKeyword,
        regionName: field.model[field.name] || '',
      };
@@ -935,6 +1165,7 @@ export default {
        latitude,
        detailAddress: keyword || this.mapKeyword,
        regionName: '',
+        regionCode: '',
      };
      this.renderAddressMarker([longitude, latitude]);
      this.mapStatus = '已选点，可确认回填';
@@ -947,6 +1178,7 @@ export default {
            this.mapSelected.regionName = [component.province, component.city, component.district]
              .filter(Boolean)
              .join('');
+            this.mapSelected.regionCode = component.adcode || '';
            this.mapKeyword = this.mapSelected.detailAddress;
            this.mapStatus = '已解析地址，可确认回填';
          }
@@ -967,16 +1199,22 @@ export default {
      target.model[target.address] = this.mapSelected.detailAddress || this.mapKeyword;
      target.model[target.longitude] = this.mapSelected.longitude;
      target.model[target.latitude] = this.mapSelected.latitude;
+      target.model[target.regionCode] = this.mapSelected.regionCode || '';
      this.mapDialogVisible = false;
+      this.syncAddressRegionPath(this.mapTarget);
    },
    openCommonCargoDialog() {
+      this.commonCargoQuery = {};
+      this.commonCargoSelected = [];
      this.commonCargoPage.current = 1;
      this.commonCargoVisible = true;
    },
    async loadCommonCargoList() {
+      this.commonCargoSelected = [];
      this.commonCargoLoading = true;
      try {
-        const response = await getCommonCargoList(this.commonCargoPage.current, this.commonCargoPage.size, { allDept: 0 });
+        const { cargoTypePath, ...query } = this.commonCargoQuery;
+        const response = await getCommonCargoList(this.commonCargoPage.current, this.commonCargoPage.size, { ...query, allDept: 0 });
        const data = response?.data?.data || response?.data || response || {};
        this.commonCargoRows = data.records || [];
        this.commonCargoPage.total = data.total || 0;
@@ -984,6 +1222,31 @@ export default {
        this.commonCargoLoading = false;
      }
    },
+    searchCommonCargoList() {
+      this.commonCargoPage.current = 1;
+      this.loadCommonCargoList();
+    },
+    resetCommonCargoList() {
+      this.commonCargoQuery = {};
+      this.commonCargoPage.current = 1;
+      this.loadCommonCargoList();
+    },
+    handleCommonCargoTypeChange(value) {
+      const path = Array.isArray(value) ? value.map(item => String(item)) : [];
+      const firstCargoType = this.getCargoTypeByPath(path.slice(0, 1));
+      const secondCargoType = path.length > 1 ? this.getCargoTypeByPath(path) : null;
+      this.commonCargoQuery = {
+        ...this.commonCargoQuery,
+        cargoTypePath: path,
+        firstCargoTypeName: firstCargoType?.label || '',
+        firstCargoTypeCode: firstCargoType?.cargoCode || firstCargoType?.code || '',
+        secondCargoTypeName: secondCargoType?.label || '',
+        secondCargoTypeCode: secondCargoType?.cargoCode || secondCargoType?.code || '',
+      };
+    },
+    handleCommonCargoSelectionChange(rows) {
+      this.commonCargoSelected = rows || [];
+    },
    async loadCargoTypeOptions() {
      if (this.cargoTypeOptions.length || this.cargoTypeLoading) return;
      this.cargoTypeLoading = true;
@@ -1133,7 +1396,16 @@ export default {
      });
    },
    selectCommonCargo(row) {
-      const cargo = this.normalizeCargoRow(row, this.resolveCargoTypePath(row));
+      this.appendCommonCargoRows([row]);
+      this.commonCargoVisible = false;
+    },
+    confirmCommonCargoSelection() {
+      if (!this.commonCargoSelected.length) return;
+      this.appendCommonCargoRows(this.commonCargoSelected);
+      this.$message.success(`成功选择${this.commonCargoSelected.length}条常用货物`);
+      this.commonCargoVisible = false;
+    },
+    appendCommonCargoRows(rows = []) {
      const firstGoods = this.form.goods[0];
      const isFirstGoodsEmpty =
        firstGoods &&
@@ -1148,12 +1420,11 @@ export default {
          'remark',
        ].some(key => firstGoods[key]);

-      if (isFirstGoodsEmpty) {
-        this.form.goods.splice(0, 1, cargo);
-      } else {
-        this.form.goods.push(cargo);
-      }
-      this.commonCargoVisible = false;
+      rows.forEach((row, index) => {
+        const cargo = this.normalizeCargoRow(row, this.resolveCargoTypePath(row));
+        if (isFirstGoodsEmpty && index === 0) this.form.goods.splice(0, 1, cargo);
+        else this.form.goods.push(cargo);
+      });
    },
    resolveCargoTypePath(row = {}) {
      return (
@@ -1275,6 +1546,7 @@ export default {
      this.form.arrivalAddress = route.arrivalAddress || '';
      this.form.arrivalContact = route.arrivalContact || '';
      this.form.arrivalPhone = route.arrivalPhone || '';
+      this.syncAddressRegionPaths();
      this.form.finalTransportType = '公路运输';
      if (!this.form.routes.length) this.addRoute();
      this.routeDialogVisible = false;
@@ -1287,6 +1559,7 @@ export default {
    },
    removeRoute(index) {
      this.form.routes.splice(index, 1);
+      this.syncAddressRegionPaths();
    },
    addGoods(index) {
      this.form.goods.splice(index + 1, 0, { quantityUnit: quantityUnitOptions[0] });
@@ -1416,6 +1689,8 @@ export default {
      }
      const payload = {
        ...this.form,
+        planStartTime: this.normalizeDateValue(this.form.planStartTime),
+        planEndTime: this.normalizeDateValue(this.form.planEndTime),
        attachmentsJson: JSON.stringify(this.attachmentRows),
        routes: [
          ...this.form.routes.map((route, index) => ({ ...route, segmentNo: `段${index + 1}` })),
@@ -1537,6 +1812,9 @@ export default {
  padding: 12px 12px 4px;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
 }
+.common-cargo-dialog__search {
+  background: #fff;
+}
 .route-dialog__search-actions {
  display: flex;
  justify-content: flex-end;
@@ -1638,9 +1916,14 @@ export default {
    flex: 0 0 auto;
  }
  .route-title-path {
+    display: inline-block;
+    max-width: 24em;
+    overflow: hidden;
    color: #606266;
    font-size: 14px;
    font-weight: 400;
+    text-overflow: ellipsis;
+    white-space: nowrap;
  }
  .route-transport-control {
    display: flex;