From 04687ca035e6fa517e88470aac7247812f85eb95 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 17 四月 2026 17:09:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/views/productionManagement/productionOrder/index.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 8d4a8aa..667688e 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -48,7 +48,7 @@
@click="handleQuery">鎼滅储</el-button>
</el-form-item>
</el-form>
- <div>
+ <div class="action-buttons">
<el-button type="primary" @click="isShowNewModal = true">鏂板</el-button>
<el-button type="danger" @click="handleDelete">鍒犻櫎</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
@@ -224,13 +224,13 @@
openBindRouteDialog(row);
},
},
- {
- name: "浜у搧缁撴瀯",
- type: "text",
- clickFun: row => {
- showProductStructure(row);
- },
- },
+ // {
+ // name: "浜у搧缁撴瀯",
+ // type: "text",
+ // clickFun: row => {
+ // showProductStructure(row);
+ // },
+ // },
{
name: "棰嗘枡",
type: "text",
@@ -421,6 +421,7 @@
path: "/productionManagement/processRouteItem",
query: {
id: data.id,
+ bomId: data.bomId,
processRouteCode: data.processRouteCode || "",
productName: data.productName || "",
model: data.model || "",
@@ -504,6 +505,12 @@
align-items: start;
}
+.action-buttons {
+ display: flex;
+ flex-wrap: nowrap;
+ gap: 8px;
+}
+
:deep(.yellow) {
background-color: #FAF0DE;
}
--
Gitblit v1.9.3