From 924150c4d2a874d87173ce3e3d67caf345b323c9 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 23 七月 2026 09:25:59 +0800
Subject: [PATCH] 修改工资
---
src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
index 77b37c2..8bed52b 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
@@ -73,9 +73,9 @@
<!-- 鎶ュ伐瀹℃壒璇︽儏 -->
<template v-else-if="row.businessType === 19">
- <div v-if="formResolved.fields.length" class="report-detail">
+ <div v-if="formResolved.fields.length || reportParamList.length" class="report-detail">
<el-divider content-position="left">鎶ュ伐濉姤鍐呭</el-divider>
- <el-descriptions :column="2" border>
+ <el-descriptions v-if="formResolved.fields.length" :column="2" border>
<el-descriptions-item
v-for="field in formResolved.fields"
:key="field.key"
@@ -84,6 +84,22 @@
{{ formatFieldDisplayValue(field, formResolved.formPayload?.[field.key]) }}
</el-descriptions-item>
</el-descriptions>
+ <div v-if="reportParamList.length" class="report-param-block">
+ <el-divider content-position="left">鎶ュ伐鍙傛暟</el-divider>
+ <el-table :data="reportParamList" border size="small" style="width: 100%">
+ <el-table-column label="鍙傛暟鍚嶇О" prop="paramName" min-width="180" show-overflow-tooltip />
+ <el-table-column label="鍙傛暟鍊�" prop="inputValue" min-width="180" show-overflow-tooltip>
+ <template #default="scope">
+ {{ scope.row.inputValue || '鈥�' }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍗曚綅" prop="unit" min-width="100" show-overflow-tooltip>
+ <template #default="scope">
+ {{ scope.row.unit || '鈥�' }}
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
</div>
<el-empty v-else description="鏆傛棤鎶ュ伐濉姤鍐呭" />
</template>
@@ -227,6 +243,25 @@
return props.detailData || {};
});
+ const reportParamList = computed(() => {
+ const payload = formResolved.value?.formPayload || {};
+ const sources = [
+ payload.productionOperationParamList,
+ payload.reportParamList,
+ payload.paramList,
+ props.row?.productionOperationParamList,
+ props.row?.reportParamList,
+ props.row?.paramList,
+ ];
+ const list = sources.find(item => Array.isArray(item) && item.length) || [];
+ return list.map((param, index) => ({
+ id: param?.id ?? index,
+ paramName: param?.paramName || param?.parameterName || param?.name || `鍙傛暟${index + 1}`,
+ inputValue: param?.inputValue ?? param?.value ?? param?.paramValue ?? '',
+ unit: param?.unit || '',
+ }));
+ });
+
const attachmentList = computed(() => {
const list = props.row.storageBlobVOList || props.row.storageBlobDTOs || [];
return Array.isArray(list) ? list : [];
@@ -264,6 +299,10 @@
color: var(--el-color-danger);
}
+ .report-param-block {
+ margin-top: 20px;
+ }
+
.attachment-list {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
--
Gitblit v1.9.3