From bbb54adc8d9fd6ae6b87ac036c8b21f3ad7daef4 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 16 七月 2026 10:05:40 +0800
Subject: [PATCH] 工作台报工完善
---
src/views/mes/workbench/components/tabs/RecordParamTab.vue | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/src/views/mes/workbench/components/tabs/RecordParamTab.vue b/src/views/mes/workbench/components/tabs/RecordParamTab.vue
index 7ecea3a..5cf6271 100644
--- a/src/views/mes/workbench/components/tabs/RecordParamTab.vue
+++ b/src/views/mes/workbench/components/tabs/RecordParamTab.vue
@@ -26,6 +26,8 @@
const props = defineProps<{
/** 褰撳墠宸ュ崟缂栧彿 */
workOrderId?: number;
+ /** 褰撳墠宸ヤ綔绔欑紪鍙� */
+ workstationId?: number;
}>();
// --- 妯″紡 ---
@@ -283,6 +285,7 @@
try {
const result = await getWorkOrderParamRecordPage({
workOrderId: props.workOrderId,
+ workstationId: props.workstationId,
pageNo: 1,
pageSize: 100,
});
@@ -292,20 +295,15 @@
}
}
-// 宸ュ崟鍙樻洿鏃跺姞杞借褰�
+// 宸ュ崟鎴栧伐浣滅珯鍙樻洿鏃跺姞杞借褰�
watch(
- () => props.workOrderId,
+ () => [props.workOrderId, props.workstationId],
() => {
handleCancelForm();
refreshRecordList();
},
+ { immediate: true },
);
-
-/** 鏍煎紡鍖栧弬鏁板�煎睍绀� */
-function formatParamDisplay(detail: MesProWorkOrderParamRecordApi.ParamRecordDetail) {
- const unit = detail.unitMeasureName ? ` ${detail.unitMeasureName}` : '';
- return `${detail.paramName}: ${detail.paramValue ?? '-'}${unit}`;
-}
</script>
<template>
@@ -410,7 +408,7 @@
<!-- 鏃犲伐鍗曟彁绀� -->
<div v-if="!workOrderId" class="record-param-tab__empty">
<IconifyIcon icon="lucide:alert-circle" class="record-param-tab__empty-icon" />
- <p>璇峰厛浠庡乏渚ч�夋嫨涓�鏉″伐鍗曚换鍔�</p>
+ <p>璇峰厛閫夋嫨宸ヤ綔绔欏拰宸ュ崟浠诲姟</p>
</div>
<!-- 绌哄垪琛� -->
@@ -450,13 +448,16 @@
澶囨敞锛歿{ record.remark }}
</div>
<div class="record-param-tab__card-params">
- <span
+ <div
v-for="d in record.details"
:key="d.id"
- class="record-param-tab__param-tag"
+ class="record-param-tab__param-row"
>
- {{ formatParamDisplay(d) }}
- </span>
+ <span class="record-param-tab__param-name">{{ d.paramName }}</span>
+ <span class="record-param-tab__param-value">
+ {{ d.paramValue ?? '-' }}<span v-if="d.unitMeasureName" class="record-param-tab__param-unit"> {{ d.unitMeasureName }}</span>
+ </span>
+ </div>
</div>
</div>
</div>
@@ -680,20 +681,38 @@
}
.record-param-tab__card-params {
- display: flex;
- flex-wrap: wrap;
- gap: 6px;
+ display: grid;
+ grid-template-columns: repeat(3, 1fr);
+ gap: 4px 16px;
margin-top: 8px;
}
-.record-param-tab__param-tag {
- display: inline-flex;
- align-items: center;
- padding: 3px 10px;
- border-radius: 4px;
+.record-param-tab__param-row {
+ display: flex;
+ align-items: baseline;
+ gap: 8px;
+ font-size: 13px;
+ line-height: 1.6;
+ padding: 2px 0;
+}
+
+.record-param-tab__param-name {
+ flex-shrink: 0;
+ color: #8c8c8c;
+ min-width: 100px;
+
+ &::after {
+ content: ':';
+ }
+}
+
+.record-param-tab__param-value {
+ color: #1a1a1a;
+ font-weight: 500;
+}
+
+.record-param-tab__param-unit {
+ color: #8c8c8c;
font-size: 12px;
- background: #f6ffed;
- color: #389e0d;
- border: 1px solid #d9f7be;
}
</style>
--
Gitblit v1.9.3