From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/mes/workbench/components/tabs/RecordParamTab.vue |   85 ++++++++++++++++++++++++++++++------------
 1 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/src/views/mes/workbench/components/tabs/RecordParamTab.vue b/src/views/mes/workbench/components/tabs/RecordParamTab.vue
index 7ecea3a..d6f9a64 100644
--- a/src/views/mes/workbench/components/tabs/RecordParamTab.vue
+++ b/src/views/mes/workbench/components/tabs/RecordParamTab.vue
@@ -24,8 +24,12 @@
 defineOptions({ name: 'WorkbenchRecordParamTab' });
 
 const props = defineProps<{
+  /** 褰撳墠浠诲姟缂栧彿锛堢敤浜庣洃鍚换鍔″垏鎹級 */
+  taskId?: number;
   /** 褰撳墠宸ュ崟缂栧彿 */
   workOrderId?: number;
+  /** 褰撳墠宸ヤ綔绔欑紪鍙� */
+  workstationId?: number;
 }>();
 
 // --- 妯″紡 ---
@@ -156,6 +160,20 @@
   await paramFormApi.resetForm();
   await nextTick();
   await paramFormApi.setState({ schema: [...baseSchemas, ...paramSchemas] });
+
+  // 鏄惧紡璁剧疆宸叉湁鍊硷紝纭繚琛ㄥ崟妯″瀷缁戝畾姝ｇ‘
+  if (existingValues && existingValues.size > 0) {
+    for (const [detailId, value] of existingValues) {
+      // 鏍规嵁鍙傛暟绫诲瀷杞崲鍊硷紝鏁板�肩被鍨嬮渶瑕佽浆涓� number
+      const detail = details.find((d) => d.id === detailId);
+      const paramType = detail?.paramType ?? 1;
+      let convertedValue: any = value;
+      if ((paramType === 1 || paramType === 2) && value != null && value !== '') {
+        convertedValue = Number(value);
+      }
+      await paramFormApi.setFieldValue(`param_${detailId}`, convertedValue);
+    }
+  }
 }
 
 /** 鏂板鍙傛暟璁板綍 */
@@ -282,7 +300,8 @@
   recordLoading.value = true;
   try {
     const result = await getWorkOrderParamRecordPage({
-      workOrderId: props.workOrderId,
+      taskId: props.workOrderId,
+      workstationId: props.workstationId,
       pageNo: 1,
       pageSize: 100,
     });
@@ -292,20 +311,15 @@
   }
 }
 
-// 宸ュ崟鍙樻洿鏃跺姞杞借褰�
+// 浠诲姟/宸ュ崟/宸ヤ綔绔欏彉鏇存椂鍔犺浇璁板綍
 watch(
-  () => props.workOrderId,
+  () => [props.taskId, 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 +424,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 +464,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 +697,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