fix

src/api/settlement/formalSettlement.js

@@ -36,3 +36,5 @@ export const adjustDetail = data =>
   request({ url: `${baseUrl}/adjust-detail`, method: 'post', data });
 export const applyPayment = data =>
   request({ url: `${baseUrl}/apply-payment`, method: 'post', data });
+export const applyPayments = data =>
+  request({ url: `${baseUrl}/apply-payments`, method: 'post', data });

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

@@ -4,11 +4,7 @@
     v-bind="editorContainerProps"
     @update:model-value="visible = $event"
   >
-    <div
+    <div v-loading="loading" class="formal-editor" :class="{ 'formal-editor--page': pageMode }">
-      v-loading="loading"
-      class="formal-editor"
-      :class="{ 'formal-editor--page': pageMode }"
-    >
       <section-card title="结算基本信息">
         <el-form
           ref="formRef"
@@ -227,6 +223,9 @@
           >
             <template #default="{ row }">
               <span v-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
+              <span v-else-if="column.prop === 'transportQuantity'">
+                {{ formatQuantity(row[column.prop]) }}
+              </span>
               <span v-else-if="column.prop === 'transportType'">
                 {{ transportTypeName(row[column.prop]) }}
               </span>
@@ -417,7 +416,12 @@
           <el-table-column prop="paidAmount" label="已付款金额" min-width="130" align="center">
             <template #default="{ row }">{{ formatMoney(row.paidAmount) }}</template>
           </el-table-column>
-          <el-table-column prop="approvalStatusName" label="单据状态" min-width="120" align="center">
+          <el-table-column
+            prop="approvalStatusName"
+            label="单据状态"
+            min-width="120"
+            align="center"
+          >
             <template #default="{ row }">{{ displayValue(row.approvalStatusName) }}</template>
           </el-table-column>
           <el-table-column prop="kingdeeBillNo" label="金蝶单据号" min-width="150" align="center">
@@ -439,7 +443,12 @@
           <el-table-column prop="adjustmentAmount" label="调整金额" min-width="130" align="center">
             <template #default="{ row }">{{ formatMoney(row.adjustmentAmount) }}</template>
           </el-table-column>
-          <el-table-column prop="approvalStatusName" label="单据状态" min-width="120" align="center">
+          <el-table-column
+            prop="approvalStatusName"
+            label="单据状态"
+            min-width="120"
+            align="center"
+          >
             <template #default="{ row }">{{ displayValue(row.approvalStatusName) }}</template>
           </el-table-column>
           <el-table-column prop="remark" label="备注" min-width="220" align="center">
@@ -627,7 +636,7 @@
             ><el-input-number
               v-model="row.transportQuantity"
               :min="0"
-              :precision="6"
+              :precision="2"
               :controls="false" /></template
         ></el-table-column>
         <el-table-column label="里程（KM）" min-width="130" align="center"
@@ -1458,9 +1467,7 @@ export default {
             remainingAmount = Number((remainingAmount - matchedAmount).toFixed(2));
             return {
               invoiceNo,
-              invoiceDate: this.$dayjs()
+              invoiceDate: this.$dayjs().subtract(index, 'day').format('YYYY-MM-DD'),
-                .subtract(index, 'day')
-                .format('YYYY-MM-DD'),
               invoiceType: index === 1 ? '增值税普通发票' : '增值税专用发票',
               taxRate: [3, 6, 9][index],
               invoiceAmount: invoiceAmounts[index],
@@ -1627,6 +1634,11 @@ export default {
     formatMoney(value) {
       return `${Number(value || 0).toFixed(2)} RMB`;
     },
+    formatQuantity(value) {
+      if (value === undefined || value === null || value === '') return '-';
+      const quantity = Number(value);
+      return Number.isFinite(quantity) ? quantity.toFixed(2) : '-';
+    },
     async loadTransportTypeOptions() {
       const { data } = await getDictionary({ code: 'transport_type' });
       this.transportTypeOptions = data?.data || [];

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

@@ -12,7 +12,7 @@
           v-if="hasPermission('formal_settlement_payment')"
           type="primary"
           plain
-          disabled
+          :disabled="!selection.length"
           @click="$emit('payment')"
           >付款申请</el-button
         >
@@ -20,7 +20,7 @@
           v-if="hasPermission('formal_settlement_sync')"
           type="primary"
           plain
-          disabled
+          :disabled="selection.length !== 1"
           @click="$emit('sync')"
           >同步金蝶</el-button
         >
@@ -46,13 +46,16 @@
       </div>
     </div>
     <el-table
+      ref="tableRef"
       v-loading="loading"
       :data="rows"
       border
       highlight-current-row
       @current-change="handleCurrentChange"
+      @selection-change="handleSelectionChange"
     >
       <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
+      <el-table-column type="selection" width="52" fixed="left" align="center" />
       <el-table-column
         v-for="column in columns"
         :key="column.prop"
@@ -131,17 +134,40 @@ export default {
     page: { type: Object, required: true },
     hasPermission: { type: Function, required: true },
   },
-  emits: ['create', 'payment', 'sync', 'print', 'export', 'refresh', 'page-change', 'action'],
+  emits: [
+    'create',
+    'payment',
+    'sync',
+    'print',
+    'export',
+    'refresh',
+    'page-change',
+    'action',
+    'update:selection',
+  ],
   data() {
     return {
       Refresh,
       selection: [],
     };
   },
+  watch: {
+    rows() {
+      this.selection = [];
+      this.$refs.tableRef?.clearSelection();
+      this.$emit('update:selection', this.selection);
+    },
+  },
   methods: {
     handleCurrentChange(row) {
-      this.selection = row ? [row] : [];
+      if (!row && this.selection.length === 1) {
-      this.$emit('update:selection', this.selection);
+        this.selection = [];
+        this.$emit('update:selection', this.selection);
+      }
+    },
+    handleSelectionChange(selection) {
+      this.selection = selection;
+      this.$emit('update:selection', selection);
     },
     emitAction(type, row) {
       this.$emit('action', { type, row });

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

@@ -505,12 +505,13 @@
       <el-table-column prop="cargoType" label="货物类型" min-width="130" align="center" />
       <el-table-column label="运输总量" min-width="150" align="center">
         <template #default="{ row }">
+          <span v-if="adjustDialog.readonly">{{ formatQuantity(row) }}</span>
           <el-input-number
+            v-else
             v-model="row.transportQuantity"
             :min="0"
-            :precision="6"
+            :precision="2"
             :controls="false"
-            :disabled="adjustDialog.readonly"
           />
         </template>
       </el-table-column>
@@ -570,7 +571,6 @@
         <template #default="{ row }">
           <el-input-number
             v-model="row.settlementAmountTax"
-            :min="0"
             :precision="2"
             :controls="false"
             :disabled="adjustDialog.readonly"
@@ -1111,11 +1111,6 @@ export default {
     },
     recalculateSummaryRow(row) {
       row.settlementAmount = Number(row.originalAmount || 0) + Number(row.adjustAmount || 0);
-      if (row.settlementAmount < 0) {
-        row.adjustAmount = -Number(row.originalAmount || 0);
-        row.settlementAmount = 0;
-        this.$message.warning('结算金额不能小于0');
-      }
     },
     buildSummaryFeesFromDetails() {
       const summaryMap = new Map();
@@ -1176,7 +1171,9 @@ export default {
             0
         );
         const residualAmount = Number((totalAmount - knownAmount).toFixed(2));
-        if (residualAmount > 0) appendSummary('其他费用', residualAmount, row.feeType);
+        if (Math.abs(residualAmount) >= 0.005) {
+          appendSummary('其他费用', residualAmount, row.feeType);
+        }
       });
 
       const manualFees = this.summaryFees.filter(row => row.manualFlag === 1);
@@ -1479,8 +1476,11 @@ export default {
       return `${amount.toFixed(2)} ${currency || 'RMB'}`;
     },
     formatQuantity(row) {
-      if (row.transportQuantity === undefined || row.transportQuantity === null) return '-';
+      const value = row.transportQuantity;
-      return `${row.transportQuantity}${row.quantityUnit ? ` ${row.quantityUnit}` : ''}`;
+      if (value === undefined || value === null || value === '') return '-';
+      const quantity = Number(value);
+      if (!Number.isFinite(quantity)) return '-';
+      return `${quantity.toFixed(2)}${row.quantityUnit ? ` ${row.quantityUnit}` : ''}`;
     },
     displayValue(value) {
       return value === undefined || value === null || value === '' ? '-' : value;

src/views/settlement/formal-settlement.vue

@@ -48,6 +48,7 @@
       >
         <el-tab-pane label="应付" name="payable">
           <formal-settlement-table-panel
+            :key="activeSettlementType"
             :rows="rows"
             :columns="columns"
             :loading="loading"
@@ -65,6 +66,7 @@
         </el-tab-pane>
         <el-tab-pane label="应收" name="receivable">
           <formal-settlement-table-panel
+            :key="activeSettlementType"
             :rows="rows"
             :columns="columns"
             :loading="loading"
@@ -96,7 +98,31 @@
       class="formal-payment-dialog"
     >
       <section-card title="付款信息">
-        <el-form :model="paymentDialog.form" label-position="right" label-width="auto">
+        <template v-if="paymentDialog.rows.length > 1">
+          <div class="formal-payment-dialog__batch-tip">
+            已选择 {{ paymentDialog.rows.length }} 条同合同应付正式结算单，请确认各单申请金额。
+          </div>
+          <el-table :data="paymentDialog.rows" border>
+            <el-table-column prop="formalSettlementNo" label="结算单号" min-width="160" />
+            <el-table-column label="剩余可申请金额" min-width="150" align="right">
+              <template #default="{ row }">{{
+                formatMoney(paymentRemaining(row), row.currency)
+              }}</template>
+            </el-table-column>
+            <el-table-column label="申请付款金额" min-width="150" align="right">
+              <template #default="{ row }">
+                <el-input-number
+                  v-model="row.appliedAmount"
+                  :min="0.01"
+                  :max="paymentRemaining(row)"
+                  :precision="2"
+                  :controls="false"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+        <el-form v-else :model="paymentDialog.form" label-position="right" label-width="auto">
           <el-form-item label="结算单号">{{
             paymentDialog.row.formalSettlementNo || '-'
           }}</el-form-item>
@@ -180,6 +206,7 @@ export default {
         visible: false,
         loading: false,
         row: {},
+        rows: [],
         form: { appliedAmount: 0, remark: '' },
       },
     };
@@ -193,11 +220,7 @@ export default {
       return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
     },
     paymentAvailable() {
-      return Math.max(
+      return this.paymentRemaining(this.paymentDialog.row);
-        0,
-        Number(this.paymentDialog.row.settlementAmount || 0) -
-          Number(this.paymentDialog.row.appliedPaymentAmount || 0)
-      );
     },
   },
   watch: {
@@ -340,29 +363,52 @@ export default {
       this.loadTable();
     },
     openPaymentDialog() {
-      const row = this.selectedOne('付款申请');
+      if (!this.selection.length) return this.$message.warning('请至少选择一条正式结算单');
-      if (!row) return;
+      const rows = this.selection;
-      if (row.approvalStatus !== 'approved' || row.settlementType !== 'payable')
+      if (rows.some(row => row.approvalStatus !== 'approved' || row.settlementType !== 'payable'))
         return this.$message.warning('仅审批通过的应付正式结算单允许发起付款申请');
+      const contractIds = new Set(rows.map(row => String(row.contractId || '')));
+      if (rows.length > 1 && (contractIds.size !== 1 || contractIds.has('')))
+        return this.$message.warning('批量付款申请必须选择同一个合同的正式结算单');
+      const paymentRows = rows.map(row => ({ ...row, appliedAmount: this.paymentRemaining(row) }));
+      if (paymentRows.some(row => row.appliedAmount <= 0))
+        return this.$message.warning('所选正式结算单均须存在剩余可申请金额');
       this.paymentDialog = {
         visible: true,
         loading: false,
-        row,
+        row: paymentRows[0],
-        form: { appliedAmount: 0, remark: '' },
+        rows: paymentRows,
+        form: {
+          appliedAmount: paymentRows.length === 1 ? paymentRows[0].appliedAmount : 0,
+          remark: '',
+        },
       };
     },
     async submitPayment() {
-      if (Number(this.paymentDialog.form.appliedAmount || 0) <= 0)
+      const paymentRows = this.paymentDialog.rows;
+      if (paymentRows.length > 1) {
+        if (paymentRows.some(row => Number(row.appliedAmount || 0) <= 0))
+          return this.$message.warning('请输入各正式结算单的申请付款金额');
+        if (paymentRows.some(row => Number(row.appliedAmount) > this.paymentRemaining(row)))
+          return this.$message.warning('申请付款金额不能超过剩余可申请金额');
+      } else if (Number(this.paymentDialog.form.appliedAmount || 0) <= 0) {
         return this.$message.warning('请输入申请付款金额');
+      }
       this.paymentDialog.loading = true;
       try {
-        const response = await api.applyPayment({
+        const response =
-          id: this.paymentDialog.row.id,
+          paymentRows.length > 1
-          ...this.paymentDialog.form,
+            ? await api.applyPayments({
-        });
+                items: paymentRows.map(row => ({ id: row.id, appliedAmount: row.appliedAmount })),
+                remark: this.paymentDialog.form.remark,
+              })
+            : await api.applyPayment({ id: this.paymentDialog.row.id, ...this.paymentDialog.form });
         const data = this.unwrapData(response);
-        this.$message.success(`付款申请已生成：${data}`);
+        this.$message.success(
+          Array.isArray(data) ? `已生成 ${data.length} 条付款申请` : `付款申请已生成：${data}`
+        );
         this.paymentDialog.visible = false;
+        this.selection = [];
         this.loadTable();
       } finally {
         this.paymentDialog.loading = false;
@@ -474,6 +520,12 @@ export default {
     formatMoney(value, currency = 'RMB') {
       return `${Number(value || 0).toFixed(2)} ${currency || 'RMB'}`;
     },
+    paymentRemaining(row) {
+      const remaining =
+        row?.remainingPayableAmount ??
+        Number(row?.settlementAmount || 0) - Number(row?.appliedPaymentAmount || 0);
+      return Math.max(0, Number(remaining || 0));
+    },
   },
 };
 </script>
@@ -512,6 +564,10 @@ export default {
 .formal-page__table-panel {
   margin-top: 8px;
 }
+.formal-payment-dialog__batch-tip {
+  margin-bottom: 12px;
+  color: #606266;
+}
 .formal-page :deep(.el-table) {
   --el-table-border-color: #eff1f7;
 }