diff --git a/src/api/mes/workstation/index.ts b/src/api/mes/workstation/index.ts
index 7fe301a2d..37694b15d 100644
--- a/src/api/mes/workstation/index.ts
+++ b/src/api/mes/workstation/index.ts
@@ -48,8 +48,7 @@ export const exportWorkstation = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/mes/workstation/get-import-template' })
-}
-// 查询班组列表
+}// 查询班组列表
 export const getTeamPage = async (params) => {
   console.log(goalParams.workstationCode)
   params.workstationCode = goalParams.workstationCode
@@ -61,6 +60,35 @@ export const getTeamPage = async (params) => {
     return await request.get({ url: `/mes/team/pageListByWorkstationCode`, params })
   }
 }
+// 查询选择班组列表
+export const checkTeamPageList = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/team/senior', data })
+  } else {
+    return await request.get({ url: `/mes/team/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加班组关联
+export const createTeamRelation = async (workstationCode,teamCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    teamCodes : teamCodes
+  }
+  return await request.post({ url: `/mes/team/createRelation`, data })
+}
+
+// 删除班组关联
+export const deleteTeamRelation = async (workstationCode,teamCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    teamCodes : teamCodes
+  }
+  return await request.post({ url: `/mes/team/deleteRelation`, data })
+}
 export const getEquipmentPage = async (params) => {
   console.log(goalParams.workstationCode)
   params.workstationCode = goalParams.workstationCode
@@ -72,6 +100,35 @@ export const getEquipmentPage = async (params) => {
     return await request.get({ url: `/mes/equipment/pageListByWorkstationCode`, params })
   }
 }
+// 查询选择设备列表
+export const checkEquipmentPageList = async (params) => {
+  console.log(goalParams.workstationCode)
+  params.workstationCode = goalParams.workstationCode
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/equipment/senior', data })
+  } else {
+    return await request.get({ url: `/mes/equipment/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加设备关联
+export const createEquipmentRelation = async (workstationCode,equipmentCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    equipmentCodes : equipmentCodes
+  }
+  return await request.post({ url: `/mes/team/createRelation`, data })
+}
+
+// 删除设备关联
+export const deleteEquipmentRelation = async (workstationCode,equipmentCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    equipmentCodes : equipmentCodes
+  }
+  return await request.post({ url: `/mes/team/deleteRelation`, data })
+}
 export const getProcessPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -81,6 +138,32 @@ export const getProcessPage = async (params) => {
     return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
   }
 }
+export const checkProcessPageList = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加工序关联
+export const createProcessRelation = async (workstationCode,processCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    processCodes : processCodes
+  }
+  return await request.post({ url: `/mes/production-process/createRelation`, data })
+}
+
+// 删除工序关联
+export const deleteProcessRelation = async (workstationCode,processCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    processCodes : processCodes
+  }
+  return await request.post({ url: `/mes/production-process/deleteRelation`, data })
+}
 export const getProductionPage = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
@@ -90,3 +173,29 @@ export const getProductionPage = async (params) => {
     return await request.get({ url: `/mes/production-process/pageListByWorkstationCode`, params })
   }
 }
+export const checkProductionPageList = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/production-process/senior', data })
+  } else {
+    return await request.get({ url: `/mes/production-process/pageCheckListByWorkstationCode`, params })
+  }
+}
+// 添加产品关联
+export const createProductionRelation = async (workstationCode,productionCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    productionCodes : productionCodes
+  }
+  return await request.post({ url: `/mes/production-process/createRelation`, data })
+}
+
+// 删除产品关联
+export const deleteProductionRelation = async (workstationCode,productionCodes:string[]) => {
+  const data = {
+    workstationCode : workstationCode,
+    productionCodes : productionCodes
+  }
+  return await request.post({ url: `/mes/production-process/deleteRelation`, data })
+}
diff --git a/src/views/mes/workstation/components/Detail.vue b/src/views/mes/workstation/components/Detail.vue
new file mode 100644
index 000000000..443256baf
--- /dev/null
+++ b/src/views/mes/workstation/components/Detail.vue
@@ -0,0 +1,681 @@
+<template>
+  <div>
+    <el-drawer
+      v-model="isShowDrawer"
+      title="详情"
+      direction="rtl"
+      size="80%"
+      v-loading="detailLoading"
+    >
+      <template #header>
+        <div class="font-size-18px">
+          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
+        </div>
+      </template>
+      <ContentWrap v-if="!isBasic">
+        <Descriptions
+          :data="detailData"
+          labelClassName="label-class-name"
+          label-align="left"
+          direction="vertical"
+          :column="8"
+          :schema="allSchemas.detailSchema"
+          :columns="2"
+          width="200px"
+        />
+      </ContentWrap>
+
+      <Tabs :tabsList="tabsList" :current="current" @change="change" />
+      <div class="flex">
+        <!-- 详情 -->
+        <ContentWrap class="w-[73%]">
+          <!-- 列表头部 -->
+          <TableHead
+            v-if="!isBasic"
+            :HeadButttondata="HeadButttondata"
+            :masterId="masterParmas.masterId"
+            @button-base-click="buttonBaseClick"
+            :routeName="routeName"
+            @searchFormClick="searchFormClick"
+            :allSchemas="detailAllSchemas"
+          />
+          <!-- 默认单表展现 -->
+          <Descriptions
+            v-if="isBasic && !tabsExtend"
+            :data="detailData"
+            :schema="allSchemas.detailSchema"
+            :columns="2"
+          />
+          <!-- 单表切换tabs 展现table -->
+          <Table
+            v-if="isBasic && tabsExtend"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+            <!-- <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template> -->
+          </Table>
+          <Table
+            v-if="!isBasic && fromeWhere != 'countPlan'"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :loading="tableObjectRef.loading"
+            :pagination="{ total: tableObjectRef.total }"
+            v-model:pageSize="tableObjectRef.pageSize"
+            v-model:currentPage="tableObjectRef.currentPage"
+          >
+          <template #photos="{ row }">
+             <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>
+            </template>
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template>
+          </Table>
+          <DetailTable
+            v-if="!isBasic && fromeWhere == 'countPlan' && isShowDrawer"
+            :columns="detailAllSchemasRef.tableColumns"
+            :data="tableObjectRef.tableList"
+            :allList="allList"
+            :countScopeType="countScopeType"
+            :key="updateKey"
+          >
+            <template #action="{ row }">
+              <ButtonBase
+                :Butttondata="buttondata"
+                @button-base-click="buttonTableClick($event, row)"
+              />
+            </template>
+          </DetailTable>
+        </ContentWrap>
+        <ContentWrap class="w-[27%] ml-16px">
+          <!-- 附件组件 -->
+          <Annex
+            :annexData="annexData"
+            @handleAnnexSuccess="handleAnnexSuccess"
+            @deleteAnnexSuccess="deleteAnnexSuccess"
+            :upData="remarksData.data"
+          />
+          <!-- 备注组件 -->
+          <Remarks
+            :remarksData="remarksData"
+            class="mt-20px"
+            @remarksSubmitScuess="remarksSubmitScuess"
+          />
+          <!-- 变更记录组件 -->
+          <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px" />
+        </ContentWrap>
+      </div>
+    </el-drawer>
+    <!-- 表单弹窗：添加/修改 -->
+    <BasicForm
+      ref="formRef"
+      @success="submitForm"
+      :rules="detailAllSchemasRules"
+      :formAllSchemas="detailAllSchemas"
+      :isBusiness="false"
+      :apiUpdate="apiUpdate"
+      :apiCreate="apiCreate"
+      :fromeWhere="fromeWhere"
+      :isDetail="true"
+      @searchTableSuccess="searchTableSuccess"
+      :detailData="detailData"
+      @submitForm="submitForm"
+      @selectChangeDetail="selectChangeDetail"
+      :formTypeDetail="formTypeDetail"
+      :countPlanAllList="countPlanAllList"
+      @onChange="detailBasicFormOnChange"
+      @onBlur="onBlur"
+      @formFormDateChange="formFormDateChange"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import Annex from '@/components/Annex/src/Annex.vue'
+import Remarks from '@/components/Remarks/src/Remarks.vue'
+import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
+import Tabs from '@/components/Tabs/src/Tabs.vue'
+import * as RemarkApi from '@/api/wms/remark'
+import * as FileApi from '@/api/wms/file'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import TableHead from './TableHead.vue'
+import DetailTable from '@/components/DetailTable/src/DetailTable.vue'
+
+defineOptions({ name: 'Detail' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+routeName.value = routeName.value.substring(0, routeName.value.length - 4) + 'Detail'
+const updateKey = ref(0)
+const addRef = ref()
+const props = defineProps({
+  // 标签参数
+  tabs: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 是否是基础数据 展现详情顶部表单
+  isBasic: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // 表单，列表 相关信息
+  allSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 明细列表相关信息
+  detailAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  明细验证
+  detailAllSchemasRules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 子表新增API
+  apiCreate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表编辑API
+  apiUpdate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表分页列表API
+  apiPage: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表删除API
+  apiDelete: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表新增修改校验
+  detailValidate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 来源 countPlan盘点计划进入
+  fromeWhere: {
+    type: String,
+    required: false,
+    default: ''
+  },
+  // 获取接口列表集合
+  allList: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 盘点范围类型
+  countScopeType: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框
+  formTypeDetail: {
+    type: String,
+    required: false,
+    default: 'InputString'
+  },
+  //盘点详情子表新增的时候判断盘点范围值的下拉列表
+  countPlanAllList: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 详情列表扩展操作按钮
+  buttondataTable: {
+    type: Array,
+    required: false,
+    default: ()=>{
+      return []
+    }
+  },
+  // 针对基础数据tabs扩展 显示table列表 默认false
+  tabsExtend: {
+    type: Boolean,
+    required: false,
+    default: false
+  },
+  // tableObject 数据过滤条件 针对 详情扩展标签页 传入不同条件
+  tableObjectExtend: {
+    type: Array,
+    required: false,
+    default: null
+  },
+  // 子列表 筛选 展示与隐藏 ，默认展示
+  detailButtonIsShowFilter:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 新增 展示与隐藏 ，默认展示
+  detailButtonIsShowAdd:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 编辑 展示与隐藏 ，默认展示
+  detailButtonIsShowEdit:{
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  // 子列表 删除 展示与隐藏 ，默认展示
+  detailButtonIsShowDelete:{
+    type: Boolean,
+    required: false,
+    default: true
+  }
+})
+const isShowDrawer = ref(false)
+const detailLoading = ref(false)
+const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
+
+if (props.isBasic == true) {
+  if (tabsList.value && tabsList.value.length > 0) {
+    tabsList.value.unshift({
+      label: '详情',
+      prop: 'Detail'
+    })
+  }
+} else {
+  if (tabsList.value && tabsList.value.length > 0) {
+  } else {
+    tabsList.value = [
+      {
+        label: '明细',
+        prop: 'Detail'
+      }
+    ]
+  }
+}
+if (tabsList.value) {
+}
+
+// 附件默认数据
+const annexData = reactive({
+  annexList: []
+})
+
+// 备注数据
+const remarksData = reactive({
+  remarksList: [],
+  data: {}
+})
+
+// 变更记录默认数据
+const changeRecordData = reactive({
+  changeRecordList: []
+})
+const detailData = ref({}) //详情数据
+// 获取附件列表篇
+const getFileList = async () => {
+  detailLoading.value = true
+  try {
+    annexData.annexList = await FileApi.getFileList(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+/** 添加附件 */
+const handleAnnexSuccess = () => {
+  getFileList()
+  getChangeRecordList()
+}
+// 删除附件成功之后所走的方法
+const deleteAnnexSuccess = async () => {
+  getFileList()
+  getChangeRecordList()
+}
+
+// Tabs当前选择
+const current = ref(0)
+const change = (item, index) => {
+  current.value = index
+  emit('changeTabs', item)
+}
+
+//主表所需的参数
+const masterParmas = ref({
+  masterId: '', //主表id
+  number: '', //主表单据号
+  status: '' //主表状态 用于控制子表新增编辑按钮显示情况
+})
+
+// 列表头部按钮
+const HeadButttondata = ref()
+// 列表-操作按钮
+const buttondata = ref()
+
+/** 打开弹窗 */
+const formRef = ref()
+const titleNameRef = ref()
+const titleValueRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
+  titleNameRef.value = titleName
+  titleValueRef.value = titleValue
+  remarksData.data = {
+    tableId: row.id,
+    tableName: tableName
+  }
+  // 加载明细列表
+  if (!props.isBasic) {
+    // 设置主表id
+    masterParmas.value.masterId = row.id
+    masterParmas.value.number = row.number
+    masterParmas.value.status = row.status
+    tableObjectRef.value.params = {
+      masterId: row.id
+    }
+    await getList()
+  }
+  isShowDrawer.value = true
+  if (row) {
+    detailLoading.value = true
+    try {
+      detailData.value = row
+      getRemarkList()
+      getFileList()
+      getChangeRecordList()
+      // 判断详情按钮是否显示
+      let detailButtonFilter: any = []
+      let detailButtonAdd: any = []
+      if (props.detailButtonIsShowFilter) {
+        // 筛选
+        detailButtonFilter = [
+          defaultButtons.defaultFilterBtn(null)
+        ]
+      }
+      if (props.detailButtonIsShowAdd) {
+        // 新增
+        detailButtonAdd = [
+          defaultButtons.defaultAddBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      HeadButttondata.value = [...detailButtonFilter,...detailButtonAdd]
+
+
+      let detailButtonEdit: any = []
+      let detailButtonDelete: any = []
+      if (props.detailButtonIsShowEdit) {
+        // 编辑
+        detailButtonEdit = [
+          defaultButtons.mainListEditBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      if (props.detailButtonIsShowDelete) {
+        // 删除
+        detailButtonDelete = [
+          defaultButtons.mainListDeleteBtn({
+            hide: isShowMainButton(row, ['1'])
+          })
+        ]
+      }
+      buttondata.value = [...detailButtonEdit,...detailButtonDelete,...props.buttondataTable]
+
+    } finally {
+      detailLoading.value = false
+    }
+  }
+}
+defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗
+
+// 获取备注列表
+const getRemarkList = async () => {
+  detailLoading.value = true
+  try {
+    remarksData.remarksList = await RemarkApi.getRemarkPage(remarksData.data)
+  } finally {
+    detailLoading.value = false
+  }
+}
+// 备注提交成功之后
+const remarksSubmitScuess = async (remark) => {
+  detailLoading.value = false
+  getRemarkList()
+  getChangeRecordList()
+}
+// 获取变更记录
+const getChangeRecordList = async () => {
+  changeRecordData.changeRecordList = await RemarkApi.getChangeRecordPage(remarksData.data)
+}
+
+const tableObjectRef = ref()
+const tableMethodsRef = ref()
+const detailAllSchemasRef = ref()
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: props.apiPage // 分页接口
+})
+
+tableObjectRef.value = tableObject
+tableMethodsRef.value = tableMethods
+detailAllSchemasRef.value = props.detailAllSchemas
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
+// 获得表格的各种操作
+const { getList } = tableMethodsRef.value
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  } else if (val == 'refresh') {
+    // 刷新
+    getList()
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 字段设置 更新主列表字段
+// const updataTableColumns = (val) => {
+//   detailAllSchemas.tableColumns.value = val
+// }
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row.id)
+  } else {
+    emit('tableFormButton',val, row)
+  }
+}
+/** 添加/修改操作 */
+const openForm = async (type: string, row?: number) => {
+  formRef.value.open(type, row, masterParmas.value)
+  emit('detailOpenForm', type, row)
+}
+// form 提交
+const submitForm = async (formType, data) => {
+  try {
+    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
+    const rs = (await props.detailValidate) ? await props.detailValidate(data) : true
+    if (!rs) return
+    if (formType === 'create') {
+      await props.apiCreate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await props.apiUpdate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
+    await getList()
+    updateKey.value += 1
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  emit('searchTableSuccessDetail', formField, searchField, val, formRef)
+}
+// 传递给父类
+const emit = defineEmits([
+  'searchTableSuccessDetail',
+  'changeTabs',
+  'selectChangeDetail',
+  'detailOpenForm',
+  'tableFormButton',
+  'openImage',
+  'onBlur',
+  'detailBasicFormOnChange',
+  'formFormDateChange'
+])
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    tableObject.loading = true
+    // 发起删除
+    await props.apiDelete(id)
+    tableObject.loading = false
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+    updateKey.value += 1
+  } catch {}
+}
+// 筛选提交
+const searchFormClick = async (searchData) => {
+  const { tableObject, tableMethods } = useTable({
+    getListApi: props.apiPage // 分页接口
+  })
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+      ? searchData.filters
+      : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  }
+  detailAllSchemasRef.value = props.detailAllSchemas
+  tableObjectRef.value = tableObject
+  tableMethodsRef.value = tableMethods
+  tableObjectRef.value.tableList = []
+  const { getList } = tableMethods
+  await getList()
+  updateKey.value += 1
+  // tableObjectRef.value.params = {
+  //   isSearch: true,
+  //   filters: searchData.filters
+  //     ? searchData.filters
+  //     : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }]
+  // }
+  // getList() // 刷新当前列表
+}
+// 选择盘点类型的时候针对限值的操作
+const selectChangeDetail = (field, val) => {
+  emit('selectChangeDetail', field, val)
+}
+// 打开图片
+const openImage=(item)=>{
+  emit('openImage', item)
+}
+/**
+ * 监听改变事件
+ * @param field 当前操作字段
+ * @param cur 改变后值
+ */
+ const detailBasicFormOnChange = (field, cur) => {
+  emit('detailBasicFormOnChange', field, cur)
+}
+
+/**
+ * 监听失焦事件
+ * @param field 当前操作字段
+ * @param e
+ */
+ const onBlur = (field, e) => {
+  emit('onBlur', field, e)
+}
+
+// 日期改变事件
+const formFormDateChange = (field, val,row, index) => {
+  emit('formFormDateChange', field, val,row, index)
+}
+//监视属性
+watch(
+  () => props.apiPage,
+  () => {
+    const { tableObject, tableMethods } = useTable({
+      getListApi: props.apiPage // 分页接口
+    })
+    tableObject.params.masterId = masterParmas.value.masterId
+    detailAllSchemasRef.value = props.detailAllSchemas
+    if (props.tableObjectExtend) {
+      props.tableObjectExtend.forEach(item => {
+        tableObject.params[item.key] = item.value
+      })
+    }
+    tableObjectRef.value = tableObject
+    tableMethodsRef.value = tableMethods
+    const { getList } = tableMethods
+    getList()
+  }
+)
+</script>
+<style lang="scss">
+.el-drawer__body {
+  background: #f5f5f5 !important;
+}
+
+::v-deep(.label-class-name) {
+  color: #dedede;
+}
+</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/mes/workstation/components/TableHead.vue b/src/views/mes/workstation/components/TableHead.vue
new file mode 100644
index 000000000..507ba8de4
--- /dev/null
+++ b/src/views/mes/workstation/components/TableHead.vue
@@ -0,0 +1,160 @@
+<template>
+  <div class="tableNavBtnsContent" ref="tableNavBtnsContent_Ref">
+    <div class="searchBox">
+      <div class="tableNavLeftBtns">
+        <ButtonBase
+          :Butttondata="buttonsLeft"
+          @button-base-click="buttonBaseClick"
+        />
+      </div>
+      <div class="tableNavRightBtns">
+        <!-- 右侧按钮 -->
+        <ButtonBase :Butttondata="buttonsRight" @button-base-click="buttonBaseClick" @updata-table-columns="updataTableColumns"
+    :allSchemas="allSchemas" ref="rowDropRef"/>
+      </div>
+    </div>
+    <slot></slot>
+  </div>
+  <!-- 字段设置弹窗 -->
+  <!-- <rowDrop 
+    ref="rowDropRef"
+    @updata-table-columns="updataTableColumns"
+    :allSchemas="allSchemas"
+  /> -->
+  <!-- 高级筛选 -->
+  <SearchHigh
+    ref="searchHigh_Ref"
+    class="searchHighClass"
+    :routeName="routeName"
+    :masterId="masterId"
+    :showPrimaryBaseButton="false"
+    @search-form-click="searchFormClick"
+    :isHighExcludePrimary="false"
+    :primarySearchCustomButton="[]"
+    :highSearchCustomButton="[]"
+    :allSchemas="allSchemas"
+  />
+</template>
+<script setup>
+import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import rowDrop from "@/components/rowDrop/index.vue"
+
+  const props = defineProps({
+    HeadButttondata: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    // 主组件name值
+    routeName: {
+      type: String,
+      default: ''
+    },
+    // 从子表进行高级搜索
+    masterId: {
+      type: String,
+      default: ''
+    },
+    allSchemas: {
+      type: Object,
+      default: null
+    }
+  })
+  const buttonsLeft = ref([])
+  const buttonsRight = ref([])
+  const tableNavBtnsContent_Ref = ref()
+
+  // 更新主列表字段
+  const updataTableColumns = (val) => {
+    emit('updataTableColumns', val)
+  }
+
+  // const defaultButtons = inject('global').defaultButtons
+  // 创建左右按钮数据
+  const buttonsLeftOrRight = () => {
+    buttonsRight.value = []
+    buttonsLeft.value = []
+    // 判断是否有筛选按钮(判断筛选按钮的逻辑位置，影响筛选按钮的位置)
+    // let _primarySearchOption = primarySearch[props.vueName]
+    // let _highSearchOption = highSearch[props.vueName]
+    // if(_primarySearchOption || _highSearchOption){
+    //   buttonsRight.value.push(defaultButtons.defaultFilterBtn())
+    // }
+    // 父级传参处理左右
+    props.HeadButttondata.forEach(item=>{
+      if(item.float && item.float == 'right'){
+        buttonsRight.value.push(item)
+      }else{
+        buttonsLeft.value.push(item)
+      }
+    })
+  }
+  buttonsLeftOrRight()
+
+watch(
+  () => props.HeadButttondata,
+  () => {
+    buttonsLeftOrRight()
+  }
+)
+
+
+  // 传递给父类
+  const emit = defineEmits([
+    'buttonBaseClick',
+    'updataTableColumns',
+    'searchFormClick'
+  ])
+
+  // 设置显示隐藏变量
+  const rowDropRef = ref()
+
+
+  const buttonBaseClick = (val, item) => {
+    // 设置按钮 
+    if (val == 'set') {
+      rowDropRef.value.popoverVisible = !rowDropRef.value.popoverVisible
+    } else if (val == 'filtrate') {
+      searchHigh_Ref.value.popoverVisible = true
+    } else {
+      emit('buttonBaseClick', val, item)
+    }
+  }
+
+  const quicklySearchDom_Ref = ref()
+
+  // 筛选组件
+  const searchHigh_Ref = ref(false)
+  // 高级筛选所有的按钮事件
+  const searchFormClick = (searchData) => {
+    emit('searchFormClick', searchData)
+    searchHigh_Ref.value.popoverVisible = false
+  }
+
+  defineExpose({
+    tableNavBtnsContent_Ref,
+    quicklySearchDom_Ref
+  })
+
+</script>
+<style lang="scss" scoped>
+.tableNavBtnsContent{
+  padding-bottom: 10px;
+  .searchBox{
+    display: flex;
+    justify-content: space-between;
+  }
+.tableNavLeftBtns{
+  display: flex;
+  
+  margin-left: -5px;
+}
+  .tableNavRightBtns{
+    display: flex;
+    margin-left: 10px;
+    margin-right: -5px;
+  }
+}
+</style>
diff --git a/src/views/mes/workstation/index.vue b/src/views/mes/workstation/index.vue
index 1aa880115..96b18035e 100644
--- a/src/views/mes/workstation/index.vue
+++ b/src/views/mes/workstation/index.vue
@@ -58,9 +58,50 @@
           :detailAllSchemasRules="WorkstationRules"
           :apiPage="apiPage"
           :tabs="TabsList"
-          :detailButtonIsShowAdd = "true"
-          :detailButtonIsShowDelete="true"
           @changeTabs="changeTabs"
+          :buttondataTable="buttondataTable"
+          @tableFormButton="tableFormButton"
+  />
+  <!-- 记录子包装弹窗 -->
+  <BasicForm
+    ref="teamRef"
+    @success="getList"
+    :tableAllSchemas="Team.allSchemas"
+    :tableData="selectTeamListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <BasicForm
+    ref="equipmentListRef"
+    @success="getList"
+    :tableAllSchemas="Equipment.allSchemas"
+    :tableData="selectEquipmentListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <BasicForm
+    ref="processListRef"
+    @success="getList"
+    :tableAllSchemas="Process.allSchemas"
+    :tableData="selectProcessListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+  <BasicForm
+    ref="productionListRef"
+    @success="getList"
+    :tableAllSchemas="Production.allSchemas"
+    :tableData="selectProductionListTableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
   />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/mes/workstation/import" :importTemplateData="importTemplateData" @success="importSuccess" />
@@ -81,18 +122,15 @@ import * as WorkstationApi 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 Detail from './components/Detail.vue'
 import {
-  getEquipmentPage,
-  getProcessPage,
-  getProductionPage,
   goalParams,
-  params
 } from "@/api/mes/workstation";
 defineOptions({ name: 'Workstation' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const teamRef = ref()
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
@@ -283,4 +321,65 @@ const changeTabs = (data) =>{
     detailAllSchemas.value = Production.allSchemas
   }
 }
+const buttondataTable = ref([{
+  label: '取消关联',
+  name: 'viewParentPickingNumber',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+const teamListRef = ref()
+const { tableObject: selectTeamListTableData, tableMethods: selectTeamListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkTeamPageList
+})
+const { getList:selectTeamList } = selectTeamListTableMethods
+
+const equipmentListRef = ref()
+const { tableObject: selectEquipmentListTableData, tableMethods: selectEquipmentListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkEquipmentPageList
+})
+const { getList:selectEquipmentList } = selectEquipmentListTableMethods
+
+const processListRef = ref()
+const { tableObject: selectProcessListTableData, tableMethods: processListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkProcessPageList
+})
+const { getList:selectProcessListList } = processListTableMethods
+
+const productionListRef = ref()
+const { tableObject: selectProductionListTableData, tableMethods: productionListTableMethods } = useTable({
+  getListApi: WorkstationApi.checkProductionPageList
+})
+const { getList:selectProductionList } = productionListTableMethods
+
+const tableFormButton = async (val , row) => {
+  if(val == 'Team'){
+    selectTeamListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectTeamList()
+    teamListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }else if(val == 'Equipment'){
+    selectEquipmentListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectEquipmentList()
+    equipmentListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }else if(val == 'Process'){
+    selectProcessListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectProcessListList()
+    processListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }else if(val == 'Production'){
+    selectProductionListTableData.params = {
+      workstationCode:row.workstationCode
+    }
+    await selectProductionList()
+    productionListRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+}
 </script>
diff --git a/src/views/mes/workstation/workstation.data.ts b/src/views/mes/workstation/workstation.data.ts
index baf468591..fe87fb777 100644
--- a/src/views/mes/workstation/workstation.data.ts
+++ b/src/views/mes/workstation/workstation.data.ts
@@ -105,6 +105,33 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
   }
 ]))
 export const Team = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '名称',
+    field: 'name',
+    sort: 'custom',
+    isSearch: true,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+  }
+]))
+export const TeamSelect = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '代码',
     field: 'code',
@@ -134,6 +161,17 @@ export const Equipment = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true
   }
 ]))
 export const Process = useCrudSchemas(reactive<CrudSchema[]>([
@@ -150,6 +188,17 @@ export const Process = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
   }
 ]))
 export const Production = useCrudSchemas(reactive<CrudSchema[]>([
@@ -166,5 +215,16 @@ export const Production = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
   }
 ]))
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index e78f9d9cb..6a60ba6a9 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -128,9 +128,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         setV['areaCode'] = val[0]['code']
         setV['areaType'] = val[0]['type']
       }else  if(formField == 'inPackUnit') {
-        setV['inPackUnit'] = val[0]['code']
+        setV['inPackUnit'] = val[0]['packUnit']
       }else  if(formField == 'outPackUnit') {
-        setV['outPackUnit'] = val[0]['code']
+        setV['outPackUnit'] = val[0]['packUnit']
       }else  if(formField == 'itemCode') {
         setV['itemCode'] = val[0]['code']
       }else{ 
@@ -227,7 +227,7 @@ const butttondata = (row) => {
   row.status = "1"
     return [
         defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:itemarea:update'}), // 编辑
-        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:itemarea:delete'}), // 删除
+        defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:itemarea:delete'}), // 删除
     ]
 }
 
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
index d3d4ff013..a1c2328fc 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@@ -96,7 +96,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料包装代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
+        searchField: 'packUnit', // 查询弹窗赋值字段
         searchTitle: '物料包装信息', // 查询弹窗标题
         searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
         searchPage: ItempackageApi.getItempackagingPage, // 查询弹窗所需分页方法
@@ -125,7 +125,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料包装代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
+        searchField: 'packUnit', // 查询弹窗赋值字段
         searchTitle: '物料包装信息', // 查询弹窗标题
         searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
         searchPage: ItempackageApi.getItempackagingPage, // 查询弹窗所需分页方法
@@ -212,7 +212,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
@@ -315,7 +315,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'Switch',
-      value: 'TRUE',
+      value: 'FALSE',
       componentProps: {
         inactiveValue: 'FALSE',
         activeValue: 'TRUE'
@@ -648,12 +648,6 @@ export const ItemareaRules = reactive({
   outPackUnit: [
     { required: true, message: '请选择出库包装规格', trigger: 'change' }
   ],
-  needReceive: [
-    { required: true, message: '请选择需要接受确认', trigger: 'change' }
-  ],
-  available: [
-    { required: true, message: '请选择是否可用', trigger: 'change' }
-  ], 
   manageMode: [
     { required: true, message: '请选择管理精度', trigger: 'change' }
   ],