From d24b6784857a9b2817736270a22ef198445703d9 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 23 三月 2026 14:25:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/views/productionManagement/productionReporting/components/Detail.vue | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/components/Detail.vue b/src/views/productionManagement/productionReporting/components/Detail.vue
index 8820727..471d388 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 = {};
+ }
}
};
@@ -37,6 +46,7 @@
</script>
<template>
+ {{ row }}
<el-dialog v-model="visible"
:title="'璇︽儏'"
width="90%">
@@ -52,7 +62,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