diff --git a/src/api/mes/workteam/index.ts b/src/api/mes/workteam/index.ts
index dac313b6..ac6c2c1b 100644
--- a/src/api/mes/workteam/index.ts
+++ b/src/api/mes/workteam/index.ts
@@ -5,7 +5,7 @@ export interface WorkTeamVO {
id: number // ID
teamName: string // 班组名称
teamLeaderId: number // 组长ID
- teamType: string // 工序类型
+ teamType?: string // 工序类型
startTime: Date
endTime: Date
remark: string // 备注
diff --git a/src/views/mes/workteam/WorkTeamForm.vue b/src/views/mes/workteam/WorkTeamForm.vue
index 2d1add30..580e0e68 100644
--- a/src/views/mes/workteam/WorkTeamForm.vue
+++ b/src/views/mes/workteam/WorkTeamForm.vue
@@ -10,25 +10,6 @@
-
-
-
- {{ t('FactoryModeling.WorkTeam.dialogProcessLabel') }}
-
-
-
-
-
-
-
- {{ dict.label }}
-
-
-
@@ -97,7 +78,6 @@ const formData = ref({
id: undefined,
teamName: undefined,
teamLeaderId: undefined,
- teamType: undefined,
groupType: undefined,
startTime: undefined,
endTime: undefined,
@@ -107,7 +87,6 @@ const formData = ref({
})
const formRules = reactive({
- teamType: [{ required: true, message: t('FactoryModeling.WorkTeam.validatorProcessRequired'), trigger: 'blur' }],
groupType: [{ required: true, message: t('FactoryModeling.WorkTeam.validatorGroupTypeRequired'), trigger: 'blur' }],
isEnable: [{ required: true, message: t('FactoryModeling.WorkTeam.validatorEnableRequired'), trigger: 'blur' }],
teamName: [{ required: true, message: t('FactoryModeling.WorkTeam.validatorTeamNameRequired'), trigger: 'blur' }]
@@ -121,7 +100,6 @@ const open = async (type: string, id?: number) => {
formType.value = type
resetForm()
formData.value.groupType = '1'
- formData.value.teamType = 'chengxing'
formData.value.isEnable = true
formData.value.dateRange=[new Date(), new Date()]
// 修改时,设置数据
@@ -169,7 +147,6 @@ const resetForm = () => {
id: undefined,
teamName: undefined,
teamLeaderId: undefined,
- teamType: undefined,
remark: undefined,
isEnable: undefined,
}
diff --git a/src/views/mes/workteam/index.vue b/src/views/mes/workteam/index.vue
index d20f0fe5..8c6bda66 100644
--- a/src/views/mes/workteam/index.vue
+++ b/src/views/mes/workteam/index.vue
@@ -17,21 +17,6 @@
class="!w-240px"
/>
-
-
-
-
-
{{getHour(scope.row.startTime)+'-'+getHour(scope.row.endTime)}}
-
-
-
-
-
@@ -157,7 +137,7 @@