From 12e91fcaa34db4ffe853b6fd689a17dd580e71f2 Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Mon, 15 Apr 2024 11:40:56 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=88=E8=AE=A1=E5=88=92=E5=B7=A5?=
 =?UTF-8?q?=E5=8E=82=E7=BC=96=E7=A0=81=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                       |  4 +-
 src/api/mes/workstation/index.ts       |  9 ++--
 src/views/mes/ordermonthplan/index.vue |  2 -
 src/views/mes/workstation/index.vue    | 57 +++++++++++++++-----------
 4 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/.env.development b/.env.development
index 81e0d3dfb..c47a3135c 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://192.168.0.113:12080'
+VITE_BASE_URL='http://localhost:12080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload'
@@ -34,4 +34,4 @@ VITE_OUT_DIR=dist
 VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html'
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://localhost:12080'
\ No newline at end of file
+VITE_JMREPORT_BASE_URL='http://localhost:12080'
diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index a3dfde12d..08794d283 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -72,7 +72,6 @@ export const createEquipmentRelation = async (equipmentCodes:string[]) => {
 
 // 删除设备关联
 export const deleteEquipmentRelation = async (equipmentCodes:string[]) => {
-  debugger
   const data = {
     workstationCode : goalParams.workstationCode,
     equipmentCodes : equipmentCodes
@@ -139,19 +138,19 @@ export const checkOperstepsPageList = async (params) => {
   }
 }
 // 添加操作步骤关联
-export const createOperstepsRelation = async (processCodes:string[]) => {
+export const createOperstepsRelation = async (codes:string[]) => {
   const data = {
     workstationCode : goalParams.workstationCode,
-    processCodes : processCodes
+    operstepsCodes : codes
   }
   return await request.post({ url: `/strategy/workstation-opersteps/createRelation`, data })
 }
 
 // 删除操作步骤关联
-export const deleteOperstepsRelation = async (processCodes:string[]) => {
+export const deleteOperstepsRelation = async (codes:string[]) => {
   const data = {
     workstationCode : goalParams.workstationCode,
-    processCodes : processCodes
+    operstepsCodes : codes
   }
   return await request.post({ url: `/strategy/workstation-opersteps/deleteRelation`, data })
 }
diff --git a/src/views/mes/ordermonthplan/index.vue b/src/views/mes/ordermonthplan/index.vue
index 32805630a..fc5c30e21 100644
--- a/src/views/mes/ordermonthplan/index.vue
+++ b/src/views/mes/ordermonthplan/index.vue
@@ -44,8 +44,6 @@
     @success="formsSuccess"
     :rules="MesOrderMonthMainRules"
     :formAllSchemas="MesOrderMonthMain.allSchemas"
-    :apiUpdate="updateMesOrderMonthMain"
-    :apiCreate="createMesOrderMonthMain"
     :apiDelete="MesOrderMonthApi.deleteMesOrderMonthMain"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 092a7e41b..bfcf17225 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -52,21 +52,22 @@
 
   <!-- 详情 -->
   <Detail ref="detailRef"
-    :isBasic="false"
-    :isOpenSearchTable="true"
-    :apiCreate="tabsCreateApi"
-    :apiDelete="tabsDeleteApi"
-    :allSchemas="Workstation.allSchemas"
-    :detailAllSchemas="detailAllSchemas"
-    :searchTableSchema="tmpPopList"
-    :detailAllSchemasRules="WorkstationRules"
-    :apiPage="apiPage"
-    :tabs="TabsList"
-    @changeTabs="changeTabs"
-    :detailButtonIsShowAdd="true"
-    :detailButtonIsShowDelete="true"
-    :detailButtonIsShowEdit="false"
-    @detailOpenForm="detailOpenForm"
+          :isBasic="false"
+          :isOpenSearchTable="true"
+          :apiCreate="tabsCreateApi"
+          :apiDelete="tabsDeleteApi"
+          :allSchemas="Workstation.allSchemas"
+          :detailAllSchemas="detailAllSchemas"
+          :searchTableSchema="tmpPopList"
+          :detailAllSchemasRules="WorkstationRules"
+          :apiPage="apiPage"
+          :tabs="TabsList"
+          @changeTabs="changeTabs"
+          :detailButtonIsShowAdd="true"
+          :detailButtonIsShowDelete="true"
+          :detailButtonIsShowEdit="false"
+          @detailOpenForm="detailOpenForm"
+          @searchTableSuccessDetail="searchTableSuccess"
   />
   <BasicForm
     ref="tmpPopListRef"
@@ -78,19 +79,19 @@
 <script setup lang="ts">
 import {
   Equipment,
+  equipmentPopList,
   Opersteps,
+  stepPopList,
   TabsList,
   Workstation,
-  WorkstationRules,equipmentPopList,stepPopList
+  WorkstationRules
 } from './workstation.data'
 import * as WorkstationApi from '@/api/mes/workstation'
+import {goalParams} from '@/api/mes/workstation'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import {
-  goalParams,
-} from "@/api/mes/workstation";
 import Detail from './components/Detail.vue'
+
 defineOptions({ name: 'Workstation' })
 let tabsDeleteApi = WorkstationApi.deleteEquipmentRelation
 let tabsCreateApi = WorkstationApi.createEquipmentRelation
@@ -103,10 +104,18 @@ const tableColumns = ref(Workstation.allSchemas.tableColumns)
 
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
-  nextTick(() => {
-    const setV = {}
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+  console.log(formField)
+  console.log(searchField)
+  console.log(val)
+  console.log(formRef)
+  nextTick(async () => {
+    debugger
+    if (formRef) {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    } else {
+    }
   })
 }