review(mes):cal-plan 的代码实现,功能测试

pull/871/MERGE
YunaiV 2026-02-17 20:58:24 +08:00
parent 416778c8e5
commit 3463213cd4
7 changed files with 607 additions and 1 deletions

View File

@ -0,0 +1,52 @@
import request from '@/config/axios'
// MES 班组 VO
export interface CalTeamVO {
id: number
code: string // 班组编码
name: string // 班组名称
calendarType: number // 班组类型
remark: string // 备注
attribute1: string
attribute2: string
attribute3: number
attribute4: number
}
// MES 班组 API
export const CalTeamApi = {
// 查询班组分页
getTeamPage: async (params: any) => {
return await request.get({ url: `/mes/cal/team/page`, params })
},
// 查询班组详情
getTeam: async (id: number) => {
return await request.get({ url: `/mes/cal/team/get?id=` + id })
},
// 新增班组
createTeam: async (data: CalTeamVO) => {
return await request.post({ url: `/mes/cal/team/create`, data })
},
// 修改班组
updateTeam: async (data: CalTeamVO) => {
return await request.put({ url: `/mes/cal/team/update`, data })
},
// 删除班组
deleteTeam: async (id: number) => {
return await request.delete({ url: `/mes/cal/team/delete?id=` + id })
},
// 获得班组列表(全量,用于下拉选择)
getTeamList: async () => {
return await request.get({ url: `/mes/cal/team/list` })
},
// 导出班组 Excel
exportTeam: async (params: any) => {
return await request.download({ url: `/mes/cal/team/export-excel`, params })
}
}

View File

@ -0,0 +1,46 @@
import request from '@/config/axios'
// TODO @AI改成 member/index.ts参考别的 api ts
// MES 班组成员 VO
export interface CalTeamMemberVO {
id: number
teamId: number // 班组编号
userId: number // 用户编号
userName: string // 用户名称(关联查询)
nickname: string // 用户昵称(关联查询)
telephone: string // 用户手机号(关联查询)
remark: string // 备注
attribute1: string
attribute2: string
attribute3: number
attribute4: number
}
// MES 班组成员 API
export const CalTeamMemberApi = {
// 创建班组成员
createTeamMember: async (data: CalTeamMemberVO) => {
return await request.post({ url: `/mes/cal/team-member/create`, data })
},
// 删除班组成员
deleteTeamMember: async (id: number) => {
return await request.delete({ url: `/mes/cal/team-member/delete?id=` + id })
},
// 查询班组成员分页
getTeamMemberPage: async (params: any) => {
return await request.get({ url: `/mes/cal/team-member/page`, params })
},
// 查询指定班组的成员列表
getTeamMemberListByTeam: async (teamId: number) => {
return await request.get({ url: `/mes/cal/team-member/list-by-team?teamId=` + teamId })
},
// 查询多个班组的成员列表
getTeamMemberListByTeamIds: async (teamIds: number[]) => {
return await request.get({ url: `/mes/cal/team-member/list-by-team-ids`, params: { teamIds: teamIds.join(',') } })
}
}

View File

@ -0,0 +1,28 @@
import request from '@/config/axios'
// TODO @AI改成 shift/index.ts参考别的 api ts
// MES 班组排班 VO
export interface CalTeamShiftVO {
id: number
planId: number // 排班计划编号
teamId: number // 班组编号
shiftId: number // 班次编号
day: number // 日期
sort: number // 排序
teamName: string // 班组名称(关联查询)
shiftName: string // 班次名称(关联查询)
remark: string // 备注
attribute1: string
attribute2: string
attribute3: number
attribute4: number
}
// MES 班组排班 API
export const CalTeamShiftApi = {
// 查询班组排班列表
getTeamShiftList: async (params: any) => {
return await request.get({ url: `/mes/cal/team-shift/list`, params })
}
}

View File

@ -40,6 +40,7 @@
<script setup lang="ts">
import { CalPlanTeamApi, CalPlanTeamVO } from '@/api/mes/cal/plan/team'
import { CalTeamApi, CalTeamVO } from '@/api/mes/cal/team'
const props = defineProps<{
planId: number //
@ -50,6 +51,7 @@ const message = useMessage() // 消息弹窗
const loading = ref(false) //
const list = ref<CalPlanTeamVO[]>([]) //
const teamList = ref<CalTeamVO[]>([]) //
/** 加载列表 */
const getList = async () => {
@ -77,10 +79,12 @@ const formRules = reactive({
})
/** 打开表单弹窗 */
const openForm = (type: string) => {
const openForm = async (type: string) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
resetForm()
//
teamList.value = await CalTeamApi.getTeamList()
}
/** 提交表单 */

View File

@ -0,0 +1,134 @@
<!-- TODO @芋艿暂未 review -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="960px">
<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="code">
<el-input v-model="formData.code" placeholder="请输入班组编码" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="班组名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入班组名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="班组类型" prop="calendarType">
<el-select v-model="formData.calendarType" placeholder="请选择班组类型" class="!w-1/1">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_CAL_CALENDAR_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 编辑时显示成员管理 Tab -->
<el-tabs v-if="formType === 'update'" v-model="activeTab" class="mt-10px">
<el-tab-pane label="班组成员" name="member">
<CalTeamMemberPanel :team-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, DICT_TYPE } from '@/utils/dict'
import { CalTeamApi, CalTeamVO } from '@/api/mes/cal/team'
import CalTeamMemberPanel from './CalTeamMemberPanel.vue'
defineOptions({ name: 'CalTeamForm' })
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) //
const formType = ref('') // create - update -
const activeTab = ref('member') // Tab
const formData = ref({
id: undefined,
code: undefined,
name: undefined,
calendarType: undefined,
remark: undefined
})
const formRules = reactive({
code: [{ required: true, message: '班组编码不能为空', trigger: 'blur' }],
name: [{ required: true, message: '班组名称不能为空', trigger: 'blur' }]
})
const formRef = ref()
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
if (id) {
formLoading.value = true
try {
formData.value = await CalTeamApi.getTeam(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open })
/** 提交表单 */
const emit = defineEmits(['success'])
const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
const data = formData.value as unknown as CalTeamVO
if (formType.value === 'create') {
await CalTeamApi.createTeam(data)
message.success(t('common.createSuccess'))
} else {
await CalTeamApi.updateTeam(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
code: undefined,
name: undefined,
calendarType: undefined,
remark: undefined
}
formRef.value?.resetFields()
}
</script>

View File

@ -0,0 +1,139 @@
<!-- TODO @芋艿暂未 review -->
<template>
<div>
<el-button type="primary" plain size="small" @click="openForm()" class="mb-10px">
<Icon icon="ep:plus" class="mr-5px" /> 添加成员
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
<el-table-column label="用户编号" align="center" prop="userId" width="100" />
<el-table-column label="用户名称" align="center" prop="userName" min-width="120" />
<el-table-column label="用户昵称" align="center" prop="nickname" min-width="120" />
<el-table-column label="手机号" align="center" prop="telephone" min-width="120" />
<el-table-column label="备注" align="center" prop="remark" min-width="150" />
<el-table-column label="操作" align="center" width="80">
<template #default="scope">
<el-button link type="danger" @click="handleDelete(scope.row.id)"></el-button>
</template>
</el-table-column>
</el-table>
<!-- 添加成员弹窗 -->
<Dialog :title="dialogTitle" v-model="dialogVisible" width="500px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="80px"
v-loading="formLoading"
>
<el-form-item label="用户" prop="userId">
<el-input-number v-model="formData.userId" placeholder="请输入用户编号" class="!w-1/1" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</div>
</template>
<script setup lang="ts">
import { CalTeamMemberApi, CalTeamMemberVO } from '@/api/mes/cal/team/member'
const props = defineProps<{
teamId: number //
}>()
const { t } = useI18n() //
const message = useMessage() //
const loading = ref(false) //
const list = ref<CalTeamMemberVO[]>([]) //
/** 加载列表 */
const getList = async () => {
loading.value = true
try {
list.value = await CalTeamMemberApi.getTeamMemberListByTeam(props.teamId)
} finally {
loading.value = false
}
}
// ==================== ====================
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) //
const formRef = ref() // Ref
const formData = ref({
id: undefined as number | undefined,
teamId: undefined as number | undefined,
userId: undefined as number | undefined,
remark: undefined as string | undefined
})
const formRules = reactive({
userId: [{ required: true, message: '用户不能为空', trigger: 'blur' }]
})
/** 打开表单弹窗 */
const openForm = () => {
dialogVisible.value = true
dialogTitle.value = t('action.create')
resetForm()
}
/** 提交表单 */
const submitForm = async () => {
//
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
//
formLoading.value = true
try {
const data = formData.value as unknown as CalTeamMemberVO
await CalTeamMemberApi.createTeamMember(data)
message.success(t('common.createSuccess'))
dialogVisible.value = false
//
await getList()
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
teamId: props.teamId,
userId: undefined,
remark: undefined
}
formRef.value?.resetFields()
}
/** 删除 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await CalTeamMemberApi.deleteTeamMember(id)
message.success('删除成功')
await getList()
} catch {}
}
watch(
() => props.teamId,
(val) => {
if (val) {
getList()
}
},
{ immediate: true }
)
</script>

View File

@ -0,0 +1,203 @@
<!-- TODO @芋艿暂未 review -->
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="85px"
>
<el-form-item label="班组编码" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入班组编码"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入班组名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="班组类型" prop="calendarType">
<el-select
v-model="queryParams.calendarType"
placeholder="请选择班组类型"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_CAL_CALENDAR_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['mes:cal-team:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:cal-team:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="班组编码" align="center" prop="code" min-width="120" />
<el-table-column label="班组名称" align="center" prop="name" min-width="150" />
<el-table-column label="班组类型" align="center" prop="calendarType" min-width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_CAL_CALENDAR_TYPE" :value="scope.row.calendarType" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" min-width="150" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" width="150">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:cal-team:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:cal-team:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<CalTeamForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { CalTeamApi, CalTeamVO } from '@/api/mes/cal/team'
import CalTeamForm from './CalTeamForm.vue'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
defineOptions({ name: 'MesCalTeam' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<CalTeamVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
name: undefined,
calendarType: undefined
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await CalTeamApi.getTeamPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await CalTeamApi.deleteTeam(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
await message.exportConfirm()
exportLoading.value = true
const data = await CalTeamApi.exportTeam(queryParams)
download.excel(data, '班组.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(async () => {
await getList()
})
</script>