add org worker

liutao_branch
chenshuichuan 2 years ago
parent 6f431ead4b
commit 1115fab85c

@ -1,52 +1,57 @@
import request from '@/config/axios'
// 机台 VO
export interface MachineComponentVO {
id: number // 装备id
name: string // 装备名称
parentId: number // 父id
sort: number // 显示顺序
orgId: number // 组织机台ID
serialCode: string // 装备SN号
outgoingTime: Date // 出厂日期
outgoingReport: string // 出厂报告
position: string // 位置
standard: string // 规格
remark: string // 备注
status: number // 状态
componentType: number // 组织类型
machineType: string // 机台类型
}
// 机台 API
export const MachineComponentApi = {
// 查询机台列表
getMachineComponentList: async (params) => {
return await request.get({ url: `/mes/machine-component/list`, params })
},
// 查询机台详情
getMachineComponent: async (id: number) => {
return await request.get({ url: `/mes/machine-component/get?id=` + id })
},
// 新增机台
createMachineComponent: async (data: MachineComponentVO) => {
return await request.post({ url: `/mes/machine-component/create`, data })
},
// 修改机台
updateMachineComponent: async (data: MachineComponentVO) => {
return await request.put({ url: `/mes/machine-component/update`, data })
},
// 删除机台
deleteMachineComponent: async (id: number) => {
return await request.delete({ url: `/mes/machine-component/delete?id=` + id })
},
// 导出机台 Excel
exportMachineComponent: async (params) => {
return await request.download({ url: `/mes/machine-component/export-excel`, params })
},
}
import request from '@/config/axios'
// 机台 VO
export interface MachineComponentVO {
id: number // 装备id
name: string // 装备名称
parentId: number // 父id
sort: number // 显示顺序
orgId: number // 组织机台ID
serialCode: string // 装备SN号
outgoingTime: Date // 出厂日期
outgoingReport: string // 出厂报告
position: string // 位置
standard: string // 规格
remark: string // 备注
status: number // 状态
componentType: number // 组织类型
machineType: string // 机台类型
}
// 机台 API
export const MachineComponentApi = {
// 查询机台列表
getMachineComponentList: async (params) => {
return await request.get({ url: `/mes/machine-component/list`, params })
},
// 查询机台详情
getMachineComponent: async (id: number) => {
return await request.get({ url: `/mes/machine-component/get?id=` + id })
},
// 新增机台
createMachineComponent: async (data: MachineComponentVO) => {
return await request.post({ url: `/mes/machine-component/create`, data })
},
// 修改机台
updateMachineComponent: async (data: MachineComponentVO) => {
return await request.put({ url: `/mes/machine-component/update`, data })
},
// 删除机台
deleteMachineComponent: async (id: number) => {
return await request.delete({ url: `/mes/machine-component/delete?id=` + id })
},
// 导出机台 Excel
exportMachineComponent: async (params) => {
return await request.download({ url: `/mes/machine-component/export-excel`, params })
},
// 查询产线和机台列表
getPipelineAndMachineList: async (params) => {
return await request.get({ url: `/mes/machine-component/listPipelineAndMachine`, params })
},
}

@ -0,0 +1,44 @@
import request from '@/config/axios'
// 工位安排 VO
export interface OrgWorkerVO {
id: number // id
orgId: number // 工位id
workDate: Date // 工作日期
groupType: number // 班别
workerId: number // 工人id
reportId: number // 报工单id
}
// 工位安排 API
export const OrgWorkerApi = {
// 查询工位安排分页
getOrgWorkerPage: async (params: any) => {
return await request.get({ url: `/mes/org-worker/page`, params })
},
// 查询工位安排详情
getOrgWorker: async (id: number) => {
return await request.get({ url: `/mes/org-worker/get?id=` + id })
},
// 新增工位安排
createOrgWorker: async (data: OrgWorkerVO) => {
return await request.post({ url: `/mes/org-worker/create`, data })
},
// 修改工位安排
updateOrgWorker: async (data: OrgWorkerVO) => {
return await request.put({ url: `/mes/org-worker/update`, data })
},
// 删除工位安排
deleteOrgWorker: async (id: number) => {
return await request.delete({ url: `/mes/org-worker/delete?id=` + id })
},
// 导出工位安排 Excel
exportOrgWorker: async (params) => {
return await request.download({ url: `/mes/org-worker/export-excel`, params })
}
}

@ -57,7 +57,14 @@
</el-form-item>
<el-form-item label="关联机台" prop="machineId">
<el-input v-model="formData.machineId" placeholder="请输入关联机台" />
<el-tree-select
v-model="formData.machineId"
:data="machineComponentTree"
:props="defaultProps"
check-strictly
default-expand-all
placeholder="请选择机台"
/>
</el-form-item>
<el-form-item label="组织状态" prop="status">
@ -85,6 +92,7 @@ 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";
import {MachineComponentApi} from "@/api/mes/machine";
/** 产线工位 表单 */
defineOptions({ name: 'OrganizationForm' })
@ -135,7 +143,7 @@ const open = async (type: string, id?: number) => {
}
}
await getOrganizationTree()
await getMachineComponentTree()
//
userList.value = await UserApi.getSimpleUserList()
}
@ -198,4 +206,13 @@ const handleOrgTypeChange = async () => {
//
userList.value = await WorkTeamApi.getUserList(formData.value.orgType)
}
const machineComponentTree = ref() //
/** 获得机台树 */
const getMachineComponentTree = async () => {
machineComponentTree.value = []
const data = await MachineComponentApi.getPipelineAndMachineList()
const root: Tree = { id: 0, name: 'ALL', children: [] }
root.children = handleTree(data, 'id', 'parentId')
machineComponentTree.value.push(root)
}
</script>

@ -0,0 +1,302 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
ref="queryFormRef"
:inline="true"
:model="queryParams"
class="-mb-15px"
label-width="68px"
>
<el-form-item label="组织名称" prop="name">
<el-input
v-model="queryParams.name"
class="!w-240px"
clearable
placeholder="请输入组织名称"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="关联机台" prop="machineId">
<el-input
v-model="queryParams.machineId"
class="!w-240px"
clearable
placeholder="请输入关联机台"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="组织状态" prop="status">
<el-select
v-model="queryParams.status"
class="!w-240px"
clearable
placeholder="请选择组织状态"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon class="mr-5px" icon="ep:search" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon class="mr-5px" icon="ep:refresh" /> 重置</el-button>
<el-button
v-hasPermi="['mes:organization:export']"
:loading="exportLoading"
plain
type="success"
@click="handleExport"
>
<Icon class="mr-5px" icon="ep:download" /> 导出
</el-button>
<el-button plain type="danger" @click="toggleExpandAll">
<Icon class="mr-5px" icon="ep:sort" /> 展开/折叠
</el-button>
</el-form-item>
</el-form>
</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-row>
<el-col :span="14">
<ContentWrap>
<el-table
v-if="refreshTable"
v-loading="loading"
:data="list"
:default-expand-all="isExpandAll"
:show-overflow-tooltip="true"
:stripe="true"
row-key="id"
>
<el-table-column align="center" label="组织名称" prop="name" width="180px"/>
<el-table-column align="center" label="关联机台" prop="machineName" />
<el-table-column align="center" label="组织状态" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column align="center" label="组织等级" prop="orgClass">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_CLASS" :value="scope.row.orgClass" />
</template>
</el-table-column>
<el-table-column align="center" label="类型" prop="orgType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
</template>
</el-table-column>
<el-table-column align="center" fixed="right" label="操作" width="150">
<template #default="scope">
<el-button
v-hasPermi="['mes:organization:update']"
link
type="primary"
@click="openForm('update', scope.row.id)"
>
编辑
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.pageNo"
:total="total"
@pagination="getList"
/>
</ContentWrap>
</el-col>
<el-col :span="10">
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column
label="工作日期"
align="center"
prop="workDate"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="工位" align="center" prop="orgId" />
<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="workerId" />
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:org-worker: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>
</el-col>
</el-row>
<!-- 表单弹窗添加/修改 -->
<OrganizationForm ref="formRef" @success="getList" />
</template>
<script lang="ts" setup>
import {getIntDictOptions, getBoolDictOptions, DICT_TYPE, getStrDictOptions} from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import {defaultProps, handleTree} from '@/utils/tree'
import download from '@/utils/download'
import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
import OrganizationForm from './OrganizationForm.vue'
/** 产线工位 列表 */
defineOptions({ name: 'Organization' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<OrganizationVO[]>([]) //
const queryParams = reactive({
name: undefined,
parentId: undefined,
sort: undefined,
workerUserId: undefined,
machineId: undefined,
phone: undefined,
email: undefined,
isEnable: undefined,
status: undefined,
orgClass: undefined,
orgType: undefined,
createTime: []
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await OrganizationApi.getOrganizationList(queryParams)
list.value = handleTree(data, 'id', 'parentId')
} 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 OrganizationApi.deleteOrganization(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await OrganizationApi.exportOrganization(queryParams)
download.excel(data, '产线工位.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 展开/折叠操作 */
const isExpandAll = ref(true) //
const refreshTable = ref(true) //
const toggleExpandAll = async () => {
refreshTable.value = false
isExpandAll.value = !isExpandAll.value
await nextTick()
refreshTable.value = true
}
const organizationTree = ref() //
/** 初始化 **/
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>

@ -138,8 +138,8 @@
<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="workerUserId" />-->
<el-table-column label="关联机台" align="center" prop="machineName" />
<el-table-column label="组织状态" align="center" prop="status">
<template #default="scope">

@ -0,0 +1,129 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="工位id" prop="orgId">
<el-input v-model="formData.orgId" placeholder="请输入工位id" />
</el-form-item>
<el-form-item label="工作日期" prop="workDate">
<el-date-picker
v-model="formData.workDate"
type="date"
value-format="x"
placeholder="选择工作日期"
/>
</el-form-item>
<el-form-item label="班别" prop="groupType">
<el-radio-group v-model="formData.groupType">
<el-radio
v-for="dict in getIntDictOptions(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="工人id" prop="workerId">
<el-input v-model="formData.workerId" placeholder="请输入工人id" />
</el-form-item>
<el-form-item label="报工单id" prop="reportId">
<el-input v-model="formData.reportId" placeholder="请输入报工单id" />
</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>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { OrgWorkerApi, OrgWorkerVO } from '@/api/mes/orgworker'
/** 工位安排 表单 */
defineOptions({ name: 'OrgWorkerForm' })
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
orgId: undefined,
workDate: undefined,
groupType: undefined,
workerId: undefined,
reportId: undefined
})
const formRules = reactive({
orgId: [{ required: true, message: '工位id不能为空', trigger: 'blur' }],
workDate: [{ required: true, message: '工作日期不能为空', trigger: 'blur' }],
groupType: [{ required: true, message: '班别不能为空', trigger: 'blur' }],
workerId: [{ required: true, message: '工人id不能为空', trigger: 'blur' }]
})
const formRef = ref() // 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 OrgWorkerApi.getOrgWorker(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as OrgWorkerVO
if (formType.value === 'create') {
await OrgWorkerApi.createOrgWorker(data)
message.success(t('common.createSuccess'))
} else {
await OrgWorkerApi.updateOrgWorker(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
orgId: undefined,
workDate: undefined,
groupType: undefined,
workerId: undefined,
reportId: undefined
}
formRef.value?.resetFields()
}
</script>

@ -0,0 +1,231 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="工位id" prop="orgId">
<el-input
v-model="queryParams.orgId"
placeholder="请输入工位id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="工作日期" prop="workDate">
<el-date-picker
v-model="queryParams.workDate"
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 label="班别" prop="groupType">
<el-select
v-model="queryParams.groupType"
placeholder="请选择班别"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_GROUP_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="工人id" prop="workerId">
<el-input
v-model="queryParams.workerId"
placeholder="请输入工人id"
clearable
@keyup.enter="handleQuery"
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>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['mes:org-worker:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:org-worker: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="id" align="center" prop="id" />
<el-table-column
label="工作日期"
align="center"
prop="workDate"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="工位" align="center" prop="orgId" />
<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="workerId" />
<el-table-column label="报工单" align="center" prop="reportId" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:org-worker:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:org-worker: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>
<!-- 表单弹窗添加/修改 -->
<OrgWorkerForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { OrgWorkerApi, OrgWorkerVO } from '@/api/mes/orgworker'
import OrgWorkerForm from './OrgWorkerForm.vue'
/** 工位安排 列表 */
defineOptions({ name: 'OrgWorker' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<OrgWorkerVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
orgId: undefined,
workDate: [],
groupType: undefined,
workerId: undefined,
reportId: undefined,
createTime: []
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await OrgWorkerApi.getOrgWorkerPage(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 OrgWorkerApi.deleteOrgWorker(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await OrgWorkerApi.exportOrgWorker(queryParams)
download.excel(data, '工位安排.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

@ -120,7 +120,7 @@
<!-- 投料进度子表的列表 -->
<el-table-column type="expand">
<template #default="scope">
<el-tabs v-if="scope.row.status > 0" model-value="itemRequisitionDetail">
<el-tabs model-value="itemRequisitionDetail">
<el-tab-pane label="各工序进度" name="itemRequisitionDetail">
<ProgressList :item-requisition-id="scope.row.requisitionId" />
</el-tab-pane>

Loading…
Cancel
Save