From fc36e9f71f1238e0c4d65ebb897bb54a68204463 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 02 四月 2026 14:50:11 +0800
Subject: [PATCH] 生产报表联调，并优化页面
---
src/views/productionManagement/productionOrder/index.vue | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 5db077d..c123928 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -58,11 +58,13 @@
@selection-change="handleSelectionChange"
@pagination="pagination">
<template #completionStatus="{ row }">
- <el-progress
- :percentage="toProgressPercentage(row?.completionStatus)"
- :color="progressColor(toProgressPercentage(row?.completionStatus))"
- :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''"
- />
+ <div class="progress-link" @click="goProductionDetail(row)">
+ <el-progress
+ :percentage="toProgressPercentage(row?.completionStatus)"
+ :color="progressColor(toProgressPercentage(row?.completionStatus))"
+ :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''"
+ />
+ </div>
</template>
</PIMTable>
</div>
@@ -137,7 +139,7 @@
},
{
label: "鐢熶骇鎵瑰彿",
- prop: "lotNo",
+ prop: "batchNo",
width: '120px',
},
{
@@ -163,6 +165,11 @@
{
label: "瑙勬牸",
prop: "specificationModel",
+ width: '120px',
+ },
+ {
+ label: "鏂欏彿",
+ prop: "materialCode",
width: '120px',
},
{
@@ -213,6 +220,7 @@
{
name: "宸ヨ壓璺嚎",
type: "text",
+ showHide: row => row.processRouteCode,
clickFun: row => {
showRouteItemModal(row);
},
@@ -396,6 +404,7 @@
processRouteCode: data.processRouteCode || "",
productName: data.productName || "",
model: data.model || "",
+ materialCode: data.materialCode || "",
bomNo: data.bomNo || "",
description: data.description || "",
orderId,
@@ -416,8 +425,24 @@
bomNo: row.bomNo || "",
productName: row.productCategory || "",
productModelName: row.specificationModel || "",
+ materialCode: row.materialCode || "",
orderId: row.id,
type: "order",
+ },
+ });
+ };
+
+ const goProductionDetail = (row) => {
+ if (!row) return;
+ router.push({
+ path: "/productionManagement/productionOrder/detail",
+ query: {
+ orderId: row.id,
+ npsNo: row.npsNo || "",
+ batchNo: row.batchNo || "",
+ productCategory: row.productCategory || "",
+ specificationModel: row.specificationModel || "",
+ materialCode: row.materialCode || "",
},
});
};
@@ -491,4 +516,8 @@
::v-deep .purple{
background-color: #F4DEFA;
}
+.progress-link {
+ cursor: pointer;
+}
+
</style>
--
Gitblit v1.9.3