From d13a7083b4f114a6dfd177dae29c839c22e074f8 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Wed, 26 Jun 2024 00:02:12 +0800
Subject: [PATCH] fix workteam

---
 src/api/mes/workteam/index.ts                 | 144 +++++++++---------
 .../mes/organization/OrganizationForm.vue     | 109 +++++++------
 src/views/mes/organization/index.vue          |  99 ++++++------
 src/views/mes/workteam/WorkTeamForm.vue       |  30 ++--
 .../components/WorkTeamDetailForm.vue         |  18 ++-
 .../components/WorkTeamDetailList.vue         |   4 +-
 src/views/mes/workteam/index.vue              |  38 +++--
 7 files changed, 239 insertions(+), 203 deletions(-)

diff --git a/src/api/mes/workteam/index.ts b/src/api/mes/workteam/index.ts
index 27e88140..142d15d8 100644
--- a/src/api/mes/workteam/index.ts
+++ b/src/api/mes/workteam/index.ts
@@ -1,70 +1,74 @@
-import request from '@/config/axios'
-
-// 生产班组 VO
-export interface WorkTeamVO {
-  id: number // ID
-  teamName: string // 班组名称
-  teamLeaderId: number // 组长ID
-  teamType: string // 工序类型
-  remark: string // 备注
-  isEnable: boolean // 是否启用
-}
-
-// 生产班组 API
-export const WorkTeamApi = {
-  // 查询生产班组分页
-  getWorkTeamPage: async (params: any) => {
-    return await request.get({ url: `/mes/work-team/page`, params })
-  },
-
-  // 查询生产班组详情
-  getWorkTeam: async (id: number) => {
-    return await request.get({ url: `/mes/work-team/get?id=` + id })
-  },
-
-  // 新增生产班组
-  createWorkTeam: async (data: WorkTeamVO) => {
-    return await request.post({ url: `/mes/work-team/create`, data })
-  },
-
-  // 修改生产班组
-  updateWorkTeam: async (data: WorkTeamVO) => {
-    return await request.put({ url: `/mes/work-team/update`, data })
-  },
-
-  // 删除生产班组
-  deleteWorkTeam: async (id: number) => {
-    return await request.delete({ url: `/mes/work-team/delete?id=` + id })
-  },
-
-  // 导出生产班组 Excel
-  exportWorkTeam: async (params) => {
-    return await request.download({ url: `/mes/work-team/export-excel`, params })
-  },
-
-// ==================== 子表（班组成员） ====================
-
-  // 获得班组成员分页
-  getWorkTeamDetailPage: async (params) => {
-    return await request.get({ url: `/mes/work-team/work-team-detail/page`, params })
-  },
-  // 新增班组成员
-  createWorkTeamDetail: async (data) => {
-    return await request.post({ url: `/mes/work-team/work-team-detail/create`, data })
-  },
-
-  // 修改班组成员
-  updateWorkTeamDetail: async (data) => {
-    return await request.put({ url: `/mes/work-team/work-team-detail/update`, data })
-  },
-
-  // 删除班组成员
-  deleteWorkTeamDetail: async (id: number) => {
-    return await request.delete({ url: `/mes/work-team/work-team-detail/delete?id=` + id })
-  },
-
-  // 获得班组成员
-  getWorkTeamDetail: async (id: number) => {
-    return await request.get({ url: `/mes/work-team/work-team-detail/get?id=` + id })
-  },
-}
\ No newline at end of file
+import request from '@/config/axios'
+
+// 生产班组 VO
+export interface WorkTeamVO {
+  id: number // ID
+  teamName: string // 班组名称
+  teamLeaderId: number // 组长ID
+  teamType: string // 工序类型
+  remark: string // 备注
+  isEnable: boolean // 是否启用
+}
+
+// 生产班组 API
+export const WorkTeamApi = {
+  // 查询生产班组分页
+  getWorkTeamPage: async (params: any) => {
+    return await request.get({ url: `/mes/work-team/page`, params })
+  },
+
+  // 查询生产班组详情
+  getWorkTeam: async (id: number) => {
+    return await request.get({ url: `/mes/work-team/get?id=` + id })
+  },
+
+  // 新增生产班组
+  createWorkTeam: async (data: WorkTeamVO) => {
+    return await request.post({ url: `/mes/work-team/create`, data })
+  },
+
+  // 修改生产班组
+  updateWorkTeam: async (data: WorkTeamVO) => {
+    return await request.put({ url: `/mes/work-team/update`, data })
+  },
+
+  // 删除生产班组
+  deleteWorkTeam: async (id: number) => {
+    return await request.delete({ url: `/mes/work-team/delete?id=` + id })
+  },
+
+  // 导出生产班组 Excel
+  exportWorkTeam: async (params) => {
+    return await request.download({ url: `/mes/work-team/export-excel`, params })
+  },
+
+// ==================== 子表（班组成员） ====================
+
+  // 获得班组成员分页
+  getWorkTeamDetailPage: async (params) => {
+    return await request.get({ url: `/mes/work-team/work-team-detail/page`, params })
+  },
+  // 新增班组成员
+  createWorkTeamDetail: async (data) => {
+    return await request.post({ url: `/mes/work-team/work-team-detail/create`, data })
+  },
+
+  // 修改班组成员
+  updateWorkTeamDetail: async (data) => {
+    return await request.put({ url: `/mes/work-team/work-team-detail/update`, data })
+  },
+
+  // 删除班组成员
+  deleteWorkTeamDetail: async (id: number) => {
+    return await request.delete({ url: `/mes/work-team/work-team-detail/delete?id=` + id })
+  },
+
+  // 获得班组成员
+  getWorkTeamDetail: async (id: number) => {
+    return await request.get({ url: `/mes/work-team/work-team-detail/get?id=` + id })
+  },
+  // 获得班组成员
+  getUserList: async (processType: string) => {
+    return await request.get({ url: `/mes/work-team/work-team-detail/getUserList?processType=` + processType })
+  },
+}
diff --git a/src/views/mes/organization/OrganizationForm.vue b/src/views/mes/organization/OrganizationForm.vue
index bad24739..405044e0 100644
--- a/src/views/mes/organization/OrganizationForm.vue
+++ b/src/views/mes/organization/OrganizationForm.vue
@@ -10,53 +10,16 @@
       <el-form-item label="组织名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入组织名称" />
       </el-form-item>
-      <el-form-item label="父组织id" prop="parentId">
+      <el-form-item label="父组织" prop="parentId">
         <el-tree-select
           v-model="formData.parentId"
           :data="organizationTree"
           :props="defaultProps"
           check-strictly
           default-expand-all
-          placeholder="请选择父组织id"
+          placeholder="请选择父组织"
         />
       </el-form-item>
-      <el-form-item label="显示顺序" prop="sort">
-        <el-input v-model="formData.sort" placeholder="请输入显示顺序" />
-      </el-form-item>
-      <el-form-item label="负责人" prop="workerUserId">
-        <el-input v-model="formData.workerUserId" placeholder="请输入负责人" />
-      </el-form-item>
-      <el-form-item label="对应机台id" prop="machineId">
-        <el-input v-model="formData.machineId" placeholder="请输入对应机台id" />
-      </el-form-item>
-      <el-form-item label="联系电话" prop="phone">
-        <el-input v-model="formData.phone" placeholder="请输入联系电话" />
-      </el-form-item>
-      <el-form-item label="邮箱" prop="email">
-        <el-input v-model="formData.email" placeholder="请输入邮箱" />
-      </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-radio-group v-model="formData.isEnable">
-          <el-radio
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="组织状态" prop="status">
-        <el-radio-group v-model="formData.status">
-          <el-radio
-            v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_STATUS)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
       <el-form-item label="组织等级" prop="orgClass">
         <el-radio-group v-model="formData.orgClass">
           <el-radio
@@ -68,17 +31,61 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="组织类型" prop="orgType">
-        <el-select v-model="formData.orgType" placeholder="请选择组织类型">
+      <el-form-item  prop="sort">
+        <template #label>
+            <span>
+              显示顺序
+              <el-tooltip content="同父级按照显示顺序从小到大排序" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+        </template>
+        <el-input v-model="formData.sort" placeholder="请输入显示顺序" />
+      </el-form-item>
+      <el-form-item label="类型" prop="orgType">
+        <el-select v-model="formData.orgType" @change="handleOrgTypeChange" placeholder="请选择类型">
           <el-option
             v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
           />
-      
         </el-select>
       </el-form-item>
+      <el-form-item label="负责人" prop="workerUserId">
+        <template #label>
+            <span>
+              负责人
+              <el-tooltip content="工序组长，工位工人，根据上面所选类型会筛选特定类型的班组成员" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+        </template>
+        <el-select v-model="formData.workerUserId" clearable filterable placeholder="请输入负责人">
+          <el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="对应机台" prop="machineId">
+        <el-input v-model="formData.machineId" placeholder="请输入对应机台" />
+      </el-form-item>
+
+      <el-form-item label="组织状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -90,6 +97,8 @@
 import { getIntDictOptions, getBoolDictOptions, DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
 import { defaultProps, handleTree } from '@/utils/tree'
+import * as UserApi from "@/api/system/user";
+import {WorkTeamApi} from "@/api/mes/workteam";
 
 /** 产线工位 表单 */
 defineOptions({ name: 'OrganizationForm' })
@@ -117,13 +126,13 @@ const formData = ref({
 })
 const formRules = reactive({
   name: [{ required: true, message: '组织名称不能为空', trigger: 'blur' }],
-  parentId: [{ required: true, message: '父组织id不能为空', trigger: 'blur' }],
+  parentId: [{ required: true, message: '父组织不能为空', trigger: 'blur' }],
   sort: [{ required: true, message: '显示顺序不能为空', trigger: 'blur' }],
-  isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
+  orgClass: [{ required: true, message: '组织等级不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const organizationTree = ref() // 树形结构
-
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -140,6 +149,9 @@ const open = async (type: string, id?: number) => {
     }
   }
   await getOrganizationTree()
+
+  // 获得用户列表
+  userList.value = await UserApi.getSimpleUserList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -194,4 +206,9 @@ const getOrganizationTree = async () => {
   root.children = handleTree(data, 'id', 'parentId')
   organizationTree.value.push(root)
 }
-</script>
\ No newline at end of file
+/** 工序类型变化，可选负责人跟着变化 */
+const handleOrgTypeChange = async () => {
+  // 获得用户列表
+  userList.value = await WorkTeamApi.getUserList(formData.value.orgType)
+}
+</script>
diff --git a/src/views/mes/organization/index.vue b/src/views/mes/organization/index.vue
index 0c395cc5..c2367740 100644
--- a/src/views/mes/organization/index.vue
+++ b/src/views/mes/organization/index.vue
@@ -17,14 +17,19 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="父组织id" prop="parentId">
-        <el-input
+      <el-form-item label="父组织" prop="parentId">
+        <el-tree-select
           v-model="queryParams.parentId"
-          placeholder="请输入父组织id"
+          :data="organizationTree"
+          :props="defaultProps"
+          check-strictly
+          @select="handleQuery"
           clearable
-          @keyup.enter="handleQuery"
+          default-expand-all
+          placeholder="请选择父组织"
           class="!w-240px"
         />
+
       </el-form-item>
      
       <el-form-item label="负责人" prop="workerUserId">
@@ -36,30 +41,16 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="对应机台id" prop="machineId">
+      <el-form-item label="对应机台" prop="machineId">
         <el-input
           v-model="queryParams.machineId"
-          placeholder="请输入对应机台id"
+          placeholder="请输入对应机台"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnable">
-        <el-select
-          v-model="queryParams.isEnable"
-          placeholder="请选择是否启用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item label="组织状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -68,7 +59,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_ORG_STATUS)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -83,22 +74,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_ORG_CLASS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="组织类型" prop="orgType">
-        <el-select
-          v-model="queryParams.orgType"
-          placeholder="请选择组织类型"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_ORG_TYPE)"
+            v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_CLASS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -135,6 +111,20 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="所有" name="" />
+      <el-tab-pane label="制浆" name="zhijiang" />
+      <el-tab-pane label="成型" name="chengxing" />
+      <el-tab-pane label="烘干" name="honggan" />
+      <el-tab-pane label="转移" name="zhuanyi" />
+      <el-tab-pane label="加湿" name="jiashi" />
+      <el-tab-pane label="热压" name="reya" />
+      <el-tab-pane label="切边" name="qiebian" />
+      <el-tab-pane label="品检" name="pinjian" />
+      <el-tab-pane label="打包" name="dabao" />
+      <el-tab-pane label="贴标" name="tiebiao" />
+      <el-tab-pane label="塑封" name="sufeng" />
+    </el-tabs>
     <el-table
       v-loading="loading"
       :data="list"
@@ -144,18 +134,13 @@
       :default-expand-all="isExpandAll"
       v-if="refreshTable"
     >
-      <el-table-column label="组织id" align="center" prop="id" />
+      <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="组织名称" align="center" prop="name" />
      
       <el-table-column label="显示顺序" align="center" prop="sort" />
       <el-table-column label="负责人" align="center" prop="workerUserId" />
       <el-table-column label="对应机台" align="center" prop="machineId" />
-     
-      <el-table-column label="是否启用" align="center" prop="isEnable">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
-        </template>
-      </el-table-column>
+
       <el-table-column label="组织状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_ORG_STATUS" :value="scope.row.status" />
@@ -166,7 +151,7 @@
           <dict-tag :type="DICT_TYPE.MES_ORG_CLASS" :value="scope.row.orgClass" />
         </template>
       </el-table-column>
-      <el-table-column label="组织类型" align="center" prop="orgType">
+      <el-table-column label="类型" align="center" prop="orgType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
         </template>
@@ -213,9 +198,9 @@
 </template>
 
 <script setup lang="ts">
-import { getIntDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import {getIntDictOptions, getBoolDictOptions, DICT_TYPE, getStrDictOptions} from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
-import { handleTree } from '@/utils/tree'
+import {defaultProps, handleTree} from '@/utils/tree'
 import download from '@/utils/download'
 import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
 import OrganizationForm from './OrganizationForm.vue'
@@ -311,9 +296,23 @@ const toggleExpandAll = async () => {
   await nextTick()
   refreshTable.value = true
 }
+const organizationTree = ref() // 树形结构
 
 /** 初始化 **/
-onMounted(() => {
-  getList()
+onMounted(async () => {
+  await getList()
+  /** 获得产线工位树 */
+  organizationTree.value = []
+  const data = await OrganizationApi.getOrganizationList()
+  const root: Tree = { id: 0, name: '顶级产线工位', children: [] }
+  root.children = handleTree(data, 'id', 'parentId')
+  organizationTree.value.push(root)
 })
+/** tab 切换 */
+let activeName = ''
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.orgType = tab.paneName
+  handleQuery()
+}
+
 </script>
diff --git a/src/views/mes/workteam/WorkTeamForm.vue b/src/views/mes/workteam/WorkTeamForm.vue
index 516bff52..3972430f 100644
--- a/src/views/mes/workteam/WorkTeamForm.vue
+++ b/src/views/mes/workteam/WorkTeamForm.vue
@@ -10,18 +10,27 @@
       <el-form-item label="班组名称" prop="teamName">
         <el-input v-model="formData.teamName" placeholder="请输入班组名称" />
       </el-form-item>
-      <el-form-item label="组长ID" prop="teamLeaderId">
-        <el-input v-model="formData.teamLeaderId" placeholder="请输入组长ID" />
-      </el-form-item>
       <el-form-item label="工序类型" prop="teamType">
-        <el-select v-model="formData.teamType" placeholder="请选择工序类型">
-          <el-option
+        <el-radio-group v-model="formData.teamType">
+          <el-radio
             v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
             :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="班组类型" prop="groupType">
+        <el-radio-group v-model="formData.groupType">
+          <el-radio
+            v-for="dict in getStrDictOptions(DICT_TYPE.MES_GROUP_TYPE)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" />
@@ -63,12 +72,13 @@ const formData = ref({
   teamName: undefined,
   teamLeaderId: undefined,
   teamType: undefined,
+  groupType: undefined,
   remark: undefined,
   isEnable: undefined,
 })
 const formRules = reactive({
-  teamLeaderId: [{ required: true, message: '组长ID不能为空', trigger: 'blur' }],
   isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }],
+  teamName: [{ required: true, message: '班组名称不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
diff --git a/src/views/mes/workteam/components/WorkTeamDetailForm.vue b/src/views/mes/workteam/components/WorkTeamDetailForm.vue
index 787585be..2a0aeeb5 100644
--- a/src/views/mes/workteam/components/WorkTeamDetailForm.vue
+++ b/src/views/mes/workteam/components/WorkTeamDetailForm.vue
@@ -7,8 +7,15 @@
       label-width="100px"
       v-loading="formLoading"
     >
-       <el-form-item label="用户ID" prop="userId">
-        <el-input v-model="formData.userId" placeholder="请输入用户ID" />
+       <el-form-item label="成员" prop="userId">
+         <el-select v-model="formData.userId" clearable filterable placeholder="请输入成员">
+           <el-option
+             v-for="item in userList"
+             :key="item.id"
+             :label="item.nickname"
+             :value="item.id"
+           />
+         </el-select>
       </el-form-item>
       <el-form-item label="角色" prop="userRole">
         <el-radio-group v-model="formData.userRole">
@@ -34,6 +41,7 @@
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { WorkTeamApi } from '@/api/mes/workteam'
+import * as UserApi from "@/api/system/user";
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -54,7 +62,7 @@ const formRules = reactive({
   userRole: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
-
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 /** 打开弹窗 */
 const open = async (type: string, id?: number, workTeamId: number) => {
   dialogVisible.value = true
@@ -71,6 +79,8 @@ const open = async (type: string, id?: number, workTeamId: number) => {
       formLoading.value = false
     }
   }
+  // 获得用户列表
+  userList.value = await UserApi.getSimpleUserList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -109,4 +119,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/mes/workteam/components/WorkTeamDetailList.vue b/src/views/mes/workteam/components/WorkTeamDetailList.vue
index 38e33291..d9cd5414 100644
--- a/src/views/mes/workteam/components/WorkTeamDetailList.vue
+++ b/src/views/mes/workteam/components/WorkTeamDetailList.vue
@@ -11,7 +11,7 @@
     </el-button>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="ID" align="center" prop="id" />
-       <el-table-column label="用户ID" align="center" prop="userId" />
+      <el-table-column label="成员" align="center" prop="userName" />
       <el-table-column label="角色" align="center" prop="userRole">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_WORK_TEAM_USER_ROLE" :value="scope.row.userRole" />
@@ -131,4 +131,4 @@ const handleDelete = async (id: number) => {
     await getList()
   } catch {}
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/mes/workteam/index.vue b/src/views/mes/workteam/index.vue
index d6f572e5..51747c19 100644
--- a/src/views/mes/workteam/index.vue
+++ b/src/views/mes/workteam/index.vue
@@ -17,15 +17,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="组长ID" prop="teamLeaderId">
-        <el-input
-          v-model="queryParams.teamLeaderId"
-          placeholder="请输入组长ID"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="工序类型" prop="teamType">
         <el-select
           v-model="queryParams.teamType"
@@ -51,17 +42,6 @@
         />
       </el-form-item>
 
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -88,6 +68,11 @@
 
   <!-- 列表 -->
   <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="所有" name="" />
+      <el-tab-pane label="白班" name="1" />
+      <el-tab-pane label="夜班" name="2" />
+    </el-tabs>
     <el-table
       v-loading="loading"
       :data="list"
@@ -98,7 +83,12 @@
     >
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="班组名称" align="center" prop="teamName" />
-      <el-table-column label="组长ID" align="center" prop="teamLeaderId" />
+      <el-table-column label="组长" align="center" prop="teamLeaderName" />
+      <el-table-column label="班组类型" align="center" prop="groupType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
+        </template>
+      </el-table-column>
       <el-table-column label="工序类型" align="center" prop="teamType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.teamType" />
@@ -257,4 +247,10 @@ const handleCurrentChange = (row) => {
 onMounted(() => {
   getList()
 })
+/** tab 切换 */
+let activeName = ''
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.status = tab.paneName
+  handleQuery()
+}
 </script>