From 9fa58487cf0c68543d2e9bb684d1bb12a03c5cde Mon Sep 17 00:00:00 2001
From: bjang03 <wenwu901@icloud.com>
Date: Mon, 1 Apr 2024 17:21:28 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E5=B7=A5=E4=BD=8D?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=AD=A5=E9=AA=A4=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/workstation/index.vue           | 13 +++++++------
 src/views/mes/workstation/workstation.data.ts | 12 +++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 6c408efca..8c3be7b0c 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -65,10 +65,10 @@
           :detailButtonIsShowEdit="false"
           @detailOpenForm="detailOpenForm"
   />
-  <!-- 记录子包装弹窗 -->
   <BasicForm
-    ref="popCheckListRef"
-    :tableAllSchemas="popCheckList.allSchemas"
+    ref="teamListRef"
+    :formAllSchemas="popList.allSchemas"
+    :isBusiness="false"
   />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/workstation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -83,7 +83,7 @@ import {
   TabsList,
   Team,
   Workstation,
-  WorkstationRules, popCheckList
+  WorkstationRules, popList
 } from './workstation.data'
 import * as WorkstationApi from '@/api/mes/workstation'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -291,8 +291,9 @@ const changeTabs = (data) =>{
     tabsDeleteApi = WorkstationApi.deleteOperstepsRelation
   }
 }
-const popCheckListRef = ref()
+const teamListRef = ref()
+
 const detailOpenForm =  async (type, params) => {
-  popCheckListRef.value.open('create', params.code, null, 'viewDetail')
+  teamListRef.value.open('create', null, null, 'viewDetail')//查看明细数据
 }
 </script>
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
index 535bf7dbc..e5ac54c59 100644
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -1,7 +1,6 @@
 import type {CrudSchema} from '@/hooks/web/useCrudSchemas'
 import {dateFormatter} from '@/utils/formatTime'
-import {Warehouse} from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data";
-import * as WarehouseApi from "@/api/wms/warehouse";
+import * as WorkstationApi from "@/api/mes/workstation";
 
 // 表单校验
 export const WorkstationRules = reactive({
@@ -215,13 +214,12 @@ export const Opersteps = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm:true,
   }
 ]))
-export const popCheckList = useCrudSchemas(reactive<CrudSchema[]>([
+export const popList = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '多选列表',
     field: 'popCheckList',
     sort: 'custom',
-    isSearch: true,
-    isForm: false,
+    isSearch: false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -229,8 +227,8 @@ export const popCheckList = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择仓库代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '仓库信息', // 查询弹窗标题
-        searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类
-        searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法
+        searchAllSchemas: Team.allSchemas, // 查询弹窗所需类
+        searchPage: WorkstationApi.getTeamPage, // 查询弹窗所需分页方法
         searchCondition: [{
           key: 'available',
           value: 'TRUE',