Merge branch 'master' into feature/20261027-hcs-bif-all-web

# Conflicts:
#	src/views/business/contract-manage.vue

src/views/settlement/settlement-adjustment.vue

@@ -190,6 +190,7 @@ import { kingdeeStatusType } from '@/utils/kingdee';
 import SettlementAdjustmentEditor from './components/settlement-adjustment-editor.vue';
 import SettlementTableTools from './components/settlement-table-tools.vue';
 import { isAdministrator } from '@/utils/auth';
+import { settlementListPath } from '@/utils/settlement-menu';
 
 const emptyQuery = () => ({
   adjustmentNo: '',
@@ -290,20 +291,23 @@ export default {
     openView(row) {
       this.editor = { visible: true, id: row.id, readonly: true };
     },
-    // 单据号→本单查看弹窗；结算单号→跳正式结算列表页并自动打开该单详情（页面支持 ?detailNo=）
+    // 单据号→本单查看弹窗；结算单号→跳付款/收款结算列表页并自动打开该单详情（页面支持 ?detailNo=）
     handleTableLink(row, column) {
       if (column.prop === 'formalSettlementNo') {
-        this.openSettlementDetail(row.formalSettlementNo);
+        this.openSettlementDetail(row.formalSettlementNo, row.settlementType);
         return;
       }
       this.openView(row);
     },
-    openSettlementDetail(detailNo) {
+    openSettlementDetail(detailNo, settlementType) {
       if (!detailNo) {
         this.$message.info('当前记录未关联结算单详情');
         return;
       }
-      this.$router.push({ path: '/settlement/formal-settlement', query: { detailNo } });
+      this.$router.push({
+        path: settlementListPath(settlementType),
+        query: { detailNo },
+      });
     },
     isEditable(row) {
       return ['draft', 'returned'].includes(row.approvalStatus);