🔀 合并 origin/master 到 dev

# Conflicts: # src/views/business/components/business-crud-page.vue
2026-10-19 19:06:34 +08:00
parent f7d8fbf16b 0e57de5c71
commit 1622015724
65 changed files with 3198 additions and 930 deletions
@@ -388,7 +388,7 @@
                          :disabled="dialogReadonly"
                          @visible-change="visible => visible && loadFeeUnitOptions()"
                          ><el-option
-                            v-for="unit in feeUnitOptions"
+                            v-for="unit in feeUnitSelectOptions"
                            :key="unit.value"
                            :label="unit.label"
                            :value="unit.value" /></el-select
@@ -1124,6 +1124,10 @@ import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDictionary } from '@/api/system/dictbiz';
 import { packageOptions } from '@/option/business/common';
 import { formatContractOptionLabel } from '@/utils/contract';
+import {
+  mapFeeUnitOptions,
+  resolvePriceUnitByQuantityUnit,
+} from '@/utils/currency';
 import { loadMeasurementUnitOptions } from '@/utils/measurement-unit';
 import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-search';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
@@ -1264,6 +1268,10 @@ const PageAvueForm = {
  },
 };

+const shippingTemplateListRoute = '/business/shipping-template';
+const shippingTemplateFormRoute = '/business/shipping-template/form';
+const shippingTemplateListRefreshKey = 'shipping-template-list-refresh';
+
 export default {
  name: 'ShippingTemplatePage',
  components: { PageAvueForm, ElImageViewer, OpenFileViewer },
@@ -1280,6 +1288,9 @@ export default {
    return {
      Location,
      OfficeBuilding,
+      // 实例所属路由快照，避免 keep-alive 列表实例被全局 $route 误判成表单页。
+      routePathLocked: this.$route.path,
+      isFormPageInstance: this.$route.path === shippingTemplateFormRoute,
      form: {},
      query: {},
      loading: true,
@@ -1401,13 +1412,18 @@ export default {
    isStandaloneBusinessPage() {
      return (
        this.standaloneFormPage &&
-        ['/business/shipping-template', '/business/shipping-template/form'].includes(
-          this.$route.path
-        )
+        (this.isFormPageInstance ||
+          [shippingTemplateListRoute, shippingTemplateFormRoute].includes(this.routePathLocked) ||
+          [shippingTemplateListRoute, shippingTemplateFormRoute].includes(this.$route.path))
      );
    },
    isStandaloneFormPage() {
-      return this.isStandaloneBusinessPage && ['add', 'edit'].includes(this.$route.query.mode);
+      // 用实例锁定标志，避免列表 keep-alive 实例被全局路由误判成表单页。
+      return (
+        this.standaloneFormPage &&
+        this.isFormPageInstance &&
+        ['add', 'edit'].includes(this.$route.query.mode)
+      );
    },
    formPageTitle() {
      return this.isStandaloneFormPage
@@ -1464,6 +1480,12 @@ export default {
      );
      return this.currencyUnit(option?.label || this.shippingTemplateFreight.currency);
    },
+    feeUnitSelectOptions() {
+      return mapFeeUnitOptions(
+        this.feeUnitOptions,
+        this.shippingTemplateFreight.currency || 'RMB'
+      );
+    },
    roadFreightTotal() {
      const total = this.shippingTemplateFreight.freightItems.reduce(
        (sum, item) => sum + Number(this.freightAmount(item) || 0),
@@ -1530,6 +1552,18 @@ export default {
  },
  watch: {
    $route(to, from) {
+      // 列表实例：从其他页进入列表时刷新（activated 负责标签切回）。
+      if (!this.isFormPageInstance) {
+        const enteringList =
+          (to.path === this.routePathLocked || to.path === shippingTemplateListRoute) &&
+          from?.path &&
+          from.path !== to.path;
+        if (enteringList) {
+          sessionStorage.removeItem(shippingTemplateListRefreshKey);
+          this.$nextTick(() => this.onLoad(this.page, this.query));
+        }
+        return;
+      }
      if (
        this.isStandaloneFormPage &&
        (to.query.mode !== from?.query?.mode ||
@@ -1550,6 +1584,10 @@ export default {
      this.handleTransportTypeChange(value);
      this.syncFreightItems();
    },
+    'form.templateType'() {
+      // 切换到运单模板时立即按货物数量单位生成公路运费明细。
+      this.$nextTick(() => this.syncFreightItems());
+    },
  },
  created() {
    this.loadProjectOptions();
@@ -1559,8 +1597,16 @@ export default {
    this.loadCurrencyOptions();
    if (this.isStandaloneFormPage) this.$nextTick(() => this.initStandaloneFormPage());
  },
+  activated() {
+    if (this.isFormPageInstance) return;
+    sessionStorage.removeItem(shippingTemplateListRefreshKey);
+    this.$nextTick(() => this.onLoad(this.page, this.query));
+  },
  methods: {
    formatContractOptionLabel,
+    markShippingTemplateListNeedRefresh() {
+      sessionStorage.setItem(shippingTemplateListRefreshKey, '1');
+    },
    loadQuantityUnitOptions() {
      if (this.quantityUnitLoading) return this.quantityUnitLoadPromise;
      this.quantityUnitLoading = true;
@@ -1591,12 +1637,8 @@ export default {
        });
      }
      if (this.menuWidth != null) next.menuWidth = this.menuWidth;
-      if (
-        this.standaloneFormPage &&
-        ['/business/shipping-template', '/business/shipping-template/form'].includes(
-          this.$route.path
-        )
-      ) {
+      // 仅表单页实例套用全屏表单弹窗样式，避免列表页误用后表格区域异常。
+      if (this.standaloneFormPage && this.$route.path === shippingTemplateFormRoute) {
        next.dialogAppendToBody = false;
        next.dialogModal = false;
        next.dialogCustomClass = 'shipping-template-form-page-dialog';
@@ -1776,13 +1818,22 @@ export default {
      this.onLoad(this.page, this.query);
    },
    onLoad(page, params = {}) {
+      if (this.isFormPageInstance) return;
      this.loading = true;
+      const currentPage = page?.currentPage || this.page.currentPage || 1;
+      const pageSize = page?.pageSize || this.page.pageSize || 10;
      this.api
-        .getList(page.currentPage, page.pageSize, { ...this.query, ...params })
+        .getList(currentPage, pageSize, { ...this.query, ...params })
        .then(res => {
-          const data = res?.data?.data || {};
-          this.data = extractRecords(res);
-          this.page.total = data.total || this.data.length;
+          const data = res?.data?.data || res?.data || {};
+          const records = extractRecords(res);
+          this.data = records;
+          this.page.total = Number(data.total ?? records.length) || 0;
+        })
+        .catch(error => {
+          window.console.error(error);
+          this.data = [];
+          this.page.total = 0;
        })
        .finally(() => {
          this.loading = false;
@@ -1821,9 +1872,10 @@ export default {
        .submit(submit)
        .then(() => {
          this.$message.success('操作成功');
+          this.markShippingTemplateListNeedRefresh();
          done?.();
          this.closeCrudDialog();
-          this.onLoad(this.page, this.query);
+          if (!this.isFormPageInstance) this.onLoad(this.page, this.query);
        })
        .catch(() => loading?.());
    },
@@ -1837,9 +1889,10 @@ export default {
        .submit(submit)
        .then(() => {
          this.$message.success('操作成功');
+          this.markShippingTemplateListNeedRefresh();
          done?.();
          this.closeCrudDialog();
-          this.onLoad(this.page, this.query);
+          if (!this.isFormPageInstance) this.onLoad(this.page, this.query);
        })
        .catch(() => loading?.());
    },
@@ -1883,6 +1936,8 @@ export default {
        this.attachmentRows = [];
        this.shippingTemplateFreight = defaultFreight();
        this.loadCurrencyOptions();
+        this.loadFeeUnitOptions();
+        this.$nextTick(() => this.syncFreightItems());
        if (typeof this.api.nextCode === 'function')
          this.api
            .nextCode()
@@ -2005,20 +2060,47 @@ export default {
        return false;
      }
      if (this.transportMode === 'road') {
-        const invalid = this.shippingTemplateFreight.freightItems.findIndex(
-          item =>
-            Number(item.unitPrice || 0) < 0 ||
-            !item.priceUnit ||
-            (!this.isFreightAutoCalculable(item) &&
-              (item.freightAmount === '' ||
-                item.freightAmount === null ||
-                item.freightAmount === undefined)) ||
-            Number(item.freightAmount || 0) < 0
-        );
-        if (invalid > -1) {
-          this.$message.warning(`第${invalid + 1}条货物的单价、计价单位或运费无效`);
+        if (!this.shippingTemplateFreight.freightItems.length) {
+          this.$message.warning('请先完善货物数量单位，以便生成运费明细');
          return false;
        }
+        for (const [index, item] of this.shippingTemplateFreight.freightItems.entries()) {
+          const label = `第${index + 1}条运费明细`;
+          if (
+            item.unitPrice === '' ||
+            item.unitPrice === null ||
+            item.unitPrice === undefined
+          ) {
+            this.$message.warning(`请填写${label}的单价`);
+            return false;
+          }
+          if (Number(item.unitPrice) < 0) {
+            this.$message.warning(`${label}的单价不能小于0`);
+            return false;
+          }
+          if (!String(item.priceUnit || '').trim()) {
+            this.$message.warning(`请选择${label}的计价单位`);
+            return false;
+          }
+          if (this.isFreightAutoCalculable(item)) {
+            if (!item.freightAmountManual) {
+              item.freightAmount = this.freightAmount(item);
+            }
+          } else if (
+            item.freightAmount === '' ||
+            item.freightAmount === null ||
+            item.freightAmount === undefined
+          ) {
+            this.$message.warning(
+              `${label}的计价单位与货物数量单位不匹配，无法自动计算运费，请手动填写运费`
+            );
+            return false;
+          }
+          if (Number(item.freightAmount || 0) < 0) {
+            this.$message.warning(`${label}的运费不能小于0`);
+            return false;
+          }
+        }
      } else if (Number(this.shippingTemplateFreight.freightAmount || 0) < 0) {
        this.$message.warning('运费不能小于0');
        return false;
@@ -2033,8 +2115,11 @@ export default {
      return true;
    },
    closeCrudDialog() {
-      if (this.isStandaloneBusinessPage) {
-        this.$router.push({ path: '/business/shipping-template', query: {} });
+      if (this.isStandaloneBusinessPage || this.isFormPageInstance) {
+        // 关闭独立表单页时标记列表需刷新（含直接点关闭未保存的场景）
+        this.markShippingTemplateListNeedRefresh();
+        this.$router.$avueRouter?.closeTag?.();
+        this.$router.push({ path: shippingTemplateListRoute, query: {} });
        return;
      }
      this.$refs.crud?.closeDialog?.();
@@ -2294,7 +2379,16 @@ export default {
    },
    loadFeeUnitOptions() {
      getDictionary({ code: 'unit_fee' }).then(res => {
-        this.feeUnitOptions = this.normalizeDictOptions(res?.data?.data || []);
+        // 计价单位必须保存可读文案（如 元/吨），才能与货物数量单位匹配并自动计算运费。
+        this.feeUnitOptions = (res?.data?.data || []).map(item => {
+          const label = String(item.dictValue || item.label || item.value || '').trim();
+          const key = String(item.dictKey || item.value || '').trim();
+          return {
+            label: label || key,
+            value: label.includes('/') ? label : key || label,
+            remark: item.remark || '',
+          };
+        });
      });
    },
    loadCurrencyOptions() {
@@ -3098,24 +3192,53 @@ export default {
        : [];
      const quantityUnits = [];
      this.transportCargoRows.forEach(row => {
-        const quantityUnit = row.quantityUnit || '';
+        const quantityUnit = String(row.quantityUnit || '').trim();
+        if (!quantityUnit) return;
        if (!quantityUnits.some(unit => unit === quantityUnit)) quantityUnits.push(quantityUnit);
      });
+      const currency = this.shippingTemplateFreight.currency || 'RMB';
      this.shippingTemplateFreight.freightItems = quantityUnits.map((quantityUnit, index) => {
        const matched =
          previousItems.find(item => String(item.quantityUnit || '') === String(quantityUnit)) ||
          previousItems[index] ||
          {};
+        const defaultPriceUnit = resolvePriceUnitByQuantityUnit(quantityUnit, currency);
+        const priceUnit = this.normalizeFreightPriceUnit(
+          matched.priceUnit || defaultPriceUnit || '',
+          quantityUnit,
+          currency
+        );
        return {
          quantityUnit,
          unitPrice: matched.unitPrice || '',
-          priceUnit: matched.priceUnit || '',
+          priceUnit,
          freightAmount: matched.freightAmount ?? '',
          freightAmountManual:
            matched.freightAmountManual === true || matched.manualFreightAmount === true,
        };
      });
    },
+    normalizeFreightPriceUnit(priceUnit, quantityUnit, currency = 'RMB') {
+      const text = this.resolvePriceUnitText(priceUnit);
+      if (text && this.priceUnitMatchesQuantity(text, quantityUnit)) return text;
+      return (
+        resolvePriceUnitByQuantityUnit(quantityUnit, currency) ||
+        text ||
+        String(priceUnit || '').trim()
+      );
+    },
+    resolvePriceUnitText(priceUnit) {
+      const raw = String(priceUnit || '').trim();
+      if (!raw) return '';
+      if (raw.includes('/')) return raw;
+      const options = this.feeUnitSelectOptions.length
+        ? this.feeUnitSelectOptions
+        : this.feeUnitOptions;
+      const matched = options.find(
+        item => String(item.value) === raw || String(item.label) === raw
+      );
+      return matched?.label || raw;
+    },
    quantityUnits() {
      return [
        ...new Set(
@@ -3131,7 +3254,7 @@ export default {
          .replace(/\s+/g, '')
          .replace(/立方米|立方公尺|方/g, '立方');
      const unit = normalizeUnit(quantityUnit).replace(/[·*.]/g, '');
-      const value = String(priceUnit || '')
+      const value = String(this.resolvePriceUnitText(priceUnit) || '')
        .trim()
        .toLowerCase()
        .replace(/\s+/g, '');
@@ -3163,6 +3286,10 @@ export default {
        return this.formatFreightNumber(item.freightAmount);
      }
      if (!this.isFreightAutoCalculable(item)) {
+        // 无法自动计算且未手工填写时返回空，避免把空值显示成 0 造成“已填写”的错觉。
+        if (item.freightAmount === '' || item.freightAmount === null || item.freightAmount === undefined) {
+          return '';
+        }
        return this.formatFreightNumber(item.freightAmount);
      }
      return this.formatFreightNumber(
@@ -2807,8 +2807,11 @@ import 'nprogress/nprogress.css';
 const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
 const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
 let amapLoader;
+const transportPlanListRoute = '/business/transport-plan';
+const transportPlanFormRoute = '/business/transport-plan/form';
+const transportPlanListRefreshKey = 'transport-plan-list-refresh';
 const standaloneTransportPlanFormRoutes = {
-  '/business/transport-plan': '/business/transport-plan/form',
+  [transportPlanListRoute]: transportPlanFormRoute,
 };
 const standaloneTransportPlanFormPaths = [
  ...Object.keys(standaloneTransportPlanFormRoutes),
@@ -3072,6 +3075,10 @@ export default {
      // 必须放 data：Options API 的顺序是 data → computed → watch(immediate) → created，
      // 放 created 的话首个 immediate watcher 会读到空值，把首次加载也挡掉。
      routePathLocked: this.$route.path,
+      // 表单页实例在创建时锁定，避免 keep-alive 列表实例随全局 $route 误切到表单态。
+      isFormPageInstance: Object.values(standaloneTransportPlanFormRoutes).includes(
+        this.$route.path
+      ),
      form: {},
      suppressTransportTypeClear: false,
      query: {},
@@ -3112,10 +3119,11 @@ export default {
      option: (() => {
        const opt = this.cloneOption(this.crudOption, estimateMenuButtonCount(this.config));
        if (this.menuWidth != null) opt.menuWidth = this.menuWidth;
-        if (
-          this.standaloneFormPage &&
-          standaloneTransportPlanFormPaths.includes(this.$route.path)
-        ) {
+        // 仅表单页实例套用全屏表单弹窗样式，避免列表页误用后表格区域异常。
+        const isFormInstance = Object.values(standaloneTransportPlanFormRoutes).includes(
+          this.$route.path
+        );
+        if (this.standaloneFormPage && isFormInstance) {
          opt.dialogAppendToBody = false;
          opt.dialogModal = false;
          opt.dialogCustomClass = 'transport-plan-form-page-dialog';
@@ -3289,6 +3297,12 @@ export default {
    }
    this.loadTaskQuantityUnitOptions();
  },
+  // keep-alive 重新激活列表时强制刷新，避免缓存脏数据；标记位用于兼容旧跳转逻辑。
+  activated() {
+    if (this.isFormPageInstance) return;
+    sessionStorage.removeItem(transportPlanListRefreshKey);
+    this.$nextTick(() => this.onLoad(this.page, this.query));
+  },
  computed: {
    ...mapGetters(['permission', 'userInfo']),
    permissionList() {
@@ -3300,10 +3314,20 @@ export default {
      return this.config.detailSections || [];
    },
    isStandaloneBusinessPage() {
-      return this.standaloneFormPage && standaloneTransportPlanFormPaths.includes(this.$route.path);
+      return (
+        this.standaloneFormPage &&
+        (this.isFormPageInstance ||
+          standaloneTransportPlanFormPaths.includes(this.routePathLocked) ||
+          standaloneTransportPlanFormPaths.includes(this.$route.path))
+      );
    },
    isStandaloneFormPage() {
-      return this.isStandaloneBusinessPage && ['add', 'edit'].includes(this.$route.query.mode);
+      // 用实例锁定标志，避免列表 keep-alive 实例被全局路由误判成表单页。
+      return (
+        this.standaloneFormPage &&
+        this.isFormPageInstance &&
+        ['add', 'edit'].includes(this.$route.query.mode)
+      );
    },
    formPageTitle() {
      if (this.isStandaloneFormPage) {
@@ -3752,6 +3776,18 @@ export default {
  },
  watch: {
    $route(to, from) {
+      // 列表实例：从其他页进入列表时刷新（activated 负责标签切回）。
+      if (!this.isFormPageInstance) {
+        const enteringList =
+          (to.path === this.routePathLocked || to.path === transportPlanListRoute) &&
+          from?.path &&
+          from.path !== to.path;
+        if (enteringList) {
+          sessionStorage.removeItem(transportPlanListRefreshKey);
+          this.$nextTick(() => this.onLoad(this.page, this.query));
+        }
+        return;
+      }
      if (!this.isStandaloneFormPage) return;
      if (
        to.query.mode !== from?.query?.mode ||
@@ -4484,6 +4520,9 @@ export default {
        loading();
      }
    },
+    markTransportPlanListNeedRefresh() {
+      sessionStorage.setItem(transportPlanListRefreshKey, '1');
+    },
    rowSave(row, done, loading) {
      const submitRow = this.normalizeRow(row);
      if (!submitRow) {
@@ -4492,6 +4531,7 @@ export default {
      }
      this.getSaveRequest()(submitRow).then(
        () => {
+          this.markTransportPlanListNeedRefresh();
          this.onLoad(this.page);
          this.$message({ type: 'success', message: '操作成功!' });
          done();
@@ -4511,6 +4551,7 @@ export default {
      }
      this.getSaveRequest()(submitRow).then(
        () => {
+          this.markTransportPlanListNeedRefresh();
          this.onLoad(this.page);
          this.$message({ type: 'success', message: '操作成功!' });
          done();
@@ -4540,7 +4581,7 @@ export default {
        .submit(submitRow)
        .then(() => {
          this.$message.success(action === 'draft' ? '暂存成功' : '创建成功');
-          this.onLoad(this.page, this.query);
+          this.markTransportPlanListNeedRefresh();
          this.closeCrudDialog();
        })
        .finally(() => {
@@ -4548,12 +4589,14 @@ export default {
        });
    },
    closeCrudDialog() {
-      if (this.isStandaloneBusinessPage) {
+      if (this.isStandaloneBusinessPage || this.isFormPageInstance) {
+        // 关闭独立表单页时标记列表需刷新（含直接点关闭未保存的场景）
+        this.markTransportPlanListNeedRefresh();
        this.$router.$avueRouter?.closeTag?.();
        const listPath =
          Object.entries(standaloneTransportPlanFormRoutes).find(
-            ([, formPath]) => formPath === this.$route.path
-          )?.[0] || this.$route.path;
+            ([, formPath]) => formPath === this.$route.path || formPath === this.routePathLocked
+          )?.[0] || transportPlanListRoute;
        this.$router.push({ path: listPath, query: {} });
        return;
      }
@@ -6634,20 +6677,33 @@ export default {
      return query;
    },
    onLoad(page, params = {}) {
+      if (this.isFormPageInstance) return;
      this.loading = true;
+      const currentPage = page?.currentPage || this.page.currentPage || 1;
+      const pageSize = page?.pageSize || this.page.pageSize || 10;
      const query = this.normalizeQueryParams({
        ...params,
        ...this.query,
        allDept: 0,
      });
      this.api
-        .getList(page.currentPage, page.pageSize, query)
+        .getList(currentPage, pageSize, query)
        .then(res => {
-          const result = res.data.data;
-          this.page.total = result.total;
-          this.data = result.records;
+          const result = res?.data?.data || res?.data || {};
+          const records = Array.isArray(result.records)
+            ? result.records
+            : Array.isArray(result)
+              ? result
+              : [];
+          this.page.total = Number(result.total ?? records.length) || 0;
+          this.data = records;
          this.selectionClear();
        })
+        .catch(error => {
+          window.console.error(error);
+          this.data = [];
+          this.page.total = 0;
+        })
        .finally(() => {
          this.loading = false;
        });
@@ -1266,9 +1266,27 @@ const fillEditForm = async row => {
  if (carrierValue) carrierChange(carrierValue);
  await loadBatchRows(snapshot.id);
 };
-const removeBatches = () =>
-  api.removeImportBatches(selected.value.map(item => item.id).join(',')).then(loadBatches);
-const removeBatch = row => api.removeImportBatches(row.id).then(loadBatches);
+/** 与行操作一致：仅草稿可删除 */
+const canRemoveBatch = row => String(row?.importStatus || '') === 'draft';
+const removeBatches = () => {
+  if (!selected.value.length) {
+    ElMessage.warning('请选择至少一条数据');
+    return;
+  }
+  // 选中含不可删条目时整批拦截（含已完成/进行中），不静默跳过
+  if (selected.value.some(row => !canRemoveBatch(row))) {
+    ElMessage.warning('已完成运单不可删除');
+    return;
+  }
+  return api.removeImportBatches(selected.value.map(item => item.id).join(',')).then(loadBatches);
+};
+const removeBatch = row => {
+  if (!canRemoveBatch(row)) {
+    ElMessage.warning('已完成运单不可删除');
+    return;
+  }
+  return api.removeImportBatches(row.id).then(loadBatches);
+};
 const projectChange = async id => {
  const requestId = ++projectRequestId;
  const item = projects.value.find(row => String(row.id) === String(id));
@@ -217,7 +217,12 @@
      />

      <section class="change-section">
-        <div class="section-head"><div class="dialog-section-title">计费信息</div><el-button type="primary" plain @click="addPlan">添加</el-button></div>
+        <div class="section-head">
+          <div class="dialog-section-title">计费信息</div>
+          <el-button v-if="feeGenerationMode !== 'manual'" type="primary" plain @click="addPlan"
+            >添加</el-button
+          >
+        </div>
        <el-radio-group v-model="feeGenerationMode"><el-radio label="system">系统生成</el-radio><el-radio label="manual">账单导入生成</el-radio></el-radio-group>
        <el-table :data="plans" border class="change-table"><el-table-column type="index" label="序号" width="70" /><el-table-column prop="planName" label="方案名称" min-width="220" /><el-table-column label="默认方案" min-width="120"><template #default="{ row }">{{ row.defaultPlan ? '是' : '否' }}</template></el-table-column><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column label="操作" width="180"><template #default="{ row, $index }"><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template></el-table-column></el-table>
      </section>
@@ -440,7 +445,7 @@ export default {
      },
      preSettlementConfig: {},
      formalSettlementConfig: {},
-      settlementTypeOptions: ['月结', '日结', '周结', '半月结', '固定天数周期结算'],
+      settlementTypeOptions: ['月结', '日结', '周结', '固定天数周期结算'],
      billCycleTypeOptions: ['固定截单日', '自然月', '自定义多周期'],
      billCutoffDayOptions: Array.from({ length: 31 }, (_, index) => ({
        label: `${index + 1}日`,
@@ -647,7 +647,12 @@
                <el-radio label="manual">账单导入生成</el-radio>
              </el-radio-group>
            </div>
-            <el-button type="primary" @click="openBillingPlan()">添加</el-button>
+            <el-button
+              v-if="form.feeGenerationMode !== 'manual'"
+              type="primary"
+              @click="openBillingPlan()"
+              >添加</el-button
+            >
          </div>
          <el-table :data="billingPlanRows" border>
            <el-table-column type="index" label="序号" width="80" align="center" />
@@ -224,7 +224,7 @@
              placeholder="请选择"
              filterable
              clearable
-              :disabled="isBasicInfoReadonly"
+              :disabled="dialogReadonly"
            />
          </el-form-item>
          <el-form-item label="平台公司" prop="undertakeDeptId">
@@ -236,7 +236,7 @@
              collapse-tags-tooltip
              clearable
              filterable
-              :disabled="isBasicInfoReadonly"
+              :disabled="dialogReadonly"
              @change="handleUndertakeDeptChange"
            >
              <el-option
@@ -2493,7 +2493,8 @@ export default {
    loadDeptOptions() {
      getDeptTree().then(res => {
        const deptTree = res.data.data || [];
-        const businessDeptTree = ['add', 'edit', 'majorSupplement'].includes(this.dialogType)
+        // 新增/编辑/重大补录/项目变更均可选择业务部门，排除外部组织
+        const businessDeptTree = ['add', 'edit', 'majorSupplement', 'change'].includes(this.dialogType)
          ? this.excludeExternalOrganization(deptTree)
          : deptTree;
        this.deptOptions = this.flattenDept(businessDeptTree);
@@ -602,6 +602,8 @@ export default {
          if (result.code !== 200) throw new Error(result.msg || '导入失败');
          this.$message.success('导入完成');
        }
+        // 与运单/配载一致：通知 keep-alive 列表实例重新拉取
+        sessionStorage.setItem('transport-plan-list-refresh', '1');
        this.$router.push('/business/transport-plan');
      } catch (error) {
        this.$message.error(error.message || '导入失败');