🐛 修复预付驳回重提、预结算变更记录与收票多选结算单
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -173,7 +173,7 @@
|
||||
<el-input
|
||||
v-model="settlementDialog.keyword"
|
||||
clearable
|
||||
placeholder="3结算单号、项目或合同"
|
||||
placeholder="结算单号、项目或合同"
|
||||
@keyup.enter="loadSettlementCandidates"
|
||||
/>
|
||||
<el-button type="primary" @click="loadSettlementCandidates">查询</el-button>
|
||||
@@ -182,10 +182,11 @@
|
||||
ref="settlementTable"
|
||||
v-loading="settlementDialog.loading"
|
||||
:data="settlementDialog.rows"
|
||||
row-key="id"
|
||||
border
|
||||
@selection-change="settlementDialog.selection = $event"
|
||||
>
|
||||
<el-table-column type="selection" width="52" align="center" />
|
||||
<el-table-column type="selection" width="52" align="center" reserve-selection />
|
||||
<el-table-column prop="formalSettlementNo" label="结算单号" min-width="170" />
|
||||
<el-table-column prop="projectName" label="所属项目" min-width="150" />
|
||||
<el-table-column prop="deptName" label="所属组织" min-width="150" />
|
||||
@@ -206,7 +207,9 @@
|
||||
</el-table>
|
||||
<template #footer>
|
||||
<el-button @click="settlementDialog.visible = false">取消</el-button>
|
||||
<el-button type="primary" @click="confirmSettlements">确定</el-button>
|
||||
<el-button type="primary" @click="confirmSettlements">
|
||||
确定{{ settlementDialog.selection.length ? `(${settlementDialog.selection.length})` : '' }}
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</basic-container>
|
||||
@@ -437,7 +440,15 @@ export default {
|
||||
},
|
||||
async openSettlementDialog() {
|
||||
this.settlementDialog.visible = true;
|
||||
this.settlementDialog.selection = [];
|
||||
await this.loadSettlementCandidates();
|
||||
await this.$nextTick();
|
||||
const selectedIds = new Set(this.settlementIds.map(id => String(id)));
|
||||
this.settlementDialog.rows.forEach(row => {
|
||||
if (selectedIds.has(String(row.id))) {
|
||||
this.$refs.settlementTable?.toggleRowSelection(row, true);
|
||||
}
|
||||
});
|
||||
},
|
||||
async loadSettlementCandidates() {
|
||||
this.settlementDialog.loading = true;
|
||||
@@ -468,11 +479,21 @@ export default {
|
||||
this.$message.warning('关联结算单必须属于同一项目、组织及收付款方');
|
||||
return;
|
||||
}
|
||||
const previousAmount = new Map(
|
||||
this.form.settlements.map(item => [
|
||||
String(item.formalSettlementId || item.settlementId),
|
||||
item.allocatedInvoiceAmount,
|
||||
])
|
||||
);
|
||||
this.form.settlements = rows.map(item => ({
|
||||
...item,
|
||||
formalSettlementId: item.id,
|
||||
settlementId: item.id,
|
||||
allocatedInvoiceAmount: rows.length === 1 ? Number(item.settlementAmount || 0) : 0,
|
||||
allocatedInvoiceAmount: previousAmount.has(String(item.id))
|
||||
? Number(previousAmount.get(String(item.id)) || 0)
|
||||
: rows.length === 1
|
||||
? Number(item.settlementAmount || 0)
|
||||
: 0,
|
||||
}));
|
||||
this.form.projectName = first.projectName;
|
||||
this.form.deptName = first.deptName;
|
||||
@@ -482,9 +503,8 @@ export default {
|
||||
await this.loadReferenceInformation();
|
||||
this.$refs.formRef?.validateField('settlementIds').catch(() => {});
|
||||
},
|
||||
async selectSettlement(row) {
|
||||
this.settlementDialog.selection = [row];
|
||||
await this.confirmSettlements();
|
||||
selectSettlement(row) {
|
||||
this.$refs.settlementTable?.toggleRowSelection(row);
|
||||
},
|
||||
async loadReferenceInformation() {
|
||||
const data = this.unwrapData(await api.getReferenceInformation(this.settlementIds.join(',')));
|
||||
|
||||
Reference in New Issue
Block a user