review(mes):work-order 的代码实现,功能测试
parent
721449d834
commit
0772290be9
|
|
@ -1,44 +1,43 @@
|
||||||
import request from '@/config/axios'
|
import request from '@/config/axios'
|
||||||
|
|
||||||
// MES 生产工单 BOM VO
|
// MES 生产工单 BOM VO
|
||||||
export interface ProWorkorderBomVO {
|
export interface ProWorkOrderBomVO {
|
||||||
id: number // 编号
|
id: number // 编号
|
||||||
workorderId: number // 生产工单编号
|
workOrderId: number // 生产工单编号
|
||||||
itemId: number // BOM 物料编号
|
itemId: number // BOM 物料编号
|
||||||
itemName: string // 物料名称
|
itemName: string // 物料名称
|
||||||
itemCode: string // 物料编码
|
itemCode: string // 物料编码
|
||||||
itemSpec: string // 规格型号
|
itemSpec: string // 规格型号
|
||||||
unitMeasureId: number // 单位编号
|
unitMeasureId: number // 单位编号
|
||||||
unitMeasureName: string // 单位名称
|
unitMeasureName: string // 单位名称
|
||||||
itemOrProduct: string // 物料产品标识
|
|
||||||
quantity: number // 预计使用量
|
quantity: number // 预计使用量
|
||||||
remark: string // 备注
|
remark: string // 备注
|
||||||
}
|
}
|
||||||
|
|
||||||
// MES 生产工单 BOM API
|
// MES 生产工单 BOM API
|
||||||
export const ProWorkorderBomApi = {
|
export const ProWorkOrderBomApi = {
|
||||||
// 查询工单 BOM 分页
|
// 查询工单 BOM 分页
|
||||||
getWorkorderBomPage: async (params: any) => {
|
getWorkOrderBomPage: async (params: any) => {
|
||||||
return await request.get({ url: `/mes/pro/workorder-bom/page`, params })
|
return await request.get({ url: `/mes/pro/work-order-bom/page`, params })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 查询工单 BOM 详情
|
// 查询工单 BOM 详情
|
||||||
getWorkorderBom: async (id: number) => {
|
getWorkOrderBom: async (id: number) => {
|
||||||
return await request.get({ url: `/mes/pro/workorder-bom/get?id=` + id })
|
return await request.get({ url: `/mes/pro/work-order-bom/get?id=` + id })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 新增工单 BOM
|
// 新增工单 BOM
|
||||||
createWorkorderBom: async (data: ProWorkorderBomVO) => {
|
createWorkOrderBom: async (data: ProWorkOrderBomVO) => {
|
||||||
return await request.post({ url: `/mes/pro/workorder-bom/create`, data })
|
return await request.post({ url: `/mes/pro/work-order-bom/create`, data })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 修改工单 BOM
|
// 修改工单 BOM
|
||||||
updateWorkorderBom: async (data: ProWorkorderBomVO) => {
|
updateWorkOrderBom: async (data: ProWorkOrderBomVO) => {
|
||||||
return await request.put({ url: `/mes/pro/workorder-bom/update`, data })
|
return await request.put({ url: `/mes/pro/work-order-bom/update`, data })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 删除工单 BOM
|
// 删除工单 BOM
|
||||||
deleteWorkorderBom: async (id: number) => {
|
deleteWorkOrderBom: async (id: number) => {
|
||||||
return await request.delete({ url: `/mes/pro/workorder-bom/delete?id=` + id })
|
return await request.delete({ url: `/mes/pro/work-order-bom/delete?id=` + id })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import request from '@/config/axios'
|
import request from '@/config/axios'
|
||||||
|
|
||||||
// MES 生产工单 VO
|
// MES 生产工单 VO
|
||||||
export interface ProWorkorderVO {
|
export interface ProWorkOrderVO {
|
||||||
id: number // 编号
|
id: number // 编号
|
||||||
code: string // 工单编码
|
code: string // 工单编码
|
||||||
name: string // 工单名称
|
name: string // 工单名称
|
||||||
|
|
@ -25,7 +25,6 @@ export interface ProWorkorderVO {
|
||||||
batchCode: string // 批次号
|
batchCode: string // 批次号
|
||||||
requestDate: Date // 需求日期
|
requestDate: Date // 需求日期
|
||||||
parentId: number // 父工单编号
|
parentId: number // 父工单编号
|
||||||
ancestors: string // 所有父节点编号
|
|
||||||
finishDate: Date // 完成时间
|
finishDate: Date // 完成时间
|
||||||
cancelDate: Date // 取消时间
|
cancelDate: Date // 取消时间
|
||||||
status: number // 工单状态
|
status: number // 工单状态
|
||||||
|
|
@ -33,44 +32,44 @@ export interface ProWorkorderVO {
|
||||||
}
|
}
|
||||||
|
|
||||||
// MES 生产工单 API
|
// MES 生产工单 API
|
||||||
export const ProWorkorderApi = {
|
export const ProWorkOrderApi = {
|
||||||
// 查询生产工单分页
|
// 查询生产工单分页
|
||||||
getWorkorderPage: async (params: any) => {
|
getWorkOrderPage: async (params: any) => {
|
||||||
return await request.get({ url: `/mes/pro/workorder/page`, params })
|
return await request.get({ url: `/mes/pro/work-order/page`, params })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 查询生产工单详情
|
// 查询生产工单详情
|
||||||
getWorkorder: async (id: number) => {
|
getWorkOrder: async (id: number) => {
|
||||||
return await request.get({ url: `/mes/pro/workorder/get?id=` + id })
|
return await request.get({ url: `/mes/pro/work-order/get?id=` + id })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 新增生产工单
|
// 新增生产工单
|
||||||
createWorkorder: async (data: ProWorkorderVO) => {
|
createWorkOrder: async (data: ProWorkOrderVO) => {
|
||||||
return await request.post({ url: `/mes/pro/workorder/create`, data })
|
return await request.post({ url: `/mes/pro/work-order/create`, data })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 修改生产工单
|
// 修改生产工单
|
||||||
updateWorkorder: async (data: ProWorkorderVO) => {
|
updateWorkOrder: async (data: ProWorkOrderVO) => {
|
||||||
return await request.put({ url: `/mes/pro/workorder/update`, data })
|
return await request.put({ url: `/mes/pro/work-order/update`, data })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 删除生产工单
|
// 删除生产工单
|
||||||
deleteWorkorder: async (id: number) => {
|
deleteWorkOrder: async (id: number) => {
|
||||||
return await request.delete({ url: `/mes/pro/workorder/delete?id=` + id })
|
return await request.delete({ url: `/mes/pro/work-order/delete?id=` + id })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 导出生产工单 Excel
|
// 导出生产工单 Excel
|
||||||
exportWorkorder: async (params: any) => {
|
exportWorkOrder: async (params: any) => {
|
||||||
return await request.download({ url: `/mes/pro/workorder/export-excel`, params })
|
return await request.download({ url: `/mes/pro/work-order/export-excel`, params })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 完成工单
|
// 完成工单
|
||||||
finishWorkorder: async (id: number) => {
|
finishWorkOrder: async (id: number) => {
|
||||||
return await request.put({ url: `/mes/pro/workorder/finish?id=` + id })
|
return await request.put({ url: `/mes/pro/work-order/finish?id=` + id })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 取消工单
|
// 取消工单
|
||||||
cancelWorkorder: async (id: number) => {
|
cancelWorkOrder: async (id: number) => {
|
||||||
return await request.put({ url: `/mes/pro/workorder/cancel?id=` + id })
|
return await request.put({ url: `/mes/pro/work-order/cancel?id=` + id })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -266,7 +266,7 @@ export enum DICT_TYPE {
|
||||||
MES_INDEX_TYPE = 'mes_index_type', // MES 检测项类型
|
MES_INDEX_TYPE = 'mes_index_type', // MES 检测项类型
|
||||||
MES_QC_RESULT_TYPE = 'mes_qc_result_type', // MES 质检结果值类型
|
MES_QC_RESULT_TYPE = 'mes_qc_result_type', // MES 质检结果值类型
|
||||||
MES_DEFECT_LEVEL = 'mes_defect_level', // MES 缺陷等级
|
MES_DEFECT_LEVEL = 'mes_defect_level', // MES 缺陷等级
|
||||||
MES_PRO_WORKORDER_STATUS = 'mes_pro_workorder_status', // MES 生产工单状态
|
MES_PRO_WORK_ORDER_STATUS = 'mes_pro_work_order_status', // MES 生产工单状态
|
||||||
MES_PRO_WORKORDER_SOURCE_TYPE = 'mes_pro_workorder_source_type', // MES 工单来源类型
|
MES_PRO_WORK_ORDER_SOURCE_TYPE = 'mes_pro_work_order_source_type', // MES 工单来源类型
|
||||||
MES_PRO_WORKORDER_TYPE = 'mes_pro_workorder_type' // MES 工单类型
|
MES_PRO_WORK_ORDER_TYPE = 'mes_pro_work_order_type' // MES 工单类型
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,11 +13,7 @@
|
||||||
<el-table-column label="物料名称" align="center" prop="itemName" min-width="150" />
|
<el-table-column label="物料名称" align="center" prop="itemName" min-width="150" />
|
||||||
<el-table-column label="规格型号" align="center" prop="itemSpec" width="120" />
|
<el-table-column label="规格型号" align="center" prop="itemSpec" width="120" />
|
||||||
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
|
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
|
||||||
<el-table-column label="物料/产品" align="center" prop="itemOrProduct" width="100">
|
<!-- TODO @AI:物料/名称,增加该类; -->
|
||||||
<template #default="scope">
|
|
||||||
{{ getItemOrProductLabel(scope.row.itemOrProduct) }}
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="预计使用量" align="center" prop="quantity" width="120" />
|
<el-table-column label="预计使用量" align="center" prop="quantity" width="120" />
|
||||||
<el-table-column label="备注" align="center" prop="remark" min-width="120" />
|
<el-table-column label="备注" align="center" prop="remark" min-width="120" />
|
||||||
<el-table-column label="操作" align="center" width="130" v-if="!disabled">
|
<el-table-column label="操作" align="center" width="130" v-if="!disabled">
|
||||||
|
|
@ -36,6 +32,8 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- BOM 表单弹窗 -->
|
<!-- BOM 表单弹窗 -->
|
||||||
|
<!-- TODO @AI:拆成 List 和 Form 两个 -->
|
||||||
|
<!-- TODO @芋艿:这块暂时还没测试和 review; -->
|
||||||
<Dialog :title="bomDialogTitle" v-model="bomDialogVisible" width="600px">
|
<Dialog :title="bomDialogTitle" v-model="bomDialogVisible" width="600px">
|
||||||
<el-form
|
<el-form
|
||||||
ref="bomFormRef"
|
ref="bomFormRef"
|
||||||
|
|
@ -75,12 +73,6 @@
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="物料/产品" prop="itemOrProduct">
|
|
||||||
<el-select v-model="bomFormData.itemOrProduct" placeholder="请选择" class="!w-1/1">
|
|
||||||
<el-option label="物料" value="ITEM" />
|
|
||||||
<el-option label="产品" value="PRODUCT" />
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="预计使用量" prop="quantity">
|
<el-form-item label="预计使用量" prop="quantity">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
v-model="bomFormData.quantity"
|
v-model="bomFormData.quantity"
|
||||||
|
|
@ -102,15 +94,14 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ProWorkorderBomApi, ProWorkorderBomVO } from '@/api/mes/pro/workorder/bom'
|
import { ProWorkOrderBomApi, ProWorkOrderBomVO } from '@/api/mes/pro/workorder/bom'
|
||||||
import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
|
import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
|
||||||
import { MdUnitMeasureApi } from '@/api/mes/md/unitmeasure'
|
import { MdUnitMeasureApi } from '@/api/mes/md/unitmeasure'
|
||||||
import { getItemOrProductLabel } from '@/views/mes/utils/constants'
|
|
||||||
|
|
||||||
defineOptions({ name: 'WorkorderBom' })
|
defineOptions({ name: 'WorkOrderBom' })
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
workorderId: number
|
workOrderId: number
|
||||||
disabled?: boolean
|
disabled?: boolean
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
|
|
@ -119,20 +110,20 @@ const { t } = useI18n()
|
||||||
|
|
||||||
// ==================== BOM 列表 ====================
|
// ==================== BOM 列表 ====================
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
const bomList = ref<ProWorkorderBomVO[]>([])
|
const bomList = ref<ProWorkOrderBomVO[]>([])
|
||||||
const bomTotal = ref(0)
|
const bomTotal = ref(0)
|
||||||
const bomQueryParams = reactive({
|
const bomQueryParams = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
workorderId: undefined as number | undefined
|
workOrderId: undefined as number | undefined
|
||||||
})
|
})
|
||||||
|
|
||||||
/** 查询 BOM 列表 */
|
/** 查询 BOM 列表 */
|
||||||
const getBomList = async () => {
|
const getBomList = async () => {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
bomQueryParams.workorderId = props.workorderId
|
bomQueryParams.workOrderId = props.workOrderId
|
||||||
const data = await ProWorkorderBomApi.getWorkorderBomPage(bomQueryParams)
|
const data = await ProWorkOrderBomApi.getWorkOrderBomPage(bomQueryParams)
|
||||||
bomList.value = data.list
|
bomList.value = data.list
|
||||||
bomTotal.value = data.total
|
bomTotal.value = data.total
|
||||||
} finally {
|
} finally {
|
||||||
|
|
@ -144,7 +135,7 @@ const getBomList = async () => {
|
||||||
const handleDeleteBom = async (id: number) => {
|
const handleDeleteBom = async (id: number) => {
|
||||||
try {
|
try {
|
||||||
await message.delConfirm()
|
await message.delConfirm()
|
||||||
await ProWorkorderBomApi.deleteWorkorderBom(id)
|
await ProWorkOrderBomApi.deleteWorkOrderBom(id)
|
||||||
message.success(t('common.delSuccess'))
|
message.success(t('common.delSuccess'))
|
||||||
await getBomList()
|
await getBomList()
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
@ -157,17 +148,15 @@ const bomFormLoading = ref(false)
|
||||||
const bomFormType = ref('')
|
const bomFormType = ref('')
|
||||||
const bomFormData = ref({
|
const bomFormData = ref({
|
||||||
id: undefined,
|
id: undefined,
|
||||||
workorderId: undefined as number | undefined,
|
workOrderId: undefined as number | undefined,
|
||||||
itemId: undefined,
|
itemId: undefined,
|
||||||
unitMeasureId: undefined,
|
unitMeasureId: undefined,
|
||||||
itemOrProduct: 'ITEM',
|
|
||||||
quantity: undefined,
|
quantity: undefined,
|
||||||
remark: undefined
|
remark: undefined
|
||||||
})
|
})
|
||||||
const bomFormRules = reactive({
|
const bomFormRules = reactive({
|
||||||
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
|
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
|
||||||
unitMeasureId: [{ required: true, message: '单位不能为空', trigger: 'change' }],
|
unitMeasureId: [{ required: true, message: '单位不能为空', trigger: 'change' }],
|
||||||
itemOrProduct: [{ required: true, message: '物料产品标识不能为空', trigger: 'change' }],
|
|
||||||
quantity: [{ required: true, message: '预计使用量不能为空', trigger: 'blur' }]
|
quantity: [{ required: true, message: '预计使用量不能为空', trigger: 'blur' }]
|
||||||
})
|
})
|
||||||
const bomFormRef = ref()
|
const bomFormRef = ref()
|
||||||
|
|
@ -185,10 +174,9 @@ const openBomForm = async (type: string, row?: any) => {
|
||||||
// 重置表单
|
// 重置表单
|
||||||
bomFormData.value = {
|
bomFormData.value = {
|
||||||
id: undefined,
|
id: undefined,
|
||||||
workorderId: props.workorderId,
|
workOrderId: props.workOrderId,
|
||||||
itemId: undefined,
|
itemId: undefined,
|
||||||
unitMeasureId: undefined,
|
unitMeasureId: undefined,
|
||||||
itemOrProduct: 'ITEM',
|
|
||||||
quantity: undefined,
|
quantity: undefined,
|
||||||
remark: undefined
|
remark: undefined
|
||||||
}
|
}
|
||||||
|
|
@ -211,12 +199,12 @@ const submitBomForm = async () => {
|
||||||
await bomFormRef.value.validate()
|
await bomFormRef.value.validate()
|
||||||
bomFormLoading.value = true
|
bomFormLoading.value = true
|
||||||
try {
|
try {
|
||||||
const data = bomFormData.value as unknown as ProWorkorderBomVO
|
const data = bomFormData.value as unknown as ProWorkOrderBomVO
|
||||||
if (bomFormType.value === 'create') {
|
if (bomFormType.value === 'create') {
|
||||||
await ProWorkorderBomApi.createWorkorderBom(data)
|
await ProWorkOrderBomApi.createWorkOrderBom(data)
|
||||||
message.success(t('common.createSuccess'))
|
message.success(t('common.createSuccess'))
|
||||||
} else {
|
} else {
|
||||||
await ProWorkorderBomApi.updateWorkorderBom(data)
|
await ProWorkOrderBomApi.updateWorkOrderBom(data)
|
||||||
message.success(t('common.updateSuccess'))
|
message.success(t('common.updateSuccess'))
|
||||||
}
|
}
|
||||||
bomDialogVisible.value = false
|
bomDialogVisible.value = false
|
||||||
|
|
|
||||||
|
|
@ -21,23 +21,6 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item label="工单类型" prop="type">
|
|
||||||
<el-select
|
|
||||||
v-model="formData.type"
|
|
||||||
placeholder="请选择工单类型"
|
|
||||||
class="!w-1/1"
|
|
||||||
:disabled="isDetail"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_WORKORDER_TYPE)"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="dict.label"
|
|
||||||
:value="dict.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="来源类型" prop="orderSourceType">
|
<el-form-item label="来源类型" prop="orderSourceType">
|
||||||
<el-select
|
<el-select
|
||||||
|
|
@ -47,7 +30,7 @@
|
||||||
:disabled="isDetail"
|
:disabled="isDetail"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_WORKORDER_SOURCE_TYPE)"
|
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE)"
|
||||||
:key="dict.value"
|
:key="dict.value"
|
||||||
:label="dict.label"
|
:label="dict.label"
|
||||||
:value="dict.value"
|
:value="dict.value"
|
||||||
|
|
@ -179,7 +162,7 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="工单状态" prop="status" v-if="formType !== 'create'">
|
<el-form-item label="工单状态" prop="status" v-if="formType !== 'create'">
|
||||||
<dict-tag :type="DICT_TYPE.MES_PRO_WORKORDER_STATUS" :value="formData.status" />
|
<dict-tag :type="DICT_TYPE.MES_PRO_WORK_ORDER_STATUS" :value="formData.status" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -199,11 +182,7 @@
|
||||||
<!-- BOM Tab:编辑/详情时显示 -->
|
<!-- BOM Tab:编辑/详情时显示 -->
|
||||||
<el-tabs v-if="formType !== 'create'" v-model="activeTab" class="mt-15px">
|
<el-tabs v-if="formType !== 'create'" v-model="activeTab" class="mt-15px">
|
||||||
<el-tab-pane label="工单 BOM" name="bom">
|
<el-tab-pane label="工单 BOM" name="bom">
|
||||||
<WorkorderBom
|
<WorkOrderBom v-if="formData.id" :work-order-id="formData.id" :disabled="isDetail" />
|
||||||
v-if="formData.id"
|
|
||||||
:workorder-id="formData.id"
|
|
||||||
:disabled="isDetail"
|
|
||||||
/>
|
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
<template #footer v-if="!isDetail">
|
<template #footer v-if="!isDetail">
|
||||||
|
|
@ -215,14 +194,14 @@
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||||
import { ProWorkorderApi, ProWorkorderVO } from '@/api/mes/pro/workorder'
|
import { ProWorkOrderApi, ProWorkOrderVO } from '@/api/mes/pro/workorder'
|
||||||
import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
|
import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
|
||||||
import { MdClientApi } from '@/api/mes/md/client'
|
import { MdClientApi } from '@/api/mes/md/client'
|
||||||
import { MdVendorApi } from '@/api/mes/md/vendor'
|
import { MdVendorApi } from '@/api/mes/md/vendor'
|
||||||
import { MdUnitMeasureApi } from '@/api/mes/md/unitmeasure'
|
import { MdUnitMeasureApi } from '@/api/mes/md/unitmeasure'
|
||||||
import WorkorderBom from './WorkorderBom.vue'
|
import WorkOrderBom from './WorkOrderBom.vue'
|
||||||
|
|
||||||
defineOptions({ name: 'WorkorderForm' })
|
defineOptions({ name: 'WorkOrderForm' })
|
||||||
|
|
||||||
const { t } = useI18n() // 国际化
|
const { t } = useI18n() // 国际化
|
||||||
const message = useMessage() // 消息弹窗
|
const message = useMessage() // 消息弹窗
|
||||||
|
|
@ -286,7 +265,7 @@ const open = async (type: string, id?: number) => {
|
||||||
if (id) {
|
if (id) {
|
||||||
formLoading.value = true
|
formLoading.value = true
|
||||||
try {
|
try {
|
||||||
formData.value = await ProWorkorderApi.getWorkorder(id)
|
formData.value = await ProWorkOrderApi.getWorkOrder(id)
|
||||||
} finally {
|
} finally {
|
||||||
formLoading.value = false
|
formLoading.value = false
|
||||||
}
|
}
|
||||||
|
|
@ -308,12 +287,12 @@ const submitForm = async () => {
|
||||||
await formRef.value.validate()
|
await formRef.value.validate()
|
||||||
formLoading.value = true
|
formLoading.value = true
|
||||||
try {
|
try {
|
||||||
const data = formData.value as unknown as ProWorkorderVO
|
const data = formData.value as unknown as ProWorkOrderVO
|
||||||
if (formType.value === 'create') {
|
if (formType.value === 'create') {
|
||||||
await ProWorkorderApi.createWorkorder(data)
|
await ProWorkOrderApi.createWorkOrder(data)
|
||||||
message.success(t('common.createSuccess'))
|
message.success(t('common.createSuccess'))
|
||||||
} else {
|
} else {
|
||||||
await ProWorkorderApi.updateWorkorder(data)
|
await ProWorkOrderApi.updateWorkOrder(data)
|
||||||
message.success(t('common.updateSuccess'))
|
message.success(t('common.updateSuccess'))
|
||||||
}
|
}
|
||||||
dialogVisible.value = false
|
dialogVisible.value = false
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
<el-form-item label="工单类型" prop="type">
|
<el-form-item label="工单类型" prop="type">
|
||||||
<el-select v-model="queryParams.type" placeholder="请选择工单类型" clearable class="!w-240px">
|
<el-select v-model="queryParams.type" placeholder="请选择工单类型" clearable class="!w-240px">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_WORKORDER_TYPE)"
|
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_TYPE)"
|
||||||
:key="dict.value"
|
:key="dict.value"
|
||||||
:label="dict.label"
|
:label="dict.label"
|
||||||
:value="dict.value"
|
:value="dict.value"
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_WORKORDER_SOURCE_TYPE)"
|
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE)"
|
||||||
:key="dict.value"
|
:key="dict.value"
|
||||||
:label="dict.label"
|
:label="dict.label"
|
||||||
:value="dict.value"
|
:value="dict.value"
|
||||||
|
|
@ -60,7 +60,7 @@
|
||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_WORKORDER_STATUS)"
|
v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRO_WORK_ORDER_STATUS)"
|
||||||
:key="dict.value"
|
:key="dict.value"
|
||||||
:label="dict.label"
|
:label="dict.label"
|
||||||
:value="dict.value"
|
:value="dict.value"
|
||||||
|
|
@ -85,7 +85,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
plain
|
plain
|
||||||
@click="openForm('create')"
|
@click="openForm('create')"
|
||||||
v-hasPermi="['mes:pro-workorder:create']"
|
v-hasPermi="['mes:pro-work-order:create']"
|
||||||
>
|
>
|
||||||
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
||||||
</el-button>
|
</el-button>
|
||||||
|
|
@ -94,7 +94,7 @@
|
||||||
plain
|
plain
|
||||||
@click="handleExport"
|
@click="handleExport"
|
||||||
:loading="exportLoading"
|
:loading="exportLoading"
|
||||||
v-hasPermi="['mes:pro-workorder:export']"
|
v-hasPermi="['mes:pro-work-order:export']"
|
||||||
>
|
>
|
||||||
<Icon icon="ep:download" class="mr-5px" /> 导出
|
<Icon icon="ep:download" class="mr-5px" /> 导出
|
||||||
</el-button>
|
</el-button>
|
||||||
|
|
@ -109,13 +109,13 @@
|
||||||
<el-table-column label="工单名称" align="center" prop="name" min-width="150" />
|
<el-table-column label="工单名称" align="center" prop="name" min-width="150" />
|
||||||
<el-table-column label="工单类型" align="center" prop="type" width="100">
|
<el-table-column label="工单类型" align="center" prop="type" width="100">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :type="DICT_TYPE.MES_PRO_WORKORDER_TYPE" :value="scope.row.type" />
|
<dict-tag :type="DICT_TYPE.MES_PRO_WORK_ORDER_TYPE" :value="scope.row.type" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="来源类型" align="center" prop="orderSourceType" width="100">
|
<el-table-column label="来源类型" align="center" prop="orderSourceType" width="100">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag
|
<dict-tag
|
||||||
:type="DICT_TYPE.MES_PRO_WORKORDER_SOURCE_TYPE"
|
:type="DICT_TYPE.MES_PRO_WORK_ORDER_SOURCE_TYPE"
|
||||||
:value="scope.row.orderSourceType"
|
:value="scope.row.orderSourceType"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -130,7 +130,7 @@
|
||||||
<el-table-column label="需求日期" align="center" prop="requestDate" :formatter="dateFormatter" width="180" />
|
<el-table-column label="需求日期" align="center" prop="requestDate" :formatter="dateFormatter" width="180" />
|
||||||
<el-table-column label="工单状态" align="center" prop="status" width="100">
|
<el-table-column label="工单状态" align="center" prop="status" width="100">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :type="DICT_TYPE.MES_PRO_WORKORDER_STATUS" :value="scope.row.status" />
|
<dict-tag :type="DICT_TYPE.MES_PRO_WORK_ORDER_STATUS" :value="scope.row.status" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
|
@ -143,12 +143,12 @@
|
||||||
<el-table-column label="操作" align="center" width="200" fixed="right">
|
<el-table-column label="操作" align="center" width="200" fixed="right">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<!-- 草稿状态:编辑、删除 -->
|
<!-- 草稿状态:编辑、删除 -->
|
||||||
<template v-if="scope.row.status === MesProWorkorderStatusEnum.PREPARE">
|
<template v-if="scope.row.status === MesProWorkOrderStatusEnum.PREPARE">
|
||||||
<el-button
|
<el-button
|
||||||
link
|
link
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="openForm('update', scope.row.id)"
|
@click="openForm('update', scope.row.id)"
|
||||||
v-hasPermi="['mes:pro-workorder:update']"
|
v-hasPermi="['mes:pro-work-order:update']"
|
||||||
>
|
>
|
||||||
编辑
|
编辑
|
||||||
</el-button>
|
</el-button>
|
||||||
|
|
@ -156,18 +156,18 @@
|
||||||
link
|
link
|
||||||
type="danger"
|
type="danger"
|
||||||
@click="handleDelete(scope.row.id)"
|
@click="handleDelete(scope.row.id)"
|
||||||
v-hasPermi="['mes:pro-workorder:delete']"
|
v-hasPermi="['mes:pro-work-order:delete']"
|
||||||
>
|
>
|
||||||
删除
|
删除
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
<!-- 已确认状态:完成、取消 -->
|
<!-- 已确认状态:完成、取消 -->
|
||||||
<template v-if="scope.row.status === MesProWorkorderStatusEnum.CONFIRMED">
|
<template v-if="scope.row.status === MesProWorkOrderStatusEnum.CONFIRMED">
|
||||||
<el-button
|
<el-button
|
||||||
link
|
link
|
||||||
type="success"
|
type="success"
|
||||||
@click="handleFinish(scope.row.id)"
|
@click="handleFinish(scope.row.id)"
|
||||||
v-hasPermi="['mes:pro-workorder:update']"
|
v-hasPermi="['mes:pro-work-order:update']"
|
||||||
>
|
>
|
||||||
完成
|
完成
|
||||||
</el-button>
|
</el-button>
|
||||||
|
|
@ -175,7 +175,7 @@
|
||||||
link
|
link
|
||||||
type="warning"
|
type="warning"
|
||||||
@click="handleCancel(scope.row.id)"
|
@click="handleCancel(scope.row.id)"
|
||||||
v-hasPermi="['mes:pro-workorder:update']"
|
v-hasPermi="['mes:pro-work-order:update']"
|
||||||
>
|
>
|
||||||
取消
|
取消
|
||||||
</el-button>
|
</el-button>
|
||||||
|
|
@ -185,7 +185,7 @@
|
||||||
link
|
link
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="openForm('detail', scope.row.id)"
|
@click="openForm('detail', scope.row.id)"
|
||||||
v-hasPermi="['mes:pro-workorder:query']"
|
v-hasPermi="['mes:pro-work-order:query']"
|
||||||
>
|
>
|
||||||
详情
|
详情
|
||||||
</el-button>
|
</el-button>
|
||||||
|
|
@ -202,24 +202,24 @@
|
||||||
</ContentWrap>
|
</ContentWrap>
|
||||||
|
|
||||||
<!-- 表单弹窗:添加/修改 -->
|
<!-- 表单弹窗:添加/修改 -->
|
||||||
<WorkorderForm ref="formRef" @success="getList" />
|
<WorkOrderForm ref="formRef" @success="getList" />
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { dateFormatter } from '@/utils/formatTime'
|
import { dateFormatter } from '@/utils/formatTime'
|
||||||
import download from '@/utils/download'
|
import download from '@/utils/download'
|
||||||
import { ProWorkorderApi, ProWorkorderVO } from '@/api/mes/pro/workorder'
|
import { ProWorkOrderApi, ProWorkOrderVO } from '@/api/mes/pro/workorder'
|
||||||
import WorkorderForm from './WorkorderForm.vue'
|
import WorkOrderForm from './WorkOrderForm.vue'
|
||||||
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
|
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
|
||||||
import { MesProWorkorderStatusEnum } from '@/views/mes/utils/constants'
|
import { MesProWorkOrderStatusEnum } from '@/views/mes/utils/constants'
|
||||||
|
|
||||||
defineOptions({ name: 'MesProWorkorder' })
|
defineOptions({ name: 'MesProWorkOrder' })
|
||||||
|
|
||||||
const message = useMessage() // 消息弹窗
|
const message = useMessage() // 消息弹窗
|
||||||
const { t } = useI18n() // 国际化
|
const { t } = useI18n() // 国际化
|
||||||
|
|
||||||
const loading = ref(true) // 列表的加载中
|
const loading = ref(true) // 列表的加载中
|
||||||
const list = ref<ProWorkorderVO[]>([]) // 列表的数据
|
const list = ref<ProWorkOrderVO[]>([]) // 列表的数据
|
||||||
const total = ref(0) // 列表的总页数
|
const total = ref(0) // 列表的总页数
|
||||||
const queryParams = reactive({
|
const queryParams = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
|
|
@ -238,7 +238,7 @@ const exportLoading = ref(false) // 导出的加载中
|
||||||
const getList = async () => {
|
const getList = async () => {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const data = await ProWorkorderApi.getWorkorderPage(queryParams)
|
const data = await ProWorkOrderApi.getWorkOrderPage(queryParams)
|
||||||
list.value = data.list
|
list.value = data.list
|
||||||
total.value = data.total
|
total.value = data.total
|
||||||
} finally {
|
} finally {
|
||||||
|
|
@ -268,7 +268,7 @@ const openForm = (type: string, id?: number) => {
|
||||||
const handleDelete = async (id: number) => {
|
const handleDelete = async (id: number) => {
|
||||||
try {
|
try {
|
||||||
await message.delConfirm()
|
await message.delConfirm()
|
||||||
await ProWorkorderApi.deleteWorkorder(id)
|
await ProWorkOrderApi.deleteWorkOrder(id)
|
||||||
message.success(t('common.delSuccess'))
|
message.success(t('common.delSuccess'))
|
||||||
await getList()
|
await getList()
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
@ -278,7 +278,7 @@ const handleDelete = async (id: number) => {
|
||||||
const handleFinish = async (id: number) => {
|
const handleFinish = async (id: number) => {
|
||||||
try {
|
try {
|
||||||
await message.confirm('确认要完成该工单吗?')
|
await message.confirm('确认要完成该工单吗?')
|
||||||
await ProWorkorderApi.finishWorkorder(id)
|
await ProWorkOrderApi.finishWorkOrder(id)
|
||||||
message.success('工单已完成')
|
message.success('工单已完成')
|
||||||
await getList()
|
await getList()
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
@ -288,7 +288,7 @@ const handleFinish = async (id: number) => {
|
||||||
const handleCancel = async (id: number) => {
|
const handleCancel = async (id: number) => {
|
||||||
try {
|
try {
|
||||||
await message.confirm('确认要取消该工单吗?')
|
await message.confirm('确认要取消该工单吗?')
|
||||||
await ProWorkorderApi.cancelWorkorder(id)
|
await ProWorkOrderApi.cancelWorkOrder(id)
|
||||||
message.success('工单已取消')
|
message.success('工单已取消')
|
||||||
await getList()
|
await getList()
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
@ -299,7 +299,7 @@ const handleExport = async () => {
|
||||||
try {
|
try {
|
||||||
await message.exportConfirm()
|
await message.exportConfirm()
|
||||||
exportLoading.value = true
|
exportLoading.value = true
|
||||||
const data = await ProWorkorderApi.exportWorkorder(queryParams)
|
const data = await ProWorkOrderApi.exportWorkOrder(queryParams)
|
||||||
download.excel(data, '生产工单.xls')
|
download.excel(data, '生产工单.xls')
|
||||||
} catch {
|
} catch {
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,7 @@ export const MesCalShiftMethodEnum = {
|
||||||
}
|
}
|
||||||
|
|
||||||
/** MES 生产工单状态枚举 */
|
/** MES 生产工单状态枚举 */
|
||||||
export const MesProWorkorderStatusEnum = {
|
export const MesProWorkOrderStatusEnum = {
|
||||||
PREPARE: 0, // 草稿
|
PREPARE: 0, // 草稿
|
||||||
CONFIRMED: 1, // 已确认
|
CONFIRMED: 1, // 已确认
|
||||||
FINISHED: 2, // 已完成
|
FINISHED: 2, // 已完成
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue