From 648f83f5d4480ae9c2794d5f4e114085943bdf6e Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 20 三月 2026 13:54:10 +0800
Subject: [PATCH] 造粒报工

---
 src/views/productionManagement/productionReporting/components/Detail.vue |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/views/productionManagement/productionReporting/components/Detail.vue b/src/views/productionManagement/productionReporting/components/Detail.vue
index 8820727..6439989 100644
--- a/src/views/productionManagement/productionReporting/components/Detail.vue
+++ b/src/views/productionManagement/productionReporting/components/Detail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {computed, onMounted} from "vue";
+import {computed, onMounted, ref} from "vue";
 
 defineOptions({
   name: "ReportingDetail"
@@ -23,10 +23,19 @@
   set: (value: boolean) => emits("update:isShow", value),
 });
 
-const otherData = ref([])
+const otherData = ref({})
+const otherDataEntries = computed(() => {
+  return Object.entries(otherData.value || {})
+      .filter(([key]) => key !== "rows")
+      .map(([key, value]) => ({key, value}));
+});
 const init = () => {
   if (props.row.otherData !== null && props.row.otherData !== '') {
-    otherData.value = JSON.parse(props.row.otherData);
+    try {
+      otherData.value = JSON.parse(props.row.otherData);
+    } catch {
+      otherData.value = {};
+    }
   }
 };
 
@@ -52,7 +61,15 @@
       <el-descriptions-item label="鍗曚綅">{{ row.scrapQty || '-' }}</el-descriptions-item>
       <el-descriptions-item label="鍒涘缓鏃堕棿">{{ row.createTime || '-' }}</el-descriptions-item>
       <el-descriptions-item
-          v-for="item in otherData"
+          v-for="item in otherDataEntries"
+          :key="item.key"
+          :label="item.key"
+      >
+        {{ item.value || '-' }}
+      </el-descriptions-item>
+      <el-descriptions-item
+          v-for="item in (otherData.rows || [])"
+          :key="item.parameterItem"
           :label="`${item.parameterItem}`"
       >
         {{ item.value || '-' }}

--
Gitblit v1.9.3