From f70ee8845ef75c346fee1ff5e8f576640f6a2d00 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 26 三月 2026 15:48:08 +0800
Subject: [PATCH] 生产详情中增加报废数量
---
src/views/productionManagement/productionOrder/Detail/index.vue | 205 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 148 insertions(+), 57 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/Detail/index.vue b/src/views/productionManagement/productionOrder/Detail/index.vue
index 7b7c2e2..df96f47 100644
--- a/src/views/productionManagement/productionOrder/Detail/index.vue
+++ b/src/views/productionManagement/productionOrder/Detail/index.vue
@@ -50,7 +50,13 @@
}"
@click="selectProcess(idx)"
>
- <span v-if="idx === active" class="step-current-badge">鐢熶骇涓�</span>
+ <span
+ v-if="p?.status"
+ class="step-status-badge"
+ :class="`step-status-badge-${p.status}`"
+ >
+ {{ statusTagText(p.status) }}
+ </span>
<div v-if="p.status !== 'wait'" class="current-progress">
<div class="current-progress-head">
<span class="current-progress-title">宸ュ簭杩涘害</span>
@@ -81,6 +87,10 @@
<div class="grid-item">
<div class="grid-label">浜у嚭鏁伴噺</div>
<div class="grid-value">{{ p.outputQty ?? 0 }}</div>
+ </div>
+ <div class="grid-item">
+ <div class="grid-label">鎶ュ簾鏁伴噺</div>
+ <div class="grid-value success">{{ p.scrapQty ?? 0 }}</div>
</div>
<div class="grid-item">
<div class="grid-label">鍚堟牸鏁伴噺</div>
@@ -114,13 +124,14 @@
<div v-else class="right-content">
<el-table :data="reports" border height="420" v-loading="reportLoading">
<el-table-column label="搴忓彿" type="index" width="60" align="center" />
- <el-table-column label="鎶ュ伐鍗曞彿" prop="reportNo" min-width="140" show-overflow-tooltip />
- <el-table-column label="鎶ュ伐浜哄憳" prop="reportUser" min-width="120" show-overflow-tooltip />
- <el-table-column label="鎶ュ伐鏃堕棿" prop="reportTime" min-width="160" show-overflow-tooltip />
- <el-table-column label="浜у嚭鏁伴噺" prop="outputQty" min-width="110" />
+ <el-table-column label="鎶ュ伐鍗曞彿" prop="productNo" min-width="140" show-overflow-tooltip />
+ <el-table-column label="鎶ュ伐浜哄憳" prop="nickName" min-width="120" show-overflow-tooltip />
+ <el-table-column label="鎶ュ伐鏃堕棿" prop="createTime" min-width="160" show-overflow-tooltip />
+ <el-table-column label="浜у嚭鏁伴噺" prop="quantity" min-width="110" />
+ <el-table-column label="鎶ュ簾鏁伴噺" prop="scrapQty" min-width="110" />
<el-table-column label="鍚堟牸鏁伴噺" prop="qualifiedQty" min-width="110" />
- <el-table-column label="涓嶈壇鏁伴噺" prop="badQty" min-width="110" />
- <el-table-column label="涓嶅悎鏍煎鐞�" prop="remark" min-width="160" show-overflow-tooltip />
+ <el-table-column label="涓嶈壇鏁伴噺" prop="defectiveQuantity" min-width="110" />
+ <el-table-column label="涓嶅悎鏍煎鐞�" prop="dealResult" min-width="160" show-overflow-tooltip />
<el-table-column label="鎿嶄綔" width="150" fixed="right">
<template #default="{ row }">
<el-button type="primary" link @click="viewReportRecord(row)">
@@ -134,21 +145,45 @@
</div>
</div>
</el-card>
- <el-dialog
- v-model="reportRecordDialogVisible"
- title="鎶ュ伐鐢熶骇璁板綍"
- width="680px"
- destroy-on-close
- >
- <div class="report-record-placeholder">
- <div>鎶ュ伐鍗曞彿锛歿{ currentReportRow?.reportNo || "-" }}</div>
- <div>宸ュ簭锛歿{ selectedProcess?.processName || "-" }}</div>
- <div class="placeholder-tip">寮规鍐呭寰呭畾锛堝悗缁ˉ鍏呰缁嗙敓浜ц褰曪級銆�</div>
- </div>
- <template #footer>
- <el-button @click="reportRecordDialogVisible = false">鍏抽棴</el-button>
- </template>
- </el-dialog>
+<!-- <el-dialog-->
+<!-- v-model="reportRecordDialogVisible"-->
+<!-- title="鎶ュ伐鐢熶骇璁板綍"-->
+<!-- width="680px"-->
+<!-- destroy-on-close-->
+<!-- >-->
+<!-- <div class="report-record-placeholder">-->
+<!-- <div>鎶ュ伐鍗曞彿锛歿{ currentReportRow?.reportNo || "-" }}</div>-->
+<!-- <div>宸ュ簭锛歿{ selectedProcess?.processName || "-" }}</div>-->
+<!-- <div class="placeholder-tip">寮规鍐呭寰呭畾锛堝悗缁ˉ鍏呰缁嗙敓浜ц褰曪級銆�</div>-->
+<!-- </div>-->
+<!-- <template #footer>-->
+<!-- <el-button @click="reportRecordDialogVisible = false">鍏抽棴</el-button>-->
+<!-- </template>-->
+<!-- </el-dialog>-->
+
+ <CopperPrintingForm
+ v-if="copperPrintingFormVisible"
+ v-model:isShow="copperPrintingFormVisible"
+ :isEdit="false"
+ :row="currentReportRow"
+ @refreshData="fetchReportsForProcess(selectedProcess.value)"/>
+ <VoltageSortingForm
+ v-if="voltageSortingFormVisible"
+ v-model:isShow="voltageSortingFormVisible"
+ :isEdit="false"
+ :row="currentReportRow"
+ @refreshData="fetchReportsForProcess(selectedProcess.value)"/>
+ <GranulationForm
+ v-if="granulationFormVisible"
+ v-model:isShow="granulationFormVisible"
+ :isEdit="false"
+ :row="currentReportRow"
+ @refreshData="fetchReportsForProcess(selectedProcess.value)"/>
+ <Detail
+ v-if="reportRecordDialogVisible"
+ v-model:isShow="reportRecordDialogVisible"
+ @refreshData="fetchReportsForProcess(selectedProcess.value)"
+ :row="currentReportRow"/>
</div>
</template>
@@ -157,7 +192,10 @@
import { useRoute } from "vue-router";
import { getByProductOrderId } from "@/api/productionManagement/workOrder.js";
import { getByProductWorkOrderId } from "@/api/productionManagement/productionProductMain.js";
-
+const VoltageSortingForm = defineAsyncComponent(() => import("@/views/productionManagement/workOrder/components/VoltageSortingForm.vue"));
+const CopperPrintingForm = defineAsyncComponent(() => import("@/views/productionManagement/workOrder/components/CopperPrintingForm.vue"));
+const GranulationForm = defineAsyncComponent(() => import("@/views/productionManagement/workOrder/components/GranulationForm.vue"));
+const Detail = defineAsyncComponent(() => import("@/views/productionManagement/productionReporting/components/Detail.vue"));
const route = useRoute();
const header = computed(() => ({
@@ -171,16 +209,19 @@
// 宸ュ簭鏁版嵁锛堟帴鍙ｆ浛鎹級
const processes = ref([]);
+const copperPrintingFormVisible = ref(false);
+const voltageSortingFormVisible = ref(false);
+const granulationFormVisible = ref(false);
+
const normalizeStatus = (statusText, completionStatus, inputQty, outputQty) => {
const s = statusText === null || statusText === undefined ? "" : String(statusText).trim();
- const lower = s.toLowerCase();
- // 甯歌涓枃鐘舵�佸厹搴曪細杩涜涓�/宸插畬鎴�/绛夊緟
- if (s.includes("杩涜") || lower.includes("process") || lower.includes("doing") || lower.includes("running")) return "process";
- if (s.includes("瀹屾垚") || s.includes("宸插畬") || lower.includes("success") || lower.includes("done") || lower.includes("completed")) return "success";
- if (s.includes("寰�") || s.includes("鏈紑濮�") || lower.includes("wait") || lower.includes("pending") || lower.includes("not_start")) return "wait";
+ // 鎸夋帴鍙ｅ疄闄呬笁绉嶇姸鎬侊細宸茬敓鎴� / 鐢熶骇涓� / 寰呯敓浜�
+ if (s.includes("鐢熶骇涓�")) return "process";
+ if (s.includes("寰呯敓浜�")) return "wait";
+ if (s.includes("宸茬敓浜�")) return "success";
- // 鐢� completionStatus 鍋氬厹搴曪紙涓�鑸负 0~100锛�
+ // 鍏滃簳锛氫粛鎸� completionStatus 鍋� 0~100 鍒ゆ柇
const cs = Number(completionStatus);
if (Number.isFinite(cs)) {
if (cs >= 100) return "success";
@@ -188,7 +229,7 @@
return "wait";
}
- // 鏈�鍚庡啀鐢ㄦ暟閲忓厹搴�
+ // 鍐嶅厹搴曪細鐢ㄦ暟閲忓垽鏂�
if (Number.isFinite(inputQty) && inputQty > 0 && Number.isFinite(outputQty) && outputQty >= inputQty) return "success";
if (Number.isFinite(outputQty) && outputQty > 0) return "process";
return "wait";
@@ -196,13 +237,14 @@
const normalizeProcess = (item) => {
// 瀛楁浠ユ帴鍙ｇ害瀹氫负鍑嗭紙浣犵粰鐨勬埅鍥惧瓧娈垫槧灏勶級
- // 宸ュ簭锛歝ompletionStatus/statusText/processNo/scrapRate/planQuantity/completeQuantity/completeQty/scrapQty
+ // 宸ュ簭锛歝ompletionStatus/statusText/processNo/defectiveRate/planQuantity/completeQuantity/completeQty/scrapQty
const inputQty = Number(item?.planQuantity ?? item?.inputQty ?? 0);
- const outputQty = Number(item?.completeQuantity ?? item?.outputQty ?? 0);
+ const outputQty = Number(item?.totalQty ?? item?.outputQty ?? 0);
const qualifiedQty = Number(item?.completeQty ?? item?.qualifiedQty ?? item?.goodQty ?? 0);
- const badQty = Number(item?.scrapQty ?? item?.badQty ?? item?.defectQty ?? 0);
+ const badQty = Number(item?.defectiveQuantity ?? item?.badQty ?? item?.defectQty ?? 0);
+ const scrapQty = Number(item?.scrapQty ?? 0);
const completionStatus = Number(item?.completionStatus ?? 0);
- const scrapRate = Number(item?.scrapRate ?? NaN);
+ const defectiveRate = Number(item?.defectiveRate ?? NaN);
const status = normalizeStatus(item?.statusText ?? item?.status ?? item?.workStatus ?? item?.processStatus ?? item?.state, completionStatus, inputQty, outputQty);
@@ -214,8 +256,9 @@
outputQty: Number.isFinite(outputQty) ? outputQty : 0,
qualifiedQty: Math.max(0, Number.isFinite(qualifiedQty) ? qualifiedQty : 0),
badQty: Math.max(0, Number.isFinite(badQty) ? badQty : 0),
+ scrapQty: Math.max(0, Number.isFinite(scrapQty) ? scrapQty : 0),
completionStatus: Number.isFinite(completionStatus) ? completionStatus : 0,
- scrapRate: Number.isFinite(scrapRate) ? scrapRate : null,
+ defectiveRate: Number.isFinite(defectiveRate) ? defectiveRate : null,
status,
};
};
@@ -266,19 +309,11 @@
const reportLoading = ref(false);
const normalizeReport = (item) => {
- // 鎶ュ伐璁板綍锛歱roductNo/userName/createTime/quantity/qualifiedQty/scrapQty
- const outputQty = Number(item?.quantity ?? item?.outputQty ?? 0);
- const qualifiedQty = Number(item?.qualifiedQty ?? item?.completeQty ?? item?.goodQty ?? 0);
- const badQty = Number(item?.scrapQty ?? item?.badQty ?? 0);
-
return {
- reportNo: item?.productNo ?? item?.reportNo ?? item?.productionReportNo ?? item?.id ?? "",
- reportUser: item?.userName ?? item?.reportUser ?? item?.createdByName ?? item?.reportUserName ?? "",
- reportTime: item?.createTime ?? item?.reportTime ?? item?.createdAt ?? item?.reportDate ?? "",
- outputQty: Number.isFinite(outputQty) ? outputQty : 0,
- qualifiedQty: Math.max(0, Number.isFinite(qualifiedQty) ? qualifiedQty : 0),
- badQty: Number.isFinite(badQty) ? Math.max(0, badQty) : 0,
- remark: item?.remark ?? item?.remarkText ?? item?.description ?? "",
+ ...item,
+ quantity: Math.max(0, Number.isFinite(item.quantity) ? item.quantity : 0),
+ scrapQty: Math.max(0, Number.isFinite(item.scrapQty) ? item.scrapQty : 0),
+ qualifiedQty: Math.max(0, Number.isFinite(item.qualifiedQty) ? item.qualifiedQty : 0),
};
};
@@ -318,9 +353,17 @@
);
const viewReportRecord = (row) => {
- if (!row?.reportNo) return;
+ if (!row?.productNo) return;
currentReportRow.value = row;
- reportRecordDialogVisible.value = true;
+ if (row.process ==='鍗伴摐' || row.process ==='鍗伴摱') {
+ copperPrintingFormVisible.value = true;
+ } else if (row.process === '鐢靛帇鍒嗛��') {
+ voltageSortingFormVisible.value = true;
+ } else if (row.process === '閫犵矑') {
+ granulationFormVisible.value = true;
+ } else {
+ reportRecordDialogVisible.value = true;
+ }
};
const reportRecordDialogVisible = ref(false);
@@ -334,11 +377,26 @@
return Math.round(n);
};
+const statusTagText = (status) => {
+ if (status === "success") return "宸茬敓浜�";
+ if (status === "process") return "鐢熶骇涓�";
+ if (status === "wait") return "寰呯敓浜�";
+ return String(status ?? "");
+};
+
// el-steps: active 涓哄綋鍓嶈繘琛屼腑鐨勬楠や笅鏍囷紙妯℃嫙锛�
const active = computed(() => {
const list = processes.value || [];
- const idx = list.findIndex((p) => p.status === "process");
- return idx >= 0 ? idx : 0;
+ // 婵�娲荤姸鎬佷负鈥滃緟鐢熶骇鈥濈殑涓婁竴鏉�
+ const firstWaitIdx = list.findIndex((p) => p?.status === "wait");
+ if (firstWaitIdx > 0) return firstWaitIdx - 1;
+
+ // 濡傛灉娌℃湁寰呯敓浜э細
+ // - 涓旀渶鍚庝竴鏉℃槸鐢熶骇涓細婵�娲绘渶鍚庝竴鏉�
+ // - 鍚﹀垯锛氭病鏈夋縺娲绘牱寮�
+ const lastIdx = list.length - 1;
+ if (lastIdx >= 0 && list[lastIdx]?.status === "process") return lastIdx;
+ return null;
});
// 宸ュ簭杩涘害锛氱敤浜у嚭/鎶曞叆浼扮畻锛圲I 鍏堣窇閫氾紝鍚庣画鎸夌湡瀹炶鍒欐浛鎹級
@@ -366,11 +424,11 @@
// 涓嶈壇鐜囷細涓嶈壇鏁伴噺 / 浜у嚭鏁伴噺锛堝厛鎸夋鍙ｅ緞锛屽悗缁鎺ユ帴鍙ｅ彲璋冩暣锛�
const defectRateText = (p) => {
- // 浼樺厛浣跨敤鎺ュ彛瀛楁 scrapRate锛堜綘缁欑殑鎴浘鈥滀笉鑹巼鈥濓級
- const scrapRate = Number(p?.scrapRate ?? NaN);
- if (Number.isFinite(scrapRate)) {
- // 鏈変簺鎺ュ彛 scrapRate 鍙兘鏄� 0~1 鎴� 0~100锛岃繖閲屽仛涓�涓畝鍗曞垽鏂�
- const percent = scrapRate <= 1 ? scrapRate * 100 : scrapRate;
+ // 浼樺厛浣跨敤鎺ュ彛瀛楁 defectiveRate锛堜綘缁欑殑鎴浘鈥滀笉鑹巼鈥濓級
+ const defectiveRate = Number(p?.defectiveRate ?? NaN);
+ if (Number.isFinite(defectiveRate)) {
+ // 鏈変簺鎺ュ彛 defectiveRate 鍙兘鏄� 0~1 鎴� 0~100锛岃繖閲屽仛涓�涓畝鍗曞垽鏂�
+ const percent = defectiveRate <= 1 ? defectiveRate * 100 : defectiveRate;
return `${percent.toFixed(2)}%`;
}
@@ -563,6 +621,39 @@
pointer-events: none;
}
+ .step-status-badge {
+ position: absolute;
+ top: 8px;
+ right: 10px;
+ z-index: 1;
+ font-size: 11px;
+ font-weight: 600;
+ border-radius: 4px;
+ padding: 2px 8px;
+ line-height: 1.2;
+ pointer-events: none;
+ white-space: nowrap;
+ border: 1px solid transparent;
+ }
+
+ .step-status-badge-success {
+ color: #67c23a;
+ background: rgba(103, 194, 58, 0.14);
+ border-color: rgba(103, 194, 58, 0.35);
+ }
+
+ .step-status-badge-process {
+ color: #b88230;
+ background: rgba(230, 162, 60, 0.18);
+ border-color: rgba(230, 162, 60, 0.45);
+ }
+
+ .step-status-badge-wait {
+ color: #909399;
+ background: rgba(144, 147, 153, 0.12);
+ border-color: rgba(144, 147, 153, 0.35);
+ }
+
.right-panel {
border: 1px solid #ebeef5;
border-radius: 10px;
@@ -656,7 +747,7 @@
.step-grid {
display: grid;
- grid-template-columns: repeat(4, minmax(0, 1fr));
+ grid-template-columns: repeat(5, minmax(0, 1fr));
gap: 10px;
.grid-item {
background: #ffffff;
--
Gitblit v1.9.3