From 9b25e5c7a4e2e300b213ad4d5fb4d4b72cdced39 Mon Sep 17 00:00:00 2001
From: zhang_nuo <zhang_12370@163.com>
Date: 星期日, 13 九月 2026 11:40:54 +0800
Subject: [PATCH] fix(monitor/operlog): 修复操作日志表格操作日期显示错误

---
 src/views/productionManagement/workOrderManagement/index.vue |   53 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/views/productionManagement/workOrderManagement/index.vue b/src/views/productionManagement/workOrderManagement/index.vue
index 600b274..704bcbf 100644
--- a/src/views/productionManagement/workOrderManagement/index.vue
+++ b/src/views/productionManagement/workOrderManagement/index.vue
@@ -57,7 +57,7 @@
               <span class="info-value">{{ transferCardRowData.productName }}</span>
             </div>
             <div class="info-item">
-              <span class="info-label">浜у搧瑙勬牸</span>
+              <span class="info-label">瑙勬牸鍨嬪彿</span>
               <span class="info-value">{{ transferCardRowData.model }}</span>
             </div>
             <div class="info-item">
@@ -161,6 +161,17 @@
                        :value="user.userId" />
           </el-select>
         </el-form-item>
+        <!-- 宸ユ椂 -->
+        <el-form-item label="宸ユ椂"
+                      v-if="currentReportRowData?.type == 0"
+                      prop="workHour">
+          <el-input v-model.number="reportForm.workHour"
+                    type="number"
+                    min="0"
+                    style="width: 280px"
+                    placeholder="璇疯緭鍏ュ伐鏃�" /><span style="margin-left:10px"
+                class="param-unit">h</span>
+        </el-form-item>
         <div v-if="params.length > 0"
              class="param-grid"
              v-loading="paramLoading">
@@ -259,6 +270,7 @@
     addProductMain,
     downProductWorkOrder,
   } from "@/api/productionManagement/workOrder.js";
+  import { listMaterialPickingDetail } from "@/api/productionManagement/productionOrder.js";
   import { findProcessParamListOrder } from "@/api/productionManagement/productProcessRoute.js";
   import { getUserProfile, userListNoPageByTenantId } from "@/api/system/user.js";
   import { getDicts } from "@/api/system/dict/data";
@@ -418,6 +430,7 @@
     productMainId: null,
     productionOrderRoutingOperationId: "",
     productionOrderId: "",
+    workHour: 0,
     paramGroups: {},
   });
 
@@ -531,12 +544,18 @@
     },
   });
   const { searchForm } = toRefs(data);
+  // 鏁伴噺杩愮畻淇濈暀6浣嶅皬鏁帮紝閬垮厤娴偣鍑忔硶鍑虹幇 7.199999999999999 杩欑被绮惧害璇樊
+  const toQuantity = val => {
+    const n = Number(val);
+    if (!Number.isFinite(n)) return 0;
+    return parseFloat(n.toFixed(6));
+  };
   const toProgressPercentage = val => {
     const n = Number(val);
     if (!Number.isFinite(n)) return 0;
     if (n <= 0) return 0;
     if (n >= 100) return 100;
-    return Math.round(n);
+    return parseFloat(n.toFixed(2));
   };
   const progressColor = percentage => {
     const p = toProgressPercentage(percentage);
@@ -644,9 +663,29 @@
     fileDialogVisible.value = true;
   };
 
-  const showReportDialog = row => {
+  const showReportDialog = async row => {
+    if (row.productionOrderId) {
+      try {
+        const res = await listMaterialPickingDetail(row.productionOrderId);
+        const records = Array.isArray(res.data)
+          ? res.data
+          : res.data?.records || [];
+        if (res.code === 200 && records.length === 0) {
+          proxy.$modal.msgError("鏈鏂欐棤娉曟姤宸�");
+          return;
+        }
+      } catch (error) {
+        console.error("鏌ヨ棰嗘枡璇︽儏澶辫触:", error);
+      }
+    }
     currentReportRowData.value = row;
-    reportForm.planQuantity = row.planQuantity;
+    const planQuantity = Number(row.planQuantity || 0);
+    const completeQuantity = Number(row.completeQuantity || 0);
+    const remainingQuantity = Math.max(
+      0,
+      toQuantity(planQuantity - completeQuantity)
+    );
+    reportForm.planQuantity = remainingQuantity;
     reportForm.quantity =
       row.quantity !== undefined && row.quantity !== null ? row.quantity : null;
     reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
@@ -658,6 +697,11 @@
     reportForm.productionOrderRoutingOperationId =
       row.productionOrderRoutingOperationId;
     reportForm.productionOrderId = row.productionOrderId;
+    if (row.type == 0) {
+      reportForm.workHour = row.workHour || 0;
+    } else {
+      reportForm.workHour = 0;
+    }
     nextTick(() => {
       reportFormRef.value?.clearValidate();
       if (row.productionOrderRoutingOperationId && row.productionOrderId) {
@@ -757,6 +801,7 @@
         productionOrderRoutingOperationId:
           reportForm.productionOrderRoutingOperationId,
         productionOrderId: reportForm.productionOrderId,
+        workHour: reportForm.workHour,
         productionOperationParamList: productionOperationParamList,
       };
 

--
Gitblit v1.9.3