From 11d7990309ddace2fa600cbeae58e3ab5ac368f9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 20 九月 2026 19:25:45 +0800
Subject: [PATCH] 新疆-融邦 1. 委外管理：新增合作商档案、委外订单、往来台账三个页面及接口；合作商附件弹框支持直接上传/删除并即时保存。 2. 信托基金与代储台账：客户档案加「信托基金 / 代储金额」并对超限标红提示；销售台账拆「卖油 / 代储」页签，代储走油库+储罐+合同金额，卖油保留产品明细；台账列表加审批状态与超限红字；审批中心显示销售合同号并能下钻台账明细。 3. 储罐号带入库存：储罐信息表单加「是否启用 / 用途 / 租客信息」联动与校验；库存管理、批号明细、入库/出库表单与列表补齐储罐号、油品、物流、过磅等字段展示。 4. 出库即发货与往来备件：出库台账区分「发货单 / 油品出库」两类来源并分别处理详情；新增备件出入库流水页面。 5. 车辆管理与残油联动：新增车辆管理页面；油品出入库表单物流信息顺序调整，车牌/车挂牌号联动只读。 6. 油品出库联动发货台账：发货台账加「发货单号 / 销售合同号」筛选，修复油品出库行批号列取错字段。 7. 采购申请模块：新增采购申请页面及接口。 8. 付款流水组件：抽出公共「付款流水」弹框组件，采购付款分栏、收付款台账与委外往来台账复用。 9. 列调整：收付款台账删除「付款金额 / 退货金额」；委外往来台账删除「回款金额」，并去掉金额列右对齐。
---
src/views/procurementManagement/paymentLedger/index.vue | 74 +++++++++++++++++++++++++++++--------
1 files changed, 58 insertions(+), 16 deletions(-)
diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index 7fba9cb..1478399 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -46,17 +46,31 @@
prop="paymentAmount"
show-overflow-tooltip
:formatter="formattedNumber" />
- <el-table-column label="閫�璐ч噾棰�(鍏�)"
- prop="returnAmount"
- show-overflow-tooltip
- :formatter="formattedNumber" />
+<!-- <el-table-column label="鍥炴閲戦(鍏�)"-->
+<!-- prop="receiptAmount"-->
+<!-- show-overflow-tooltip-->
+<!-- :formatter="formattedNumber" />-->
+<!-- <el-table-column label="閫�璐ч噾棰�(鍏�)"-->
+<!-- prop="returnAmount"-->
+<!-- show-overflow-tooltip-->
+<!-- :formatter="formattedNumber" />-->
<el-table-column label="搴斾粯閲戦(鍏�)"
- prop="payableAmount"
+ prop="paymentRecordAmount"
show-overflow-tooltip>
<template #default="{ row, column }">
<el-text type="danger">
- {{ formattedNumber(row, column, row.payableAmount) }}
+ {{ formattedNumber(row, column, row.paymentRecordAmount) }}
</el-text>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔"
+ align="center"
+ width="90"
+ fixed="right">
+ <template #default="{ row }">
+ <el-button link
+ type="primary"
+ @click.stop="openRecordDialog(row)">娴佹按</el-button>
</template>
</el-table-column>
</el-table>
@@ -90,6 +104,14 @@
</div>
</el-col>
</el-row>
+ <!-- 渚涘簲鍟嗗洖娆炬祦姘寸淮鎶� -->
+ <PaymentRecordDialog v-model:visible="recordDialogVisible"
+ title="渚涘簲鍟嗗洖娆炬祦姘�"
+ :party-type="2"
+ :party-id="recordPartyId"
+ :party-name="recordPartyName"
+ :direction="2"
+ @changed="getList" />
</div>
</template>
@@ -101,6 +123,7 @@
paymentRecordList,
} from "@/api/procurementManagement/paymentLedger.js";
import Pagination from "../../../components/PIMTable/Pagination.vue";
+ import PaymentRecordDialog from "@/components/PaymentRecordDialog/index.vue";
const tableData = ref([]);
const tableLoading = ref(false);
@@ -123,6 +146,16 @@
const isShowSummary = ref(true);
const { searchForm } = toRefs(data);
const currentSupplierId = ref("");
+ // 鍥炴娴佹按寮圭獥
+ const recordDialogVisible = ref(false);
+ const recordPartyId = ref("");
+ const recordPartyName = ref("");
+
+ const openRecordDialog = row => {
+ recordPartyId.value = row.supplierId;
+ recordPartyName.value = row.supplierName || "";
+ recordDialogVisible.value = true;
+ };
const rowClick = row => {
currentSupplierId.value = row.supplierId;
sonPage.current = 1;
@@ -156,19 +189,28 @@
return params ? parseFloat(params).toFixed(2) : 0;
},
},
- {
- label: "閫�璐ч噾棰�(鍏�)",
- prop: "returnAmount",
- width: 200,
- formatData: params => {
- return params ? parseFloat(params).toFixed(2) : 0;
- },
- },
+ // 寰�鏉ユ柟缁村害鍚堣锛屾槑缁嗗悇琛屽悓鍊硷紝鏁呬笉鍙備笌鍚堣琛�
+ // {
+ // label: "鍥炴閲戦(鍏�)",
+ // prop: "receiptAmount",
+ // width: 200,
+ // formatData: params => {
+ // return params ? parseFloat(params).toFixed(2) : 0;
+ // },
+ // },
+ // {
+ // label: "閫�璐ч噾棰�(鍏�)",
+ // prop: "returnAmount",
+ // width: 200,
+ // formatData: params => {
+ // return params ? parseFloat(params).toFixed(2) : 0;
+ // },
+ // },
{
label: "搴斾粯閲戦(鍏�)",
dataType: "slot",
width: 200,
- prop: "payableAmount",
+ prop: "paymentRecordAmount",
slot: "payableAmountSlot",
},
]);
@@ -182,7 +224,7 @@
const summarizeMainTable = param => {
return proxy.summarizeTable(
param,
- ["contractAmounts", "paymentAmount", "returnAmount", "payableAmount"],
+ ["contractAmounts", "paymentAmount", "receiptAmount", "returnAmount", "payableAmount"],
{
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
--
Gitblit v1.9.3