fix: 修复发票登记弹窗金蝶同步状态不显示

Co-authored-by: Cursor <cursoragent@cursor.com>

src/api/vehicle/customer-archive.js

@@ -152,6 +152,34 @@ export const getScoreTemplate = quantificationId => {
   });
 };
 
+/** 线下评分 Excel 模板下载 */
+export const downloadScoreExcelTemplate = quantificationId => {
+  return request({
+    url: '/blade-transport/customer-archive/score-excel-template',
+    method: 'get',
+    responseType: 'blob',
+    params: {
+      quantificationId,
+    },
+  });
+};
+
+/** 线下评分 Excel 导入（成功返回评分明细 JSON；失败返回失败明细 Excel 流） */
+export const importScoreExcel = (quantificationId, file) => {
+  const formData = new FormData();
+  formData.append('file', file);
+  return request({
+    url: '/blade-transport/customer-archive/score-import',
+    method: 'post',
+    data: formData,
+    responseType: 'blob',
+    timeout: 60000,
+    params: {
+      quantificationId,
+    },
+  });
+};
+
 export const queryKingdeeCustomer = creditCode => {
   return request({
     url: '/blade-transport/bfi/customer/query-by-credit-code',

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

@@ -1,8 +1,8 @@
 <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-dialog v-model="visible" :title="title" width="92%" append-to-body align-center destroy-on-close @open="handleOpen">
+    <el-form class="kingdee-pool-dialog__form" :model="query" inline label-position="right" label-width="120px" @submit.prevent>
       <el-form-item label="发票号码">
-        <el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="query.invoiceNo" clearable placeholder="请输入" @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="开票日期">
         <el-date-picker
@@ -10,15 +10,16 @@
           type="daterange"
           value-format="YYYY-MM-DD"
           format="YYYY-MM-DD"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
+          range-separator="-"
+          start-placeholder="请选择"
+          end-placeholder="请选择"
         />
       </el-form-item>
       <el-form-item label="开票单位">
-        <el-input v-model="query.salerName" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="query.salerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="受票单位">
-        <el-input v-model="query.buyerName" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="query.buyerName" clearable placeholder="请输入" @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="开票单位（销方）">
         <el-select
@@ -93,6 +94,9 @@
       <el-form-item>
         <el-button :disabled="loading" @click="resetQuery">重置</el-button>
         <el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
+        <el-tooltip content="按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找" placement="top">
+          <el-icon class="kingdee-pool-dialog__query-tip"><QuestionFilled /></el-icon>
+        </el-tooltip>
       </el-form-item>
     </el-form>
     <el-table
@@ -101,7 +105,7 @@
       :data="rows"
       :row-key="rowKey"
       border
-      height="520"
+      max-height="50vh"
       :highlight-current-row="!multiple"
       @selection-change="selection => (selected = selection)"
       @row-dblclick="handleRowDblclick"
@@ -118,6 +122,7 @@
           </el-radio>
         </template>
       </el-table-column>
+      <el-table-column type="index" label="序号" width="70" align="center" :index="indexMethod" />
       <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" />
@@ -172,8 +177,8 @@
         </template>
       </el-table-column>
     </el-table>
-    <div class="kingdee-pool-dialog__pager">
-      <span class="kingdee-pool-dialog__pager-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
+    <div class="kingdee-pool-dialog__pagination">
+      <span class="kingdee-pool-dialog__pagination-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
       <el-pagination
         v-model:current-page="page.current"
         v-model:page-size="page.size"
@@ -323,6 +328,9 @@ export default {
       this.page.current = 1;
       this.load();
     },
+    indexMethod(index) {
+      return (this.page.current - 1) * this.page.size + index + 1;
+    },
     resetQuery() {
       this.query = this.emptyQuery();
       this.handleQuery();
@@ -420,15 +428,28 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.kingdee-pool-dialog__pager {
+.kingdee-pool-dialog__form {
+  margin-bottom: 16px;
+  padding: 12px 12px 4px;
+  background: #fff;
+  border-radius: 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+}
+.kingdee-pool-dialog__pagination {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-top: 12px;
+  padding: 16px 0;
   gap: 16px;
 }
-.kingdee-pool-dialog__pager-tip {
+.kingdee-pool-dialog__pagination-tip {
   color: #909399;
   font-size: 12px;
+  white-space: nowrap;
+}
+.kingdee-pool-dialog__query-tip {
+  margin-left: 8px;
+  color: #909399;
+  cursor: pointer;
 }
 </style>

src/option/payment/invoiceReceipt.js

@@ -12,7 +12,7 @@ export const invoiceReceiptTableColumns = [
   { prop: 'createUserName', label: '创建人', minWidth: 110 },
   { prop: 'createTime', label: '创建时间', minWidth: 170 },
   { prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 },
-  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 },
+  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130, kingdeeStatus: true },
   { prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
   { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];

src/option/settlement/formalSettlement.js

@@ -118,7 +118,7 @@ export const formalSettlementOption = (settlementType = '') => ({
   emptyBtnText: '重置',
   searchShow: true,
   searchIcon: true,
-  searchLabelWidth: 88,
+  searchLabelWidth: 100,
   // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
   searchMenuSpan: 4,
   searchIndex: 4,

src/option/settlement/preSettlementForm.js

@@ -8,8 +8,20 @@ export const preSettlementFormFields = [
   { label: '合同名称', prop: 'contractId', type: 'contract', required: true },
   { label: '合同编号', prop: 'contractNo', readonly: true },
   { label: '项目名称', prop: 'projectName', readonly: true },
-  { label: '收款方', prop: 'payeeName', readonly: true },
-  { label: '付款方', prop: 'payerName', readonly: true },
+  {
+    label: '收款方',
+    prop: 'payeeName',
+    type: 'select',
+    optionsKey: 'payeeOptions',
+    required: true,
+  },
+  {
+    label: '付款方',
+    prop: 'payerName',
+    type: 'select',
+    optionsKey: 'payerOptions',
+    required: true,
+  },
   { label: '结算类型', prop: 'settlementType', readonly: true },
   { label: '结算金额', prop: 'settlementAmount', readonly: true, money: true },
   { label: '业务模式', prop: 'businessModel', type: 'select', optionsKey: 'businessModelOptions' },
@@ -24,6 +36,8 @@ export const preSettlementFormFields = [
 
 export const preSettlementFormRules = {
   contractId: [{ required: true, message: '请选择合同名称', trigger: 'change' }],
+  payeeName: [{ required: true, message: '请选择收款方', trigger: 'change' }],
+  payerName: [{ required: true, message: '请选择付款方', trigger: 'change' }],
   exchangeRateDate: [
     {
       validator: (_rule, value, callback, source) => {

src/router/views/index.js

@@ -129,7 +129,39 @@ export default [
         name: '新增编辑结算单',
         meta: {
           keepAlive: false,
-          // 付款/收款结算单共用表单页，具体高亮菜单由页面按 settlementType 回写
+          // 付款结算单表单入口，高亮付款结算单菜单
+          activeMenu: '/settlement/payment-settlement',
+        },
+        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
+      },
+    ],
+  },
+  {
+    // 收款结算单表单入口：与付款结算单共用表单组件，仅高亮菜单不同
+    path: '/settlement/receipt-settlement/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '新增编辑收款结算单',
+        meta: {
+          keepAlive: false,
+          activeMenu: '/settlement/receipt-settlement',
+        },
+        component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
+      },
+    ],
+  },
+  {
+    // 付款结算单表单入口：与 settlementListPath('payable') + '/form' 对应
+    path: '/settlement/payment-settlement/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '新增编辑付款结算单',
+        meta: {
+          keepAlive: false,
           activeMenu: '/settlement/payment-settlement',
         },
         component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),

src/utils/kingdee.js

@@ -14,6 +14,17 @@ export const KINGDEE_STATUS_TAG_TYPES = {
 /** 金蝶单据状态 → el-tag 颜色类型，未映射状态返回 info */
 export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info';
 
+/** 收票登记推送状态 → el-tag 颜色类型（已指定应付=绿、已保存收票单=黄、推送失败=红、未推送=灰） */
+export const KINGDEE_PUSH_STATUS_TAG_TYPES = {
+  unsynced: 'info',
+  pushed: 'warning',
+  assigned: 'success',
+  failed: 'danger',
+};
+
+/** 收票登记推送状态 → el-tag 颜色类型，未映射状态返回 info */
+export const kingdeePushStatusType = status => KINGDEE_PUSH_STATUS_TAG_TYPES[status] || 'info';
+
 /** 金蝶冲销状态 → el-tag 颜色类型（已冲销=绿、未冲销=黄） */
 export const KINGDEE_WRITEOFF_TAG_TYPES = {
   writtenoff: 'success',

src/views/business/contract-manage.vue

@@ -3084,7 +3084,7 @@ export default {
           const message =
             error?.response?.data?.msg ||
             error?.message ||
-            '部门合同前缀未配置，无法自动生成，请手动输入合同编号';
+            '业务部门配置中未维护该平台公司与业务部门的合同编码前缀，无法自动生成，请先在业务部门配置中维护或手动输入合同编号';
           this.$message.warning(message);
         });
     },

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

@@ -494,6 +494,9 @@ import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.v
 import { getMkPublicDetail } from '@/api/mk-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
+// 提交成功后带标记返回，列表页（keep-alive）据此重新拉取
+const invoiceApplicationListRefreshKey = 'invoice-application-list-refresh';
+
 let localId = 0;
 const emptyLine = () => ({
   localId: ++localId,
@@ -1227,6 +1230,7 @@ export default {
         mkEnabled: await loadMkEnabled().catch(() => false),
       });
       this.$message.success('提交成功');
+      sessionStorage.setItem(invoiceApplicationListRefreshKey, '1');
       this.goBack();
     },
     async syncReferenceData() {

src/views/payment/invoice-application.vue

@@ -250,6 +250,11 @@ import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import { kingdeeStatusType } from '@/utils/kingdee';
+import { settlementListPath } from '@/utils/settlement-menu';
+
+// 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
+const invoiceApplicationListRefreshKey = 'invoice-application-list-refresh';
+const invoiceApplicationListRoute = '/payment/invoice-application';
 
 const emptyQuery = () => ({
   applicationNo: '',
@@ -308,7 +313,28 @@ export default {
         this.mkEnabled = false;
       });
   },
+  activated() {
+    this.consumeListRefreshFlag();
+  },
+  watch: {
+    $route(to, from) {
+      if (
+        to.path === invoiceApplicationListRoute &&
+        from?.path?.includes('/invoice-application/form')
+      ) {
+        this.consumeListRefreshFlag();
+      }
+    },
+  },
   methods: {
+    /** 表单提交成功后带标记返回时，重新拉取列表 */
+    consumeListRefreshFlag() {
+      if (!sessionStorage.getItem(invoiceApplicationListRefreshKey)) {
+        return;
+      }
+      sessionStorage.removeItem(invoiceApplicationListRefreshKey);
+      this.loadTable();
+    },
     hasPermission(code) {
       return this.permission?.[code] !== false;
     },
@@ -372,12 +398,18 @@ export default {
           item => String(item.formalSettlementNo || '').trim() === normalizedNo
         );
         if (!row?.id) {
-          this.$message.warning('未找到对应的付款结算单');
+          this.$message.warning('未找到对应的结算单');
           return;
         }
+        // 开票申请关联的多为收款结算单，按单据类型路由到对应表单入口，避免误落付款结算单
         this.$router.push({
-          path: '/settlement/formal-settlement/form',
-          query: { mode: 'view', id: row.id, name: '查看正式结算' },
+          path: settlementListPath(row.settlementType) + '/form',
+          query: {
+            mode: 'view',
+            id: row.id,
+            settlementType: row.settlementType,
+            name: '查看正式结算',
+          },
         });
       } catch (error) {
         this.$message.error('正式结算单详情加载失败');

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

@@ -100,18 +100,28 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="结算组织" prop="deptId">
-              <el-cascader
-                v-if="!readonly"
-                :model-value="deptCascaderValue"
-                :options="deptTreeOptions"
-                :props="deptCascaderProps"
-                placeholder="请选择结算组织（合同承办部门）"
-                filterable
-                clearable
-                @change="handleDeptChange"
-              />
-              <el-input v-else :model-value="form.deptName" disabled />
+            <el-form-item label="所属合同" prop="contractNo">
+              <el-tooltip
+                :content="form.contractName"
+                :disabled="!form.contractName"
+                placement="top"
+                :show-after="200"
+              >
+                <div class="receipt-form-page__overflow-trigger">
+                  <el-input :model-value="form.contractNo" readonly placeholder="请选择承运商合同">
+                    <template v-if="!readonly" #append>
+                      <el-tooltip content="选择承运商合同" placement="top">
+                        <el-button :icon="Search" @click="openContractDialog" />
+                      </el-tooltip>
+                    </template>
+                  </el-input>
+                </div>
+              </el-tooltip>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="承办部门">
+              <el-input :model-value="form.deptName" disabled placeholder="从所属合同带出" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -214,6 +224,48 @@
       :query-api="apiQueryInvoicePool"
       @confirm="handleInvoicePicked"
     />
+
+    <el-dialog v-model="contractDialog.visible" title="选择承运商合同" width="920px" append-to-body>
+      <el-form :model="contractDialog.query" label-position="right" label-width="auto" inline @submit.prevent>
+        <el-form-item label="合同编号">
+          <el-input
+            v-model="contractDialog.query.contractNo"
+            clearable
+            placeholder="请输入"
+            @keyup.enter="searchContracts"
+          />
+        </el-form-item>
+        <el-form-item label="合同名称">
+          <el-input
+            v-model="contractDialog.query.contractName"
+            clearable
+            placeholder="请输入"
+            @keyup.enter="searchContracts"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" :icon="Search" @click="searchContracts">查询</el-button>
+          <el-button @click="resetContractQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="contractDialog.loading" :data="contractDialog.rows" border>
+        <el-table-column prop="contractNo" label="合同编号" min-width="180" show-overflow-tooltip />
+        <el-table-column prop="contractName" label="合同名称" min-width="200" show-overflow-tooltip />
+        <el-table-column prop="organizationName" label="承办部门" min-width="160" show-overflow-tooltip />
+        <el-table-column label="操作" width="80" align="center">
+          <template #default="{ row }">
+            <el-button type="primary" link @click="pickContract(row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        v-model:current-page="contractDialog.page.current"
+        v-model:page-size="contractDialog.page.size"
+        :total="contractDialog.page.total"
+        layout="total, prev, pager, next"
+        @current-change="loadContracts"
+      />
+    </el-dialog>
   </basic-container>
 </template>
 
@@ -221,7 +273,7 @@
 import { Search } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/invoiceReceipt';
-import { getDeptTree } from '@/api/system/dept';
+import { getList as getContractList } from '@/api/business/contract-manage';
 import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
@@ -247,6 +299,8 @@ const emptyForm = () => ({
   customerEmails: [],
   departmentEmails: [],
   projectName: '',
+  contractNo: '',
+  contractName: '',
   deptId: null,
   deptName: '',
   payerName: '',
@@ -269,16 +323,19 @@ export default {
       customerEmailOptions: [],
       departmentEmailOptions: [],
       invoiceItems: [],
-      deptTreeOptions: [],
-      deptMap: new Map(),
-      // 结算组织=合同承办部门：部门树级联单选（取末级 id），后端沿部门树上溯平台公司取金蝶组织
-      deptCascaderProps: { checkStrictly: true, emitPath: true },
+      contractDialog: {
+        visible: false,
+        loading: false,
+        rows: [],
+        page: { current: 1, size: 10, total: 0 },
+        query: { contractNo: '', contractName: '' },
+      },
       invoiceDialog: {
         visible: false,
       },
       rules: {
         invoiceNo: [{ required: true, validator: this.validateInvoice, trigger: 'change' }],
-        deptId: [{ required: true, validator: this.validateDept, trigger: 'change' }],
+        contractNo: [{ required: true, validator: this.validateContract, trigger: 'change' }],
         customerEmails: [{ validator: this.validateEmails, trigger: 'change' }],
         departmentEmails: [{ validator: this.validateEmails, trigger: 'change' }],
       },
@@ -299,12 +356,6 @@ export default {
       const code = this.recordId ? 'invoice_receipt_edit' : 'invoice_receipt_add';
       return this.hasPermission(code);
     },
-    deptCascaderValue() {
-      if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
-        return [];
-      }
-      return [String(this.form.deptId)];
-    },
   },
   created() {
     this.initialize();
@@ -339,7 +390,6 @@ export default {
         .filter(Boolean);
     },
     async initialize() {
-      this.loadDepartments();
       if (this.isPublicViewPage) {
         await this.loadPublicDetail();
         return;
@@ -380,9 +430,9 @@ export default {
       }
       callback();
     },
-    validateDept(rule, value, callback) {
-      if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
-        callback(new Error('请选择结算组织'));
+    validateContract(rule, value, callback) {
+      if (!this.form.contractNo) {
+        callback(new Error('请选择所属合同'));
         return;
       }
       callback();
@@ -454,47 +504,43 @@ export default {
         this.invoiceItems = [];
       }
     },
-    loadDepartments() {
-      // 结算组织取租户部门树（过滤外部组织），选中取末级部门 id
-      getDeptTree(this.userInfo?.tenantId)
-        .then(response => {
-          const rows = this.excludeExternalOrganization(this.unwrapData(response) || []);
-          this.deptTreeOptions = this.toDeptCascaderOptions(rows);
-          this.deptMap = new Map();
-          this.flattenDepartments(rows).forEach(item =>
-            this.deptMap.set(String(item.id), item.title || item.deptName || item.name)
-          );
-        })
-        .catch(() => {});
+    // 所属合同=承运商合同：选择后带出承办部门（结算组织=承办部门对应平台公司金蝶编码，后端派生）
+    openContractDialog() {
+      this.contractDialog.visible = true;
+      this.searchContracts();
     },
-    excludeExternalOrganization(list = []) {
-      return list.reduce((result, item) => {
-        const deptName = item.title || item.deptName || item.name;
-        if (String(deptName || '').trim() === '外部组织') return result;
-        result.push({
-          ...item,
-          children: item.children?.length
-            ? this.excludeExternalOrganization(item.children)
-            : item.children,
+    searchContracts() {
+      this.contractDialog.page.current = 1;
+      this.loadContracts();
+    },
+    resetContractQuery() {
+      this.contractDialog.query = { contractNo: '', contractName: '' };
+      this.searchContracts();
+    },
+    async loadContracts() {
+      this.contractDialog.loading = true;
+      try {
+        const res = await getContractList(this.contractDialog.page.current, this.contractDialog.page.size, {
+          ...this.contractDialog.query,
+          contractCategory: '承运商合同',
+          approvalStatuses: 'approved,change_approved',
         });
-        return result;
-      }, []);
+        const data = this.unwrapData(res) || {};
+        this.contractDialog.rows = data.records || [];
+        this.contractDialog.page.total = Number(data.total || 0);
+      } finally {
+        this.contractDialog.loading = false;
+      }
     },
-    toDeptCascaderOptions(list = []) {
-      return list.map(item => ({
-        label: item.title || item.deptName || item.name,
-        value: item.id == null || item.id === '' ? '' : String(item.id),
-        children: item.children?.length ? this.toDeptCascaderOptions(item.children) : undefined,
-      }));
-    },
-    flattenDepartments(rows) {
-      return (rows || []).flatMap(item => [item, ...this.flattenDepartments(item.children || [])]);
-    },
-    handleDeptChange(value) {
-      const deptId = Array.isArray(value) ? value.at(-1) : value;
-      this.form.deptId = deptId || null;
-      this.form.deptName = deptId ? this.deptMap.get(String(deptId)) || '' : '';
-      this.$refs.formRef?.validateField('deptId').catch(() => {});
+    pickContract(row) {
+      if (!row) return;
+      Object.assign(this.form, {
+        contractNo: row.contractNo,
+        contractName: row.contractName,
+        deptName: row.organizationName,
+      });
+      this.contractDialog.visible = false;
+      this.$refs.formRef?.validateField('contractNo').catch(() => {});
     },
     openSettlementDetail(row) {
       const id = row.formalSettlementId || row.settlementId || row.id;
@@ -527,9 +573,8 @@ export default {
         departmentEmails: this.form.departmentEmails.join(';'),
         attachmentsJson: JSON.stringify(this.form.attachments || []),
         remark: this.form.remark,
-        // 结算组织=页面手选部门（先票后款不挂结算单，认领关系由结算单侧维护，不再传 settlements）
-        deptId: this.form.deptId,
-        deptName: this.form.deptName,
+        // 所属合同仅传编号，合同名称/承办部门由后端按编号带出（结算组织=合同承办部门）
+        contractNo: this.form.contractNo,
       };
     },
     async saveDraft() {

src/views/payment/invoice-receipt.vue

@@ -119,6 +119,9 @@
             <el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">
               {{ displayValue(row[column.prop]) }}
             </el-tag>
+            <el-tag v-else-if="column.kingdeeStatus" :type="kingdeePushStatusType(row.kingdeePushStatus)">
+              {{ displayValue(row[column.prop]) }}
+            </el-tag>
             <span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
             <span v-else>{{ displayValue(row[column.prop]) }}</span>
           </template>
@@ -222,6 +225,7 @@ import TableHeaderTools from '@/components/table-header-tools/main.vue';
 import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
+import { kingdeePushStatusType } from '@/utils/kingdee';
 
 // 表单提交成功后带标记返回，keep-alive 缓存的列表页据此重新拉取
 const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh';
@@ -480,6 +484,7 @@ export default {
         ''
       );
     },
+    kingdeePushStatusType,
     displayValue(value) {
       return value === null || value === undefined || value === '' ? '-' : value;
     },

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

@@ -1296,9 +1296,11 @@ export default {
       this.form = {
         ...emptyForm(),
         ...data,
+        // 后端可能返回 -1 占位预付 id，统一归一为 null，防止点击结算单号误跳预付
+        preSettlementId: this.isValidReferenceId(data.preSettlementId) ? data.preSettlementId : null,
         preSettlementIds: data.preSettlementIds?.length
           ? data.preSettlementIds
-          : data.preSettlementId
+          : this.isValidReferenceId(data.preSettlementId)
           ? [data.preSettlementId]
           : [],
         attachments: this.parse(data.attachmentsJson),
@@ -1344,9 +1346,13 @@ export default {
         this.form = {
           ...emptyForm(),
           ...data,
+          // 后端可能返回 -1 占位预付 id，统一归一为 null，防止点击结算单号误跳预付
+          preSettlementId: this.isValidReferenceId(data.preSettlementId)
+            ? data.preSettlementId
+            : null,
           preSettlementIds: data.preSettlementIds?.length
             ? data.preSettlementIds
-            : data.preSettlementId
+            : this.isValidReferenceId(data.preSettlementId)
             ? [data.preSettlementId]
             : [],
           attachments: this.parse(data.attachmentsJson),
@@ -1587,17 +1593,22 @@ export default {
       });
     },
     clearFormalReferenceWhenPreOnly() {
+      // 纯预付引用才收敛为预付；-1 占位 id 不得充当预付关联
       const progressAdvance = this.form.paymentType === 'progress_advance';
       const onlyPre =
         progressAdvance ||
         (this.referenceRows.length > 0 &&
           this.referenceRows.every(item => item.referenceType === 'pre'));
       if (!onlyPre) return;
-      if (!this.form.preSettlementId) {
+      if (!this.isValidReferenceId(this.form.preSettlementId)) {
         const preId =
-          this.referenceRows.find(item => item.referenceType === 'pre')?.id ||
-          (progressAdvance ? this.form.settlementId : null);
-        if (preId) {
+          this.referenceRows.find(
+            item => item.referenceType === 'pre' && this.isValidReferenceId(item.id)
+          )?.id ||
+          (progressAdvance && this.isValidReferenceId(this.form.settlementId)
+            ? this.form.settlementId
+            : null);
+        if (this.isValidReferenceId(preId)) {
           this.form.preSettlementId = preId;
           this.form.preSettlementIds = [preId];
         }
@@ -1608,13 +1619,16 @@ export default {
     },
     restoreReferenceRows(data, fallbackRow) {
       const relations = Array.isArray(data?.settlements) ? data.settlements : [];
+      // 行级预付/正式类型以过滤占位 id 后的关联为准，决定点击结算单号的跳转目标
       const rows = relations
         .map(item => {
-          const isPre = Boolean(item.preSettlementId || item.preSettlementNo);
+          // 后端用 -1 占位空 id，必须先过滤再判预付，否则正式结算行会被误标为预付
+          const preId = this.isValidReferenceId(item.preSettlementId) ? item.preSettlementId : null;
+          const isPre = Boolean(preId || item.preSettlementNo);
           const settlementNo = item.preSettlementNo || item.formalSettlementNo || '';
           if (!settlementNo) return null;
           return {
-            id: isPre ? item.preSettlementId || item.formalSettlementId : item.formalSettlementId,
+            id: isPre ? preId || item.formalSettlementId : item.formalSettlementId,
             settlementNo,
             referenceType: isPre ? 'pre' : 'formal',
             settlementAmount: Number(Number(item.settlementAmount || 0).toFixed(2)),
@@ -1642,9 +1656,10 @@ export default {
     },
     createReferenceRow(row) {
       const settlementAmount = Number(row.settlementAmount || 0);
+      // 后端以 -1 占位空预付 id，必须先校验否则正式结算行会被误判为预付
       const isPre = Boolean(
         row.preSettlementNo ||
-          row.preSettlementId ||
+          this.isValidReferenceId(row.preSettlementId) ||
           row.referenceType === 'pre' ||
           row.paymentType === 'progress_advance'
       );
@@ -2770,23 +2785,26 @@ export default {
     },
     async openSettlementDetail(row = {}) {
       const settlementNo = String(row.settlementNo || '').trim();
+      // 行上 referenceType 优先；发票行等只带单号的，按单号回查引用行；都缺省才回落表单级推断
+      const matchedReference = this.referenceRows.find(
+        item => String(item.settlementNo || '').trim() === settlementNo
+      );
+      const referenceType = row.referenceType || matchedReference?.referenceType;
       const isPre =
-        row.referenceType === 'pre' ||
-        this.form.paymentType === 'progress_advance' ||
-        Boolean(this.form.preSettlementId || this.form.preSettlementNo);
+        referenceType === 'pre' ||
+        (!referenceType &&
+          (this.form.paymentType === 'progress_advance' ||
+            Boolean(
+              this.isValidReferenceId(this.form.preSettlementId) || this.form.preSettlementNo
+            )));
       let id =
         row.id ||
         row.preSettlementId ||
         row.settlementId ||
+        matchedReference?.id ||
         (isPre
           ? this.form.preSettlementId || this.form.preSettlementIds?.[0]
           : this.form.settlementId || this.form.settlementIds?.[0]);
-      if (!id && settlementNo) {
-        const matched = this.referenceRows.find(
-          item => String(item.settlementNo || '').trim() === settlementNo
-        );
-        id = matched?.id;
-      }
       if (!id && settlementNo) {
         try {
           const listApi = isPre ? preApi.getList : formalApi.getList;

src/views/settlement/components/invoice-receipt-candidates-dialog.vue

@@ -74,6 +74,7 @@
 
 <script>
 import { claimCandidates } from '@/api/payment/invoiceReceipt';
+import { kingdeePushStatusType } from '@/utils/kingdee';
 
 export default {
   name: 'InvoiceReceiptCandidatesDialog',
@@ -152,7 +153,7 @@ export default {
       );
     },
     pushStatusType(value) {
-      return { pushed: 'warning', assigned: 'success', failed: 'danger', unsynced: 'info' }[value] || 'info';
+      return kingdeePushStatusType(value);
     },
     formatMoney(value) {
       const number = Number(value);

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

@@ -989,6 +989,7 @@ import {
   save,
   submit,
 } from '@/api/settlement/preSettlement';
+import { getDetail as getContractDetail } from '@/api/business/contract-manage';
 import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
 import {
   resolveReceivablePayableDetailId,
@@ -1072,6 +1073,8 @@ export default {
       changeTableColumns: changeRecordColumns,
       candidateColumns: candidateDetailColumns,
       contractOptions: [],
+      payerOptions: [],
+      payeeOptions: [],
       contractCategoryOptions,
       signTypeOptions,
       effectiveTypeOptions,
@@ -1391,18 +1394,34 @@ export default {
       const first = rows[0];
       const settlementType = this.initialData.settlementType || first.settlementType || 'payable';
       const contractId = first.contractId || '';
-      let contractPartyA = first.payerName || '';
-      let contractPartyB = first.payeeName || '';
-      if (contractId && (!contractPartyA || !contractPartyB)) {
+      let contractPartyA = '';
+      let contractPartyB = '';
+      let contractPartyAJson = '';
+      let contractPartyBJson = '';
+      if (contractId) {
         try {
-          const { data } = await getContractOptions(first.contractNo || '');
-          const matched = (data?.data || []).find(item => String(item.id) === String(contractId));
-          contractPartyA = contractPartyA || matched?.partyA || '';
-          contractPartyB = contractPartyB || matched?.partyB || '';
+          const contractDetail = await this.fetchContractPartyDetail(contractId);
+          if (contractDetail) {
+            contractPartyA = contractDetail.partyA || '';
+            contractPartyB = contractDetail.partyB || '';
+            contractPartyAJson = contractDetail.partyAJson || '';
+            contractPartyBJson = contractDetail.partyBJson || '';
+          }
         } catch (error) {
           contractPartyA = '';
           contractPartyB = '';
         }
+        if (!contractPartyA && !contractPartyB) {
+          try {
+            const { data } = await getContractOptions(first.contractNo || '');
+            const matched = (data?.data || []).find(item => String(item.id) === String(contractId));
+            contractPartyA = matched?.partyA || '';
+            contractPartyB = matched?.partyB || '';
+          } catch (error) {
+            contractPartyA = first.payerName || '';
+            contractPartyB = first.payeeName || '';
+          }
+        }
       }
       if (!this.contractOptions.some(item => String(item.id) === String(contractId))) {
         this.contractOptions.push({
@@ -1416,6 +1435,8 @@ export default {
           settlementType,
           partyA: contractPartyA,
           partyB: contractPartyB,
+          partyAJson: contractPartyAJson,
+          partyBJson: contractPartyBJson,
         });
       }
       this.handleContractChange(contractId);
@@ -1427,12 +1448,12 @@ export default {
         projectName: first.projectName || this.form.projectName,
         deptId: first.deptId || this.form.deptId,
         deptName: first.deptName || this.form.deptName,
-        payerName: this.form.payerName || contractPartyA,
-        payeeName: this.form.payeeName || contractPartyB,
         settlementType,
         currency: first.currency || 'RMB',
         localCurrency: first.localCurrency || 'RMB',
       });
+      // 明细带入的收付方若为单值且在选项中，优先保留；多方拼接值由下拉默认首项承接
+      this.applyPartySelection(first.payerName, first.payeeName);
       this.details = rows.map(row => this.normalizeSourceDetail(row));
       this.detailPage.current = 1;
       this.loading = true;
@@ -1516,6 +1537,8 @@ export default {
       this.billingRuleDialog.visible = false;
       this.billingRuleDialog.rule = null;
       this.contractOptions = [];
+      this.payerOptions = [];
+      this.payeeOptions = [];
       this.contractDialog.visible = false;
       this.contractDialog.expanded = false;
       this.contractDialog.rows = [];
@@ -1552,21 +1575,20 @@ export default {
         this.attachments = this.parseAttachments(detail.attachmentsJson);
         this.sortAttachments();
         this.selectedAttachmentRows = [];
-        if (
-          detail.contractId &&
-          !this.contractOptions.some(item => item.id === detail.contractId)
-        ) {
-          this.contractOptions.push({
-            id: detail.contractId,
+        if (detail.contractId) {
+          await this.ensureContractPartyOptions(detail.contractId, {
             contractNo: detail.contractNo,
             contractName: detail.contractName,
             projectId: detail.projectId,
             projectName: detail.projectName,
             deptId: detail.deptId,
             deptName: detail.deptName,
-            partyA: detail.payerName,
-            partyB: detail.payeeName,
+            settlementType: detail.settlementType,
           });
+          this.applyPartySelection(detail.payerName, detail.payeeName);
+        } else {
+          this.payerOptions = [];
+          this.payeeOptions = [];
         }
         if (this.publicMode && detail.detailFees) {
           Object.entries(detail.detailFees).forEach(([detailId, feeRows]) => {
@@ -1640,6 +1662,8 @@ export default {
         deptName: row.deptName || row.organizationName,
         partyA: row.partyA || row.payerName,
         partyB: row.partyB || row.payeeName,
+        partyAJson: row.partyAJson || '',
+        partyBJson: row.partyBJson || '',
         settlementType:
           row.settlementType || (row.contractCategory === '客户合同' ? 'receivable' : 'payable'),
       };
@@ -1649,7 +1673,7 @@ export default {
       this.handleContractChange(contract.id);
       this.contractDialog.visible = false;
       this.contractDialog.current = null;
-      this.$refs.formRef?.clearValidate('contractId');
+      this.$refs.formRef?.clearValidate(['contractId', 'payerName', 'payeeName']);
     },
     contractCategoryName(value) {
       return (
@@ -1714,6 +1738,8 @@ export default {
         this.form.deptName = '';
         this.form.payerName = '';
         this.form.payeeName = '';
+        this.payerOptions = [];
+        this.payeeOptions = [];
         this.summaryFees = [];
         this.projectAdvanceWriteOffs = [];
         return;
@@ -1726,9 +1752,8 @@ export default {
       this.form.deptId = contract.deptId;
       this.form.deptName = contract.deptName;
       this.form.settlementType = contract.settlementType || 'payable';
-      // 部分候选合同只带 id/名称，缺甲方乙方；此时保留已带出的收付方，不要清成 undefined
-      if (contract.partyA) this.form.payerName = contract.partyA;
-      if (contract.partyB) this.form.payeeName = contract.partyB;
+      this.syncPartyOptionsFromContract(contract);
+      this.applyPartySelection('', '');
       this.form.currency = contract.settlementCurrency || 'RMB';
       this.summaryFees = [];
       this.projectAdvanceWriteOffs = [];
@@ -1737,6 +1762,152 @@ export default {
         this.fetchBfiExchangeRate();
       }
     },
+    parsePartyNames(partyJson, fallbackName) {
+      try {
+        const parsed = partyJson ? JSON.parse(partyJson) : [];
+        if (Array.isArray(parsed) && parsed.length) {
+          const names = parsed
+            .map(item => String(item?.customerName || '').trim())
+            .filter(Boolean);
+          if (names.length) return [...new Set(names)];
+        }
+      } catch (error) {
+        // JSON 解析失败时回退到名称拆分
+      }
+      return [
+        ...new Set(
+          String(fallbackName || '')
+            .split(/[、,，]/)
+            .map(name => name.trim())
+            .filter(Boolean)
+        ),
+      ];
+    },
+    buildPartySelectOptions(names) {
+      return (names || []).map(name => ({ dictKey: name, dictValue: name }));
+    },
+    resolveContractPartyNames(contract) {
+      const settlementType = contract?.settlementType || this.form.settlementType || 'payable';
+      const partyANames = this.parsePartyNames(contract?.partyAJson, contract?.partyA);
+      const partyBNames = this.parsePartyNames(contract?.partyBJson, contract?.partyB);
+      if (settlementType === 'receivable') {
+        return { payerNames: partyBNames, payeeNames: partyANames };
+      }
+      return { payerNames: partyANames, payeeNames: partyBNames };
+    },
+    syncPartyOptionsFromContract(contract) {
+      const { payerNames, payeeNames } = this.resolveContractPartyNames(contract || {});
+      this.payerOptions = this.buildPartySelectOptions(payerNames);
+      this.payeeOptions = this.buildPartySelectOptions(payeeNames);
+    },
+    isJoinedPartyName(value) {
+      return /[、,，]/.test(String(value || ''));
+    },
+    pickPartyValue(names, currentValue) {
+      const options = Array.isArray(names) ? names : [];
+      const current = String(currentValue || '').trim();
+      if (!options.length) {
+        // 无线上选项时（如公开查看拉不到合同），保留已有单值，丢弃多方拼接脏值
+        return this.isJoinedPartyName(current) ? '' : current;
+      }
+      if (current && !this.isJoinedPartyName(current) && options.includes(current)) {
+        return current;
+      }
+      return options[0] || '';
+    },
+    applyPartySelection(payerName, payeeName) {
+      const payerNames = this.payerOptions.map(item => item.dictKey);
+      const payeeNames = this.payeeOptions.map(item => item.dictKey);
+      this.form.payerName = this.pickPartyValue(payerNames, payerName);
+      this.form.payeeName = this.pickPartyValue(payeeNames, payeeName);
+      // 编辑历史单值不在合同多方中时，仍保留展示，避免下拉空白
+      if (
+        this.form.payerName &&
+        !this.payerOptions.some(item => item.dictKey === this.form.payerName)
+      ) {
+        this.payerOptions = [
+          ...this.payerOptions,
+          { dictKey: this.form.payerName, dictValue: this.form.payerName },
+        ];
+      }
+      if (
+        this.form.payeeName &&
+        !this.payeeOptions.some(item => item.dictKey === this.form.payeeName)
+      ) {
+        this.payeeOptions = [
+          ...this.payeeOptions,
+          { dictKey: this.form.payeeName, dictValue: this.form.payeeName },
+        ];
+      }
+    },
+    async fetchContractPartyDetail(contractId) {
+      if (!contractId) return null;
+      const { data } = await getContractDetail(contractId);
+      return data?.data || null;
+    },
+    async ensureContractPartyOptions(contractId, fallback = {}) {
+      if (!contractId) {
+        this.payerOptions = [];
+        this.payeeOptions = [];
+        return null;
+      }
+      let contract = this.contractOptions.find(item => String(item.id) === String(contractId));
+      const needDetail =
+        !contract ||
+        !(contract.partyAJson || contract.partyBJson) ||
+        this.isJoinedPartyName(contract.partyA) ||
+        this.isJoinedPartyName(contract.partyB) ||
+        (!contract.partyA && !contract.partyB);
+      if (needDetail) {
+        try {
+          const detail = await this.fetchContractPartyDetail(contractId);
+          if (detail) {
+            contract = {
+              ...(contract || {}),
+              id: contractId,
+              contractNo: detail.contractNo || fallback.contractNo || contract?.contractNo,
+              contractName: detail.contractName || fallback.contractName || contract?.contractName,
+              projectId: detail.projectId || fallback.projectId || contract?.projectId,
+              projectName: detail.projectName || fallback.projectName || contract?.projectName,
+              deptId:
+                detail.organizationId ||
+                detail.deptId ||
+                fallback.deptId ||
+                contract?.deptId,
+              deptName:
+                detail.organizationName ||
+                detail.deptName ||
+                fallback.deptName ||
+                contract?.deptName,
+              partyA: detail.partyA || contract?.partyA || '',
+              partyB: detail.partyB || contract?.partyB || '',
+              partyAJson: detail.partyAJson || contract?.partyAJson || '',
+              partyBJson: detail.partyBJson || contract?.partyBJson || '',
+              settlementType:
+                fallback.settlementType ||
+                contract?.settlementType ||
+                (detail.contractCategory === '客户合同' ? 'receivable' : 'payable'),
+              settlementCurrency: detail.settlementCurrency || contract?.settlementCurrency,
+            };
+          }
+        } catch (error) {
+          // 合同详情失败时仍用现有快照拆分多方名称
+        }
+      }
+      if (!contract) {
+        contract = {
+          id: contractId,
+          ...fallback,
+          partyA: fallback.partyA || '',
+          partyB: fallback.partyB || '',
+        };
+      }
+      const index = this.contractOptions.findIndex(item => String(item.id) === String(contractId));
+      if (index >= 0) this.contractOptions.splice(index, 1, contract);
+      else this.contractOptions.push(contract);
+      this.syncPartyOptionsFromContract(contract);
+      return contract;
+    },
     async saveDraft(shouldSubmit) {
       await this.$refs.formRef?.validate();
       if (shouldSubmit && !this.details.length) {

src/views/settlement/formal-settlement.vue

@@ -145,10 +145,10 @@
           <el-descriptions-item label="创建时间">
             {{ invoiceRegisterDialog.row.createTime || '-' }}
           </el-descriptions-item>
-          <el-descriptions-item label="金蝶同步状态" :span="2">
+          <el-descriptions-item label="金蝶同步状态">
             {{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
           </el-descriptions-item>
-          <el-descriptions-item label="备注" :span="2">
+          <el-descriptions-item label="备注">
             {{ invoiceRegisterDialog.row.remark || '-' }}
           </el-descriptions-item>
         </el-descriptions>
@@ -436,8 +436,9 @@ export default {
       (handlers[type] || (() => {}))();
     },
     openCreate() {
+      // 按列表锁定的结算类型路由到对应表单入口，保证菜单高亮与关闭回落列表正确
       this.$router.push({
-        path: '/settlement/formal-settlement/form',
+        path: settlementListPath(this.activeSettlementType) + '/form',
         query: {
           mode: 'add',
           name: `新增${this.billLabel}`,
@@ -448,8 +449,9 @@ export default {
     },
     openEdit(row) {
       const settlementType = row.settlementType || this.activeSettlementType;
+      // 行类型可能与列表锁定类型不同，按行类型路由
       this.$router.push({
-        path: '/settlement/formal-settlement/form',
+        path: settlementListPath(settlementType) + '/form',
         query: {
           mode: 'edit',
           id: row.id,
@@ -845,6 +847,10 @@ export default {
     settlementTypeName(value) {
       return { payable: '付款', receivable: '收款' }[value] || '-';
     },
+    // 模板无法直接访问 script 顶部 import，包装成实例方法（与 formal-settlement-table-panel 同模式）
+    kingdeeSyncName(value) {
+      return kingdeeSyncName(value);
+    },
     unwrapData(response) {
       const body = response?.data || response || {};
       return body?.data || body;

src/views/settlement/pre-settlement.vue

@@ -1,7 +1,7 @@
 <template>
   <basic-container class="pre-settlement-page">
     <section v-show="searchVisible" class="pre-settlement-page__search">
-      <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
+      <el-form :model="query" label-position="right" label-width="100px" @submit.prevent>
         <div class="pre-settlement-page__search-grid">
           <template v-for="field in visibleSearchFields" :key="field.prop">
             <el-form-item :label="field.label">
@@ -108,6 +108,7 @@
         :data="rows"
         :size="tableSize"
         border
+        height="100%"
         class="pre-settlement-page__table"
         @selection-change="handleSelectionChange"
       >
@@ -768,8 +769,27 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+// 页面固定在视口内：搜索区/工具栏/分页固定，仅表格内部滚动（与付款结算单 avue 高度自适应对齐）
+// 100vh - 50(top) - 40(tags) - 24(avue-view padding)
+$pre_page_height: calc(100vh - 114px);
+
 .pre-settlement-page {
+  height: $pre_page_height;
+
+  :deep(.basic-container__card) {
+    height: 100%;
+    overflow: hidden;
+  }
+
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+  }
+
   &__search {
+    flex-shrink: 0;
     padding: 12px 12px 4px;
     background: #fff;
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
@@ -801,6 +821,10 @@ export default {
   }
 
   &__table-panel {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
     margin-top: 8px;
   }
 
@@ -823,8 +847,14 @@ export default {
     justify-content: center;
   }
 
+  &__table {
+    flex: 1;
+    min-height: 0;
+  }
+
   &__pagination {
     display: flex;
+    flex-shrink: 0;
     justify-content: flex-end;
     padding: 12px;
   }

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

@@ -507,7 +507,13 @@
       </template>
     </el-dialog>
 
-    <el-dialog v-model="transferDialog.visible" title="批量转结算" width="86%" append-to-body>
+    <el-dialog
+      v-model="transferDialog.visible"
+      title="批量转结算"
+      width="72%"
+      append-to-body
+      align-center
+    >
       <div class="settlement-detail-page__transfer-form">
         <el-form :model="transferQuery" inline label-position="right" label-width="120px">
           <el-form-item label="转结算类型">
@@ -548,9 +554,10 @@
         :data="transferRows"
         row-key="id"
         border
+        max-height="50vh"
         @selection-change="transferSelectionChange"
       >
-        <el-table-column type="selection" width="52" align="center" reserve-selection />
+        <el-table-column type="selection" width="52" align="center" reserve-selection fixed />
         <el-table-column
           type="index"
           label="序号"
@@ -1060,6 +1067,7 @@ import { formatContractOptionLabel } from '@/utils/contract';
 import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
 import { downloadXls } from '@/utils/util';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
+import { settlementListPath } from '@/utils/settlement-menu';
 import {
   contractApprovalStatusOptions,
   contractCategoryOptions,
@@ -2659,10 +2667,11 @@ export default {
         });
         const isPreSettlement = settlementBillType === 'pre';
         this.transferDialog.visible = false;
+        // 按结算类型路由到对应表单入口，保证收款/付款菜单各自高亮正确
         await this.$router.push({
           path: isPreSettlement
             ? '/settlement/pre-settlement/form'
-            : '/settlement/formal-settlement/form',
+            : settlementListPath(this.settlementType) + '/form',
           query: {
             mode: 'add',
             transferToken,

src/views/settlement/settlement-adjustment.vue

@@ -69,6 +69,8 @@
         :data="rows"
         :size="tableSize"
         border
+        height="100%"
+        class="settlement-adjustment-page__table"
         @selection-change="selection = $event"
       >
         <el-table-column type="selection" width="52" fixed="left" align="center" /><el-table-column
@@ -389,8 +391,27 @@ export default {
 </script>
 
 <style scoped lang="scss">
+// 页面固定在视口内：搜索区/工具栏/分页固定，仅表格内部滚动（与付款结算单对齐）
+// 100vh - 50(top) - 40(tags) - 24(avue-view padding)
+$adjustment_page_height: calc(100vh - 114px);
+
 .settlement-adjustment-page {
+  height: $adjustment_page_height;
+
+  :deep(.basic-container__card) {
+    height: 100%;
+    overflow: hidden;
+  }
+
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+  }
+
   &__search {
+    flex-shrink: 0;
     padding: 12px 12px 4px;
     background: #fff;
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
@@ -417,6 +438,10 @@ export default {
     margin-bottom: 8px;
   }
   &__table-panel {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    min-height: 0;
     margin-top: 8px;
   }
   &__toolbar {
@@ -431,8 +456,13 @@ export default {
     justify-content: center;
     gap: 8px;
   }
+  &__table {
+    flex: 1;
+    min-height: 0;
+  }
   &__pagination {
     display: flex;
+    flex-shrink: 0;
     justify-content: flex-end;
     padding: 12px;
   }

src/views/system/business-dept-config.vue

@@ -195,7 +195,8 @@ export default {
             formslot: true,
             addDisplay: true,
             editDisplay: true,
-            hide: true,
+            // 列表展示，维护入口在组织管理的平台公司
+            hide: false,
           },
           {
             label: '初始流水号',
@@ -206,6 +207,7 @@ export default {
             minRows: 1,
             maxRows: 999,
             controls: false,
+            clearable: true,
             slot: true,
             placeholder: '如果系统已有相同流水号，则跳过这个流水号',
           },
@@ -259,6 +261,14 @@ export default {
       };
     },
   },
+  watch: {
+    // Avue number 清空后可能回写成 -1，统一清成空，避免未填却落库 -1
+    'form.initialSerial'(value) {
+      if (value === -1 || value === '-1') {
+        this.form.initialSerial = undefined;
+      }
+    },
+  },
   created() {
     this.loadSelectOptions();
   },
@@ -283,14 +293,26 @@ export default {
       }));
     },
     formatSerial(value) {
-      if (value === null || value === undefined || value === '') return '-';
+      // Avue number 空值常落成 -1，历史脏数据也按空展示
+      if (value === null || value === undefined || value === '' || value === -1 || value === '-1') {
+        return '';
+      }
       const number = Number(value);
-      if (!Number.isInteger(number) || number < 1) return String(value);
+      if (!Number.isInteger(number) || number < 1) return '';
       return String(number).padStart(3, '0');
     },
+    /** 初始流水号空值归一：未填 / -1 都按空处理，禁止自动落库 -1 */
+    normalizeInitialSerial(value) {
+      if (value === '' || value === undefined || value === null || value === -1 || value === '-1') {
+        return null;
+      }
+      const number = Number(value);
+      return Number.isFinite(number) ? number : null;
+    },
     handlePlatformCompanyChange(value) {
       const matched = this.platformCompanyOptions.find(item => String(item.value) === String(value));
       this.form.platformCompanyName = matched ? matched.label : '';
+      // 只读回填组织中平台公司的金蝶公司代码
       this.form.kingdeeCompanyCode = matched ? matched.kingdeeDeptCode || '' : '';
     },
     handleBusinessDeptChange(value) {
@@ -298,47 +320,63 @@ export default {
       this.form.businessDeptName = matched ? matched.label : '';
     },
     beforeOpen(done, type) {
-      this.loadSelectOptions();
+      const loadOptions = Promise.all([getPlatformCompanySelect(), getBusinessDeptSelect()]).then(
+        ([platformRes, businessRes]) => {
+          this.platformCompanyOptions = this.normalizeDeptOptions(platformRes?.data?.data);
+          this.businessDeptOptions = this.normalizeDeptOptions(businessRes?.data?.data);
+          const platformColumn = this.findColumn(this.option.column, 'platformCompanyId');
+          if (platformColumn) platformColumn.dicData = this.platformCompanyOptions;
+          const businessColumn = this.findColumn(this.option.column, 'businessDeptId');
+          if (businessColumn) businessColumn.dicData = this.businessDeptOptions;
+        }
+      );
       if (['edit', 'view'].includes(type) && this.form.id) {
-        getDetail(this.form.id).then(res => {
-          const detail = res.data?.data || {};
+        Promise.all([loadOptions, getDetail(this.form.id)]).then(([, detailRes]) => {
+          const detail = detailRes.data?.data || {};
+          const platformCompanyId = detail.platformCompanyId ? String(detail.platformCompanyId) : '';
+          const platformMatched = this.platformCompanyOptions.find(
+            item => String(item.value) === platformCompanyId
+          );
           this.form = {
             ...detail,
-            platformCompanyId: detail.platformCompanyId ? String(detail.platformCompanyId) : '',
+            platformCompanyId,
             businessDeptId: detail.businessDeptId ? String(detail.businessDeptId) : '',
+            // 展示以组织当前配置为准，避免配置表镜像滞后
+            kingdeeCompanyCode: platformMatched?.kingdeeDeptCode || detail.kingdeeCompanyCode || '',
+            // 历史 -1 / 无效值在表单中显示为空，避免 Avue number 回显 -1
+            initialSerial: this.normalizeInitialSerial(detail.initialSerial) ?? undefined,
           };
           done();
         });
         return;
       }
-      if (type === 'add') {
-        this.form = {
-          platformCompanyId: '',
-          platformCompanyName: '',
-          businessDeptId: '',
-          businessDeptName: '',
-          contractCodePrefix: '',
-          initialSerial: undefined,
-          kingdeeCompanyCode: '',
-          kingdeeDeptCode: '',
-          remark: '',
-        };
-      }
-      done();
+      loadOptions.finally(() => {
+        if (type === 'add') {
+          this.form = {
+            platformCompanyId: '',
+            platformCompanyName: '',
+            businessDeptId: '',
+            businessDeptName: '',
+            contractCodePrefix: '',
+            initialSerial: undefined,
+            kingdeeCompanyCode: '',
+            kingdeeDeptCode: '',
+            remark: '',
+          };
+        }
+        done();
+      });
     },
     normalizeSubmitRow(row) {
-      const initialSerial =
-        row.initialSerial === '' || row.initialSerial === undefined || row.initialSerial === null
-          ? null
-          : Number(row.initialSerial);
       return {
         ...row,
         platformCompanyId: row.platformCompanyId || null,
         businessDeptId: row.businessDeptId || null,
         contractCodePrefix: String(row.contractCodePrefix || '').trim(),
+        // 金蝶公司代码由后端按平台公司组织配置覆盖，前端仅展示
         kingdeeDeptCode: String(row.kingdeeDeptCode || '').trim(),
         remark: String(row.remark || '').trim(),
-        initialSerial: Number.isFinite(initialSerial) ? initialSerial : null,
+        initialSerial: this.normalizeInitialSerial(row.initialSerial),
       };
     },
     rowSave(row, done, loading) {

src/views/system/dept.vue

@@ -408,6 +408,7 @@ export default {
             searchOrder: 2,
             searchPlaceholder: '请选择是否平台公司',
             formatter: row => (Number(row.isPlatformCompany) === 1 ? '是' : '否'),
+            change: ({ value }) => this.handlePlatformCompanyChange(value),
             rules: [
               {
                 validator: (rule, value, callback) => {
@@ -421,6 +422,37 @@ export default {
               },
             ],
           },
+          {
+            label: '金蝶公司代码',
+            prop: 'kingdeeDeptCode',
+            minWidth: 140,
+            order: 35,
+            maxlength: 64,
+            showWordLimit: true,
+            // 仅平台公司维护/展示金蝶公司代码；非平台公司列表留空
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            formatter: row =>
+              Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '',
+            rules: [
+              {
+                validator: (rule, value, callback) => {
+                  const code = String(value || '').trim();
+                  if (!code) {
+                    callback();
+                    return;
+                  }
+                  if (code.length > 64) {
+                    callback(new Error('金蝶公司代码不能超过64个字符'));
+                    return;
+                  }
+                  callback();
+                },
+                trigger: 'blur',
+              },
+            ],
+          },
           {
             label: '是否业务部门',
             prop: 'isBusinessDept',
@@ -961,6 +993,21 @@ export default {
     normalizeYesNoFlag(value) {
       return Number(value) === 1 ? 1 : 0;
     },
+    handlePlatformCompanyChange(value) {
+      const isPlatform = Number(value) === 1;
+      this.syncKingdeeCompanyCodeDisplay(isPlatform);
+      if (!isPlatform && this.form) {
+        this.form.kingdeeDeptCode = '';
+      }
+    },
+    syncKingdeeCompanyCodeDisplay(isPlatformCompany) {
+      const column = this.findColumn(this.option.column, 'kingdeeDeptCode');
+      if (!column) return;
+      const visible = Number(isPlatformCompany) === 1;
+      column.addDisplay = visible;
+      column.editDisplay = visible;
+      column.viewDisplay = visible;
+    },
     resolveDeptCategoryValue(value) {
       if (value === null || value === undefined || value === '') {
         this.$message.warning('请选择组织类型');
@@ -1261,6 +1308,9 @@ export default {
     rowSave(row, done, loading) {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
+      // 金蝶公司代码仅平台公司维护
+      row.kingdeeDeptCode =
+        Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
       row.leaderId = func.join(row.leaderId);
       this.normalizeTopParent(row);
       if (!this.prepareDeptSubmitRow(row)) {
@@ -1306,6 +1356,9 @@ export default {
     rowUpdate(row, index, done, loading) {
       row.tenantId = row.tenantId || this.userInfo.tenantId || website.tenantId;
       row.deptCode = String(row.deptCode || '').trim();
+      // 金蝶公司代码仅平台公司维护
+      row.kingdeeDeptCode =
+        Number(row.isPlatformCompany) === 1 ? String(row.kingdeeDeptCode || '').trim() : '';
       row.leaderId = func.join(row.leaderId);
       this.normalizeTopParent(row);
       if (!this.prepareDeptSubmitRow(row)) {
@@ -1414,6 +1467,7 @@ export default {
         this.form.tenantId = this.form.tenantId || this.userInfo.tenantId || website.tenantId;
         this.form.isPlatformCompany = this.normalizeYesNoFlag(this.form.isPlatformCompany);
         this.form.isBusinessDept = this.normalizeYesNoFlag(this.form.isBusinessDept);
+        this.syncKingdeeCompanyCodeDisplay(this.form.isPlatformCompany);
         this.initData(this.form.tenantId);
         this.loadParentDeptCode(this.form.parentId);
         done();
@@ -1435,6 +1489,7 @@ export default {
             if (this.form.parentId === '0') {
               this.form.parentId = '';
             }
+            this.syncKingdeeCompanyCodeDisplay(this.form.isPlatformCompany);
             this.loadParentDeptCode(this.form.parentId);
             if (Object.prototype.hasOwnProperty.call(this.form, 'leaderId')) {
               const splitResult = func.split(this.form.leaderId);

src/views/vehicle/credit-score-quantification.vue

@@ -1012,7 +1012,9 @@ export default {
         this.$message.warning('得分率下限必须小于上限');
         return;
       }
+      // F 级无授信允许额度上下限均为 0；其余等级仍要求下限严格小于上限
       if (
+        !this.isZeroCreditLimitRange(this.standardForm) &&
         Number(this.standardForm.creditLimitLower) >= Number(this.standardForm.creditLimitUpper)
       ) {
         this.$message.warning('授信额度下限必须小于上限');
@@ -1033,7 +1035,7 @@ export default {
         this.$message.warning('评估标准中的得分率区间不能重叠');
         return;
       }
-      if (this.hasRangeOverlap(nextStandards, 'creditLimitLower', 'creditLimitUpper')) {
+      if (this.hasCreditLimitOverlap(nextStandards)) {
         this.$message.warning('评估标准中的授信额度区间不能重叠');
         return;
       }
@@ -1083,6 +1085,17 @@ export default {
         return next && range.upper > next.lower;
       });
     },
+    /** F 级无授信：额度上下限均为 0 */
+    isZeroCreditLimitRange(standard = {}) {
+      return (
+        Number(standard.creditLimitLower) === 0 && Number(standard.creditLimitUpper) === 0
+      );
+    },
+    /** 授信额度区间重叠校验：跳过 0~0 无授信区间，避免与 E 级 0~500 冲突 */
+    hasCreditLimitOverlap(list = []) {
+      const ranges = list.filter(item => !this.isZeroCreditLimitRange(item));
+      return this.hasRangeOverlap(ranges, 'creditLimitLower', 'creditLimitUpper');
+    },
     validateConfig() {
       if (!this.configForm.name || !this.configForm.name.trim()) {
         this.$message.warning('请输入评定表名称');
@@ -1219,7 +1232,10 @@ export default {
           this.$message.warning(`${standard.creditLevel}信用等级得分率下限必须小于上限`);
           return false;
         }
-        if (Number(standard.creditLimitLower) >= Number(standard.creditLimitUpper)) {
+        if (
+          !this.isZeroCreditLimitRange(standard) &&
+          Number(standard.creditLimitLower) >= Number(standard.creditLimitUpper)
+        ) {
           this.$message.warning(`${standard.creditLevel}信用等级授信额度下限必须小于上限`);
           return false;
         }
@@ -1234,7 +1250,7 @@ export default {
         this.$message.warning('评估标准中的得分率区间不能重叠');
         return false;
       }
-      if (this.hasRangeOverlap(standards, 'creditLimitLower', 'creditLimitUpper')) {
+      if (this.hasCreditLimitOverlap(standards)) {
         this.$message.warning('评估标准中的授信额度区间不能重叠');
         return false;
       }

src/views/vehicle/customer-archive.vue

@@ -42,6 +42,21 @@
           >批量删除
         </el-button>
       </template>
+      <template #header>
+        <el-tabs
+          v-model="query.expireStatus"
+          type="card"
+          class="customer-archive-page__expiry-tabs"
+          @tab-change="handleExpireChange"
+        >
+          <el-tab-pane
+            v-for="item in expiryTagOptions"
+            :key="item.value"
+            :label="item.label"
+            :name="item.value"
+          />
+        </el-tabs>
+      </template>
       <template #customerCode="{ row }">
         <el-button type="primary" link @click="viewArchive(row)">
           {{ row.customerCode }}
@@ -84,10 +99,15 @@
         </el-tag>
       </template>
       <template #businessEndDate="{ row }">
-        <span :class="{ 'business-license-expiring': isBusinessLicenseExpiringSoon(row) }">
+        <span :class="{ 'business-license-expiring': isDateExpiringSoon(row.businessEndDate, row.businessTermType === '长期') }">
           {{ formatBusinessLicenseValidPeriod(row) }}
         </span>
       </template>
+      <template #nextEvaluateDate="{ row }">
+        <span :class="{ 'business-license-expiring': isDateExpiringSoon(row.nextEvaluateDate) }">
+          {{ row.nextEvaluateDate || '-' }}
+        </span>
+      </template>
       <template #fundUseRate="{ row }">
         {{ formatFundUseRate(row) }}
       </template>
@@ -1301,6 +1321,19 @@
           class="score-detail-form"
         >
           <el-row :gutter="42">
+            <el-col :span="12">
+              <el-form-item label="评分方式" required>
+                <el-radio-group
+                  v-model="currentScore.evaluateMode"
+                  :disabled="readonly"
+                  @change="handleEvaluateModeChange"
+                >
+                  <el-radio value="online">线上评估</el-radio>
+                  <el-radio value="offline">线下评估</el-radio>
+                </el-radio-group>
+                <span v-if="isOfflineScore" class="score-offline-tip">线下请上传评分表 Excel</span>
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
               <el-form-item label="评定日期" required>
                 <el-date-picker
@@ -1311,59 +1344,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="拟申请总资金使用额度" required>
-                <el-input
-                  v-model="currentScore.applyCreditLimit"
-                  maxlength="18"
-                  @input="value => handleScoreDecimalInput('applyCreditLimit', value)"
-                >
-                  <template #suffix>万元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="最终得分">
-                <el-input :model-value="formatScoreValue(currentScore.finalScore)" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="最大资金使用额度">
-                <el-input :model-value="formatScoreValue(currentScore.maxCreditLimit)" disabled>
-                  <template #suffix>万元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="信用等级">
-                <el-input :model-value="formatScoreValue(currentScore.creditLevel)" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="临时申请额度">
-                <el-input
-                  v-model="currentScore.tempApplyCreditLimit"
-                  maxlength="18"
-                  @input="value => handleScoreDecimalInput('tempApplyCreditLimit', value)"
-                >
-                  <template #suffix>万元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="临时申请额度有效期起">
+              <el-form-item label="下次评定日期" required>
                 <el-date-picker
-                  v-model="currentScore.tempCreditStartDate"
-                  type="date"
-                  value-format="YYYY-MM-DD"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="临时申请额度有效期止">
-                <el-date-picker
-                  v-model="currentScore.tempCreditEndDate"
+                  v-model="currentScore.nextEvaluateDate"
                   type="date"
                   value-format="YYYY-MM-DD"
+                  placeholder="请选择"
                 />
               </el-form-item>
             </el-col>
@@ -1386,6 +1372,108 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col v-if="isOfflineScore" :span="12">
+              <el-form-item label="评分表">
+                <div class="score-offline-actions">
+                  <el-button
+                    type="primary"
+                    plain
+                    :disabled="!currentScore.quantificationId || readonly"
+                    @click="downloadScoreTemplate"
+                  >
+                    下载模板
+                  </el-button>
+                  <el-upload
+                    :show-file-list="false"
+                    :disabled="!currentScore.quantificationId || readonly || scoreImporting"
+                    accept=".xls,.xlsx"
+                    :http-request="uploadScoreExcel"
+                  >
+                    <el-button
+                      type="primary"
+                      :loading="scoreImporting"
+                      :disabled="!currentScore.quantificationId || readonly"
+                    >
+                      上传 Excel
+                    </el-button>
+                  </el-upload>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="信用等级">
+                <el-input :model-value="formatScoreValue(currentScore.creditLevel)" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="自评得分" :required="isOfflineScore">
+                <el-input
+                  v-if="isOfflineScore"
+                  v-model="currentScore.selfScore"
+                  maxlength="10"
+                  :disabled="readonly"
+                  @input="handleOfflineSelfScoreInput"
+                  @blur="recalculateOfflineScore"
+                >
+                  <template #suffix>分</template>
+                </el-input>
+                <el-input v-else :model-value="formatScoreValue(currentScore.selfScore)" disabled>
+                  <template #suffix>分</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="最终得分">
+                <el-input :model-value="formatScoreValue(currentScore.finalScore)" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="拟申请总资金使用额度" required>
+                <el-input
+                  v-model="currentScore.applyCreditLimit"
+                  maxlength="18"
+                  @input="value => handleScoreDecimalInput('applyCreditLimit', value)"
+                >
+                  <template #suffix>万元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="最大资金使用额度">
+                <el-input :model-value="formatScoreValue(currentScore.maxCreditLimit)" disabled>
+                  <template #suffix>万元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="!isOfflineScore" :span="6">
+              <el-form-item label="临时申请额度">
+                <el-input
+                  v-model="currentScore.tempApplyCreditLimit"
+                  maxlength="18"
+                  @input="value => handleScoreDecimalInput('tempApplyCreditLimit', value)"
+                >
+                  <template #suffix>万元</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="!isOfflineScore" :span="6">
+              <el-form-item label="临时申请额度有效期起">
+                <el-date-picker
+                  v-model="currentScore.tempCreditStartDate"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="!isOfflineScore" :span="6">
+              <el-form-item label="临时申请额度有效期止">
+                <el-date-picker
+                  v-model="currentScore.tempCreditEndDate"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                />
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="备注">
                 <el-input v-model="currentScore.remark" maxlength="200" :rows="2" type="textarea" />
@@ -1395,7 +1483,7 @@
         </el-form>
 
         <el-table
-          v-if="currentScore.quantificationId"
+          v-if="!isOfflineScore && currentScore.quantificationId"
           ref="scoreCategoryTable"
           :data="scoreCategoryRows"
           border
@@ -1617,6 +1705,8 @@ import {
   changeStatus,
   remove,
   getScoreTemplate,
+  downloadScoreExcelTemplate,
+  importScoreExcel,
   recognizeBusinessLicenseOcr,
   queryKingdeeBank,
   queryKingdeeBankByNumber,
@@ -1637,6 +1727,12 @@ import { getDeptTree } from '@/api/system/dept';
 import { getLazyTree } from '@/api/base/region';
 import { exportBlob } from '@/api/common';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
+import {
+  isExcelResponse,
+  isBusinessJson,
+  parseBlobJson,
+  resolveImportErrorMessage,
+} from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { getUploadHeaders } from '@/utils/upload';
 import { normalizeSearchRangeParams } from '@/utils/search-range';
@@ -1723,9 +1819,10 @@ export default {
     };
     return {
       form: {},
-      query: {},
+      query: { expireStatus: 'all' },
       deptSearchInitialized: false,
       loading: true,
+      scoreImporting: false,
       data: [],
       archiveNameRisky: false,
       archiveNameRiskTip: '',
@@ -2069,6 +2166,12 @@ export default {
             slot: true,
             minWidth: 140,
           },
+          {
+            label: '下次评定日期',
+            prop: 'nextEvaluateDate',
+            slot: true,
+            minWidth: 130,
+          },
           {
             label: '资金使用情况',
             prop: 'fundUseRate',
@@ -2388,7 +2491,7 @@ export default {
         const details = this.getScoreCategoryDetails(category.categoryCode);
         let selfScore = details.reduce((sum, item) => sum + Number(item.selfScore || 0), 0);
         let reviewScore = details.reduce((sum, item) => sum + Number(item.reviewScore || 0), 0);
-        // 暂定：加分/减分合计最高按 15 分计
+        // 暂定：加分/减分合计最高按 15 分计（分类汇总展示封顶后值）
         if (category.categoryCode === 'plus') {
           selfScore = Math.min(selfScore, HARDCODED_MAX_PLUS_SCORE);
           reviewScore = Math.min(reviewScore, HARDCODED_MAX_PLUS_SCORE);
@@ -2406,6 +2509,16 @@ export default {
       });
       return rows;
     },
+    isOfflineScore() {
+      return String(this.currentScore?.evaluateMode || 'online') === 'offline';
+    },
+    expiryTagOptions() {
+      return [
+        { label: '全部', value: 'all' },
+        { label: '30天内到期', value: 'soon' },
+        { label: '已过期', value: 'expired' },
+      ];
+    },
   },
   watch: {
     $route(to, from) {
@@ -2544,7 +2657,9 @@ export default {
         const res = await querySupplierCode(code);
         // 防止响应返回时用户已修改代码
         if (String(this.archiveForm.unifiedCreditCode || '').trim().toUpperCase() !== code) return;
-        this.archiveForm.supplierCode = res?.data?.data || '';
+        // 后端查不到时 data 为 {}（R 对 null 的空承载兜底），非字符串一律按空处理，避免显示 [object Object]
+        const supplierCode = res?.data?.data;
+        this.archiveForm.supplierCode = typeof supplierCode === 'string' ? supplierCode : '';
       } catch (error) {
         // 忽略查询异常，编码留空
       }
@@ -3516,13 +3631,22 @@ export default {
       return Number.isFinite(rate) ? `${rate.toFixed(2)}%` : '-';
     },
     isBusinessLicenseExpiringSoon(row = {}) {
-      if (row.businessTermType === '长期' || !row.businessEndDate) return false;
-      const endDate = this.$dayjs(row.businessEndDate);
+      return this.isDateExpiringSoon(row.businessEndDate, row.businessTermType === '长期');
+    },
+    /** 日期是否在 30 天内到期（含当天）；skip=true 时不提示（如营业执照长期） */
+    isDateExpiringSoon(dateValue, skip = false) {
+      if (skip || !dateValue) return false;
+      const endDate = this.$dayjs(dateValue);
       if (!endDate.isValid()) return false;
       const today = this.$dayjs().startOf('day');
       const expireSoonDate = today.add(30, 'day');
       return !endDate.isAfter(expireSoonDate, 'day');
     },
+    handleExpireChange(expireStatus) {
+      this.query.expireStatus = expireStatus || 'all';
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+    },
     handleBusinessEndDateChange(value) {
       if (value) {
         this.archiveForm.businessTermType = '固定期限';
@@ -4406,7 +4530,9 @@ export default {
     normalizeScore(score) {
       return {
         quantificationId: '',
+        evaluateMode: 'online',
         scoreDate: this.$dayjs().format('YYYY-MM-DD'),
+        nextEvaluateDate: '',
         applyCreditLimit: this.archiveForm.applyCreditLimit || '',
         maxCreditLimit: '',
         maxMinusScore: HARDCODED_MAX_MINUS_SCORE,
@@ -4424,6 +4550,8 @@ export default {
         details: [],
         ...score,
         quantificationId: score.quantificationId ? String(score.quantificationId) : '',
+        evaluateMode: score.evaluateMode === 'offline' ? 'offline' : 'online',
+        nextEvaluateDate: score.nextEvaluateDate || '',
         applyCreditLimit: this.normalizeOptionalAmount(
           score.applyCreditLimit === undefined
             ? this.archiveForm.applyCreditLimit
@@ -4586,19 +4714,38 @@ export default {
       this.invoiceForm = this.emptyInvoice();
       this.$refs.archiveForm?.clearValidate();
     },
-    // 客商材料不做提交校验，仅在页面上提示未上传项。提交审批前必须完成自评，且评分记录只能有一条。
+    // 仅客商分类含「客户」时强制评分；纯承运商不强制。评分记录至多一条。
     validateScoreForApproval(archive) {
       const scores = archive.scores || [];
       if (scores.length > 1) {
         this.$message.warning('评分记录只能有一条');
         return false;
       }
+      if (!this.requiresCustomerScore(archive.customerType)) {
+        return true;
+      }
       if (scores.length !== 1 || scores[0].selfStatus !== '已完成') {
-        this.$message.warning('提交审批前必须完成自评');
+        this.$message.warning('客户提交审批前必须完成评分自评');
+        return false;
+      }
+      if (!scores[0].nextEvaluateDate) {
+        this.$message.warning('请填写下次评定日期');
         return false;
       }
       return true;
     },
+    /** 客商分类是否包含客户（字典值「客户」或历史值 customer） */
+    requiresCustomerScore(customerType) {
+      const values = Array.isArray(customerType)
+        ? customerType
+        : String(customerType || '')
+            .replace(/，/g, ',')
+            .split(',');
+      return values
+        .map(item => String(item || '').trim())
+        .filter(Boolean)
+        .some(item => item === '客户' || item.toLowerCase() === 'customer');
+    },
     normalizeArchive() {
       // 提交前再次固定所属组织，防止被绕过
       this.applyFixedOwnerDept();
@@ -4889,7 +5036,9 @@ export default {
         const template = this.normalizeScore({
           ...scoreTemplate,
           quantificationId,
+          evaluateMode: this.currentScore.evaluateMode || 'online',
           scoreDate: this.currentScore.scoreDate,
+          nextEvaluateDate: this.currentScore.nextEvaluateDate,
           applyCreditLimit: this.currentScore.applyCreditLimit,
           maxCreditLimit: '',
           creditLevel: '',
@@ -5143,7 +5292,8 @@ export default {
         .replace(/^\./, '')
         .replace(/(\..*)\./g, '$1')
         .replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2');
-      if (prop === 'reviewScore' && normalized !== '') {
+      // 减分项复评得分存正数扣分，允许填 0（不扣分）；不做项目满分截断
+      if (prop === 'reviewScore' && normalized !== '' && !this.isMinusScoreDetail(detail)) {
         const maxScore = this.getScoreItemFullScore(detail);
         if (Number(normalized) > maxScore) {
           detail[prop] = String(maxScore);
@@ -5204,7 +5354,12 @@ export default {
       const optionScores = this.parseScoreOptions(detail.optionsJson)
         .map(item => Number(item.score))
         .filter(score => Number.isFinite(score));
-      return optionScores.length ? Math.max(...optionScores) : 0;
+      if (!optionScores.length) return 0;
+      // 减分项选项分常为负（如 -5），项目满分按绝对值取最大可扣分；避免 0 分被误判为高于“最高得分-5”
+      if (this.isMinusScoreDetail(detail)) {
+        return Math.max(...optionScores.map(score => Math.abs(score)));
+      }
+      return Math.max(...optionScores);
     },
     getScoreFullMark(details = []) {
       return details.reduce((sum, item) => {
@@ -5222,6 +5377,7 @@ export default {
       });
     },
     matchCreditStandard(score, scoreRate) {
+      // 闭开区间：≥lower 且 <upper；最高档 upper=100 时包含 100（≥90 A；80≤x<90 B；…；x<50 F）
       const standards = (score.standards || [])
         .filter(item => item && item.creditLevel)
         .sort((a, b) => Number(b.scoreRateLower || 0) - Number(a.scoreRateLower || 0));
@@ -5229,7 +5385,10 @@ export default {
         const lower = Number(standard.scoreRateLower);
         const upper = Number(standard.scoreRateUpper);
         if (!Number.isFinite(lower) || !Number.isFinite(upper)) return false;
-        return scoreRate >= lower && scoreRate <= upper;
+        if (upper >= 100) {
+          return scoreRate >= lower && scoreRate <= upper;
+        }
+        return scoreRate >= lower && scoreRate < upper;
       });
     },
     calculateCreditLimitByStandard(standard, scoreRate) {
@@ -5265,25 +5424,32 @@ export default {
       const rawPlusReview = sumScore(plusDetails, 'reviewScore');
       const rawMinusSelf = sumScore(minusDetails, 'selfScore');
       const rawMinusReview = sumScore(minusDetails, 'reviewScore');
-      // 暂定：加分/减分合计最高按 15 分计
+      // 暂定：加分/减分合计最高按 15 分计（未超按实际，超 15 按 15/-15）
       const plusSelf = Math.min(rawPlusSelf, HARDCODED_MAX_PLUS_SCORE);
       const plusReview = Math.min(rawPlusReview, HARDCODED_MAX_PLUS_SCORE);
       const minusSelf = Math.min(rawMinusSelf, HARDCODED_MAX_MINUS_SCORE);
       const minusReview = Math.min(rawMinusReview, HARDCODED_MAX_MINUS_SCORE);
-      const selfScore = sumScore(basicDetails, 'selfScore') + plusSelf - minusSelf;
+      const computedSelfScore = sumScore(basicDetails, 'selfScore') + plusSelf - minusSelf;
       const reviewScore = sumScore(basicDetails, 'reviewScore') + plusReview - minusReview;
       const hasReviewScore = details.some(
         item => !this.isBlankScore(item.reviewScore)
       );
+      // 线下模式允许手工改自评得分：有手工值时优先采用，否则回退明细合计
+      const isOffline = String(score.evaluateMode || '') === 'offline';
+      const manualSelfScore = Number(score.selfScore);
+      const selfScore =
+        isOffline && Number.isFinite(manualSelfScore) && String(score.selfScore ?? '').trim() !== ''
+          ? manualSelfScore
+          : computedSelfScore;
       const finalScore = hasReviewScore ? reviewScore : selfScore;
       const fullMark = this.getScoreFullMark(details);
       const scoreRate =
         fullMark > 0 ? Math.max(0, Math.min(100, (finalScore / fullMark) * 100)) : 0;
       const standard = this.matchCreditStandard(score, scoreRate);
       const hasStandards = (score.standards || []).some(item => item && item.creditLevel);
-      score.selfScore = Number(selfScore.toFixed(2));
+      score.selfScore = Number(Number(selfScore).toFixed(2));
       score.reviewScore = Number(reviewScore.toFixed(2));
-      score.finalScore = Number(finalScore.toFixed(2));
+      score.finalScore = Number(Number(finalScore).toFixed(2));
       score.scoreRate = Number(scoreRate.toFixed(2));
       if (hasStandards) {
         score.creditLevel = standard?.creditLevel || '';
@@ -5411,6 +5577,10 @@ export default {
         this.$message.warning('请选择评定日期');
         return false;
       }
+      if (!this.currentScore.nextEvaluateDate) {
+        this.$message.warning('请选择下次评定日期');
+        return false;
+      }
       if (!this.currentScore.applyCreditLimit) {
         this.$message.warning('请输入拟申请总资金使用额度');
         return false;
@@ -5424,7 +5594,11 @@ export default {
         return false;
       }
       if (!this.currentScore.details || !this.currentScore.details.length) {
-        this.$message.warning('当前评分量化表未配置评分项目');
+        this.$message.warning(
+          this.isOfflineScore
+            ? '请先上传评分表 Excel 解析回填明细'
+            : '当前评分量化表未配置评分项目'
+        );
         return false;
       }
       const invalidScoreInput = this.currentScore.details.find(item => {
@@ -5438,7 +5612,9 @@ export default {
         );
         return false;
       }
+      // 减分项允许填 0（不扣分），且按阶梯累计扣分不做项目满分截断
       const overMaxReviewScore = this.currentScore.details.find(item => {
+        if (this.isMinusScoreDetail(item)) return false;
         if (
           item.reviewScore === undefined ||
           item.reviewScore === null ||
@@ -5633,13 +5809,15 @@ export default {
         });
     },
     searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
+      this.query = { expireStatus: this.query.expireStatus || 'all' };
+      this.onLoad(this.page, this.query);
     },
     searchChange(params, done) {
       // Avue 只回传非空筛选项，被清空的字段不会出现在 params 里，
       // 因此查询条件必须整体重建，不能与上一次的 this.query 合并，否则清空后仍会带上次的值
+      const expireStatus = this.query.expireStatus || 'all';
       this.query = this.buildQuery(params, true);
+      this.query.expireStatus = expireStatus;
       this.page.currentPage = 1;
       this.onLoad(this.page, this.query);
       done();
@@ -5778,8 +5956,145 @@ export default {
       if (status === 0 || status === '0' || status === -1 || status === '-1') {
         delete values.status;
       }
+      if (!values.expireStatus) {
+        values.expireStatus = this.query.expireStatus || 'all';
+      }
+      if (values.expireStatus === 'all') {
+        delete values.expireStatus;
+      }
       return values;
     },
+    handleEvaluateModeChange(mode) {
+      this.currentScore.evaluateMode = mode === 'offline' ? 'offline' : 'online';
+      if (this.isOfflineScore) {
+        this.expandedScoreCategoryKeys = [];
+      }
+    },
+    handleOfflineSelfScoreInput(value) {
+      const normalized = String(value || '')
+        .replace(/[^\d.-]/g, '')
+        .replace(/(?!^)-/g, '')
+        .replace(/^\./, '')
+        .replace(/(\..*)\./g, '$1')
+        .replace(/^(-?\d+)(\.\d{0,2})?.*$/, '$1$2');
+      this.currentScore.selfScore = normalized;
+    },
+    recalculateOfflineScore() {
+      if (!this.isOfflineScore) return;
+      const selfScore = Number(this.currentScore.selfScore);
+      if (!Number.isFinite(selfScore)) return;
+      this.currentScore.selfScore = Number(selfScore.toFixed(2));
+      const hasReviewScore = (this.currentScore.details || []).some(
+        item => !this.isBlankScore(item.reviewScore)
+      );
+      if (!hasReviewScore) {
+        this.currentScore.finalScore = this.currentScore.selfScore;
+      }
+      const fullMark = this.getScoreFullMark(this.currentScore.details || []);
+      const scoreRate =
+        fullMark > 0
+          ? Math.max(0, Math.min(100, (Number(this.currentScore.finalScore) / fullMark) * 100))
+          : 0;
+      this.currentScore.scoreRate = Number(scoreRate.toFixed(2));
+      const standard = this.matchCreditStandard(this.currentScore, scoreRate);
+      const hasStandards = (this.currentScore.standards || []).some(item => item && item.creditLevel);
+      if (hasStandards) {
+        this.currentScore.creditLevel = standard?.creditLevel || '';
+        this.currentScore.maxCreditLimit = standard
+          ? this.calculateCreditLimitByStandard(standard, scoreRate)
+          : '';
+      }
+    },
+    downloadScoreTemplate() {
+      if (!this.currentScore.quantificationId) {
+        this.$message.warning('请先选择评分量化表');
+        return;
+      }
+      NProgress.start();
+      const loading = ElLoading.service({
+        lock: true,
+        text: '模板下载中',
+        background: 'rgba(255, 255, 255, 0.7)',
+      });
+      downloadScoreExcelTemplate(this.currentScore.quantificationId)
+        .then(res => {
+          downloadXls(
+            res.data,
+            `客商评分明细模板${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`
+          );
+        })
+        .finally(() => {
+          loading.close();
+          NProgress.done();
+        });
+    },
+    async uploadScoreExcel(option) {
+      const file = option?.file;
+      if (!file) return;
+      if (!this.currentScore.quantificationId) {
+        this.$message.warning('请先选择评分量化表');
+        return;
+      }
+      const fileName = String(file.name || '').toLowerCase();
+      if (!/\.(xls|xlsx)$/.test(fileName)) {
+        this.$message.error('请上传 .xls,.xlsx 标准格式文件');
+        return;
+      }
+      this.scoreImporting = true;
+      NProgress.start();
+      const loading = ElLoading.service({
+        lock: true,
+        text: '导入中',
+        background: 'rgba(255, 255, 255, 0.7)',
+      });
+      try {
+        const res = await importScoreExcel(this.currentScore.quantificationId, file);
+        if (isExcelResponse(res)) {
+          downloadXls(
+            res.data,
+            `客商评分导入失败明细${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`
+          );
+          this.$message.warning('部分数据导入失败，已下载失败明细');
+          return;
+        }
+        const result = isBusinessJson(res?.data) ? res.data : await parseBlobJson(res?.data);
+        if (Number(result?.code) !== 200) {
+          this.$message.error(result?.msg || '导入失败');
+          return;
+        }
+        const imported = result?.data || {};
+        const keepFields = {
+          evaluateMode: 'offline',
+          scoreDate: this.currentScore.scoreDate,
+          nextEvaluateDate: this.currentScore.nextEvaluateDate,
+          applyCreditLimit: this.currentScore.applyCreditLimit,
+          tempApplyCreditLimit: this.currentScore.tempApplyCreditLimit,
+          tempCreditStartDate: this.currentScore.tempCreditStartDate,
+          tempCreditEndDate: this.currentScore.tempCreditEndDate,
+          remark: this.currentScore.remark,
+          attachments: this.scoreAttachmentFiles,
+          quantificationId: this.currentScore.quantificationId,
+        };
+        this.currentScore = this.normalizeScore({
+          ...imported,
+          ...keepFields,
+          standards: imported.standards || this.currentScore.standards || [],
+          details: (imported.details || []).map(detail => ({
+            ...detail,
+            scoreInput: this.normalizeScoreInputValue(detail.scoreInput),
+          })),
+        });
+        this.calculateScore(this.currentScore);
+        this.$message.success('评分表解析成功，请在证明材料中上传评分表原件');
+      } catch (error) {
+        const message = await resolveImportErrorMessage(error);
+        this.$message.error(message);
+      } finally {
+        this.scoreImporting = false;
+        loading.close();
+        NProgress.done();
+      }
+    },
   },
 };
 </script>
@@ -5814,6 +6129,23 @@ export default {
   color: var(--el-color-danger);
 }
 
+.customer-archive-page__expiry-tabs {
+  margin-bottom: 8px;
+}
+
+.score-offline-tip {
+  margin-left: 12px;
+  color: #909399;
+  font-size: 12px;
+}
+
+.score-offline-actions {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+}
+
 // 风险客商悬浮提示：popper 挂在 body 下，需用 :global 约束宽度
 :global(.customer-risk-popper) {
   max-width: 360px;