fix: 修复带detailNo跳转正式结算单时缓存实例重复弹出查看弹框

src/api/settlement/settlementAdjustment.js

@@ -17,6 +17,10 @@ export const approve = id => request({ url: `${baseUrl}/approve`, method: 'post'
 export const returnBill = (id, reason) =>
   request({ url: `${baseUrl}/return`, method: 'post', data: { id, reason } });
 export const repush = id => request({ url: `${baseUrl}/repush`, method: 'post', params: { id } });
+export const syncKingdee = id =>
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
+export const kingdeeWriteOffPrecheck = formalSettlementId =>
+  request({ url: `${baseUrl}/kingdee-writeoff-precheck`, method: 'get', params: { formalSettlementId } });
 
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },

src/option/settlement/formalSettlementTable.js

@@ -19,6 +19,8 @@ export const formalSettlementTableColumns = [
   { label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
   { label: '当前节点', prop: 'currentNode', minWidth: 130 },
   { label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
+  { label: '调整标识', prop: 'adjustFlag', minWidth: 110 },
+  { label: '来源原单号', prop: 'originFormalSettlementNo', minWidth: 170 },
   { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
   { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
   { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 },

src/option/settlement/settlementAdjustmentTable.js

@@ -1,6 +1,6 @@
 export const settlementAdjustmentTableColumns = [
   { label: '单据号', prop: 'adjustmentNo', minWidth: 160, link: true, fixed: 'left' },
-  { label: '结算单号', prop: 'formalSettlementNo', minWidth: 160 },
+  { label: '结算单号', prop: 'formalSettlementNo', minWidth: 160, link: true },
   { label: '结算单类型', prop: 'settlementTypeName', minWidth: 110 },
   { label: '项目名称', prop: 'projectName', minWidth: 140 },
   { label: '所属组织', prop: 'deptName', minWidth: 140 },
@@ -9,6 +9,8 @@ export const settlementAdjustmentTableColumns = [
   { label: '合同名称', prop: 'contractName', minWidth: 170 },
   { label: '调整金额', prop: 'adjustmentAmount', minWidth: 130, money: true },
   { label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
+  { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 130, kingdee: true },
+  { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
   { label: '当前节点', prop: 'currentNode', minWidth: 120 },
   { label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
   { label: '创建人', prop: 'createUserName', minWidth: 110 },

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

@@ -639,6 +639,22 @@
           <el-table-column prop="createTime" label="创建时间" min-width="170" align="center">
             <template #default="{ row }">{{ displayValue(row.createTime) }}</template>
           </el-table-column>
+          <el-table-column
+            v-if="hasPermission('settlement_adjustment_repush')"
+            label="操作"
+            width="120"
+            align="center"
+          >
+            <template #default="{ row }">
+              <el-link
+                v-if="row.approvalStatus === 'approved' && row.kingdeeSyncStatus === 'synced'"
+                type="danger"
+                @click="handleAdjustmentRepush(row)"
+                >重新推送</el-link
+              >
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
         </el-table>
       </section-card>
 
@@ -1048,6 +1064,7 @@ import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/m
 import ProjectAdvanceWriteOff from './project-advance-write-off.vue';
 import * as XLSX from 'xlsx';
 import { isAdministrator } from '@/utils/auth';
+import * as settlementAdjustmentApi from '@/api/settlement/settlementAdjustment';
 
 // 结算币种为本位币（人民币）时汇率恒为1，汇率日期、结算汇率与按汇率换算的本位币合计都不展示
 const LOCAL_CURRENCY_HIDDEN_FIELDS = ['exchangeRateDate', 'exchangeRate', 'localSettlementAmount'];
@@ -1316,6 +1333,17 @@ export default {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission?.[code], false);
     },
+    async handleAdjustmentRepush(row) {
+      await this.$confirm(
+        '请确认金蝶旧应付/应收单已由财务手工冲销，继续将生成全新财务应付/应收单。',
+        '高危操作确认',
+        { type: 'warning', confirmButtonText: '确认重新推送' }
+      );
+      const res = await settlementAdjustmentApi.repush(row.id);
+      this.$message.success(`已生成新金蝶单据：${res.data?.data || res.data || '-'}`);
+      await this.loadFormalDetail(this.recordId);
+      this.$emit('success');
+    },
     async loadFormalDetail(id) {
       const response = this.publicMode
         ? await getMkPublicDetail('formal-settlement', id)

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

@@ -92,6 +92,7 @@
           <span v-else-if="column.prop === 'kingdeeSyncStatus'">{{
             kingdeeSyncName(row.kingdeeSyncStatus)
           }}</span>
+          <span v-else-if="column.prop === 'adjustFlag'">{{ adjustFlag(row) }}</span>
           <template v-else-if="column.prop === 'kingdeeLockStatus'">
             <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
               <el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
@@ -275,6 +276,12 @@ export default {
     kingdeeSyncName(value) {
       return kingdeeSyncStatusOptions.find(item => item.value === value)?.label || value || '-';
     },
+    adjustFlag(row) {
+      // 原单已调整 / 重推生成的新单（显示来源原单号）
+      if (row.adjustStatusName) return row.adjustStatusName;
+      if (row.originFormalSettlementNo) return '调整后单';
+      return '-';
+    },
     lockTag(row) {
       if (row.kingdeeLockStatus === 'locked') {
         return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };

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

@@ -414,6 +414,8 @@ export default {
       });
       this.details = [];
       this.recalculate();
+      // 金蝶冲销预检：软提示，不阻断建单（金蝶不可用时静默降级）
+      this.precheckWriteOff(formalSettlementId);
       this.loading = true;
       try {
         const { data } = await api.getFormalDetails(formalSettlementId);
@@ -431,6 +433,19 @@ export default {
         this.loading = false;
       }
     },
+    async precheckWriteOff(formalSettlementId) {
+      try {
+        const { data } = await api.kingdeeWriteOffPrecheck(formalSettlementId);
+        if (String(this.form.formalSettlementId) !== String(formalSettlementId)) return;
+        const result = data?.data || data || {};
+        if (!result.message) return;
+        if (result.syncStatus === 'synced' && result.writtenOff === false)
+          this.$message.warning(result.message);
+        else this.$message.info(result.message);
+      } catch (error) {
+        // 预检软提示：金蝶查询失败静默降级，不阻断建单
+      }
+    },
     addFeeRow() {
       this.details.push({
         formalSettlementDetailId: null,

src/views/settlement/formal-settlement.vue

@@ -253,6 +253,10 @@ export default {
       if (detailNo) this.openRouteDetail(detailNo);
     },
   },
+  created() {
+    // 标签机制按 fullPath 缓存同页多实例：仅当前路由实例应响应 detailNo 跳转，防止缓存旧实例也弹窗
+    this.ownFullPath = this.$route.fullPath;
+  },
   mounted() {
     this.loadOrganizationOptions();
     this.loadTable();
@@ -342,7 +346,7 @@ export default {
     },
     async openRouteDetail(detailNo = this.$route.query.detailNo) {
       const formalSettlementNo = String(detailNo || '').trim();
-      if (!formalSettlementNo) return;
+      if (!formalSettlementNo || this.ownFullPath !== this.$route.fullPath) return;
       const response = await api.getList(1, 10, { formalSettlementNo });
       const data = this.unwrapData(response);
       const row = (data.records || []).find(item => item.formalSettlementNo === formalSettlementNo);

src/views/settlement/settlement-adjustment.vue

@@ -88,16 +88,21 @@
             ><el-link
               v-if="column.link && row[column.prop]"
               type="primary"
-              @click="openView(row)"
+              @click="handleTableLink(row, column)"
               >{{ row[column.prop] }}</el-link
             ><el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">{{
               row[column.prop] || '-'
             }}</el-tag
+            ><el-tag
+              v-else-if="column.kingdee"
+              :type="kingdeeStatusType(row.kingdeeSyncStatus)"
+              class="status-text"
+              >{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</el-tag
             ><span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span
             ><span v-else>{{ displayValue(row[column.prop]) }}</span></template
           ></el-table-column
         >
-        <el-table-column label="操作" width="120" fixed="right" align="center"
+        <el-table-column label="操作" width="320" fixed="right" align="center"
           ><template #default="{ row }"
             ><div class="settlement-adjustment-page__links">
               <el-link
@@ -139,14 +144,10 @@
                 @click="handleReturn(row)"
                 >驳回</el-link
               ><el-link
-                v-if="
-                  hasPermission('settlement_adjustment_repush') &&
-                  row.approvalStatus === 'approved' &&
-                  row.kingdeeSyncStatus === 'synced'
-                "
-                type="danger"
-                @click="handleRepush(row)"
-                >重新推送（高危）</el-link
+                v-if="hasPermission('settlement_adjustment_repush') && row.approvalStatus === 'approved'"
+                :type="row.kingdeeSyncStatus === 'synced' ? 'danger' : 'primary'"
+                @click="handleKingdee(row)"
+                >{{ row.kingdeeSyncStatus === 'synced' ? '重新推送（高危）' : '推送金蝶' }}</el-link
               >
             </div></template
           ></el-table-column
@@ -180,6 +181,7 @@ import * as api from '@/api/settlement/settlementAdjustment';
 import { settlementAdjustmentSearchFields } from '@/option/settlement/settlementAdjustmentSearch';
 import organizationSearch from '@/mixins/organization-search';
 import { settlementAdjustmentTableColumns } from '@/option/settlement/settlementAdjustmentTable';
+import { kingdeeSyncStatusOptions } from '@/option/settlement/formalSettlementSearch';
 import SettlementAdjustmentEditor from './components/settlement-adjustment-editor.vue';
 import SettlementTableTools from './components/settlement-table-tools.vue';
 import { isAdministrator } from '@/utils/auth';
@@ -283,6 +285,21 @@ export default {
     openView(row) {
       this.editor = { visible: true, id: row.id, readonly: true };
     },
+    // 单据号→本单查看弹窗；结算单号→跳正式结算列表页并自动打开该单详情（页面支持 ?detailNo=）
+    handleTableLink(row, column) {
+      if (column.prop === 'formalSettlementNo') {
+        this.openSettlementDetail(row.formalSettlementNo);
+        return;
+      }
+      this.openView(row);
+    },
+    openSettlementDetail(detailNo) {
+      if (!detailNo) {
+        this.$message.info('当前记录未关联结算单详情');
+        return;
+      }
+      this.$router.push({ path: '/settlement/formal-settlement', query: { detailNo } });
+    },
     isEditable(row) {
       return ['draft', 'returned'].includes(row.approvalStatus);
     },
@@ -300,12 +317,10 @@ export default {
     },
     async handleApprove(row) {
       await this.$confirm('审批通过后将更新关联正式结算单，确认继续？', '提示');
-      await api.approve(row.id);
-      if (row.kingdeeSyncStatus === 'synced')
-        this.$message.warning(
-          '调整已生效，本地已更新；原结算单已推送金蝶，请财务先手工冲销旧应付单后再重新推送。'
-        );
-      else this.$message.success('审批通过');
+      const res = await api.approve(row.id);
+      // data=false：自动同步金蝶失败；data=true 且 msg 带已推送场景的手工冲销提示
+      if (res.data.data === true || res.data.data === false) this.$message.warning(res.data.msg);
+      else this.$message.success(res.data.msg || '审批通过');
       this.loadTable();
     },
     async handleReturn(row) {
@@ -317,14 +332,24 @@ export default {
       this.$message.success('已驳回');
       this.loadTable();
     },
+    // 单一入口按状态分流：未同步/失败→推送原结算单；已同步→冲销后重推新单（高危）
+    async handleKingdee(row) {
+      if (row.kingdeeSyncStatus === 'synced') return this.handleRepush(row);
+      return this.handleSyncKingdee(row);
+    },
+    async handleSyncKingdee(row) {
+      const res = await api.syncKingdee(row.id);
+      this.$message.success(`已推送金蝶：${res.data.data || '-'}`);
+      this.loadTable();
+    },
     async handleRepush(row) {
       await this.$confirm(
-        '请确认金蝶旧应付单已由财务手工冲销，继续将生成全新财务应付单。',
+        '请确认金蝶旧应付/应收单已由财务手工冲销，继续将生成全新财务应付/应收单。',
         '高危操作确认',
         { type: 'warning', confirmButtonText: '确认重新推送' }
       );
       const { data } = await api.repush(row.id);
-      this.$message.success(`已生成新金蝶应付单：${data?.data || data || '-'}`);
+      this.$message.success(`已生成新金蝶单据：${data?.data || data || '-'}`);
       this.loadTable();
     },
     statusType(status) {
@@ -333,6 +358,12 @@ export default {
         'info'
       );
     },
+    kingdeeStatusType(status) {
+      return { synced: 'success', failed: 'danger' }[status] || 'info';
+    },
+    kingdeeSyncName(value) {
+      return kingdeeSyncStatusOptions.find(item => item.value === value)?.label || value || '-';
+    },
     displayValue(value) {
       return value === null || value === undefined || value === '' ? '-' : value;
     },

src/views/wel/components/rank-panel.vue

@@ -42,5 +42,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 </style>

src/views/wel/components/section-business.vue

@@ -156,7 +156,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .business-panel {
   margin-bottom: 16px;

src/views/wel/components/section-finance.vue

@@ -60,7 +60,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .finance-panel {
   margin-bottom: 16px;

src/views/wel/components/section-fleet.vue

@@ -67,7 +67,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .fleet-panel {
   margin-bottom: 16px;

src/views/wel/components/section-kpi.vue

@@ -92,7 +92,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .kpi-card {
   background: #ffffff;

src/views/wel/components/section-project.vue

@@ -62,7 +62,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .project-panel {
   margin-bottom: 16px;

src/views/wel/components/section-structure.vue

@@ -102,7 +102,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .structure-cards__item {
   margin-bottom: 16px;

src/views/wel/components/section-summary.vue

@@ -59,7 +59,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .summary-panel {
   margin-bottom: 16px;

src/views/wel/components/section-vehicle.vue

@@ -68,7 +68,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .vehicle-cards__item {
   margin-bottom: 16px;

src/views/wel/components/wel-filters.vue

@@ -41,7 +41,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .wel-filter__range {
   width: 110px;