Merge remote-tracking branch 'origin/master' into feature/20261019-bfi-all-web

# Conflicts:
#	src/views/settlement/formal-settlement.vue

src/views/payment/bill-payment.vue

@@ -156,9 +156,17 @@ export default {
         });
     },
     async handleApprove(row) {
-      await api.approve({ id: row.id });
-      this.$message.success('审批通过');
-      this.loadTable();
+      await this.$confirm('确认审批通过该汇票付款？', '提示', { type: 'warning' });
+      // 防止重复点击：请求期间表格遮罩，后续点击直接忽略
+      if (this.loading) return;
+      this.loading = true;
+      try {
+        await api.approve({ id: row.id });
+        this.$message.success('审批通过');
+        await this.loadTable();
+      } finally {
+        this.loading = false;
+      }
     },
     async handleReturn(row) {
       const { value } = await this.$prompt('请输入驳回原因', '审批驳回');

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

@@ -323,17 +323,8 @@
           <el-table-column label="可开票金额" min-width="140" align="right">
             <template #default="{ row }">{{ formatMoney(row.availableInvoiceAmount) }}</template>
           </el-table-column>
-          <el-table-column label="分摊发票金额" min-width="160">
-            <template #default="{ row }">
-              <el-input-number
-                v-model="row.allocatedInvoiceAmount"
-                :disabled="readonly"
-                :min="0"
-                :max="Number(row.availableInvoiceAmount || 0)"
-                :precision="2"
-                :controls="false"
-              />
-            </template>
+          <el-table-column label="分摊发票金额" min-width="140" align="right">
+            <template #default="{ row }">{{ formatMoney(row.allocatedInvoiceAmount) }}</template>
           </el-table-column>
         </el-table>
       </section-card>
@@ -454,6 +445,9 @@
         <el-table-column label="结算金额" min-width="130" align="right">
           <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
         </el-table-column>
+        <el-table-column label="已申请开票金额" min-width="140" align="right">
+          <template #default="{ row }">{{ formatMoney(row.invoicedAmount) }}</template>
+        </el-table-column>
         <el-table-column label="可开票金额" min-width="140" align="right">
           <template #default="{ row }">{{ formatMoney(row.availableInvoiceAmount) }}</template>
         </el-table-column>
@@ -861,7 +855,6 @@ export default {
               keyword: this.settlementDialog.keyword,
               contractCategory: '客户合同',
               settlementType: 'receivable',
-              invoiceStatus: 'unreceived',
             }
           )
         );
@@ -913,7 +906,7 @@ export default {
         ...item,
         formalSettlementId: item.id,
         settlementId: item.id,
-        allocatedInvoiceAmount: rows.length === 1 ? Number(item.availableInvoiceAmount || 0) : 0,
+        allocatedInvoiceAmount: 0,
       }));
       this.form.projectName = first.projectName;
       this.form.deptName = first.deptName;

src/views/payment/invoice-application.vue

@@ -409,14 +409,21 @@ export default {
     },
     async handleApprove(row) {
       await this.$confirm('确认审批通过该开票申请？', '提示', { type: 'warning' });
-      const res = await api.approve({ id: row.id });
-      // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
-      if (res.data.data === false) {
-        this.$message.warning(res.data.msg);
-      } else {
-        this.$message.success(res.data.msg || '审批通过');
+      // 防止重复点击：请求期间表格遮罩，后续点击直接忽略
+      if (this.loading) return;
+      this.loading = true;
+      try {
+        const res = await api.approve({ id: row.id });
+        // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
+        if (res.data.data === false) {
+          this.$message.warning(res.data.msg);
+        } else {
+          this.$message.success(res.data.msg || '审批通过');
+        }
+        await this.loadTable();
+      } finally {
+        this.loading = false;
       }
-      this.loadTable();
     },
     async handleReturn(row) {
       const { value } = await this.$prompt('请输入驳回原因', '审批驳回');

src/views/payment/invoice-receipt.vue

@@ -366,14 +366,21 @@ export default {
     },
     async handleApprove(row) {
       await this.$confirm('确认审批通过该收票登记？', '提示', { type: 'warning' });
-      const res = await api.approve({ id: row.id });
-      // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
-      if (res.data.data === false) {
-        this.$message.warning(res.data.msg);
-      } else {
-        this.$message.success(res.data.msg || '审批通过');
+      // 防止重复点击：请求期间表格遮罩，后续点击直接忽略
+      if (this.loading) return;
+      this.loading = true;
+      try {
+        const res = await api.approve({ id: row.id });
+        // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
+        if (res.data.data === false) {
+          this.$message.warning(res.data.msg);
+        } else {
+          this.$message.success(res.data.msg || '审批通过');
+        }
+        await this.loadTable();
+      } finally {
+        this.loading = false;
       }
-      this.loadTable();
     },
     async handleReturn(row) {
       const { value } = await this.$prompt('请输入驳回原因', '审批驳回');

src/views/payment/payment-application.vue

@@ -163,7 +163,6 @@ export default {
       rows: [],
       selection: [],
       loading: false,
-      approveLoading: false,
       syncLoading: false,
       resultSyncing: false,
       query: {},
@@ -328,9 +327,9 @@ export default {
       this.refreshChange();
     },
     async handleApprove(row) {
-      // 防止重复点击：请求进行中忽略后续点击
-      if (this.approveLoading) return;
-      this.approveLoading = true;
+      // 防止重复点击：请求期间表格遮罩，后续点击直接忽略
+      if (this.loading) return;
+      this.loading = true;
       try {
         const res = await api.approve({ id: row.id });
         // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
@@ -339,9 +338,9 @@ export default {
         } else {
           this.$message.success(res.data.msg || '审批通过');
         }
-        this.refreshChange();
+        await this.onLoad(this.page);
       } finally {
-        this.approveLoading = false;
+        this.loading = false;
       }
     },
     handleMkAudit(row) {

src/views/settlement/formal-settlement.vue

@@ -376,12 +376,20 @@ export default {
         '提示',
         { type: 'warning' }
       );
-      const res = await api.approve({ id: row.id });
-      // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
-      if (res.data.data === false) {
-        this.$message.warning(res.data.msg);
-      } else {
-        this.$message.success(res.data.msg || '审批通过');
+      // 防止重复点击：请求期间表格遮罩，后续点击直接忽略
+      if (this.loading) return;
+      this.loading = true;
+      try {
+        const res = await api.approve({ id: row.id });
+        // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
+        if (res.data.data === false) {
+          this.$message.warning(res.data.msg);
+        } else {
+          this.$message.success(res.data.msg || '审批通过');
+        }
+        await this.loadTable();
+      } finally {
+        this.loading = false;
       }
       this.onLoad(this.page);
     },

src/views/settlement/pre-settlement.vue

@@ -692,9 +692,16 @@ export default {
     },
     async handleApprove(row) {
       await this.$confirm('确认审批通过该预付结算单？', '提示', { type: 'warning' });
-      await approve({ id: row.id });
-      this.$message.success('审批通过');
-      this.loadTable();
+      // 防止重复点击：请求期间表格遮罩，后续点击直接忽略
+      if (this.loading) return;
+      this.loading = true;
+      try {
+        await approve({ id: row.id });
+        this.$message.success('审批通过');
+        await this.loadTable();
+      } finally {
+        this.loading = false;
+      }
     },
     async handleReturn(row) {
       const { value } = await this.$prompt('请输入驳回原因', '审批驳回', {

src/views/settlement/settlement-adjustment.vue

@@ -317,11 +317,18 @@ export default {
     },
     async handleApprove(row) {
       await this.$confirm('审批通过后将更新关联正式结算单，确认继续？', '提示');
-      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();
+      // 防止重复点击：请求期间表格遮罩，后续点击直接忽略
+      if (this.loading) return;
+      this.loading = true;
+      try {
+        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 || '审批通过');
+        await this.loadTable();
+      } finally {
+        this.loading = false;
+      }
     },
     async handleReturn(row) {
       const { value } = await this.$prompt('请输入驳回原因', '驳回', {

src/views/vehicle/customer-archive.vue

@@ -2416,6 +2416,7 @@ export default {
     resetKingdeeBackfill() {
       const form = this.archiveForm;
       form.kingdeeStatus = 'none';
+      form.customerCode = '';
       form.fullName = '';
       form.legalPerson = '';
       form.registeredCapital = '';
@@ -2469,6 +2470,8 @@ export default {
     applyKingdeeCustomer(customer) {
       const form = this.archiveForm;
       form.kingdeeStatus = 'exist';
+      // 客商编号回显金蝶客商编码，与后端同步金蝶时的采纳口径保持一致
+      if (customer.number) form.customerCode = customer.number;
       // 工商信息以金蝶为准，直接覆盖（后续字段锁定）
       if (customer.name) form.fullName = customer.name;
       if (customer.artificialperson) form.legalPerson = customer.artificialperson;