From 1daa22ed05c77e4a8c3069124a1849d5d6504f69 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 30 七月 2026 17:57:00 +0800
Subject: [PATCH] 修改报工审批数据显示
---
src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js | 104 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 96 insertions(+), 8 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
index 3f0e99c..91cf317 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js
@@ -10,6 +10,7 @@
saveApprovalInstance,
updateApprovalInstance,
} from "@/api/officeProcessAutomation/approvalInstance.js";
+import { productionProductMainGetInfo } from "@/api/productionManagement/productionProductMain.js";
import { getQuotationList } from "@/api/salesManagement/salesQuotation.js";
import { getPurchaseByCode } from "@/api/procurementManagement/procurementLedger.js";
import { getDeliveryDetailByShippingNo } from "@/api/salesManagement/deliveryLedger.js";
@@ -140,7 +141,7 @@
const tableColumn = ref([
// { label: "鐢宠浜虹紪鍙�", prop: "applicantNo", width: 110 },
- { label: "鐢宠浜哄悕绉�", prop: "applicantName", minWidth: 100 },
+ { label: "鍙戣捣浜�", prop: "applicantName", minWidth: 100 },
{ label: "妯℃澘绫诲瀷", prop: "businessName", minWidth: 120 },
{
label: "瀹℃壒绫诲瀷",
@@ -154,7 +155,9 @@
prop: "unread",
width: 90,
align: "center",
+ dataType: "tag",
formatData: (v) => (v ? "鏄�" : "鍚�"),
+ formatType: (v) => (v ? "success" : "danger"),
},
{
label: "瀹℃壒鐘舵��",
@@ -181,7 +184,7 @@
{
name: "淇敼",
type: "text",
- disabled: (row) => row.approvalStatus !== "pending",
+ disabled: (row) => row.approvalStatus !== "pending" || Number(row?.businessType) === 19,
clickFun: (row) => openEditDialog(row),
},
{
@@ -190,11 +193,11 @@
disabled: (row) => row.approvalStatus !== "pending" || !row.isApprove,
clickFun: (row) => openApprove(row),
},
- {
- name: "鍒犻櫎",
- type: "danger",
- clickFun: (row) => removeInstance(row),
- },
+ // {
+ // name: "鍒犻櫎",
+ // type: "danger",
+ // clickFun: (row) => removeInstance(row),
+ // },
],
},
]);
@@ -321,6 +324,12 @@
detailData.value = res?.data || res || {};
}
}
+
+ // 鎶ュ伐瀹℃壒锛氱洿鎺ュ睍绀哄鎵瑰～鎶ュ唴瀹�
+ else if (row.businessType === 19) {
+ detailData.value = {};
+ detailRow.value = await mergeProductionReportDetail(detailRow.value);
+ }
// 鍏朵粬瀹℃壒绫诲瀷
else {
@@ -367,11 +376,87 @@
}
}
+ // 鎶ュ伐瀹℃壒锛氱洿鎺ュ睍绀哄鎵瑰～鎶ュ唴瀹�
+ else if (row.businessType === 19) {
+ detailData.value = {};
+ approveDialog.row = await mergeProductionReportDetail(approveDialog.row);
+ }
+
// 鍏朵粬瀹℃壒绫诲瀷
else {
detailData.value = {};
}
approveDialog.visible = true;
+ }
+
+ async function mergeProductionReportDetail(row) {
+ const businessId = row?.businessId ?? row?.bizId ?? row?.id;
+ if (!businessId) return row;
+ try {
+ const res = await productionProductMainGetInfo(businessId);
+ const report = res?.data || res || {};
+ const formConfigPayload = row?.formConfig?.formPayload || {};
+ const schedulingNum = Number(
+ report?.schedulingNum ?? report?.planQuantity ?? formConfigPayload.schedulingNum ?? row?.schedulingNum ?? 0
+ );
+ const finishedNum = Number(
+ report?.finishedNum ?? report?.quantity ?? formConfigPayload.finishedNum ?? row?.finishedNum ?? row?.quantity ?? 0
+ );
+ const scrapQty = Number(
+ report?.scrapQty ?? formConfigPayload.scrapQty ?? row?.scrapQty ?? 0
+ );
+ const pendingNum = Number(
+ formConfigPayload.pendingNum ?? report?.pendingNum ?? row?.pendingNum ?? Math.max(schedulingNum - finishedNum, 0)
+ );
+ const reportTypeOptions = [
+ { label: "鍚堟牸", value: 0 },
+ { label: "杞诲井杩斿伐", value: 1 },
+ { label: "涓ラ噸杩斿伐", value: 2 },
+ { label: "鎶ュ簾", value: 3 },
+ ];
+ const mergedFields = [
+ { key: "productNo", label: "鎶ュ伐鍗曞彿", type: "text" },
+ { key: "userName", label: "鎶ュ伐浜哄憳", type: "text" },
+ { key: "teamInfo", label: "鐝粍淇℃伅", type: "text" },
+ { key: "workOrderNo", label: "宸ュ崟缂栧彿", type: "text" },
+ { key: "pendingNum", label: "寰呯敓浜ф暟閲�", type: "number", precision: 2 },
+ { key: "finishedNum", label: "鐢熶骇鍚堟牸鏁伴噺", type: "number", precision: 2 },
+ { key: "scrapQty", label: "鎶ュ簾鏁伴噺", type: "number", precision: 2 },
+ { key: "reportType", label: "鎶ュ伐绫诲瀷", type: "select", options: reportTypeOptions },
+ ];
+ const rawReportType = report?.reportType ?? row?.formPayload?.reportType ?? row?.reportType;
+ const reportType = Number.isFinite(Number(rawReportType)) ? Number(rawReportType) : 0;
+ const formPayload = {
+ productNo: report?.productNo || row?.productNo || row?.formPayload?.productNo || "鈥�",
+ userName: report?.userName || row?.applicantName || row?.formPayload?.userName || "鈥�",
+ teamInfo: report?.teamInfo || row?.applicantName || row?.formPayload?.teamInfo || "鈥�",
+ workOrderNo: report?.workOrderNo || row?.workOrderNo || row?.formPayload?.workOrderNo || "鈥�",
+ pendingNum,
+ finishedNum,
+ scrapQty,
+ reportType,
+ };
+ const mergedRow = {
+ ...row,
+ schedulingNum,
+ pendingNum,
+ scrapQty,
+ finishedNum,
+ formFieldDefs: mergedFields,
+ formPayload,
+ formConfig: {
+ ...(typeof row.formConfig === "object" ? row.formConfig : {}),
+ ...(row?.formConfig?.formPayload ? { formPayload: { ...row.formConfig.formPayload } } : {}),
+ fields: mergedFields,
+ formPayload,
+ approvalType: "production_report",
+ },
+ };
+ return mergedRow;
+ } catch (error) {
+ console.error("鍔犺浇鎶ュ伐瀹℃壒涓氬姟璇︽儏澶辫触", error);
+ }
+ return row;
}
function isReimburseApprovalInstance(row) {
@@ -414,6 +499,9 @@
if (!row?.id) {
ElMessage.warning("鏃犳硶淇敼锛氱己灏戝鎵瑰疄渚� ID");
return;
+ }
+ if (row.businessType === 19) {
+ row = await mergeProductionReportDetail(row);
}
submitDialog.mode = "edit";
submitDialog.step = 3;
@@ -697,4 +785,4 @@
openApprove,
fetchApprovalList,
};
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3