From 716b64bf299622a3d0dad0d3cc4e1e2e4306bd7f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 八月 2026 15:40:20 +0800
Subject: [PATCH] fix(monitor): 修正操作时间选择器的日期格式
---
src/views/productionManagement/productionOrder/index.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index c37358b..6e0c55a 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -125,7 +125,8 @@
<!-- 鏉ユ簮鏁版嵁寮圭獥 -->
<el-dialog v-model="sourceDataDialogVisible"
title="鏉ユ簮鏁版嵁"
- width="1200px">
+ width="1200px"
+ custom-class="source-data-dialog">
<div v-if="sourceRowData"
class="applyno-summary1">
<div class="summary-item">
@@ -402,7 +403,7 @@
name: "棰嗘枡",
type: "text",
color: "#5EC7AB",
- showHide: row => !row.endOrder,
+ showHide: row => !row.endOrder && !row.returned,
clickFun: row => {
openMaterialDialog(row);
},
@@ -411,7 +412,7 @@
name: "琛ユ枡",
type: "text",
color: "#5EC7AB",
- showHide: row => !row.endOrder,
+ showHide: row => !row.endOrder && !row.returned,
clickFun: row => {
openMaterialSupplementDialog(row);
},
@@ -487,7 +488,7 @@
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));
};
// 30/50/80/100 鍒嗘棰滆壊锛氱孩/姗�/钃�/缁�
@@ -570,7 +571,7 @@
const openBindRouteDialog = async (row, type) => {
bindForm.orderId = row.id;
- bindForm.routeId = type === "add" ? null : row.processRouteCode;
+ bindForm.routeId = type === "add" ? null : row.technologyRoutingId;
bindRouteDialogVisible.value = true;
routeOptions.value = [];
if (!row.productModelId) {
@@ -723,6 +724,7 @@
bomNo: row.bomNo || "",
description: data.description || "",
quantity: row.quantity || 0,
+ technologyRoutingId: data.technologyRoutingId,
orderId,
type: "order",
editable: !row.endOrder,
@@ -810,9 +812,9 @@
})
.then(() => {
proxy.download(
- "/productOrder/export",
+ "/productionOrder/export",
{ ...searchForm.value },
- "鐢熶骇璁㈠崟.xlsx"
+ "鐢熶骇璁㈠崟鏁版嵁.xlsx"
);
})
.catch(() => {
@@ -943,6 +945,17 @@
text-shadow: 0 1px 2px rgba(64, 158, 255, 0.2);
}
+ .source-data-dialog {
+ display: flex;
+ flex-direction: column;
+ max-height: 80vh;
+
+ .el-dialog__body {
+ overflow-y: auto;
+ flex: 1;
+ }
+ }
+
.source-table-container {
margin-top: 20px;
}
@@ -951,8 +964,6 @@
display: flex;
flex-direction: column;
gap: 16px;
- max-height: 500px;
- overflow-y: auto;
padding: 10px;
background-color: #f5f7fa;
border-radius: 4px;
--
Gitblit v1.9.3