From d380b19833e2b7ffaf8d68addf9be22760601389 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 25 三月 2026 13:08:07 +0800
Subject: [PATCH] 生产报工中的生产记录必填校验未起作用
---
src/views/productionManagement/productionReporting/components/Detail.vue | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/components/Detail.vue b/src/views/productionManagement/productionReporting/components/Detail.vue
index 8820727..f4d964e 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 = {};
+ }
}
};
@@ -45,14 +54,22 @@
<el-descriptions-item label="鎶ュ伐浜哄憳">{{ row.nickName || '-' }}</el-descriptions-item>
<el-descriptions-item label="宸ュ簭">{{ row.process || '-' }}</el-descriptions-item>
<el-descriptions-item label="宸ュ崟缂栧彿">{{ row.workOrderNo || '-' }}</el-descriptions-item>
- <el-descriptions-item label="浜у搧鍚嶇О">{{ row.salesContractNo || '-' }}</el-descriptions-item>
- <el-descriptions-item label="浜у搧瑙勬牸鍨嬪彿">{{ row.productName || '-' }}</el-descriptions-item>
- <el-descriptions-item label="浜у嚭鏁伴噺">{{ row.productModelName || '-' }}</el-descriptions-item>
- <el-descriptions-item label="鎶ュ簾鏁伴噺">{{ row.quantity || '-' }}</el-descriptions-item>
- <el-descriptions-item label="鍗曚綅">{{ row.scrapQty || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="浜у搧鍚嶇О">{{ row.productName || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="浜у搧瑙勬牸鍨嬪彿">{{ row.productModelName || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="浜у嚭鏁伴噺">{{ row.quantity || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鎶ュ簾鏁伴噺">{{ row.scrapQty || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="鍗曚綅">{{ row.unit || '-' }}</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