From 45a98ba63e6541a82416fde84aa5fa2efb9679bd Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 17:01:02 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventory-management into dev_NEW_pro
---
src/views/productionManagement/productionTraceability/index.vue | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/src/views/productionManagement/productionTraceability/index.vue b/src/views/productionManagement/productionTraceability/index.vue
index 8de8ab3..b9d37a1 100644
--- a/src/views/productionManagement/productionTraceability/index.vue
+++ b/src/views/productionManagement/productionTraceability/index.vue
@@ -1,5 +1,7 @@
<template>
<div class="app-container">
+ <PageHeader v-if="showHeader"
+ content="鐢熶骇璁㈠崟" />
<el-card style="height:82vh;overflow:auto;">
<template #header>
<div class="card-header">
@@ -68,22 +70,35 @@
</el-table-column>
<el-table-column label="浜у搧鍚嶇О"
align="center">
- <template #default>
- {{ rowData.productionOrderDto?.productName || '-' }}
+ <template #default="{ row }">
+ {{ row.workOrder.productName || '-' }}
</template>
</el-table-column>
<el-table-column label="瑙勬牸"
align="center">
- <template #default>
- {{ rowData.productionOrderDto?.model || '-' }}
+ <template #default="{ row }">
+ {{ row.workOrder.model || '-' }}
</template>
</el-table-column>
+ <el-table-column label="宸ュ簭"
+ prop="workOrder.operationName"
+ align="center" />
<el-table-column prop="workOrder.planQuantity"
label="闇�姹傛暟閲�"
align="center" />
<el-table-column prop="workOrder.completeQuantity"
label="瀹屾垚鏁伴噺"
align="center" />
+ <el-table-column prop="workOrder.scrapQty"
+ label="鎶ュ簾鏁伴噺"
+ align="center" />
+ <el-table-column prop="workOrder.completionStatus"
+ label="瀹屾垚杩涘害"
+ align="center">
+ <template #default="{ row }">
+ <span :style="{ color: customColors(row.workOrder.completionStatus) }">{{ row.workOrder.completionStatus || 0 }}%</span>
+ </template>
+ </el-table-column>
<el-table-column label="璇︽儏"
align="center"
width="200">
@@ -119,9 +134,13 @@
<el-descriptions-item label="瀹屾垚鏁伴噺">{{ detailData.workOrder.completeQuantity || 0 }}</el-descriptions-item>
<el-descriptions-item label="瀹為檯寮�濮嬫椂闂�">{{ parseTime(detailData.workOrder.actualStartTime) || '-' }}</el-descriptions-item>
<el-descriptions-item label="瀹為檯缁撴潫鏃堕棿">{{ parseTime(detailData.workOrder.actualEndTime) || '-' }}</el-descriptions-item>
- <el-descriptions-item label="鐘舵��">
- <el-tag :type="getStatusType(detailData.workOrder.status)">{{ getStatusText(detailData.workOrder.status) }}</el-tag>
- </el-descriptions-item>
+ <!-- <el-descriptions-item label="瀹屾垚杩涘害">
+ <el-progress :percentage="detailData.workOrder.completionStatus >= 100 ? 100 : (detailData.workOrder.completionStatus || 0)"
+ :color="customColors(detailData.workOrder.completionStatus)"
+ :status="detailData.workOrder.completionStatus >= 100 ? 'success' : ''"
+ style="width:500px;" />
+ </el-descriptions-item> -->
+ <el-descriptions-item label="瀹屾垚杩涘害"><span :style="{ color: customColors(detailData.workOrder.completionStatus) }">{{ detailData.workOrder.completionStatus || 0 }}%</span></el-descriptions-item>
</el-descriptions>
</div>
<div class="detail-section">
@@ -141,6 +160,15 @@
{{ parseTime(row.createTime) }}
</template>
</el-table-column>
+ <el-table-column label="宸ユ椂锛坔锛�"
+ prop="workHour"
+ align="center" />
+ <el-table-column label="浜у嚭鏁伴噺"
+ prop="quantity"
+ align="center" />
+ <el-table-column label="鎶ュ簾鏁伴噺"
+ prop="scrapQty"
+ align="center" />
<el-table-column label="鎿嶄綔"
align="center"
width="200">
@@ -227,7 +255,7 @@
width="60"
align="center" />
<el-table-column label="鎸囨爣"
- prop="paramName"
+ prop="parameterItem"
align="center" />
<el-table-column label="鍗曚綅"
prop="unit"
@@ -235,8 +263,11 @@
<el-table-column label="鏍囧噯鍊�"
prop="standardValue"
align="center" />
+ <el-table-column label="鍐呮帶鍊�"
+ prop="controlValue"
+ align="center" />
<el-table-column label="瀹為檯鍊�"
- prop="inputValue"
+ prop="testValue"
align="center" />
</el-table>
</div>
@@ -253,7 +284,7 @@
</template>
<script setup>
- import { ref, reactive, onMounted } from "vue";
+ import { ref, reactive, onMounted, computed } from "vue";
import { useRoute, useRouter } from "vue-router";
import { ElMessage } from "element-plus";
import { parseTime } from "@/utils/ruoyi";
@@ -265,6 +296,13 @@
const route = useRoute();
const router = useRouter();
+
+ // 鍒ゆ柇鏄惁鏄剧ず椤靛ご
+ const showHeader = computed(() => {
+ return (
+ Object.keys(route.query).length > 0 || Object.keys(route.params).length > 0
+ );
+ });
// 鎼滅储鐩稿叧
const searchForm = reactive({
@@ -371,6 +409,7 @@
workOrder: row.workOrder || {},
reports: (row.reportList || []).map(r => ({
...r.reportMain,
+ ...(r.reportOutputList[0] || {}),
productionOperationParamList: r.reportParamList || [],
})),
};
--
Gitblit v1.9.3