Merge remote-tracking branch 'origin/feature/kingdee-attachment-sync' into feature/bfi-api-rate

# Conflicts:
#	src/api/payment/invoiceApplication.js
#	src/api/payment/invoiceReceipt.js
#	src/api/payment/paymentApplication.js
#	src/api/settlement/formalSettlement.js
#	src/views/payment/invoice-application.vue
#	src/views/payment/invoice-receipt.vue
#	src/views/payment/payment-application-form.vue
#	src/views/payment/payment-application.vue
#	src/views/settlement/formal-settlement.vue

.env.development

@@ -3,8 +3,9 @@
 VITE_APP_ENV = 'development'
 
 #接口地址
-# 开发环境建议填 [/api]：由下方 vite.config.mjs 的 proxy 同源转发到后端(172.16.203.228:8000)，避免跨域(CORS)被浏览器拦截
-# 如需直连线上绝对地址(如 http://172.16.203.228:8000/api)，必须让后端 CORS 把 Allow-Origin 改为具体前端域名，不能用 `*`(配合 credentials 会被浏览器拒绝)
+# 开发环境建议填 [/api]：由 vite.config.mjs 的 proxy 同源转发到本地网关 http://localhost（80）
+# 本地需先启动：Nacos + blade-gateway(80) + blade-auth + blade-system 等；8080 端口一般是 Nacos 控制台不是网关
+# 如需临时联调远程，把 vite proxy target 改为 http://172.16.203.228:8000 并去掉 rewrite
 VITE_APP_API=/api
 
 #调试参数

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
+pnpm-lock.yaml
 /dist
 
 /tests/e2e/videos/

package.json

@@ -6,7 +6,8 @@
     "prod": "vite --mode production",
     "build": "vite build",
     "build:prod": "vite build --mode production",
-    "serve": "vite preview --host"
+    "serve": "vite preview --host",
+    "typecheck": "vue-tsc --noEmit"
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
@@ -46,9 +47,11 @@
     "prettier": "^2.8.7",
     "sass": "^1.85.1",
     "terser": "^5.31.1",
+    "typescript": "^7.0.2",
     "unplugin-auto-import": "^0.11.2",
     "vite": "^5.4.19",
     "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-vue-setup-extend": "^0.4.0"
+    "vite-plugin-vue-setup-extend": "^0.4.0",
+    "vue-tsc": "^3.3.11"
   }
 }

src/api/base/currency.js

@@ -58,3 +58,14 @@ export const changeStatus = (id, status) => {
     },
   });
 };
+
+export const getBfiExchangeRate = (currencyCode, effectdate) => {
+  return request({
+    url: '/blade-transport/bfi/exchange-rate',
+    method: 'get',
+    params: {
+      currencyCode,
+      effectdate,
+    },
+  });
+};

src/api/payment/invoiceApplication.js

@@ -22,7 +22,7 @@ export const approve = data => request({ url: `${baseUrl}/approve`, method: 'pos
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
 export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
 
 export const invoiceTypeOptions = [
   { label: '电子专票', value: 'electronic_special' },

src/api/payment/invoiceReceipt.js

@@ -5,8 +5,17 @@ const baseUrl = '/blade-transport/invoice-receipt';
 export const getList = (current, size, params) =>
   request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
 export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
-export const getInvoicePool = keyword =>
-  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params: { keyword } });
+export const queryInvoicePool = params =>
+  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });
+export const downloadInvoicePoolAttachment = invoiceNo =>
+  // 金蝶票池发票文件下载（后端代理 A801-2 流式回源），耗时较普通接口长，放宽到 120s
+  request({
+    url: `${baseUrl}/invoice-pool/attachment/download`,
+    method: 'get',
+    params: { invoiceNo },
+    responseType: 'blob',
+    timeout: 120000,
+  });
 export const getSettlementCandidates = (keyword, receiptId) =>
   request({
     url: `${baseUrl}/settlement-candidates`,
@@ -25,8 +34,8 @@ export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post'
 export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
-export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
+export const pushKingdee = ids =>
+  request({ url: `${baseUrl}/push-kingdee`, method: 'post', timeout: 30000, data: ids });
 
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },
@@ -36,8 +45,9 @@ export const approvalStatusOptions = [
   { label: '已作废', value: 'voided' },
 ];
 
-export const kingdeeStatusOptions = [
-  { label: '未同步', value: 'unsynced' },
-  { label: '已同步', value: 'synced' },
-  { label: '同步失败', value: 'failed' },
+export const kingdeePushStatusOptions = [
+  { label: '未推送', value: 'unsynced' },
+  { label: '已保存收票单', value: 'pushed' },
+  { label: '已指定应付', value: 'assigned' },
+  { label: '推送失败', value: 'failed' },
 ];

src/api/payment/paymentApplication.js

@@ -16,15 +16,20 @@ export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post'
 export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
+// 同步金蝶涉及多次金蝶远程接口调用（A103-2 预检 + A103-1/A103-3 推送），单笔可达 20s+，覆盖全局 10s 超时
 export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
+// 批量同步逐单单据级事务串行推送，耗时随单量线性增长
 export const syncKingdeeBatch = ids =>
-  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', data: ids });
+  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', timeout: 30000, data: ids });
+// 回写任务按 paymentNo 分批远程查询 A103-2/A103-4，同样可能超过全局超时
+export const syncKingdeeResult = () =>
+  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: 30000 });
 
 export const paymentTypeOptions = [
   { label: '项目预付', value: 'project_advance' },
   { label: '进度预付', value: 'progress_advance' },
-  { label: '结算付款', value: 'settlement_payment' },
+  { label: '尾款付款', value: 'settlement_payment' },
 ];
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },
@@ -36,5 +41,8 @@ export const approvalStatusOptions = [
 export const kingdeeStatusOptions = [
   { label: '未生成', value: 'unsynced' },
   { label: '已生成', value: 'synced' },
+  { label: '付款中', value: 'paying' },
+  { label: '已付款', value: 'paid' },
+  { label: '已关闭', value: 'closed' },
   { label: '生成失败', value: 'failed' },
 ];

src/api/payment/receiptClaimRecord.js

@@ -8,6 +8,8 @@ export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get'
 export const updateAttachments = data =>
   request({ url: `${baseUrl}/attachments`, method: 'post', data });
 export const voidClaim = id => request({ url: `${baseUrl}/void`, method: 'post', params: { id } });
+export const queryKingdeeResult = () =>
+  request({ url: `${baseUrl}/query-kingdee-result`, method: 'post' });
 
 export const claimStatusOptions = [
   { label: '已认领', value: 'claimed' },
@@ -16,6 +18,8 @@ export const claimStatusOptions = [
 
 export const kingdeeBillStatusOptions = [
   { label: '未生成', value: 'none' },
+  { label: '已推送', value: 'pushed' },
   { label: '审核通过', value: 'approved' },
+  { label: '已收款', value: 'received' },
   { label: '处理失败', value: 'failed' },
 ];

src/api/payment/receiptFlow.js

@@ -12,7 +12,7 @@ export const getSettlementCandidates = (keyword, flowId) =>
     params: { keyword, flowId },
   });
 export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
-export const sync = data => request({ url: `${baseUrl}/sync`, method: 'post', data });
+export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' });
 
 export const claimStatusOptions = [
   { label: '未认领', value: 'unclaimed' },

src/api/settlement/formalSettlement.js

@@ -30,8 +30,9 @@ export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post'
 export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
+// 同步金蝶涉及多次金蝶远程接口调用（A102-4 预检 + A102-2 保存），可达 20s+，覆盖全局 10s 超时
 export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
 export const getDetailFees = detailId =>
   request({ url: `${baseUrl}/detail-fees`, method: 'get', params: { detailId } });
 export const getReceiptClaims = formalSettlementId =>
@@ -48,3 +49,5 @@ export const applyPayments = data =>
   request({ url: `${baseUrl}/apply-payments`, method: 'post', data });
 export const claimInvoices = data =>
   request({ url: `${baseUrl}/claim-invoices`, method: 'post', data });
+export const queryInvoicePool = params =>
+  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });

src/api/system/dept.js

@@ -48,6 +48,15 @@ export const syncIamOrganizations = () => {
   });
 };
 
+export const clearNonTopDept = signal => {
+  return request({
+    url: '/blade-system/dept/clear-non-top',
+    method: 'post',
+    timeout: 60000,
+    signal,
+  });
+};
+
 export const syncOaCompany = (current = 1, size = 20, signal) => {
   return request({
     url: '/blade-system/dept/sync-oa-company',

src/api/vehicle/customer-archive.js

@@ -152,6 +152,28 @@ export const getScoreTemplate = quantificationId => {
   });
 };
 
+export const queryKingdeeCustomer = creditCode => {
+  return request({
+    url: '/blade-transport/bfi/customer/query-by-credit-code',
+    method: 'get',
+    timeout: 30000,
+    params: {
+      creditCode,
+    },
+  });
+};
+
+export const syncKingdee = id => {
+  return request({
+    url: '/blade-transport/customer-archive/sync-kingdee',
+    method: 'post',
+    timeout: 30000,
+    params: {
+      id,
+    },
+  });
+};
+
 export const recognizeBusinessLicenseOcr = imageUrl => {
   return request({
     url: '/blade-transport/baidu-ocr/recognize-url',

src/axios.js

@@ -223,6 +223,14 @@ axios.interceptors.response.use(
   },
   error => {
     NProgress.done();
+    // 网络级失败（HTTP 状态 >500、网关错误、超时、断网等 validateStatus 放行之外的响应）
+    // 原为静默 reject，接口报错页面无任何感知；统一补错误提示，取消请求与刷新令牌请求除外
+    if (!axios.isCancel(error) && !isRefreshTokenRequest(error?.config)) {
+      ElMessage({
+        message: error?.response?.data?.msg || '请求失败，请稍后重试',
+        type: 'error',
+      });
+    }
     return Promise.reject(new Error(error));
   }
 );

src/components/address-map-picker/main.vue

@@ -10,12 +10,8 @@
       <el-button type="primary" :loading="searching" @click="searchKeyword">搜索</el-button>
     </div>
     <div class="address-map-picker__content">
-      <map-search-results
-        v-if="searchResults.length"
-        :results="searchResults"
-        @select="selectSearchResult"
-      />
       <div ref="map" class="address-map-picker__map"></div>
+      <map-search-results :results="searchResults" @select="selectSearchResult" />
     </div>
     <div class="address-map-picker__info">{{ status }}</div>
     <template #footer>
@@ -28,6 +24,8 @@
 </template>
 
 <script>
+import { normalizeMapSearchResults } from '@/utils/map-search';
+
 const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
 const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
 let amapLoader;
@@ -42,6 +40,14 @@ export default {
       type: String,
       default: '',
     },
+    longitude: {
+      type: [String, Number],
+      default: '',
+    },
+    latitude: {
+      type: [String, Number],
+      default: '',
+    },
   },
   emits: ['update:modelValue', 'confirm'],
   data() {
@@ -66,9 +72,11 @@ export default {
         this.visible = value;
         if (value) {
           this.keyword = this.address || '';
-          this.selected = {};
-          this.status = '可搜索地址或点击地图选点';
           this.searchResults = [];
+          this.selected = this.buildInitialSelection();
+          this.status = this.selected.longitude
+            ? this.selected.address || '已选点，可确认回填'
+            : '可搜索地址或点击地图选点';
         }
       },
     },
@@ -82,6 +90,18 @@ export default {
     }
   },
   methods: {
+    buildInitialSelection() {
+      const longitude = Number(this.longitude);
+      const latitude = Number(this.latitude);
+      if (!Number.isFinite(longitude) || !Number.isFinite(latitude)) {
+        return {};
+      }
+      return {
+        longitude,
+        latitude,
+        address: this.address || '',
+      };
+    },
     loadAmap() {
       if (window.AMap && window.AMap.Map) {
         return Promise.resolve();
@@ -110,15 +130,27 @@ export default {
           return new Promise(resolve => {
             this.$nextTick(() => {
               if (!this.$refs.map) return resolve(null);
+              const initial = this.buildInitialSelection();
+              const center =
+                Number.isFinite(initial.longitude) && Number.isFinite(initial.latitude)
+                  ? [initial.longitude, initial.latitude]
+                  : [116.40769, 39.89945];
               if (!this.amap) {
                 this.amap = new window.AMap.Map(this.$refs.map, {
-                  center: [116.40769, 39.89945],
-                  zoom: 11,
+                  center,
+                  zoom: initial.longitude ? 14 : 11,
                 });
                 this.amap.on('click', event => this.pickPoint(event.lnglat));
               } else {
                 this.amap.resize();
                 this.clearMarker();
+                this.amap.setZoomAndCenter(initial.longitude ? 14 : 11, center);
+              }
+              if (initial.longitude) {
+                const point = new window.AMap.LngLat(initial.longitude, initial.latitude);
+                this.renderMarker(point);
+                this.selected = { ...initial };
+                this.status = initial.address || '已选点，可确认回填';
               }
               resolve(this.amap);
             });
@@ -180,19 +212,14 @@ export default {
         .then(result => {
           if (!result) return;
           const geocodes = result.geocodes || (result.location ? [result] : []);
-          this.searchResults = geocodes.map((item, index) => ({
-            id: item.id || index,
-            name: item.formattedAddress || item.address || keyword,
-            address: item.formattedAddress || item.address || keyword,
-            location: item.location,
-          }));
-          const point = geocodes[0]?.location || result.location;
+          this.searchResults = normalizeMapSearchResults(geocodes, keyword);
+          const point = this.searchResults[0]?.location || result.location;
           if (!point) {
             throw new Error('未找到匹配地址');
           }
           return this.$nextTick().then(() => {
             this.amap?.resize();
-            this.pickPoint(point, geocodes[0]?.formattedAddress || keyword);
+            this.pickPoint(point, this.searchResults[0]?.address || keyword);
           });
         })
         .catch(() => {
@@ -254,11 +281,19 @@ export default {
       }
     },
     confirm() {
+      if (!this.selected.longitude || !this.selected.latitude) {
+        this.$message.warning('请先搜索或点击地图完成选点');
+        return;
+      }
       if (!this.selected.address) {
         this.$message.warning('请等待地址解析完成后再确认');
         return;
       }
-      this.$emit('confirm', this.selected.address);
+      this.$emit('confirm', {
+        address: this.selected.address,
+        longitude: this.selected.longitude,
+        latitude: this.selected.latitude,
+      });
       this.visible = false;
     },
   },
@@ -278,7 +313,6 @@ export default {
   }
 
   &__map {
-    flex: 1 1 auto;
     width: 100%;
     min-width: 0;
     height: 420px;
@@ -286,9 +320,19 @@ export default {
   }
 
   &__content {
-    display: flex;
-    gap: 12px;
+    position: relative;
+    display: block;
     min-width: 0;
+    overflow: visible;
+
+    .address-map-picker__map {
+      position: relative;
+      z-index: 1;
+    }
+
+    :deep(.map-search-results) {
+      z-index: 2000;
+    }
   }
 
   &__info {

src/components/change-record-detail-dialog/main.vue

@@ -0,0 +1,108 @@
+<template>
+  <el-dialog
+    :model-value="modelValue"
+    title="变更记录详情"
+    append-to-body
+    destroy-on-close
+    align-center
+    width="1100px"
+    class="change-record-detail-dialog"
+    @update:model-value="$emit('update:modelValue', $event)"
+    @open="resetPage"
+  >
+    <el-table
+      :data="pageRows"
+      border
+      max-height="60vh"
+      :show-overflow-tooltip="false"
+    >
+      <el-table-column prop="field" label="变更字段" min-width="180" />
+      <el-table-column
+        prop="before"
+        label="变更前"
+        min-width="360"
+        class-name="change-record-detail-value"
+      />
+      <el-table-column
+        prop="after"
+        label="变更后"
+        min-width="500"
+        class-name="change-record-detail-value"
+      />
+    </el-table>
+    <el-empty v-if="!total" description="暂无变更内容" :image-size="60" />
+    <div class="change-record-detail-dialog__pager">
+      <el-pagination
+        v-model:current-page="currentPage"
+        v-model:page-size="pageSize"
+        background
+        :total="total"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next, jumper"
+      />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="$emit('update:modelValue', false)">关闭</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'ChangeRecordDetailDialog',
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+    rows: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  emits: ['update:modelValue'],
+  data() {
+    return {
+      currentPage: 1,
+      pageSize: 10,
+    };
+  },
+  computed: {
+    total() {
+      return this.rows.length;
+    },
+    pageRows() {
+      const start = (this.currentPage - 1) * this.pageSize;
+      return this.rows.slice(start, start + this.pageSize);
+    },
+  },
+  watch: {
+    rows() {
+      const maxPage = Math.max(1, Math.ceil(this.total / this.pageSize) || 1);
+      if (this.currentPage > maxPage) this.currentPage = 1;
+    },
+  },
+  methods: {
+    resetPage() {
+      this.currentPage = 1;
+      this.pageSize = 10;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.change-record-detail-dialog__pager {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 12px;
+}
+
+:deep(.change-record-detail-value .cell) {
+  white-space: pre-wrap;
+  word-break: break-word;
+  overflow: visible;
+  text-overflow: clip;
+  line-height: 1.6;
+}
+</style>

src/components/kingdee-invoice-pool-dialog/main.vue

@@ -0,0 +1,380 @@
+<template>
+  <el-dialog v-model="visible" :title="title" width="92%" append-to-body destroy-on-close @open="handleOpen">
+    <el-form :model="query" inline label-width="130px" @submit.prevent>
+      <el-form-item label="发票号码">
+        <el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="开票日期">
+        <el-date-picker
+          v-model="query.invoiceDateRange"
+          type="daterange"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+      </el-form-item>
+      <el-form-item label="销方（开票方税号）">
+        <el-input
+          v-model="query.salerTaxNo"
+          clearable
+          style="width: 180px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="购方（收票方税号）">
+        <el-input
+          v-model="query.buyerTaxNo"
+          clearable
+          style="width: 180px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发票类型">
+        <el-select
+          v-model="query.invoiceType"
+          clearable
+          filterable
+          placeholder="不限"
+          style="width: 230px"
+        >
+          <el-option
+            v-for="option in invoiceTypeOptions"
+            :key="option.value"
+            :label="option.label"
+            :value="option.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button :disabled="loading" @click="resetQuery">重置</el-button>
+        <el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      ref="poolTable"
+      v-loading="loading"
+      :data="rows"
+      :row-key="rowKey"
+      border
+      height="520"
+      :highlight-current-row="!multiple"
+      @selection-change="selection => (selected = selection)"
+      @row-dblclick="handleRowDblclick"
+    >
+      <el-table-column v-if="multiple" type="selection" width="52" fixed="left" align="center" reserve-selection />
+      <el-table-column v-else width="52" align="center" fixed="left">
+        <template #default="{ row }">
+          <el-radio
+            :model-value="current && current.invoiceNo"
+            :value="row.invoiceNo"
+            @change="current = row"
+          >
+            <span></span>
+          </el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
+      <el-table-column prop="invoiceDate" label="开票日期" min-width="120" />
+      <el-table-column prop="invoiceType" label="发票类型" min-width="140" />
+      <el-table-column prop="issuerName" label="开票单位" min-width="180" show-overflow-tooltip />
+      <el-table-column prop="receiverName" label="受票单位" min-width="180" show-overflow-tooltip />
+      <el-table-column label="金额(含税)" min-width="130" align="right">
+        <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
+      </el-table-column>
+      <el-table-column label="税率" min-width="90" align="center">
+        <template #default="{ row }">{{ formatRate(row.taxRate) }}</template>
+      </el-table-column>
+      <el-table-column label="税额" min-width="120" align="right">
+        <template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
+      </el-table-column>
+      <el-table-column label="剩余可用金额" min-width="130" align="right">
+        <template #default="{ row }">{{ formatMoney(row.availableTaxAmount) }}</template>
+      </el-table-column>
+      <el-table-column prop="kingdeeBillNo" label="金蝶单据号" min-width="210" show-overflow-tooltip />
+      <el-table-column label="认领状态" min-width="100" align="center">
+        <template #default="{ row }">
+          <el-tag v-if="row.claimed" type="danger" size="small">已认领</el-tag>
+          <el-tag v-else type="info" size="small">未认领</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="登记状态" min-width="100" align="center">
+        <template #default="{ row }">
+          <el-tag v-if="row.registered" type="warning" size="small">已登记</el-tag>
+          <el-tag v-else type="info" size="small">未登记</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="附件" width="120" fixed="right" align="center">
+        <template #default="{ row }">
+          <el-link
+            type="primary"
+            :underline="false"
+            :disabled="attachmentBusy === row.invoiceNo"
+            @click.stop="viewAttachment(row)"
+            >查看</el-link
+          >
+          <el-link
+            type="primary"
+            :underline="false"
+            :disabled="attachmentBusy === row.invoiceNo"
+            @click.stop="downloadAttachment(row)"
+            >下载</el-link
+          >
+        </template>
+      </el-table-column>
+      <el-table-column v-if="!multiple" label="操作" width="90" fixed="right" align="center">
+        <template #default="{ row }">
+          <el-link type="primary" @click.stop="confirmRows([row])">选择</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="kingdee-pool-dialog__pager">
+      <span class="kingdee-pool-dialog__pager-info">第 {{ page.current }} 页</span>
+      <el-button :disabled="page.current <= 1 || loading" @click="prevPage">上一页</el-button>
+      <el-button :disabled="!page.hasMore || loading" @click="nextPage">下一页</el-button>
+      <el-select v-model="page.size" style="width: 110px" @change="handleSizeChange">
+        <el-option v-for="n in [10, 20, 50, 100]" :key="n" :label="`${n}条/页`" :value="n" />
+      </el-select>
+    </div>
+    <template #footer>
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="handleConfirm">{{ confirmText }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  downloadKingdeeInvoiceFile,
+  isKingdeePathAttachment,
+  viewKingdeeInvoiceFile,
+} from '@/utils/kingdee-attachment';
+
+export default {
+  name: 'KingdeeInvoicePoolDialog',
+  props: {
+    modelValue: { type: Boolean, required: true },
+    title: { type: String, default: '查询金蝶票据池' },
+    confirmText: { type: String, default: '确定' },
+    multiple: { type: Boolean, default: false },
+    initialInvoiceNo: { type: String, default: '' },
+    queryApi: { type: Function, required: true },
+  },
+  emits: ['update:modelValue', 'confirm'],
+  data() {
+    return {
+      loading: false,
+      // 与后端 BfiConstant.INVOICE_TYPE_NAMES 对齐：value 为发票类型编码，label 为中文名
+      // 选票场景只开放数电票（普票/专票）
+      invoiceTypeOptions: [
+        { value: '26', label: '数电发票（普通发票）' },
+        { value: '27', label: '数电发票（增值税专用发票）' },
+      ],
+      rows: [],
+      selected: [],
+      current: null,
+      page: { current: 1, size: 10, hasMore: false },
+      // 续扫游标（服务端过滤补页后翻页须按游标对齐，防漏行/重行）
+      nextCursor: null,
+      // 下一页请求待回传的游标：nextPage 时暂存，load 成功或失败后清空
+      pendingCursor: null,
+      // 已浏览页缓存：上一页直接回显不再请求（0 远程调用）
+      pageCache: {},
+      // 正在查看/下载附件的发票号（行级 loading 守卫）
+      attachmentBusy: null,
+      query: this.emptyQuery(),
+    };
+  },
+  computed: {
+    visible: {
+      get() {
+        return this.modelValue;
+      },
+      set(value) {
+        this.$emit('update:modelValue', value);
+      },
+    },
+  },
+  methods: {
+    emptyQuery() {
+      return {
+        invoiceNo: '',
+        // 默认查近一个月，随请求传后端并在页面回显
+        invoiceDateRange: [this.$dayjs().subtract(1, 'month').format('YYYY-MM-DD'), this.$dayjs().format('YYYY-MM-DD')],
+        salerTaxNo: '',
+        buyerTaxNo: '',
+        invoiceType: '',
+      };
+    },
+    // 远程实时查询的票未入本地镜像，id 恒空，用发票号码兜底作为行主键
+    rowKey(row) {
+      return row.invoiceNo || row.id;
+    },
+    // 票池行附件字段为复数 attachmentsJson，行内首项即发票文件（{source,path,name}）
+    rowAttachment(row = {}) {
+      const value = row.attachmentsJson;
+      if (!value) return null;
+      let parsed = value;
+      if (typeof value === 'string') {
+        try {
+          parsed = JSON.parse(value);
+        } catch {
+          return null;
+        }
+      }
+      return Array.isArray(parsed) ? parsed[0] || null : parsed || null;
+    },
+    attachmentName(row) {
+      const attachment = this.rowAttachment(row);
+      return attachment?.name || `${row.invoiceNo || '发票'}.pdf`;
+    },
+    async viewAttachment(row) {
+      const attachment = this.rowAttachment(row);
+      if (!isKingdeePathAttachment(attachment)) {
+        this.$message.warning('当前发票暂无可查看附件');
+        return;
+      }
+      this.attachmentBusy = row.invoiceNo;
+      try {
+        await viewKingdeeInvoiceFile(row.invoiceNo, this.attachmentName(row));
+      } finally {
+        this.attachmentBusy = null;
+      }
+    },
+    async downloadAttachment(row) {
+      const attachment = this.rowAttachment(row);
+      if (!isKingdeePathAttachment(attachment)) {
+        this.$message.warning('当前发票暂无可下载附件');
+        return;
+      }
+      this.attachmentBusy = row.invoiceNo;
+      try {
+        await downloadKingdeeInvoiceFile(row.invoiceNo, this.attachmentName(row));
+      } finally {
+        this.attachmentBusy = null;
+      }
+    },
+    handleOpen() {
+      this.query = this.emptyQuery();
+      this.query.invoiceNo = this.initialInvoiceNo || '';
+      this.current = null;
+      this.selected = [];
+      this.$refs.poolTable?.clearSelection();
+      this.page.current = 1;
+      this.resetScanState();
+      this.load();
+    },
+    handleQuery() {
+      this.page.current = 1;
+      this.resetScanState();
+      this.load();
+    },
+    handleSizeChange() {
+      this.page.current = 1;
+      this.resetScanState();
+      this.load();
+    },
+    prevPage() {
+      // 已浏览页直接回显缓存，不再请求
+      const cached = this.pageCache[this.page.current - 1];
+      if (cached) {
+        this.page.current -= 1;
+        this.rows = cached.rows;
+        this.page.hasMore = cached.hasMore;
+        this.nextCursor = cached.nextCursor;
+        return;
+      }
+      this.page.current -= 1;
+      this.load();
+    },
+    nextPage() {
+      this.pendingCursor = this.nextCursor;
+      this.page.current += 1;
+      this.load();
+    },
+    resetQuery() {
+      this.query = this.emptyQuery();
+      this.handleQuery();
+    },
+    // 新查询/换页容量/重新打开时清空游标与已浏览页缓存，重新锚定扫描
+    resetScanState() {
+      this.nextCursor = null;
+      this.pendingCursor = null;
+      this.pageCache = {};
+    },
+    unwrap(response) {
+      const body = response?.data || response || {};
+      return body?.data || body;
+    },
+    async load() {
+      this.loading = true;
+      // 请求前快照页码：prev/next 会先改写 current，远程失败时回滚避免停留在错页
+      const lastRequested = this.page.current;
+      const cursor = this.pendingCursor;
+      this.pendingCursor = null;
+      try {
+        const range = this.query.invoiceDateRange || [];
+        const data = this.unwrap(
+          await this.queryApi({
+            current: this.page.current,
+            size: this.page.size,
+            cursor: cursor || undefined,
+            invoiceNo: this.query.invoiceNo || undefined,
+            invoiceDateStart: range[0] || undefined,
+            invoiceDateEnd: range[1] || undefined,
+            salerTaxNo: this.query.salerTaxNo || undefined,
+            buyerTaxNo: this.query.buyerTaxNo || undefined,
+            invoiceType: this.query.invoiceType || undefined,
+          })
+        );
+        this.rows = data.records || [];
+        this.page.hasMore = !!data.hasMore;
+        this.nextCursor = data.nextCursor || null;
+        this.pageCache[this.page.current] = { rows: this.rows, hasMore: this.page.hasMore, nextCursor: this.nextCursor };
+      } catch (error) {
+        if (this.page.current !== lastRequested) {
+          this.page.current = lastRequested;
+        }
+        throw error;
+      } finally {
+        this.loading = false;
+      }
+    },
+    handleRowDblclick(row) {
+      if (!this.multiple) {
+        this.confirmRows([row]);
+      }
+    },
+    handleConfirm() {
+      const picked = this.multiple ? this.selected : this.current ? [this.current] : [];
+      this.confirmRows(picked);
+    },
+    confirmRows(rows) {
+      if (!rows.length) {
+        this.$message.warning(this.multiple ? '请至少选择一条发票' : '请选择一张发票');
+        return;
+      }
+      this.$emit('confirm', rows);
+      this.visible = false;
+    },
+    formatMoney(value) {
+      const number = Number(value);
+      return Number.isFinite(number) ? number.toFixed(2) : '-';
+    },
+    formatRate(value) {
+      const number = Number(value);
+      return Number.isFinite(number) ? `${number}%` : '-';
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.kingdee-pool-dialog__pager {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  justify-content: flex-end;
+  margin-top: 12px;
+}
+</style>

src/components/map-search-results/main.vue

@@ -1,20 +1,55 @@
 <template>
   <div v-if="results.length" class="map-search-results">
-    <div class="map-search-results__title">搜索结果</div>
-    <el-empty v-if="!results.length" description="暂无搜索结果" :image-size="60" />
-    <div
-      v-for="(item, index) in results"
-      :key="item.id || index"
-      class="map-search-results__item"
-      @click="$emit('select', item)"
-    >
-      <div class="map-search-results__name">{{ item.name || item.address || '未命名地址' }}</div>
-      <div class="map-search-results__address">{{ item.address || item.name || '-' }}</div>
+    <div class="map-search-results__list">
+      <div
+        v-for="(item, index) in pageResults"
+        :key="item.id || `${currentPage}-${index}`"
+        class="map-search-results__item"
+        :class="{ 'is-active': isActive(item, index) }"
+        @click="handleSelect(item, index)"
+      >
+        <img
+          v-if="item.photo || item.image"
+          class="map-search-results__thumb"
+          :src="item.photo || item.image"
+          alt=""
+        />
+        <div class="map-search-results__body">
+          <div class="map-search-results__name">
+            {{ item.name || item.address || '未命名地址' }}
+          </div>
+          <div class="map-search-results__address">
+            地址：{{ item.address || item.name || '-' }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="totalPages > 1" class="map-search-results__pager">
+      <button
+        v-for="page in visiblePages"
+        :key="page"
+        type="button"
+        class="map-search-results__page"
+        :class="{ 'is-active': page === currentPage }"
+        @click="currentPage = page"
+      >
+        {{ page }}
+      </button>
+      <button
+        type="button"
+        class="map-search-results__page map-search-results__page--next"
+        :disabled="currentPage >= totalPages"
+        @click="goNext"
+      >
+        下一页
+      </button>
     </div>
   </div>
 </template>
 
 <script>
+const PAGE_SIZE = 5;
+
 export default {
   props: {
     results: {
@@ -23,43 +58,167 @@ export default {
     },
   },
   emits: ['select'],
+  data() {
+    return {
+      currentPage: 1,
+      activeKey: '',
+    };
+  },
+  computed: {
+    totalPages() {
+      return Math.max(1, Math.ceil((this.results || []).length / PAGE_SIZE));
+    },
+    pageResults() {
+      const start = (this.currentPage - 1) * PAGE_SIZE;
+      return (this.results || []).slice(start, start + PAGE_SIZE);
+    },
+    visiblePages() {
+      const maxButtons = 3;
+      let start = Math.max(1, this.currentPage - 1);
+      let end = Math.min(this.totalPages, start + maxButtons - 1);
+      start = Math.max(1, end - maxButtons + 1);
+      const pages = [];
+      for (let page = start; page <= end; page += 1) {
+        pages.push(page);
+      }
+      return pages;
+    },
+  },
+  watch: {
+    results() {
+      this.currentPage = 1;
+      this.activeKey = '';
+    },
+  },
+  methods: {
+    resultKey(item, index) {
+      return item?.id ?? `${this.currentPage}-${index}`;
+    },
+    isActive(item, index) {
+      return this.activeKey === this.resultKey(item, index);
+    },
+    handleSelect(item, index) {
+      this.activeKey = this.resultKey(item, index);
+      this.$emit('select', item);
+    },
+    goNext() {
+      if (this.currentPage < this.totalPages) {
+        this.currentPage += 1;
+      }
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .map-search-results {
-  width: 260px;
-  height: 420px;
-  overflow-y: auto;
-  border: 1px solid #eff1f7;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 2000;
+  display: flex;
+  flex-direction: column;
+  width: 360px;
+  max-height: 360px;
+  overflow: hidden;
   background: #fff;
-  flex: 0 0 260px;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.12);
+  pointer-events: auto;
 
-  &__title {
-    padding: 10px 12px;
-    border-bottom: 1px solid #eff1f7;
-    font-weight: 600;
+  &__list {
+    flex: 1 1 auto;
+    min-height: 0;
+    overflow-y: auto;
   }
 
   &__item {
+    display: flex;
+    gap: 10px;
+    align-items: flex-start;
     padding: 10px 12px;
     cursor: pointer;
-    border-bottom: 1px solid #f5f5f5;
+    border-bottom: 1px solid #ebeef5;
   }
 
-  &__item:hover {
-    background: #f5f9ff;
+  &__item:hover,
+  &__item.is-active {
+    background: #f5f5f5;
+  }
+
+  &__thumb {
+    flex: 0 0 48px;
+    width: 48px;
+    height: 48px;
+    object-fit: cover;
+    border: 1px solid #ebeef5;
+    background: #fafafa;
+  }
+
+  &__body {
+    flex: 1 1 auto;
+    min-width: 0;
   }
 
   &__name {
+    overflow: hidden;
     color: #303133;
     font-size: 14px;
+    font-weight: 600;
+    line-height: 1.4;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 
   &__address {
     margin-top: 4px;
     color: #909399;
     font-size: 12px;
+    line-height: 1.5;
+    word-break: break-all;
+  }
+
+  &__pager {
+    display: flex;
+    flex: 0 0 auto;
+    flex-wrap: wrap;
+    gap: 6px;
+    align-items: center;
+    padding: 8px 10px;
+    border-top: 1px solid #ebeef5;
+    background: #fff;
+  }
+
+  &__page {
+    min-width: 28px;
+    height: 28px;
+    padding: 0 8px;
+    color: #606266;
+    font-size: 13px;
+    line-height: 26px;
+    text-align: center;
+    background: #fff;
+    border: 1px solid #dcdfe6;
+    cursor: pointer;
+
+    &:hover:not(:disabled) {
+      color: #409eff;
+      border-color: #409eff;
+    }
+
+    &.is-active {
+      color: #409eff;
+      border-color: #409eff;
+    }
+
+    &:disabled {
+      color: #c0c4cc;
+      cursor: not-allowed;
+    }
+
+    &--next {
+      min-width: 56px;
+    }
   }
 }
 </style>

src/components/vehicle-attachment-upload/main.vue

@@ -212,7 +212,14 @@ export default {
         .filter(Boolean);
     },
     acceptText() {
-      return this.acceptedList.join(',');
+      return this.acceptedList
+        .map(item => {
+          const value = String(item).trim();
+          if (!value || value.includes('/') || value.startsWith('.')) return value;
+          return `.${value}`;
+        })
+        .filter(Boolean)
+        .join(',');
     },
     tipText() {
       return this.tip || `${UNIFIED_ATTACHMENT_TIP_PREFIX}${this.maxSize}M`;
@@ -304,12 +311,22 @@ export default {
       });
     },
     handleSuccess(response, file, files) {
-      if (!response || response.success === false || (response.code && response.code !== 200)) {
+      const code = response?.code;
+      const codeInvalid = code !== undefined && code !== null && code !== '' && Number(code) !== 200;
+      if (!response || response.success === false || codeInvalid) {
         this.$message.error((response && response.msg) || '上传失败');
         return;
       }
-      this.emitUploadFiles(this.multiple ? files : [file]);
-      this.$emit('success', this.normalizeUploadFile(file));
+      if (file && !file.response) {
+        file.response = response;
+      }
+      const normalized = this.normalizeUploadFile(file, response);
+      if (!normalized.url) {
+        this.$message.error('上传成功但未返回文件地址');
+        return;
+      }
+      this.$emit('success', normalized);
+      this.emitUploadFiles(this.multiple ? files : [file], normalized);
       this.$message.success('上传成功');
     },
     handleChange(file, files) {
@@ -323,35 +340,89 @@ export default {
       this.emitUploadFiles(files);
       return true;
     },
-    emitUploadFiles(files) {
-      const list = files
-        .filter(file => file.status === 'success' || this.getFileUrl(file))
-        .map(this.normalizeUploadFile)
+    emitUploadFiles(files, preferredFile) {
+      const list = (files || [])
+        .filter(file => {
+          if (file?.status === 'fail') return false;
+          return (
+            file?.status === 'success' ||
+            this.getFileUrl(file) ||
+            file?.response?.data ||
+            file?.response?.link ||
+            file?.response
+          );
+        })
+        .map(file => this.normalizeUploadFile(file))
         .filter(item => item.url);
-      this.$emit('update:modelValue', list);
-      this.$emit('change', list);
+
+      if (preferredFile?.url) {
+        const exists = list.some(
+          item =>
+            (preferredFile.uid && item.uid && String(item.uid) === String(preferredFile.uid)) ||
+            item.url === preferredFile.url
+        );
+        if (!exists) list.push(preferredFile);
+      }
+
+      const current = this.parseValue(this.modelValue).map(item => ({
+        ...item,
+        url: this.getFileUrl(item),
+      }));
+      const merged = [...current];
+      list.forEach(file => {
+        const index = merged.findIndex(
+          item =>
+            (file.uid && item.uid && String(item.uid) === String(file.uid)) ||
+            (file.url && this.getFileUrl(item) === file.url)
+        );
+        if (index >= 0) merged.splice(index, 1, { ...merged[index], ...file });
+        else merged.push(file);
+      });
+
+      const result = merged.filter(item => this.getFileUrl(item));
+      this.$emit('update:modelValue', result);
+      this.$emit('change', result);
     },
-    normalizeUploadFile(file) {
-      const data = (file.response && file.response.data) || file.data || file;
-      const url = data.link || data.url || data.domain || file.url || '';
+    normalizeUploadFile(file, responseOverride) {
+      const response = responseOverride || file?.response;
+      let data = {};
+      if (response && typeof response === 'object') {
+        if (response.data && typeof response.data === 'object') {
+          data = response.data;
+        } else if (response.link || response.url || response.domain) {
+          data = response;
+        }
+      }
+      if (!data.link && !data.url && !data.domain) {
+        data = file?.data && typeof file.data === 'object' ? file.data : file || {};
+      }
+      const url =
+        data.link ||
+        data.url ||
+        data.domain ||
+        data.fileLink ||
+        data.fileUrl ||
+        file?.url ||
+        file?.link ||
+        '';
       const originalName =
         data.originalName ||
-        file.originalName ||
-        file.name ||
+        file?.originalName ||
+        file?.name ||
         data.name ||
         this.getFileName(url) ||
         '附件';
       const extension = this.getExtension({ name: originalName, url });
       return {
         ...data,
-        uid: file.uid || data.uid,
+        uid: file?.uid || data.uid,
         originalName,
         name: originalName,
         url,
         link: data.link || url,
-        size: data.size || data.attachSize || file.size || '',
+        size: data.size || data.attachSize || file?.size || '',
         extension,
-        mimeType: data.mimeType || data.contentType || file.raw?.type || MIME_MAP[extension] || '',
+        mimeType: data.mimeType || data.contentType || file?.raw?.type || MIME_MAP[extension] || '',
       };
     },
     handlePreview(file) {

src/option/base/measurement-unit.js

@@ -42,6 +42,7 @@ export const createOption = () => ({
       label: '计量单位编码',
       prop: 'unitCode',
       minWidth: 150,
+      span: 24,
       search: true,
       searchOrder: 4,
       searchSpan: 6,

src/option/business/temporary-credit-limit.js

@@ -334,7 +334,7 @@ export const option = {
     },
     ...auditColumns.map(column => ({ ...column, hide: true })),
   ])),
-  dialogWidth: '96%',
+  dialogWidth: 1100,
   menuFixed: 'right',
   menuWidth: 320,
   index: false,

src/option/business/waybill-manage.js

@@ -543,7 +543,8 @@ export const option = {
         prop: 'projectName',
         formslot: true,
         search: true,
-        searchLabel: '项目',
+        searchLabel: '项目名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 22,
         span: 6,
         order: 890,
@@ -555,6 +556,7 @@ export const option = {
         prop: 'customerName',
         search: true,
         searchLabel: '客户名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 21,
         minWidth: 150,
         addDisplay: false,
@@ -576,6 +578,7 @@ export const option = {
         prop: 'driverName',
         search: true,
         searchLabel: '司机名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 14,
         minWidth: 120,
         display: false,
@@ -626,6 +629,7 @@ export const option = {
         prop: 'carrierName',
         search: true,
         searchLabel: '承运商名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 15,
         minWidth: 150,
         display: false,
@@ -729,6 +733,7 @@ export const option = {
         prop: 'planName',
         formslot: true,
         search: true,
+        searchPlaceholder: '请选择或输入',
         searchOrder: 7,
         span: 6,
         order: 870,
@@ -738,6 +743,7 @@ export const option = {
         label: '货物类型',
         prop: 'cargoType',
         search: true,
+        searchPlaceholder: '请选择或输入',
         searchOrder: 18,
         formatter: row => formatGoodsField(row, ['cargoType', 'goodsType', 'typeName']),
         minWidth: 130,

src/option/payment/invoiceApplication.js

@@ -13,6 +13,7 @@ export const invoiceApplicationTableColumns = [
   { prop: 'currentProcessor', label: '当前处理人', minWidth: 130 },
   { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 },
   { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 },
+  { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];
 
 export const invoiceApplicationDetailColumns = [

src/option/payment/invoiceReceipt.js

@@ -11,6 +11,8 @@ export const invoiceReceiptTableColumns = [
   { prop: 'currentProcessor', label: '当前处理人', minWidth: 130 },
   { prop: 'createUserName', label: '创建人', minWidth: 110 },
   { prop: 'createTime', label: '创建时间', minWidth: 170 },
-  { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 },
-  { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 },
+  { prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 },
+  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 },
+  { prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
+  { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];

src/option/payment/paymentApplication.js

@@ -17,4 +17,5 @@ export const paymentApplicationTableColumns = [
   { prop: 'currentProcessor', label: '当前处理人', minWidth: 120 },
   { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 130 },
   { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 130 },
+  { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];

src/option/payment/receiptFlow.js

@@ -8,5 +8,6 @@ export const receiptFlowTableColumns = [
   { prop: 'summary', label: '摘要', minWidth: 160 },
   { prop: 'transactionTime', label: '交易时间', minWidth: 170 },
   { prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
+  { prop: 'kingdeeClaimStatusName', label: '公告状态', minWidth: 110 },
   { prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
 ];

src/option/settlement/formalSettlementTable.js

@@ -21,6 +21,7 @@ export const formalSettlementTableColumns = [
   { label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
   { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
   { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
+  { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },
   { label: '创建人', prop: 'createUserName', minWidth: 110 },
   { label: '创建时间', prop: 'createTime', minWidth: 170 },
 ];

src/option/settlement/receivable-payable-detail.js

@@ -88,6 +88,8 @@ export const updateFeeFormFields = [
 ];
 
 export const transferSearchFields = [
+  { label: '单据号', prop: 'documentNo', type: 'input' },
+  { label: '合同编码', prop: 'contractNo', type: 'input' },
   { label: '合同名称', prop: 'contractName', type: 'input' },
   { label: '批次号', prop: 'batchNo', type: 'input' },
   { label: '生成日期', prop: 'generateDateRange', type: 'daterange' },

src/option/system/authlog.js

@@ -5,6 +5,7 @@ export const GRANT_TYPE_DIC = [
   { label: '社交登录', value: 'social' },
   { label: '客户端凭证', value: 'client_credentials' },
   { label: '刷新令牌', value: 'refresh_token' },
+  { label: '退出登录', value: 'logout' },
 ];
 
 export const authLogOption = {
@@ -38,7 +39,7 @@ export const authLogOption = {
       prop: 'realName',
     },
     {
-      label: '授权类型',
+      label: '操作类型',
       prop: 'grantType',
       type: 'select',
       search: true,
@@ -80,7 +81,7 @@ export const authLogOption = {
       width: 120,
     },
     {
-      label: '登录时间',
+      label: '操作时间',
       prop: 'loginTime',
       sortable: true,
       span: 24,

src/option/system/user.js

@@ -1,12 +1,9 @@
 import { getDeptLazyTree } from '@/api/system/dept';
+import { validateLoginPassword } from '@/utils/validate';
 
 export const userOption = safe => {
   const validatePass = (rule, value, callback) => {
-    if (value === '') {
-      callback(new Error('请输入密码'));
-    } else {
-      callback();
-    }
+    validateLoginPassword(rule, value, callback);
   };
   const validatePass2 = (rule, value, callback) => {
     if (value === '') {

src/page/login/facelogin.vue

@@ -13,8 +13,8 @@ export default {
   data() {
     return {
       loginForm: {
-        username: 'admin',
-        password: '123456',
+        username: '',
+        password: '',
       },
     };
   },

src/page/login/index.vue

@@ -24,6 +24,7 @@
           -->
           <userLogin v-if="activeName === 'user'"></userLogin>
           <registerLogin v-else-if="activeName === 'register'"></registerLogin>
+          <!-- 暂时默认账号密码登录，IAM 选择入口先隐藏
           <div v-else class="iam-login">
             <el-button type="primary" class="login-submit" @click.prevent="handleIamLogin">
               IAM统一身份认证
@@ -32,6 +33,7 @@
               账号密码登录
             </el-button>
           </div>
+          -->
         </div>
       </div>
     </div>
@@ -61,7 +63,7 @@ export default {
     return {
       website: website,
       time: '',
-      activeName: 'iam',
+      activeName: 'user',
       socialForm: {
         tenantId: '000000',
         source: '',

src/page/login/userlogin.vue

@@ -93,9 +93,9 @@ export default {
         //角色ID
         roleId: '',
         //用户名
-        username: 'admin',
+        username: '',
         //密码
-        password: 'admin',
+        password: '',
         //账号类型
         type: 'account',
         //验证码的值

src/router/page/index.js

@@ -87,7 +87,7 @@ export default [
   {
     path: '/business/project-apply/public-view',
     name: '查看项目信息',
-    component: () => import('@/views/mk/public-biz-view.vue'),
+    component: () => import('@/views/business/project-apply-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,
@@ -98,7 +98,7 @@ export default [
   {
     path: '/business/contract-manage/public-view',
     name: '查看合同信息',
-    component: () => import('@/views/mk/public-biz-view.vue'),
+    component: () => import('@/views/business/contract-manage-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,
@@ -109,7 +109,7 @@ export default [
   {
     path: '/business/waybill-manage/public-view',
     name: '查看运单信息',
-    component: () => import('@/views/mk/public-biz-view.vue'),
+    component: () => import('@/views/business/waybill-manage-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,
@@ -120,7 +120,7 @@ export default [
   {
     path: '/settlement/pre-settlement/public-view',
     name: '查看预结算信息',
-    component: () => import('@/views/mk/public-biz-view.vue'),
+    component: () => import('@/views/settlement/pre-settlement-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,
@@ -131,7 +131,7 @@ export default [
   {
     path: '/settlement/formal-settlement/public-view',
     name: '查看正式结算信息',
-    component: () => import('@/views/mk/public-biz-view.vue'),
+    component: () => import('@/views/settlement/formal-settlement-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,
@@ -142,7 +142,7 @@ export default [
   {
     path: '/payment/payment-application/public-view',
     name: '查看付款申请信息',
-    component: () => import('@/views/mk/public-biz-view.vue'),
+    component: () => import('@/views/payment/payment-application-public-view.vue'),
     meta: {
       keepAlive: false,
       isTab: false,

src/styles/common.scss

@@ -150,12 +150,15 @@ a {
   bottom: 0;
 }
 .map-picker-content {
-  display: flex;
-  gap: 12px;
+  position: relative;
+  display: block;
+  min-width: 0;
+  overflow: visible;
 
   > [class$='__map'],
   > .address-map {
-    flex: 1 1 auto;
+    position: relative;
+    z-index: 1;
     width: 100%;
     min-width: 0;
     box-sizing: border-box;
@@ -165,4 +168,8 @@ a {
       height: 100% !important;
     }
   }
+
+  > .map-search-results {
+    z-index: 2000;
+  }
 }

src/utils/carrier-org-resource.js

@@ -0,0 +1,140 @@
+import { getDetail, getList as getCustomerList } from '@/api/vehicle/customer-archive';
+import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import { getList as getVehicleList } from '@/api/transportCapacity/transport-vehicle';
+
+const orgNameCache = new Map();
+
+const extractRecords = res => {
+  const data = res?.data?.data ?? res?.data ?? res;
+  if (Array.isArray(data)) return data;
+  if (Array.isArray(data?.records)) return data.records;
+  if (Array.isArray(data?.data)) return data.data;
+  return [];
+};
+
+const normalizeOrgName = value => String(value || '').trim();
+
+const uniqueOrgNames = (values = []) => {
+  const seen = new Set();
+  const result = [];
+  values.forEach(value => {
+    const name = normalizeOrgName(value);
+    if (!name || seen.has(name)) return;
+    seen.add(name);
+    result.push(name);
+  });
+  return result;
+};
+
+/**
+ * 解析承运商客商档案上联系人的所属组织（branchName），无联系人时回退客商所属组织。
+ */
+export const resolveCarrierOrganizationNames = async ({ carrierId, carrierName } = {}) => {
+  const id = String(carrierId || '').trim();
+  const name = normalizeOrgName(carrierName);
+  const cacheKey = id || name;
+  if (!cacheKey) return [];
+  if (orgNameCache.has(cacheKey)) return orgNameCache.get(cacheKey);
+
+  let detail = null;
+  if (id) {
+    try {
+      const res = await getDetail(id);
+      detail = res?.data?.data || res?.data || null;
+    } catch (error) {
+      detail = null;
+    }
+  }
+  if (!detail && name) {
+    try {
+      const res = await getCustomerList(1, 20, { fullName: name });
+      const records = extractRecords(res);
+      const matched =
+        records.find(item => normalizeOrgName(item.fullName || item.customerName) === name) ||
+        records[0];
+      if (matched?.id) {
+        const detailRes = await getDetail(matched.id);
+        detail = detailRes?.data?.data || detailRes?.data || matched;
+      }
+    } catch (error) {
+      detail = null;
+    }
+  }
+
+  const contacts = Array.isArray(detail?.contacts) ? detail.contacts : [];
+  const orgNames = uniqueOrgNames([
+    ...contacts.map(item => item.branchName),
+    detail?.deptName,
+    detail?.organizationName,
+  ]);
+  orgNameCache.set(cacheKey, orgNames);
+  if (id && name) orgNameCache.set(name, orgNames);
+  return orgNames;
+};
+
+export const clearCarrierOrganizationCache = (carrier = {}) => {
+  const id = String(carrier.carrierId || '').trim();
+  const name = normalizeOrgName(carrier.carrierName);
+  if (id) orgNameCache.delete(id);
+  if (name) orgNameCache.delete(name);
+};
+
+export const matchOrganizationName = (value, orgNames = []) => {
+  const text = normalizeOrgName(value);
+  if (!text || !orgNames.length) return false;
+  return orgNames.some(org => text === org || text.includes(org) || org.includes(text));
+};
+
+const filterByOrganizations = (records = [], orgNames = []) => {
+  if (!orgNames.length) return [];
+  return records.filter(item => matchOrganizationName(item.organizationName, orgNames));
+};
+
+/**
+ * 按承运商联系人所属组织筛选司机。
+ * 未选择承运商时返回空列表（需先选承运商）。
+ */
+export const fetchDriversByCarrierOrganizations = async (
+  query = {},
+  { carrierId, carrierName } = {}
+) => {
+  if (!String(carrierId || '').trim() && !normalizeOrgName(carrierName)) {
+    return [];
+  }
+  const orgNames = await resolveCarrierOrganizationNames({ carrierId, carrierName });
+  if (!orgNames.length) return [];
+
+  const size = Math.max(Number(query.size) || 50, 50);
+  const params = { ...query };
+  delete params.size;
+  // 单组织时用后端模糊条件缩小范围；多组织再前端精确过滤
+  if (orgNames.length === 1) {
+    params.organizationName = orgNames[0];
+  }
+  const res = await getDriverList(1, Math.min(size * 5, 200), params);
+  return filterByOrganizations(extractRecords(res), orgNames).slice(0, size);
+};
+
+/**
+ * 按承运商联系人所属组织筛选车辆。
+ * 未选择承运商时返回空列表。
+ */
+export const fetchVehiclesByCarrierOrganizations = async (
+  query = {},
+  { carrierId, carrierName } = {}
+) => {
+  if (!String(carrierId || '').trim() && !normalizeOrgName(carrierName)) {
+    return [];
+  }
+  const orgNames = await resolveCarrierOrganizationNames({ carrierId, carrierName });
+  if (!orgNames.length) return [];
+
+  const size = Math.max(Number(query.size) || 50, 50);
+  const params = { ...query };
+  delete params.size;
+  if (orgNames.length === 1) {
+    params.organizationName = orgNames[0];
+  }
+  const res = await getVehicleList(1, Math.min(size * 5, 200), params);
+  return filterByOrganizations(extractRecords(res), orgNames).slice(0, size);
+};

src/utils/kingdee-attachment.js

@@ -0,0 +1,90 @@
+/**
+ * 金蝶侧发票附件查看/下载公共工具
+ *
+ * 票池发票附件为 {source:'piaozone', path, name}：path 是金蝶侧文件 id（非 http 直链），
+ * 须由后端代理 A801-2 流式回源；OSS 直链附件（url/link/fileUrl）仍由前端直连下载/预览。
+ * 三处入口共用：票池弹窗、正式结算认领发票行、付款申请发票附件行。
+ */
+import { ElMessage } from 'element-plus';
+import { downloadFile } from '@/utils/util';
+import { downloadInvoicePoolAttachment } from '@/api/payment/invoiceReceipt';
+
+/**
+ * 金蝶侧附件判定：source=piaozone，或有 path 且非 http(s) 直链
+ * @param {Object|Null} attachment 附件对象（attachmentsJson/attachmentJson 行内首项）
+ * @returns {Boolean}
+ */
+export const isKingdeePathAttachment = attachment => {
+  if (!attachment) return false;
+  if (attachment.source === 'piaozone') return true;
+  return Boolean(attachment.path) && !/^https?:\/\//i.test(attachment.path);
+};
+
+/**
+ * 请求金蝶文件流：成功返回 Blob；业务失败为 HTTP 200 + R.fail JSON（响应通道未写流时后端即失败），
+ * 按 Content-Type 识别并抛出带 msg 的错误；网络级失败拦截器已提示，标记 silent 避免重复提示
+ * @param {String} invoiceNo 发票号码
+ * @returns {Promise<Blob>}
+ */
+const requestKingdeeFile = async invoiceNo => {
+  let res;
+  try {
+    res = await downloadInvoicePoolAttachment(invoiceNo);
+  } catch (error) {
+    throw Object.assign(new Error(error?.message || '附件下载失败'), { silent: true });
+  }
+  const blob = res?.data;
+  if (!(blob instanceof Blob)) {
+    throw new Error('响应不是文件流');
+  }
+  if (blob.type && blob.type.includes('application/json')) {
+    let message = '附件下载失败';
+    try {
+      const parsed = JSON.parse(await blob.text());
+      message = parsed.msg || parsed.message || message;
+    } catch {
+      // 错误体非 JSON 时按默认提示
+    }
+    throw new Error(message);
+  }
+  return blob;
+};
+
+/**
+ * 下载金蝶侧发票附件（经 A801-2 后端代理），失败统一 ElMessage 提示
+ * @param {String} invoiceNo 发票号码
+ * @param {String} fileName 下载文件名（缺省按 发票号.pdf）
+ */
+export const downloadKingdeeInvoiceFile = async (invoiceNo, fileName) => {
+  if (!invoiceNo) {
+    ElMessage.warning('当前发票缺少发票号码，无法下载金蝶侧附件');
+    return;
+  }
+  try {
+    const blob = await requestKingdeeFile(invoiceNo);
+    downloadFile(blob, fileName || `${invoiceNo}.pdf`);
+  } catch (error) {
+    if (!error?.silent) ElMessage.error(error?.message || '金蝶附件下载失败');
+  }
+};
+
+/**
+ * 新窗口预览金蝶侧发票附件：拉取 Blob 转 objectURL（PDF 可预览；OFD 等浏览器不可预览的格式由浏览器触发下载）
+ * @param {String} invoiceNo 发票号码
+ * @param {String} fileName 预览文件名（缺省按 发票号.pdf）
+ */
+export const viewKingdeeInvoiceFile = async (invoiceNo, fileName) => {
+  if (!invoiceNo) {
+    ElMessage.warning('当前发票缺少发票号码，无法预览金蝶侧附件');
+    return;
+  }
+  try {
+    const blob = await requestKingdeeFile(invoiceNo);
+    const url = URL.createObjectURL(blob);
+    window.open(url, '_blank');
+    // 延迟释放 objectURL：立即回收可能导致新窗口尚未加载完成即失效
+    setTimeout(() => URL.revokeObjectURL(url), 60000);
+  } catch (error) {
+    if (!error?.silent) ElMessage.error(error?.message || '金蝶附件预览失败');
+  }
+};

src/utils/map-search.js

@@ -0,0 +1,39 @@
+/**
+ * 将高德 Geocoder 结果规范化为地图选址浮层列表数据。
+ * @param {Array|Object} geocodesOrResult geocodes 数组，或含 geocodes/location 的结果对象
+ * @param {string} keyword 搜索关键词兜底文案
+ * @returns {Array<{id: string|number, name: string, address: string, location: any, photo: string}>}
+ */
+export function normalizeMapSearchResults(geocodesOrResult, keyword = '') {
+  const fallback = String(keyword || '').trim();
+  let list = [];
+  if (Array.isArray(geocodesOrResult)) {
+    list = geocodesOrResult;
+  } else if (geocodesOrResult && typeof geocodesOrResult === 'object') {
+    if (Array.isArray(geocodesOrResult.geocodes)) {
+      list = geocodesOrResult.geocodes;
+    } else if (geocodesOrResult.location) {
+      list = [geocodesOrResult];
+    }
+  }
+
+  return list.map((item, index) => {
+    const buildingName = pickNamedField(item?.building);
+    const neighborhoodName = pickNamedField(item?.neighborhood);
+    const address = item?.formattedAddress || item?.address || fallback || '-';
+    return {
+      id: item?.id || index,
+      name: buildingName || neighborhoodName || address,
+      address,
+      location: item?.location,
+      photo: item?.photo || item?.image || '',
+    };
+  });
+}
+
+function pickNamedField(value) {
+  if (!value) return '';
+  if (typeof value === 'string') return value.trim();
+  if (typeof value === 'object' && value.name) return String(value.name).trim();
+  return '';
+}

src/utils/mk-approval.js

@@ -40,10 +40,22 @@ export const MK_BIZ = {
   },
 };
 
-export async function resolveMkTemplateCode(dictName) {
+const MK_SWITCH_NAME = '开启MK';
+
+async function loadMkTemplateList() {
   const res = await getDictionary({ code: 'mk_template' });
-  const list = res?.data?.data || [];
-  const matched = list.find(item => String(item.dictValue || '').trim() === dictName);
+  return res?.data?.data || [];
+}
+
+/** 业务字典 mk_template：名称「开启MK」且键值为 1 时才请求 MK */
+export function isMkEnabled(list = []) {
+  const matched = list.find(item => String(item.dictValue || '').trim() === MK_SWITCH_NAME);
+  return String(matched?.dictKey ?? '').trim() === '1';
+}
+
+export async function resolveMkTemplateCode(dictName, list) {
+  const dictList = list || (await loadMkTemplateList());
+  const matched = dictList.find(item => String(item.dictValue || '').trim() === dictName);
   const templateCode = matched?.dictKey;
   if (!templateCode) {
     ElMessage.warning(`未配置业务字典 mk_template「${dictName}」，无法提交审核流`);
@@ -62,10 +74,14 @@ export async function submitMkApprovalFlow({
   if (!conf) {
     return Promise.reject(new Error(`不支持的MK业务类型：${bizType}`));
   }
+  const list = await loadMkTemplateList();
+  if (!isMkEnabled(list)) {
+    return;
+  }
   if ((conf.rejected || []).includes(approvalStatus)) {
     await processDelete({ formInstanceId: String(formInstanceId) });
   }
-  const templateCode = await resolveMkTemplateCode(conf.dictName);
+  const templateCode = await resolveMkTemplateCode(conf.dictName, list);
   const subject = subjectName
     ? `${conf.subjectPrefix}：${subjectName}`
     : `${conf.subjectPrefix}：${formInstanceId}`;

src/utils/validate.js

@@ -283,3 +283,31 @@ export function validatejson(val) {
   // 非对象、非数组、非字符串，或者字符串不是 JSON
   return false;
 }
+
+/** 登录密码规则提示 */
+export const LOGIN_PASSWORD_RULE_MESSAGE =
+  '密码须大于8位，且同时包含字母、数字和特殊字符（.!@#$%^&*）';
+
+/**
+ * 校验登录密码强度：大于8位，同时包含字母、数字、特殊字符（.!@#$%^&*）
+ * @param {string} password
+ * @returns {boolean}
+ */
+export function isValidLoginPassword(password) {
+  return /^(?=.*[A-Za-z])(?=.*\d)(?=.*[.!@#$%^&*]).{9,}$/.test(String(password || ''));
+}
+
+/**
+ * Element Plus / Avue 表单校验器：登录密码强度
+ */
+export function validateLoginPassword(rule, value, callback) {
+  if (value === undefined || value === null || String(value).trim() === '') {
+    callback(new Error('请输入登录密码'));
+    return;
+  }
+  if (!isValidLoginPassword(value)) {
+    callback(new Error(LOGIN_PASSWORD_RULE_MESSAGE));
+    return;
+  }
+  callback();
+}

src/views/base/airport-master.vue

@@ -94,6 +94,17 @@
           />
         </el-select>
       </template>
+      <template #detailAddress-form>
+        <el-input
+          v-model="form.detailAddress"
+          class="detail-address-input"
+          readonly
+          maxlength="255"
+          show-word-limit
+          placeholder="点击选择地图地址"
+          @click="openAddressMapPicker"
+        />
+      </template>
       <template #longitude-form>
         <el-input
           v-model="form.longitude"
@@ -121,6 +132,13 @@
         </template>
       </avue-form>
     </el-dialog>
+    <address-map-picker
+      v-model="addressMapPickerVisible"
+      :address="form.detailAddress"
+      :longitude="form.longitude"
+      :latitude="form.latitude"
+      @confirm="handleAddressMapConfirm"
+    />
   </basic-container>
 </template>
 
@@ -134,6 +152,7 @@ import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken } from '@/utils/auth';
 import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
+import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 
@@ -181,6 +200,9 @@ const addExcelRequiredHeaderMarks = async blob => {
 };
 
 export default {
+  components: {
+    AddressMapPicker,
+  },
   data() {
     const validateIataCode = (rule, value, callback) => {
       if (!/^[A-Z]{3}$/.test(String(value || '').toUpperCase())) {
@@ -220,6 +242,7 @@ export default {
       loading: true,
       data: [],
       excelBox: false,
+      addressMapPickerVisible: false,
       excelForm: {},
       provinceOptions: [],
       cityOptions: [],
@@ -368,15 +391,14 @@ export default {
           {
             label: '详细地址',
             prop: 'detailAddress',
-            type: 'textarea',
-            minRows: 2,
+            formslot: true,
             span: 24,
             minWidth: 220,
             overHidden: false,
             maxlength: 255,
             showWordLimit: true,
             rules: [
-              { required: true, message: '请输入详细地址', trigger: 'blur' },
+              { required: true, message: '请选择详细地址', trigger: 'change' },
               { max: 255, message: '详细地址不能超过255字', trigger: 'blur' },
             ],
           },
@@ -669,6 +691,29 @@ export default {
     handleCoordinateInput(prop, value) {
       this.form[prop] = normalizeCoordinateInput(value);
     },
+    openAddressMapPicker() {
+      this.addressMapPickerVisible = true;
+    },
+    handleAddressMapConfirm(payload) {
+      const selection = typeof payload === 'string' ? { address: payload } : payload || {};
+      if (selection.address) {
+        this.form.detailAddress = selection.address;
+      }
+      if (
+        selection.longitude !== undefined &&
+        selection.longitude !== null &&
+        selection.longitude !== ''
+      ) {
+        this.form.longitude = Number(selection.longitude).toFixed(6);
+      }
+      if (
+        selection.latitude !== undefined &&
+        selection.latitude !== null &&
+        selection.latitude !== ''
+      ) {
+        this.form.latitude = Number(selection.latitude).toFixed(6);
+      }
+    },
     normalizeRow(row) {
       row.code = row.iataCode ? `JC-${row.iataCode}` : row.code;
       row.regionCode = String(row.regionCode || '').trim();
@@ -917,4 +962,13 @@ export default {
     white-space: nowrap;
   }
 }
+
+.detail-address-input {
+  cursor: pointer;
+
+  :deep(.el-input__wrapper),
+  :deep(.el-input__inner) {
+    cursor: pointer;
+  }
+}
 </style>

src/views/base/common-address.vue

@@ -233,8 +233,8 @@
         </el-button>
       </div>
       <div class="map-picker-content">
-        <map-search-results :results="mapSearchResults" @select="selectMapSearchResult" />
         <div ref="amap" class="common-address-page__map"></div>
+        <map-search-results :results="mapSearchResults" @select="selectMapSearchResult" />
       </div>
       <div class="common-address-page__map-info">
         <span>{{ mapStatus }}</span>
@@ -270,6 +270,7 @@ import { createOption } from '@/option/base/common-address';
 import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { getToken } from '@/utils/auth';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { isMobile } from '@/utils/validate';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
@@ -1117,12 +1118,7 @@ export default {
           this.ensureAmapGeocoder()
             .then(() => this.runAmapGeocode('location', keyword))
             .then(result => {
-              this.mapSearchResults = (result.geocodes || []).map((item, index) => ({
-                id: item.id || index,
-                name: item.formattedAddress || keyword,
-                address: item.formattedAddress || keyword,
-                location: item.location,
-              }));
+              this.mapSearchResults = normalizeMapSearchResults(result, keyword);
               const point = this.resolveMapPoint(result);
               if (!point) {
                 this.mapStatus = '未找到匹配地址';

src/views/base/port-terminal.vue

@@ -194,10 +194,11 @@
         <el-input
           v-model="form.detailAddress"
           class="detail-address-input"
-          clearable
+          readonly
           maxlength="255"
           show-word-limit
-          placeholder="请输入"
+          placeholder="点击选择地图地址"
+          @click="openAddressMapPicker"
         />
       </template>
       <template #remark-form>
@@ -244,6 +245,13 @@
         </template>
       </avue-form>
     </el-dialog>
+    <address-map-picker
+      v-model="addressMapPickerVisible"
+      :address="form.detailAddress"
+      :longitude="form.longitude"
+      :latitude="form.latitude"
+      @confirm="handleAddressMapConfirm"
+    />
   </basic-container>
 </template>
 
@@ -264,12 +272,16 @@ import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken } from '@/utils/auth';
 import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
+import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 
 const DEFAULT_COUNTRY_CODE = '+86';
 const newLocal = '请选择类型';
 export default {
+  components: {
+    AddressMapPicker,
+  },
   data() {
     const validateCode = (rule, value, callback) => {
       const code = String(value || '').toUpperCase();
@@ -315,6 +327,7 @@ export default {
       loading: true,
       data: [],
       excelBox: false,
+      addressMapPickerVisible: false,
       excelForm: {},
       portOptions: [],
       countryOptions: [],
@@ -572,11 +585,11 @@ export default {
             minWidth: 220,
             overHidden: false,
             order: 85,
-            placeholder: '请输入',
+            placeholder: '点击选择地图地址',
             maxlength: 255,
             showWordLimit: true,
             rules: [
-              { required: true, message: '请输入详细地址', trigger: 'blur' },
+              { required: true, message: '请选择详细地址', trigger: 'change' },
               { max: 255, message: '详细地址不能超过255字', trigger: 'blur' },
             ],
           },
@@ -1040,6 +1053,21 @@ export default {
     handleCoordinateInput(prop, value) {
       this.form[prop] = normalizeCoordinateInput(value);
     },
+    openAddressMapPicker() {
+      this.addressMapPickerVisible = true;
+    },
+    handleAddressMapConfirm(payload) {
+      const selection = typeof payload === 'string' ? { address: payload } : payload || {};
+      if (selection.address) {
+        this.form.detailAddress = selection.address;
+      }
+      if (selection.longitude !== undefined && selection.longitude !== null && selection.longitude !== '') {
+        this.form.longitude = Number(selection.longitude).toFixed(6);
+      }
+      if (selection.latitude !== undefined && selection.latitude !== null && selection.latitude !== '') {
+        this.form.latitude = Number(selection.latitude).toFixed(6);
+      }
+    },
     resolveCountryCode(country) {
       if (!country) {
         return Promise.resolve('');
@@ -1107,7 +1135,7 @@ export default {
         return false;
       }
       if (isBlank(row.detailAddress)) {
-        this.$message.warning('请输入详细地址');
+        this.$message.warning('请选择详细地址');
         return false;
       }
       if (isBlank(row.longitude)) {
@@ -1399,6 +1427,15 @@ export default {
   line-height: 20px;
   padding: 4px 0;
 }
+
+.detail-address-input {
+  cursor: pointer;
+
+  :deep(.el-input__wrapper),
+  :deep(.el-input__inner) {
+    cursor: pointer;
+  }
+}
 </style>
 
 <style lang="scss">

src/views/base/railway-station.vue

@@ -94,6 +94,17 @@
           />
         </el-select>
       </template>
+      <template #detailAddress-form>
+        <el-input
+          v-model="form.detailAddress"
+          class="detail-address-input"
+          readonly
+          maxlength="255"
+          show-word-limit
+          placeholder="点击选择地图地址"
+          @click="openAddressMapPicker"
+        />
+      </template>
       <template #longitude-form>
         <el-input
           v-model="form.longitude"
@@ -121,6 +132,13 @@
         </template>
       </avue-form>
     </el-dialog>
+    <address-map-picker
+      v-model="addressMapPickerVisible"
+      :address="form.detailAddress"
+      :longitude="form.longitude"
+      :latitude="form.latitude"
+      @confirm="handleAddressMapConfirm"
+    />
   </basic-container>
 </template>
 
@@ -134,12 +152,16 @@ import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken } from '@/utils/auth';
 import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
+import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 
 const DEFAULT_COUNTRY_CODE = '+86';
 
 export default {
+  components: {
+    AddressMapPicker,
+  },
   data() {
     const validateTmisCode = (rule, value, callback) => {
       if (!/^\d{5}$/.test(value || '')) {
@@ -185,6 +207,7 @@ export default {
       loading: true,
       data: [],
       excelBox: false,
+      addressMapPickerVisible: false,
       excelForm: {},
       provinceOptions: [],
       cityOptions: [],
@@ -340,15 +363,14 @@ export default {
           {
             label: '详细地址',
             prop: 'detailAddress',
-            type: 'textarea',
-            minRows: 2,
+            formslot: true,
             span: 24,
             minWidth: 220,
             overHidden: false,
             maxlength: 255,
             showWordLimit: true,
             rules: [
-              { required: true, message: '请输入详细地址', trigger: 'blur' },
+              { required: true, message: '请选择详细地址', trigger: 'change' },
               { max: 255, message: '详细地址不能超过255字', trigger: 'blur' },
             ],
           },
@@ -652,6 +674,29 @@ export default {
     handleCoordinateInput(prop, value) {
       this.form[prop] = normalizeCoordinateInput(value);
     },
+    openAddressMapPicker() {
+      this.addressMapPickerVisible = true;
+    },
+    handleAddressMapConfirm(payload) {
+      const selection = typeof payload === 'string' ? { address: payload } : payload || {};
+      if (selection.address) {
+        this.form.detailAddress = selection.address;
+      }
+      if (
+        selection.longitude !== undefined &&
+        selection.longitude !== null &&
+        selection.longitude !== ''
+      ) {
+        this.form.longitude = Number(selection.longitude).toFixed(6);
+      }
+      if (
+        selection.latitude !== undefined &&
+        selection.latitude !== null &&
+        selection.latitude !== ''
+      ) {
+        this.form.latitude = Number(selection.latitude).toFixed(6);
+      }
+    },
     normalizeRow(row) {
       row.code = row.tmisCode ? `TL${row.tmisCode}` : row.code;
       row.regionCode = String(row.regionCode || '').trim();
@@ -910,9 +955,16 @@ export default {
   :deep(.el-table td .cell) {
     white-space: nowrap;
   }
-
 }
 
+.detail-address-input {
+  cursor: pointer;
+
+  :deep(.el-input__wrapper),
+  :deep(.el-input__inner) {
+    cursor: pointer;
+  }
+}
 </style>
 
 <style lang="scss">

src/views/business/common-route.vue

@@ -289,8 +289,8 @@
         </el-button>
       </div>
       <div class="map-picker-content">
-        <map-search-results :results="routeMapSearchResults" @select="selectRouteMapSearchResult" />
         <div ref="routeAmap" class="common-route-page__map"></div>
+        <map-search-results :results="routeMapSearchResults" @select="selectRouteMapSearchResult" />
       </div>
       <div class="common-route-page__map-info">
         <span>{{ routeMapStatus }}</span>
@@ -323,6 +323,7 @@ import { addressTypeOptions } from '@/option/base/common-address';
 import { config, excelOption, option } from '@/option/business/common-route';
 import { getToken } from '@/utils/auth';
 import { openImportDialog } from '@/utils/import-excel';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
 import { List, Search } from '@element-plus/icons-vue';
@@ -616,12 +617,7 @@ export default {
         })
         .then(() => this.runAmapGeocode('location', keyword))
         .then(result => {
-          this.routeMapSearchResults = (result.geocodes || []).map((item, index) => ({
-            id: item.id || index,
-            name: item.formattedAddress || keyword,
-            address: item.formattedAddress || keyword,
-            location: item.location,
-          }));
+          this.routeMapSearchResults = normalizeMapSearchResults(result, keyword);
           const point = this.resolveMapPoint(result);
           if (!point) {
             this.routeMapStatus = '未找到匹配地址';

src/views/business/components/billing-plan-editor.vue

@@ -162,9 +162,9 @@
             v-model="row.billingUnit"
             clearable
             filterable
-            :disabled="!row.billingElement"
+            :disabled="!canSelectBillingUnit(row)"
             :loading="unitLoading"
-            :placeholder="row.billingElement ? '请选择' : '请先选择计费要素'"
+            :placeholder="billingUnitPlaceholder(row)"
             ><el-option
               v-for="item in unitOptionsFor(row)"
               :key="item.id || item.value"
@@ -381,11 +381,18 @@ import { getDictionary } from '@/api/system/dictbiz';
 import SectionCard from '@/components/section-card/main.vue';
 
 const clone = value => JSON.parse(JSON.stringify(value));
-/** 计费要素与计量单位维度的对应关系 */
+/** 计费要素与计量单位维度的对应关系（这些要素可选计费单位） */
 const BILLING_ELEMENT_DIMENSION_MAP = {
   按重量: '重量',
   按体积: '体积',
-  按车辆: '数量',
+  按数量: '数量',
+};
+const BILLING_UNIT_SELECTABLE_ELEMENTS = Object.keys(BILLING_ELEMENT_DIMENSION_MAP);
+/** 固定计费单位（不可编辑） */
+const FIXED_BILLING_UNIT_MAP = {
+  按里程: '公里',
+  '按吨·公里': '吨公里',
+  '固定金额（整单一口价）': '单',
 };
 const defaultRule = () => ({
   feeType: '',
@@ -436,7 +443,6 @@ export default {
       billingElements: [
         '按重量',
         '按体积',
-        '按车辆',
         '按里程',
         '按吨·公里',
         '固定金额（整单一口价）',
@@ -445,7 +451,6 @@ export default {
       typeMap: {
         按重量: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'],
         按体积: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'],
-        按车辆: ['固定单价'],
         按里程: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'],
         '按吨·公里': ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'],
         '固定金额（整单一口价）': ['固定一口价'],
@@ -560,6 +565,7 @@ export default {
         next.limitRanges = next.limitRanges.map(item => ({ ...item, minimumBillingWeight: '' }));
       this.syncLegacyLimit(next);
       next.matchCondition = { ...defaultRule().matchCondition, ...(rule.matchCondition || {}) };
+      this.syncBillingUnit(next);
       return next;
     },
     normalizeRanges(row) {
@@ -651,7 +657,26 @@ export default {
     measurementDimension(billingElement) {
       return BILLING_ELEMENT_DIMENSION_MAP[billingElement] || '';
     },
+    fixedBillingUnit(billingElement) {
+      return FIXED_BILLING_UNIT_MAP[String(billingElement || '').trim()] || '';
+    },
+    canSelectBillingUnit(row) {
+      return BILLING_UNIT_SELECTABLE_ELEMENTS.includes(String(row?.billingElement || '').trim());
+    },
+    billingUnitPlaceholder(row) {
+      if (!row?.billingElement) return '请先选择计费要素';
+      if (this.fixedBillingUnit(row.billingElement)) return this.fixedBillingUnit(row.billingElement);
+      if (!this.canSelectBillingUnit(row)) return '当前计费要素无需选择';
+      return '请选择';
+    },
     unitOptionsFor(row) {
+      const fixedUnit = this.fixedBillingUnit(row?.billingElement);
+      if (fixedUnit) {
+        return [{ id: fixedUnit, label: fixedUnit, value: fixedUnit }];
+      }
+      if (!this.canSelectBillingUnit(row)) {
+        return [];
+      }
       const dimension = this.measurementDimension(row?.billingElement);
       if (dimension) {
         return this.measurementUnits
@@ -663,15 +688,18 @@ export default {
           }))
           .filter(item => item.value);
       }
-      return (this.unitOptions || [])
-        .map(item => ({
-          id: item.id || item.dictKey || item.dictValue,
-          label: item.dictValue,
-          value: item.dictValue,
-        }))
-        .filter(item => item.value);
+      return [];
     },
     syncBillingUnit(row) {
+      const fixedUnit = this.fixedBillingUnit(row?.billingElement);
+      if (fixedUnit) {
+        row.billingUnit = fixedUnit;
+        return;
+      }
+      if (!this.canSelectBillingUnit(row)) {
+        row.billingUnit = '';
+        return;
+      }
       const options = this.unitOptionsFor(row);
       if (!options.some(item => String(item.value) === String(row.billingUnit || ''))) {
         row.billingUnit = '';
@@ -892,7 +920,6 @@ export default {
         ['taxRate', '税率'],
         ['billingElement', '计费要素'],
         ['billingType', '计费类型'],
-        ['billingUnit', '计费单位'],
       ];
       for (const [i, row] of this.draft.rules.entries()) {
         const empty = required.find(
@@ -902,6 +929,15 @@ export default {
           this.$message.warning(`第${i + 1}行${empty[1]}不能为空`);
           return false;
         }
+        if (
+          this.canSelectBillingUnit(row) &&
+          (row.billingUnit === undefined ||
+            row.billingUnit === null ||
+            String(row.billingUnit).trim() === '')
+        ) {
+          this.$message.warning(`第${i + 1}行计费单位不能为空`);
+          return false;
+        }
         const feeItem = String(row.feeItem).trim();
         if (feeItemSet.has(feeItem)) {
           this.$message.warning(`费用项“${feeItem}”不能重复`);

src/views/business/components/business-crud-page.vue

@@ -1899,11 +1899,11 @@
             label-width="auto"
             class="business-crud-page__module-form business-crud-page__module-form--three"
           >
-            <el-form-item label="账单起始日期" required :error="settlementRuleErrors.billStartDate">
+            <el-form-item label="账单起始日" required :error="settlementRuleErrors.billStartDate">
               <el-date-picker
                 v-model="settlementRuleForm.billStartDate"
                 type="date"
-                placeholder="请选择账单起始日期"
+                placeholder="请选择账单起始日"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 :disabled="dialogReadonly"
@@ -2478,7 +2478,7 @@
                 {{ formatTransportPlanDetailTransportType(waybillTransportMode(detailRow)) }}
               </span>
               <el-link
-                v-if="detailRow.id"
+                v-if="detailRow.id && canChangeWaybillRoute(detailRow)"
                 class="business-crud-page__waybill-route-change-link"
                 type="primary"
                 @click="openWaybillRouteChangeDialog"
@@ -2947,35 +2947,6 @@
               </el-table-column>
             </el-table>
           </section-card>
-          <section-card title="路线编辑">
-            <template #extra>
-              <span class="business-crud-page__route-change-hint">拖拽调整顺序</span>
-            </template>
-            <div
-              v-if="waybillRouteChangeNodes.length"
-              class="business-crud-page__route-change-list"
-            >
-              <div
-                v-for="(node, index) in waybillRouteChangeNodes"
-                :key="node.key || index"
-                class="business-crud-page__route-change-item"
-                draggable="true"
-                @dragstart="handleWaybillRouteChangeDragStart(index)"
-                @dragover.prevent
-                @drop="handleWaybillRouteChangeDrop(index)"
-              >
-                <span class="business-crud-page__route-change-type">
-                  {{ waybillRouteChangeTypeText(index) }}
-                </span>
-                <span>{{ node.address }}</span>
-                <span class="business-crud-page__route-change-tags">
-                  <el-tag v-for="tag in node.tags || []" :key="tag" size="small">{{ tag }}</el-tag>
-                </span>
-                <el-icon><Rank /></el-icon>
-              </div>
-            </div>
-            <el-empty v-else description="暂无路线" :image-size="60" />
-          </section-card>
           <el-form label-width="auto">
             <el-form-item label="变更备注" style="margin-top: 8px">
               <el-input
@@ -4036,7 +4007,7 @@
               </el-input>
               <div class="business-crud-page__dispatch-quantity-hint">
                 剩余数量：{{
-                  formatDispatchQuantity(dispatchItemRemainingQuantity(dispatchItemForm))
+                  formatDispatchQuantity(dispatchItemHintRemainingQuantity(dispatchItemForm))
                 }}
                 {{ dispatchItemForm.quantityUnit || '吨' }}
               </div>
@@ -4093,7 +4064,11 @@
               </el-input>
             </el-form-item>
             <el-form-item label="其他费用合计">
-              <el-input v-model="dispatchItemForm.otherFeeTotal" placeholder="请输入">
+              <el-input
+                v-model="dispatchItemForm.otherFeeTotal"
+                placeholder="请输入"
+                @input="value => handleDispatchNumberInput('otherFeeTotal', value)"
+              >
                 <template #suffix>{{ dispatchItemFreightCurrencyLabel }}</template>
               </el-input>
             </el-form-item>
@@ -5025,8 +5000,8 @@
         </el-button>
       </div>
       <div class="map-picker-content">
-        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
         <div ref="transportAmap" class="business-crud-page__map"></div>
+        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
       </div>
       <div class="business-crud-page__map-info">
         <span>{{ transportMapStatus }}</span>
@@ -5300,7 +5275,7 @@ import {
   getVoucherImages as getProcessConfigVoucherImages,
 } from '@/api/business/process-config';
 import { getList as getCarrierCustomerList } from '@/api/vehicle/customer-archive';
-import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
 import { getDictionary } from '@/api/system/dictbiz';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { addressTypeOptions } from '@/option/base/common-address';
@@ -5308,10 +5283,11 @@ import { packageOptions } from '@/option/business/common';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken } from '@/utils/auth';
 import { openImportDialog } from '@/utils/import-excel';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { applyTableMenuWidth } from '@/utils/table-menu';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
-import { Location, OfficeBuilding, Rank, Search } from '@element-plus/icons-vue';
+import { Location, OfficeBuilding, Search } from '@element-plus/icons-vue';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import {
@@ -5574,7 +5550,6 @@ export default {
   components: {
     BillingPlanEditor,
     PageAvueForm,
-    Rank,
     ElImageViewer,
     OpenFileViewer,
   },
@@ -5637,7 +5612,6 @@ export default {
       waybillRouteChangeNodes: [],
       waybillRouteChangeRemark: '',
       waybillRouteChangeRecords: [],
-      waybillRouteChangeDragIndex: -1,
       waybillRouteChangeSaving: false,
       mileageDialog: {
         visible: false,
@@ -6371,19 +6345,21 @@ export default {
       if (this.dispatchItemForm.taskEntryMode !== 'full') {
         const quantity = Number(this.dispatchItemForm.quantity || 0);
         const unitPrice = Number(this.dispatchItemForm.unitPrice || 0);
-        const otherFeeTotal = Number(this.dispatchItemForm.otherFeeTotal || 0);
+        const otherFeeRaw = this.normalizeDispatchFeeValue(this.dispatchItemForm.otherFeeTotal);
+        const otherFeeTotal = Number(otherFeeRaw || 0);
         const hasFreight = this.dispatchItemForm.unitPrice !== '' && quantity > 0;
-        const hasOtherFee = this.dispatchItemForm.otherFeeTotal !== '';
+        const hasOtherFee = otherFeeRaw !== '';
         if (!hasFreight && !hasOtherFee) return '';
         const total = (hasFreight ? quantity * unitPrice : 0) + (hasOtherFee ? otherFeeTotal : 0);
         return Number.isInteger(total) ? String(total) : String(Number(total.toFixed(2)));
       }
-      const otherFeeTotal = Number(this.dispatchItemForm.otherFeeTotal || 0);
+      const otherFeeRaw = this.normalizeDispatchFeeValue(this.dispatchItemForm.otherFeeTotal);
+      const otherFeeTotal = Number(otherFeeRaw || 0);
       const freightTotal = this.dispatchItemCargoRows.reduce(
         (total, cargo) => total + Number(this.dispatchCargoFreightAmount(cargo) || 0),
         0
       );
-      const hasOtherFee = this.dispatchItemForm.otherFeeTotal !== '';
+      const hasOtherFee = otherFeeRaw !== '';
       if (!freightTotal && !hasOtherFee) return '';
       const total = freightTotal + (hasOtherFee ? otherFeeTotal : 0);
       return Number.isInteger(total) ? String(total) : String(Number(total.toFixed(2)));
@@ -7438,7 +7414,7 @@ export default {
         : [];
     },
     openWaybillRouteChangeDialog() {
-      if (!this.detailRow.id) return;
+      if (!this.detailRow.id || !this.canChangeWaybillRoute(this.detailRow)) return;
       this.restoreWaybillRouteChangeRecords();
       this.waybillRouteChangeTab = 'change';
       this.waybillRouteChangeRemark = '';
@@ -7455,22 +7431,11 @@ export default {
       this.waybillRouteChangeNodes = this.buildWaybillRouteNodes(this.waybillRouteChangeRows);
       this.waybillRouteChangeBox = true;
     },
-    waybillRouteChangeTypeText(index) {
-      if (index === 0) return '起';
-      if (index === this.waybillRouteChangeNodes.length - 1) return '终';
-      return '经';
-    },
-    handleWaybillRouteChangeDragStart(index) {
-      this.waybillRouteChangeDragIndex = index;
-    },
-    handleWaybillRouteChangeDrop(index) {
-      if (this.waybillRouteChangeDragIndex < 0 || this.waybillRouteChangeDragIndex === index)
-        return;
-      const nodes = [...this.waybillRouteChangeNodes];
-      const [node] = nodes.splice(this.waybillRouteChangeDragIndex, 1);
-      nodes.splice(index, 0, node);
-      this.waybillRouteChangeNodes = nodes;
-      this.waybillRouteChangeDragIndex = -1;
+    canChangeWaybillRoute(row = {}) {
+      const status = String(this.statusValue(row) || row.businessStatus || row.status || '');
+      if (status === 'completed') return false;
+      const statusName = String(row.businessStatusName || row.statusName || '');
+      return !statusName.includes('已完成');
     },
     updateWaybillRouteChangeNodes() {
       this.waybillRouteChangeNodes = this.buildWaybillRouteNodes(this.waybillRouteChangeRows);
@@ -7519,9 +7484,8 @@ export default {
         row.departureAddress !== row.originalDepartureAddress ||
         row.arrivalAddress !== row.originalArrivalAddress;
       const routeJson = JSON.stringify(this.waybillRouteChangeNodes);
-      const originalRouteJson = this.detailRow.routeJson || '';
-      if (!changed && routeJson === originalRouteJson && !this.waybillRouteChangeRemark) {
-        this.$message.warning('请修改地址、调整路线或填写变更备注');
+      if (!changed && !this.waybillRouteChangeRemark) {
+        this.$message.warning('请修改地址或填写变更备注');
         return;
       }
       if (typeof this.api.changeRoute !== 'function') {
@@ -7529,11 +7493,9 @@ export default {
         return;
       }
 
-      const content = changed
-        ? `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress || '-'} → ${
-            row.departureAddress || '-'
-          }；到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`
-        : '调整运输路线顺序';
+      const content = `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress || '-'} → ${
+        row.departureAddress || '-'
+      }；到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`;
       const records = [
         {
           changeTime: this.$dayjs().format('YYYY-MM-DD HH:mm:ss'),
@@ -7784,8 +7746,8 @@ export default {
       const rule = this.normalizeSettlementRule(source);
       this.settlementRuleErrors = {};
       if (this.isBillingFieldEmpty(rule.billStartDate)) {
-        this.settlementRuleErrors = { billStartDate: '请选择账单起始日期' };
-        this.$message.warning(`${label}${label ? '：' : ''}请选择账单起始日期`);
+        this.settlementRuleErrors = { billStartDate: '请选择账单起始日' };
+        this.$message.warning(`${label}${label ? '：' : ''}请选择账单起始日`);
         return false;
       }
       if (this.isBillingFieldEmpty(rule.settlementType)) {
@@ -8964,6 +8926,7 @@ export default {
         this.form.carrierContractId = '';
       }
       this.form.carrierType = nextValue;
+      this.clearTaskDriverVehicleFields();
       if (this.isWaybillDetailLayout) {
         this.taskCarrierRequestId += 1;
         this.taskCarrierOptions = [];
@@ -9081,25 +9044,58 @@ export default {
     },
     handleTaskCarrierChange(value) {
       const carrier = this.taskCarrierOptions.find(item =>
-        [item.value, item.customerName, item.carrierName, item.fullName, item.name].some(name =>
-          String(name || '') === String(value || '')
-        )
+        [
+          item.value,
+          item.customerName,
+          item.carrierName,
+          item.fullName,
+          item.name,
+          item.carrierContractId,
+        ].some(name => String(name || '') === String(value || ''))
       );
       if (this.isWaybillDetailLayout && this.form.carrierType === '承运商') {
         this.form.carrierContractId = carrier?.carrierContractId || '';
         this.form.carrierId = carrier?.carrierId || '';
         this.form.carrierName = carrier?.carrierName || value || '';
-        return;
+      } else {
+        this.form.carrierId = carrier?.id || carrier?.carrierId || '';
+        this.form.carrierName = value || '';
       }
-      this.form.carrierId = carrier?.id || '';
-      this.form.carrierName = value || '';
+      this.clearTaskDriverVehicleFields();
+    },
+    clearTaskDriverVehicleFields() {
+      this.form.driverId = '';
+      this.form.driverName = '';
+      this.form.driverPhone = '';
+      this.form.vehicleNo = '';
+      this.form.trailerVehicleNo = '';
+      this.form.escortName = '';
+      this.form.escortPhone = '';
+      this.taskDriverOptions = [];
+    },
+    getActiveCarrierFilter() {
+      if (this.dispatchItemBox) {
+        return {
+          carrierId: this.dispatchItemForm.carrierId || '',
+          carrierName: this.dispatchItemForm.carrierName || '',
+        };
+      }
+      return {
+        carrierId: this.form.carrierId || '',
+        carrierName: this.form.carrierName || '',
+      };
     },
     loadTaskDriverOptions() {
       if (!this.taskInfoFormEnabled || this.taskDriverLoading) return Promise.resolve([]);
+      const carrier = this.getActiveCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        this.taskDriverOptions = [];
+        return Promise.resolve([]);
+      }
       this.taskDriverLoading = true;
-      return getDriverList(1, 9999, {})
-        .then(res => {
-          this.taskDriverOptions = extractRecords(res);
+      return fetchDriversByCarrierOrganizations({ size: 9999, posts: '司机' }, carrier)
+        .then(records => {
+          this.taskDriverOptions = records;
           return this.taskDriverOptions;
         })
         .finally(() => {
@@ -9108,10 +9104,17 @@ export default {
     },
     fetchTaskDriverSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getActiveCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.taskDriverLoading = true;
-      getDriverList(1, 20, keyword ? { driverName: keyword } : {})
-        .then(res => {
-          const records = extractRecords(res);
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+        carrier
+      )
+        .then(records => {
           this.taskDriverOptions = records;
           callback(
             records.map(item => ({
@@ -10284,12 +10287,7 @@ export default {
           this.ensureTransportAmapGeocoder()
             .then(() => this.runAmapGeocode('location', keyword))
             .then(result => {
-              this.transportMapSearchResults = (result.geocodes || []).map((item, index) => ({
-                id: item.id || index,
-                name: item.formattedAddress || keyword,
-                address: item.formattedAddress || keyword,
-                location: item.location,
-              }));
+              this.transportMapSearchResults = normalizeMapSearchResults(result, keyword);
               const point = this.resolveMapPoint(result);
               if (!point) {
                 this.transportMapStatus = '未找到匹配地址';
@@ -12805,6 +12803,9 @@ export default {
         ...baseRow,
         ...(index >= 0 ? row : {}),
       };
+      this.dispatchItemForm.otherFeeTotal = this.normalizeDispatchFeeValue(
+        this.dispatchItemForm.otherFeeTotal
+      );
       this.dispatchItemForm.carrierType = this.dispatchItemForm.carrierType || '承运商';
       const goodsRows = this.parseJsonArray(this.dispatchItemForm.goodsJson);
       this.dispatchItemCargoRows = (goodsRows.length ? goodsRows : [this.dispatchItemForm]).map(
@@ -12861,6 +12862,7 @@ export default {
         }
       }
       this.dispatchItemForm.carrierType = nextValue;
+      this.clearDispatchDriverVehicleFields();
       this.loadDispatchCarrierOptions(this.dispatchRow);
     },
     isDispatchCarrierRequired(carrierType) {
@@ -12990,20 +12992,39 @@ export default {
       });
       if (this.dispatchIsCarrierMode) {
         this.dispatchItemForm.carrierContractId = carrier?.carrierContractId || '';
-        this.dispatchItemForm.carrierId = '';
+        this.dispatchItemForm.carrierId = carrier?.carrierId || '';
         this.dispatchItemForm.carrierName = carrier?.carrierName || '';
-        return;
+      } else {
+        this.dispatchItemForm.carrierContractId = '';
+        this.dispatchItemForm.carrierId = carrier?.id || carrier?.carrierId || '';
+        this.dispatchItemForm.carrierName = carrier?.carrierName || value || '';
       }
-      this.dispatchItemForm.carrierContractId = '';
-      this.dispatchItemForm.carrierId = carrier?.id || '';
-      this.dispatchItemForm.carrierName = carrier?.carrierName || value || '';
+      this.clearDispatchDriverVehicleFields();
+    },
+    clearDispatchDriverVehicleFields() {
+      this.dispatchItemForm.driverId = '';
+      this.dispatchItemForm.driverName = '';
+      this.dispatchItemForm.driverPhone = '';
+      this.dispatchItemForm.vehicleNo = '';
+      this.dispatchItemForm.trailerVehicleNo = '';
+      this.dispatchItemForm.escortName = '';
+      this.dispatchItemForm.escortPhone = '';
+      this.taskDriverOptions = [];
     },
     loadDispatchDriverOptions() {
       if (this.taskDriverLoading) return Promise.resolve([]);
+      const carrier = {
+        carrierId: this.dispatchItemForm.carrierId || '',
+        carrierName: this.dispatchItemForm.carrierName || '',
+      };
+      if (!carrier.carrierId && !carrier.carrierName) {
+        this.taskDriverOptions = [];
+        return Promise.resolve([]);
+      }
       this.taskDriverLoading = true;
-      return getDriverList(1, 9999, {})
-        .then(res => {
-          this.taskDriverOptions = extractRecords(res);
+      return fetchDriversByCarrierOrganizations({ size: 9999, posts: '司机' }, carrier)
+        .then(records => {
+          this.taskDriverOptions = records;
           return this.taskDriverOptions;
         })
         .finally(() => {
@@ -13080,6 +13101,11 @@ export default {
       this.dispatchItemForm[prop] =
         parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
     },
+    normalizeDispatchFeeValue(value) {
+      if (value === undefined || value === null || value === '') return '';
+      if (Number(value) === -1) return '';
+      return value;
+    },
     addDispatchCargoRow(index = -1) {
       const nextRow = this.normalizeTransportCargoRow({ priceUnit: '元/吨' });
       if (index > -1) this.dispatchItemCargoRows.splice(index + 1, 0, nextRow);
@@ -13163,6 +13189,12 @@ export default {
         }, 0)
       );
     },
+    /** 精简录入提示：可调度余量扣减当前本次数量后的剩余 */
+    dispatchItemHintRemainingQuantity(row = {}) {
+      const available = this.dispatchItemRemainingQuantity(row);
+      const current = this.parseDispatchQuantity(row.quantity);
+      return Math.max(available - current, 0);
+    },
     pruneDispatchPendingRows(rows = []) {
       const planQuantities = new Map();
       this.dispatchPlanGoodsRows.forEach(goods => {
@@ -13409,14 +13441,29 @@ export default {
               }),
             ];
       const firstGoods = goodsRows[0] || {};
+      const quantitySum = goodsRows.reduce(
+        (sum, goods) => sum + this.parseDispatchQuantity(goods.quantity),
+        0
+      );
+      const quantityText = quantitySum
+        ? this.formatDispatchQuantity(quantitySum)
+        : firstGoods.quantity || this.dispatchItemForm.quantity || '';
+      const otherFeeTotal = this.normalizeDispatchFeeValue(this.dispatchItemForm.otherFeeTotal);
       const nextRow = {
         ...this.dispatchItemForm,
         goodsJson: JSON.stringify(goodsRows),
         cargoType: firstGoods.cargoType || this.dispatchItemForm.cargoType || '',
         cargoTypeCode: firstGoods.cargoTypeCode || this.dispatchItemForm.cargoTypeCode || '',
         cargoTypePath: firstGoods.cargoTypePath || this.dispatchItemForm.cargoTypePath || [],
-        cargoName: firstGoods.cargoName || this.dispatchItemForm.cargoName || '',
-        quantity: firstGoods.quantity || this.dispatchItemForm.quantity || '',
+        cargoName:
+          goodsRows
+            .map(goods => goods.cargoName || goods.goodsName || '')
+            .filter(Boolean)
+            .join('.') ||
+          firstGoods.cargoName ||
+          this.dispatchItemForm.cargoName ||
+          '',
+        quantity: quantityText,
         quantityUnit: firstGoods.quantityUnit || this.dispatchItemForm.quantityUnit || '',
         unitPrice: firstGoods.unitPrice || '',
         priceUnit: firstGoods.priceUnit || '',
@@ -13424,7 +13471,7 @@ export default {
         freightJson: JSON.stringify({
           currency: this.dispatchItemForm.freightCurrency || 'CNY',
           totalFreightAmount: this.dispatchItemFreightSubtotal,
-          otherFreightAmount: this.dispatchItemForm.otherFeeTotal || '',
+          otherFreightAmount: otherFeeTotal,
           freightItems: goodsRows.map((cargo, index) => ({
             cargoIndex: index,
             cargoName: cargo.cargoName || '',
@@ -13440,7 +13487,7 @@ export default {
       };
       nextRow.cargoInfo = this.formatDispatchCargoInfo({}, nextRow);
       nextRow.freight = this.getDispatchFeeFields({}, nextRow).freight;
-      nextRow.otherFeeTotal = this.dispatchItemForm.otherFeeTotal || '';
+      nextRow.otherFeeTotal = otherFeeTotal;
       const quantityUnit = this.getDispatchQuantityUnit(nextRow);
       const otherDispatchedQuantity = this.dispatchRows.reduce((total, row, index) => {
         if (

src/views/business/components/contract-attachment-section.vue

@@ -1,94 +1,102 @@
 <template>
-  <section
-    class="contract-manage-form__section contract-manage-form__section--panel contract-manage-form__section--attachment"
-  >
-    <div class="contract-manage-form__attachment-head">
-      <div class="dialog-section-title">{{ title }}</div>
-      <el-button type="primary" :disabled="!rows.length" @click="batchDownload">批量下载</el-button>
-    </div>
-    <el-table
-      :data="rows"
-      border
-      class="contract-manage-form__attachment-table"
-      @selection-change="selected = $event"
+  <div class="contract-attachment-section">
+    <section
+      v-if="!dialogOnly"
+      class="contract-manage-form__section contract-manage-form__section--panel contract-manage-form__section--attachment"
     >
-      <el-table-column v-if="!readonly" type="selection" width="55" align="center" />
-      <el-table-column type="index" label="序号" width="70" align="center" />
-      <el-table-column v-if="attachmentType" label="附件类型" min-width="160" align="center">
-        <template #default="{ row }">
-          <span v-if="readonly || isRowLocked(row)">{{ row.fileType || '-' }}</span>
-          <el-select
-            v-else
-            :model-value="row.fileType"
-            placeholder="请选择"
-            :teleported="false"
-            :fit-input-width="true"
-            @update:model-value="value => updateRowFileType(row, value)"
-          >
-            <el-option
-              v-for="item in contractAttachmentTypeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="文件名"
-        min-width="240"
-        align="left"
-        header-align="left"
-        show-overflow-tooltip
+      <div class="contract-manage-form__attachment-head">
+        <div class="dialog-section-title">{{ title }}</div>
+        <el-button type="primary" :disabled="!rows.length" @click="batchDownload"
+          >批量下载</el-button
+        >
+      </div>
+      <el-table
+        :data="rows"
+        border
+        class="contract-manage-form__attachment-table"
+        @selection-change="selected = $event"
       >
-        <template #default="{ row }">
-          <el-link type="primary" @click="preview?.(row, rows)">{{ attachmentName(row) }}</el-link>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="description" label="附件描述" min-width="220">
-        <template #default="{ row }">
-          <span v-if="readonly || isRowLocked(row)">{{ row.description || '-' }}</span>
-          <el-input
-            v-else
-            :model-value="row.description"
-            maxlength="200"
-            @update:model-value="value => updateRowDescription(row, value)"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="文件大小" width="120" align="center">
-        <template #default="{ row }">{{ formatSize(row.size) }}</template>
-      </el-table-column>
-      <el-table-column prop="uploadUserName" label="上传人" width="140" align="center" />
-      <el-table-column prop="uploadTime" label="上传时间" width="180" align="center" sortable />
-      <el-table-column v-if="!readonly" label="操作" width="100" align="center" fixed="right">
-        <template #default="{ row, $index }">
-          <span v-if="isRowLocked(row)">-</span>
-          <el-link v-else type="danger" @click="remove($index)">删除</el-link>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column v-if="!readonly" type="selection" width="55" align="center" />
+        <el-table-column type="index" label="序号" width="70" align="center" />
+        <el-table-column v-if="attachmentType" label="附件类型" min-width="160" align="center">
+          <template #default="{ row, $index }">
+            <span v-if="readonly || isRowLocked(row)">{{ row.fileType || '-' }}</span>
+            <el-select
+              v-else
+              :model-value="row.fileType"
+              placeholder="请选择"
+              style="width: 100%"
+              teleported
+              clearable
+              @update:model-value="value => updateRowFileType($index, value)"
+            >
+              <el-option
+                v-for="item in contractAttachmentTypeOptions"
+                :key="`${item.value}-${item.label}`"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="文件名"
+          min-width="240"
+          align="left"
+          header-align="left"
+          show-overflow-tooltip
+        >
+          <template #default="{ row }">
+            <el-link type="primary" @click="preview?.(row, rows)">{{
+              attachmentName(row)
+            }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="description" label="附件描述" min-width="220">
+          <template #default="{ row, $index }">
+            <span v-if="readonly || isRowLocked(row)">{{ row.description || '-' }}</span>
+            <el-input
+              v-else
+              :model-value="row.description"
+              maxlength="200"
+              @update:model-value="value => updateRowDescription($index, value)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="文件大小" width="120" align="center">
+          <template #default="{ row }">{{ formatSize(row.size) }}</template>
+        </el-table-column>
+        <el-table-column prop="uploadUserName" label="上传人" width="140" align="center" />
+        <el-table-column prop="uploadTime" label="上传时间" width="180" align="center" sortable />
+        <el-table-column v-if="!readonly" label="操作" width="100" align="center" fixed="right">
+          <template #default="{ row, $index }">
+            <span v-if="isRowLocked(row)">-</span>
+            <el-link v-else type="danger" @click="remove($index)">删除</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <div v-if="!readonly" class="contract-manage-form__attachment-upload">
-      <template v-if="useUploadDialog">
-        <el-button type="primary" plain @click="openUploadDialog">上传附件</el-button>
-        <span class="contract-manage-form__attachment-tip">
-          支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过50M
-        </span>
-      </template>
-      <vehicle-attachment-upload
-        v-else
-        :model-value="rows"
-        :file-types="attachmentFileTypes"
-        :max-size="50"
-        show-tip
-        tip="支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过50M"
-        :show-file-list="false"
-        button-text="上传附件"
-        @update:model-value="handleChange"
-        @change="handleChange"
-      />
-    </div>
+      <div v-if="!readonly" class="contract-manage-form__attachment-upload">
+        <template v-if="useUploadDialog">
+          <el-button type="primary" plain @click="openUploadDialog">上传附件</el-button>
+          <span class="contract-manage-form__attachment-tip">
+            支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过50M
+          </span>
+        </template>
+        <vehicle-attachment-upload
+          v-else
+          :model-value="rows"
+          :file-types="attachmentFileTypes"
+          :max-size="50"
+          show-tip
+          tip="支持pdf、bmp、jpeg、png、jpg、doc、docx、ppt、pptx、xlsx、xls、eml、msg、zip的文件格式，单个文件不超过50M"
+          :show-file-list="false"
+          button-text="上传附件"
+          @change="handleChange"
+          @success="handleUploadSuccess"
+        />
+      </div>
+    </section>
 
     <el-dialog
       v-model="uploadDialogVisible"
@@ -103,8 +111,18 @@
       <div class="contract-attachment-upload-dialog__body">
         <div class="contract-attachment-upload-dialog__field">
           <span class="contract-attachment-upload-dialog__label">附件位置</span>
-          <el-select :model-value="attachmentLocation" disabled style="width: 100%">
-            <el-option :label="attachmentLocation" :value="attachmentLocation" />
+          <el-select
+            v-model="uploadDialogLocation"
+            placeholder="请选择附件位置"
+            style="width: 100%"
+            @change="syncUploadDialogTypeByLocation"
+          >
+            <el-option
+              v-for="item in resolvedLocationOptions"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
           </el-select>
         </div>
         <div class="contract-attachment-upload-dialog__field">
@@ -144,7 +162,7 @@
         </div>
       </template>
     </el-dialog>
-  </section>
+  </div>
 </template>
 
 <script>
@@ -154,11 +172,11 @@ import { getUploadHeaders } from '@/utils/upload';
 import { downloadFileByUrl } from '@/utils/util';
 import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 
-const CONTRACT_ATTACHMENT_TYPE_OTHER = '其它文件';
+const CONTRACT_ATTACHMENT_TYPE_OTHER = '其他文件';
 export const defaultContractAttachmentTypeOptions = [
   { label: '合同文件', value: '合同文件' },
   { label: '双章归档文件', value: '双章归档文件' },
-  { label: '其它文件', value: CONTRACT_ATTACHMENT_TYPE_OTHER },
+  { label: '其他文件', value: CONTRACT_ATTACHMENT_TYPE_OTHER },
 ];
 /** @deprecated 兼容旧引用，实际选项由业务字典 contract_attachment_type 动态加载 */
 export const contractAttachmentTypeOptions = defaultContractAttachmentTypeOptions;
@@ -201,21 +219,32 @@ const normalizeAttachmentTypeText = value => {
     .replace(/[\s_\-—–·•()（）\[\]【】{}《》<>“”"'、，,。.]/g, '');
 };
 
+const isOtherAttachmentTypeOption = item => {
+  const text = `${item?.label || ''}${item?.value || ''}`;
+  return (
+    String(item?.value) === CONTRACT_ATTACHMENT_TYPE_OTHER ||
+    String(item?.value) === '其它文件' ||
+    text.includes('其他文件') ||
+    text.includes('其它文件') ||
+    text.includes('其他') ||
+    text.includes('其它')
+  );
+};
+
 const attachmentTypeKeywords = fileType => {
-  if (fileType === '双章归档文件') return ['双章归档文件', '双章归档', '双章'];
-  if (fileType === '合同文件') return ['合同文件', '合同'];
-  return [fileType];
+  const text = String(fileType || '');
+  if (text.includes('双章')) return ['双章归档文件', '双章归档', '双章'];
+  if (text.includes('合同') && !text.includes('其他') && !text.includes('其它')) {
+    return ['合同文件', '合同'];
+  }
+  if (isOtherAttachmentTypeOption({ label: text, value: text })) return [];
+  return text ? [text] : [];
 };
 
 const resolveOtherAttachmentType = (options = []) => {
   const list = options.length ? options : defaultContractAttachmentTypeOptions;
-  const matched = list.find(
-    item =>
-      String(item.value) === CONTRACT_ATTACHMENT_TYPE_OTHER ||
-      String(item.label).includes('其它') ||
-      String(item.label).includes('其他')
-  );
-  return matched?.value || list[list.length - 1]?.value || CONTRACT_ATTACHMENT_TYPE_OTHER;
+  const matched = list.find(isOtherAttachmentTypeOption);
+  return matched?.value || CONTRACT_ATTACHMENT_TYPE_OTHER;
 };
 
 export const resolveContractAttachmentType = (
@@ -223,22 +252,27 @@ export const resolveContractAttachmentType = (
   options = defaultContractAttachmentTypeOptions
 ) => {
   const list = options.length ? options : defaultContractAttachmentTypeOptions;
+  const otherType = resolveOtherAttachmentType(list);
   const values = list.map(item => item.value);
   if (values.includes(row.fileType)) return row.fileType;
+  const matchedByLabel = list.find(item => String(item.label) === String(row.fileType));
+  if (matchedByLabel) return matchedByLabel.value;
   const fileName = normalizeAttachmentTypeText(attachmentName(row));
-  const otherType = resolveOtherAttachmentType(list);
   if (!fileName) return otherType;
   const matched = list
-    .filter(item => item.value !== otherType)
+    .filter(item => !isOtherAttachmentTypeOption(item))
     .flatMap(item =>
-      attachmentTypeKeywords(item.value).map(keyword => ({
-        value: item.value,
-        keyword: normalizeAttachmentTypeText(keyword),
-      }))
+      attachmentTypeKeywords(item.value)
+        .concat(attachmentTypeKeywords(item.label))
+        .map(keyword => ({
+          value: item.value,
+          keyword: normalizeAttachmentTypeText(keyword),
+        }))
     )
     .filter(item => item.keyword)
     .sort((a, b) => b.keyword.length - a.keyword.length)
     .find(item => fileName.includes(item.keyword));
+  // 文件名未命中任何附件类型时，默认「其他文件」
   return matched?.value || otherType;
 };
 
@@ -272,16 +306,19 @@ export default {
     lockApproved: Boolean,
     markApprovedOnUpload: Boolean,
     useUploadDialog: Boolean,
+    dialogOnly: Boolean,
     attachmentLocation: { type: String, default: '合同文件' },
+    attachmentLocationOptions: { type: Array, default: null },
     preview: { type: Function, default: null },
   },
-  emits: ['update:rows'],
+  emits: ['update:rows', 'upload-to-location', 'upload-confirmed'],
   data() {
     return {
       selected: [],
       attachmentFileTypes,
       contractAttachmentTypeOptions: [...defaultContractAttachmentTypeOptions],
       uploadDialogVisible: false,
+      uploadDialogLocation: '合同文件',
       uploadDialogType: resolveOtherAttachmentType(defaultContractAttachmentTypeOptions),
       uploadDialogFiles: [],
       uploadDialogFileList: [],
@@ -300,6 +337,11 @@ export default {
     defaultAttachmentType() {
       return resolveOtherAttachmentType(this.contractAttachmentTypeOptions);
     },
+    resolvedLocationOptions() {
+      const options = (this.attachmentLocationOptions || []).filter(Boolean);
+      if (options.length) return options;
+      return ['合同文件', '其它附件'];
+    },
   },
   created() {
     this.loadAttachmentTypeOptions();
@@ -311,12 +353,28 @@ export default {
         .then(res => {
           const options = mapDictOptions(res);
           if (options.length) {
-            this.contractAttachmentTypeOptions = options;
+            // 字典缺少「其他文件」时补上，保证未匹配文件名可默认选中
+            this.contractAttachmentTypeOptions = options.some(isOtherAttachmentTypeOption)
+              ? options
+              : [...options, { label: '其他文件', value: CONTRACT_ATTACHMENT_TYPE_OTHER }];
             if (
-              !options.some(item => String(item.value) === String(this.uploadDialogType))
+              !this.contractAttachmentTypeOptions.some(
+                item => String(item.value) === String(this.uploadDialogType)
+              )
             ) {
               this.uploadDialogType = this.defaultAttachmentType;
             }
+            // 字典加载后，把已有行的中文类型名对齐到 dictKey，保证下拉可选中
+            if (this.attachmentType && (this.rows || []).length) {
+              const aligned = (this.rows || []).map(row => ({
+                ...row,
+                fileType: resolveContractAttachmentType(row, this.contractAttachmentTypeOptions),
+              }));
+              const changed = aligned.some(
+                (row, index) => row.fileType !== this.rows[index]?.fileType
+              );
+              if (changed) this.update(aligned);
+            }
           }
         })
         .catch(() => {
@@ -327,20 +385,76 @@ export default {
       return this.lockApproved && isAttachmentApproved(row);
     },
     update(rows) {
-      this.$emit('update:rows', rows);
+      this.$emit('update:rows', Array.isArray(rows) ? rows.map(item => ({ ...item })) : []);
     },
-    updateRowFileType(row, value) {
-      if (this.isRowLocked(row)) return;
-      row.fileType = value;
-      this.update([...this.rows]);
+    enrichUploadedRow(row, existing) {
+      const uploadUserName = this.$store.getters.userInfo?.realName || '';
+      const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
+      const next = {
+        ...existing,
+        ...row,
+        description: row.description || existing?.description || '',
+        uploadUserName: existing?.uploadUserName || row.uploadUserName || uploadUserName,
+        uploadTime: existing?.uploadTime || row.uploadTime || uploadTime,
+        approved: existing?.approved || row.approved || false,
+      };
+      if (this.attachmentType) {
+        next.fileType = existing?.fileType
+          ? existing.fileType
+          : resolveContractAttachmentType(
+              { ...next, fileType: '' },
+              this.contractAttachmentTypeOptions
+            );
+      }
+      if (this.markApprovedOnUpload && !existing) next.approved = true;
+      return next;
     },
-    updateRowDescription(row, value) {
-      if (this.isRowLocked(row)) return;
-      row.description = value;
-      this.update([...this.rows]);
+    findExistingRow(row, rows = this.rows) {
+      const fileUrl = attachmentUrl(row);
+      return (rows || []).find(item => {
+        const sameUid = row.uid && item.uid && String(row.uid) === String(item.uid);
+        const sameUrl = fileUrl && attachmentUrl(item) === fileUrl;
+        return sameUid || sameUrl;
+      });
+    },
+    updateRowFileType(index, value) {
+      const rows = [...(this.rows || [])];
+      const row = rows[index];
+      if (!row || this.isRowLocked(row)) return;
+      rows[index] = { ...row, fileType: value };
+      this.update(rows);
+    },
+    updateRowDescription(index, value) {
+      const rows = [...(this.rows || [])];
+      const row = rows[index];
+      if (!row || this.isRowLocked(row)) return;
+      rows[index] = { ...row, description: value };
+      this.update(rows);
+    },
+    resolveTypeByLocation(location) {
+      const options = this.contractAttachmentTypeOptions || [];
+      const locationText = String(location || '');
+      if (locationText.includes('其它') || locationText.includes('其他')) {
+        return this.defaultAttachmentType;
+      }
+      const matched = options.find(
+        item =>
+          String(item.value) === locationText ||
+          String(item.label) === locationText ||
+          String(item.value).includes('合同') ||
+          String(item.label).includes('合同')
+      );
+      return matched?.value || options[0]?.value || this.defaultAttachmentType;
+    },
+    syncUploadDialogTypeByLocation() {
+      this.uploadDialogType = this.resolveTypeByLocation(this.uploadDialogLocation);
     },
     openUploadDialog() {
-      this.uploadDialogType = this.defaultAttachmentType;
+      const options = this.resolvedLocationOptions;
+      this.uploadDialogLocation = options.includes(this.attachmentLocation)
+        ? this.attachmentLocation
+        : options[0] || this.attachmentLocation;
+      this.syncUploadDialogTypeByLocation();
       this.uploadDialogFiles = [];
       this.uploadDialogFileList = [];
       this.uploadDialogVisible = true;
@@ -348,7 +462,8 @@ export default {
     resetUploadDialog() {
       this.uploadDialogFiles = [];
       this.uploadDialogFileList = [];
-      this.uploadDialogType = this.defaultAttachmentType;
+      this.uploadDialogLocation = this.attachmentLocation;
+      this.syncUploadDialogTypeByLocation();
     },
     beforeUpload(file) {
       const extension = String(file.name || '')
@@ -391,13 +506,18 @@ export default {
         ...this.uploadDialogFiles.filter(item => String(item.uid) !== String(file.uid)),
         normalized,
       ];
-      this.uploadDialogType = resolveContractAttachmentType(
-        {
-          ...normalized,
-          fileType: '',
-        },
-        this.contractAttachmentTypeOptions
-      );
+      const locationText = String(this.uploadDialogLocation || '');
+      if (!(locationText.includes('其它') || locationText.includes('其他'))) {
+        this.uploadDialogType = resolveContractAttachmentType(
+          {
+            ...normalized,
+            fileType: '',
+          },
+          this.contractAttachmentTypeOptions
+        );
+      } else {
+        this.uploadDialogType = this.defaultAttachmentType;
+      }
       this.$message.success('上传成功');
     },
     handleDialogError() {
@@ -416,6 +536,10 @@ export default {
         this.$message.warning('请先上传附件');
         return;
       }
+      if (!this.uploadDialogLocation) {
+        this.$message.warning('请选择附件位置');
+        return;
+      }
       if (!this.uploadDialogType) {
         this.$message.warning('请选择附件类型');
         return;
@@ -430,43 +554,39 @@ export default {
         uploadTime: row.uploadTime || uploadTime,
         ...(this.markApprovedOnUpload ? { approved: true } : {}),
       }));
-      this.update([...(this.rows || []), ...appended]);
+      // 统一交给父组件按附件位置写入对应列表，避免同位置双写或跨位置不显示
+      this.$emit('upload-to-location', {
+        location: this.uploadDialogLocation,
+        rows: appended,
+      });
       this.uploadDialogVisible = false;
+      this.$emit('upload-confirmed', {
+        location: this.uploadDialogLocation,
+        rows: appended,
+      });
     },
-    handleChange(rows) {
-      const uploadUserName = this.$store.getters.userInfo?.realName || '';
-      const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
+    handleChange(list) {
+      if (!Array.isArray(list)) return;
+      // 上传组件偶发回传空列表时，禁止清空已有表格数据
+      if (!list.length) return;
       const existingRows = this.rows || [];
-      this.update(
-        (rows || []).map(row => {
-          const fileUrl = attachmentUrl(row);
-          const existing = existingRows.find(item => {
-            const sameUid = row.uid && item.uid && String(row.uid) === String(item.uid);
-            const sameUrl = fileUrl && attachmentUrl(item) === fileUrl;
-            return sameUid || sameUrl;
-          });
-          if (existing && this.isRowLocked(existing)) return { ...existing };
-          const next = {
-            ...existing,
-            ...row,
-            description: row.description || existing?.description || '',
-            uploadUserName: existing?.uploadUserName || row.uploadUserName || uploadUserName,
-            uploadTime: existing?.uploadTime || row.uploadTime || uploadTime,
-            approved: existing?.approved || row.approved || false,
-          };
-          if (this.attachmentType) {
-            next.fileType = resolveContractAttachmentType(
-              {
-                ...next,
-                fileType: existing?.fileType || row.fileType,
-              },
-              this.contractAttachmentTypeOptions
-            );
-          }
-          if (this.markApprovedOnUpload && !existing) next.approved = true;
-          return next;
-        })
-      );
+      const nextRows = list.map(row => {
+        const existing = this.findExistingRow(row, existingRows);
+        if (existing && this.isRowLocked(existing)) return { ...existing };
+        return this.enrichUploadedRow(row, existing);
+      });
+      existingRows.forEach(item => {
+        if (!this.isRowLocked(item)) return;
+        if (this.findExistingRow(item, nextRows)) return;
+        nextRows.unshift({ ...item });
+      });
+      this.update(nextRows);
+    },
+    handleUploadSuccess(file) {
+      const url = attachmentUrl(file);
+      if (!file || !url) return;
+      if (this.findExistingRow(file)) return;
+      this.update([...(this.rows || []), this.enrichUploadedRow(file)]);
     },
     remove(index) {
       const row = this.rows[index];
@@ -474,7 +594,7 @@ export default {
         this.$message.warning('已审核通过的附件不允许删除');
         return;
       }
-      const rows = [...this.rows];
+      const rows = [...(this.rows || [])];
       rows.splice(index, 1);
       this.update(rows);
     },
@@ -487,7 +607,7 @@ export default {
       downloadFileByUrl(url, attachmentName(row));
     },
     batchDownload() {
-      (this.selected.length ? this.selected : this.rows).forEach(this.download);
+      (this.selected.length ? this.selected : this.rows || []).forEach(this.download);
     },
     formatSize(size) {
       const value = Number(size);
@@ -504,7 +624,7 @@ export default {
 .contract-manage-form__section {
   margin: 12px 0 0;
   padding: 14px 16px 16px;
-  overflow: hidden;
+  overflow: visible;
   background: #fff;
   border-radius: 6px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
@@ -527,6 +647,15 @@ export default {
   }
 }
 
+.contract-manage-form__attachment-table {
+  :deep(.el-table__body-wrapper),
+  :deep(.el-table__header-wrapper),
+  :deep(.el-table__cell),
+  :deep(.cell) {
+    overflow: visible;
+  }
+}
+
 .contract-manage-form__attachment-head {
   display: flex;
   align-items: center;

src/views/business/components/master-order-detail.vue

@@ -1,7 +1,17 @@
 <template>
   <div v-loading="loading" class="master-detail">
     <section v-if="master" class="detail-overview">
-      <div class="detail-heading"><div><h2>多联总单详情 <span>|</span> {{ master.masterNo }}</h2><el-tag :type="statusType(master.businessStatus)" class="status-text">{{ statusName(master.businessStatus) }}</el-tag><el-tag v-if="transportFlowLabel" type="info" class="transport-flow-tag">{{ transportFlowLabel }}</el-tag></div></div>
+      <div class="detail-heading">
+        <div>
+          <h2>多联总单详情 <span>|</span> {{ master.masterNo }}</h2>
+          <el-tag :type="statusType(master.businessStatus)">{{
+            statusName(master.businessStatus)
+          }}</el-tag>
+          <el-tag v-if="transportFlowLabel" type="primary" class="transport-flow-tag">{{
+            transportFlowLabel
+          }}</el-tag>
+        </div>
+      </div>
       <dl class="detail-meta">
         <div>
           <dt>客户</dt>
@@ -132,6 +142,7 @@ export default {
     dateRange() { return this.master?.planStartTime && this.master?.planEndTime ? `${String(this.master.planStartTime).slice(0, 10)} ~ ${String(this.master.planEndTime).slice(0, 10)}` : '-'; },
   },
   async mounted() {
+    if (!this.id) return;
     this.loading = true;
     try {
       const res = await api.getDetail(this.id);
@@ -282,8 +293,36 @@ export default {
 <style scoped lang="scss">
 .master-detail { padding-bottom: 20px; color: #303133; }
 .detail-overview, .execution-detail-card { margin-bottom: 8px; border: 1px solid #eff1f7; background: #fff; }
-.detail-heading { display: flex; align-items: center; justify-content: space-between; padding: 18px 24px; h2 { display: inline-block; margin: 0 16px 0 0; font-size: 20px; } h2 span { margin: 0 8px; color: #909399; font-weight: 400; } }
-.transport-flow-tag { margin-left: 8px; }
+.detail-heading {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 18px 24px;
+
+  h2 {
+    display: inline-block;
+    margin: 0 16px 0 0;
+    font-size: 20px;
+  }
+
+  h2 span {
+    margin: 0 8px;
+    color: #909399;
+    font-weight: 400;
+  }
+
+  :deep(.el-tag) {
+    height: 28px;
+    padding: 0 12px;
+    border: 0;
+    border-radius: 8px;
+    font-size: 13px;
+    line-height: 28px;
+  }
+}
+.transport-flow-tag {
+  margin-left: 8px;
+}
 .detail-meta { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 18px 24px; margin: 0; padding: 0 24px 20px; dt { margin-bottom: 6px; color: #909399; font-size: 13px; } dd { display: flex; flex-wrap: wrap; gap: 8px 16px; margin: 0; color: #303133; font-size: 14px; word-break: break-all; } :deep(.el-link) { font-size: 14px; } }
 .route-map { display: flex; align-items: flex-start; padding: 16px 24px 20px; border-top: 1px solid #eff1f7; overflow-x: auto; }
 .route-map__node { display: grid; flex: 0 0 150px; justify-items: center; gap: 6px; text-align: center; strong { font-size: 16px; white-space: nowrap; } small { color: #606266; white-space: nowrap; } }

src/views/business/components/master-order-dispatch.vue

@@ -156,11 +156,11 @@
             <el-row :gutter="16">
               <template v-if="isRoad(route)">
                 <el-col :span="6"><el-form-item label="承运商" :required="route.carrierType !== '自运'"><el-select :model-value="route.carrierType !== '自运' ? route.carrierContractId : route.carrierName" filterable clearable placeholder="请选择" :loading="carrierLoading" @change="value => handleCarrierContractChange(route, value)"><el-option v-for="item in carrierOptions" :key="carrierOptionValue(item)" :label="carrierOptionLabel(item)" :value="route.carrierType !== '自运' ? carrierOptionValue(item) : item.carrierName" /></el-select></el-form-item></el-col>
-                <el-col :span="6"><el-form-item label="司机" :required="route.carrierType !== '承运商'"><el-autocomplete :ref="element => setDriverInput(route.segmentNo, element)" v-model="route.driverName" :debounce="300" :fetch-suggestions="fetchDriverSuggestions" clearable placeholder="请输入司机" :loading="driverLoading" @select="item => handleDriverSuggestionSelect(route, item)" /></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="司机" :required="route.carrierType !== '承运商'"><el-autocomplete :ref="element => setDriverInput(route.segmentNo, element)" v-model="route.driverName" :debounce="300" :fetch-suggestions="(query, cb) => fetchDriverSuggestions(route, query, cb)" clearable placeholder="请输入司机" :loading="driverLoading" @select="item => handleDriverSuggestionSelect(route, item)" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item :label="route.carrierType === '承运商' ? '手机号' : '司机手机号'" :required="route.carrierType !== '承运商'"><el-input v-model="route.driverPhone" placeholder="请输入" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="车牌号" required><el-input v-model="route.vehicleNo" placeholder="请输入" /></el-form-item></el-col>
                 <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="挂车车牌号"><el-input v-model="route.trailerVehicleNo" placeholder="请输入" /></el-form-item></el-col>
-                <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="押运人"><el-autocomplete v-model="route.escortName" :debounce="300" :fetch-suggestions="fetchEscortSuggestions" clearable placeholder="请输入" :loading="escortLoading" @select="item => handleEscortSuggestionSelect(route, item)" /></el-form-item></el-col>
+                <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="押运人"><el-autocomplete v-model="route.escortName" :debounce="300" :fetch-suggestions="(query, cb) => fetchEscortSuggestions(route, query, cb)" clearable placeholder="请输入" :loading="escortLoading" @select="item => handleEscortSuggestionSelect(route, item)" /></el-form-item></el-col>
                 <el-col v-if="route.carrierType !== '承运商'" :span="6"><el-form-item label="押运人手机号"><el-input v-model="route.escortPhone" placeholder="请输入" /></el-form-item></el-col>
               </template>
               <template v-else>
@@ -233,7 +233,7 @@
 
 <script>
 import * as api from '@/api/business/master-order';
-import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
 import { isMobile } from '@/utils/validate';
 
 const unwrapRecords = res => {
@@ -290,11 +290,12 @@ export default {
     },
   },
   async mounted() {
-    await Promise.all([this.load(), this.loadCarrierOptions(), this.loadDriverOptions()]);
+    await Promise.all([this.load(), this.loadCarrierOptions()]);
     this.applySelfOperatedCarrierDefaults();
   },
   methods: {
     async load() {
+      if (!this.id) return;
       this.loading = true;
       try {
         const res = await api.getDetail(this.id);
@@ -726,6 +727,7 @@ export default {
       route.carrierName = '';
       route.carrierId = '';
       route.carrierContractId = '';
+      this.clearRouteDriverVehicleFields(route);
       if (value === '承运商') {
         route.trailerVehicleNo = '';
         route.escortName = '';
@@ -745,6 +747,24 @@ export default {
       route.carrierContractId = route.carrierType !== '自运' ? contract?.contractId || '' : '';
       route.carrierId = route.carrierType !== '自运' ? contract?.carrierId || '' : '';
       route.carrierName = contract?.carrierName || '';
+      this.clearRouteDriverVehicleFields(route);
+    },
+    clearRouteDriverVehicleFields(route) {
+      if (!route) return;
+      route.driverId = '';
+      route.driverName = '';
+      route.driverPhone = '';
+      route.vehicleNo = '';
+      route.trailerVehicleNo = '';
+      route.escortName = '';
+      route.escortPhone = '';
+      this.driverOptions = [];
+    },
+    getRouteCarrierFilter(route = {}) {
+      return {
+        carrierId: route.carrierId || '',
+        carrierName: route.carrierName || '',
+      };
     },
     carrierOptionValue(item = {}) {
       return item.contractId || item.id || item.value || item.carrierName || '';
@@ -816,18 +836,30 @@ export default {
         route.carrierContractId = '';
       });
     },
-    async loadDriverOptions(keyword = '') {
+    async loadDriverOptions(route = {}, keyword = '') {
+      const carrier = this.getRouteCarrierFilter(route);
+      if (!carrier.carrierId && !carrier.carrierName) {
+        this.driverOptions = [];
+        return [];
+      }
       this.driverLoading = true;
       try {
-        this.driverOptions = unwrapRecords(
-          await getDriverList(1, 20, { driverName: keyword, posts: '司机' })
+        this.driverOptions = await fetchDriversByCarrierOrganizations(
+          { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+          carrier
         );
+        return this.driverOptions;
       } finally {
         this.driverLoading = false;
       }
     },
-    fetchDriverSuggestions(queryString, callback) {
-      this.loadDriverOptions(String(queryString || '').trim())
+    fetchDriverSuggestions(route, queryString, callback) {
+      const carrier = this.getRouteCarrierFilter(route);
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
+      this.loadDriverOptions(route, String(queryString || '').trim())
         .then(() =>
           callback(
             this.driverOptions.map(item => ({
@@ -845,13 +877,21 @@ export default {
       const drivingVehicle = String(item.drivingVehicle || '').trim();
       if (drivingVehicle) route.vehicleNo = drivingVehicle;
     },
-    fetchEscortSuggestions(queryString, callback) {
+    fetchEscortSuggestions(route, queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getRouteCarrierFilter(route);
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.escortLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '押运员' })
-        .then(res => {
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
+        carrier
+      )
+        .then(records => {
           callback(
-            unwrapRecords(res).map(item => ({
+            records.map(item => ({
               ...item,
               value: this.driverOptionLabel(item),
             }))

src/views/business/components/master-order-editor.vue

@@ -402,8 +402,8 @@
         >
       </div>
       <div class="map-picker-content">
-        <map-search-results :results="mapSearchResults" @select="selectAddressMapSearchResult" />
         <div ref="addressMap" class="address-map" />
+        <map-search-results :results="mapSearchResults" @select="selectAddressMapSearchResult" />
       </div>
       <div class="address-map-status">
         {{ mapStatus
@@ -601,6 +601,7 @@ let amapLoader;
 import { getList as getCommonRouteList } from '@/api/business/common-route';
 import * as api from '@/api/business/master-order';
 import { formatUpdateUserName } from '@/utils/audit';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { isMobile } from '@/utils/validate';
 export default {
   components: {
@@ -1285,14 +1286,8 @@ export default {
             )
         )
         .then(result => {
-          const geocodes = result?.geocodes || [];
-          this.mapSearchResults = geocodes.map((item, index) => ({
-            id: item.id || index,
-            name: item.formattedAddress || this.mapKeyword,
-            address: item.formattedAddress || this.mapKeyword,
-            location: item.location,
-          }));
-          const point = geocodes[0]?.location;
+          this.mapSearchResults = normalizeMapSearchResults(result, this.mapKeyword);
+          const point = this.mapSearchResults[0]?.location;
           if (!point) return this.$message.warning('地图搜索无匹配地址');
           this.pickAddressMap(point, this.mapKeyword);
         })
@@ -2199,8 +2194,15 @@ export default {
   display: flex;
   gap: 8px;
   margin-bottom: 12px;
+
+  .el-input {
+    flex: 1;
+    min-width: 0;
+  }
 }
 .address-map {
+  width: 100%;
+  min-width: 0;
   height: 440px;
 }
 .address-map-status {

src/views/business/components/shipping-template-page.vue

@@ -931,11 +931,11 @@
         /><el-button type="primary" @click="searchTransportMapKeyword">搜索</el-button>
       </div>
       <div class="map-picker-content">
+        <div ref="transportMap" class="shipping-template-page__map" />
         <map-search-results
           :results="transportMapSearchResults"
           @select="selectTransportMapSearchResult"
         />
-        <div ref="transportMap" class="shipping-template-page__map" />
       </div>
       <div class="shipping-template-page__map-info">{{ transportMapStatus }}</div>
       <template #footer
@@ -1098,6 +1098,7 @@ import {
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDictionary } from '@/api/system/dictbiz';
 import { packageOptions } from '@/option/business/common';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
 import { Location } from '@element-plus/icons-vue';
@@ -2615,12 +2616,7 @@ export default {
         .then(() => this.ensureTransportMapGeocoder())
         .then(() => this.runTransportMapGeocode('location', keyword))
         .then(result => {
-          this.transportMapSearchResults = (result.geocodes || []).map((item, index) => ({
-            id: item.id || index,
-            name: item.formattedAddress || keyword,
-            address: item.formattedAddress || keyword,
-            location: item.location,
-          }));
+          this.transportMapSearchResults = normalizeMapSearchResults(result, keyword);
           const point = this.resolveTransportMapPoint(result);
           if (!point) throw new Error('未找到匹配地址');
           return this.$nextTick().then(() => {
@@ -3754,6 +3750,12 @@ export default {
 .shipping-template-page__map-toolbar {
   display: flex;
   gap: 8px;
+  margin-bottom: 12px;
+
+  .el-input {
+    flex: 1;
+    min-width: 0;
+  }
 }
 .shipping-template-page__dialog-search {
   margin-bottom: 8px;
@@ -3766,11 +3768,9 @@ export default {
   justify-content: flex-end;
 }
 .shipping-template-page__map {
-  flex: 1 1 auto;
   width: 100%;
   min-width: 0;
   height: 480px;
-  margin-top: 12px;
 }
 :deep(.shipping-template-page__map > .amap-container) {
   width: 100% !important;

src/views/business/components/transport-plan-page.vue

@@ -637,13 +637,14 @@
                 <span>|</span>
                 {{ detailRow.planNo || '-' }}
               </h2>
-              <span class="detail-status-text is-dispatching">
+              <span class="detail-status-text" :class="detailStatusTextClass">
                 {{ displayStatus(detailRow, 'businessStatus') }}
               </span>
               <span class="detail-status-text detail-transport-type">
                 {{
                   detailRow.transportTypeName ||
-                  formatTransportPlanDetailTransportType(detailRow.transportType)
+                  formatTransportPlanDetailTransportType(detailRow.transportType) ||
+                  '-'
                 }}
               </span>
             </div>
@@ -1231,7 +1232,7 @@
                 {{ dispatchDialogStatusText }}
               </el-tag>
               <el-tag type="primary" effect="light">
-                {{ formatDispatchTransportType(dispatchRow.transportType) || '公路运输' }}
+                {{ formatDispatchTransportType(dispatchRow.transportType) || '-' }}
               </el-tag>
             </div>
           </div>
@@ -1931,7 +1932,7 @@
                 class="transport-plan-page__dispatch-quantity-hint"
               >
                 剩余数量：{{
-                  formatDispatchQuantity(dispatchItemRemainingQuantity(dispatchItemForm))
+                  formatDispatchQuantity(dispatchItemHintRemainingQuantity(dispatchItemForm))
                 }}
                 {{ dispatchItemForm.quantityUnit || '吨' }}
               </div>
@@ -1997,7 +1998,11 @@
               </el-input>
             </el-form-item>
             <el-form-item label="其他费用合计">
-              <el-input v-model="dispatchItemForm.otherFeeTotal" placeholder="请输入">
+              <el-input
+                v-model="dispatchItemForm.otherFeeTotal"
+                placeholder="请输入"
+                @input="value => handleDispatchNumberInput('otherFeeTotal', value)"
+              >
                 <template #suffix>{{ dispatchItemFreightCurrencyLabel }}</template>
               </el-input>
             </el-form-item>
@@ -2547,8 +2552,8 @@
         </el-button>
       </div>
       <div class="map-picker-content">
-        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
         <div ref="transportAmap" class="transport-plan-page__map"></div>
+        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
       </div>
       <div class="transport-plan-page__map-info">
         <span>{{ transportMapStatus }}</span>
@@ -2729,13 +2734,14 @@ import {
   getList as getProjectList,
 } from '@/api/business/project-apply';
 import { getList as getCommonRouteList } from '@/api/business/common-route';
-import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
 import { getDictionary } from '@/api/system/dictbiz';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { addressTypeOptions } from '@/option/base/common-address';
 import { packageOptions } from '@/option/business/common';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken } from '@/utils/auth';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { applyTableMenuWidth } from '@/utils/table-menu';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
@@ -3284,6 +3290,23 @@ export default {
     isTransportPlanDetailLayout() {
       return this.detailBox;
     },
+    detailStatusTextClass() {
+      const status = this.detailRow?.businessStatus;
+      if (status === 2 || status === '2' || status === 'completed') {
+        return 'status-text-success';
+      }
+      if (status === 1 || status === '1' || status === 'dispatching') {
+        return 'is-dispatching';
+      }
+      if (
+        status === 3 ||
+        status === '3' ||
+        ['rejected', 'change_rejected', 'cancelled', 'withdrawn'].includes(status)
+      ) {
+        return 'is-danger';
+      }
+      return 'is-info';
+    },
     transportPlanGoodsText() {
       const text = this.formatTransportPlanGoodsInfo(this.detailRow);
       return text && text !== '-' ? text : '暂无货物信息';
@@ -3526,17 +3549,19 @@ export default {
     },
     dispatchItemFreightTotal() {
       if (this.dispatchItemForm.taskEntryMode !== 'full') {
-        const otherFeeTotal = Number(this.dispatchItemForm.otherFeeTotal || 0);
+        const otherFeeRaw = this.normalizeDispatchFeeValue(this.dispatchItemForm.otherFeeTotal);
+        const otherFeeTotal = Number(otherFeeRaw || 0);
         const freight = this.dispatchItemFreightSubtotal;
         const hasFreight = freight !== '';
-        const hasOtherFee = this.dispatchItemForm.otherFeeTotal !== '';
+        const hasOtherFee = otherFeeRaw !== '';
         if (!hasFreight && !hasOtherFee) return '';
         const total = (hasFreight ? Number(freight) : 0) + (hasOtherFee ? otherFeeTotal : 0);
         return Number.isInteger(total) ? String(total) : String(Number(total.toFixed(2)));
       }
-      const otherFeeTotal = Number(this.dispatchItemForm.otherFeeTotal || 0);
+      const otherFeeRaw = this.normalizeDispatchFeeValue(this.dispatchItemForm.otherFeeTotal);
+      const otherFeeTotal = Number(otherFeeRaw || 0);
       const freightSubtotal = this.dispatchItemFreightSubtotal;
-      const hasOtherFee = this.dispatchItemForm.otherFeeTotal !== '';
+      const hasOtherFee = otherFeeRaw !== '';
       if (freightSubtotal === '' && !hasOtherFee) return '';
       const total = Number(freightSubtotal || 0) + (hasOtherFee ? otherFeeTotal : 0);
       return Number.isInteger(total) ? String(total) : String(Number(total.toFixed(2)));
@@ -4841,10 +4866,17 @@ export default {
     },
     fetchTaskDriverSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getDispatchCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.taskDriverLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
-        .then(res => {
-          const records = extractRecords(res);
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+        carrier
+      )
+        .then(records => {
           this.taskDriverOptions = records;
           callback(
             records.map(item => ({
@@ -4863,10 +4895,17 @@ export default {
     },
     fetchTaskEscortSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getDispatchCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.taskEscortLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '押运员' })
-        .then(res => {
-          const records = extractRecords(res);
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
+        carrier
+      )
+        .then(records => {
           this.taskEscortOptions = records;
           callback(records.map(item => ({ ...item, value: item.driverName || item.name || '' })));
         })
@@ -5738,12 +5777,7 @@ export default {
           this.ensureTransportAmapGeocoder()
             .then(() => this.runAmapGeocode('location', keyword))
             .then(result => {
-              this.transportMapSearchResults = (result.geocodes || []).map((item, index) => ({
-                id: item.id || index,
-                name: item.formattedAddress || keyword,
-                address: item.formattedAddress || keyword,
-                location: item.location,
-              }));
+              this.transportMapSearchResults = normalizeMapSearchResults(result, keyword);
               const point = this.resolveMapPoint(result);
               if (!point) {
                 this.transportMapStatus = '未找到匹配地址';
@@ -7241,11 +7275,13 @@ export default {
         freightInfo.freightItems?.[0]?.unitPrice ??
         '';
       const otherFeeTotal =
-        item.otherFeeTotal ??
-        plan.otherFeeTotal ??
-        freightInfo.otherFeeTotal ??
-        freightInfo.otherFreightAmount ??
-        '';
+        this.normalizeDispatchFeeValue(
+          item.otherFeeTotal ??
+            plan.otherFeeTotal ??
+            freightInfo.otherFeeTotal ??
+            freightInfo.otherFreightAmount ??
+            ''
+        );
       const quantity = Number(
         item.quantity ||
           item.cargoQuantity ||
@@ -7560,6 +7596,9 @@ export default {
         ...baseRow,
         ...(index >= 0 ? row : {}),
       };
+      this.dispatchItemForm.otherFeeTotal = this.normalizeDispatchFeeValue(
+        this.dispatchItemForm.otherFeeTotal
+      );
       this.dispatchItemForm.carrierType = this.dispatchItemForm.carrierType || '承运商';
       this.loadDispatchCarrierOptions(this.dispatchRow).then(() => {
         this.applyDispatchSelfCarrierDefaults();
@@ -7611,6 +7650,7 @@ export default {
       this.dispatchItemForm.carrierName = '';
       this.dispatchItemForm.carrierId = '';
       this.dispatchItemForm.carrierContractId = '';
+      this.clearDispatchDriverVehicleFields();
       if (nextValue === '承运商') {
         this.dispatchItemForm.trailerVehicleNo = '';
         this.dispatchItemForm.escortName = '';
@@ -7798,12 +7838,29 @@ export default {
         this.dispatchItemForm.carrierContractId = carrier?.carrierContractId || '';
         this.dispatchItemForm.carrierId = carrier?.carrierId || '';
         this.dispatchItemForm.carrierName = carrier?.carrierName || '';
-        return;
+      } else {
+        this.dispatchItemForm.carrierContractId = '';
+        this.dispatchItemForm.carrierId = '';
+        this.dispatchItemForm.carrierName = carrier?.carrierName || value || '';
       }
-      this.dispatchItemForm.carrierContractId = '';
-      this.dispatchItemForm.carrierId =
-        this.dispatchItemForm.carrierType === '自运' ? '' : carrier?.id || '';
-      this.dispatchItemForm.carrierName = carrier?.carrierName || value || '';
+      this.clearDispatchDriverVehicleFields();
+    },
+    clearDispatchDriverVehicleFields() {
+      this.dispatchItemForm.driverId = '';
+      this.dispatchItemForm.driverName = '';
+      this.dispatchItemForm.driverPhone = '';
+      this.dispatchItemForm.vehicleNo = '';
+      this.dispatchItemForm.trailerVehicleNo = '';
+      this.dispatchItemForm.escortName = '';
+      this.dispatchItemForm.escortPhone = '';
+      this.taskDriverOptions = [];
+      this.taskEscortOptions = [];
+    },
+    getDispatchCarrierFilter() {
+      return {
+        carrierId: this.dispatchItemForm.carrierId || '',
+        carrierName: this.dispatchItemForm.carrierName || '',
+      };
     },
     handleDispatchCargoQuantityInput(row, value) {
       const text = String(value || '').replace(/[^\d.]/g, '');
@@ -7820,6 +7877,11 @@ export default {
       this.dispatchItemForm[prop] =
         parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
     },
+    normalizeDispatchFeeValue(value) {
+      if (value === undefined || value === null || value === '') return '';
+      if (Number(value) === -1) return '';
+      return value;
+    },
     addDispatchCargoRow(index = -1) {
       const nextRow = this.normalizeTransportCargoRow({ priceUnit: '元/吨' });
       if (index > -1) this.dispatchItemCargoRows.splice(index + 1, 0, nextRow);
@@ -7972,6 +8034,12 @@ export default {
         }, 0)
       );
     },
+    /** 精简录入提示：可调度余量扣减当前本次数量后的剩余 */
+    dispatchItemHintRemainingQuantity(row = {}) {
+      const available = this.dispatchItemRemainingQuantity(row);
+      const current = this.parseDispatchQuantity(row.quantity);
+      return Math.max(available - current, 0);
+    },
     pruneDispatchPendingRows(rows = []) {
       const planQuantities = new Map();
       this.dispatchPlanGoodsRows.forEach(goods => {
@@ -8220,14 +8288,29 @@ export default {
               }),
             ];
       const firstGoods = goodsRows[0] || {};
+      const quantitySum = goodsRows.reduce(
+        (sum, goods) => sum + this.parseDispatchQuantity(goods.quantity),
+        0
+      );
+      const quantityText = quantitySum
+        ? this.formatDispatchQuantity(quantitySum)
+        : firstGoods.quantity || this.dispatchItemForm.quantity || '';
+      const otherFeeTotal = this.normalizeDispatchFeeValue(this.dispatchItemForm.otherFeeTotal);
       const nextRow = {
         ...this.dispatchItemForm,
         goodsJson: JSON.stringify(goodsRows),
         cargoType: firstGoods.cargoType || this.dispatchItemForm.cargoType || '',
         cargoTypeCode: firstGoods.cargoTypeCode || this.dispatchItemForm.cargoTypeCode || '',
         cargoTypePath: firstGoods.cargoTypePath || this.dispatchItemForm.cargoTypePath || [],
-        cargoName: firstGoods.cargoName || this.dispatchItemForm.cargoName || '',
-        quantity: firstGoods.quantity || this.dispatchItemForm.quantity || '',
+        cargoName:
+          goodsRows
+            .map(goods => goods.cargoName || goods.goodsName || '')
+            .filter(Boolean)
+            .join('.') ||
+          firstGoods.cargoName ||
+          this.dispatchItemForm.cargoName ||
+          '',
+        quantity: quantityText,
         quantityUnit: firstGoods.quantityUnit || this.dispatchItemForm.quantityUnit || '',
         unitPrice: firstGoods.unitPrice || '',
         priceUnit: firstGoods.priceUnit || '',
@@ -8235,7 +8318,7 @@ export default {
         freightJson: JSON.stringify({
           currency: this.dispatchContractCurrency || this.dispatchItemForm.freightCurrency || 'RMB',
           totalFreightAmount: this.dispatchItemFreightSubtotal,
-          otherFreightAmount: this.dispatchItemForm.otherFeeTotal || '',
+          otherFreightAmount: otherFeeTotal,
           freightItems: goodsRows.map((cargo, index) => ({
             cargoIndex: index,
             cargoName: cargo.cargoName || '',
@@ -8251,7 +8334,7 @@ export default {
       };
       nextRow.cargoInfo = this.formatDispatchCargoInfo({}, nextRow);
       nextRow.freight = this.dispatchItemFreightSubtotal;
-      nextRow.otherFeeTotal = this.dispatchItemForm.otherFeeTotal || '';
+      nextRow.otherFeeTotal = otherFeeTotal;
       const quantityUnit = this.getDispatchQuantityUnit(nextRow);
       const otherDispatchedQuantity = this.dispatchRows.reduce((total, row, index) => {
         if (
@@ -9348,19 +9431,36 @@ export default {
       }
     }
 
-    :deep(.el-tag) {
-      height: 36px;
-      padding: 0 14px;
-      border: 0;
+    .detail-status-text {
+      display: inline-flex;
+      align-items: center;
+      height: 28px;
+      padding: 0 12px;
       border-radius: 8px;
-      font-size: 14px;
-      line-height: 36px;
+      font-size: 13px;
+      line-height: 28px;
     }
 
-    :deep(.is-dispatching) {
+    .status-text-success,
+    .is-dispatching {
       color: #67c23a;
       background: #e1f3d8;
     }
+
+    .detail-transport-type {
+      color: #409eff;
+      background: #ecf5ff;
+    }
+
+    .is-danger {
+      color: #f56c6c;
+      background: #fef0f0;
+    }
+
+    .is-info {
+      color: #909399;
+      background: #f4f4f5;
+    }
   }
 
   &__transport-plan-detail-overview {

src/views/business/components/waybill-import-dialog.vue

@@ -113,6 +113,12 @@
           label="导入方式"
           width="100"
         />
+        <el-table-column
+          v-if="columnVisible.statusName"
+          prop="statusName"
+          label="状态"
+          width="100"
+        />
         <el-table-column
           v-if="columnVisible.createUserName"
           prop="createUserName"
@@ -121,12 +127,6 @@
         >
           <template #default="{ row }">{{ row.createUserName || '-' }}</template>
         </el-table-column>
-        <el-table-column
-          v-if="columnVisible.statusName"
-          prop="statusName"
-          label="状态"
-          width="100"
-        />
         <el-table-column
           v-if="columnVisible.createTime"
           prop="createTime"
@@ -621,8 +621,8 @@ const columnOptions = [
   { prop: 'carrierType', label: '承运类型' },
   { prop: 'waybillCount', label: '运单数' },
   { prop: 'importTypeName', label: '导入方式' },
-  { prop: 'createUserName', label: '创建人' },
   { prop: 'statusName', label: '状态' },
+  { prop: 'createUserName', label: '创建人' },
   { prop: 'createTime', label: '创建时间' },
   { prop: 'updateTime', label: '更新时间' },
 ];

src/views/business/components/waybill-manage-page.vue

@@ -1774,14 +1774,19 @@
             <div class="waybill-manage-page__waybill-heading">
               <strong>运单详情</strong>
               <span>{{ detailRow.waybillNo || '-' }}</span>
-              <span class="detail-status-text status-text-success">{{
-                displayStatus(detailRow, 'businessStatus')
-              }}</span>
-              <span class="detail-status-text detail-transport-type">
-                {{ getTransportTypeLabel(waybillTransportMode(detailRow)) || '-' }}
-              </span>
+              <el-tag :type="statusTagType(detailRow.businessStatus)">
+                {{ displayStatus(detailRow, 'businessStatus') }}
+              </el-tag>
+              <el-tag type="primary">
+                {{
+                  detailRow.transportTypeName ||
+                  getTransportTypeLabel(detailRow.transportType) ||
+                  waybillTransportMode(detailRow) ||
+                  '-'
+                }}
+              </el-tag>
               <el-link
-                v-if="detailRow.id"
+                v-if="detailRow.id && canChangeWaybillRoute(detailRow)"
                 class="waybill-manage-page__waybill-route-change-link"
                 type="primary"
                 @click="openWaybillRouteChangeDialog"
@@ -1797,7 +1802,18 @@
                 :class="{ 'is-plan': item[0] === 'planName' }"
               >
                 <span class="waybill-manage-page__waybill-label">{{ item[1] }}</span>
-                <span :class="['waybill-manage-page__waybill-value', { 'is-link': item[2] }]">
+                <el-link
+                  v-if="canOpenWaybillDetailSummaryLink(item[0])"
+                  type="primary"
+                  class="waybill-manage-page__waybill-value is-link"
+                  @click="handleWaybillDetailSummaryClick(item[0])"
+                >
+                  {{ formatDetailValue(detailRow, item[0]) }}
+                </el-link>
+                <span
+                  v-else
+                  :class="['waybill-manage-page__waybill-value', { 'is-link': item[2] }]"
+                >
                   {{ formatDetailValue(detailRow, item[0]) }}
                 </span>
               </div>
@@ -1923,11 +1939,17 @@
                     }}</strong
                   >
                 </div>
-                <div
-                  v-if="!waybillIsCarrier(detailRow)"
-                  class="waybill-manage-page__waybill-detail-field"
-                >
-                  <span>里程(km)</span><strong>{{ detailRow.mileage || '-' }}</strong>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>里程(km)</span
+                  ><strong>{{ waybillDetailMileage(detailRow) || '-' }}</strong>
+                </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>计划发货日期</span
+                  ><strong>{{ waybillDetailEstimatedStartTime(detailRow) || '-' }}</strong>
+                </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>计划完成日期</span
+                  ><strong>{{ waybillDetailEstimatedEndTime(detailRow) || '-' }}</strong>
                 </div>
               </template>
               <template v-else-if="waybillIsNonRoadTransport(detailRow)">
@@ -1949,12 +1971,32 @@
                 <div class="waybill-manage-page__waybill-detail-field">
                   <span>仓位</span><strong>{{ detailRow.cabinNo || '-' }}</strong>
                 </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>预计发货日期</span
+                  ><strong>{{ waybillDetailEstimatedStartTime(detailRow) || '-' }}</strong>
+                </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>预计完成日期</span
+                  ><strong>{{ waybillDetailEstimatedEndTime(detailRow) || '-' }}</strong>
+                </div>
               </template>
               <template v-else>
                 <div class="waybill-manage-page__waybill-detail-field">
                   <span>{{ waybillVehicleNoLabel(detailRow) }}</span>
                   <strong>{{ detailRow.vehicleNo || '-' }}</strong>
                 </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>里程(km)</span
+                  ><strong>{{ waybillDetailMileage(detailRow) || '-' }}</strong>
+                </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>计划发货日期</span
+                  ><strong>{{ waybillDetailEstimatedStartTime(detailRow) || '-' }}</strong>
+                </div>
+                <div class="waybill-manage-page__waybill-detail-field">
+                  <span>计划完成日期</span
+                  ><strong>{{ waybillDetailEstimatedEndTime(detailRow) || '-' }}</strong>
+                </div>
               </template>
               <div
                 class="waybill-manage-page__waybill-detail-field"
@@ -2183,7 +2225,11 @@
                     />
                   </div>
                 </el-tab-pane>
-                <el-tab-pane label="司机上传" name="driverUpload">
+                <el-tab-pane
+                  v-if="waybillDriverUploads.length"
+                  label="司机上传"
+                  name="driverUpload"
+                >
                   <div
                     v-loading="waybillPunchRecordsLoading"
                     class="waybill-manage-page__driver-upload-grid"
@@ -2200,11 +2246,6 @@
                         {{ photo.label || '凭证' }}
                       </div>
                     </div>
-                    <el-empty
-                      v-if="!waybillPunchRecordsLoading && !waybillDriverUploads.length"
-                      description="暂无司机上传数据"
-                      :image-size="50"
-                    />
                   </div>
                 </el-tab-pane>
               </el-tabs>
@@ -2315,7 +2356,7 @@
           </div>
         </template>
       </div>
-      <div v-if="detailPageLocked" class="waybill-manage-page__detail-footer">
+      <div v-if="detailPageLocked && !isPublicWaybillView" class="waybill-manage-page__detail-footer">
         <el-button type="primary" @click="closeDetail">关闭</el-button>
       </div>
       <template v-if="!detailPageLocked" #footer>
@@ -2418,35 +2459,6 @@
               </el-table-column>
             </el-table>
           </section-card>
-          <section-card title="路线编辑">
-            <template #extra>
-              <span class="waybill-manage-page__route-change-hint">拖拽调整顺序</span>
-            </template>
-            <div
-              v-if="waybillRouteChangeNodes.length"
-              class="waybill-manage-page__route-change-list"
-            >
-              <div
-                v-for="(node, index) in waybillRouteChangeNodes"
-                :key="node.key || index"
-                class="waybill-manage-page__route-change-item"
-                draggable="true"
-                @dragstart="handleWaybillRouteChangeDragStart(index)"
-                @dragover.prevent
-                @drop="handleWaybillRouteChangeDrop(index)"
-              >
-                <span class="waybill-manage-page__route-change-type">
-                  {{ waybillRouteChangeTypeText(index) }}
-                </span>
-                <span>{{ node.address }}</span>
-                <span class="waybill-manage-page__route-change-tags">
-                  <el-tag v-for="tag in node.tags || []" :key="tag" size="small">{{ tag }}</el-tag>
-                </span>
-                <el-icon><Rank /></el-icon>
-              </div>
-            </div>
-            <el-empty v-else description="暂无路线" :image-size="60" />
-          </section-card>
           <el-form label-width="auto">
             <el-form-item label="变更备注" style="margin-top: 8px">
               <el-input
@@ -2864,8 +2876,8 @@
         </el-button>
       </div>
       <div class="map-picker-content">
-        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
         <div ref="transportAmap" class="waybill-manage-page__map"></div>
+        <map-search-results :results="transportMapSearchResults" @select="selectTransportMapSearchResult" />
       </div>
       <div class="waybill-manage-page__map-info">
         <span>{{ transportMapStatus }}</span>
@@ -3111,6 +3123,7 @@ import {
   getList as getProjectList,
 } from '@/api/business/project-apply';
 import { getList as getLoadingList } from '@/api/business/loading-manage';
+import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
 import { getList as getCommonRouteList } from '@/api/business/common-route';
 import {
   getDetail as getShippingPlanDetail,
@@ -3122,7 +3135,11 @@ import {
   getVoucherImages as getProcessConfigVoucherImages,
 } from '@/api/business/process-config';
 import { getPunchRecords as getWaybillPunchRecords, locateVehicle, trackVehicle } from '@/api/business/waybill-manage';
+import { getMkPublicDetail } from '@/api/mk-process';
 import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import {
+  fetchDriversByCarrierOrganizations,
+} from '@/utils/carrier-org-resource';
 import { getDictionary } from '@/api/system/dictbiz';
 import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { addressTypeOptions } from '@/option/base/common-address';
@@ -3131,11 +3148,12 @@ import { formatUpdateUserName } from '@/utils/audit';
 import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import { getToken } from '@/utils/auth';
 import { openImportDialog } from '@/utils/import-excel';
+import { normalizeMapSearchResults } from '@/utils/map-search';
 import { applyTableMenuWidth } from '@/utils/table-menu';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { isMobile } from '@/utils/validate';
-import { InfoFilled, Location, OfficeBuilding, Rank, Search, WarnTriangleFilled } from '@element-plus/icons-vue';
-import { ElImageViewer } from 'element-plus';
+import { InfoFilled, Location, OfficeBuilding, Search, WarnTriangleFilled } from '@element-plus/icons-vue';
+import { ElAutocomplete, ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import {
   fallbackPlugin,
@@ -3310,7 +3328,6 @@ export default {
     PageDetail,
     InfoFilled,
     WarnTriangleFilled,
-    Rank,
     ElImageViewer,
     OpenFileViewer,
   },
@@ -3383,7 +3400,6 @@ export default {
       waybillRouteChangeNodes: [],
       waybillRouteChangeRemark: '',
       waybillRouteChangeRecords: [],
-      waybillRouteChangeDragIndex: -1,
       waybillRouteChangeSaving: false,
       waybillLocateLoading: false,
       waybillLocateInfo: null,
@@ -3646,6 +3662,8 @@ export default {
     this.formPageLocked = this.isStandaloneWaybillFormPage;
     this.detailPageLocked = this.isStandaloneWaybillDetailPage;
     this.formModeLocked = this.$route.query.mode || '';
+    if (this.isPublicWaybillView) return;
+    this.setupSearchAutocompletes();
     if (this.config.enableAllDept && this.isAdmin) {
       this.allDept = 1;
     }
@@ -3709,8 +3727,14 @@ export default {
     isStandaloneWaybillFormPage() {
       return this.isStandaloneWaybillPage && ['add', 'edit'].includes(this.$route.query.mode);
     },
+    isPublicWaybillView() {
+      return this.$route.path === '/business/waybill-manage/public-view';
+    },
     isStandaloneWaybillDetailPage() {
-      return this.standaloneDetailPage && this.$route.path === standaloneWaybillDetailRoute;
+      return (
+        (this.standaloneDetailPage && this.$route.path === standaloneWaybillDetailRoute) ||
+        this.isPublicWaybillView
+      );
     },
     // 容器形态读实例创建时锁定的标志，不随 $route 翻转（详见 data 中 formPageLocked 的说明）
     // 当前路由是否仍属于本实例（tab.js 按 fullPath 建实例，一个实例只对应一个 path）。
@@ -4298,8 +4322,12 @@ export default {
       ) {
         return false;
       }
+      // 进行中的运单隐藏取消（与 config.canCancel / isInProgressStatus 对齐）
+      if (typeof this.config.canCancel === 'function' && !this.config.canCancel(row)) {
+        return false;
+      }
       const status = this.statusValue(row);
-      return ['pending', 'processing', 'running'].includes(status);
+      return status === 'pending';
     },
     canComplete(row) {
       if (
@@ -4530,6 +4558,42 @@ export default {
     waybillIsCarrier(row = {}) {
       return String(row.carrierTypeName || row.carrierType || '').trim() === '承运商';
     },
+    waybillDetailTaskInfo(row = {}) {
+      return this.parseJsonObject(row.taskInfoJson || row.taskInfo || {});
+    },
+    waybillDetailMileage(row = {}) {
+      const taskInfo = this.waybillDetailTaskInfo(row);
+      const goodsRows = this.parseJsonArray(row.goodsJson);
+      const firstGoods = goodsRows[0] || {};
+      return this.normalizeMileageValue(
+        row.mileage || taskInfo.mileage || firstGoods.mileage || ''
+      );
+    },
+    waybillDetailEstimatedStartTime(row = {}) {
+      const taskInfo = this.waybillDetailTaskInfo(row);
+      const value =
+        row.estimatedStartTime ||
+        row.planStartDate ||
+        taskInfo.estimatedStartTime ||
+        taskInfo.planStartDate ||
+        '';
+      return this.formatWaybillDetailDate(value);
+    },
+    waybillDetailEstimatedEndTime(row = {}) {
+      const taskInfo = this.waybillDetailTaskInfo(row);
+      const value =
+        row.estimatedEndTime ||
+        row.planEndDate ||
+        taskInfo.estimatedEndTime ||
+        taskInfo.planEndDate ||
+        '';
+      return this.formatWaybillDetailDate(value);
+    },
+    formatWaybillDetailDate(value) {
+      const text = String(value || '').trim();
+      if (!text) return '';
+      return text.slice(0, 10);
+    },
     waybillVehicleNoLabel(row = {}) {
       return this.waybillIsRoadTransport(row) ? '车牌号' : '船/航/班列号';
     },
@@ -4591,14 +4655,19 @@ export default {
       this.waybillVoucherFolder = null;
       this.waybillVoucherFolderView = false;
       this.waybillVoucherImagesLoaded = false;
-      const request =
-        typeof this.api.getDetail === 'function'
+      const request = this.isPublicWaybillView
+        ? getMkPublicDetail('waybill-manage', row.id)
+        : typeof this.api.getDetail === 'function'
           ? this.api.getDetail(row.id)
           : Promise.resolve({ data: { data: row } });
       request
         .then(res => {
           const detail = res?.data?.data || res?.data || row;
           this.detailRow = detail;
+          if (this.isPublicWaybillView) {
+            this.applyFormDetail(detail);
+            return;
+          }
           this.loadWaybillPunchRecords();
           this.loadWaybillVoucherImages();
           if (detail.contractId) {
@@ -4666,6 +4735,90 @@ export default {
         query: { id, name: '配载单详情' },
       });
     },
+    waybillDetailCustomerLabel(row = {}) {
+      return row.customer || row.fullName || row.shortName || row.customerName || row.customerCode || '';
+    },
+    waybillDetailCustomerId(row = {}) {
+      return row.id || row.customerId || '';
+    },
+    canOpenWaybillDetailSummaryLink(prop) {
+      if (this.isPublicWaybillView) return false;
+      const row = this.detailRow || {};
+      const value = this.formatDetailValue(row, prop);
+      if (!value || value === '-') return false;
+      if (prop === 'customerName') return Boolean(row.customerName);
+      if (prop === 'contractNo') return Boolean(row.contractId);
+      if (prop === 'projectName') return Boolean(row.projectId);
+      return false;
+    },
+    handleWaybillDetailSummaryClick(prop) {
+      if (prop === 'customerName') return this.openWaybillDetailCustomer();
+      if (prop === 'contractNo') return this.openWaybillDetailContract();
+      if (prop === 'projectName') return this.openWaybillDetailProject();
+    },
+    async resolveWaybillDetailCustomerId() {
+      const row = this.detailRow || {};
+      if (row.customerId) return row.customerId;
+      const name = String(row.customerName || '').trim();
+      if (!name) return '';
+      if (row.projectId) {
+        try {
+          const res = await getProjectDetail(row.projectId);
+          const customers = this.parseJsonArray(res.data?.data?.customerJson);
+          const matched =
+            customers.find(item => this.waybillDetailCustomerLabel(item) === name) ||
+            customers.find(item => {
+              const label = this.waybillDetailCustomerLabel(item);
+              return label && (name.includes(label) || label.includes(name));
+            });
+          const id = this.waybillDetailCustomerId(matched);
+          if (id) return id;
+        } catch (error) {
+          // 项目客户解析失败时回退到客商档案检索
+        }
+      }
+      try {
+        const res = await getCustomerArchiveList(1, 20, { fullName: name });
+        const records = res.data?.data?.records || [];
+        const exact =
+          records.find(item => item.fullName === name || item.shortName === name) || records[0];
+        return exact?.id || '';
+      } catch (error) {
+        return '';
+      }
+    },
+    async openWaybillDetailCustomer() {
+      if (!this.detailRow?.customerName) return;
+      const customerId = await this.resolveWaybillDetailCustomerId();
+      if (!customerId) {
+        this.$message.warning('未找到对应客商档案，无法打开');
+        return;
+      }
+      this.$router.push({
+        path: '/vehicle/customer-archive/form',
+        query: { id: String(customerId), name: '查看客商档案', view: '1' },
+      });
+    },
+    openWaybillDetailContract() {
+      if (!this.detailRow?.contractId) {
+        this.$message.warning('合同信息缺失，无法打开');
+        return;
+      }
+      this.$router.push({
+        path: '/business/contract-manage/detail',
+        query: { id: this.detailRow.contractId, name: '合同详情' },
+      });
+    },
+    openWaybillDetailProject() {
+      if (!this.detailRow?.projectId) {
+        this.$message.warning('项目信息缺失，无法打开');
+        return;
+      }
+      this.$router.push({
+        path: '/business/project-apply/form',
+        query: { mode: 'view', id: this.detailRow.projectId, name: '查看项目管理' },
+      });
+    },
     loadWaybillDetailProcessNodes(projectId) {
       this.waybillDetailProcessNodes = [];
       if (!projectId) return Promise.resolve([]);
@@ -4836,7 +4989,7 @@ export default {
         : [];
     },
     openWaybillRouteChangeDialog() {
-      if (!this.detailRow.id) return;
+      if (!this.detailRow.id || !this.canChangeWaybillRoute(this.detailRow)) return;
       this.restoreWaybillRouteChangeRecords();
       this.waybillRouteChangeTab = 'change';
       this.waybillRouteChangeRemark = '';
@@ -4853,22 +5006,11 @@ export default {
       this.waybillRouteChangeNodes = this.buildWaybillRouteNodes(this.waybillRouteChangeRows);
       this.waybillRouteChangeBox = true;
     },
-    waybillRouteChangeTypeText(index) {
-      if (index === 0) return '起';
-      if (index === this.waybillRouteChangeNodes.length - 1) return '终';
-      return '经';
-    },
-    handleWaybillRouteChangeDragStart(index) {
-      this.waybillRouteChangeDragIndex = index;
-    },
-    handleWaybillRouteChangeDrop(index) {
-      if (this.waybillRouteChangeDragIndex < 0 || this.waybillRouteChangeDragIndex === index)
-        return;
-      const nodes = [...this.waybillRouteChangeNodes];
-      const [node] = nodes.splice(this.waybillRouteChangeDragIndex, 1);
-      nodes.splice(index, 0, node);
-      this.waybillRouteChangeNodes = nodes;
-      this.waybillRouteChangeDragIndex = -1;
+    canChangeWaybillRoute(row = {}) {
+      const status = String(this.statusValue(row) || row.businessStatus || row.status || '');
+      if (status === 'completed') return false;
+      const statusName = String(row.businessStatusName || row.statusName || '');
+      return !statusName.includes('已完成');
     },
     updateWaybillRouteChangeNodes() {
       this.waybillRouteChangeNodes = this.buildWaybillRouteNodes(this.waybillRouteChangeRows);
@@ -4917,9 +5059,8 @@ export default {
         row.departureAddress !== row.originalDepartureAddress ||
         row.arrivalAddress !== row.originalArrivalAddress;
       const routeJson = JSON.stringify(this.waybillRouteChangeNodes);
-      const originalRouteJson = this.detailRow.routeJson || '';
-      if (!changed && routeJson === originalRouteJson && !this.waybillRouteChangeRemark) {
-        this.$message.warning('请修改地址、调整路线或填写变更备注');
+      if (!changed && !this.waybillRouteChangeRemark) {
+        this.$message.warning('请修改地址或填写变更备注');
         return;
       }
       if (typeof this.api.changeRoute !== 'function') {
@@ -4927,11 +5068,9 @@ export default {
         return;
       }
 
-      const content = changed
-        ? `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress || '-'} → ${
-            row.departureAddress || '-'
-          }；到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`
-        : '调整运输路线顺序';
+      const content = `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress || '-'} → ${
+        row.departureAddress || '-'
+      }；到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`;
       const records = [
         {
           changeTime: this.$dayjs().format('YYYY-MM-DD HH:mm:ss'),
@@ -5251,7 +5390,9 @@ export default {
         : defaultText;
     },
     statusTagType(status) {
-      if ([1, 'pending', 'processing', 'approved', 'change_approved'].includes(status)) {
+      if (
+        [1, 'pending', 'processing', 'running', 'approved', 'change_approved'].includes(status)
+      ) {
         return 'success';
       }
       if ([2, 'cancelled', 'withdrawn', 'draft'].includes(status)) {
@@ -6327,6 +6468,15 @@ export default {
       this.form.carrierName = '';
       this.form.carrierId = '';
       this.form.carrierContractId = '';
+      this.form.driverId = '';
+      this.form.driverName = '';
+      this.form.driverPhone = '';
+      this.form.vehicleNo = '';
+      this.form.trailerVehicleNo = '';
+      this.form.escortName = '';
+      this.form.escortPhone = '';
+      this.taskDriverOptions = [];
+      this.taskEscortOptions = [];
       if (nextValue === '承运商') {
         this.form.trailerVehicleNo = '';
         this.form.escortName = '';
@@ -6580,17 +6730,36 @@ export default {
         this.form.carrierContractId = carrier?.carrierContractId || '';
         this.form.carrierId = carrier?.carrierId || '';
         this.form.carrierName = carrier?.carrierName || '';
-        return;
+      } else {
+        this.form.carrierId = carrier?.carrierContractId ? '' : carrier?.id || '';
+        this.form.carrierName = value || '';
       }
-      this.form.carrierId = carrier?.carrierContractId ? '' : carrier?.id || '';
-      this.form.carrierName = value || '';
+      // 承运商变更后清空司机/车辆，避免跨组织脏数据
+      this.form.driverId = '';
+      this.form.driverName = '';
+      this.form.driverPhone = '';
+      this.form.vehicleNo = '';
+      this.form.trailerVehicleNo = '';
+      this.form.escortName = '';
+      this.form.escortPhone = '';
+      this.taskDriverOptions = [];
+      this.taskEscortOptions = [];
+    },
+    getTaskCarrierFilter() {
+      return {
+        carrierId: this.form.carrierId || '',
+        carrierName: this.form.carrierName || '',
+      };
     },
     loadTaskDriverOptions() {
       if (!this.taskInfoFormEnabled || this.taskDriverLoading) return Promise.resolve([]);
       this.taskDriverLoading = true;
-      return getDriverList(1, 9999, { posts: '司机' })
-        .then(res => {
-          this.taskDriverOptions = extractRecords(res);
+      return fetchDriversByCarrierOrganizations(
+        { size: 9999, posts: '司机' },
+        this.getTaskCarrierFilter()
+      )
+        .then(records => {
+          this.taskDriverOptions = records;
           return this.taskDriverOptions;
         })
         .finally(() => {
@@ -6599,10 +6768,17 @@ export default {
     },
     fetchTaskDriverSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getTaskCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.taskDriverLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
-        .then(res => {
-          const records = extractRecords(res);
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+        carrier
+      )
+        .then(records => {
           this.taskDriverOptions = records;
           callback(
             records.map(item => ({
@@ -6621,10 +6797,17 @@ export default {
     },
     fetchTaskEscortSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getTaskCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.taskEscortLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '押运员' })
-        .then(res => {
-          const records = extractRecords(res);
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
+        carrier
+      )
+        .then(records => {
           this.taskEscortOptions = records;
           callback(records.map(item => ({ ...item, value: item.driverName || item.name || '' })));
         })
@@ -7764,12 +7947,7 @@ export default {
           this.ensureTransportAmapGeocoder()
             .then(() => this.runAmapGeocode('location', keyword))
             .then(result => {
-              this.transportMapSearchResults = (result.geocodes || []).map((item, index) => ({
-                id: item.id || index,
-                name: item.formattedAddress || keyword,
-                address: item.formattedAddress || keyword,
-                location: item.location,
-              }));
+              this.transportMapSearchResults = normalizeMapSearchResults(result, keyword);
               const point = this.resolveMapPoint(result);
               if (!point) {
                 this.transportMapStatus = '未找到匹配地址';
@@ -8392,6 +8570,123 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
+    setupSearchAutocompletes() {
+      const fields = [
+        {
+          prop: 'projectName',
+          placeholder: '请选择或输入项目名称',
+          fetch: (queryString, callback) =>
+            this.fetchSearchNameSuggestions(queryString, callback, {
+              request: keyword =>
+                getProjectList(1, 20, keyword ? { projectName: keyword } : {}),
+              getValue: item => item.projectName || item.name || '',
+            }),
+        },
+        {
+          prop: 'customerName',
+          placeholder: '请选择或输入客户名称',
+          fetch: (queryString, callback) =>
+            this.fetchSearchNameSuggestions(queryString, callback, {
+              request: keyword =>
+                getCustomerArchiveList(1, 20, {
+                  ...(keyword ? { fullName: keyword } : {}),
+                  customerType: '客户',
+                }),
+              getValue: item => item.fullName || item.customerName || item.name || '',
+            }),
+        },
+        {
+          prop: 'cargoType',
+          placeholder: '请选择或输入货物类型',
+          fetch: (queryString, callback) =>
+            this.fetchSearchNameSuggestions(queryString, callback, {
+              request: keyword =>
+                getCargoTypeList(1, 20, keyword ? { cargoName: keyword } : {}),
+              getValue: item => item.cargoName || item.typeName || item.name || item.label || '',
+            }),
+        },
+        {
+          prop: 'carrierName',
+          placeholder: '请选择或输入承运商名称',
+          fetch: (queryString, callback) =>
+            this.fetchSearchNameSuggestions(queryString, callback, {
+              request: keyword =>
+                getCustomerArchiveList(1, 20, {
+                  ...(keyword ? { fullName: keyword } : {}),
+                  customerType: '承运商',
+                }),
+              getValue: item =>
+                item.fullName || item.carrierName || item.customerName || item.name || '',
+            }),
+        },
+        {
+          prop: 'driverName',
+          placeholder: '请选择或输入司机名称',
+          fetch: (queryString, callback) =>
+            this.fetchSearchNameSuggestions(queryString, callback, {
+              request: keyword =>
+                getDriverList(1, 20, {
+                  ...(keyword ? { driverName: keyword } : {}),
+                  posts: '司机',
+                }),
+              getValue: item => item.driverName || item.name || '',
+            }),
+        },
+        {
+          prop: 'planName',
+          placeholder: '请选择或输入计划名称',
+          fetch: (queryString, callback) =>
+            this.fetchSearchNameSuggestions(queryString, callback, {
+              request: keyword =>
+                getShippingPlanList(1, 20, keyword ? { planName: keyword } : {}),
+              getValue: item => item.planName || item.name || '',
+            }),
+        },
+      ];
+      fields.forEach(field => {
+        const column = this.findColumn?.(this.option.column, field.prop);
+        if (!column) return;
+        column.searchPlaceholder = field.placeholder;
+        column.renderSearch = scope =>
+          this.renderSearchAutocomplete(scope, field.prop, field.placeholder, field.fetch);
+      });
+    },
+    renderSearchAutocomplete(scope, prop, placeholder, fetchSuggestions) {
+      return h(ElAutocomplete, {
+        modelValue: scope.row?.[prop] ?? '',
+        'onUpdate:modelValue': value => {
+          if (scope.row) scope.row[prop] = value ?? '';
+        },
+        fetchSuggestions,
+        debounce: 300,
+        clearable: true,
+        triggerOnFocus: true,
+        placeholder,
+        style: 'width: 100%',
+        valueKey: 'value',
+        fitInputWidth: true,
+      });
+    },
+    fetchSearchNameSuggestions(queryString, callback, { request, getValue }) {
+      const keyword = String(queryString || '').trim();
+      Promise.resolve(request(keyword))
+        .then(res => {
+          const records = extractRecords(res);
+          const seen = new Set();
+          const options = [];
+          records.forEach(item => {
+            const value = String(getValue(item) || '').trim();
+            if (!value || seen.has(value)) return;
+            seen.add(value);
+            options.push({ ...item, value });
+          });
+          callback(options);
+        })
+        .catch(error => {
+          window.console.log(error);
+          callback([]);
+        });
+    },
     searchChange(params, done) {
       this.query = {
         ...params,
@@ -8560,7 +8855,7 @@ export default {
       };
       this.mileageForm = {
         id: row.id,
-        mileage: row.mileage === null || row.mileage === undefined ? '' : String(row.mileage),
+        mileage: this.normalizeMileageValue(row.mileage),
         mileageRemark: row.mileageRemark || '',
       };
       this.$nextTick(() => this.$refs.mileageFormRef?.clearValidate());
@@ -8657,10 +8952,21 @@ export default {
     },
     fetchReassignDriverSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const row = this.reassignDrawer.row || {};
+      const carrier = {
+        carrierId: row.carrierId || '',
+        carrierName: row.carrierName || '',
+      };
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.reassignDrawer.driverLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
-        .then(res => {
-          const records = extractRecords(res);
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+        carrier
+      )
+        .then(records => {
           this.reassignDriverOptions = records;
           callback(
             records.map(item => ({
@@ -9749,6 +10055,15 @@ export default {
     strong {
       font-size: 20px;
     }
+
+    :deep(.el-tag) {
+      height: 28px;
+      padding: 0 12px;
+      border: 0;
+      border-radius: 8px;
+      font-size: 13px;
+      line-height: 28px;
+    }
   }
 
   &__waybill-route-change-link {
@@ -9785,7 +10100,12 @@ export default {
     white-space: nowrap;
 
     &.is-link {
+      display: inline;
+      justify-content: flex-start;
+      max-width: 100%;
       color: #409eff;
+      font-weight: 500;
+      vertical-align: baseline;
     }
   }
 

src/views/business/contract-manage-change.vue

@@ -70,7 +70,7 @@
                 type="date"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
-                placeholder="YYYY-MM-DD"
+                placeholder="请输入"
               />
               <span>至</span>
               <el-date-picker
@@ -78,7 +78,7 @@
                 type="date"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
-                placeholder="YYYY-MM-DD"
+                placeholder="请输入"
               />
             </div>
           </el-form-item>
@@ -92,12 +92,12 @@
             </el-input>
           </el-form-item>
           <el-form-item label="合同金额">
-            <el-input-number
-              v-model="form.contractAmount"
-              :min="0"
-              :precision="2"
-              :controls="false"
+            <el-input
+              :model-value="contractAmountDisplay"
               placeholder="请输入"
+              clearable
+              @input="handleContractAmountInput"
+              @clear="form.contractAmount = null"
             />
           </el-form-item>
           <el-form-item label="是否范本">
@@ -189,10 +189,11 @@
         title="合同文件"
         description
         attachment-type
-        use-upload-dialog
+        :attachment-location-options="changeAttachmentLocationOptions"
         :rows="contractFileRows"
         :preview="previewAttachment"
         @update:rows="contractFileRows = $event"
+        @upload-to-location="handleAttachmentUploadToLocation"
       />
 
       <section class="change-section">
@@ -218,7 +219,7 @@
           </el-radio-group>
         </div>
         <el-form v-if="settlementRule.autoGenerate === 1" :model="settlementRule" label-position="right" label-width="auto" class="settlement-form">
-          <el-form-item label="账单起始日期" required><el-date-picker v-model="settlementRule.billStartDate" type="date" placeholder="请选择账单起始日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD" /></el-form-item>
+          <el-form-item label="账单起始日" required><el-date-picker v-model="settlementRule.billStartDate" type="date" placeholder="请选择账单起始日" format="YYYY-MM-DD" value-format="YYYY-MM-DD" /></el-form-item>
           <el-form-item label="结算类型" required><el-select v-model="settlementRule.settlementType" placeholder="请选择结算类型" @change="handleSettlementTypeChange"><el-option v-for="item in settlementTypeOptions" :key="item" :label="item" :value="item" /></el-select></el-form-item>
           <el-form-item v-if="showSettlementBillCycleType" label="结算周期" required><el-select v-model="settlementRule.billCycleType" placeholder="请选择结算周期" @change="handleCycleTypeChange"><el-option v-for="item in billCycleTypeOptions" :key="item" :label="item" :value="item" /></el-select></el-form-item>
           <el-form-item v-if="showSettlementBillCutoffDay" label="账单截单日" required><el-select v-model="settlementRule.billCutoffDay" placeholder="请选择账单截单日"><el-option v-for="item in billCutoffDayOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item>
@@ -256,11 +257,12 @@
         title="其它附件"
         description
         attachment-type
-        use-upload-dialog
         attachment-location="其它附件"
+        :attachment-location-options="changeAttachmentLocationOptions"
         :rows="attachments"
         :preview="previewAttachment"
         @update:rows="attachments = $event"
+        @upload-to-location="handleAttachmentUploadToLocation"
       />
 
       <section class="change-section change-reason-section">
@@ -281,11 +283,12 @@
         title="变更材料"
         description
         attachment-type
-        use-upload-dialog
         attachment-location="变更材料"
+        :attachment-location-options="changeAttachmentLocationOptions"
         :rows="changeMaterials"
         :preview="previewAttachment"
         @update:rows="changeMaterials = $event"
+        @upload-to-location="handleAttachmentUploadToLocation"
       />
       <div class="page-footer">
         <el-button @click="$router.back()">取消</el-button>
@@ -343,7 +346,15 @@ const normalizeOptionalPositiveInteger = value => {
   return Number.isInteger(number) && number > 0 ? number : null;
 };
 const normalizeOptionalAmount = value => {
-  if (value === undefined || value === null || value === '') return null;
+  if (
+    value === undefined ||
+    value === null ||
+    value === '' ||
+    Number(value) === -1 ||
+    String(value) === '-1'
+  ) {
+    return null;
+  }
   const number = Number(value);
   return Number.isFinite(number) && number >= 0 ? Number(number.toFixed(2)) : null;
 };
@@ -421,6 +432,22 @@ export default {
     pageTitle() {
       return this.$route.query.name || '合同变更';
     },
+    changeAttachmentLocationOptions() {
+      return ['合同文件', '其它附件', '变更材料'];
+    },
+    contractAmountDisplay() {
+      const value = this.form.contractAmount;
+      if (
+        value === undefined ||
+        value === null ||
+        value === '' ||
+        Number(value) === -1 ||
+        String(value) === '-1'
+      ) {
+        return '';
+      }
+      return value;
+    },
     contractCategoryOptions() {
       return this.contractCategoryDictOptions.length
         ? this.contractCategoryDictOptions
@@ -464,6 +491,13 @@ export default {
     },
   },
   methods: {
+    handleContractAmountInput(value) {
+      const text = String(value || '').replace(/[^\d.]/g, '');
+      const parts = text.split('.');
+      const normalized =
+        parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
+      this.form.contractAmount = normalized === '' ? null : normalized;
+    },
     loadDictionaries() {
       Promise.all([
         getSystemDictionary({ code: 'currency_type' }),
@@ -619,6 +653,20 @@ export default {
     attachmentExtension(row = {}) { const source = String(this.attachmentName(row) || this.attachmentUrl(row)).split('?')[0]; const index = source.lastIndexOf('.'); return index > -1 ? source.slice(index + 1).toLowerCase() : ''; },
     isAttachmentImage(row) { return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp'].includes(this.attachmentExtension(row)); },
     previewAttachment(row, rows = this.attachments) { const url = this.attachmentUrl(row); if (!url) { this.$message.warning('附件地址为空，无法预览'); return; } if (this.isAttachmentImage(row)) { this.imagePreviewUrls = (rows || []).filter(item => this.isAttachmentImage(item) && this.attachmentUrl(item)).map(item => this.attachmentUrl(item)); this.imagePreviewIndex = Math.max(this.imagePreviewUrls.indexOf(url), 0); this.imagePreviewVisible = true; return; } this.previewFile = { name: this.attachmentName(row), url, mimeType: row.mimeType || row.contentType || '' }; this.documentPreviewVisible = true; },
+    handleAttachmentUploadToLocation({ location, rows = [] }) {
+      if (!rows.length) return;
+      if (location === '合同文件') {
+        this.contractFileRows = [...(this.contractFileRows || []), ...rows];
+        return;
+      }
+      if (location === '其它附件') {
+        this.attachments = [...(this.attachments || []), ...rows];
+        return;
+      }
+      if (location === '变更材料') {
+        this.changeMaterials = [...(this.changeMaterials || []), ...rows];
+      }
+    },
     handlePreviewUnsupported() { this.$message.warning('当前文件暂不支持在线预览'); },
     handlePreviewError() { this.$message.error('附件预览失败'); },
     formatFileSize(value) { const size = Number(value || 0); return size > 1024 * 1024 ? `${(size / 1024 / 1024).toFixed(2)}MB` : `${Math.max(1, Math.ceil(size / 1024))}KB`; },
@@ -629,7 +677,7 @@ export default {
     addCustomPeriodRow() { const periods = normalizeCustomPeriods(this.settlementRule.customPeriods || []); periods.push({ startDay: '', endDay: '' }); this.settlementRule.customPeriods = periods; },
     removeCustomPeriodRow(index) { if (index <= 0) return; const periods = [...(this.settlementRule.customPeriods || [])]; periods.splice(index, 1); this.settlementRule.customPeriods = normalizeCustomPeriods(periods); },
     validateCustomPeriods(periods = [], label) { const rows = normalizeCustomPeriods(periods); if (!rows.length) { this.$message.warning(`${label}：请至少配置一段自定义周期`); return false; } for (let index = 0; index < rows.length; index += 1) { const row = rows[index]; const startDay = Number(row.startDay); const endDay = Number(row.endDay); if (!Number.isFinite(startDay) || startDay < 1 || startDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间开始日`); return false; } if (!Number.isFinite(endDay) || endDay < 1 || endDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间结束日`); return false; } if (endDay < startDay) { this.$message.warning(`${label}：第${index + 1}行结束日不能早于开始日`); return false; } if (index > 0 && startDay !== Number(rows[index - 1].endDay) + 1) { this.$message.warning(`${label}：自定义多周期区间必须连续，不允许重叠或存在日期缺口`); return false; } } return true; },
-    validateSettlementRule(rule, label) { if (Number(rule.autoGenerate) !== 1) return true; if (!rule.billStartDate || !rule.settlementType) { this.$message.warning(`${label}：请完整填写账单起始日期和结算类型`); return false; } if (rule.settlementType === '月结' && !rule.billCycleType) { this.$message.warning(`${label}：请选择结算周期`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '固定截单日' && !rule.billCutoffDay) { this.$message.warning(`${label}：请选择账单截单日`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') return this.validateCustomPeriods(rule.customPeriods, label); if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) { this.$message.warning(`${label}：请选择周期天数`); return false; } return true; },
+    validateSettlementRule(rule, label) { if (Number(rule.autoGenerate) !== 1) return true; if (!rule.billStartDate || !rule.settlementType) { this.$message.warning(`${label}：请完整填写账单起始日和结算类型`); return false; } if (rule.settlementType === '月结' && !rule.billCycleType) { this.$message.warning(`${label}：请选择结算周期`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '固定截单日' && !rule.billCutoffDay) { this.$message.warning(`${label}：请选择账单截单日`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') return this.validateCustomPeriods(rule.customPeriods, label); if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) { this.$message.warning(`${label}：请选择周期天数`); return false; } return true; },
     async submit() { await this.$refs.formRef.validate(); const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0); if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) { this.$message.warning('付款比例上限合计必须等于100%'); return; } if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule }; else this.formalSettlementConfig = { ...this.settlementRule }; if (!this.validateSettlementRule(this.preSettlementConfig, '预结算配置') || !this.validateSettlementRule(this.formalSettlementConfig, '正式结算配置')) return; const settlementRule = { preSettlementConfig: this.preSettlementConfig, formalSettlementConfig: this.formalSettlementConfig }; await api.submitChange({ ...this.form, settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB', copyCount: normalizeOptionalPositiveInteger(this.form.copyCount), invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle), paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays), contractAmount: normalizeOptionalAmount(this.form.contractAmount), startDate: this.period[0], endDate: this.period[1], feeGenerationMode: this.feeGenerationMode, billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0, billingPlanJson: JSON.stringify(this.plans), settlementRuleJson: JSON.stringify(settlementRule), preSettlementConfigJson: JSON.stringify(this.preSettlementConfig), formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig), paymentRatioJson: JSON.stringify(this.paymentRatioRows), contractFileJson: JSON.stringify(this.contractFileRows), attachmentsJson: JSON.stringify(this.attachments), changeContent: this.form.changeContent, changeReason: this.form.changeReason, changeAttachmentsJson: JSON.stringify(this.changeMaterials) }); await submitMkApprovalFlow({ bizType: 'contract-manage', formInstanceId: this.form.id, subjectName: this.form.contractName || '', approvalStatus: this.form.approvalStatus || 'change_rejected' }); this.$message.success('变更已提交'); this.$router.back(); },
   },
 };
@@ -654,6 +702,14 @@ export default {
 .contract-basic-section :deep(.el-input),
 .contract-basic-section :deep(.el-select),
 .contract-basic-section :deep(.el-date-editor) { width: 360px; max-width: 100%; }
+.contract-basic-section :deep(.el-input-number) {
+  width: 360px;
+  max-width: 100%;
+
+  .el-input__inner {
+    text-align: left;
+  }
+}
 .dialog-section-title { margin-bottom: 18px; font-size: 16px; font-weight: 600; }
 .dialog-section-title::before { display: inline-block; width: 4px; height: 16px; margin-right: 8px; vertical-align: -2px; background: #409eff; content: ''; }
 .section-head { display: flex; align-items: center; justify-content: space-between; }

src/views/business/contract-manage-public-view.vue

@@ -0,0 +1,21 @@
+<template>
+  <mk-public-shell biz-type="contract-manage" :get-form="getForm">
+    <contract-manage ref="page" />
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import ContractManage from '@/views/business/contract-manage.vue';
+
+export default {
+  name: 'ContractManagePublicView',
+  components: { MkPublicShell, ContractManage },
+  methods: {
+    getForm() {
+      const row = this.$refs.page?.detailRow || {};
+      return { ...row, subject: row.contractName || row.contractNo || '' };
+    },
+  },
+};
+</script>

src/views/business/contract-manage.vue

@@ -222,7 +222,7 @@
               Number(detailSettlementRule.autoGenerate) === 1 ? '开启' : '关闭'
             }}</el-descriptions-item>
             <template v-if="Number(detailSettlementRule.autoGenerate) === 1">
-              <el-descriptions-item label="账单起始日期">{{
+              <el-descriptions-item label="账单起始日">{{
                 displayValue(detailSettlementRule.billStartDate)
               }}</el-descriptions-item>
               <el-descriptions-item label="结算类型">{{
@@ -244,7 +244,7 @@
                 }}</el-descriptions-item
               >
               <el-descriptions-item
-                v-if="detailSettlementRule.settlementType === '固定天数周期结算'"
+                v-if="isFixedCycleSettlementType(detailSettlementRule.settlementType)"
                 label="周期天数"
                 >{{
                   detailObjectUnitValue(detailSettlementRule, 'cycleDays', '天')
@@ -345,7 +345,7 @@
         </section>
       </div>
       <div class="contract-manage-page__footer">
-        <el-button @click="closeDetail">关闭</el-button>
+        <el-button v-if="!isPublicViewPage" @click="closeDetail">关闭</el-button>
       </div>
     </template>
 
@@ -478,7 +478,7 @@
                   type="date"
                   format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD"
-                  placeholder="YYYY-MM-DD"
+                  placeholder="请输入"
                 />
                 <span>至</span>
                 <el-date-picker
@@ -486,7 +486,7 @@
                   type="date"
                   format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD"
-                  placeholder="YYYY-MM-DD"
+                  placeholder="请输入"
                 />
               </div>
             </el-form-item>
@@ -498,12 +498,12 @@
               ><template #suffix>天</template></el-input>
             </el-form-item>
             <el-form-item label="合同金额">
-              <el-input-number
-                v-model="form.contractAmount"
-                :min="0"
-                :precision="2"
-                :controls="false"
+              <el-input
+                :model-value="contractAmountDisplay"
                 placeholder="请输入"
+                clearable
+                @input="handleContractAmountInput"
+                @clear="form.contractAmount = null"
               />
             </el-form-item>
             <el-form-item label="是否范本">
@@ -592,12 +592,13 @@
           title="合同文件"
           description
           attachment-type
-          use-upload-dialog
+          :attachment-location-options="contractAttachmentLocationOptions"
           :lock-approved="isAttachmentUploadMode || hasApprovedContractFiles"
           :mark-approved-on-upload="isAttachmentUploadMode"
           :rows="contractFileRows"
           :preview="previewAttachment"
           @update:rows="contractFileRows = $event"
+          @upload-to-location="handleAttachmentUploadToLocation"
         />
 
         <section class="contract-manage-form__section contract-manage-form__section--panel">
@@ -646,7 +647,7 @@
                 content="开启时，系统根据配置规则归集运单，定时生成结算单"
                 placement="top"
               >
-                <el-icon class="settlement-switch-tip"><QuestionFilled /></el-icon>
+                <el-icon class="contract-manage-form__fee-mode-tip"><QuestionFilled /></el-icon>
               </el-tooltip>
               <el-radio :label="0">关闭</el-radio>
             </el-radio-group>
@@ -655,13 +656,13 @@
             v-if="settlementRuleEnabled"
             class="contract-manage-form__grid contract-manage-form__settlement-grid"
           >
-            <el-form-item label="账单起始日期" required>
+            <el-form-item label="账单起始日" required>
               <el-date-picker
                 v-model="settlementRuleForm.billStartDate"
                 type="date"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
-                placeholder="请选择账单起始日期"
+                placeholder="请选择账单起始日"
               />
             </el-form-item>
             <el-form-item label="结算类型" required>
@@ -811,12 +812,13 @@
           title="其它附件"
           description
           attachment-type
-          use-upload-dialog
           attachment-location="其它附件"
+          :attachment-location-options="contractAttachmentLocationOptions"
           :readonly="isAttachmentUploadMode"
           :rows="attachmentRows"
           :preview="previewAttachment"
           @update:rows="attachmentRows = $event"
+          @upload-to-location="handleAttachmentUploadToLocation"
         />
 
         <section
@@ -921,6 +923,21 @@
       @save="saveBillingPlan"
     />
 
+    <contract-attachment-section
+      ref="listAttachmentUploader"
+      dialog-only
+      title="合同文件"
+      description
+      attachment-type
+      use-upload-dialog
+      mark-approved-on-upload
+      :attachment-location-options="['合同文件', '其它附件']"
+      :rows="listUploadContractFileRows"
+      @update:rows="listUploadContractFileRows = $event"
+      @upload-to-location="handleListAttachmentUploadToLocation"
+      @upload-confirmed="handleListAttachmentUploadConfirmed"
+    />
+
     <el-dialog
       v-model="attachmentDocumentPreviewVisible"
       :title="attachmentPreviewFile.name || '附件预览'"
@@ -962,44 +979,10 @@
       @close="attachmentImagePreviewVisible = false"
     />
 
-    <el-dialog
+    <change-record-detail-dialog
       v-model="detailChangeRecordVisible"
-      title="变更记录详情"
-      append-to-body
-      destroy-on-close
-      width="1100px"
-      top="10px"
-      class="contract-change-record-detail-dialog"
-    >
-      <div v-if="detailChangeRecord" class="contract-change-record-detail-meta">
-        <span>经办人：{{ detailChangeRecord.handlerUserName || '-' }}</span>
-        <span>变更类型：{{ detailChangeRecord.changeType || '-' }}</span>
-        <span>状态：{{ detailChangeRecord.statusName || detailChangeRecord.status || '-' }}</span>
-      </div>
-      <el-table :data="detailChangeRecordDetailRows" border :show-overflow-tooltip="false">
-        <el-table-column prop="field" label="变更字段" min-width="180" />
-        <el-table-column
-          prop="before"
-          label="变更前"
-          min-width="360"
-          class-name="contract-change-record-detail-value"
-        />
-        <el-table-column
-          prop="after"
-          label="变更后"
-          min-width="500"
-          class-name="contract-change-record-detail-value"
-        />
-      </el-table>
-      <el-empty
-        v-if="!detailChangeRecordDetailRows.length"
-        description="暂无变更内容"
-        :image-size="60"
-      />
-      <template #footer>
-        <el-button type="primary" @click="detailChangeRecordVisible = false">关闭</el-button>
-      </template>
-    </el-dialog>
+      :rows="detailChangeRecordDetailRows"
+    />
 
     <billing-plan-editor
       v-model="detailBillingPlanBox"
@@ -1027,6 +1010,7 @@ import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import { exportBlob } from '@/api/common';
 import * as api from '@/api/business/contract-manage';
+import { getMkPublicDetail } from '@/api/mk-process';
 import { getList as getProjectList } from '@/api/business/project-apply';
 import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
 import { getDeptTree } from '@/api/system/dept';
@@ -1037,6 +1021,7 @@ import { getToken } from '@/utils/auth';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
 import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
+import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
 import ContractAttachmentSection, {
   attachmentName as sharedAttachmentName,
   attachmentUrl as sharedAttachmentUrl,
@@ -1058,7 +1043,15 @@ const normalizeOptionalInteger = (value, emptyValue = null) => {
   return Number.isFinite(number) ? Math.trunc(number) : emptyValue;
 };
 const normalizeOptionalAmount = (value, emptyValue = null) => {
-  if (value === undefined || value === null || value === '') return emptyValue;
+  if (
+    value === undefined ||
+    value === null ||
+    value === '' ||
+    Number(value) === -1 ||
+    String(value) === '-1'
+  ) {
+    return emptyValue;
+  }
   const number = Number(value);
   return Number.isFinite(number) && number >= 0 ? Number(number.toFixed(2)) : emptyValue;
 };
@@ -1100,7 +1093,7 @@ const defaultForm = () => ({
   settlementCurrency: '',
   invoiceCycle: '',
   paymentDays: '',
-  contractAmount: '',
+  contractAmount: null,
   templateFlag: 0,
   originalContractNo: '',
   electronicSealFlag: 0,
@@ -1181,7 +1174,14 @@ const attachmentViewerPlugins = [
 
 export default {
   name: 'ContractManage',
-  components: { ContractAttachmentSection, BillingPlanEditor, ElImageViewer, OpenFileViewer, PdfPreview },
+  components: {
+    ContractAttachmentSection,
+    BillingPlanEditor,
+    ChangeRecordDetailDialog,
+    ElImageViewer,
+    OpenFileViewer,
+    PdfPreview,
+  },
   data() {
     return {
       api,
@@ -1249,6 +1249,9 @@ export default {
       organizationLoading: false,
       contractFileRows: [],
       attachmentRows: [],
+      listUploadContractFileRows: [],
+      listUploadAttachmentRows: [],
+      attachmentUploadFromList: false,
       attachmentImagePreviewVisible: false,
       attachmentImagePreviewUrls: [],
       attachmentImagePreviewIndex: 0,
@@ -1272,7 +1275,7 @@ export default {
       formalSettlementRuleForm: defaultSettlementRule(),
       paymentRatioRows: [],
       changeRecordRows: [],
-      settlementTypeOptions: ['月结', '日结', '周结', '半月结', '固定天数周期结算'],
+      settlementTypeOptions: ['现结', '日结', '周结', '月结', '按固定天数周期'],
       billCycleTypeOptions: ['固定截单日', '自然月', '自定义多周期'],
       detailLoading: false,
       detailRow: {},
@@ -1316,7 +1319,12 @@ export default {
       return this.$route.path === '/business/contract-manage/form';
     },
     isDetailPage() {
-      return this.$route.path === '/business/contract-manage/detail';
+      return (
+        this.$route.path === '/business/contract-manage/detail' || this.isPublicViewPage
+      );
+    },
+    isPublicViewPage() {
+      return this.$route.path === '/business/contract-manage/public-view';
     },
     formMode() {
       return this.$route.query.mode === 'edit' ? 'edit' : 'add';
@@ -1331,6 +1339,23 @@ export default {
     isAttachmentUploadMode() {
       return this.$route.query.attachmentUpload === '1';
     },
+    contractAttachmentLocationOptions() {
+      if (this.isAttachmentUploadMode) return ['合同文件'];
+      return ['合同文件', '其它附件'];
+    },
+    contractAmountDisplay() {
+      const value = this.form.contractAmount;
+      if (
+        value === undefined ||
+        value === null ||
+        value === '' ||
+        Number(value) === -1 ||
+        String(value) === '-1'
+      ) {
+        return '';
+      }
+      return value;
+    },
     hasApprovedContractFiles() {
       return (this.contractFileRows || []).some(
         row =>
@@ -1412,7 +1437,7 @@ export default {
       return this.showBillCycleType && this.settlementRuleForm.billCycleType === '自定义多周期';
     },
     showCycleDays() {
-      return this.settlementRuleForm.settlementType === '固定天数周期结算';
+      return this.isFixedCycleSettlementType(this.settlementRuleForm.settlementType);
     },
     billCutoffDayOptions() {
       return Array.from({ length: 31 }, (_, index) => ({
@@ -1473,9 +1498,11 @@ export default {
     },
   },
   created() {
-    this.loadProjectOptions();
-    this.loadSettlementDictionaries();
-    this.loadOrganizationOptions();
+    if (!this.isPublicViewPage) {
+      this.loadProjectOptions();
+      this.loadSettlementDictionaries();
+      this.loadOrganizationOptions();
+    }
     if (this.isFormPage) this.initFormPage();
     if (this.isDetailPage) this.initDetailPage();
   },
@@ -1675,7 +1702,7 @@ export default {
         copyCount: normalizeOptionalInteger(detail.copyCount, ''),
         invoiceCycle: normalizeOptionalInteger(detail.invoiceCycle, ''),
         paymentDays: normalizeOptionalInteger(detail.paymentDays, ''),
-        contractAmount: normalizeOptionalAmount(detail.contractAmount, ''),
+        contractAmount: normalizeOptionalAmount(detail.contractAmount, null),
         archiveStatus: detail.archiveStatus || '未归档',
         feeGenerationMode:
           detail.feeGenerationMode || (Number(detail.billingEnabled) === 0 ? 'manual' : 'system'),
@@ -1888,20 +1915,86 @@ export default {
         return;
       }
       this.submitAction = 'attachment';
-      this.api
+      const contractFileRows = this.attachmentUploadFromList
+        ? this.listUploadContractFileRows
+        : this.contractFileRows;
+      const attachmentRows = this.attachmentUploadFromList
+        ? this.listUploadAttachmentRows
+        : this.attachmentRows;
+      return this.api
         .updateAttachments({
           id: this.form.id,
-          contractFileJson: JSON.stringify(this.contractFileRows),
-          attachmentsJson: JSON.stringify(this.attachmentRows),
+          contractFileJson: JSON.stringify(contractFileRows),
+          attachmentsJson: JSON.stringify(attachmentRows),
         })
         .then(() => {
           this.$message.success('附件保存成功');
+          if (this.attachmentUploadFromList) {
+            this.attachmentUploadFromList = false;
+            this.listUploadContractFileRows = [];
+            this.listUploadAttachmentRows = [];
+            this.onLoad(this.page, this.query);
+            return;
+          }
           this.closeForm();
         })
         .finally(() => {
           this.submitAction = '';
         });
     },
+    openAttachmentUploadDialog(row = {}) {
+      if (!row?.id) {
+        this.$message.warning('合同不存在，无法上传附件');
+        return;
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '加载中',
+        background: 'rgba(255, 255, 255, 0.6)',
+      });
+      this.attachmentUploadFromList = true;
+      this.listUploadContractFileRows = [];
+      this.listUploadAttachmentRows = [];
+      this.form = { ...defaultForm(), id: row.id };
+      this.api
+        .getDetail(row.id)
+        .then(res => {
+          const detail = res.data?.data || {};
+          this.form = {
+            ...defaultForm(),
+            ...detail,
+            id: detail.id || row.id,
+          };
+          this.listUploadContractFileRows = normalizeContractFileRows(
+            parseArray(detail.contractFileJson)
+          );
+          this.listUploadAttachmentRows = parseArray(detail.attachmentsJson);
+          this.$nextTick(() => {
+            this.$refs.listAttachmentUploader?.openUploadDialog?.();
+          });
+        })
+        .catch(() => {
+          this.attachmentUploadFromList = false;
+          this.$message.error('合同详情加载失败');
+        })
+        .finally(() => {
+          loading.close();
+        });
+    },
+    handleListAttachmentUploadConfirmed() {
+      if (!this.attachmentUploadFromList) return;
+      this.submitAttachmentUpload();
+    },
+    handleListAttachmentUploadToLocation({ location, rows = [] }) {
+      if (!rows.length) return;
+      if (location === '合同文件') {
+        this.listUploadContractFileRows = [...(this.listUploadContractFileRows || []), ...rows];
+        return;
+      }
+      if (location === '其它附件') {
+        this.listUploadAttachmentRows = [...(this.listUploadAttachmentRows || []), ...rows];
+      }
+    },
     loadProjectOptions() {
       if (this.projectLoading) return;
       this.projectLoading = true;
@@ -2118,6 +2211,13 @@ export default {
     integerInput(prop, value) {
       this.form[prop] = String(value || '').replace(/\D/g, '');
     },
+    handleContractAmountInput(value) {
+      const text = String(value || '').replace(/[^\d.]/g, '');
+      const parts = text.split('.');
+      const normalized =
+        parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 2)}` : parts[0];
+      this.form.contractAmount = normalized === '' ? null : normalized;
+    },
     positiveIntegerInput(prop, value) {
       const normalized = String(value || '').replace(/\D/g, '').replace(/^0+/, '');
       this.form[prop] = normalized;
@@ -2148,6 +2248,16 @@ export default {
       };
       this.attachmentDocumentPreviewVisible = true;
     },
+    handleAttachmentUploadToLocation({ location, rows = [] }) {
+      if (!rows.length) return;
+      if (location === '合同文件') {
+        this.contractFileRows = [...(this.contractFileRows || []), ...rows];
+        return;
+      }
+      if (location === '其它附件') {
+        this.attachmentRows = [...(this.attachmentRows || []), ...rows];
+      }
+    },
     handleAttachmentPreviewUnsupported() {
       this.$message.warning('当前文件暂不支持在线预览');
     },
@@ -2206,8 +2316,12 @@ export default {
       }
       return true;
     },
+    isFixedCycleSettlementType(value) {
+      return value === '按固定天数周期' || value === '固定天数周期结算';
+    },
     normalizeSettlementRule(rule = {}) {
       const next = { ...defaultSettlementRule(), ...rule };
+      if (next.settlementType === '固定天数周期结算') next.settlementType = '按固定天数周期';
       if (next.settlementType !== '月结') {
         next.billCycleType = '';
         next.billCutoffDay = '';
@@ -2222,7 +2336,7 @@ export default {
       } else {
         next.customPeriods = [];
       }
-      if (next.settlementType !== '固定天数周期结算') next.cycleDays = '';
+      if (!this.isFixedCycleSettlementType(next.settlementType)) next.cycleDays = '';
       return next;
     },
     syncSettlementConfig() {
@@ -2245,7 +2359,7 @@ export default {
       this.settlementRuleForm.billCycleType = '';
       this.settlementRuleForm.billCutoffDay = '';
       this.settlementRuleForm.customPeriods = [];
-      if (value !== '固定天数周期结算') this.settlementRuleForm.cycleDays = '';
+      if (!this.isFixedCycleSettlementType(value)) this.settlementRuleForm.cycleDays = '';
     },
     handleBillCycleTypeChange(value) {
       if (value !== '固定截单日') this.settlementRuleForm.billCutoffDay = '';
@@ -2336,7 +2450,7 @@ export default {
     validateSettlementRule(rule, label) {
       if (Number(rule.autoGenerate) !== 1) return true;
       if (!rule.billStartDate || !rule.settlementType) {
-        this.$message.warning(`${label}：请完整填写账单起始日期和结算类型`);
+        this.$message.warning(`${label}：请完整填写账单起始日和结算类型`);
         return false;
       }
       if (rule.settlementType === '月结' && !rule.billCycleType) {
@@ -2354,7 +2468,7 @@ export default {
       if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') {
         return this.validateCustomPeriods(rule.customPeriods, label);
       }
-      if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) {
+      if (this.isFixedCycleSettlementType(rule.settlementType) && !rule.cycleDays) {
         this.$message.warning(`${label}：请选择周期天数`);
         return false;
       }
@@ -2406,8 +2520,10 @@ export default {
       if (!id) return;
       this.detailLoading = true;
       this.applyDetailState({});
-      this.api
-        .getDetail(id)
+      const request = this.isPublicViewPage
+        ? getMkPublicDetail('contract-manage', id)
+        : this.api.getDetail(id);
+      request
         .then(res => {
           this.applyDetailState(res.data?.data || {});
         })
@@ -2576,7 +2692,7 @@ export default {
               .join('，')}`
           );
         }
-        if (config.billStartDate) parts.push(`账单起始日期：${config.billStartDate}`);
+        if (config.billStartDate) parts.push(`账单起始日：${config.billStartDate}`);
         return parts.join('，');
       };
       if (normalized.preSettlementConfig || normalized.formalSettlementConfig) {
@@ -2672,6 +2788,15 @@ export default {
     },
     detailValue(prop) {
       const value = this.detailRow[prop];
+      if (prop === 'contractAmount') {
+        return value === undefined ||
+          value === null ||
+          value === '' ||
+          Number(value) === -1 ||
+          String(value) === '-1'
+          ? '-'
+          : value;
+      }
       if (
         prop === 'contractStage' ||
         prop === 'approvalStatus' ||
@@ -2706,15 +2831,7 @@ export default {
         return;
       }
       if (operation.action === 'attachmentUpload') {
-        this.$router.push({
-          path: '/business/contract-manage/form',
-          query: {
-            mode: 'edit',
-            id: row.id,
-            name: '附件上传',
-            attachmentUpload: '1',
-          },
-        });
+        this.openAttachmentUploadDialog(row);
         return;
       }
       const run = value => {
@@ -2900,25 +3017,6 @@ export default {
   word-break: break-word;
 }
 
-.contract-change-record-detail-meta {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px 32px;
-  margin-bottom: 16px;
-  color: #606266;
-}
-
-:deep(.contract-change-record-detail-dialog .el-dialog__body) {
-  max-height: 65vh;
-  overflow: auto;
-  padding-top: 12px;
-}
-
-:deep(.contract-change-record-detail-dialog .contract-change-record-detail-value .cell) {
-  white-space: pre-wrap;
-  word-break: break-all;
-}
-
 :global(.avue--collapse .contract-manage-page__footer) {
   left: 60px;
 }
@@ -2954,6 +3052,10 @@ export default {
       box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
     }
 
+    &--attachment {
+      overflow: visible;
+    }
+
     > .dialog-section-title,
     :deep(.dialog-section-title) {
       margin-bottom: 20px;
@@ -3018,13 +3120,6 @@ export default {
     align-items: center;
     gap: 20px;
     margin-bottom: 16px;
-
-    .settlement-switch-tip {
-      margin: 0 4px;
-      color: #a8abb2;
-      cursor: help;
-      font-size: 14px;
-    }
   }
 
   &__settlement-grid {
@@ -3082,11 +3177,19 @@ export default {
     min-width: 0;
   }
 
+  :deep(.el-input-number) {
+    width: 360px;
+    max-width: 100%;
+
+    .el-input__inner {
+      text-align: left;
+    }
+  }
+
   :deep(.el-input),
   :deep(.el-select),
   :deep(.el-cascader),
   :deep(.el-tree-select),
-  :deep(.el-input-number),
   :deep(.el-date-editor) {
     width: 360px;
     max-width: 100%;

src/views/business/loading-manage.vue

@@ -289,29 +289,53 @@
       <el-table-column label="承运类型" prop="carrierType" min-width="120" show-overflow-tooltip />
       <el-table-column label="发货地" prop="departureAddress" min-width="180">
         <template #default="{ row }">
-          <el-tooltip :content="formatFullRouteAddress(row, 'departure')" placement="top">
+          <el-tooltip
+            v-if="formatFullRouteAddress(row, 'departure')"
+            :content="formatFullRouteAddress(row, 'departure')"
+            placement="top"
+            :show-after="120"
+          >
             <div class="loading-manage-page__address-cell">
               {{ formatRouteAddress(row, 'departure') }}
             </div>
           </el-tooltip>
+          <div v-else class="loading-manage-page__address-cell">
+            {{ formatRouteAddress(row, 'departure') }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="途经地" prop="transitAddress" min-width="190">
         <template #default="{ row }">
-          <el-tooltip :content="formatFullRouteAddress(row, 'transit')" placement="top">
+          <el-tooltip
+            v-if="formatFullRouteAddress(row, 'transit')"
+            :content="formatFullRouteAddress(row, 'transit')"
+            placement="top"
+            :show-after="120"
+          >
             <div class="loading-manage-page__address-cell">
               {{ formatRouteAddress(row, 'transit') }}
             </div>
           </el-tooltip>
+          <div v-else class="loading-manage-page__address-cell">
+            {{ formatRouteAddress(row, 'transit') }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="到货地" prop="arrivalAddress" min-width="180">
         <template #default="{ row }">
-          <el-tooltip :content="formatFullRouteAddress(row, 'arrival')" placement="top">
+          <el-tooltip
+            v-if="formatFullRouteAddress(row, 'arrival')"
+            :content="formatFullRouteAddress(row, 'arrival')"
+            placement="top"
+            :show-after="120"
+          >
             <div class="loading-manage-page__address-cell">
               {{ formatRouteAddress(row, 'arrival') }}
             </div>
           </el-tooltip>
+          <div v-else class="loading-manage-page__address-cell">
+            {{ formatRouteAddress(row, 'arrival') }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="承运商" prop="carrierName" min-width="160" show-overflow-tooltip />
@@ -386,32 +410,74 @@
       v-if="isStandalonePage"
       class="loading-manage-dialog loading-manage-form-dialog loading-manage-form-page"
     >
-      <div class="archive-page-form__title">{{
-        isStandaloneDetailPage ? detailPageTitle : formPageTitle
-      }}</div>
+      <div v-if="!isStandaloneDetailPage" class="archive-page-form__title">{{ formPageTitle }}</div>
       <div v-loading="dialogLoading" class="loading-manage-dialog__body">
         <div v-if="dialogReadonly" class="loading-detail">
           <section-card title="配载单详情">
             <div class="loading-detail__summary">
-              <div class="loading-detail__heading">配载单详情</div>
               <div>{{ dialogForm.loadingNo || '-' }}</div>
-              <div>
-                <el-tag :type="detailStatusType" class="status-text">{{
-                  statusText(dialogForm)
-                }}</el-tag>
-              </div>
-              <div>
-                <el-tag type="warning">{{ transportTypeLabel(dialogForm.transportType) }}</el-tag>
-              </div>
+              <el-tag :type="detailStatusType">{{ statusText(dialogForm) }}</el-tag>
+              <el-tag type="primary">{{ transportTypeLabel(dialogForm.transportType) }}</el-tag>
             </div>
             <div class="loading-detail__task-row">
-              <div class="loading-detail__field">
-                <span class="loading-detail__label">任务信息</span
-                ><span class="loading-detail__value">{{ taskSummary }}</span>
+              <div class="loading-detail__task-main">
+                <span class="loading-detail__label">任务信息</span>
+                <div class="loading-detail__task-grid">
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">承运商</span>
+                    <span class="loading-detail__value">{{ detailTaskField('carrierName') }}</span>
+                  </div>
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">司机</span>
+                    <span class="loading-detail__value">{{ detailTaskField('driverName') }}</span>
+                  </div>
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">车牌号</span>
+                    <span class="loading-detail__value">{{ detailTaskField('vehicleNo') }}</span>
+                  </div>
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">手机号</span>
+                    <span class="loading-detail__value">{{ detailTaskField('driverPhone') }}</span>
+                  </div>
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">里程</span>
+                    <span class="loading-detail__value">{{
+                      detailTaskMileage ? `${detailTaskMileage} km` : '-'
+                    }}</span>
+                  </div>
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">预计发货日期</span>
+                    <span class="loading-detail__value">{{
+                      detailTaskDate('estimatedStartDate')
+                    }}</span>
+                  </div>
+                  <div class="loading-detail__field">
+                    <span class="loading-detail__label">预计完成日期</span>
+                    <span class="loading-detail__value">{{
+                      detailTaskDate('estimatedEndDate')
+                    }}</span>
+                  </div>
+                  <template v-if="isSelfCarrierDetail">
+                    <div class="loading-detail__field">
+                      <span class="loading-detail__label">挂车车牌号</span>
+                      <span class="loading-detail__value">{{
+                        detailTaskField('trailerVehicleNo')
+                      }}</span>
+                    </div>
+                    <div class="loading-detail__field">
+                      <span class="loading-detail__label">押运人</span>
+                      <span class="loading-detail__value">{{ detailTaskField('escortName') }}</span>
+                    </div>
+                    <div class="loading-detail__field">
+                      <span class="loading-detail__label">押运人手机号</span>
+                      <span class="loading-detail__value">{{ detailTaskField('escortPhone') }}</span>
+                    </div>
+                  </template>
+                </div>
               </div>
-              <div class="loading-detail__field">
-                <span class="loading-detail__label">附件</span
-                ><span class="loading-detail__value"
+              <div class="loading-detail__field loading-detail__attachment-field">
+                <span class="loading-detail__label">附件</span>
+                <span class="loading-detail__value"
                   ><el-link
                     v-for="file in detailAttachments"
                     :key="file.url || file.name"
@@ -447,7 +513,19 @@
                   >
                 </div>
                 <div class="loading-detail__step-address">
-                  {{ node.displayAddress || formatAddressText(node.address) }}
+                  <el-tooltip
+                    v-if="formatDetailRouteTooltip(node)"
+                    :content="formatDetailRouteTooltip(node)"
+                    placement="top"
+                    :show-after="120"
+                  >
+                    <span class="loading-detail__step-address-text">{{
+                      formatDetailRouteShort(node)
+                    }}</span>
+                  </el-tooltip>
+                  <span v-else class="loading-detail__step-address-text">{{
+                    formatDetailRouteShort(node)
+                  }}</span>
                 </div>
                 <div class="loading-detail__step-tags">
                   <el-tag v-for="tag in node.tags || []" :key="tag" size="small">{{ tag }}</el-tag>
@@ -1181,9 +1259,10 @@
                 </el-form-item>
                 <el-form-item label="里程（km）">
                   <el-input
-                    v-model="dialogForm.mileage"
+                    :model-value="normalizeLoadingMileage(dialogForm.mileage)"
                     clearable
                     placeholder="请输入"
+                    :disabled="dialogReadonly"
                     @input="handleMileageInput"
                   />
                 </el-form-item>
@@ -1414,6 +1493,7 @@ import { getList as getContractList } from '@/api/business/contract-manage';
 import { getParentOptions as getCargoTypeOptions } from '@/api/base/cargo-type';
 import { getList as getCustomerList } from '@/api/vehicle/customer-archive';
 import { getList as getDriverList } from '@/api/transportCapacity/driver';
+import { fetchDriversByCarrierOrganizations } from '@/utils/carrier-org-resource';
 import { getList as getProcessConfigList } from '@/api/business/process-config';
 import { getList as getCommonAddressList } from '@/api/base/common-address';
 import {
@@ -1433,6 +1513,7 @@ const defaultCandidateTransportType = '';
 const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
 const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
 const loadingCreateWaybillsStorageKey = 'loading-manage-create-waybills';
+const loadingManageListRefreshKey = 'loading-manage-list-refresh';
 let detailAmapLoader;
 
 const createSearchForm = () => ({
@@ -1517,6 +1598,14 @@ const normalizeLoadingMileage = value => {
   return value;
 };
 
+// 提交时未填写里程传 null，禁止自动填充 -1
+const toSubmitMileage = value => {
+  const normalized = normalizeLoadingMileage(value);
+  if (normalized === '') return null;
+  const number = Number(normalized);
+  return Number.isFinite(number) ? number : null;
+};
+
 const createCopiedDialogForm = (detail = {}) => {
   const form = createDialogForm();
   Object.keys(form).forEach(prop => {
@@ -1683,11 +1772,12 @@ export default {
       const typeMap = {
         pending: 'success',
         running: 'success',
-        completed: 'info',
+        processing: 'success',
+        completed: 'primary',
         cancelled: 'info',
-        draft: 'warning',
+        draft: 'info',
       };
-      return typeMap[this.dialogForm.businessStatus] || 'info';
+      return typeMap[this.dialogForm.businessStatus] || 'warning';
     },
     taskSummary() {
       return (
@@ -1696,6 +1786,12 @@ export default {
           .join(' / ') || '-'
       );
     },
+    isSelfCarrierDetail() {
+      return String(this.dialogForm.carrierType || '').trim() === '自运';
+    },
+    detailTaskMileage() {
+      return normalizeLoadingMileage(this.dialogForm.mileage);
+    },
     detailAttachments() {
       return parseJsonArray(this.dialogForm.attachmentsJson || this.dialogForm.attachmentJson).map(
         item =>
@@ -1753,12 +1849,29 @@ export default {
   deactivated() {
     this.closeInnerDialogs();
   },
+  activated() {
+    if (this.isStandalonePage) return;
+    if (sessionStorage.getItem(loadingManageListRefreshKey)) {
+      sessionStorage.removeItem(loadingManageListRefreshKey);
+      this.loadTable();
+    }
+  },
   beforeUnmount() {
     this.closeInnerDialogs();
   },
   watch: {
     $route(to, from) {
-      if (!this.isStandalonePage) return;
+      if (!this.isStandalonePage) {
+        // 从表单/详情返回列表时刷新，避免草稿确认后仍显示旧状态
+        if (
+          from?.path?.includes('/loading-manage/form') ||
+          from?.path?.includes('/loading-manage/detail')
+        ) {
+          sessionStorage.removeItem(loadingManageListRefreshKey);
+          this.loadTable();
+        }
+        return;
+      }
       this.syncStandaloneTagTitle();
       if (this.isStandaloneDetailPage) {
         // 记录变化或上一个页面不是详情态（例如从表单页/列表页进来）时重新拉取详情
@@ -1987,6 +2100,157 @@ export default {
         value.includes('highway')
       );
     },
+    // 与总单详情一致：公路地址压缩为「市 区县」
+    formatRoadLocation(value) {
+      const text = String(value || '')
+        .replace(/[\/／\s]+/g, '')
+        .trim();
+      if (!text) return '';
+
+      const parts = this.parseWaybillAddress(text);
+      let city = String(parts.city || '').trim();
+      let district = String(parts.district || '').trim();
+      let detail = String(parts.detailAddress || '').trim();
+
+      // 自治州/地区/盟下还有「XX市 + 区县」时，以市级作为展示主体
+      if (/(?:自治州|地区|盟)$/.test(city) && detail) {
+        const nestedCityMatch = detail.match(/^(.+?市)/);
+        if (nestedCityMatch) {
+          city = nestedCityMatch[1];
+          detail = detail.slice(nestedCityMatch[1].length);
+          const nestedDistrictMatch = detail.match(
+            /^(.+?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗))/
+          );
+          if (nestedDistrictMatch) district = nestedDistrictMatch[1];
+        } else if (!district) {
+          const nestedDistrictMatch = detail.match(
+            /^(.+?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗))/
+          );
+          if (nestedDistrictMatch) district = nestedDistrictMatch[1];
+        }
+      }
+
+      // 市级后紧跟区县，但 parse 未拆出时再补一次
+      if (city && !district && detail) {
+        const nestedDistrictMatch = detail.match(
+          /^(.+?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗))/
+        );
+        if (nestedDistrictMatch) district = nestedDistrictMatch[1];
+      }
+
+      if (city && district) {
+        // 兼容「梅县区」：命中「县」后还需保留后面的「区」
+        if (district.endsWith('县') && detail.startsWith(`${district}区`)) {
+          district = `${district}区`;
+        }
+        return `${city} ${district}`;
+      }
+      if (city) return city;
+      if (district) return district;
+
+      // 兜底压缩
+      const withoutProvince = text.replace(/^.*?(?:省|自治区|特别行政区)/, '');
+      const cityMatch = withoutProvince.match(/.+?(?:市|自治州|州(?!市)|盟(?!市)|地区)/);
+      if (!cityMatch) return text;
+      const fallbackCity = cityMatch[0];
+      const districtSource = withoutProvince.slice(fallbackCity.length);
+      const districtMatch = districtSource.match(
+        /^[^市州盟]*?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)/
+      );
+      if (!districtMatch) {
+        // 州后面是县级市时，继续解析市 + 区
+        const nestedCityMatch = districtSource.match(/^(.+?市)/);
+        if (nestedCityMatch) {
+          const nestedDistrictSource = districtSource.slice(nestedCityMatch[1].length);
+          const nestedDistrictMatch = nestedDistrictSource.match(
+            /^[^市州盟]*?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)/
+          );
+          if (nestedDistrictMatch) {
+            return `${nestedCityMatch[1]} ${nestedDistrictMatch[0]}`;
+          }
+          return nestedCityMatch[1];
+        }
+        return fallbackCity;
+      }
+      const fallbackDistrict = `${districtMatch[0]}${
+        districtSource.slice(districtMatch[0].length).startsWith('区') ? '区' : ''
+      }`;
+      return `${fallbackCity} ${fallbackDistrict}`;
+    },
+    isStationLikeName(value) {
+      const text = String(value || '').trim();
+      if (!text) return false;
+      return (
+        /(?:火车站|高铁站|客运站|货运站|港口|码头|机场|空港|航站楼)$/.test(text) ||
+        /(?<!市|州|盟|区|县|旗)站$/.test(text)
+      );
+    },
+    // 详情运输路线短展示：公路仅市区，非公路仅名称
+    formatDetailRouteShort(node = {}) {
+      const name = String(node.name || '').trim();
+      const address = String(node.address || '').trim();
+      const displayAddress = String(node.displayAddress || '').trim();
+      if (!this.isRoadTransportType(this.dialogForm.transportType)) {
+        if (name) return name;
+        if (this.isStationLikeName(displayAddress)) return displayAddress;
+        if (this.isStationLikeName(address)) return address;
+        return displayAddress || address || '-';
+      }
+      const enriched = this.enrichRouteNodeRegion(node);
+      // 合并节点地址与运单上的市/区字段，避免只解析到市
+      const region = this.mergeRouteAddressParts(enriched.cityName, enriched.districtName, '');
+      const source = this.mergeRouteAddressParts(
+        address,
+        displayAddress,
+        region,
+        enriched.name || name
+      );
+      const formatted = this.formatRoadLocation(source);
+      if (enriched.cityName && enriched.districtName) {
+        return `${enriched.cityName} ${enriched.districtName}`;
+      }
+      if (/(?:市|州|盟|区|县|旗)/.test(formatted)) return formatted;
+      return formatted || name || displayAddress || address || '-';
+    },
+    // 公路悬停展示完整地址；非公路不展示 tooltip
+    formatDetailRouteTooltip(node = {}) {
+      if (!this.isRoadTransportType(this.dialogForm.transportType)) return '';
+      const enriched = this.enrichRouteNodeRegion(node);
+      const region = this.mergeRouteAddressParts(enriched.cityName, enriched.districtName, '');
+      const full = this.mergeRouteAddressParts(
+        String(node.address || '').trim(),
+        String(node.displayAddress || '').trim(),
+        region,
+        String(node.name || enriched.name || '').trim()
+      );
+      const short = this.formatDetailRouteShort(node);
+      if (!full) return '';
+      return full === short ? '' : full;
+    },
+    // 按装/卸标签从已选运单回填市、区，补充 routeJson 中缺失的区县
+    enrichRouteNodeRegion(node = {}) {
+      const tags = Array.isArray(node.tags) ? node.tags : [];
+      const result = { cityName: '', districtName: '', name: '' };
+      for (const tag of tags) {
+        const text = String(tag || '');
+        const loadMatch = text.match(/^装(\d+)$/);
+        const unloadMatch = text.match(/^卸(\d+)$/);
+        const index = Number((loadMatch || unloadMatch)?.[1] || 0) - 1;
+        if (index < 0) continue;
+        const row = this.selectedWaybillRows[index];
+        if (!row) continue;
+        const prefix = loadMatch ? 'departure' : 'arrival';
+        result.cityName = String(
+          row[`${prefix}CityName`] || row[`${prefix}City`] || ''
+        ).trim();
+        result.districtName = String(
+          row[`${prefix}DistrictName`] || row[`${prefix}District`] || ''
+        ).trim();
+        result.name = String(row[`${prefix}Name`] || '').trim();
+        if (result.cityName || result.districtName || result.name) break;
+      }
+      return result;
+    },
     splitText(value) {
       if (!value) return [];
       return String(value)
@@ -2024,37 +2288,72 @@ export default {
     formatRouteAddress(row, type) {
       const prefix =
         type === 'departure' ? 'departure' : type === 'arrival' ? 'arrival' : 'transit';
-      if (type !== 'transit') {
-        const address = row[`${prefix}Address`];
-        const region = this.routeProvinceName(row, prefix);
-        const district = row[`${prefix}DistrictName`];
-        const source = this.mergeRouteAddressParts(region, district, address);
-        return this.formatProvinceCityDistrict(source) || '-';
+      if (type === 'transit') {
+        const values = this.splitText(row.transitAddress || row.transitName || '')
+          .map(value => this.formatListRouteShort(row, value, value))
+          .filter(value => value && value !== '-');
+        return [...new Set(values)].join('，') || '-';
       }
-      const values = [
-        row[`${prefix}RegionName`],
-        row[`${prefix}DistrictName`],
-        row[`${prefix}Address`],
-      ]
-        .filter(Boolean)
-        .flatMap(value => this.splitText(value))
-        .map(value => this.formatProvinceCityDistrict(value))
-        .filter(Boolean);
-      return [...new Set(values)].join(',') || '-';
+      const name = String(row[`${prefix}Name`] || '').trim();
+      const address = String(row[`${prefix}Address`] || '').trim();
+      const cityName = String(
+        row[`${prefix}CityName`] || row[`${prefix}City`] || ''
+      ).trim();
+      const districtName = String(
+        row[`${prefix}DistrictName`] || row[`${prefix}District`] || ''
+      ).trim();
+      if (
+        this.isRoadTransportType(row?.transportType) &&
+        cityName &&
+        districtName
+      ) {
+        return `${cityName} ${districtName}`;
+      }
+      const region = this.mergeRouteAddressParts(
+        this.routeProvinceName(row, prefix),
+        cityName,
+        districtName
+      );
+      const source = this.mergeRouteAddressParts(region, '', address || name);
+      return this.formatListRouteShort(row, name, source || address || name);
     },
     formatFullRouteAddress(row, type) {
+      if (!this.isRoadTransportType(row?.transportType)) return '';
       const prefix =
         type === 'departure' ? 'departure' : type === 'arrival' ? 'arrival' : 'transit';
-      if (type !== 'transit') {
-        const address = row[`${prefix}Address`];
-        const region = this.routeProvinceName(row, prefix);
-        const district = row[`${prefix}DistrictName`];
-        return this.mergeRouteAddressParts(region, district, address) || '-';
+      if (type === 'transit') {
+        const values = this.splitText(row.transitAddress || '')
+          .map(value => String(value || '').trim())
+          .filter(Boolean);
+        const full = [...new Set(values)].join('，');
+        const short = this.formatRouteAddress(row, 'transit');
+        return full && full !== short ? full : '';
       }
-      const values = [row.transitRegionName, row.transitDistrictName, row.transitAddress]
-        .filter(Boolean)
-        .flatMap(value => this.splitText(value));
-      return [...new Set(values)].join('，') || '-';
+      const name = String(row[`${prefix}Name`] || '').trim();
+      const address = String(row[`${prefix}Address`] || '').trim();
+      const region = this.mergeRouteAddressParts(
+        this.routeProvinceName(row, prefix),
+        row[`${prefix}CityName`] || row[`${prefix}City`],
+        row[`${prefix}DistrictName`] || row[`${prefix}District`]
+      );
+      const full = this.mergeRouteAddressParts(region, '', address || name);
+      const short = this.formatRouteAddress(row, type);
+      if (!full) return '';
+      return full === short ? '' : full;
+    },
+    // 列表短地址：公路「市 区县」，非公路仅名称
+    formatListRouteShort(row = {}, name = '', address = '') {
+      const rawName = String(name || '').trim();
+      const rawAddress = String(address || '').trim();
+      if (!this.isRoadTransportType(row?.transportType)) {
+        if (rawName) return rawName;
+        if (this.isStationLikeName(rawAddress)) return rawAddress;
+        return rawAddress || '-';
+      }
+      const source = rawAddress || rawName;
+      const formatted = this.formatRoadLocation(source);
+      if (/(?:市|州|盟)/.test(formatted)) return formatted;
+      return formatted || rawName || rawAddress || '-';
     },
     formatWaybillAddress(row, type) {
       const prefix = type === 'departure' ? 'departure' : 'arrival';
@@ -2280,7 +2579,8 @@ export default {
           this.dialogForm = row.copy
             ? createCopiedDialogForm(detail)
             : { ...createDialogForm(), ...detail };
-          this.dialogForm.mileage = normalizeLoadingMileage(this.dialogForm.mileage);
+          this.applyLoadingTaskInfoFromDetail(this.dialogForm);
+          this.applyLoadingMileageFromDetail(this.dialogForm);
           await this.restoreWaybillRows(
             this.dialogForm.waybillIdsJson,
             this.dialogForm.loadingSubNos
@@ -2617,6 +2917,8 @@ export default {
           ...this.buildQueryParams(this.candidateQuery),
           businessStatus: 'pending',
           onlyUnassignedLoading: 1,
+          // 仅查当前账户所属组织及子组织下的运单
+          allDept: 0,
           ...(this.dialogMode === 'add' ? { transportType: 'road' } : {}),
         };
         const transportType = this.getCandidateTransportTypeQuery(query.transportType);
@@ -2711,12 +3013,16 @@ export default {
         .map(row => row.waybillNo)
         .filter(Boolean)
         .join('，');
-      this.dialogForm.waybillIdsJson = JSON.stringify(
-        rows
-          .map(row => row.id)
-          .filter(Boolean)
-          .map(id => String(id))
-      );
+      const rowIds = rows
+        .map(row => row.id)
+        .filter(Boolean)
+        .map(id => String(id));
+      // 回显失败仅有运单号时，保留原 waybillIdsJson，避免确认提交清空运单绑定
+      if (rowIds.length) {
+        this.dialogForm.waybillIdsJson = JSON.stringify(rowIds);
+      } else if (!String(this.dialogForm.waybillIdsJson || '').trim()) {
+        this.dialogForm.waybillIdsJson = '[]';
+      }
       this.dialogForm.projectName = uniqueText(rows, 'projectName');
       this.dialogForm.customerName = uniqueText(rows, 'customerName');
       this.dialogForm.originalNo = uniqueText(rows, 'originalNo');
@@ -2843,29 +3149,95 @@ export default {
         remark: item.remark || '',
       };
     },
+    applyLoadingMileageFromDetail(form = this.dialogForm) {
+      let taskMileage = '';
+      try {
+        const taskInfo = JSON.parse(form.taskInfoJson || '{}');
+        taskMileage = taskInfo?.mileage;
+      } catch (error) {
+        taskMileage = '';
+      }
+      form.mileage = normalizeLoadingMileage(
+        form.mileage !== undefined && form.mileage !== null && form.mileage !== ''
+          ? form.mileage
+          : taskMileage
+      );
+    },
+    applyLoadingTaskInfoFromDetail(form = this.dialogForm) {
+      let taskInfo = {};
+      try {
+        taskInfo = JSON.parse(form.taskInfoJson || '{}') || {};
+      } catch (error) {
+        taskInfo = {};
+      }
+      if (!taskInfo || typeof taskInfo !== 'object' || Array.isArray(taskInfo)) return;
+      const fields = [
+        'carrierType',
+        'carrierName',
+        'carrierContractId',
+        'driverName',
+        'driverPhone',
+        'vehicleNo',
+        'trailerVehicleNo',
+        'escortName',
+        'escortPhone',
+        'estimatedStartDate',
+        'estimatedEndDate',
+        'taskRemark',
+      ];
+      fields.forEach(prop => {
+        if (
+          (form[prop] === undefined || form[prop] === null || form[prop] === '') &&
+          taskInfo[prop] !== undefined &&
+          taskInfo[prop] !== null &&
+          taskInfo[prop] !== ''
+        ) {
+          form[prop] = taskInfo[prop];
+        }
+      });
+      if (
+        (form.mileage === undefined || form.mileage === null || form.mileage === '') &&
+        taskInfo.mileage !== undefined
+      ) {
+        form.mileage = normalizeLoadingMileage(taskInfo.mileage);
+      }
+    },
+    detailTaskField(prop) {
+      const value = String(this.dialogForm?.[prop] ?? '').trim();
+      return value || '-';
+    },
+    detailTaskDate(prop) {
+      const value = String(this.dialogForm?.[prop] ?? '').trim();
+      return value ? value.slice(0, 10) : '-';
+    },
     normalizePayload() {
       this.syncRouteAddressFields();
       this.rebuildSummaryFromWaybills(false);
       this.dialogForm.mileage = normalizeLoadingMileage(this.dialogForm.mileage);
+      const mileage = toSubmitMileage(this.dialogForm.mileage);
+      const taskInfo = {
+        carrierType: this.dialogForm.carrierType,
+        carrierName: this.dialogForm.carrierName,
+        carrierContractId: this.dialogForm.carrierContractId,
+        driverName: this.dialogForm.driverName,
+        driverPhone: this.dialogForm.driverPhone,
+        vehicleNo: this.dialogForm.vehicleNo,
+        trailerVehicleNo: this.dialogForm.trailerVehicleNo,
+        escortName: this.dialogForm.escortName,
+        escortPhone: this.dialogForm.escortPhone,
+        estimatedStartDate: this.dialogForm.estimatedStartDate,
+        estimatedEndDate: this.dialogForm.estimatedEndDate,
+        taskRemark: this.dialogForm.taskRemark,
+      };
+      if (mileage !== null) {
+        taskInfo.mileage = mileage;
+      }
       return {
         ...this.dialogForm,
+        mileage,
         routeJson: JSON.stringify(this.routeNodes),
         goodsJson: JSON.stringify(this.cargoRows),
-        taskInfoJson: JSON.stringify({
-          carrierType: this.dialogForm.carrierType,
-          carrierName: this.dialogForm.carrierName,
-          carrierContractId: this.dialogForm.carrierContractId,
-          driverName: this.dialogForm.driverName,
-          driverPhone: this.dialogForm.driverPhone,
-          vehicleNo: this.dialogForm.vehicleNo,
-          trailerVehicleNo: this.dialogForm.trailerVehicleNo,
-          escortName: this.dialogForm.escortName,
-          escortPhone: this.dialogForm.escortPhone,
-          mileage: this.dialogForm.mileage,
-          estimatedStartDate: this.dialogForm.estimatedStartDate,
-          estimatedEndDate: this.dialogForm.estimatedEndDate,
-          taskRemark: this.dialogForm.taskRemark,
-        }),
+        taskInfoJson: JSON.stringify(taskInfo),
       };
     },
     validatePayload(draftMode = false) {
@@ -2920,7 +3292,7 @@ export default {
       return true;
     },
     async saveDraft() {
-      if (!this.validatePayload(true)) return;
+      // 暂存不做任何业务校验，直接保存
       this.dialogSaving = 'draft';
       try {
         const res = await loadingApi.saveDraft(this.normalizePayload());
@@ -2928,7 +3300,7 @@ export default {
           ...this.dialogForm,
           ...(res.data?.data || res.data || {}),
         };
-        this.dialogForm.mileage = normalizeLoadingMileage(this.dialogForm.mileage);
+        this.applyLoadingMileageFromDetail(this.dialogForm);
         ElMessage.success('暂存成功');
         this.loadTable();
       } finally {
@@ -2939,7 +3311,11 @@ export default {
       if (!this.validatePayload(false)) return;
       this.dialogSaving = 'submit';
       try {
-        const payload = this.normalizePayload();
+        const payload = {
+          ...this.normalizePayload(),
+          // 确认生成正式配载单（待执行），覆盖草稿状态
+          businessStatus: 'pending',
+        };
         if (this.dialogMode === 'reassign') {
           await loadingApi.reassign(payload);
           ElMessage.success('派单成功');
@@ -2947,6 +3323,7 @@ export default {
           await loadingApi.submit(payload);
           ElMessage.success('确认成功');
         }
+        sessionStorage.setItem(loadingManageListRefreshKey, '1');
         this.closeLoadingDialog();
         this.loadTable();
       } finally {
@@ -3032,6 +3409,7 @@ export default {
       this.dialogForm.carrierContractId = '';
       this.dialogForm.carrierName = '';
       this.dialogForm.carrierId = '';
+      this.clearDialogDriverVehicleFields();
       if (this.dialogForm.carrierType === '承运商') {
         this.dialogForm.trailerVehicleNo = '';
         this.dialogForm.escortName = '';
@@ -3051,6 +3429,23 @@ export default {
       this.dialogForm.carrierContractId =
         this.dialogForm.carrierType === '承运商' && contract?.id ? contract.id : '';
       this.dialogForm.carrierName = contract?.carrierName || '';
+      this.dialogForm.carrierId = contract?.carrierId || contract?.customerId || '';
+      this.clearDialogDriverVehicleFields();
+    },
+    clearDialogDriverVehicleFields() {
+      this.dialogForm.driverName = '';
+      this.dialogForm.driverPhone = '';
+      this.dialogForm.vehicleNo = '';
+      this.dialogForm.trailerVehicleNo = '';
+      this.dialogForm.escortName = '';
+      this.dialogForm.escortPhone = '';
+      this.driverOptions = [];
+    },
+    getDialogCarrierFilter() {
+      return {
+        carrierId: this.dialogForm.carrierId || '',
+        carrierName: this.dialogForm.carrierName || '',
+      };
     },
     handleDriverChange(value) {
       const driver = this.driverOptions.find(item => (item.driverName || item.name) === value);
@@ -3062,7 +3457,7 @@ export default {
       }
     },
     fetchDriverSuggestions(queryString, callback) {
-      this.loadDriverOptions(String(queryString || '').trim())
+      this.loadDialogDriverOptions(String(queryString || '').trim())
         .then(() =>
           callback(
             this.driverOptions.map(item => ({
@@ -3085,11 +3480,19 @@ export default {
     },
     fetchEscortSuggestions(queryString, callback) {
       const keyword = String(queryString || '').trim();
+      const carrier = this.getDialogCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        callback([]);
+        return;
+      }
       this.escortLoading = true;
-      getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '押运员' })
-        .then(res => {
+      fetchDriversByCarrierOrganizations(
+        { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '押运员' },
+        carrier
+      )
+        .then(records => {
           callback(
-            unwrapRecords(res).map(item => ({
+            records.map(item => ({
               ...item,
               value: item.driverName || item.name || '',
             }))
@@ -3109,6 +3512,7 @@ export default {
     handleMileageInput(value) {
       this.dialogForm.mileage = String(value || '').replace(/[^\d.]/g, '');
     },
+    normalizeLoadingMileage,
     transportTypeLabel(value) {
       if (!value) return '-';
       return (
@@ -3158,12 +3562,29 @@ export default {
       this.driverLoading = true;
       try {
         this.driverOptions = unwrapRecords(
-          await getDriverList(1, 20, { driverName: keyword, posts: '司机' })
+          await getDriverList(1, 20, { ...(keyword ? { driverName: keyword } : {}), posts: '司机' })
         );
       } finally {
         this.driverLoading = false;
       }
     },
+    async loadDialogDriverOptions(keyword = '') {
+      const carrier = this.getDialogCarrierFilter();
+      if (!carrier.carrierId && !carrier.carrierName) {
+        this.driverOptions = [];
+        return [];
+      }
+      this.driverLoading = true;
+      try {
+        this.driverOptions = await fetchDriversByCarrierOrganizations(
+          { size: 20, ...(keyword ? { driverName: keyword } : {}), posts: '司机' },
+          carrier
+        );
+        return this.driverOptions;
+      } finally {
+        this.driverLoading = false;
+      }
+    },
     async loadCarrierOptions(keyword = '') {
       this.carrierLoading = true;
       try {
@@ -3225,15 +3646,39 @@ export default {
           } else {
             this.dialogForm.carrierContractId = '';
             this.dialogForm.carrierName = '';
+            this.dialogForm.carrierId = '';
           }
           return this.taskCarrierOptions;
         }
         if (this.dialogForm.carrierType === '自运' && contracts.length) {
-          this.taskCarrierOptions = contracts;
-          const current = contracts.find(item => item.carrierName === this.dialogForm.carrierName);
+          this.taskCarrierOptions = contracts
+            .map(item => ({
+              ...item,
+              carrierName:
+                item.partyB ||
+                item.partyBName ||
+                item.contractPartyB ||
+                item.customerContractPartyB ||
+                item.carrierName ||
+                '',
+              carrierId:
+                item.partyBId ||
+                item.partyBUserId ||
+                item.contractPartyBId ||
+                item.customerContractPartyBId ||
+                item.carrierId ||
+                '',
+            }))
+            .filter(item => item.carrierName);
+          const current = this.taskCarrierOptions.find(
+            item => item.carrierName === this.dialogForm.carrierName
+          );
           this.dialogForm.carrierContractId = '';
-          this.dialogForm.carrierName = current?.carrierName || contracts[0].carrierName || '';
-          return contracts;
+          this.dialogForm.carrierName =
+            current?.carrierName || this.taskCarrierOptions[0]?.carrierName || '';
+          this.dialogForm.carrierId =
+            current?.carrierId || this.taskCarrierOptions[0]?.carrierId || '';
+          return this.taskCarrierOptions;
         }
         if (this.dialogForm.carrierType !== '自运') {
           this.taskCarrierOptions = [];
@@ -3267,6 +3712,7 @@ export default {
         }));
         this.dialogForm.carrierContractId = '';
         this.dialogForm.carrierName = partyBNames[0] || '';
+        this.dialogForm.carrierId = '';
         return this.taskCarrierOptions;
       } catch (error) {
         if (requestId !== this.taskCarrierRequestId) return [];
@@ -3604,13 +4050,17 @@ export default {
     display: flex;
     align-items: center;
     flex-wrap: wrap;
-    gap: 24px;
+    gap: 12px;
     padding: 4px 0 16px;
-  }
-  .loading-detail__heading {
-    font-size: 20px;
-    font-weight: 600;
-    margin-right: 8px;
+
+    :deep(.el-tag) {
+      height: 28px;
+      padding: 0 12px;
+      border: 0;
+      border-radius: 8px;
+      font-size: 13px;
+      line-height: 28px;
+    }
   }
   .loading-detail__route-title {
     display: inline-flex;
@@ -3623,9 +4073,24 @@ export default {
   }
   .loading-detail__task-row {
     display: grid;
-    grid-template-columns: 1fr 1fr;
+    grid-template-columns: minmax(0, 1fr) 220px;
     gap: 24px;
     padding-bottom: 4px;
+    align-items: start;
+  }
+  .loading-detail__task-main {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    min-width: 0;
+  }
+  .loading-detail__task-grid {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+    gap: 16px 24px;
+  }
+  .loading-detail__attachment-field {
+    min-width: 0;
   }
   .loading-detail__field {
     display: flex;
@@ -3641,6 +4106,8 @@ export default {
     flex-wrap: wrap;
     gap: 8px;
     text-align: left;
+    color: #303133;
+    word-break: break-all;
   }
   .loading-detail__steps {
     display: flex;
@@ -3697,6 +4164,14 @@ export default {
     overflow: hidden;
     text-overflow: ellipsis;
   }
+  .loading-detail__step-address-text {
+    display: inline-block;
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: bottom;
+    cursor: default;
+  }
   .loading-detail__step-tags {
     display: flex;
     justify-content: center;
@@ -3883,5 +4358,9 @@ export default {
   .loading-detail__bottom-grid {
     grid-template-columns: 1fr;
   }
+
+  .loading-detail__task-grid {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
 }
 </style>

src/views/business/master-order.vue

@@ -132,7 +132,7 @@
       />
     </template>
     <master-order-dispatch v-else-if="mode === 'dispatch'" :id="routeId" @back="goList" />
-    <master-order-detail v-else :id="routeId" />
+    <master-order-detail v-else-if="mode === 'detail'" :id="routeId" />
     <el-dialog v-model="confirm.visible" title="提示" width="400px"
       ><span>{{ confirm.message }}</span
       ><template #footer
@@ -153,6 +153,10 @@ export default {
   components: { MasterOrderEditor, MasterOrderDispatch, MasterOrderDetail },
   data() {
     return {
+      // 实例创建时锁定所属路由。keep-alive 缓存后 $route 会变成其它页面，
+      // 不能再用全局 query.mode / query.id 决定本页形态，否则打开「新增项目管理」
+      //（mode=add 且无 id）会落入详情分支并请求缺少 id 的详情接口。
+      routePathLocked: this.$route.path,
       searchExpanded: false,
       loading: false,
       records: [],
@@ -180,10 +184,15 @@ export default {
     };
   },
   computed: {
+    isOwnedRoute() {
+      return this.$route.path === this.routePathLocked;
+    },
     mode() {
+      if (!this.isOwnedRoute) return 'list';
       return this.$route.query.mode || 'list';
     },
     routeId() {
+      if (!this.isOwnedRoute) return '';
       return this.$route.query.id;
     },
     masterEditorTitle() {
@@ -194,6 +203,7 @@ export default {
     '$route.query': {
       immediate: true,
       handler() {
+        if (!this.isOwnedRoute) return;
         this.syncTagTitle();
         if (this.mode === 'list') this.load();
       },

src/views/business/project-apply-public-view.vue

@@ -0,0 +1,149 @@
+<template>
+  <div ref="page" class="project-apply-public-view">
+    <project-apply ref="project" />
+  </div>
+</template>
+
+<script>
+import ProjectApply from './project-apply.vue';
+import { postMkPublicProcessMessage } from '@/api/mk-process';
+
+export default {
+  name: 'ProjectApplyPublicView',
+  components: {
+    ProjectApply,
+  },
+  created() {
+    this.handleIframeHeight = () => this.sendIframeHeight();
+    this.handleProcessMessage = event => this.onProcessMessage(event);
+    document.addEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+    window.addEventListener('message', this.handleProcessMessage);
+  },
+  mounted() {
+    document.documentElement.classList.add('mk-iframe-page');
+    document.body.classList.add('mk-iframe-page');
+    const app = document.getElementById('app');
+    if (app) app.classList.add('mk-iframe-page');
+    this.handleIframeHeight();
+    window.addEventListener('load', this.handleIframeHeight);
+    this.mkHeightTimers = [300, 800, 1600].map(delay => setTimeout(this.handleIframeHeight, delay));
+    if (typeof ResizeObserver === 'undefined') return;
+    this.mkHeightObserver = new ResizeObserver(() => this.handleIframeHeight());
+    this.$nextTick(() => {
+      if (this.$refs.page) this.mkHeightObserver.observe(this.$refs.page);
+      this.mkHeightObserver.observe(document.body);
+    });
+  },
+  beforeUnmount() {
+    document.removeEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+    window.removeEventListener('load', this.handleIframeHeight);
+    window.removeEventListener('message', this.handleProcessMessage);
+    (this.mkHeightTimers || []).forEach(timer => clearTimeout(timer));
+    if (this.mkHeightObserver) {
+      this.mkHeightObserver.disconnect();
+      this.mkHeightObserver = null;
+    }
+    document.documentElement.classList.remove('mk-iframe-page');
+    document.body.classList.remove('mk-iframe-page');
+    const app = document.getElementById('app');
+    if (app) app.classList.remove('mk-iframe-page');
+  },
+  methods: {
+    sendIframeHeight() {
+      this.$nextTick(() => {
+        window.parent.postMessage({ height: document.body.clientHeight }, '*');
+      });
+    },
+    onProcessMessage(event) {
+      const data = event && event.data;
+      if (!data || typeof data !== 'object') return;
+      if (data.height && !data.status && !data.type) return;
+      if (data.type === 'formValues' || data.type === 'afterSubmit') return;
+      const formValues = data.formValues;
+      if (data.status === 'submit') {
+        this.submitData(formValues);
+      } else if (data.status === 'save') {
+        this.saveData(formValues);
+      }
+      if (data.type === 'getFormValues') {
+        window.parent.postMessage({ type: 'formValues', formData: this.buildFormData() }, '*');
+      }
+    },
+    submitData(lbpmFormValues) {
+      const formData = this.buildFormData();
+      this.postFormData('submit', lbpmFormValues, formData);
+      if (!lbpmFormValues) return;
+      const parameters = Object.assign({}, lbpmFormValues, {
+        loginName: this.getLoginName(lbpmFormValues),
+        formInstanceId: this.getFormId(),
+        subject: formData.subject,
+      });
+      window.parent.postMessage({ type: 'afterSubmit', success: true, parameters }, '*');
+    },
+    saveData(lbpmFormValues) {
+      this.postFormData('save', lbpmFormValues, this.buildFormData());
+    },
+    postFormData(status, formValues, formData) {
+      postMkPublicProcessMessage('project-apply', {
+        status,
+        formValues: formValues || {},
+        formData,
+      }).catch(error => {
+        console.error('项目公开页提交流程数据失败：', error);
+      });
+    },
+    buildFormData() {
+      const form = this.getProjectForm();
+      return {
+        ...form,
+        subject: form.projectName || form.projectShortName || '',
+        formInstanceId: this.getFormId(),
+      };
+    },
+    getProjectForm() {
+      const form = this.$refs.project && this.$refs.project.form;
+      if (!form) return {};
+      try {
+        return JSON.parse(JSON.stringify(form));
+      } catch (error) {
+        return { ...form };
+      }
+    },
+    getFormId() {
+      return this.$route.query.id || this.getProjectForm().id || '';
+    },
+    getLoginName(formValues = {}) {
+      return (
+        formValues.loginName ||
+        this.$route.query.loginName ||
+        this.$route.query.submitIdentity ||
+        ''
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+html.mk-iframe-page,
+html.mk-iframe-page body,
+html.mk-iframe-page #app,
+html.mk-iframe-page #app.mk-iframe-page {
+  height: auto !important;
+  min-height: 100%;
+  overflow: visible;
+}
+</style>
+
+<style lang="scss" scoped>
+.project-apply-public-view {
+  min-height: 100%;
+  padding: 12px 0 24px;
+  box-sizing: border-box;
+  background: #f0f2f5;
+
+  :deep(.basic-container) {
+    padding: 0 12px;
+  }
+}
+</style>

src/views/business/project-apply.vue

@@ -1,5 +1,5 @@
 <template>
-  <basic-container class="project-apply-page">
+  <basic-container class="project-apply-page" :class="{ 'is-public-view': isPublicViewPage }">
     <avue-crud
       v-if="!isProjectFormPage"
       :option="tableOption"
@@ -196,7 +196,7 @@
           <el-form-item label="项目编号" prop="projectCode">
             <el-input
               v-model="form.projectCode"
-              placeholder="请输入"
+              :placeholder="dialogType === 'add' ? '若不填写，系统自动生成' : '请输入'"
               :disabled="dialogType === 'edit'"
             />
           </el-form-item>
@@ -525,6 +525,11 @@
             </template>
           </el-table-column>
           <el-table-column prop="companyNature" label="企业性质" min-width="140" align="center" />
+          <el-table-column label="是否广西百强" min-width="140" align="center">
+            <template #default="{ row }">
+              {{ formatGuangxiTop100(row.guangxiTop100) }}
+            </template>
+          </el-table-column>
           <el-table-column prop="legalPerson" label="法定代表人" min-width="140" align="center" />
           <el-table-column
             prop="address"
@@ -703,6 +708,7 @@
             label="变更内容"
             min-width="180"
             align="center"
+            :show-overflow-tooltip="false"
           >
             <template #default="{ row }">
               <el-tooltip placement="top" :show-after="200">
@@ -730,43 +736,10 @@
           </el-table-column>
         </el-table>
 
-        <el-dialog
+        <change-record-detail-dialog
           v-model="changeRecordDetailVisible"
-          title="变更记录详情"
-          append-to-body
-          destroy-on-close
-          width="1100px"
-          top="10px"
-          class="project-change-record-detail-dialog"
-        >
-          <div v-if="changeRecordDetail" class="project-change-record-detail-meta">
-            <span>变更日期：{{ changeRecordDetail.changeDate || '-' }}</span>
-            <span>变更账号：{{ changeRecordDetail.handler || '-' }}</span>
-          </div>
-          <el-table :data="changeRecordDetailRows" border :show-overflow-tooltip="false">
-            <el-table-column prop="field" label="变更字段" min-width="180" />
-            <el-table-column
-              prop="before"
-              label="变更前"
-              min-width="360"
-              class-name="project-change-record-detail-value"
-            />
-            <el-table-column
-              prop="after"
-              label="变更后"
-              min-width="500"
-              class-name="project-change-record-detail-value"
-            />
-          </el-table>
-          <el-empty
-            v-if="!changeRecordDetailRows.length"
-            description="暂无变更内容"
-            :image-size="60"
-          />
-          <template #footer>
-            <el-button type="primary" @click="changeRecordDetailVisible = false">关闭</el-button>
-          </template>
-        </el-dialog>
+          :rows="changeRecordDetailRows"
+        />
 
         <template v-if="isChangeDialog">
           <div class="dialog-section-title">变更原因</div>
@@ -784,15 +757,13 @@
       </el-form>
 
       <div
+        v-if="!isPublicViewPage"
         class="project-apply-dialog__footer"
         :class="{ 'project-apply-dialog__footer--change': isChangeDialog }"
       >
           <template v-if="isChangeDialog">
             <el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
             <el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
-            <el-button type="primary" plain :loading="submitLoading" @click="saveChangeProject">
-              保存
-            </el-button>
             <el-button type="primary" :loading="submitLoading" @click="submitChangeProject">
               提交
             </el-button>
@@ -909,12 +880,29 @@
         />
       </div>
     </el-dialog>
+
+    <el-dialog
+      v-model="publicCustomerVisible"
+      title="查看客商档案"
+      append-to-body
+      destroy-on-close
+      width="92%"
+      top="4vh"
+      class="project-apply-public-customer-dialog"
+    >
+      <customer-archive
+        v-if="publicCustomerVisible"
+        :embedded-public-id="publicCustomerId"
+      />
+    </el-dialog>
   </basic-container>
 </template>
 
 <script>
 import { exportBlob } from '@/api/common';
+import { defineAsyncComponent } from 'vue';
 import * as api from '@/api/business/project-apply';
+import { getMkPublicDetail } from '@/api/mk-process';
 import {
   getList as getCustomerArchiveList,
   getDetail as getCustomerArchiveDetail,
@@ -929,6 +917,7 @@ import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import PdfPreview from '@/components/pdf-preview/main.vue';
+import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
 import {
   fallbackPlugin,
   imagePlugin,
@@ -1045,7 +1034,10 @@ const majorProjectAttachmentTypeOptions = [
 ].map(item => ({ label: item, value: item })).concat(otherAttachmentType);
 
 export default {
+  name: 'ProjectApply',
   components: {
+    CustomerArchive: defineAsyncComponent(() => import('@/views/vehicle/customer-archive.vue')),
+    ChangeRecordDetailDialog,
     ElImageViewer,
     OpenFileViewer,
     PdfPreview,
@@ -1239,6 +1231,8 @@ export default {
       changeRecordDetail: null,
       changeRecordDetailRows: [],
       userBox: false,
+      publicCustomerVisible: false,
+      publicCustomerId: '',
       userPickType: '',
       userLoading: false,
       userData: [],
@@ -1315,6 +1309,9 @@ export default {
     isProjectFormPage() {
       return this.isFormPageInstance;
     },
+    isPublicViewPage() {
+      return this.$route.path === '/business/project-apply/public-view';
+    },
     projectFormContainer() {
       // 表单页实例始终用页面容器，避免 keep-alive 失活时误切弹窗
       return this.isFormPageInstance ? 'div' : 'el-dialog';
@@ -1361,6 +1358,11 @@ export default {
     },
   },
   created() {
+    if (this.isPublicViewPage) {
+      this.isFormPageInstance = true;
+      this.openPublicProjectForm();
+      return;
+    }
     this.loadDeptOptions();
     this.loadCargoTypeOptions();
     this.loadTransportTypeOptions();
@@ -1384,6 +1386,7 @@ export default {
       this.attachmentDocumentPreviewVisible = false;
       this.attachmentImagePreviewVisible = false;
       this.userBox = false;
+      this.publicCustomerVisible = false;
     },
     buildTableOption() {
       return {
@@ -1406,6 +1409,75 @@ export default {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission && this.permission[code], false);
     },
+    openPublicProjectForm() {
+      const id = this.$route.query.id;
+      this.dialogType = 'view';
+      this.dialogReadonly = true;
+      this.projectBox = true;
+      if (!id) {
+        this.$message.error('缺少项目ID');
+        return;
+      }
+      getMkPublicDetail('project-apply', id)
+        .then(res => {
+          const detail = res.data?.data || {};
+          this.applyPublicDictOptions(detail);
+          const displayDetail = { ...detail };
+          delete displayDetail.cargoTypeOptions;
+          delete displayDetail.transportTypeOptions;
+          delete displayDetail.settlementModeOptions;
+          this.applyProjectDetail(displayDetail);
+        })
+        .catch(() => {
+          this.$message.error('项目信息加载失败');
+        });
+    },
+    applyPublicDictOptions(detail = {}) {
+      this.cargoTypeOptions = this.resolvePublicDictOptions(
+        detail.cargoTypeOptions,
+        detail.cargoType
+      );
+      this.transportTypeOptions = this.resolvePublicDictOptions(
+        detail.transportTypeOptions,
+        detail.transportType
+      );
+      this.settlementModeOptions = this.resolvePublicDictOptions(
+        detail.settlementModeOptions,
+        detail.settlementMode
+      );
+      if (detail.businessDeptId) {
+        const label = detail.businessDeptName || String(detail.businessDeptId);
+        this.businessDeptTreeOptions = [{ label, value: detail.businessDeptId }];
+        this.deptOptions = [{ label, rawLabel: label, value: detail.businessDeptId }];
+      }
+      if (detail.undertakeDeptId) {
+        this.platformCompanyOptions = [
+          {
+            label: detail.undertakeDeptName || String(detail.undertakeDeptId),
+            value: detail.undertakeDeptId,
+          },
+        ];
+      }
+    },
+    resolvePublicDictOptions(options, currentValue) {
+      const list = Array.isArray(options)
+        ? options
+            .filter(item => item && item.value !== undefined && item.value !== null && item.value !== '')
+            .map(item => ({
+              label: item.label || String(item.value),
+              value: item.value,
+            }))
+        : [];
+      if (
+        currentValue !== undefined &&
+        currentValue !== null &&
+        currentValue !== '' &&
+        !list.some(item => String(item.value) === String(currentValue))
+      ) {
+        list.unshift({ label: String(currentValue), value: currentValue });
+      }
+      return list;
+    },
     openProjectFormPage() {
       const type = this.$route.query.mode || 'add';
       const id = this.$route.query.id;
@@ -1420,6 +1492,7 @@ export default {
         this.fillDefaultUsers();
         return;
       }
+      if (!id) return;
       this.api.getDetail(id).then(res => {
         const detail = res.data.data || {};
         const isChange = type === 'change';
@@ -1832,13 +1905,7 @@ export default {
         this.closeProjectForm();
       });
     },
-    saveChangeProject() {
-      this.submitChangeForm(false);
-    },
     submitChangeProject() {
-      this.submitChangeForm(true);
-    },
-    submitChangeForm(needSubmit) {
       this.$refs.projectForm.validate(valid => {
         if (!valid) {
           this.handleValidateFail();
@@ -1846,19 +1913,12 @@ export default {
         }
         if (!this.validateAttachmentFileTypes()) return;
         this.submitLoading = true;
-        const request = needSubmit ? this.api.submitChange : this.api.saveChange;
-        request(this.normalizeSubmitForm({ includeChangeType: true }))
+        // 变更记录仅在提交时生成，保存草稿不落记录
+        this.api
+          .submitChange(this.normalizeSubmitForm({ includeChangeType: true }))
           .then(res => {
             if (res.data?.success === false || res.data?.data === false) {
-              this.$message.error(
-                res.data?.msg || `${needSubmit ? '提交' : '保存'}失败，请联系管理员`
-              );
-              return;
-            }
-            if (!needSubmit) {
-              this.$message.success('保存成功!');
-              this.closeProjectForm();
-              this.onLoad(this.page, this.query);
+              this.$message.error(res.data?.msg || '提交失败，请联系管理员');
               return;
             }
             const id = this.form.id;
@@ -2012,6 +2072,11 @@ export default {
         this.$message.warning('客商档案 ID 为空，无法打开');
         return;
       }
+      if (this.isPublicViewPage) {
+        this.publicCustomerId = String(id);
+        this.publicCustomerVisible = true;
+        return;
+      }
       this.$router.push({
         path: '/vehicle/customer-archive/form',
         query: { id: String(id), name: '查看客商档案', view: '1' },
@@ -2046,6 +2111,11 @@ export default {
     normalizeReadonlyAmount(value) {
       return this.normalizeOptionalSentinel(value);
     },
+    formatGuangxiTop100(value) {
+      if (value === 1 || value === '1') return '是';
+      if (value === 0 || value === '0') return '否';
+      return value || '';
+    },
     normalizeOptionalSentinel(value, emptyValue = '') {
       return value === null || value === undefined || value === '' || Number(value) === -1
         ? emptyValue
@@ -2452,6 +2522,8 @@ export default {
         id: item.id,
         credit: item.maxCreditLimit || item.applyCreditLimit || '',
         companyNature: item.customerNature || '',
+        guangxiTop100:
+          item.guangxiTop100 === 0 || item.guangxiTop100 === 1 ? item.guangxiTop100 : null,
         legalPerson: item.legalPerson || '',
         address: item.registeredAddress || '',
         contact: defaultContact.contactName || item.principal || '',
@@ -2594,6 +2666,12 @@ export default {
         this.$message.warning('项目ID为空，无法查看变更详情');
         return;
       }
+      if (this.isPublicViewPage) {
+        this.changeRecordDetail = { ...row };
+        this.changeRecordDetailRows = this.buildChangeRecordDetailRows(this.changeRecordDetail);
+        this.changeRecordDetailVisible = true;
+        return;
+      }
       try {
         if (!this.transportTypeOptions.length) {
           await this.loadTransportTypeOptions();
@@ -2650,6 +2728,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.project-apply-page.is-public-view {
+  :deep(.el-link) {
+    pointer-events: auto;
+  }
+}
+
 .project-apply-form {
   padding: 0;
 
@@ -2882,27 +2966,6 @@ export default {
   }
 }
 
-:deep(.project-change-record-detail-dialog .el-dialog__body) {
-  max-height: 65vh;
-  overflow: auto;
-}
-
-:deep(.project-change-record-detail-dialog .project-change-record-detail-value .cell) {
-  white-space: pre-wrap;
-  word-break: break-word;
-  overflow: visible;
-  text-overflow: clip;
-  line-height: 1.6;
-}
-
-.project-change-record-detail-meta {
-  display: flex;
-  gap: 32px;
-  margin-bottom: 16px;
-  color: #606266;
-  font-size: 14px;
-}
-
 :global(.project-apply-dialog .el-dialog__body) {
   max-height: 76vh;
   overflow-y: auto;
@@ -3019,3 +3082,11 @@ export default {
   }
 }
 </style>
+
+<style lang="scss">
+.project-apply-public-customer-dialog .el-dialog__body {
+  max-height: 78vh;
+  overflow: auto;
+  padding-top: 8px;
+}
+</style>

src/views/business/temporary-credit-limit.vue

@@ -99,13 +99,25 @@
           <el-table :data="attachmentRows" border @selection-change="selectedAttachments = $event">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column type="index" label="序号" width="70" align="center" />
-            <el-table-column label="文件名" min-width="240" show-overflow-tooltip>
+            <el-table-column label="文件名称" min-width="240" show-overflow-tooltip>
               <template #default="{ row }">
                 <el-link type="primary" @click="previewAttachment(row)">
                   {{ attachmentName(row) }}
                 </el-link>
               </template>
             </el-table-column>
+            <el-table-column label="附件描述" min-width="220">
+              <template #default="{ row }">
+                <span v-if="dialogReadonly">{{ row.description || '-' }}</span>
+                <el-input
+                  v-else
+                  v-model="row.description"
+                  maxlength="200"
+                  placeholder="请输入"
+                  @input="syncAttachmentsJson"
+                />
+              </template>
+            </el-table-column>
             <el-table-column label="文件大小" width="120" align="center">
               <template #default="{ row }">{{ formatFileSize(row.size) }}</template>
             </el-table-column>
@@ -172,7 +184,7 @@
       title="查看临时额度申请"
       append-to-body
       destroy-on-close
-      width="96%"
+      :width="formDialogWidth"
       class="temporary-credit-limit-dialog temporary-credit-limit-detail-dialog"
     >
       <div v-loading="detailLoading" class="business-crud-page__detail-content">
@@ -204,13 +216,16 @@
             </div>
             <el-table :data="attachmentRows" empty-text="暂无附件">
               <el-table-column type="index" label="序号" width="70" align="center" />
-              <el-table-column label="文件名" min-width="240" show-overflow-tooltip>
+              <el-table-column label="文件名称" min-width="240" show-overflow-tooltip>
                 <template #default="{ row }">
                   <el-link type="primary" @click="previewAttachment(row)">
                     {{ attachmentName(row) }}
                   </el-link>
                 </template>
               </el-table-column>
+              <el-table-column label="附件描述" min-width="220" show-overflow-tooltip>
+                <template #default="{ row }">{{ row.description || '-' }}</template>
+              </el-table-column>
               <el-table-column label="文件大小" width="120" align="center">
                 <template #default="{ row }">{{ formatFileSize(row.size) }}</template>
               </el-table-column>
@@ -400,6 +415,13 @@ export default {
     detailSections() {
       return this.config.detailSections || [];
     },
+    formDialogWidth() {
+      const width = this.tableOption?.dialogWidth ?? option.dialogWidth ?? 1100;
+      if (typeof width === 'number' || /^\d+$/.test(String(width))) {
+        return `${width}px`;
+      }
+      return String(width);
+    },
     isAdmin() {
       const authority = this.userInfo?.authority;
       return Array.isArray(authority)
@@ -595,7 +617,12 @@ export default {
       return value;
     },
     applyDetail(detail) {
-      this.form = { ...detail };
+      this.form = {
+        ...detail,
+        projectFundLimit: this.blankSentinelAmount(detail.projectFundLimit),
+        usedFundLimit: this.blankSentinelAmount(detail.usedFundLimit),
+        remainingFundLimit: this.blankSentinelAmount(detail.remainingFundLimit),
+      };
       this.selectedProjectId = detail.projectId || '';
       this.attachmentRows = this.parseJsonArray(detail.attachmentsJson);
       this.selectedAttachments = [];
@@ -605,6 +632,9 @@ export default {
       const { projectQuotaInfoTitle, temporaryCreditInfoTitle, ...payload } = row || {};
       return {
         ...payload,
+        projectFundLimit: this.toOptionalAmount(payload.projectFundLimit),
+        usedFundLimit: this.toOptionalAmount(payload.usedFundLimit),
+        remainingFundLimit: this.toOptionalAmount(payload.remainingFundLimit),
         applyLimit: payload.applyLimit === '' ? '' : Number(payload.applyLimit),
         attachmentsJson: JSON.stringify(this.attachmentRows),
       };
@@ -750,8 +780,8 @@ export default {
         projectName: project.projectName || '',
         projectCode: project.projectCode || '',
         undertakeDeptName: project.undertakeDeptName || '',
-        projectFundLimit: project.fundLimit || project.projectFundLimit || 0,
-        usedFundLimit: project.usedFundLimit || 0,
+        projectFundLimit: this.blankSentinelAmount(project.fundLimit ?? project.projectFundLimit),
+        usedFundLimit: this.blankSentinelAmount(project.usedFundLimit),
       });
       this.form.remainingFundLimit = this.calculateRemainingFundLimit();
       getProjectDetail(project.id).then(res => {
@@ -759,18 +789,32 @@ export default {
         Object.assign(this.form, {
           projectCode: detail.projectCode || this.form.projectCode,
           undertakeDeptName: detail.undertakeDeptName || this.form.undertakeDeptName,
-          projectFundLimit:
-            detail.fundLimit ?? detail.projectFundLimit ?? this.form.projectFundLimit,
-          usedFundLimit: detail.usedFundLimit ?? this.form.usedFundLimit,
+          projectFundLimit: this.blankSentinelAmount(
+            detail.fundLimit ?? detail.projectFundLimit ?? this.form.projectFundLimit
+          ),
+          usedFundLimit: this.blankSentinelAmount(
+            detail.usedFundLimit ?? this.form.usedFundLimit
+          ),
         });
         this.form.remainingFundLimit = this.calculateRemainingFundLimit();
       });
     },
+    blankSentinelAmount(value) {
+      if (value === undefined || value === null || value === '') return '';
+      return Number(value) === -1 ? '' : value;
+    },
+    toOptionalAmount(value) {
+      const amount = this.blankSentinelAmount(value);
+      return amount === '' ? null : amount;
+    },
     calculateRemainingFundLimit() {
-      const total = Number(this.form.projectFundLimit);
-      const used = Number(this.form.usedFundLimit);
-      if (!Number.isFinite(total) || !Number.isFinite(used)) return '';
-      return Math.round((total - used + Number.EPSILON) * 100) / 100;
+      const total = this.blankSentinelAmount(this.form.projectFundLimit);
+      const used = this.blankSentinelAmount(this.form.usedFundLimit);
+      if (total === '' || used === '') return '';
+      const totalAmount = Number(total);
+      const usedAmount = Number(used);
+      if (!Number.isFinite(totalAmount) || !Number.isFinite(usedAmount)) return '';
+      return Math.round((totalAmount - usedAmount + Number.EPSILON) * 100) / 100;
     },
     handleAmountInput(value) {
       const text = String(value || '').replace(/[^\d.]/g, '');
@@ -783,24 +827,37 @@ export default {
       const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
       this.attachmentRows = (list || []).map(item => ({
         ...item,
+        description: item.description || '',
         uploadUserName: item.uploadUserName || uploadUserName,
         uploadTime: item.uploadTime || uploadTime,
       }));
-      this.form.attachmentsJson = JSON.stringify(this.attachmentRows);
+      this.syncAttachmentsJson();
     },
     removeAttachment(index) {
       this.attachmentRows.splice(index, 1);
-      this.form.attachmentsJson = JSON.stringify(this.attachmentRows);
+      this.syncAttachmentsJson();
+    },
+    syncAttachmentsJson() {
+      this.form.attachmentsJson = JSON.stringify(this.attachmentRows || []);
     },
     parseJsonArray(value) {
-      if (Array.isArray(value)) return value;
-      if (!value) return [];
-      try {
-        const data = JSON.parse(value);
-        return Array.isArray(data) ? data : [];
-      } catch (error) {
+      let list = [];
+      if (Array.isArray(value)) {
+        list = value;
+      } else if (!value) {
         return [];
+      } else {
+        try {
+          const data = JSON.parse(value);
+          list = Array.isArray(data) ? data : [];
+        } catch (error) {
+          return [];
+        }
       }
+      return list.map(item => ({
+        ...item,
+        description: item?.description || '',
+      }));
     },
     attachmentName(row = {}) {
       return row.originalName || row.name || row.fileName || '附件';
@@ -906,7 +963,8 @@ export default {
 <style lang="scss" scoped>
 .temporary-credit-limit-page {
   &__field {
-    width: 100%;
+    width: 240px;
+    max-width: 100%;
   }
 
   &__attachment-head {
@@ -993,7 +1051,7 @@ export default {
       align-items: center;
       gap: 8px;
       width: 100%;
-      padding: 14px 16px 4px;
+      padding: 14px 0 4px;
       margin-bottom: 0;
       color: #303133;
       font-size: 15px;
@@ -1086,17 +1144,51 @@ export default {
     background: transparent !important;
     box-shadow: none !important;
     margin: 0 !important;
-    padding: 0 !important;
+    padding: 0 16px 8px !important;
     border-radius: 0 !important;
   }
+
+  // 新增/编辑：input/select 与「项目名称」同宽（240px），备注 textarea 保持整行
+  &:not(.temporary-credit-limit-detail-dialog) {
+    .el-form-item__content {
+      min-width: 0;
+    }
+
+    .el-form-item__content > .el-input,
+    .el-form-item__content > .el-select,
+    .el-form-item__content > .el-date-editor,
+    .el-form-item__content > .el-cascader,
+    .el-form-item__content > div > .el-input,
+    .el-form-item__content > div > .el-select,
+    .el-form-item__content > div > .el-date-editor,
+    .el-form-item__content > div > .el-cascader,
+    .temporary-credit-limit-page__field {
+      width: 240px !important;
+      max-width: 100%;
+    }
+
+    .el-form-item__content > .el-textarea,
+    .el-form-item__content > div > .el-textarea,
+    .el-form-item__content .el-textarea {
+      width: 100% !important;
+      max-width: 100% !important;
+    }
+
+    .el-date-editor.el-input,
+    .el-date-editor.el-input__wrapper {
+      width: 240px !important;
+      max-width: 100%;
+    }
+  }
 }
 
 .temporary-credit-limit-dialog .business-crud-page__detail-content .el-descriptions__label {
   width: 180px !important;
 }
 
-// 新增/编辑/查看：高度随内容自适应，超出时再滚动；去掉强制全屏导致的底部大片空白
+// 新增/编辑/查看：宽度与高度规则统一（Avue setPx 对 '1100px' 会拼成 '1100pxpx'，故 option 用数字 1100）
 .temporary-credit-limit-dialog.el-dialog {
+  width: 1100px !important;
   margin-top: 20px !important;
   margin-bottom: 20px !important;
   height: auto !important;

src/views/business/transport-plan-dispatch.vue

@@ -11,7 +11,7 @@
             {{ planData.businessStatusName || '-' }}
           </span>
           <span class="detail-status-text detail-transport-type">
-            {{ planData.transportTypeName || '公路运输' }}
+            {{ transportTypeLabel }}
           </span>
         </div>
         <div class="transport-plan-dispatch-page__summary-grid">
@@ -123,16 +123,20 @@
           </el-button>
         </template>
         <el-table
-          :data="dispatchList"
+          :data="pagedDispatchList"
           border
           height="100%"
           row-key="id"
           class="transport-plan-dispatch-page__table"
         >
-          <el-table-column type="index" label="序号" width="70" align="center" fixed="left" />
+          <el-table-column label="序号" width="70" align="center" fixed="left">
+            <template #default="{ $index }">
+              {{ dispatchRowIndex($index) }}
+            </template>
+          </el-table-column>
           <el-table-column label="运输方式" min-width="180" align="center" show-overflow-tooltip>
             <template #default="{ row }">
-              {{ row.transportTypeName || '-' }}
+              {{ formatTransportType(row.transportTypeName || row.transportType) }}
             </template>
           </el-table-column>
           <el-table-column prop="carrierType" label="承运类型" min-width="150" align="center" show-overflow-tooltip />
@@ -177,6 +181,17 @@
             </template>
           </el-table-column>
         </el-table>
+        <div class="transport-plan-dispatch-page__pagination">
+          <el-pagination
+            v-model:current-page="dispatchPage.currentPage"
+            v-model:page-size="dispatchPage.pageSize"
+            :page-sizes="dispatchPage.pageSizes"
+            layout="total, sizes, prev, pager, next"
+            :total="dispatchList.length"
+            @current-change="handleDispatchCurrentChange"
+            @size-change="handleDispatchSizeChange"
+          />
+        </div>
       </section-card>
 
       <!-- 底部按钮 -->
@@ -202,6 +217,7 @@
 
 <script>
 import { getDetail, dispatch } from '@/api/business/transport-plan';
+import { getDictionary } from '@/api/system/dictbiz';
 import SectionCard from '@/components/section-card/main.vue';
 import TransportPlanPage from './components/transport-plan-page.vue';
 import * as api from '@/api/business/transport-plan';
@@ -209,6 +225,12 @@ import { config, option } from '@/option/business/transport-plan';
 
 const TRANSPORT_PLAN_QUANTITY_UNIT = '吨';
 
+const normalizeDictOptions = (list = []) =>
+  (Array.isArray(list) ? list : []).map(item => ({
+    label: item.dictValue || item.label || '',
+    value: item.dictKey ?? item.value ?? '',
+  }));
+
 export default {
   name: 'TransportPlanDispatch',
   components: {
@@ -223,6 +245,12 @@ export default {
       dispatchList: [],
       attachmentList: [],
       transportPlanPageVisible: false,
+      transportTypeOptions: [],
+      dispatchPage: {
+        currentPage: 1,
+        pageSize: 10,
+        pageSizes: [10, 20, 50, 100],
+      },
       api,
       config,
       option,
@@ -232,6 +260,15 @@ export default {
     planId() {
       return this.$route.query.planId;
     },
+    transportTypeLabel() {
+      return this.formatTransportType(
+        this.planData.transportTypeName || this.planData.transportType
+      );
+    },
+    pagedDispatchList() {
+      const start = (this.dispatchPage.currentPage - 1) * this.dispatchPage.pageSize;
+      return this.dispatchList.slice(start, start + this.dispatchPage.pageSize);
+    },
     statusTextClass() {
       const status = this.planData.businessStatus;
       if (status === 2 || status === '2') return 'status-text-success';
@@ -306,13 +343,34 @@ export default {
     },
   },
   created() {
-    this.loadPlanData();
+    this.loadTransportTypeOptions().finally(() => {
+      this.loadPlanData();
+    });
   },
   mounted() {
     // 初始化 transport-plan-page 组件用于打开弹窗
     this.transportPlanPageVisible = true;
   },
   methods: {
+    loadTransportTypeOptions() {
+      return getDictionary({ code: 'transport_type' })
+        .then(res => {
+          this.transportTypeOptions = normalizeDictOptions(res.data?.data || []);
+        })
+        .catch(() => {
+          this.transportTypeOptions = [];
+        });
+    },
+    formatTransportType(value) {
+      const transportType = String(value || '').trim();
+      if (!transportType) return '-';
+      // 已是中文标签时直接展示
+      if (/[\u4e00-\u9fff]/.test(transportType)) return transportType;
+      const item = this.transportTypeOptions.find(
+        option => String(option.value ?? '').toLowerCase() === transportType.toLowerCase()
+      );
+      return item?.label || transportType;
+    },
     loadPlanData() {
       if (!this.planId) {
         this.$message.error('缺少计划ID参数');
@@ -327,6 +385,7 @@ export default {
             this.planData = res.data.data || {};
             this.attachmentList = this.parseAttachments(this.planData.attachmentsJson);
             this.dispatchList = this.parseDispatchList(this.planData);
+            this.dispatchPage.currentPage = 1;
           } else {
             this.$message.error(res.data?.msg || '加载数据失败');
           }
@@ -448,8 +507,30 @@ export default {
       }
       this.openPageDispatchItemDialog(-1);
     },
+    dispatchRowIndex(index) {
+      return (this.dispatchPage.currentPage - 1) * this.dispatchPage.pageSize + index + 1;
+    },
+    resolveDispatchGlobalIndex(pageIndex) {
+      return (this.dispatchPage.currentPage - 1) * this.dispatchPage.pageSize + pageIndex;
+    },
+    syncDispatchPage() {
+      const maxPage = Math.max(
+        1,
+        Math.ceil(this.dispatchList.length / this.dispatchPage.pageSize) || 1
+      );
+      if (this.dispatchPage.currentPage > maxPage) {
+        this.dispatchPage.currentPage = maxPage;
+      }
+    },
+    handleDispatchCurrentChange(currentPage) {
+      this.dispatchPage.currentPage = currentPage;
+    },
+    handleDispatchSizeChange(pageSize) {
+      this.dispatchPage.pageSize = pageSize;
+      this.dispatchPage.currentPage = 1;
+    },
     handleEdit(row, index) {
-      this.openPageDispatchItemDialog(index, row);
+      this.openPageDispatchItemDialog(this.resolveDispatchGlobalIndex(index), row);
     },
     openPageDispatchItemDialog(index = -1, row) {
       this.$nextTick(() => {
@@ -469,6 +550,7 @@ export default {
         originalSave.apply(component, args);
         if (!component.dispatchItemBox) {
           this.dispatchList = [...(component.dispatchRows || [])];
+          this.syncDispatchPage();
         }
       };
       component.__dispatchListSaveSynced = true;
@@ -479,7 +561,8 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        this.dispatchList.splice(index, 1);
+        this.dispatchList.splice(this.resolveDispatchGlobalIndex(index), 1);
+        this.syncDispatchPage();
         this.$message.success('删除成功');
       });
     },
@@ -782,6 +865,12 @@ export default {
     flex: 1;
   }
 
+  &__pagination {
+    display: flex;
+    justify-content: flex-end;
+    padding-top: 12px;
+  }
+
   &__actions {
     display: flex;
     gap: 8px;

src/views/business/waybill-manage-public-view.vue

@@ -0,0 +1,38 @@
+<template>
+  <mk-public-shell biz-type="waybill-manage" :get-form="getForm">
+    <waybill-manage-page
+      ref="page"
+      :api="api"
+      :config="config"
+      :crud-option="option"
+      :detail-id="detailId"
+      standalone-detail-page
+    />
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import WaybillManagePage from '@/views/business/components/waybill-manage-page.vue';
+import * as api from '@/api/business/waybill-manage';
+import { config, option } from '@/option/business/waybill-manage';
+
+export default {
+  name: 'WaybillManagePublicView',
+  components: { MkPublicShell, WaybillManagePage },
+  data() {
+    return { api, config, option };
+  },
+  computed: {
+    detailId() {
+      return this.$route.query.id || '';
+    },
+  },
+  methods: {
+    getForm() {
+      const row = this.$refs.page?.detailRow || {};
+      return { ...row, subject: row.waybillNo || '' };
+    },
+  },
+};
+</script>

src/views/mk/mk-public-shell.vue

@@ -0,0 +1,155 @@
+<template>
+  <div ref="page" class="mk-public-shell">
+    <slot />
+  </div>
+</template>
+
+<script>
+import { postMkPublicProcessMessage } from '@/api/mk-process';
+
+export default {
+  name: 'MkPublicShell',
+  props: {
+    bizType: {
+      type: String,
+      required: true,
+    },
+    getForm: {
+      type: Function,
+      default: null,
+    },
+  },
+  created() {
+    this.handleIframeHeight = () => this.sendIframeHeight();
+    this.handleProcessMessage = event => this.onProcessMessage(event);
+    document.addEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+    window.addEventListener('message', this.handleProcessMessage);
+  },
+  mounted() {
+    document.documentElement.classList.add('mk-iframe-page');
+    document.body.classList.add('mk-iframe-page');
+    const app = document.getElementById('app');
+    if (app) app.classList.add('mk-iframe-page');
+    this.handleIframeHeight();
+    window.addEventListener('load', this.handleIframeHeight);
+    this.mkHeightTimers = [300, 800, 1600].map(delay => setTimeout(this.handleIframeHeight, delay));
+    if (typeof ResizeObserver === 'undefined') return;
+    this.mkHeightObserver = new ResizeObserver(() => this.handleIframeHeight());
+    this.$nextTick(() => {
+      if (this.$refs.page) this.mkHeightObserver.observe(this.$refs.page);
+      this.mkHeightObserver.observe(document.body);
+    });
+  },
+  beforeUnmount() {
+    document.removeEventListener('DOMContentLoaded', this.handleIframeHeight, false);
+    window.removeEventListener('load', this.handleIframeHeight);
+    window.removeEventListener('message', this.handleProcessMessage);
+    (this.mkHeightTimers || []).forEach(timer => clearTimeout(timer));
+    if (this.mkHeightObserver) {
+      this.mkHeightObserver.disconnect();
+      this.mkHeightObserver = null;
+    }
+    document.documentElement.classList.remove('mk-iframe-page');
+    document.body.classList.remove('mk-iframe-page');
+    const app = document.getElementById('app');
+    if (app) app.classList.remove('mk-iframe-page');
+  },
+  methods: {
+    sendIframeHeight() {
+      this.$nextTick(() => {
+        window.parent.postMessage({ height: document.body.clientHeight }, '*');
+      });
+    },
+    onProcessMessage(event) {
+      const data = event && event.data;
+      if (!data || typeof data !== 'object') return;
+      if (data.height && !data.status && !data.type) return;
+      if (data.type === 'formValues' || data.type === 'afterSubmit') return;
+      const formValues = data.formValues;
+      if (data.status === 'submit') {
+        this.submitData(formValues);
+      } else if (data.status === 'save') {
+        this.saveData(formValues);
+      }
+      if (data.type === 'getFormValues') {
+        window.parent.postMessage({ type: 'formValues', formData: this.buildFormData() }, '*');
+      }
+    },
+    submitData(lbpmFormValues) {
+      const formData = this.buildFormData();
+      this.postFormData('submit', lbpmFormValues, formData);
+      if (!lbpmFormValues) return;
+      const parameters = Object.assign({}, lbpmFormValues, {
+        loginName: this.getLoginName(lbpmFormValues),
+        formInstanceId: this.getFormId(),
+        subject: formData.subject,
+      });
+      window.parent.postMessage({ type: 'afterSubmit', success: true, parameters }, '*');
+    },
+    saveData(lbpmFormValues) {
+      this.postFormData('save', lbpmFormValues, this.buildFormData());
+    },
+    postFormData(status, formValues, formData) {
+      postMkPublicProcessMessage(this.bizType, {
+        status,
+        formValues: formValues || {},
+        formData,
+      }).catch(error => {
+        console.error('公开页提交流程数据失败：', error);
+      });
+    },
+    buildFormData() {
+      const form = this.readForm();
+      return {
+        ...form,
+        subject: form.subject || '',
+        formInstanceId: this.getFormId(),
+      };
+    },
+    readForm() {
+      const form = typeof this.getForm === 'function' ? this.getForm() : {};
+      if (!form) return {};
+      try {
+        return JSON.parse(JSON.stringify(form));
+      } catch (error) {
+        return { ...form };
+      }
+    },
+    getFormId() {
+      return this.$route.query.id || this.readForm().id || '';
+    },
+    getLoginName(formValues = {}) {
+      return (
+        formValues.loginName ||
+        this.$route.query.loginName ||
+        this.$route.query.submitIdentity ||
+        ''
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+html.mk-iframe-page,
+html.mk-iframe-page body,
+html.mk-iframe-page #app,
+html.mk-iframe-page #app.mk-iframe-page {
+  height: auto !important;
+  min-height: 100%;
+  overflow: visible;
+}
+</style>
+
+<style lang="scss" scoped>
+.mk-public-shell {
+  min-height: 100%;
+  padding: 12px 0 24px;
+  box-sizing: border-box;
+  background: #f0f2f5;
+
+  :deep(.basic-container) {
+    padding: 0 12px;
+  }
+}
+</style>

src/views/payment/invoice-application-form.vue

@@ -497,6 +497,7 @@ const emptyLine = () => ({
   localId: ++localId,
   goodsCategory: '',
   goodsName: '',
+  taxClassificationCode: '',
   unit: '吨',
   quantity: 0,
   unitPriceNoTax: 0,
@@ -724,9 +725,11 @@ export default {
       const item = this.findInvoiceItem(line);
       if (item) {
         line.taxRate = Number(item.defaultTaxRate || 0);
+        line.taxClassificationCode = item.taxClassificationCode || '';
       } else if (clearInvalid) {
         line.goodsName = '';
         line.taxRate = 0;
+        line.taxClassificationCode = '';
       }
       this.recalculateLine(line);
     },
@@ -734,6 +737,7 @@ export default {
       const names = this.invoiceItemNames(line.goodsCategory);
       if (!names.some(item => item.shortName === line.goodsName)) line.goodsName = '';
       line.taxRate = 0;
+      line.taxClassificationCode = this.findInvoiceItem(line)?.taxClassificationCode || '';
       if (names.length === 1) {
         line.goodsName = names[0].shortName;
         this.handleGoodsNameChange(line);
@@ -743,9 +747,11 @@ export default {
       const item = this.findInvoiceItem(line);
       if (!item) {
         line.taxRate = 0;
+        line.taxClassificationCode = '';
         return;
       }
       line.taxRate = Number(item.defaultTaxRate || 0);
+      line.taxClassificationCode = item.taxClassificationCode || '';
       this.recalculateLine(line);
     },
     validateSettlements(rule, value, callback) {
@@ -1141,6 +1147,7 @@ export default {
           lines: sheet.lines.map(line => ({
             goodsCategory: line.goodsCategory,
             goodsName: line.goodsName,
+            taxClassificationCode: line.taxClassificationCode,
             unit: line.unit,
             quantity: line.quantity,
             unitPriceNoTax: line.unitPriceNoTax,

src/views/payment/invoice-application.vue

@@ -61,6 +61,7 @@
             v-if="hasPermission('invoice_application_sync')"
             type="primary"
             plain
+            :loading="batchSyncing"
             @click="handleBatchSync"
             >批量同步</el-button
           >
@@ -270,6 +271,7 @@ export default {
       rows: [],
       selection: [],
       loading: false,
+      batchSyncing: false,
       page: { current: 1, size: 10, total: 0 },
       flowDialog: { visible: false, loading: false, row: {}, records: [] },
     };
@@ -399,14 +401,31 @@ export default {
       this.loadTable();
     },
     async handleBatchSync() {
+      if (this.batchSyncing) return;
       const rows = this.selection.filter(row => row.approvalStatus === 'approved');
       if (!rows.length) {
         this.$message.warning('请选择至少一条审批通过的开票申请');
         return;
       }
-      await Promise.all(rows.map(row => api.syncKingdee(row.id)));
-      this.$message.success(`已同步${rows.length}条开票申请`);
-      this.loadTable();
+      this.batchSyncing = true;
+      try {
+        await Promise.all(rows.map(row => api.syncKingdee(row.id)));
+        this.$message.success(`已同步${rows.length}条开票申请`);
+        await this.loadTable();
+        // 附件联带同步提示：同步成功但附件未全部上传时追加 warning，重推即自动补传
+        const idSet = new Set(rows.map(row => String(row.id)));
+        const pendingCount = (this.rows || []).filter(row => idSet.has(String(row.id))
+          && ['pending', 'partial'].includes(row.attachmentSyncStatus)).length;
+        if (pendingCount) {
+          this.$message({
+            type: 'warning',
+            message: `其中${pendingCount}单附件未全部上传，可重推补传`,
+            duration: 8000,
+          });
+        }
+      } finally {
+        this.batchSyncing = false;
+      }
     },
     async handleExport() {
       const data = this.unwrapData(await api.getList(1, 100000, this.query));

src/views/payment/invoice-receipt-form.vue

@@ -47,7 +47,7 @@
           <el-col :span="6">
             <el-form-item label="开票金额">
               <el-input
-                :model-value="form.kingdeeInvoicePoolId ? formatMoney(form.invoiceAmount) : ''"
+                :model-value="form.invoiceNo ? formatMoney(form.invoiceAmount) : ''"
                 disabled
                 placeholder="从金蝶票据池带出"
               />
@@ -56,7 +56,7 @@
           <el-col :span="6">
             <el-form-item label="税额">
               <el-input
-                :model-value="form.kingdeeInvoicePoolId ? formatMoney(form.taxAmount) : ''"
+                :model-value="form.invoiceNo ? formatMoney(form.taxAmount) : ''"
                 disabled
                 placeholder="从金蝶票据池带出"
               />
@@ -149,62 +149,13 @@
       </div>
     </el-form>
 
-    <el-dialog v-model="invoiceDialog.visible" title="查询金蝶票据池" width="86%" append-to-body>
-      <div class="receipt-form-page__dialog-search">
-        <el-input
-          v-model="invoiceDialog.keyword"
-          clearable
-          placeholder="发票号码、开票单位或受票单位"
-          @keyup.enter="loadInvoicePool"
-        />
-        <el-button type="primary" @click="loadInvoicePool">查询</el-button>
-      </div>
-      <el-table
-        v-loading="invoiceDialog.loading"
-        :data="invoiceDialog.rows"
-        border
-        empty-text="暂无票据数据"
-        highlight-current-row
-        @current-change="invoiceDialog.current = $event"
-        @row-dblclick="confirmInvoice"
-      >
-        <el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
-        <el-table-column prop="invoiceDate" label="开票日期" min-width="120" />
-        <el-table-column prop="invoiceType" label="发票类型" min-width="130" />
-        <el-table-column prop="issuerName" label="开票单位" min-width="170" />
-        <el-table-column prop="receiverName" label="受票单位" min-width="170" />
-        <el-table-column label="开票金额" min-width="130" align="right">
-          <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
-        </el-table-column>
-        <el-table-column label="税率" min-width="100" align="center">
-          <template #default="{ row }">{{ formatRate(row.taxRate) }}</template>
-        </el-table-column>
-        <el-table-column label="税额" min-width="120" align="right">
-          <template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
-        </el-table-column>
-        <el-table-column prop="kingdeeBillNo" label="金蝶单据号" min-width="150" />
-        <el-table-column label="操作" width="100" fixed="right" align="center">
-          <template #default="{ row }">
-            <el-link type="primary" @click.stop="confirmInvoice(row)">选择</el-link>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="receipt-form-page__dialog-pagination">
-        <el-pagination
-          v-model:current-page="invoiceDialog.page.current"
-          v-model:page-size="invoiceDialog.page.size"
-          :total="invoiceDialog.page.total"
-          :page-sizes="[10, 20, 50, 100]"
-          layout="total, sizes, prev, pager, next, jumper"
-          @current-change="refreshInvoicePoolPage"
-          @size-change="handleInvoicePoolSizeChange"
-        />
-      </div>
-      <template #footer>
-        <el-button @click="invoiceDialog.visible = false">取消</el-button>
-        <el-button type="primary" @click="confirmInvoice()">确定</el-button>
-      </template>
-    </el-dialog>
+    <kingdee-invoice-pool-dialog
+      v-model="invoiceDialog.visible"
+      title="查询金蝶票据池"
+      :initial-invoice-no="form.invoiceNo"
+      :query-api="apiQueryInvoicePool"
+      @confirm="handleInvoicePicked"
+    />
 
     <el-dialog
       v-model="settlementDialog.visible"
@@ -259,80 +210,11 @@
 import { Search } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/invoiceReceipt';
-import { getList as getCustomerList } from '@/api/vehicle/customer-archive';
+import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 
-const mockInvoiceTypes = ['增值税专用发票', '增值税普通发票'];
-const mockTaxRates = [3, 6, 9, 13];
-const mockBankNames = ['中国工商银行', '中国农业银行', '中国银行', '中国建设银行', '招商银行'];
-
-const randomDigits = length =>
-  Array.from({ length }, () => Math.floor(Math.random() * 10)).join('');
-
-const formatMockDate = date => {
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, '0');
-  const day = String(date.getDate()).padStart(2, '0');
-  return `${year}-${month}-${day}`;
-};
-
-const customerName = customer =>
-  customer.fullName || customer.shortName || customer.customerCode || `客商${customer.id}`;
-
-const customerEmail = (customer, index) => {
-  const prefix = String(customer.customerCode || customer.id || `customer${index + 1}`)
-    .replace(/[^a-zA-Z0-9_-]/g, '')
-    .toLowerCase();
-  return `finance@${prefix || `customer${index + 1}`}.example.com`;
-};
-
-const createInvoicePoolMockRows = (customers, counterpartyName, departmentEmail) => {
-  const rows = [];
-  const baseId = Date.now();
-  customers.forEach((customer, customerIndex) => {
-    const name = customerName(customer);
-    ['issuer', 'receiver'].forEach((role, roleIndex) => {
-      const count = 3 + Math.floor(Math.random() * 5);
-      for (let index = 0; index < count; index += 1) {
-        const rowIndex = rows.length;
-        const invoiceDateValue = new Date();
-        invoiceDateValue.setDate(invoiceDateValue.getDate() - Math.floor(Math.random() * 90));
-        const invoiceDate = formatMockDate(invoiceDateValue);
-        const taxRate = mockTaxRates[(customerIndex + roleIndex + index) % mockTaxRates.length];
-        const invoiceAmount = Math.floor(10000 + Math.random() * 190000);
-        const taxAmount = Number(
-          ((invoiceAmount * Number(taxRate)) / (100 + Number(taxRate))).toFixed(2)
-        );
-        const bankName = mockBankNames[(customerIndex + index) % mockBankNames.length];
-        rows.push({
-          id: baseId + rowIndex,
-          invoiceNo: `25${randomDigits(18)}`,
-          invoiceDate,
-          invoiceType: mockInvoiceTypes[(customerIndex + index) % mockInvoiceTypes.length],
-          taxRate,
-          invoiceAmount,
-          taxAmount,
-          receiverName: role === 'receiver' ? name : counterpartyName,
-          issuerName: role === 'issuer' ? name : counterpartyName,
-          bankName,
-          bankAccount: randomDigits(19),
-          issuingBank: `${bankName}营业部`,
-          phone: customer.contactPhone || '',
-          customerEmails: customerEmail(customer, customerIndex),
-          departmentEmails: departmentEmail || '',
-          attachmentsJson: '[]',
-          kingdeeBillNo: `KD-FP-${invoiceDate.replaceAll('-', '')}${randomDigits(5)}`,
-          kingdeeStatus: 'unsynced',
-        });
-      }
-    });
-  });
-  return rows;
-};
-
 const emptyForm = () => ({
   id: null,
-  kingdeeInvoicePoolId: null,
   invoiceNo: '',
   invoiceDate: '',
   invoiceType: '',
@@ -344,8 +226,6 @@ const emptyForm = () => ({
   bankName: '',
   bankAccount: '',
   issuingBank: '',
-  kingdeeBillNo: '',
-  kingdeeStatus: 'unsynced',
   phone: '',
   customerEmails: [],
   departmentEmails: [],
@@ -361,24 +241,17 @@ const emptyForm = () => ({
 export default {
   name: 'InvoiceReceiptForm',
   components: {
+    KingdeeInvoicePoolDialog,
     VehicleAttachmentTable,
   },
   data() {
     return {
       Search,
       form: emptyForm(),
-      invoicePoolMockRows: [],
-      invoicePoolMockLoaded: false,
       customerEmailOptions: [],
       departmentEmailOptions: [],
       invoiceDialog: {
         visible: false,
-        loading: false,
-        keyword: '',
-        sourceRows: [],
-        rows: [],
-        current: null,
-        page: { current: 1, size: 10, total: 0 },
       },
       settlementDialog: {
         visible: false,
@@ -421,6 +294,12 @@ export default {
     this.initialize();
   },
   methods: {
+    apiQueryInvoicePool(params) {
+      return api.queryInvoicePool(params);
+    },
+    handleInvoicePicked(rows) {
+      this.confirmInvoice(rows[0]);
+    },
     hasPermission(code) {
       return this.permission?.[code] !== false;
     },
@@ -466,7 +345,7 @@ export default {
       if (this.settlementIds.length) await this.loadReferenceInformation();
     },
     validateInvoice(rule, value, callback) {
-      if (!value || !this.form.kingdeeInvoicePoolId) {
+      if (!value) {
         callback(new Error('请选择金蝶票据池发票'));
         return;
       }
@@ -492,99 +371,17 @@ export default {
       }
       callback();
     },
-    async openInvoiceDialog() {
+    openInvoiceDialog() {
       this.invoiceDialog.visible = true;
-      this.invoiceDialog.keyword = this.form.invoiceNo || '';
-      await this.loadInvoicePool();
-    },
-    async loadInvoicePool() {
-      this.invoiceDialog.loading = true;
-      this.invoiceDialog.page.current = 1;
-      this.invoiceDialog.current = null;
-      try {
-        if (!this.recordId) {
-          if (!this.invoicePoolMockLoaded) await this.loadInvoicePoolMockRows();
-          this.invoiceDialog.sourceRows = this.filterInvoicePoolMockRows(
-            this.invoiceDialog.keyword
-          );
-          this.refreshInvoicePoolPage();
-          return;
-        }
-        const data = this.unwrapData(await api.getInvoicePool(this.invoiceDialog.keyword));
-        this.invoiceDialog.sourceRows = Array.isArray(data) ? data : data?.records || [];
-        this.refreshInvoicePoolPage();
-      } finally {
-        this.invoiceDialog.loading = false;
-      }
-    },
-    async loadInvoicePoolMockRows() {
-      const pageSize = 500;
-      const firstData = this.unwrapData(await getCustomerList(1, pageSize, {}));
-      const firstRows = Array.isArray(firstData) ? firstData : firstData?.records || [];
-      const total = Number(firstData?.total || firstRows.length);
-      const pageCount = Math.ceil(total / pageSize);
-      const remainingPages = await Promise.all(
-        Array.from({ length: Math.max(pageCount - 1, 0) }, (_, index) =>
-          getCustomerList(index + 2, pageSize, {})
-        )
-      );
-      const customers = [
-        ...firstRows,
-        ...remainingPages.flatMap(response => {
-          const data = this.unwrapData(response);
-          return Array.isArray(data) ? data : data?.records || [];
-        }),
-      ].filter(
-        (customer, index, rows) =>
-          rows.findIndex(item => String(item.id) === String(customer.id)) === index
-      );
-      const userInfo = this.$store.getters.userInfo || {};
-      const counterpartyName = userInfo.deptName || userInfo.dept_name || '本企业';
-      this.invoicePoolMockRows = createInvoicePoolMockRows(
-        customers,
-        counterpartyName,
-        userInfo.email || ''
-      );
-      this.invoicePoolMockLoaded = true;
-    },
-    refreshInvoicePoolPage() {
-      const page = this.invoiceDialog.page;
-      const total = this.invoiceDialog.sourceRows.length;
-      const maxPage = Math.max(Math.ceil(total / page.size), 1);
-      if (page.current > maxPage) page.current = maxPage;
-      const start = (page.current - 1) * page.size;
-      page.total = total;
-      this.invoiceDialog.current = null;
-      this.invoiceDialog.rows = this.invoiceDialog.sourceRows.slice(start, start + page.size);
-    },
-    handleInvoicePoolSizeChange() {
-      this.invoiceDialog.page.current = 1;
-      this.refreshInvoicePoolPage();
-    },
-    filterInvoicePoolMockRows(keyword) {
-      const normalizedKeyword = String(keyword || '')
-        .trim()
-        .toLowerCase();
-      if (!normalizedKeyword) return this.invoicePoolMockRows.map(item => ({ ...item }));
-      return this.invoicePoolMockRows
-        .filter(item =>
-          [item.invoiceNo, item.issuerName, item.receiverName].some(value =>
-            String(value || '')
-              .toLowerCase()
-              .includes(normalizedKeyword)
-          )
-        )
-        .map(item => ({ ...item }));
     },
     confirmInvoice(row, options = {}) {
-      const selected = row?.id ? row : this.invoiceDialog.current;
+      const selected = row;
       if (!selected) {
         this.$message.warning('请选择一张金蝶票据池发票');
         return;
       }
       const preserveUserInput = options.preserveUserInput === true;
       Object.assign(this.form, {
-        kingdeeInvoicePoolId: selected.id,
         invoiceNo: selected.invoiceNo,
         invoiceDate: selected.invoiceDate,
         invoiceType: selected.invoiceType,
@@ -596,8 +393,6 @@ export default {
         bankName: selected.bankName,
         bankAccount: selected.bankAccount,
         issuingBank: selected.issuingBank,
-        kingdeeBillNo: selected.kingdeeBillNo || '',
-        kingdeeStatus: selected.kingdeeStatus || 'unsynced',
         phone: preserveUserInput ? this.form.phone : selected.phone || '',
         customerEmails: preserveUserInput
           ? this.form.customerEmails
@@ -708,7 +503,6 @@ export default {
     payload() {
       return {
         id: this.form.id,
-        kingdeeInvoicePoolId: this.form.kingdeeInvoicePoolId,
         invoiceNo: this.form.invoiceNo,
         invoiceDate: this.form.invoiceDate,
         invoiceType: this.form.invoiceType,
@@ -720,8 +514,6 @@ export default {
         bankName: this.form.bankName,
         bankAccount: this.form.bankAccount,
         issuingBank: this.form.issuingBank,
-        kingdeeBillNo: this.form.kingdeeBillNo,
-        kingdeeStatus: this.form.kingdeeStatus,
         phone: this.form.phone,
         customerEmails: this.form.customerEmails.join(';'),
         departmentEmails: this.form.departmentEmails.join(';'),
@@ -758,13 +550,12 @@ export default {
         this.$message.warning('请先选择金蝶票据池发票');
         return;
       }
-      const data = this.recordId
-        ? this.unwrapData(await api.getInvoicePool(this.form.invoiceNo))
-        : this.filterInvoicePoolMockRows(this.form.invoiceNo);
-      const rows = Array.isArray(data) ? data : data?.records || [];
-      const invoice = rows.find(item => item.invoiceNo === this.form.invoiceNo);
+      const data = this.unwrapData(
+        await api.queryInvoicePool({ current: 1, size: 1, invoiceNo: this.form.invoiceNo })
+      );
+      const invoice = (data.records || []).find(item => item.invoiceNo === this.form.invoiceNo);
       if (!invoice) {
-        this.$message.warning('金蝶票据池中未查询到该发票');
+        this.$message.warning('金蝶票池未查询到该发票');
         return;
       }
       if (!this.confirmInvoice(invoice, { preserveUserInput: true })) return;
@@ -827,11 +618,6 @@ export default {
 .receipt-form-page__dialog-search .el-input {
   width: 360px;
 }
-.receipt-form-page__dialog-pagination {
-  display: flex;
-  justify-content: flex-end;
-  margin-top: 12px;
-}
 .receipt-form-page :deep(.el-table) {
   --el-table-border-color: #eff1f7;
 }

src/views/payment/invoice-receipt.vue

@@ -40,10 +40,10 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item v-if="searchExpanded" label="金蝶单据状态">
-            <el-select v-model="query.kingdeeStatus" clearable placeholder="请选择">
+          <el-form-item v-if="searchExpanded" label="金蝶状态">
+            <el-select v-model="query.kingdeePushStatus" clearable placeholder="请选择">
               <el-option
-                v-for="item in kingdeeStatusOptions"
+                v-for="item in kingdeePushStatusOptions"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -70,7 +70,8 @@
             v-if="hasPermission('invoice_receipt_sync')"
             type="primary"
             plain
-            @click="handleBatchSync"
+            :loading="pushLoading"
+            @click="handlePushKingdee"
             >批量同步</el-button
           >
           <el-button v-if="hasPermission('invoice_receipt_add')" type="primary" @click="openCreate"
@@ -244,7 +245,7 @@ const emptyQuery = () => ({
   deptName: '',
   deptPath: [],
   approvalStatus: '',
-  kingdeeStatus: '',
+  kingdeePushStatus: '',
 });
 
 export default {
@@ -258,11 +259,12 @@ export default {
       query: emptyQuery(),
       searchExpanded: false,
       approvalStatusOptions: api.approvalStatusOptions,
-      kingdeeStatusOptions: api.kingdeeStatusOptions,
+      kingdeePushStatusOptions: api.kingdeePushStatusOptions,
       columns: invoiceReceiptTableColumns,
       rows: [],
       selection: [],
       loading: false,
+      pushLoading: false,
       page: { current: 1, size: 10, total: 0 },
       flowDialog: { visible: false, loading: false, row: {}, records: [] },
     };
@@ -363,15 +365,29 @@ export default {
       this.$message.success('作废成功');
       this.loadTable();
     },
-    async handleBatchSync() {
+    async handlePushKingdee() {
+      if (this.pushLoading) return;
       const rows = this.selection.filter(row => row.approvalStatus === 'approved');
       if (!rows.length) {
         this.$message.warning('请选择至少一条审批通过的收票登记');
         return;
       }
-      await Promise.all(rows.map(row => api.syncKingdee(row.id)));
-      this.$message.success(`已同步${rows.length}条收票登记`);
-      this.loadTable();
+      await this.$confirm(`确认将选中的 ${rows.length} 条收票登记同步至金蝶？`, '提示', {
+        type: 'warning',
+      });
+      this.pushLoading = true;
+      try {
+        const summary = this.unwrapData(await api.pushKingdee(rows.map(row => row.id)));
+        await this.loadTable();
+        // 附件联带同步提示：推送成功但附件未全部上传时在结果弹窗追加说明，重推即自动补传
+        const idSet = new Set(rows.map(row => String(row.id)));
+        const pendingCount = (this.rows || []).filter(row => idSet.has(String(row.id))
+          && ['pending', 'partial'].includes(row.attachmentSyncStatus)).length;
+        const attachmentTip = pendingCount ? `\n其中${pendingCount}单附件未全部上传，可重推补传` : '';
+        this.$alert((summary || '推送完成') + attachmentTip, '推送结果', { confirmButtonText: '知道了' });
+      } finally {
+        this.pushLoading = false;
+      }
     },
     async handleExport() {
       const data = this.unwrapData(await api.getList(1, 100000, this.query));
@@ -388,8 +404,9 @@ export default {
         当前处理人: item.currentProcessor,
         创建人: item.createUserName,
         创建时间: item.createTime,
-        金蝶单据号: item.kingdeeBillNo,
-        金蝶单据状态: item.kingdeeStatusName,
+        金蝶单据号: item.kingdeeReceivedInvoiceNo,
+        金蝶状态: item.kingdeePushStatusName,
+        失败原因: item.kingdeePushMsg,
       }));
       const workbook = XLSX.utils.book_new();
       XLSX.utils.book_append_sheet(workbook, XLSX.utils.json_to_sheet(exportRows), '收票登记');

src/views/payment/payment-application-public-view.vue

@@ -0,0 +1,21 @@
+<template>
+  <mk-public-shell biz-type="payment-application" :get-form="getForm">
+    <payment-application-form ref="page" />
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import PaymentApplicationForm from '@/views/payment/payment-application-form.vue';
+
+export default {
+  name: 'PaymentApplicationPublicView',
+  components: { MkPublicShell, PaymentApplicationForm },
+  methods: {
+    getForm() {
+      const form = this.$refs.page?.form || {};
+      return { ...form, subject: form.paymentNo || form.projectName || '' };
+    },
+  },
+};
+</script>

src/views/payment/payment-application.vue

@@ -81,9 +81,18 @@
             v-if="hasPermission('payment_application_sync')"
             type="primary"
             plain
+            :loading="syncLoading"
             @click="handleSync"
             >批量同步</el-button
           >
+          <el-button
+            v-if="hasPermission('payment_application_sync')"
+            type="primary"
+            plain
+            :loading="resultSyncing"
+            @click="handleSyncResult"
+            >同步付款结果</el-button
+          >
           <el-button
             v-if="hasPermission('payment_application_add')"
             type="primary"
@@ -264,6 +273,8 @@ export default {
       rows: [],
       selection: [],
       loading: false,
+      syncLoading: false,
+      resultSyncing: false,
       page: { current: 1, size: 10, total: 0 },
       flowDialog: { visible: false, row: {} },
     };
@@ -326,7 +337,7 @@ export default {
     openProjectAdvance() {
       this.$router.push({
         path: '/payment/payment-application/form',
-        query: { mode: 'add', paymentType: 'project_advance' },
+        query: { mode: 'add', paymentType: 'progress_advance' },
       });
     },
     openEdit(row) {
@@ -395,17 +406,58 @@ export default {
     async handleSyncRow(row) {
       const data = this.unwrapData(await api.syncKingdee(row.id));
       this.$message.success(`已生成金蝶付款单：${data}`);
-      this.loadTable();
+      await this.loadTable();
+      this.warnAttachmentNotUploaded([row.id]);
     },
     async handleSync() {
+      if (this.syncLoading) return;
       const rows = this.selection.filter(row => row.approvalStatus === 'approved');
       if (!rows.length) {
         this.$message.warning('请选择至少一条审批通过的付款申请');
         return;
       }
-      await api.syncKingdeeBatch(rows.map(row => row.id));
-      this.$message.success(`已同步${rows.length}条付款申请`);
-      this.loadTable();
+      this.syncLoading = true;
+      try {
+        const data = this.unwrapData(await api.syncKingdeeBatch(rows.map(row => row.id))) || [];
+        const failedList = data.filter(item => String(item).includes('同步失败'));
+        if (failedList.length) {
+          this.$message({
+            type: 'warning',
+            message: `同步完成：成功${data.length - failedList.length}条，失败${failedList.length}条。${failedList.join('；')}`,
+            duration: 8000,
+          });
+        } else {
+          this.$message.success(`已同步${data.length}条付款申请`);
+        }
+        await this.loadTable();
+        this.warnAttachmentNotUploaded(rows.map(row => row.id));
+      } finally {
+        this.syncLoading = false;
+      }
+    },
+    // 附件联带同步提示：同步成功但附件未全部上传时追加 warning，重推即自动补传
+    warnAttachmentNotUploaded(ids) {
+      const idSet = new Set(ids.map(String));
+      const pendingCount = (this.rows || []).filter(row => idSet.has(String(row.id))
+        && ['pending', 'partial'].includes(row.attachmentSyncStatus)).length;
+      if (pendingCount) {
+        this.$message({
+          type: 'warning',
+          message: `其中${pendingCount}单附件未全部上传，可重推补传`,
+          duration: 8000,
+        });
+      }
+    },
+    async handleSyncResult() {
+      if (this.resultSyncing) return;
+      this.resultSyncing = true;
+      try {
+        const data = this.unwrapData(await api.syncKingdeeResult());
+        this.$message.success(data || '金蝶付款结果回写完成');
+        this.loadTable();
+      } finally {
+        this.resultSyncing = false;
+      }
     },
     handleExport() {
       const headers = this.columns.map(item => item.label);

src/views/payment/receipt-claim-record.vue

@@ -80,6 +80,11 @@
     </section-card>
 
     <section class="claim-record-page__table-panel">
+      <div class="claim-record-page__toolbar">
+        <el-button :loading="refreshing" @click="handleRefreshKingdeeResult">
+          查询金蝶认领结果
+        </el-button>
+      </div>
       <el-table v-loading="loading" :data="rows" border>
         <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
         <el-table-column
@@ -167,6 +172,7 @@ export default {
       columns: receiptClaimRecordTableColumns,
       rows: [],
       loading: false,
+      refreshing: false,
       page: { current: 1, size: 10, total: 0 },
     };
   },
@@ -237,6 +243,16 @@ export default {
       this.$message.success(`作废成功，金蝶冲单号：${kingdeeBillNo}`);
       await this.loadTable();
     },
+    async handleRefreshKingdeeResult() {
+      this.refreshing = true;
+      try {
+        const updated = Number(this.unwrapData(await api.queryKingdeeResult()) || 0);
+        this.$message.success(`金蝶认领结果回写完成，更新${updated}条`);
+        await this.loadTable();
+      } finally {
+        this.refreshing = false;
+      }
+    },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission?.[code], false);
     },
@@ -281,6 +297,13 @@ export default {
 .claim-record-page__table-panel {
   margin-top: 8px;
 }
+.claim-record-page__toolbar {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  gap: 8px;
+  padding: 12px 0;
+}
 .claim-record-page__pagination {
   display: flex;
   justify-content: flex-end;

src/views/payment/receipt-flow.vue

@@ -194,64 +194,6 @@ import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/receiptFlow';
 import { receiptFlowTableColumns } from '@/option/payment/receiptFlow';
 
-const receiptFlowMockTemplates = [
-  {
-    receiptNoticeNo: 'SKTZ20260827001',
-    payerName: '华东供应链管理有限公司',
-    receiptAmount: 48000,
-    counterpartyName: '上海安捷运输有限公司',
-    counterpartyAccount: '310000000000001001',
-    counterpartyBank: '中国工商银行上海分行',
-    summary: '运输服务款',
-    transactionTime: '2026-08-27 09:30:00',
-    detailSerialNo: 'MOCK-RF-20260827-001',
-    sourceUpdatedTime: '2026-08-27 09:30:00',
-  },
-  {
-    receiptNoticeNo: 'SKTZ20260827002',
-    payerName: '华东供应链管理有限公司',
-    receiptAmount: 26500,
-    counterpartyName: '江苏联运物流有限公司',
-    counterpartyAccount: '320100000000002002',
-    counterpartyBank: '中国建设银行南京分行',
-    summary: '物流服务款',
-    transactionTime: '2026-08-27 13:45:00',
-    detailSerialNo: 'MOCK-RF-20260827-002',
-    sourceUpdatedTime: '2026-08-27 13:45:00',
-  },
-];
-
-const randomDigits = length =>
-  Array.from({ length }, () => Math.floor(Math.random() * 10)).join('');
-
-const formatMockDateTime = date => {
-  const pad = value => String(value).padStart(2, '0');
-  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(
-    date.getHours()
-  )}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`;
-};
-
-const createReceiptFlowMockRows = () => {
-  const count = 20 + Math.floor(Math.random() * 31);
-  return Array.from({ length: count }, (_, index) => {
-    const template = receiptFlowMockTemplates[index % receiptFlowMockTemplates.length];
-    const transactionDate = new Date();
-    transactionDate.setDate(transactionDate.getDate() - Math.floor(Math.random() * 7));
-    transactionDate.setHours(8 + Math.floor(Math.random() * 10), Math.floor(Math.random() * 60), 0);
-    const transactionTime = formatMockDateTime(transactionDate);
-    const dateCode = transactionTime.slice(0, 10).replaceAll('-', '');
-    return {
-      ...template,
-      receiptNoticeNo: `SKTZ${dateCode}${randomDigits(5)}`,
-      receiptAmount: Math.floor(10000 + Math.random() * 90000),
-      counterpartyAccount: `${template.counterpartyAccount.slice(0, -6)}${randomDigits(6)}`,
-      transactionTime,
-      detailSerialNo: `MOCK-RF-${dateCode}-${index + 1}${randomDigits(4)}`,
-      sourceUpdatedTime: transactionTime,
-    };
-  });
-};
-
 const emptyQuery = () => ({
   receiptNoticeNo: '',
   counterpartyName: '',
@@ -329,9 +271,8 @@ export default {
     async handleSync() {
       this.syncing = true;
       try {
-        const mockRows = createReceiptFlowMockRows();
-        const syncedCount = Number(this.unwrapData(await api.sync({ flows: mockRows })) || 0);
-        this.$message.success(`流水同步完成，共同步${syncedCount}条`);
+        const syncedCount = Number(this.unwrapData(await api.sync()) || 0);
+        this.$message.success(`流水同步完成，共同步${syncedCount}条认领公告`);
         await this.loadTable();
       } finally {
         this.syncing = false;

src/views/settlement/components/formal-settlement-editor.vue

@@ -22,6 +22,7 @@
                   type="date"
                   value-format="YYYY-MM-DD"
                   placeholder="请选择"
+                  @change="fetchBfiExchangeRate"
                 />
                 <el-select
                   v-else-if="field.type === 'project' && editable"
@@ -211,8 +212,15 @@
             </el-button>
           </el-form-item>
         </el-form>
-        <el-table v-show="!detailCollapsed" :data="filteredDetails" border>
-          <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
+        <el-table v-show="!detailCollapsed" :data="pagedDetails" border>
+          <el-table-column
+            type="index"
+            label="序号"
+            width="64"
+            fixed="left"
+            align="center"
+            :index="detailIndexMethod"
+          />
           <el-table-column
             v-for="column in detailTableColumns"
             :key="column.prop"
@@ -245,6 +253,16 @@
             </template>
           </el-table-column>
         </el-table>
+        <div v-show="!detailCollapsed" class="formal-editor__pagination">
+          <el-pagination
+            v-model:current-page="detailPage.current"
+            v-model:page-size="detailPage.size"
+            :total="filteredDetails.length"
+            :page-sizes="[10, 20, 50, 100]"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleDetailPageSizeChange"
+          />
+        </div>
       </section-card>
 
       <section-card>
@@ -402,8 +420,18 @@
           <el-table-column label="操作" width="220" align="center">
             <template #default="{ row, $index }">
               <div class="formal-editor__links">
-                <el-link type="primary" @click="viewInvoiceAttachment(row)">查看</el-link>
-                <el-link type="primary" @click="downloadInvoiceAttachment(row)">下载</el-link>
+                <el-link
+                  type="primary"
+                  :disabled="kingdeeAttachmentBusy"
+                  @click="viewInvoiceAttachment(row)"
+                  >查看</el-link
+                >
+                <el-link
+                  type="primary"
+                  :disabled="kingdeeAttachmentBusy"
+                  @click="downloadInvoiceAttachment(row)"
+                  >下载</el-link
+                >
                 <el-link v-if="editable" type="danger" @click="removeInvoice($index)">删除</el-link>
               </div>
             </template>
@@ -411,66 +439,15 @@
         </el-table>
       </section-card>
 
-      <el-dialog
+      <kingdee-invoice-pool-dialog
         v-model="invoiceClaimDialog.visible"
         title="查询可认领发票"
-        width="92%"
-        append-to-body
-        destroy-on-close
-      >
-        <el-table
-          ref="invoiceClaimTable"
-          v-loading="invoiceClaimDialog.loading"
-          :data="invoiceClaimPagedRows"
-          row-key="invoiceNo"
-          border
-          height="520"
-          @selection-change="invoiceClaimDialog.selected = $event"
-        >
-          <el-table-column
-            type="selection"
-            width="52"
-            fixed="left"
-            align="center"
-            reserve-selection
-          />
-          <el-table-column type="index" label="序号" width="64" align="center" />
-          <el-table-column prop="invoiceNo" label="发票号" min-width="180" align="center" />
-          <el-table-column prop="invoiceDate" label="开票日期" min-width="130" align="center" />
-          <el-table-column prop="invoiceType" label="发票类型" min-width="150" align="center" />
-          <el-table-column prop="issuerName" label="开票单位" min-width="180" align="center" />
-          <el-table-column prop="receiverName" label="受票单位" min-width="180" align="center" />
-          <el-table-column
-            prop="invoiceAmount"
-            label="发票金额（含税）"
-            min-width="160"
-            align="right"
-          >
-            <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
-          </el-table-column>
-          <el-table-column prop="matchedAmount" label="认领金额" min-width="140" align="right">
-            <template #default="{ row }">{{ formatMoney(row.matchedAmount) }}</template>
-          </el-table-column>
-        </el-table>
-        <div class="formal-editor__pagination">
-          <el-pagination
-            v-model:current-page="invoiceClaimDialog.page.current"
-            v-model:page-size="invoiceClaimDialog.page.size"
-            :total="invoiceClaimDialog.page.total"
-            :page-sizes="[10, 20, 50, 100]"
-            layout="total, sizes, prev, pager, next, jumper"
-          />
-        </div>
-        <template #footer>
-          <el-button @click="invoiceClaimDialog.visible = false">取消</el-button>
-          <el-button
-            type="primary"
-            :loading="invoiceClaimDialog.confirming"
-            @click="confirmInvoiceClaims"
-            >确认认领</el-button
-          >
-        </template>
-      </el-dialog>
+        confirm-text="确认认领"
+        multiple
+        :initial-invoice-no="String(invoiceClaimNo || '').trim()"
+        :query-api="invoicePoolQueryApi"
+        @confirm="handleInvoiceClaimConfirm"
+      />
 
       <section-card
         v-if="readonly"
@@ -623,7 +600,7 @@
         >提交</el-button
       >
     </template>
-    <div v-if="pageMode" class="formal-editor__page-actions">
+    <div v-if="pageMode && !publicMode" class="formal-editor__page-actions">
       <el-button @click="visible = false">取消</el-button>
       <el-button
         v-if="editable && !recordId"
@@ -929,6 +906,7 @@
 </template>
 
 <script>
+import { getMkPublicDetail } from '@/api/mk-process';
 import {
   adjustDetail,
   getCandidateDetails,
@@ -940,6 +918,7 @@ import {
   getNextNo,
   getReceiptClaims,
   claimInvoices as claimInvoicesApi,
+  queryInvoicePool,
   save,
 } from '@/api/settlement/formalSettlement';
 import {
@@ -947,6 +926,7 @@ import {
   getDetailFees as getPreSettlementDetailFees,
 } from '@/api/settlement/preSettlement';
 import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
+import { getBfiExchangeRate } from '@/api/base/currency';
 import {
   createFormalSettlementForm,
   formalSettlementFormFields,
@@ -963,11 +943,17 @@ import { h } from 'vue';
 import { InfoFilled } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import { downloadFileByUrl } from '@/utils/util';
+import {
+  downloadKingdeeInvoiceFile,
+  isKingdeePathAttachment,
+  viewKingdeeInvoiceFile,
+} from '@/utils/kingdee-attachment';
+import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
 import * as XLSX from 'xlsx';
 
 export default {
   name: 'FormalSettlementEditor',
-  components: { InfoFilled },
+  components: { InfoFilled, KingdeeInvoicePoolDialog },
   props: {
     modelValue: Boolean,
     recordId: [String, Number],
@@ -977,6 +963,10 @@ export default {
       type: Object,
       default: null,
     },
+    publicMode: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['update:modelValue', 'success'],
   data() {
@@ -997,13 +987,12 @@ export default {
       invoices: [],
       invoiceClaimNo: '',
       invoiceClaimLoading: false,
+      // 金蝶侧发票附件查看/下载进行中（行组级 loading 守卫）
+      kingdeeAttachmentBusy: false,
       invoiceClaimDialog: {
         visible: false,
-        loading: false,
-        confirming: false,
-        rows: [],
         selected: [],
-        page: { current: 1, size: 10, total: 0 },
+        confirming: false,
       },
       attachmentUploadFiles: [],
       attachmentTypeOptions: [],
@@ -1088,6 +1077,10 @@ export default {
         batchNo: '',
         cargoName: '',
       },
+      detailPage: {
+        current: 1,
+        size: 10,
+      },
     };
   },
   computed: {
@@ -1135,6 +1128,13 @@ export default {
         })
       );
     },
+    pagedDetails() {
+      const list = this.filteredDetails;
+      const size = Number(this.detailPage.size) || 10;
+      const current = Math.max(Number(this.detailPage.current) || 1, 1);
+      const start = (current - 1) * size;
+      return list.slice(start, start + size);
+    },
     missingAttachmentTypeText() {
       const missing = this.getMissingAttachmentTypes();
       return missing.length ? `未上传：${missing.join('、')}` : '';
@@ -1146,11 +1146,6 @@ export default {
       });
       return Array.from(names);
     },
-    invoiceClaimPagedRows() {
-      const { current, size } = this.invoiceClaimDialog.page;
-      const start = (current - 1) * size;
-      return this.invoiceClaimDialog.rows.slice(start, start + size);
-    },
   },
   watch: {
     modelValue: {
@@ -1159,6 +1154,16 @@ export default {
         if (value) this.initialize();
       },
     },
+    filteredDetails: {
+      handler(list) {
+        const size = Number(this.detailPage.size) || 10;
+        const maxPage = Math.max(1, Math.ceil((list?.length || 0) / size) || 1);
+        if (this.detailPage.current > maxPage) {
+          this.detailPage.current = maxPage;
+        }
+      },
+      immediate: true,
+    },
     summaryTotal(value) {
       this.form.settlementAmount = Number(value || 0).toFixed(2);
       this.form.localSettlementAmount = (
@@ -1173,7 +1178,9 @@ export default {
   },
   methods: {
     async loadFormalDetail(id) {
-      const response = await getDetail(id);
+      const response = this.publicMode
+        ? await getMkPublicDetail('formal-settlement', id)
+        : await getDetail(id);
       const data = this.unwrapData(response);
       this.form = {
         ...createFormalSettlementForm(),
@@ -1185,12 +1192,13 @@ export default {
       };
       this.sources = data.sources || [];
       this.details = data.details || [];
+      this.detailPage.current = 1;
       this.summaryFees = data.summaryFees || [];
       // 服务端数据已刷新，费用快照与暂存调整全部作废。
       this.detailFeeSnapshots = {};
       this.pendingAdjustments = {};
       this.paymentApplications = data.paymentApplications || [];
-      if (this.readonly && this.form.settlementType === 'receivable') {
+      if (this.readonly && this.form.settlementType === 'receivable' && !this.publicMode) {
         this.receiptClaims = this.unwrapData(await getReceiptClaims(id)) || [];
       }
       this.adjustments = data.adjustments || [];
@@ -1229,7 +1237,6 @@ export default {
       this.invoices = [];
       this.invoiceClaimNo = '';
       this.invoiceClaimDialog.visible = false;
-      this.invoiceClaimDialog.rows = [];
       this.invoiceClaimDialog.selected = [];
       this.attachmentUploadFiles = [];
       this.billingRuleDialog = {
@@ -1237,19 +1244,23 @@ export default {
         rule: null,
       };
       this.detailCollapsed = false;
+      this.detailPage = { current: 1, size: 10 };
       this.resetDetailQuery(false);
-      await Promise.all([
-        this.loadAllContracts(),
-        this.loadFeeOptions(),
-        this.loadFeeCategoryOptions(),
-        this.loadAttachmentTypeOptions(),
-        this.loadTransportTypeOptions(),
-      ]);
+      if (!this.publicMode) {
+        await Promise.all([
+          this.loadAllContracts(),
+          this.loadFeeOptions(),
+          this.loadFeeCategoryOptions(),
+          this.loadAttachmentTypeOptions(),
+          this.loadTransportTypeOptions(),
+        ]);
+      }
       if (!this.recordId) {
         this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
         if (this.initialData) await this.applyInitialData();
         Object.assign(this.form, newRecordAudit);
         await this.refreshFormalSettlementNo();
+        await this.fetchBfiExchangeRate();
         return;
       }
       this.loading = true;
@@ -1328,6 +1339,7 @@ export default {
         settlementAmountTax:
           row.settlementAmountTax ?? row.totalAmount ?? row.afterAmount ?? row.settlementAmount,
       }));
+      this.detailPage.current = 1;
       this.form.sourceDetailIds = this.details.map(item => item.sourceDetailId);
       await this.refreshSummaryFees();
     },
@@ -1373,6 +1385,7 @@ export default {
           sourcePreSettlementId: settlement.id,
         }))
       );
+      this.detailPage.current = 1;
       const summaryMap = new Map();
       settlements
         .flatMap(settlement => settlement.summaryFees || [])
@@ -1482,6 +1495,7 @@ export default {
           (settlementType === 'receivable' ? contract.partyA : contract.partyB),
         settlementType,
         settlementTypeName: settlementType === 'receivable' ? '应收' : '应付',
+        currency: contract.settlementCurrency || 'RMB',
       });
       this.sources = [];
       this.details = [];
@@ -1489,6 +1503,23 @@ export default {
       this.form.sourcePreSettlementIds = [];
       this.form.sourceDetailIds = [];
       if (refreshSettlementNo) this.refreshFormalSettlementNo();
+      if (this.form.currency !== 'RMB') this.fetchBfiExchangeRate();
+    },
+    async fetchBfiExchangeRate() {
+      const currency = this.form.currency;
+      if (!currency || currency === 'RMB') return;
+      if (!this.form.exchangeRateDate) return;
+      try {
+        const { data } = await getBfiExchangeRate(currency, this.form.exchangeRateDate);
+        const rateData = data?.data;
+        if (rateData?.excval != null) {
+          this.form.exchangeRate = Number(rateData.excval);
+        } else {
+          this.$message.warning(`未查询到 ${currency} 的BFI汇率数据`);
+        }
+      } catch (e) {
+        this.$message.warning('查询BFI汇率失败，请手动输入结算汇率');
+      }
     },
     openCandidateDialog() {
       this.candidate.visible = true;
@@ -1601,6 +1632,7 @@ export default {
         ...this.details.filter(item => item.formalSettlementId),
         ...existing.values(),
       ];
+      this.detailPage.current = 1;
       this.form.sourceDetailIds = [...existing.values()].map(item => item.sourceDetailId);
       this.detailCandidate.loading = true;
       try {
@@ -1819,6 +1851,9 @@ export default {
       return sourceDetailId ? `src:${sourceDetailId}` : '';
     },
     async loadDetailFeeRows(detail) {
+      if (this.publicMode) {
+        return [this.normalizeAdjustRow(detail)];
+      }
       if (detail.formalSettlementId && detail.id) {
         const rows = this.unwrapData(await getDetailFees(detail.id)) || [];
         return rows.map(item => this.normalizeAdjustRow(item));
@@ -1920,12 +1955,19 @@ export default {
     },
     handleDetailQuery() {
       this.appliedDetailQuery = { ...this.detailQuery };
+      this.detailPage.current = 1;
     },
     resetDetailQuery(apply = true) {
       this.detailQuery = { documentNo: '', waybillNo: '', batchNo: '', cargoName: '' };
       if (apply) this.handleDetailQuery();
       else this.appliedDetailQuery = { ...this.detailQuery };
     },
+    handleDetailPageSizeChange() {
+      this.detailPage.current = 1;
+    },
+    detailIndexMethod(index) {
+      return (this.detailPage.current - 1) * this.detailPage.size + index + 1;
+    },
     exportDetails() {
       if (!this.details.length) return this.$message.warning('暂无可导出的结算明细');
       const rows = this.details.map((row, index) => {
@@ -2202,79 +2244,19 @@ export default {
         this.adjust.saving = false;
       }
     },
-    claimInvoices() {
-      this.invoiceClaimLoading = true;
-      try {
-        const keyword = String(this.invoiceClaimNo || '').trim();
-        const defaultNo = `MOCK${this.$dayjs().format('YYYYMMDD')}`;
-        const baseNo = (keyword || defaultNo).slice(0, 29);
-        const numbers = [baseNo, `${baseNo}-02`, `${baseNo}-03`];
-        const invoiceAmounts = [1000, 2000, 3000];
-        const availableAmounts = [1000, 1000, 3000];
-        const preferredMatchedAmounts = [1000, 1000, 2000];
-        let remainingAmount = Math.max(
-          Number(this.form.settlementAmount || this.summaryTotal || 0) -
-            this.invoices.reduce((total, item) => total + Number(item.matchedAmount || 0), 0),
-          0
-        );
-        const existingNumbers = new Set(this.invoices.map(item => String(item.invoiceNo)));
-        const mockRows = numbers
-          .map((invoiceNo, index) => {
-            const matchedAmount = Math.min(
-              preferredMatchedAmounts[index],
-              availableAmounts[index],
-              remainingAmount
-            );
-            remainingAmount = Number((remainingAmount - matchedAmount).toFixed(2));
-            return {
-              invoiceNo,
-              invoiceDate: this.$dayjs().subtract(index, 'day').format('YYYY-MM-DD'),
-              invoiceType: index === 1 ? '增值税普通发票' : '增值税专用发票',
-              taxRate: [3, 6, 9][index],
-              invoiceAmount: invoiceAmounts[index],
-              availableInvoiceAmount: availableAmounts[index],
-              matchedAmount,
-              attachmentJson: '',
-              mockData: true,
-            };
-          })
-          .filter(item => !existingNumbers.has(item.invoiceNo));
-        if (!mockRows.length) {
-          this.$message.warning('当前发票号码的Mock数据已认领');
-          return;
-        }
-        this.invoices = [...this.invoices, ...mockRows];
-        this.$message.success(`已生成${mockRows.length}条Mock发票数据`);
-      } finally {
-        this.invoiceClaimLoading = false;
-      }
-    },
     openInvoiceClaimDialog() {
-      const stamp = Date.now();
-      this.invoiceClaimDialog.loading = true;
-      this.invoiceClaimDialog.rows = Array.from({ length: 80 }, (_, index) => {
-        const amount = Math.floor(1000 + Math.random() * 49000);
-        return {
-          invoiceNo: `MOCK${stamp}${String(index + 1).padStart(3, '0')}`.slice(0, 32),
-          invoiceDate: this.$dayjs()
-            .subtract(Math.floor(Math.random() * 90), 'day')
-            .format('YYYY-MM-DD'),
-          invoiceType: index % 2 ? '增值税普通发票' : '增值税专用发票',
-          issuerName: this.form.payerName || 'Mock开票单位',
-          receiverName: this.form.payeeName || 'Mock受票单位',
-          invoiceAmount: amount,
-          availableInvoiceAmount: amount,
-          matchedAmount: amount,
-          taxRate: [3, 6, 9, 13][index % 4],
-          attachmentJson: '',
-          mockData: true,
-        };
-      });
-      this.invoiceClaimDialog.selected = [];
-      this.invoiceClaimDialog.page.current = 1;
-      this.invoiceClaimDialog.page.total = 80;
       this.invoiceClaimDialog.visible = true;
-      this.invoiceClaimDialog.loading = false;
+    },
+    invoicePoolQueryApi(params) {
+      return queryInvoicePool(params);
+    },
+    async handleInvoiceClaimConfirm(rows) {
+      // 统一票池行附件字段为复数 attachmentsJson，认领请求契约是单数 attachmentJson，中转处归一
+      this.invoiceClaimDialog.selected = rows.map(row => ({
+        ...row,
+        attachmentJson: row.attachmentJson || row.attachmentsJson,
+      }));
+      await this.confirmInvoiceClaims();
     },
     async confirmInvoiceClaims() {
       if (!this.invoiceClaimDialog.selected.length) {
@@ -2300,7 +2282,11 @@ export default {
             if (Number(this.form.settlementAmount || 0) > 0) {
               remaining = Math.max(0, remaining - matchedAmount);
             }
-            return { ...row, matchedAmount };
+            return {
+              ...row,
+              invoiceType: row.invoiceTypeName || row.invoiceType || '',
+              matchedAmount,
+            };
           })
           .filter(row => row.matchedAmount > 0);
         if (!invoices.length) {
@@ -2386,14 +2372,38 @@ export default {
       const attachment = this.invoiceAttachment(row);
       return attachment.originalName || attachment.name || `${row.invoiceNo || '发票'}.pdf`;
     },
-    viewInvoiceAttachment(row) {
+    async viewInvoiceAttachment(row) {
+      const attachment = this.invoiceAttachment(row);
+      // 金蝶侧附件（path 型）经后端代理 A801-2 预览，OSS 直链维持 window.open
+      if (isKingdeePathAttachment(attachment)) {
+        if (this.kingdeeAttachmentBusy) return;
+        this.kingdeeAttachmentBusy = true;
+        try {
+          await viewKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
+        } finally {
+          this.kingdeeAttachmentBusy = false;
+        }
+        return;
+      }
       const url = this.invoiceAttachmentUrl(row);
-      if (!url) return this.$message.warning('当前Mock发票暂无可查看附件');
+      if (!url) return this.$message.warning('当前发票暂无可查看附件');
       window.open(url, '_blank');
     },
-    downloadInvoiceAttachment(row) {
+    async downloadInvoiceAttachment(row) {
+      const attachment = this.invoiceAttachment(row);
+      // 金蝶侧附件（path 型）经后端代理 A801-2 下载，OSS 直链维持前端直连下载
+      if (isKingdeePathAttachment(attachment)) {
+        if (this.kingdeeAttachmentBusy) return;
+        this.kingdeeAttachmentBusy = true;
+        try {
+          await downloadKingdeeInvoiceFile(row.invoiceNo, this.invoiceAttachmentName(row));
+        } finally {
+          this.kingdeeAttachmentBusy = false;
+        }
+        return;
+      }
       const url = this.invoiceAttachmentUrl(row);
-      if (!url) return this.$message.warning('当前Mock发票暂无可下载附件');
+      if (!url) return this.$message.warning('当前发票暂无可下载附件');
       downloadFileByUrl(url, this.invoiceAttachmentName(row));
     },
     buildSavePayload() {

src/views/settlement/components/formal-settlement-table-panel.vue

@@ -21,6 +21,7 @@
           type="primary"
           plain
           :disabled="selection.length !== 1"
+          :loading="syncLoading"
           @click="$emit('sync')"
           >同步金蝶</el-button
         >
@@ -132,6 +133,7 @@ export default {
     rows: { type: Array, default: () => [] },
     columns: { type: Array, default: () => [] },
     loading: { type: Boolean, default: false },
+    syncLoading: { type: Boolean, default: false },
     page: { type: Object, required: true },
     hasPermission: { type: Function, required: true },
   },

src/views/settlement/components/pre-settlement-editor.vue

@@ -42,7 +42,7 @@
                   format="YYYY-MM-DD"
                   :disabled="!editable || form.currency === 'RMB'"
                   placeholder="请选择"
-                  @change="recalculateLocalAmount"
+                  @change="handleExchangeRateDateChange"
                 />
                 <el-input-number
                   v-else-if="field.type === 'number'"
@@ -66,6 +66,12 @@
                 <span v-else-if="field.prop === 'settlementType'" class="form-readonly">
                   {{ settlementTypeName }}
                 </span>
+                <span v-else-if="field.prop === 'preSettlementNo'" class="form-readonly">
+                  {{ form.preSettlementNo || (!form.id ? '系统自动生成' : '-') }}
+                </span>
+                <span v-else-if="field.prop === 'createTime'" class="form-readonly">
+                  {{ formatCreateDate(form.createTime) }}
+                </span>
                 <span v-else-if="field.money" class="form-readonly">
                   {{ formatMoney(form[field.prop], moneyCurrency(field.prop)) }}
                 </span>
@@ -184,7 +190,6 @@
         </template>
         <el-form
           :model="detailQuery"
-          inline
           label-position="right"
           label-width="auto"
           class="pre-settlement-editor__detail-filter"
@@ -228,8 +233,15 @@
           </el-form-item>
         </el-form>
         <div v-show="!detailCollapsed">
-          <el-table :data="filteredDetails" border class="pre-settlement-editor__detail-table">
-            <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
+          <el-table :data="pagedDetails" border class="pre-settlement-editor__detail-table">
+            <el-table-column
+              type="index"
+              label="序号"
+              width="64"
+              fixed="left"
+              align="center"
+              :index="detailIndexMethod"
+            />
             <el-table-column
               v-for="column in visibleDetailColumns"
               :key="column.prop"
@@ -300,6 +312,16 @@
               </template>
             </el-table-column>
           </el-table>
+          <div class="pre-settlement-editor__pagination">
+            <el-pagination
+              v-model:current-page="detailPage.current"
+              v-model:page-size="detailPage.size"
+              :total="filteredDetails.length"
+              :page-sizes="[10, 20, 50, 100]"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleDetailPageSizeChange"
+            />
+          </div>
         </div>
       </section-card>
 
@@ -313,13 +335,43 @@
           <el-table :data="attachments" border @selection-change="handleAttachmentSelectionChange">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column type="index" label="序号" width="70" align="center" />
-            <el-table-column label="文件名" min-width="260" show-overflow-tooltip>
+            <el-table-column label="附件类型" min-width="180" align="center">
+              <template #default="{ row }">
+                <el-select
+                  v-if="editable"
+                  v-model="row.type"
+                  filterable
+                  placeholder="请选择"
+                  @change="sortAttachments"
+                >
+                  <el-option
+                    v-for="item in attachmentTypeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                <span v-else>{{ attachmentTypeName(row.type) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="文件名称" min-width="260" show-overflow-tooltip>
               <template #default="{ row }">
                 <el-link type="primary" @click="previewAttachment(row)">
                   {{ attachmentName(row) }}
                 </el-link>
               </template>
             </el-table-column>
+            <el-table-column label="附件描述" min-width="220">
+              <template #default="{ row }">
+                <span v-if="!editable">{{ row.description || '-' }}</span>
+                <el-input
+                  v-else
+                  v-model="row.description"
+                  maxlength="200"
+                  placeholder="请输入"
+                />
+              </template>
+            </el-table-column>
             <el-table-column label="文件大小" width="120" align="center">
               <template #default="{ row }">{{ formatFileSize(row.size) }}</template>
             </el-table-column>
@@ -425,7 +477,7 @@
         提交
       </el-button>
     </template>
-    <div v-if="pageMode" class="pre-settlement-editor__page-actions">
+    <div v-if="pageMode && !publicMode" class="pre-settlement-editor__page-actions">
       <el-button @click="visible = false">取消</el-button>
       <el-button v-if="editable" type="primary" plain :loading="saving" @click="saveDraft(false)"
         >保存</el-button
@@ -681,134 +733,113 @@
     append-to-body
     destroy-on-close
   >
-    <el-tabs v-model="adjustDialog.activeTab" class="pre-settlement-editor__adjust-tabs">
-      <el-tab-pane label="结算明细调整" name="adjust">
-        <el-table v-loading="adjustDialog.loading" :data="adjustRows" border>
-          <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
-          <el-table-column prop="cargoName" label="货物名称" min-width="140" align="center" />
-          <el-table-column prop="cargoType" label="货物类型" min-width="130" align="center" />
-          <el-table-column label="计费规则" min-width="190" align="center">
-            <template #default="{ row }">
-              <div class="pre-settlement-editor__billing-rule-cell">
-                <span>{{ displayValue(billingRuleName(row)) }}</span>
-                <el-icon
-                  class="pre-settlement-editor__billing-rule-icon"
-                  title="查看计费规则详情"
-                  @click="openBillingRuleInfo(row)"
-                >
-                  <InfoFilled />
-                </el-icon>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="运输总量" min-width="150" align="center">
-            <template #default="{ row }">
-              <span v-if="adjustDialog.readonly">{{ formatQuantity(row) }}</span>
-              <el-input-number
-                v-else
-                v-model="row.transportQuantity"
-                :min="0"
-                :precision="2"
-                :controls="false"
-                @change="recalculateAdjustRow(row, 'transportQuantity')"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="里程（KM）" min-width="140" align="center">
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.mileage"
-                :min="0"
-                :precision="2"
-                :controls="false"
-                :disabled="adjustDialog.readonly"
-                @change="recalculateAdjustRow(row, 'mileage')"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="运输单价" min-width="140" align="center">
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.unitPrice"
-                :min="0"
-                :precision="2"
-                :controls="false"
-                :disabled="adjustDialog.readonly"
-                @change="recalculateAdjustRow(row, 'unitPrice')"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-for="feeItem in adjustFeeItemNames"
-            :key="feeItem"
-            :label="feeItem"
-            min-width="140"
-            align="center"
-          >
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.feeItems[feeItem]"
-                :min="0"
-                :precision="2"
-                :controls="false"
-                :disabled="adjustDialog.readonly"
-                @change="recalculateAdjustRow(row, feeItem)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="结算金额（含税）" min-width="170" align="center">
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.settlementAmountTax"
-                :precision="2"
-                :controls="false"
-                :disabled="adjustDialog.readonly"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" min-width="200" align="center">
-            <template #default="{ row }">
-              <el-input v-model="row.remark" maxlength="200" :disabled="adjustDialog.readonly" />
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-form
-          v-if="!adjustDialog.readonly"
-          :model="adjustDialog"
-          label-position="right"
-          label-width="auto"
-          class="pre-settlement-editor__adjust-reason"
-        >
-          <el-form-item label="调整原因">
-            <el-input v-model="adjustDialog.reason" maxlength="200" show-word-limit />
-          </el-form-item>
-        </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="变更记录" name="records">
-        <el-table :data="changeRecords" border>
-          <el-table-column type="index" label="序号" width="70" align="center" />
-          <el-table-column prop="changeTime" label="变更日期" min-width="170" align="center" />
-          <el-table-column prop="operatorName" label="经办人" min-width="140" align="center" />
-          <el-table-column prop="changeType" label="变更类型" min-width="160" align="center" />
-          <el-table-column
-            prop="changeReason"
-            label="变更原因"
-            min-width="240"
-            align="center"
-            show-overflow-tooltip
+    <el-table v-loading="adjustDialog.loading" :data="adjustRows" border>
+      <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
+      <el-table-column prop="cargoName" label="货物名称" min-width="140" align="center" />
+      <el-table-column prop="cargoType" label="货物类型" min-width="130" align="center" />
+      <el-table-column label="计费规则" min-width="190" align="center">
+        <template #default="{ row }">
+          <div class="pre-settlement-editor__billing-rule-cell">
+            <span>{{ displayValue(billingRuleName(row)) }}</span>
+            <el-icon
+              class="pre-settlement-editor__billing-rule-icon"
+              title="查看计费规则详情"
+              @click="openBillingRuleInfo(row)"
+            >
+              <InfoFilled />
+            </el-icon>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="运输总量" min-width="150" align="center">
+        <template #default="{ row }">
+          <span v-if="adjustDialog.readonly">{{ formatQuantity(row) }}</span>
+          <el-input-number
+            v-else
+            v-model="row.transportQuantity"
+            :min="0"
+            :precision="2"
+            :controls="false"
+            @change="recalculateAdjustRow(row, 'transportQuantity')"
           />
-          <el-table-column label="状态" min-width="120" align="center">
-            <template #default>已生效</template>
-          </el-table-column>
-          <el-table-column label="操作" width="120" align="center" fixed="right">
-            <template #default="{ row }">
-              <el-link type="primary" @click="openAdjustChangeRecord(row)">查看详情</el-link>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-empty v-if="!adjustChangeRecords.length" description="暂无变更记录" :image-size="60" />
-      </el-tab-pane>
-    </el-tabs>
+        </template>
+      </el-table-column>
+      <el-table-column label="里程（KM）" min-width="140" align="center">
+        <template #default="{ row }">
+          <el-input-number
+            v-model="row.mileage"
+            :min="0"
+            :precision="2"
+            :controls="false"
+            :disabled="adjustDialog.readonly"
+            @change="recalculateAdjustRow(row, 'mileage')"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="运输单价" min-width="140" align="center">
+        <template #default="{ row }">
+          <el-input-number
+            v-model="row.unitPrice"
+            :min="0"
+            :precision="2"
+            :controls="false"
+            :disabled="adjustDialog.readonly"
+            @change="recalculateAdjustRow(row, 'unitPrice')"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="feeItem in adjustFeeItemNames"
+        :key="feeItem"
+        :label="feeItem"
+        min-width="140"
+        align="center"
+      >
+        <template #default="{ row }">
+          <el-input-number
+            v-model="row.feeItems[feeItem]"
+            :min="0"
+            :precision="2"
+            :controls="false"
+            :disabled="adjustDialog.readonly"
+            @change="recalculateAdjustRow(row, feeItem)"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="结算金额（含税）" min-width="170" align="center">
+        <template #default="{ row }">
+          <el-input-number
+            v-model="row.settlementAmountTax"
+            :precision="2"
+            :controls="false"
+            :disabled="adjustDialog.readonly"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" min-width="200" align="center">
+        <template #default="{ row }">
+          <el-input v-model="row.remark" maxlength="200" :disabled="adjustDialog.readonly" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-form
+      v-if="!adjustDialog.readonly"
+      :model="adjustDialog"
+      label-position="right"
+      label-width="auto"
+      class="pre-settlement-editor__adjust-reason"
+    >
+      <el-form-item label="调整原因">
+        <el-input
+          v-model="adjustDialog.reason"
+          type="textarea"
+          :rows="2"
+          maxlength="200"
+          show-word-limit
+          placeholder="请输入"
+        />
+      </el-form-item>
+    </el-form>
     <template #footer>
       <el-button @click="adjustDialog.visible = false">取消</el-button>
       <el-button
@@ -822,35 +853,10 @@
     </template>
   </el-dialog>
 
-  <el-dialog
+  <change-record-detail-dialog
     v-model="adjustChangeRecordVisible"
-    title="变更记录详情"
-    append-to-body
-    destroy-on-close
-    width="1100px"
-    top="10px"
-    class="pre-settlement-change-record-detail-dialog"
-  >
-    <div v-if="adjustChangeRecord" class="pre-settlement-change-record-detail-meta">
-      <span>变更日期：{{ adjustChangeRecord.changeTime || '-' }}</span>
-      <span>经办人：{{ adjustChangeRecord.operatorName || '-' }}</span>
-      <span>变更类型：{{ adjustChangeRecord.changeType || '-' }}</span>
-      <span>状态：已生效</span>
-    </div>
-    <el-table :data="adjustChangeRecordDetailRows" border :show-overflow-tooltip="false">
-      <el-table-column prop="field" label="变更字段" min-width="220" />
-      <el-table-column prop="before" label="变更前" min-width="330" />
-      <el-table-column prop="after" label="变更后" min-width="420" />
-    </el-table>
-    <el-empty
-      v-if="!adjustChangeRecordDetailRows.length"
-      description="暂无变更内容"
-      :image-size="60"
-    />
-    <template #footer>
-      <el-button type="primary" @click="adjustChangeRecordVisible = false">关闭</el-button>
-    </template>
-  </el-dialog>
+    :rows="adjustChangeRecordDetailRows"
+  />
 
   <el-dialog
     v-model="billingRuleDialog.visible"
@@ -922,6 +928,8 @@
 import { h } from 'vue';
 import { mapGetters } from 'vuex';
 import { InfoFilled } from '@element-plus/icons-vue';
+import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
+import { getMkPublicDetail } from '@/api/mk-process';
 import {
   adjustDetail,
   getCandidateDetails,
@@ -934,6 +942,7 @@ import {
   submit,
 } from '@/api/settlement/preSettlement';
 import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
+import { getBfiExchangeRate } from '@/api/base/currency';
 import { getDictionary } from '@/api/system/dictbiz';
 import {
   emptyPreSettlementForm,
@@ -960,7 +969,7 @@ import * as XLSX from 'xlsx';
 
 export default {
   name: 'PreSettlementEditor',
-  components: { InfoFilled },
+  components: { InfoFilled, ChangeRecordDetailDialog },
   props: {
     modelValue: {
       type: Boolean,
@@ -982,6 +991,10 @@ export default {
       type: Object,
       default: null,
     },
+    publicMode: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['update:modelValue', 'success'],
   data() {
@@ -1054,9 +1067,14 @@ export default {
         batchNo: '',
         cargoName: '',
       },
+      detailPage: {
+        current: 1,
+        size: 10,
+      },
       advances: [],
       changeRecords: [],
       attachments: [],
+      attachmentTypeOptions: [],
       selectedAttachmentRows: [],
       candidateDialog: {
         visible: false,
@@ -1079,7 +1097,6 @@ export default {
         loading: false,
         saving: false,
         readonly: false,
-        activeTab: 'adjust',
         detailId: '',
         sourceDetailId: '',
         detailLineNo: '',
@@ -1206,6 +1223,13 @@ export default {
         })
       );
     },
+    pagedDetails() {
+      const list = this.filteredDetails;
+      const size = Number(this.detailPage.size) || 10;
+      const current = Math.max(Number(this.detailPage.current) || 1, 1);
+      const start = (current - 1) * size;
+      return list.slice(start, start + size);
+    },
     adjustFeeItemNames() {
       const names = new Set();
       this.adjustRows.forEach(row => {
@@ -1232,6 +1256,16 @@ export default {
       this.form.settlementAmount = Number(value || 0).toFixed(2);
       this.recalculateLocalAmount();
     },
+    filteredDetails: {
+      handler(list) {
+        const size = Number(this.detailPage.size) || 10;
+        const maxPage = Math.max(1, Math.ceil((list?.length || 0) / size) || 1);
+        if (this.detailPage.current > maxPage) {
+          this.detailPage.current = maxPage;
+        }
+      },
+      immediate: true,
+    },
   },
   methods: {
     hasPermission(code) {
@@ -1239,11 +1273,18 @@ export default {
     },
     async initialize() {
       this.resetEditor();
-      await this.loadFeeOptions();
-      await this.loadFeeCategoryOptions();
-      await this.loadTransportTypeOptions();
+      if (!this.publicMode) {
+        await this.loadFeeOptions();
+        await this.loadFeeCategoryOptions();
+        await this.loadTransportTypeOptions();
+        await this.loadAttachmentTypeOptions();
+      }
       if (this.recordId) await this.loadDetail();
-      else if (this.initialData) await this.applyInitialData();
+      else if (this.initialData) {
+        await this.applyInitialData();
+        this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
+        await this.fetchBfiExchangeRate();
+      }
     },
     async applyInitialData() {
       const rows = Array.isArray(this.initialData?.rows) ? this.initialData.rows : [];
@@ -1281,6 +1322,7 @@ export default {
         localCurrency: first.localCurrency || 'RMB',
       });
       this.details = rows.map(row => this.normalizeSourceDetail(row));
+      this.detailPage.current = 1;
       this.loading = true;
       try {
         await this.ensureSourceFeeSnapshots();
@@ -1342,6 +1384,7 @@ export default {
         cargoName: '',
       };
       this.appliedDetailQuery = { ...this.detailQuery };
+      this.detailPage = { current: 1, size: 10 };
       this.advances = [];
       this.changeRecords = [];
       this.attachments = [];
@@ -1350,7 +1393,6 @@ export default {
       this.pendingAdjustments = {};
       this.sourceFeeSnapshots = {};
       this.detailFeeCache = {};
-      this.adjustDialog.activeTab = 'adjust';
       this.adjustDialog.detailId = '';
       this.adjustDialog.sourceDetailId = '';
       this.adjustDialog.detailLineNo = '';
@@ -1370,11 +1412,14 @@ export default {
     async loadDetail() {
       this.loading = true;
       try {
-        const { data } = await getDetail(this.form.id || this.recordId);
-        const detail = data?.data || {};
+        const response = this.publicMode
+          ? await getMkPublicDetail('pre-settlement', this.form.id || this.recordId)
+          : await getDetail(this.form.id || this.recordId);
+        const detail = response.data?.data || {};
         this.form = { ...emptyPreSettlementForm(), ...detail };
         this.summaryFees = (detail.summaryFees || []).map(row => ({ ...row }));
         this.details = (detail.details || []).map(row => this.normalizeSourceDetail(row));
+        this.detailPage.current = 1;
         this.advances = (detail.advances || []).map(row => ({
           ...row,
           createUserName: row.createUserName || detail.createUserName,
@@ -1382,6 +1427,7 @@ export default {
         }));
         this.changeRecords = detail.changeRecords || [];
         this.attachments = this.parseAttachments(detail.attachmentsJson);
+        this.sortAttachments();
         this.selectedAttachmentRows = [];
         if (
           detail.contractId &&
@@ -1399,8 +1445,15 @@ export default {
             partyB: detail.payeeName,
           });
         }
-        // 预加载所有明细的费用明细数据，用于拼接货物名称和类型
-        await this.loadAllDetailFees();
+        if (this.publicMode && detail.detailFees) {
+          Object.entries(detail.detailFees).forEach(([detailId, feeRows]) => {
+            if (Array.isArray(feeRows) && feeRows.length) {
+              this.detailFeeCache[detailId] = feeRows;
+            }
+          });
+        } else {
+          await this.loadAllDetailFees();
+        }
       } finally {
         this.loading = false;
       }
@@ -1528,7 +1581,12 @@ export default {
       this.form.settlementType = contract.settlementType || 'payable';
       this.form.payerName = contract.partyA;
       this.form.payeeName = contract.partyB;
+      this.form.currency = contract.settlementCurrency || 'RMB';
       this.summaryFees = [];
+      if (this.form.currency !== 'RMB') {
+        this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
+        this.fetchBfiExchangeRate();
+      }
     },
     async saveDraft(shouldSubmit) {
       await this.$refs.formRef?.validate();
@@ -1566,6 +1624,7 @@ export default {
           return;
         }
         this.$message.success('保存成功');
+        this.visible = false;
         this.$emit('success', this.form.id);
       } finally {
         this[stateKey] = false;
@@ -1801,6 +1860,26 @@ export default {
           .toFixed(2)
       );
     },
+    handleExchangeRateDateChange() {
+      this.fetchBfiExchangeRate();
+      this.recalculateLocalAmount();
+    },
+    async fetchBfiExchangeRate() {
+      if (!this.form.currency || this.form.currency === 'RMB') return;
+      if (!this.form.exchangeRateDate) return;
+      try {
+        const { data } = await getBfiExchangeRate(this.form.currency, this.form.exchangeRateDate);
+        const rateData = data?.data;
+        if (rateData?.excval != null) {
+          this.form.exchangeRate = Number(rateData.excval);
+          this.recalculateLocalAmount();
+        } else {
+          this.$message.warning(`未查询到 ${this.form.currency} 的BFI汇率数据`);
+        }
+      } catch (e) {
+        this.$message.warning('查询BFI汇率失败，请手动输入结算汇率');
+      }
+    },
     recalculateLocalAmount() {
       const rate = this.form.currency === 'RMB' ? 1 : Number(this.form.exchangeRate || 0);
       this.form.localSettlementAmount = (Number(this.form.settlementAmount || 0) * rate).toFixed(2);
@@ -1895,6 +1974,7 @@ export default {
     },
     handleDetailQuery() {
       this.appliedDetailQuery = { ...this.detailQuery };
+      this.detailPage.current = 1;
     },
     resetDetailQuery() {
       this.detailQuery = {
@@ -1904,6 +1984,13 @@ export default {
         cargoName: '',
       };
       this.appliedDetailQuery = { ...this.detailQuery };
+      this.detailPage.current = 1;
+    },
+    handleDetailPageSizeChange() {
+      this.detailPage.current = 1;
+    },
+    detailIndexMethod(index) {
+      return (this.detailPage.current - 1) * this.detailPage.size + index + 1;
     },
     normalizeAdjustRow(item, feeItemNames = []) {
       const rawFeeItems =
@@ -2026,7 +2113,6 @@ export default {
       this.adjustDialog.visible = true;
       this.adjustDialog.loading = true;
       this.adjustDialog.readonly = readonly;
-      this.adjustDialog.activeTab = 'adjust';
       this.adjustDialog.detailId = detailRow.id;
       this.adjustDialog.detailLineNo = detailRow.lineNo;
       this.adjustDialog.sourceDetailId =
@@ -2042,6 +2128,11 @@ export default {
           this.adjustRows = this.cloneAdjustRows(pending.rows);
           return;
         }
+        if (this.publicMode) {
+          const cachedFees = this.detailFeeCache[detailRow.id] || [];
+          this.adjustRows = cachedFees.map(item => this.normalizeAdjustRow(item));
+          return;
+        }
         if (sourceDetailId) {
           if (!this.sourceFeeSnapshots[sourceDetailId]) {
             this.sourceFeeSnapshots[sourceDetailId] = await this.loadSourceFeeRows(sourceDetailId);
@@ -2049,6 +2140,11 @@ export default {
           this.adjustRows = this.cloneAdjustRows(this.sourceFeeSnapshots[sourceDetailId]);
           return;
         }
+        const cachedFees = this.detailFeeCache[detailRow.id];
+        if (this.publicMode && Array.isArray(cachedFees)) {
+          this.adjustRows = cachedFees.map(item => this.normalizeAdjustRow(item));
+          return;
+        }
         const response = await getDetailFees(detailRow.id);
         const rows = response.data?.data || response.data || [];
         this.adjustRows = rows.map(item => this.normalizeAdjustRow(item));
@@ -2237,10 +2333,6 @@ export default {
       return String(name || '').includes('运费') || String(name || '').includes('运输费');
     },
     async saveAdjustment() {
-      if (!this.adjustDialog.reason.trim()) {
-        this.$message.warning('请输入调整原因');
-        return;
-      }
       if (this.adjustRows.some(row => row.calculating)) {
         this.$message.warning('费用正在重新计算，请稍候');
         return;
@@ -2419,13 +2511,92 @@ export default {
     handleAttachmentChange(list) {
       const uploadUserName = this.userInfo?.realName || this.userInfo?.userName || '';
       const uploadTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
-      this.attachments = (list || []).map(file => ({
-        ...file,
-        uploadUserName: file.uploadUserName || uploadUserName,
-        uploadTime: file.uploadTime || uploadTime,
-      }));
+      const existingRows = this.attachments || [];
+      this.attachments = (list || []).map(file => {
+        const fileUrl = this.attachmentUrl(file);
+        const existing = existingRows.find(item => {
+          const sameUid = file.uid && item.uid && String(file.uid) === String(item.uid);
+          const sameUrl = fileUrl && this.attachmentUrl(item) === fileUrl;
+          return sameUid || sameUrl;
+        });
+        const originalName = this.attachmentName(file);
+        return {
+          ...file,
+          type: existing?.type || file.type || this.resolveAttachmentType(originalName),
+          description: existing?.description || file.description || '',
+          uploadUserName: existing?.uploadUserName || file.uploadUserName || uploadUserName,
+          uploadTime: existing?.uploadTime || file.uploadTime || uploadTime,
+        };
+      });
+      this.sortAttachments();
       this.selectedAttachmentRows = [];
     },
+    async loadAttachmentTypeOptions() {
+      try {
+        const response = await getDictionary({ code: 'pre_settlement_attachment_type' });
+        const data = response?.data?.data || [];
+        this.attachmentTypeOptions = data
+          .map(item => ({
+            label: item.dictValue,
+            value: item.dictValue,
+          }))
+          .filter(item => item.label && item.value);
+      } catch (error) {
+        this.attachmentTypeOptions = [];
+      }
+      this.sortAttachments();
+    },
+    resolveAttachmentType(fileName) {
+      const normalizedName = String(fileName || '').toLocaleLowerCase();
+      const matchedType = [...this.attachmentTypeOptions]
+        .filter(item => item?.label || item?.value)
+        .sort(
+          (a, b) =>
+            String(b.label || b.value || '').length - String(a.label || a.value || '').length
+        )
+        .find(item => {
+          const typeText = String(item.label || item.value || '').toLocaleLowerCase();
+          return typeText && normalizedName.includes(typeText);
+        });
+      if (matchedType?.value) return matchedType.value;
+      const otherType = this.attachmentTypeOptions.find(item => this.isOtherAttachmentType(item));
+      if (otherType?.value) return otherType.value;
+      return '';
+    },
+    isOtherAttachmentType(item) {
+      const typeText = String(item?.label || item?.value || '').trim();
+      return (
+        typeText === '其他' ||
+        typeText === '其它' ||
+        typeText === '其他附件' ||
+        typeText === '其它附件'
+      );
+    },
+    getAttachmentTypeOrder(type) {
+      const normalizedType = String(type || '').trim();
+      const index = this.attachmentTypeOptions.findIndex(
+        item =>
+          String(item.value || '').trim() === normalizedType ||
+          String(item.label || '').trim() === normalizedType
+      );
+      return index === -1 ? Number.MAX_SAFE_INTEGER : index;
+    },
+    sortAttachments() {
+      this.attachments = (this.attachments || [])
+        .map((file, index) => ({ file, index }))
+        .sort((a, b) => {
+          const orderDifference =
+            this.getAttachmentTypeOrder(a.file.type) - this.getAttachmentTypeOrder(b.file.type);
+          return orderDifference || a.index - b.index;
+        })
+        .map(item => item.file);
+    },
+    attachmentTypeName(type) {
+      const option = this.attachmentTypeOptions.find(
+        item => String(item.value) === String(type) || String(item.label) === String(type)
+      );
+      return option?.label || type || '-';
+    },
     handleAttachmentSelectionChange(rows) {
       this.selectedAttachmentRows = rows || [];
     },
@@ -2469,13 +2640,25 @@ export default {
     },
     parseAttachments(value) {
       if (!value) return [];
-      if (Array.isArray(value)) return value;
-      try {
-        const parsed = JSON.parse(value);
-        return Array.isArray(parsed) ? parsed : [];
-      } catch (error) {
-        return [];
+      let list = [];
+      if (Array.isArray(value)) {
+        list = value;
+      } else {
+        try {
+          const parsed = JSON.parse(value);
+          list = Array.isArray(parsed) ? parsed : [];
+        } catch (error) {
+          return [];
+        }
       }
+      return list.map(file => {
+        const originalName = this.attachmentName(file);
+        return {
+          ...file,
+          type: file?.type || this.resolveAttachmentType(originalName),
+          description: file?.description || '',
+        };
+      });
     },
     parseFeeItems(value) {
       if (!value) return {};
@@ -2512,6 +2695,11 @@ export default {
       if (!Number.isFinite(amount)) return '-';
       return `${amount.toFixed(2)} ${currency || 'RMB'}`;
     },
+    formatCreateDate(value) {
+      if (value === undefined || value === null || value === '') return '-';
+      const parsed = this.$dayjs(value);
+      return parsed.isValid() ? parsed.format('YYYY-MM-DD') : this.displayValue(value);
+    },
     formatQuantity(row) {
       const value = row.transportQuantity;
       if (value === undefined || value === null || value === '') return '-';
@@ -2662,22 +2850,43 @@ export default {
   }
 
   &__detail-filter {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 0 24px;
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr)) auto;
+    align-items: center;
+    gap: 8px 16px;
     margin-bottom: 12px;
+    padding: 12px 12px 4px;
+    background: #fff;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
 
     :deep(.el-form-item) {
+      display: flex;
+      min-width: 0;
+      margin-right: 0;
       margin-bottom: 0;
     }
 
+    :deep(.el-form-item__content) {
+      flex: 1;
+      min-width: 0;
+    }
+
     :deep(.el-input) {
-      width: 220px;
+      width: 100%;
     }
   }
 
   &__detail-filter-actions {
-    margin-left: auto;
+    width: auto;
+    margin-left: 0;
+    white-space: nowrap;
+    justify-self: end;
+
+    :deep(.el-form-item__content) {
+      flex: none;
+      justify-content: flex-end;
+      flex-wrap: nowrap;
+    }
   }
 
   &__contract-filter {
@@ -2790,23 +2999,6 @@ export default {
   }
 }
 
-.pre-settlement-change-record-detail-meta {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px 32px;
-  margin-bottom: 16px;
-  color: #606266;
-}
-
-:deep(.pre-settlement-change-record-detail-dialog .el-dialog__body) {
-  padding-top: 12px;
-}
-
-:deep(.pre-settlement-change-record-detail-dialog .el-table .cell) {
-  white-space: pre-wrap;
-  word-break: break-all;
-}
-
 :deep(.pre-settlement-editor .el-dialog__body) {
   padding: 12px 16px;
 }

src/views/settlement/formal-settlement-form.vue

@@ -56,6 +56,7 @@ export default {
   methods: {
     goBack() {
       removeSettlementTransfer(this.$route.query.transferToken);
+      this.$router.$avueRouter.closeTag();
       this.$router.push('/settlement/formal-settlement');
     },
     syncTagTitle() {

src/views/settlement/formal-settlement-public-view.vue

@@ -0,0 +1,55 @@
+<template>
+  <mk-public-shell biz-type="formal-settlement" :get-form="getForm">
+    <basic-container>
+      <div class="mk-public-form-title">查看正式结算</div>
+      <formal-settlement-editor
+        ref="page"
+        :model-value="true"
+        page-mode
+        readonly
+        public-mode
+        :record-id="recordId"
+      />
+    </basic-container>
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import FormalSettlementEditor from '@/views/settlement/components/formal-settlement-editor.vue';
+
+export default {
+  name: 'FormalSettlementPublicView',
+  components: { MkPublicShell, FormalSettlementEditor },
+  computed: {
+    recordId() {
+      return this.$route.query.id || '';
+    },
+  },
+  methods: {
+    getForm() {
+      const form = this.$refs.page?.form || {};
+      return { ...form, subject: form.formalSettlementNo || form.contractName || '' };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.mk-public-form-title {
+  display: flex;
+  align-items: center;
+  min-height: 24px;
+  margin-bottom: 16px;
+  font-size: 18px;
+  font-weight: 600;
+
+  &::before {
+    width: 4px;
+    height: 20px;
+    margin-right: 8px;
+    background: #409eff;
+    content: '';
+  }
+}
+</style>

src/views/settlement/formal-settlement.vue

@@ -64,6 +64,7 @@
             :loading="loading"
             :page="page"
             :has-permission="hasPermissionFn"
+            :sync-loading="syncLoading"
             @create="openCreate"
             @payment="openPaymentDialog"
             @sync="handleSync"
@@ -82,6 +83,7 @@
             :loading="loading"
             :page="page"
             :has-permission="hasPermissionFn"
+            :sync-loading="syncLoading"
             @create="openCreate"
             @payment="openPaymentDialog"
             @sync="handleSync"
@@ -215,6 +217,7 @@ export default {
       rows: [],
       selection: [],
       loading: false,
+      syncLoading: false,
       page: { current: 1, size: 10, total: 0 },
       editor: { visible: false, id: null, readonly: false },
       paymentDialog: {
@@ -381,12 +384,28 @@ export default {
       return this.selection[0];
     },
     async handleSync() {
+      if (this.syncLoading) return;
       const row = this.selectedOne('同步金蝶');
       if (!row) return;
-      const response = await api.syncKingdee(row.id);
-      const data = this.unwrapData(response);
-      this.$message.success(`同步成功，金蝶单据号：${data}`);
-      this.loadTable();
+
+      this.syncLoading = true;
+      try {
+        const response = await api.syncKingdee(row.id);
+        const data = this.unwrapData(response);
+        this.$message.success(`同步成功，金蝶单据号：${data}`);
+        await this.loadTable();
+        // 附件联带同步提示：同步成功但附件未全部上传时追加 warning，重推即自动补传
+        const freshRow = (this.rows || []).find(item => String(item.id) === String(row.id));
+        if (freshRow && ['pending', 'partial'].includes(freshRow.attachmentSyncStatus)) {
+          this.$message({
+            type: 'warning',
+            message: '该单附件未全部上传，可重推补传',
+            duration: 8000,
+          });
+        }
+      } finally {
+        this.syncLoading = false;
+      }
     },
     async openPaymentDialog() {
       if (!this.selection.length) return this.$message.warning('请至少选择一条正式结算单');

src/views/settlement/pre-settlement-form.vue

@@ -50,6 +50,7 @@ export default {
     },
     goBack() {
       removeSettlementTransfer(this.$route.query.transferToken);
+      this.$router.$avueRouter.closeTag();
       this.$router.push('/settlement/pre-settlement');
     },
     syncTagTitle() {

src/views/settlement/pre-settlement-public-view.vue

@@ -0,0 +1,55 @@
+<template>
+  <mk-public-shell biz-type="pre-settlement" :get-form="getForm">
+    <basic-container>
+      <div class="mk-public-form-title">查看预结算</div>
+      <pre-settlement-editor
+        ref="page"
+        :model-value="true"
+        page-mode
+        readonly
+        public-mode
+        :record-id="recordId"
+      />
+    </basic-container>
+  </mk-public-shell>
+</template>
+
+<script>
+import MkPublicShell from '@/views/mk/mk-public-shell.vue';
+import PreSettlementEditor from '@/views/settlement/components/pre-settlement-editor.vue';
+
+export default {
+  name: 'PreSettlementPublicView',
+  components: { MkPublicShell, PreSettlementEditor },
+  computed: {
+    recordId() {
+      return this.$route.query.id || '';
+    },
+  },
+  methods: {
+    getForm() {
+      const form = this.$refs.page?.form || {};
+      return { ...form, subject: form.preSettlementNo || form.contractName || '' };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.mk-public-form-title {
+  display: flex;
+  align-items: center;
+  min-height: 24px;
+  margin-bottom: 16px;
+  font-size: 18px;
+  font-weight: 600;
+
+  &::before {
+    width: 4px;
+    height: 20px;
+    margin-right: 8px;
+    background: #409eff;
+    content: '';
+  }
+}
+</style>

src/views/settlement/pre-settlement.vue

@@ -497,6 +497,7 @@ export default {
         path: '/payment/payment-application/form',
         query: {
           mode: 'add',
+          paymentType: 'progress_advance',
           transferToken,
           preSettlementIds: sourcePreSettlements
             .map(row => row.preSettlementId)

src/views/settlement/receivable-payable-detail.vue

@@ -183,6 +183,7 @@
       title="变更记录详情"
       width="88%"
       append-to-body
+      align-center
     >
       <el-table v-loading="changeRecordsDialog.loading" :data="changeRows" border>
         <el-table-column type="index" label="序号" width="64" align="center" />
@@ -1153,28 +1154,16 @@ export default {
         minWidth: 130,
         align: 'right',
       };
-      const dynamicColumns = this.isPayable
-        ? [
-            {
-              label: '运输费',
-              prop: 'tableFreightAmount',
-              feeSummaryType: 'freight',
-              minWidth: 130,
-              align: 'right',
-            },
-            otherFeeColumn,
-          ]
-        : [
-            ...this.tableFeeItemNames.map((name, index) => ({
-              label: name,
-              prop: `tableFeeItem${index}`,
-              feeItemName: name,
-              dynamic: true,
-              minWidth: 130,
-              align: 'right',
-            })),
-            otherFeeColumn,
-          ];
+      const dynamicColumns = [
+        {
+          label: '运输费',
+          prop: 'tableFreightAmount',
+          feeSummaryType: 'freight',
+          minWidth: 130,
+          align: 'right',
+        },
+        otherFeeColumn,
+      ];
       if (totalIndex < 0) return [...columns, ...dynamicColumns];
       columns.splice(totalIndex, 0, ...dynamicColumns);
       return columns;
@@ -1209,10 +1198,24 @@ export default {
     await this.loadTable();
     await this.openRouteDetail();
   },
+  // 标签切走（keep-alive 缓存）或销毁时，收起 teleport/append-to-body 弹层，避免残留盖住其它页面
+  deactivated() {
+    this.closeInnerDialogs();
+  },
   beforeUnmount() {
-    this.clearAdjustCalculations();
+    this.closeInnerDialogs();
   },
   methods: {
+    closeInnerDialogs() {
+      this.closeDetailPanel();
+      this.closeAdjustPanel();
+      this.changeRecordsDialog.visible = false;
+      this.updateFeeDialog.visible = false;
+      this.transferDialog.visible = false;
+      this.generateDialog.visible = false;
+      this.previewDialog.visible = false;
+      this.generateContractDialog.visible = false;
+    },
     contractCategoryName(value) {
       return (
         this.contractCategoryOptions.find(item => String(item.value) === String(value))?.label ||
@@ -1498,7 +1501,7 @@ export default {
         const res = await api.getList(this.page.current, this.page.size, params);
         const data = this.unwrapPage(res);
         this.rows = (data.records || []).map(this.decorateRow);
-        this.tableFeeItemNames = this.isPayable ? [] : this.collectFeeItemNames(this.rows);
+        this.tableFeeItemNames = [];
         this.page.total = data.total || 0;
       } finally {
         this.loading = false;
@@ -1738,7 +1741,7 @@ export default {
           });
           const adjusted = {
             ...item,
-            transportQuantity: Number(item.transportQuantity || 0),
+            transportQuantity: this.normalizeAdjustTransportQuantity(item),
             mileage:
               item.mileage === null || item.mileage === undefined || Number(item.mileage) === -1
                 ? null
@@ -1767,6 +1770,21 @@ export default {
     feeSourceLabel(value) {
       return ['手动录入', '手动添加', '手工录入'].includes(value) ? '手动录入' : '自动生成';
     },
+    normalizeAdjustTransportQuantity(item = {}) {
+      const value = item.transportQuantity;
+      if (value === undefined || value === null || value === '' || Number(value) === -1) {
+        return '';
+      }
+      const element = item.billingFactor;
+      // 按车辆/固定金额生成时运输量会被写成占位 1，调整弹窗无实际运输量时不展示
+      if (
+        (element === '按车辆' || element === '固定金额（整单一口价）') &&
+        Number(value) === 1
+      ) {
+        return '';
+      }
+      return Number(value);
+    },
     adjustBillingTypes(row) {
       return ADJUST_BILLING_TYPE_MAP[row.billingFactor] || [];
     },
@@ -1894,7 +1912,12 @@ export default {
             model: row.model,
             billingFactor: row.billingFactor,
             billingType: row.billingType,
-            transportQuantity: row.transportQuantity,
+            transportQuantity:
+              row.transportQuantity === '' ||
+              row.transportQuantity === null ||
+              row.transportQuantity === undefined
+                ? null
+                : Number(row.transportQuantity),
             priceUnit: row.priceUnit,
             unitPrice: row.unitPrice,
             mileage: row.mileage,

src/views/system/dept.vue

@@ -143,7 +143,8 @@
           :status="oaSyncProgressStatus"
           :stroke-width="12"
         />
-        <div class="oa-sync-meta">
+        <div class="oa-sync-meta" v-if="oaSyncStage === 'clear'">当前阶段：{{ oaSyncStageLabel }}</div>
+        <div class="oa-sync-meta" v-else>
           当前阶段：{{ oaSyncStageLabel }}，第 {{ oaSyncProgress.current || 0 }} / {{ oaSyncTotalPage }} 页
         </div>
         <div class="oa-sync-stats">
@@ -177,6 +178,7 @@ import {
   getDeptTree,
   syncOaCompany,
   syncOaDepartment,
+  clearNonTopDept,
 } from '@/api/system/dept';
 import { getLeaderList } from '@/api/system/user';
 import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
@@ -215,6 +217,7 @@ export default {
       oaSyncCancelled: false,
       oaSyncStatus: 'running',
       oaSyncStage: 'company',
+      oaSyncClearNonTop: false,
       oaSyncController: null,
       oaSyncProgress: {
         current: 0,
@@ -287,8 +290,9 @@ export default {
                     return;
                   }
                   const parentId = this.normalizeParentId(this.form?.parentId);
+                  // 顶级组织不选择上级时，编码不依赖上级编码
                   if (!parentId) {
-                    callback(new Error('请先选择上级组织'));
+                    callback();
                     return;
                   }
                   if (!this.parentDept || String(this.parentDept.id) !== String(parentId)) {
@@ -429,13 +433,6 @@ export default {
             props: {
               label: 'title',
             },
-            rules: [
-              {
-                required: true,
-                message: '请选择上级组织',
-                trigger: 'click',
-              },
-            ],
           },
           {
             label: '所属租户',
@@ -520,6 +517,9 @@ export default {
       return '自动同步组织';
     },
     oaSyncStageLabel() {
+      if (this.oaSyncStage === 'clear') {
+        return '清除非顶级组织';
+      }
       return this.oaSyncStage === 'department' ? '同步部门' : '同步公司';
     },
     oaSyncTotalPage() {
@@ -555,21 +555,34 @@ export default {
   },
   methods: {
     handleOaOrgSync() {
-      this.$confirm('确定从OA先同步公司、再同步部门?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        this.startOaOrgSync();
-      });
+      this.$confirm(
+        '是否清除非顶级组织？选择“是”将先删除顶级以外的组织后再同步；选择“否”则直接同步。',
+        '提示',
+        {
+          confirmButtonText: '是',
+          cancelButtonText: '否',
+          distinguishCancelAndClose: true,
+          closeOnClickModal: false,
+          type: 'warning',
+        }
+      )
+        .then(() => {
+          this.startOaOrgSync(true);
+        })
+        .catch(action => {
+          if (action === 'cancel') {
+            this.startOaOrgSync(false);
+          }
+        });
     },
-    startOaOrgSync() {
+    startOaOrgSync(clearNonTop) {
       this.oaSyncLoading = true;
       this.oaSyncVisible = true;
       this.oaSyncRunning = true;
       this.oaSyncCancelled = false;
       this.oaSyncStatus = 'running';
-      this.oaSyncStage = 'company';
+      this.oaSyncClearNonTop = !!clearNonTop;
+      this.oaSyncStage = clearNonTop ? 'clear' : 'company';
       this.oaSyncController = new AbortController();
       this.oaSyncProgress = {
         current: 0,
@@ -607,6 +620,14 @@ export default {
     },
     async runOaOrgSyncPages() {
       try {
+        if (this.oaSyncClearNonTop) {
+          this.oaSyncStage = 'clear';
+          await clearNonTopDept(this.oaSyncController?.signal);
+          if (this.oaSyncCancelled) {
+            this.oaSyncStatus = 'cancelled';
+            return;
+          }
+        }
         this.oaSyncStage = 'company';
         await this.runOaOrgSyncStage(syncOaCompany);
         if (this.oaSyncCancelled) {
@@ -821,6 +842,11 @@ export default {
         .filter(Boolean);
       return result.length ? result.join('、') : '-';
     },
+    normalizeTopParent(row) {
+      if (!this.normalizeParentId(row?.parentId)) {
+        row.parentId = 0;
+      }
+    },
     isRootDept(row) {
       return row && (row.parentId === 0 || String(row.parentId) === '0');
     },
@@ -836,6 +862,7 @@ export default {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
       row.leaderId = func.join(row.leaderId);
+      this.normalizeTopParent(row);
       if (Number(row.deptCategory) === 6 && !row.carrierCustomerId) {
         this.$message.warning('请选择承运商');
         loading();
@@ -865,6 +892,7 @@ export default {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
       row.leaderId = func.join(row.leaderId);
+      this.normalizeTopParent(row);
       if (Number(row.deptCategory) === 6 && !row.carrierCustomerId) {
         this.$message.warning('请选择承运商');
         loading();

src/views/system/user.vue

@@ -205,7 +205,7 @@
                       type="password"
                       show-password
                       autocomplete="new-password"
-                      placeholder="请输入登录密码"
+                      placeholder="大于8位，含字母、数字、特殊字符.!@#$%^&*"
                     />
                   </el-form-item>
                 </el-col>
@@ -332,7 +332,12 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="新密码" prop="password">
-                    <el-input v-model="passwordForm.password" type="password" show-password />
+                    <el-input
+                      v-model="passwordForm.password"
+                      type="password"
+                      show-password
+                      placeholder="大于8位，含字母、数字、特殊字符.!@#$%^&*"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -424,6 +429,7 @@ import { mapGetters } from 'vuex';
 import { h } from 'vue';
 import { getToken } from '@/utils/auth';
 import { downloadXls } from '@/utils/util';
+import { validateLoginPassword } from '@/utils/validate';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import func from '@/utils/func';
@@ -487,8 +493,7 @@ export default {
       passwordForm: {},
       passwordRules: {
         password: [
-          { required: true, message: '请输入新密码', trigger: 'blur' },
-          { min: 6, max: 32, message: '密码长度在6到32个字符', trigger: 'blur' },
+          { required: true, validator: validateLoginPassword, trigger: 'blur' },
         ],
         password2: [
           { required: true, message: '请再次输入新密码', trigger: 'blur' },
@@ -497,6 +502,7 @@ export default {
       },
       userRules: {
         account: [{ required: true, message: '请输入账号名', trigger: 'blur' }],
+        password: [{ required: true, validator: validateLoginPassword, trigger: 'blur' }],
         realName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
         phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }],
         deptId: [{ required: true, message: '请选择所属组织', trigger: 'change' }],

src/views/system/userinfo.vue

@@ -91,7 +91,7 @@
               <el-input
                 v-model="passwordForm.newPassword"
                 type="password"
-                placeholder="请输入新密码"
+                placeholder="大于8位，含字母、数字、特殊字符.!@#$%^&*"
                 show-password
               >
                 <template #prefix>
@@ -143,6 +143,7 @@
 import { getUserInfo, updateInfo, updatePassword } from '@/api/system/user';
 import md5 from 'js-md5';
 import { sensitive } from '@/utils/sensitive';
+import { isValidLoginPassword, LOGIN_PASSWORD_RULE_MESSAGE } from '@/utils/validate';
 import {
   Plus,
   Bell,
@@ -259,6 +260,18 @@ export default {
     },
     // 提交密码修改
     submitPassword() {
+      if (!this.passwordForm.newPassword || !this.passwordForm.newPassword1) {
+        this.$message.warning('请输入新密码和确认密码');
+        return;
+      }
+      if (this.passwordForm.newPassword !== this.passwordForm.newPassword1) {
+        this.$message.warning('两次输入的新密码不一致');
+        return;
+      }
+      if (!isValidLoginPassword(this.passwordForm.newPassword)) {
+        this.$message.warning(LOGIN_PASSWORD_RULE_MESSAGE);
+        return;
+      }
       this.loading = true;
       updatePassword(
         md5(this.passwordForm.oldPassword),

src/views/transportCapacity/vehicle.vue

@@ -129,7 +129,7 @@
     >
       <el-form
         label-position="right"
-        label-width="calc(7em + 24px)"
+        label-width="calc(4em + 12px)"
         class="certification-audit archive-form"
       >
         <section-card title="基础信息">
@@ -145,19 +145,25 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="外廓尺寸（毫米）">
+              <el-form-item label="外廓尺寸">
                 <div class="dimension-group">
                   <div class="dimension-group__item">
                     <span class="dimension-group__label">长</span>
-                    <span class="certification-audit__value">{{ auditValue('outerLength') }}</span>
+                    <span class="certification-audit__value">
+                      {{ auditValueWithUnit('outerLength', 'mm') }}
+                    </span>
                   </div>
                   <div class="dimension-group__item">
                     <span class="dimension-group__label">宽</span>
-                    <span class="certification-audit__value">{{ auditValue('outerWidth') }}</span>
+                    <span class="certification-audit__value">
+                      {{ auditValueWithUnit('outerWidth', 'mm') }}
+                    </span>
                   </div>
                   <div class="dimension-group__item">
                     <span class="dimension-group__label">高</span>
-                    <span class="certification-audit__value">{{ auditValue('outerHeight') }}</span>
+                    <span class="certification-audit__value">
+                      {{ auditValueWithUnit('outerHeight', 'mm') }}
+                    </span>
                   </div>
                 </div>
               </el-form-item>
@@ -165,13 +171,17 @@
           </el-row>
           <el-row :gutter="18">
             <el-col :span="6">
-              <el-form-item label="核定载质量（KG）">
-                <span class="certification-audit__value">{{ auditValue('approvedLoadKg') }}</span>
+              <el-form-item label="核定载质量">
+                <span class="certification-audit__value">
+                  {{ auditValueWithUnit('approvedLoadKg', 'KG') }}
+                </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="准牵引总质量（KG）">
-                <span class="certification-audit__value">{{ auditValue('tractionMassKg') }}</span>
+              <el-form-item label="准牵引总质量">
+                <span class="certification-audit__value">
+                  {{ auditValueWithUnit('tractionMassKg', 'KG') }}
+                </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -357,7 +367,7 @@
         v-if="showRejectReason"
         class="certification-audit__reason"
         label-position="right"
-        label-width="calc(7em + 24px)"
+        label-width="calc(4em + 24px)"
       >
         <el-form-item label="驳回原因" required>
           <el-input
@@ -427,7 +437,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="外廓尺寸（毫米）">
+              <el-form-item label="外廓尺寸">
                 <div class="dimension-group">
                   <div class="dimension-group__item">
                     <span class="dimension-group__label">长</span>
@@ -436,7 +446,9 @@
                       inputmode="numeric"
                       placeholder="请输入"
                       @input="vehicleForm.outerLength = digitsOnly($event)"
-                    />
+                    >
+                      <template #suffix>mm</template>
+                    </el-input>
                   </div>
                   <div class="dimension-group__item">
                     <span class="dimension-group__label">宽</span>
@@ -445,7 +457,9 @@
                       inputmode="numeric"
                       placeholder="请输入"
                       @input="vehicleForm.outerWidth = digitsOnly($event)"
-                    />
+                    >
+                      <template #suffix>mm</template>
+                    </el-input>
                   </div>
                   <div class="dimension-group__item">
                     <span class="dimension-group__label">高</span>
@@ -454,7 +468,9 @@
                       inputmode="numeric"
                       placeholder="请输入"
                       @input="vehicleForm.outerHeight = digitsOnly($event)"
-                    />
+                    >
+                      <template #suffix>mm</template>
+                    </el-input>
                   </div>
                 </div>
               </el-form-item>
@@ -462,23 +478,27 @@
           </el-row>
           <el-row :gutter="18">
             <el-col :span="6">
-              <el-form-item label="核定载质量（KG）" prop="approvedLoadKg">
+              <el-form-item label="核定载质量" prop="approvedLoadKg">
                 <el-input
                   v-model="vehicleForm.approvedLoadKg"
                   inputmode="numeric"
                   placeholder="请输入"
                   @input="vehicleForm.approvedLoadKg = digitsOnly($event)"
-                />
+                >
+                  <template #suffix>KG</template>
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="准牵引总质量（KG）" prop="tractionMassKg">
+              <el-form-item label="准牵引总质量" prop="tractionMassKg">
                 <el-input
                   v-model="vehicleForm.tractionMassKg"
                   inputmode="numeric"
                   placeholder="请输入"
                   @input="vehicleForm.tractionMassKg = digitsOnly($event)"
-                />
+                >
+                  <template #suffix>KG</template>
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -896,6 +916,7 @@ export default {
       energyTypeOptions: ['柴油', '汽油', '新能源', '天然气'],
       baseRules: {
         organizationName: [{ required: true, message: '请选择所属组织', trigger: 'change' }],
+        useDepartment: [{ required: true, message: '请选择使用部门', trigger: 'change' }],
         plateNo: [
           { required: true, message: '请输入车牌号', trigger: 'change' },
           { validator: this.validatePlateNo, trigger: 'change' },
@@ -986,6 +1007,9 @@ export default {
         if (this.vehicleBox && !this.vehicleForm.id && !this.vehicleForm.organizationName) {
           this.vehicleForm.organizationName = this.getCurrentOrganizationName();
         }
+        if (this.vehicleBox && !this.vehicleForm.useDepartment) {
+          this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
+        }
       });
     },
     flattenDeptOptions(tree = [], level = 0) {
@@ -1061,6 +1085,7 @@ export default {
       if (!row?.id) {
         this.vehicleForm = emptyForm();
         this.vehicleForm.organizationName = this.getCurrentOrganizationName();
+        this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
         this.syncPlateNo(false);
         this.vehicleBox = true;
         return;
@@ -1070,6 +1095,9 @@ export default {
           ...emptyForm(),
           ...(res.data.data || {}),
         };
+        if (!this.vehicleForm.useDepartment) {
+          this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
+        }
         this.splitPlateNo();
         this.syncPlateNo(false);
         this.vehicleBox = true;
@@ -1102,6 +1130,10 @@ export default {
       const value = this.certificationAuditForm[prop];
       return value === undefined || value === null || value === '' ? '-' : value;
     },
+    auditValueWithUnit(prop, unit) {
+      const value = this.auditValue(prop);
+      return value === '-' ? value : `${value}${unit}`;
+    },
     handleCertificationApprove() {
       auditCertification(this.certificationAuditForm.id, 1).then(() => {
         this.$message.success('认证已通过');
@@ -1693,11 +1725,19 @@ export default {
   }
 }
 
-.certification-audit,
+.certification-audit {
+  :deep(.el-form-item__label) {
+    flex: 0 0 calc(4em + 12px) !important;
+    width: calc(4em + 12px) !important;
+    max-width: calc(4em + 12px);
+  }
+}
+
 .certification-audit__reason {
   :deep(.el-form-item__label) {
-    flex: 0 0 calc(7em + 24px) !important;
-    width: calc(7em + 24px) !important;
+    flex: 0 0 calc(4em + 24px) !important;
+    width: calc(4em + 24px) !important;
+    max-width: calc(4em + 24px);
   }
 }
 

src/views/vehicle/maintenance-plan.vue

@@ -564,8 +564,8 @@ export default {
         this.addressMapPickerVisible = true;
       }
     },
-    handleAddressMapConfirm(address) {
-      this.form.address = address;
+    handleAddressMapConfirm(payload) {
+      this.form.address = typeof payload === 'string' ? payload : payload?.address || '';
     },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission[code], false);

src/views/vehicle/maintenance-record.vue

@@ -545,8 +545,8 @@ export default {
         this.addressMapPickerVisible = true;
       }
     },
-    handleAddressMapConfirm(address) {
-      this.form.address = address;
+    handleAddressMapConfirm(payload) {
+      this.form.address = typeof payload === 'string' ? payload : payload?.address || '';
     },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission[code], false);

src/views/vehicle/violation-record.vue

@@ -288,8 +288,8 @@ export default {
         this.locationMapPickerVisible = true;
       }
     },
-    handleLocationMapConfirm(address) {
-      this.form.location = address;
+    handleLocationMapConfirm(payload) {
+      this.form.location = typeof payload === 'string' ? payload : payload?.address || '';
     },
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission[code], false);

vite.config.mjs

@@ -51,8 +51,10 @@ export default ({ mode, command }) => {
       port: 2888,
       proxy: {
         '/api': {
+          // 本地网关默认 80 端口（blade-gateway bootstrap.yml）；开发时需先启动网关及 blade-auth/blade-system 等服务
+          // 注意：本机 8080 一般是 Nacos，不是业务网关
           target: 'http://localhost',
-          //target: 'https://saber3.bladex.cn/api',
+          // target: 'http://172.16.203.228:8000', // 仅联调远程网关时启用（且不要 rewrite）
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },

需求卡/运单管理需求卡.md

@@ -570,19 +570,22 @@
 
 - 功能点：
   - 任意状态的运单均支持复制。
-  - 复制后生成新的草稿运单，运单号重新生成。
-  - 复制时保留运单基础信息、货物信息、承运信息和过程配置相关信息，状态与过程记录重新初始化。
-  - 复制成功后跳转编辑页面。
+  - 复制后运单号重新生成，业务状态与原运单保持一致。
+  - 复制时保留运单基础信息、货物信息、承运信息和过程配置相关信息；过程打卡记录重新初始化。
+  - 若原运单为已完成，复制保存后按合同系统计费规则自动生成对应应收、应付明细。
+  - 复制成功后跳转编辑页面（独立表单模式）或刷新列表（弹窗模式）。
 
 - 异常与边界：
   - 原运单不存在时提示数据不存在。
   - 复制后名称、编号或关联字段触发唯一性校验时应重新处理。
   - 复制失败时不影响原运单数据。
+  - 合同未开启系统计费、无匹配计费方案或自有运输等场景下，按既有规则跳过对应应收/应付生成。
 
 - 反例：
   - 不允许复制后沿用原运单号。
-  - 不允许复制后直接生成进行中或已完成状态。
+  - 不允许复制后状态与原运单不一致。
   - 不允许复制后保留原过程节点完成记录。
+  - 不允许已完成运单复制成功后遗漏按规则应生成的应收应付明细。
 
 ---