From 179772056665ccc50629c71d4e4ebbaba8640565 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Tue, 16 Apr 2024 14:05:15 +0800
Subject: [PATCH] =?UTF-8?q?2024-4*-16=20=E5=B7=A5=E8=89=BA=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/processroute/index.ts             |  5 +++
 .../processroute/components/configDialog.vue  | 35 +++++++++++--------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/api/mes/processroute/index.ts b/src/api/mes/processroute/index.ts
index 04e7c6abd..b18879dc3 100644
--- a/src/api/mes/processroute/index.ts
+++ b/src/api/mes/processroute/index.ts
@@ -30,6 +30,11 @@ export const getProcessroutePage = async (params) => {
 export const getProcessroute = async (id: number) => {
   return await request.get({ url: `/mes/processroute/get?id=` + id })
 }
+// 查询工艺路线定义的工序列表
+export const getProcessrouteNodeList = async (code:any) => {
+  return await request.get({ url: `/mes/processrouteNodeDetail/getRouteNodes?code=`+code })
+}
+
 
 // 新增工艺路线定义
 export const createProcessroute = async (data: ProcessrouteVO) => {
diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue
index d68b94120..cf4426e07 100644
--- a/src/views/mes/processroute/components/configDialog.vue
+++ b/src/views/mes/processroute/components/configDialog.vue
@@ -145,7 +145,6 @@ import { start_node, end_node, createGraph, getNewNode } from './graphbase.data'
 import  {ProcessSearch} from '../../publicUtil/processSearch.data'
 import * as ProcessrouteApi from '@/api/mes/processroute'
 import { Graph } from '@antv/x6'
-import { get } from 'http'
 const graphContainer = ref<HTMLElement | null>(null)
 defineOptions({ name: 'ProcessRouteConfig' })
 const isShowDrawer = ref(false)
@@ -234,11 +233,12 @@ const openDetail =  (row: any) => {
     materialData.value = []
     mouldData.value = []
     workStationList.value = []
-    graph.value.on('node:click', ({ e, x, y, node, view }) => {
+    graph.value.on('node:dblclick', ({ e, x, y, node, view }) => {
       nodeClick(e, x, y, node, view)
     })
     graph.value.fromJSON(graphJson.cells)
   })
+    getProcessList(rowData.value.processrouteCode)
     getItembasicInfo(rowData.value.productCode)
     getRemarkList()
     getFileList()
@@ -275,17 +275,24 @@ const getPatternPage = async (code) => {
 const getWorkstationPage = async (code) => {
   return await ProcessrouteApi.getWorkstationPage(code);
 }
-const processListParmas = ref({
-  name: '',
-  workshopCode: '',
-  productionLineCode:'',
-  pageNum: 1,
-  pageSize: 50
-})
-/**获取工序列表 */
-const getProcessList = async () => {
-  const res = await ProcessrouteApi.getProcessList(processListParmas.value)
-  processData.value = res.list
+// const processListParmas = ref({
+//   name: '',
+//   workshopCode: '',
+//   productionLineCode:'',
+//   pageNum: 1,
+//   pageSize: 50
+// })
+// /**获取基础工序列表 */
+// const getProcessList = async () => {
+//   const res = await ProcessrouteApi.getProcessList(processListParmas.value)
+//   processData.value = res.list
+//   //return res
+// }
+/**获取工艺路线定义的工序列表 */
+const getProcessList = async (code) => {
+  console.log('code',code)
+  const res = await ProcessrouteApi.getProcessrouteNodeList(code)
+  processData.value = res
   //return res
 }
 // 并行执行所有异步操作
@@ -353,7 +360,7 @@ defineExpose({ openDetail, createGraph }) // 提供 open 方法，用于打开
 onMounted?.(() => {
   //registerNodes()
 
-  getProcessList()
+  //getProcessList()
 })
 //保存图形
 const saveResult = async () => {