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/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
index 737e2de..b413fd8 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
@@ -13,6 +13,7 @@
import { getQuotationList } from "@/api/salesManagement/salesQuotation.js";
import { getPurchaseByCode } from "@/api/procurementManagement/procurementLedger.js";
import { getDeliveryDetailByShippingNo } from "@/api/salesManagement/deliveryLedger.js";
+import { ledgerListPage } from "@/api/salesManagement/salesLedger.js";
import useUserStore from "@/store/modules/user";
import { Search } from "@element-plus/icons-vue";
import { ElMessage, ElMessageBox } from "element-plus";
@@ -120,6 +121,18 @@
return hit?.label || "";
}
+ // 鍒楄〃銆屼笟鍔″崟鍙枫�嶏細鎸変笟鍔＄被鍨嬪彇瀵瑰簲鐨勫崟鍙凤紙19=閿�鍞彴璐﹀鎵癸級
+ function businessNoOf(row) {
+ return (
+ row?.salesContractNo ||
+ row?.quotationNo ||
+ row?.purchaseContractNumber ||
+ row?.shippingNo ||
+ row?.bizId ||
+ ""
+ );
+ }
+
function countTemplatesByBusinessType(type) {
return allSubmitTemplates.value.filter((card) => matchBusinessTypeValue(card.businessType, type)).length;
}
@@ -142,6 +155,13 @@
// { label: "鐢宠浜虹紪鍙�", prop: "applicantNo", width: 110 },
{ label: "鍙戣捣浜�", prop: "applicantName", minWidth: 100 },
{ label: "妯℃澘绫诲瀷", prop: "businessName", minWidth: 120 },
+ {
+ label: "涓氬姟鍗曞彿",
+ prop: "businessNo",
+ minWidth: 170,
+ dataType: "slot",
+ slot: "bizNo",
+ },
{
label: "瀹℃壒绫诲瀷",
prop: "approvalType",
@@ -326,13 +346,29 @@
detailData.value = res?.data || res || {};
}
}
-
+
+ // 閿�鍞彴璐﹀鎵癸細鐢ㄥ鎵逛簨鐢卞瓧娈垫壙杞界殑"閿�鍞悎鍚屽彿"鍘绘煡鍙拌处鍒楄〃
+ else if (row.businessType === 19) {
+ detailData.value = await fetchSalesLedgerByContractNo(row?.salesContractNo);
+ }
+
// 鍏朵粬瀹℃壒绫诲瀷
else {
detailData.value = {};
}
-
+
detailDialog.visible = true;
+ }
+
+ async function fetchSalesLedgerByContractNo(salesContractNo) {
+ if (!salesContractNo) return {};
+ // /sales/ledger/listPage 鐩存帴杩斿洖 IPage锛堥《灞� records锛夛紝娌℃湁 code/msg 澶栧眰
+ const res = await ledgerListPage({
+ salesContractNo,
+ pageNum: 1,
+ pageSize: 1,
+ });
+ return res?.records?.[0] || {};
}
async function openApprove(row) {
@@ -373,6 +409,11 @@
const res = await getDeliveryDetailByShippingNo({ shippingNo });
detailData.value = res?.data || res || {};
}
+ }
+
+ // 閿�鍞彴璐﹀鎵癸細鐢ㄥ鎵逛簨鐢卞瓧娈垫壙杞界殑"閿�鍞悎鍚屽彿"鍘绘煡鍙拌处鍒楄〃
+ else if (row.businessType === 19) {
+ detailData.value = await fetchSalesLedgerByContractNo(row?.salesContractNo);
}
// 鍏朵粬瀹℃壒绫诲瀷
@@ -686,6 +727,7 @@
selectedBusinessType,
selectedBusinessTypeLabel,
businessTypeLabel,
+ businessNoOf,
countTemplatesByBusinessType,
submitTemplatesLoading,
handleQuery,
--
Gitblit v1.9.3