From e1570f458b2ab42bb1a212be8de63134a50b2af1 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 30 七月 2026 16:09:03 +0800
Subject: [PATCH] 生产核算增加折算工时，隐藏工资
---
src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue | 67 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 5 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
index b9eb42f..8bed52b 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
@@ -19,9 +19,9 @@
{{ approvalTypeLabel(row.approvalType) }}
</span>
</el-descriptions-item>
- <el-descriptions-item label="鐢宠浜虹紪鍙�">{{ row.applicantNo || "鈥�" }}</el-descriptions-item>
- <el-descriptions-item label="鐢宠浜哄悕绉�">{{ row.applicantName || "鈥�" }}</el-descriptions-item>
- <el-descriptions-item label="鐢宠鎽樿">{{ row.summary || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戣捣浜虹紪鍙�">{{ row.applicantNo || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鍙戣捣浜哄悕绉�">{{ row.applicantName || "鈥�" }}</el-descriptions-item>
+ <el-descriptions-item label="鎽樿">{{ row.summary || "鈥�" }}</el-descriptions-item>
<el-descriptions-item v-if="row.rejectReason"
label="椹冲洖鍘熷洜"
:span="2">
@@ -36,7 +36,7 @@
<div class="detail-block">
<div class="detail-block-title">濉姤鍐呭</div>
<!-- 榛樿琛ㄥ崟灞曠ず -->
- <FormPayloadFields v-if="!isSpecialApprovalType"
+ <FormPayloadFields v-if="!isSpecialApprovalType && row.businessType !== 19"
:fields="formResolved.fields"
:form-payload="formResolved.formPayload"
readonly />
@@ -69,6 +69,39 @@
</el-table>
</div>
</div>
+ </template>
+
+ <!-- 鎶ュ伐瀹℃壒璇︽儏 -->
+ <template v-else-if="row.businessType === 19">
+ <div v-if="formResolved.fields.length || reportParamList.length" class="report-detail">
+ <el-divider content-position="left">鎶ュ伐濉姤鍐呭</el-divider>
+ <el-descriptions v-if="formResolved.fields.length" :column="2" border>
+ <el-descriptions-item
+ v-for="field in formResolved.fields"
+ :key="field.key"
+ :label="field.label || field.key"
+ >
+ {{ 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>
<!-- 閲囪喘瀹℃壒璇︽儏 -->
@@ -188,6 +221,7 @@
approvalStatusLabel,
approvalStatusTagType,
resolveInstanceFormFields,
+ formatFieldDisplayValue,
} from "../approveListConstants.js";
import FormPayloadFields from "./FormPayloadFields.vue";
@@ -207,6 +241,25 @@
// 璇︽儏鏁版嵁锛堢洿鎺ヤ娇鐢ㄤ紶鍏ョ殑 detail-data 鍙傛暟锛�
const detailData = computed(() => {
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(() => {
@@ -246,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));
@@ -283,4 +340,4 @@
align-items: center;
flex-shrink: 0;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3