From 0e3db55c0301d324d63e3beb988f1ac52d6e3690 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Mon, 8 Jul 2024 11:49:47 +0800
Subject: [PATCH] fix report

---
 src/api/mes/orgworker/index.ts                |   4 +
 src/api/mes/producereport/index.ts            |   5 +-
 src/views/mes/producereport/AdminIndex.vue    |  84 +++--
 .../producereport/ProduceReportDetailForm.vue |   6 +-
 .../components/AdminReplaceForm.vue           | 303 ++++++++++++++++++
 .../components/ProduceReportDetailForm.vue    |   2 +-
 .../components/ProduceReportDetailList.vue    |   2 +-
 src/views/mes/producereport/index.vue         |  32 +-
 src/views/mes/workteam/WorkTeamForm.vue       |   5 +
 .../components/WorkTeamDetailForm.vue         |   4 +-
 .../components/WorkTeamDetailList.vue         |   3 +-
 src/views/mes/workteam/index.vue              |   2 +-
 12 files changed, 417 insertions(+), 35 deletions(-)
 create mode 100644 src/views/mes/producereport/components/AdminReplaceForm.vue

diff --git a/src/api/mes/orgworker/index.ts b/src/api/mes/orgworker/index.ts
index 0427dba8..f12af8c9 100644
--- a/src/api/mes/orgworker/index.ts
+++ b/src/api/mes/orgworker/index.ts
@@ -62,4 +62,8 @@ export const OrgWorkerApi = {
   getOtherPersonalUser: async (params: any) => {
     return await request.get({ url: `/mes/org-worker/getOtherPersonalUser`, params })
   },
+  // 获得工位
+  getOrgWorkerListByOrgId: async (orgId: number) => {
+    return await request.get({ url: `/mes/org-worker/getOrgWorkerListByOrgId?orgId=`+orgId   })
+  },
 }
diff --git a/src/api/mes/producereport/index.ts b/src/api/mes/producereport/index.ts
index ec6de6aa..f86a32bd 100644
--- a/src/api/mes/producereport/index.ts
+++ b/src/api/mes/producereport/index.ts
@@ -42,7 +42,10 @@ export const ProduceReportApi = {
   deleteProduceReport: async (id: number) => {
     return await request.delete({ url: `/mes/produce-report/delete?id=` + id })
   },
-
+// 更改报工单状态
+  updateStatus: async (id: number, status:number) => {
+    return await request.get({ url: `/mes/produce-report/updateStatus?id=` + id +'&status='+status})
+  },
   // 导出生产报工单 Excel
   exportProduceReport: async (params) => {
     return await request.download({ url: `/mes/produce-report/export-excel`, params })
diff --git a/src/views/mes/producereport/AdminIndex.vue b/src/views/mes/producereport/AdminIndex.vue
index d5762618..ec0660a4 100644
--- a/src/views/mes/producereport/AdminIndex.vue
+++ b/src/views/mes/producereport/AdminIndex.vue
@@ -19,12 +19,13 @@
               end-placeholder="结束日期"
               :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
               class="!w-240px"
+              @change="handleQuery"
             />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="人员" prop="userId">
-            <el-select v-model="queryParams.userId" clearable filterable placeholder="请选择人员"  class="!w-180px">
+            <el-select v-model="queryParams.userId" @change="handleQuery" clearable filterable placeholder="请选择人员"  class="!w-180px">
               <el-option
                 v-for="item in userList"
                 :key="item.id"
@@ -66,8 +67,7 @@
         <el-button
           type="warning"
           plain
-          @click="openForm('create')"
-          v-hasPermi="['mes:produce-report:replace']"
+          @click="openReplaceForm('create')"
         >
           <Icon icon="ep:plus" class="mr-5px" /> 代报工
         </el-button>
@@ -90,6 +90,7 @@
       <el-tab-pane label="品印" name="pinjian" />
       <el-tab-pane label="塑封" name="sufeng" />
     </el-tabs>
+
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <!-- 子表的列表 -->
       <el-table-column type="expand">
@@ -140,17 +141,47 @@
           <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.reportStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" width="150px">
+      <el-table-column label="操作" align="center" fixed="right" width="200px">
         <template #default="scope">
           <el-button
+            link
+            v-if="scope.row.reportStatus === 0"
+            type="success"
+            @click="updateStatus(scope.row.id,1,'提交')"
+            v-hasPermi="['mes:produce-report-detail:update']"
+          >
+            提交
+          </el-button>
+          <el-button
+            link
+            v-if="scope.row.reportStatus === 1"
+            type="success"
+            @click="updateStatus(scope.row.id,2,'通过')"
+            v-hasPermi="['mes:produce-report-detail:replace']"
+          >
+            通过
+          </el-button>
+          <el-button
+            link
+            v-if="scope.row.reportStatus === 1"
+            type="warning"
+            @click="updateStatus(scope.row.id,3,'驳回')"
+            v-hasPermi="['mes:produce-report-detail:replace']"
+          >
+            驳回
+          </el-button>
+          <!--          代报工编辑别人的-->
+          <el-button
+            v-if="scope.row.reportStatus !== 2"
             link
             type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['mes:produce-report:update']"
+            @click="openReplaceForm('update', scope.row.id)"
+            v-hasPermi="['mes:produce-report-detail:update']"
           >
             编辑
           </el-button>
           <el-button
+            v-if="scope.row.reportStatus !== 2"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
@@ -172,19 +203,23 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <ProduceReportForm ref="formRef" @success="getList" />
+
+
+  <!-- 代报工弹窗：添加/修改 -->
+  <AdminReplaceForm ref="replaceFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
 import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
 import download from '@/utils/download'
-import { ProduceReportApi, ProduceReportVO } from '@/api/mes/producereport'
+import {ProduceReportApi, ProduceReportDetailApi, ProduceReportVO} from '@/api/mes/producereport'
 import ProduceReportForm from './ProduceReportForm.vue'
 import ProduceReportDetailList from './components/ProduceReportDetailList.vue'
 import {defaultProps, handleTree} from "@/utils/tree";
 import * as UserApi from "@/api/system/user";
 import {OrganizationApi} from "@/api/mes/organization";
-import {checkPermi} from "@/utils/permission";
+import AdminReplaceForm from "@/views/mes/producereport/components/AdminReplaceForm.vue";
 
 /** 生产报工单 列表 */
 defineOptions({ name: 'ProduceReport' })
@@ -259,20 +294,6 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await ProduceReportApi.exportProduceReport(queryParams)
-    download.excel(data, '生产报工单.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
 /** 获得产线工位树 */
 const getOrganizationTree = async () => {
   organizationTree.value = []
@@ -294,4 +315,23 @@ const handleTabClick = (tab: TabsPaneContext) => {
   queryParams.orgType = tab.paneName
   handleQuery()
 }
+/** 代报工添加/修改操作 */
+const replaceFormRef = ref()
+const openReplaceForm = (type: string, id?: number) => {
+  replaceFormRef.value.open(type, id)
+}
+const updateStatus = async (id:number, status:number, type:string) => {
+  try {
+    // 二次确认
+    await message.confirm('确定'+type+"该报工单吗？")
+    // 发起导出
+    const data = await ProduceReportApi.updateStatus(id,status)
+    message.success(type+"报工单成功！")
+    // 刷新列表
+    await getList()
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
 </script>
diff --git a/src/views/mes/producereport/ProduceReportDetailForm.vue b/src/views/mes/producereport/ProduceReportDetailForm.vue
index 7bae05a0..63cdf38f 100644
--- a/src/views/mes/producereport/ProduceReportDetailForm.vue
+++ b/src/views/mes/producereport/ProduceReportDetailForm.vue
@@ -128,8 +128,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="计件时长" prop="reportTime">
-            <el-input-number v-model="formData.reportTime" :min="0"  :precision="2" placeholder="请输入数量"/>
+          <el-form-item label="计件时段" prop="reportTime">
+            <el-input v-model="formData.reportTime" placeholder="请输入备注" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -230,7 +230,7 @@ const open = async (type: string, id?: number) => {
   if(productList.value.length ==1)
     formData.value.productId = productList.value[0].id
 
-  else if(type === 'create'){
+  if(type === 'create'){
     formData.value.reportType = '个人'
     formData.value.userId = userStore.getUser.id
   }
diff --git a/src/views/mes/producereport/components/AdminReplaceForm.vue b/src/views/mes/producereport/components/AdminReplaceForm.vue
new file mode 100644
index 00000000..044ea66d
--- /dev/null
+++ b/src/views/mes/producereport/components/AdminReplaceForm.vue
@@ -0,0 +1,303 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="工序" prop="orgType">
+            <el-select
+              :disabled="isDisableUpdate"
+              v-model="formData.orgType"
+              placeholder=""
+              clearable
+              @change="changeDate"
+            >
+              <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-col>
+        <el-col :span="8">
+          <el-form-item label="报工日期" prop="reportDate">
+            <el-date-picker
+              :disabled="isDisableUpdate"
+              v-model="formData.reportDate"
+              type="date"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              placeholder="选择报工日期"
+              @change="changeDate"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="班别" prop="groupType">
+            <el-radio-group v-model="formData.groupType">
+              <el-radio
+                :disabled="isDisableUpdate"
+                v-for="dict in getIntDictOptions(DICT_TYPE.MES_GROUP_TYPE)"
+                :key="dict.value"
+                :label="dict.value"
+                @change="changeDate"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row v-if="formData.orgType && formData.groupType && formData.reportDate">
+        <el-col :span="8">
+          <el-form-item label="工人" prop="userId">
+            <el-select
+              :disabled="isDisableUpdate"
+              v-model="formData.userId"
+              clearable
+              filterable
+              @change="changeDateUser"
+              placeholder="请选择工人"
+            >
+              <el-option
+                v-for="item in userList"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col  :span="8">
+          <el-form-item label="工位" prop="orgId">
+            <el-select
+              :disabled="isDisableUpdate"
+              v-model="formData.orgId"
+              clearable
+              filterable
+              placeholder="请选择工位"
+            >
+              <el-option
+                v-for="item in orgWorkerList"
+                :key="item.orgId"
+                :label="item.orgName"
+                :value="item.orgId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" >
+          <el-text v-if="warningInfo" class="mx-1" type="warning">{{warningInfo}}</el-text>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="计件时段" prop="reportTime">
+            <el-input v-model="formData.reportTime" placeholder="请输入计件时段" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="计件时长" prop="totalTime">
+            <el-input-number v-model="formData.totalTime" :min="0"  :precision="2" placeholder="请输入时长" class="!w-260px"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" placeholder="请输入备注"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <!-- 子表的表单 -->
+    <el-tabs v-model="subTabsName">
+      <el-tab-pane label="生产报工明细" name="produceReportDetail">
+        <ProduceReportDetailForm ref="produceReportDetailFormRef" :report-id="formData.id" />
+      </el-tab-pane>
+    </el-tabs>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { ProduceReportApi, ProduceReportVO } from '@/api/mes/producereport'
+import ProduceReportDetailForm from './ProduceReportDetailForm.vue'
+import {useUserStore} from "@/store/modules/user";
+import {OrgWorkerApi, OrgWorkerVO} from "@/api/mes/orgworker";
+import {formatToDateTime} from "@/utils/dateUtil";
+import * as UserApi from "@/api/system/user";
+import {WorkTeamApi} from "@/api/mes/workteam";
+
+/** 生产报工单 表单 */
+defineOptions({ name: 'ProduceReportForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const userStore = useUserStore()
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  processInstanceId: undefined,
+  reportCode: undefined,
+  userId: undefined,
+  orgId: undefined,
+  orgType: undefined,
+  reportTime: undefined,
+  totalTime: undefined,
+  reportStatus: undefined,
+  remark: undefined,
+  groupType: undefined,
+  reportType: undefined,
+  reportDateString: undefined,
+  reportDate: undefined
+})
+const formRules = reactive({
+  reportDate: [{ required: true, message: '日期不能为空', trigger: 'blur' }],
+  groupType: [{ required: true, message: '班别不能为空', trigger: 'blur' }],
+  productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
+  userId: [{ required: true, message: '工人不能为空', trigger: 'blur' }],
+  orgId: [{ required: true, message: '工位不能为空', trigger: 'blur' }],
+  orgType: [{ required: true, message: '工序不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+const isDisableUpdate = ref(false)
+/** 子表的表单 */
+const subTabsName = ref('produceReportDetail')
+const produceReportDetailFormRef = ref()
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)+"代报工单"
+  formType.value = type
+  resetForm()
+  formData.value.reportDate = getCurrentDate()
+  formData.value.groupType = 1
+  formData.value.userId = userStore.getUser.id
+  formData.value.reportType = "代报工"
+  warningInfo.value = ''
+  isDisableUpdate.value = false
+
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      userList.value = await UserApi.getSimpleUserList()
+      formData.value = await ProduceReportApi.getProduceReport(id)
+      formData.value.reportDate = formatToDateTime(new Date(formData.value.reportDate))
+      orgWorkerList.value = await OrgWorkerApi.getOrgWorkerListByOrgId(formData.value.orgId)
+      let orgId = formData.value.orgId
+      formData.value.orgId = 15
+      formData.value.orgId = orgId
+    } finally {
+      formLoading.value = false
+    }
+    isDisableUpdate.value=true;
+  }
+  else{
+    await changeDate()
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 校验子表单
+  try {
+    await produceReportDetailFormRef.value.validate()
+  } catch (e) {
+    subTabsName.value = 'produceReportDetail'
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    formData.value.reportDateString =  formData.value.reportDate
+    const data = formData.value as unknown as ProduceReportVO
+    // 拼接子表的数据
+    data.produceReportDetails = produceReportDetailFormRef.value.getData()
+    if (formType.value === 'create') {
+      await ProduceReportApi.createProduceReport(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProduceReportApi.updateProduceReport(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    processInstanceId: undefined,
+    reportCode: undefined,
+    userId: undefined,
+    orgId: undefined,
+    orgType: undefined,
+    reportTime: undefined,
+    totalTime: undefined,
+    reportStatus: undefined,
+    remark: undefined,
+    groupType: undefined,
+    reportType: undefined,
+    reportDate: undefined
+  }
+  formRef.value?.resetFields()
+}
+
+
+const warningInfo  = ref()
+const orgWorkerList = ref<OrgWorkerVO[]>([]) // 用户列表
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+//更改报工日期时查询用户在该日期绑定的工位信息
+const changeDate = async () =>{
+  if(formData.value.reportDate && formData.value.groupType && formData.value.orgType){
+    formData.value.userId = null
+    formData.value.orgId = null
+    userList.value = await WorkTeamApi.getUserList(formData.value.orgType, formData.value.groupType)
+    if(userList.value && userList.value.length>0){
+      formData.value.userId = userList.value[0].id
+      orgWorkerList.value = await OrgWorkerApi.getOrgWorkerList2(formData.value)
+      if(orgWorkerList.value && orgWorkerList.value.length>0){
+        formData.value.orgId = orgWorkerList.value[0].orgId
+        warningInfo.value=''
+      }
+    }
+    if(!formData.value.userId || !formData.value.orgId){
+      warningInfo.value = '该条件下未查询到工位安排信息！'
+      message.error(warningInfo.value)
+    }
+  }
+}
+const getCurrentDate = () =>{
+  let now = new Date();
+  let year = now.getFullYear();
+  let month = now.getMonth() + 1;
+  if(month<10){month = '0'+month}
+  let day = now.getDate();
+  if(day<10)day = '0'+day;
+  return year + "-" + month + "-" + day +" 00:00:00";
+}
+
+</script>
diff --git a/src/views/mes/producereport/components/ProduceReportDetailForm.vue b/src/views/mes/producereport/components/ProduceReportDetailForm.vue
index 38873812..a91cdee7 100644
--- a/src/views/mes/producereport/components/ProduceReportDetailForm.vue
+++ b/src/views/mes/producereport/components/ProduceReportDetailForm.vue
@@ -52,7 +52,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="成品率" min-width="150">
+      <el-table-column label="成品率%" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.qualityRate`" :rules="formRules.qualityRate" class="mb-0px!">
             <el-input-number disabled v-model="row.qualityRate" :min="0" :precision="2"  class="!w-1/1" placeholder=""/>
diff --git a/src/views/mes/producereport/components/ProduceReportDetailList.vue b/src/views/mes/producereport/components/ProduceReportDetailList.vue
index 0b626065..52cbdbd2 100644
--- a/src/views/mes/producereport/components/ProduceReportDetailList.vue
+++ b/src/views/mes/producereport/components/ProduceReportDetailList.vue
@@ -7,7 +7,7 @@
       <el-table-column label="成品数量" align="center" prop="qualityNumber" />
       <el-table-column label="废品数量" align="center" prop="wasteNumber" />
       <el-table-column label="总数量" align="center" prop="totalNumber" />
-      <el-table-column label="成品率" align="center" prop="qualityRate" />
+      <el-table-column label="成品率%" align="center" prop="qualityRate" />
       <el-table-column label="打包数量" align="center" prop="packageNumber" />
       <el-table-column label="备注" align="center" prop="remark" />
     </el-table>
diff --git a/src/views/mes/producereport/index.vue b/src/views/mes/producereport/index.vue
index 0dc9bf52..24035e25 100644
--- a/src/views/mes/producereport/index.vue
+++ b/src/views/mes/producereport/index.vue
@@ -90,15 +90,15 @@
         align="center"
         prop="reportDate"
         :formatter="dateFormatter2"
-        width="130px"
+        width="120px"
       />
-      <el-table-column label="用户" align="center" prop="userName" width="130px"/>
+      <el-table-column label="用户" align="center" prop="userName" width="120px"/>
       <el-table-column label="工序" align="center" prop="orgType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
         </template>
       </el-table-column>
-      <el-table-column label="工位" align="center" prop="orgName" />
+      <el-table-column label="工位" align="center" prop="orgName" width="130px"/>
       <el-table-column label="计件时段" align="center" prop="reportTime" />
       <el-table-column label="计件时长" align="center" prop="totalTime" />
       <el-table-column label="状态" align="center" prop="reportStatus">
@@ -127,6 +127,16 @@
       <el-table-column label="操作" align="center" fixed="right" width="150px">
         <template #default="scope">
           <el-button
+            link
+            v-if="scope.row.reportStatus === 0"
+            type="success"
+            @click="updateStatus(scope.row.id,1,'提交')"
+            v-hasPermi="['mes:produce-report-detail:update']"
+          >
+            提交
+          </el-button>
+          <el-button
+            v-if="scope.row.reportStatus !== 2 "
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
@@ -135,6 +145,7 @@
             编辑
           </el-button>
           <el-button
+            v-if="scope.row.reportStatus !== 2 "
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
@@ -272,4 +283,19 @@ onMounted(async() => {
   await getList()
   await getOrganizationTree()
 })
+
+const updateStatus = async (id:number, status:number, type:string) => {
+  try {
+    // 二次确认
+    await message.confirm('确定'+type+"该报工单吗？")
+    // 发起导出
+    const data = await ProduceReportApi.updateStatus(id,status)
+    message.success(type+"报工单成功！")
+    // 刷新列表
+    await getList()
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
 </script>
diff --git a/src/views/mes/workteam/WorkTeamForm.vue b/src/views/mes/workteam/WorkTeamForm.vue
index 3972430f..537f4fbe 100644
--- a/src/views/mes/workteam/WorkTeamForm.vue
+++ b/src/views/mes/workteam/WorkTeamForm.vue
@@ -77,6 +77,8 @@ const formData = ref({
   isEnable: undefined,
 })
 const formRules = reactive({
+  teamType: [{ required: true, message: '工序类型不能为空', trigger: 'blur' }],
+  groupType: [{ required: true, message: '班组类型不能为空', trigger: 'blur' }],
   isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }],
   teamName: [{ required: true, message: '班组名称不能为空', trigger: 'blur' }]
 })
@@ -88,6 +90,9 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  formData.value.groupType = '1'
+  formData.value.teamType = 'chengxing'
+  formData.value.isEnable = true
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
diff --git a/src/views/mes/workteam/components/WorkTeamDetailForm.vue b/src/views/mes/workteam/components/WorkTeamDetailForm.vue
index 2a0aeeb5..0132037b 100644
--- a/src/views/mes/workteam/components/WorkTeamDetailForm.vue
+++ b/src/views/mes/workteam/components/WorkTeamDetailForm.vue
@@ -64,9 +64,9 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 /** 打开弹窗 */
-const open = async (type: string, id?: number, workTeamId: number) => {
+const open = async (type: string, id?: number, workTeamId: number, teamName?:string) => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
+  dialogTitle.value = t('action.' + type)+" ["+teamName+"] 成员"
   formType.value = type
   resetForm()
   formData.value.workTeamId = workTeamId
diff --git a/src/views/mes/workteam/components/WorkTeamDetailList.vue b/src/views/mes/workteam/components/WorkTeamDetailList.vue
index d9cd5414..c1af1aa3 100644
--- a/src/views/mes/workteam/components/WorkTeamDetailList.vue
+++ b/src/views/mes/workteam/components/WorkTeamDetailList.vue
@@ -68,6 +68,7 @@ const message = useMessage() // 消息弹窗
 
 const props = defineProps<{
   workTeamId?: number // 班组id（主表的关联字段）
+  teamName?: string
 }>()
 const loading = ref(false) // 列表的加载中
 const list = ref([]) // 列表的数据
@@ -116,7 +117,7 @@ const openForm = (type: string, id?: number) => {
     message.error('请选择一个生产班组')
     return
   }
-  formRef.value.open(type, id, props.workTeamId)
+  formRef.value.open(type, id, props.workTeamId, props.teamName)
 }
 
 /** 删除按钮操作 */
diff --git a/src/views/mes/workteam/index.vue b/src/views/mes/workteam/index.vue
index 51747c19..f018eb9d 100644
--- a/src/views/mes/workteam/index.vue
+++ b/src/views/mes/workteam/index.vue
@@ -143,7 +143,7 @@
   <ContentWrap>
     <el-tabs model-value="workTeamDetail">
       <el-tab-pane label="班组成员" name="workTeamDetail">
-        <WorkTeamDetailList :work-team-id="currentRow.id" />
+        <WorkTeamDetailList :work-team-id="currentRow.id" :team-name="currentRow.teamName"/>
       </el-tab-pane>
     </el-tabs>
   </ContentWrap>