From 10d40e15d8d39201469f61100933f36a48b68d6d Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期五, 24 四月 2026 18:01:58 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventory-management into dev_NEW_pro
---
src/views/productionManagement/productionOrder/index.vue | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 670290c..02e75eb 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -227,7 +227,15 @@
type: "text",
showHide: row => !row.processRouteCode,
clickFun: row => {
- openBindRouteDialog(row);
+ openBindRouteDialog(row, "add");
+ },
+ },
+ {
+ name: "鏇存崲宸ヨ壓璺嚎",
+ type: "text",
+ showHide: row => row.processRouteCode,
+ clickFun: row => {
+ openBindRouteDialog(row, "change");
},
},
// {
@@ -237,20 +245,20 @@
// showProductStructure(row);
// },
// },
- {
- name: "棰嗘枡",
- type: "text",
- clickFun: row => {
- openMaterialDialog(row);
- },
- },
- {
- name: "棰嗘枡璇︽儏",
- type: "text",
- clickFun: row => {
- openMaterialDetailDialog(row);
- },
- },
+ // {
+ // name: "棰嗘枡",
+ // type: "text",
+ // clickFun: row => {
+ // openMaterialDialog(row);
+ // },
+ // },
+ // {
+ // name: "棰嗘枡璇︽儏",
+ // type: "text",
+ // clickFun: row => {
+ // openMaterialDetailDialog(row);
+ // },
+ // },
],
},
]);
@@ -323,9 +331,9 @@
const materialDetailDialogVisible = ref(false);
const currentMaterialDetailOrder = ref(null);
- const openBindRouteDialog = async row => {
+ const openBindRouteDialog = async (row, type) => {
bindForm.orderId = row.id;
- bindForm.routeId = null;
+ bindForm.routeId = type === "add" ? null : row.processRouteCode;
bindRouteDialogVisible.value = true;
routeOptions.value = [];
if (!row.productModelId) {
@@ -354,7 +362,7 @@
try {
await bindingRoute({
id: bindForm.orderId,
- routeId: bindForm.routeId,
+ technologyRoutingId: bindForm.routeId,
});
proxy.$modal.msgSuccess("缁戝畾鎴愬姛");
bindRouteDialogVisible.value = false;
@@ -427,7 +435,7 @@
path: "/productionManagement/processRouteItem",
query: {
id: data.id,
- bomId: data.bomId,
+ bomId: data.orderBomId,
processRouteCode: data.processRouteCode || "",
productName: row.productName || "",
model: row.model || "",
--
Gitblit v1.9.3