From 6e6de6c3c110e56ff832ea8d32a8db2ab32f8133 Mon Sep 17 00:00:00 2001
From: zhousq <zhoushaoqiang@sina.com>
Date: Tue, 19 Mar 2024 17:28:44 +0800
Subject: [PATCH] =?UTF-8?q?2024-3-18=20=E5=A2=9E=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/processroute/index.ts             |  6 +-
 .../processroute/components/configDialog.vue  | 58 +++++--------------
 2 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/src/api/mes/processroute/index.ts b/src/api/mes/processroute/index.ts
index f9409206c..be6648c4f 100644
--- a/src/api/mes/processroute/index.ts
+++ b/src/api/mes/processroute/index.ts
@@ -61,15 +61,15 @@ export const importTemplate = () => {
 }
 // 获取工序工序列表-
 export const getProcessList =async (params) => {
-  return request.get({ url: `/wms/process/page`,params })
+  return await request.get({ url: `/wms/process/page`, params })
 }
 // 获取工序工序信息-
 export const getProcesInfo = async(code:String) => {
-  return request.get({ url: `/wms/process/getByCode?code=`,code })
+  return await request.get({ url: `/wms/process/getByCode?code=`,code })
 }
 // 获取产品信息列表-
 export const getProductInfo =async (code:String) => {
-  return request.get({ url: `/wms/itembasic/getProduct?code=`+code})
+  return await request.get({ url: `/wms/itembasic/getProduct?code=`+code})
 }
 
 // 获取设备列表-参数为工序编码
diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue
index 4f9957a31..3f041b99b 100644
--- a/src/views/mes/processroute/components/configDialog.vue
+++ b/src/views/mes/processroute/components/configDialog.vue
@@ -26,42 +26,12 @@
 
       <el-row :gutter="10" style="height: calc(100vh - 300px)">
         <el-col :span="6">
-          <!-- <el-form>
-            <el-form-item label="车间选择">
-              <el-select
-                :v-model="processListParmas.workshopCode"
-                value-key="code"
-                placeholder="Select"
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="item in workshopCodeOptions"
-                  :key="item.code"
-                  :label="item.name"
-                  :value="item"
-                />
-    </el-select>
-            </el-form-item>
-            <el-form-item label="产线选择">
-              <el-select
-                :v-model="processListParmas.productionLineCode"
-                value-key="code"
-                placeholder="Select"
-                style="width: 240px"
-              >
-                <el-option
-                  v-for="item in productionLineCodeOptions"
-                  :key="item.code"
-                  :label="item.name"
-                  :value="item"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="">
-              <el-button type="primary" @click="getProcessList">搜索</el-button>
-            </el-form-item>
-              
-          </el-form> -->
+              <el-input v-model="processListParmas.name" placeholder="工序名称">
+                <template #append>
+                  <el-button @click="getProcessList" >查询</el-button>
+                </template>
+              </el-input>
+           
           <el-table :data="processData" ref="tableProcess" style="width: 100%; height: 80%">
             <el-table-column prop="name" label="工序名称">
               <template #default="scope">
@@ -126,9 +96,8 @@
 <script lang="ts" setup>
 import { start_node, end_node, createGraph, registerNodes, getNewNode } from './graphbase.data'
 import * as ProcessrouteApi from '@/api/mes/processroute'
+import { Search } from '@/components/Search'
 import { Graph } from '@antv/x6'
-import { table } from 'console'
-
 //import { async } from '@antv/x6/lib/registry/marker/async'
 //import { object } from 'vue-types'
 const graphContainer = ref<HTMLElement | null>(null)
@@ -180,7 +149,6 @@ const handleDrawerClose = () => {
   if (graph && graph.value != undefined) {
     //console.log(graph.value.toJSON())
   }
-  
 }
 //**获取 工序信息 */
 const getProcessInfo = async (id: number) => {
@@ -213,17 +181,19 @@ const getWorkerList = async (code: String) => {
   //console.log(productData.value)
 }
 const processListParmas = ref({
+  name: '',
   workshopCode: '',
-  productionLineCode: '',
+  productionLineCode:'',
   pageNum: 1,
   pageSize: 50
 })
 /**获取工序列表 */
 const getProcessList = async () => {
+  //console.log(processListParmas.value)
   const res = await ProcessrouteApi.getProcessList(processListParmas.value)
-
+ 
   processData.value = res.list
-
+  
   //return res
 }
 const nodeClick = (e, x, y, node, view) => {
@@ -306,9 +276,7 @@ const saveResult = async () => {
 }
 // 验证图形
 onUnmounted(() => {})
-const emit = defineEmits([
-  'close',
-])
+const emit = defineEmits(['close'])
 </script>
 <style lang="scss">
 .el-drawer__body {