diff --git a/src/views/mes/production/material-requisition/MaterialRequisitionForm.vue b/src/views/mes/production/material-requisition/MaterialRequisitionForm.vue index 3cd74c3..bd7269d 100644 --- a/src/views/mes/production/material-requisition/MaterialRequisitionForm.vue +++ b/src/views/mes/production/material-requisition/MaterialRequisitionForm.vue @@ -1,14 +1,14 @@ - + - - + + - + - - + + - + - - + + - + @@ -632,6 +632,10 @@ import { WarehouseApi } from '@/api/erp/stock/warehouse' import { WeighApi } from '@/api/erp/purchase/weigh' import { YVHgetWorkOrderPage } from '@/api/mes/production/workorder' import { getProductBomPage, getProductBom, ProductBomVO, ProductBomItemVO } from '@/api/mes/product/bom' +import { useWindowSize } from '@vueuse/core' + +const { width } = useWindowSize() +const isMobile = computed(() => width.value < 768) const emit = defineEmits(['success']) const dialogVisible = ref(false) diff --git a/src/views/mes/production/material-requisition/index.vue b/src/views/mes/production/material-requisition/index.vue index b2c82b4..8a16494 100644 --- a/src/views/mes/production/material-requisition/index.vue +++ b/src/views/mes/production/material-requisition/index.vue @@ -1,87 +1,196 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - 搜索 - 重置 - - 新增 - - - - - + + + + + + - - - - - + + + 全部 + 待审核 + 已审核 + 已领料 + + + + + + + + + + {{ row.code }} + {{ getStatusText(row.status) }} + + + + 批次信息 + {{ row.orderCode || '-' }} + + + 领料时间 + {{ formatDate(row.requisitionTime) }} + + + 申请人 + {{ row.applicantName || '-' }} + + + 审批人 + {{ row.approverName || '-' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 重置 + 确认筛选 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + 新增 + + + + + + + + + + @@ -172,15 +281,16 @@ --> - - - - + + + + + @@ -191,6 +301,7 @@ + + diff --git a/src/views/mes/production/plan/detail/index.vue b/src/views/mes/production/plan/detail/index.vue index a7a36ea..81a8744 100644 --- a/src/views/mes/production/plan/detail/index.vue +++ b/src/views/mes/production/plan/detail/index.vue @@ -3,7 +3,7 @@ - + {{ planInfo.planCode }} {{ planInfo.planName }} @@ -20,7 +20,7 @@ {{ planInfo.createTime }} - {{ planInfo.remark || '-' }} + {{ planInfo.remark || '-' }} @@ -37,26 +37,26 @@ - - + + 总计划数量 {{ planInfo.totalPlanQuantity || 0 }} - + 已完成数量 {{ planInfo.totalCompletedQuantity || 0 }} - + 进行中数量 {{ planInfo.totalInProgressQuantity || 0 }} - + 整体完成率 @@ -221,7 +221,7 @@ + + diff --git a/src/views/mes/production/plan/list/GenerateOrderDialog.vue b/src/views/mes/production/plan/list/GenerateOrderDialog.vue index 923e192..71930db 100644 --- a/src/views/mes/production/plan/list/GenerateOrderDialog.vue +++ b/src/views/mes/production/plan/list/GenerateOrderDialog.vue @@ -1,5 +1,105 @@ + + + + + + + 计划名称:{{ planInfo.planName }} + 计划周期:{{ planInfo.planPeriod }} + 总计划数量:{{ planInfo.totalPlanQuantity }} + + + + + + 选择产品 + + + + + {{ item.productName }} + + + + 计划 + {{ item.planQuantity }} + + + 已完成 + {{ item.completedQuantity || 0 }} + + + 进行中 + {{ item.inProgressQuantity || 0 }} + + + + + + + + + + + 拆分策略 + + 单个工单(不拆分) + 按周拆分 + 按天拆分 + + + 将整个计划明细生成为一个工单 + 按周拆分,每周生成一个工单 + 按天拆分,每天生成一个工单 + + + + + 其他设置 + + 自动审核 + + + 开启后,生成的工单将自动审核通过 + + + + + + + + + + + diff --git a/src/views/mes/production/plan/list/ProductionPlanForm.vue b/src/views/mes/production/plan/list/ProductionPlanForm.vue index 93acd89..f94b343 100644 --- a/src/views/mes/production/plan/list/ProductionPlanForm.vue +++ b/src/views/mes/production/plan/list/ProductionPlanForm.vue @@ -1,5 +1,189 @@ + + + + + 基本信息 + + + + + + + + + + + + + + + + + + + + + + + + + + 计划时间 + + + + + + + + + + + + + + 计划明细 + + 添加产品 + + + + + + + {{ index + 1 }} + + + + + + + + {{ product.name }} + ({{ product.barCode }}) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + @@ -30,12 +214,12 @@ - + - + - - + + - + width.value < 768) const emits = defineEmits(['success']) @@ -405,3 +593,72 @@ const getCurrentPeriod = () => { defineExpose({ open }) + + diff --git a/src/views/mes/production/plan/list/index.vue b/src/views/mes/production/plan/list/index.vue index 9db8480..2acdf36 100644 --- a/src/views/mes/production/plan/list/index.vue +++ b/src/views/mes/production/plan/list/index.vue @@ -1,87 +1,234 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - 搜索 - 重置 - - 新增计划 - - - - + + + + + + - - - + + 全部 + 草稿 + 已发布 + 执行中 + + + + + + + + + + {{ row.planCode }} + {{ getStatusText(row.status) }} + + + + 计划名称 + {{ row.planName }} + + + 计划类型 + + {{ getPlanTypeText(row.planType) }} + + + + 计划周期 + {{ row.planPeriod }} + + + 计划时间 + {{ row.startDate }} ~ {{ row.endDate }} + + + + {{ row.totalPlanQuantity || 0 }} + 计划数量 + + + {{ row.totalCompletedQuantity || 0 }} + 已完成 + + + {{ row.totalInProgressQuantity || 0 }} + 进行中 + + + {{ row.overallCompletionRate || 0 }}% + 完成率 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 重置 + 确认筛选 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + 新增计划 + + + + + + + + - - - - + + + + + @@ -286,9 +434,10 @@ + + diff --git a/src/views/mes/production/workorder/WorkOrderForm.vue b/src/views/mes/production/workorder/WorkOrderForm.vue index 6b569e7..666bd09 100644 --- a/src/views/mes/production/workorder/WorkOrderForm.vue +++ b/src/views/mes/production/workorder/WorkOrderForm.vue @@ -2,11 +2,12 @@ - + @@ -14,7 +15,7 @@ @@ -76,7 +78,7 @@ @@ -137,6 +139,10 @@ import { } from '@/api/mes/production/workorder' import { YVHgetProcessRoute, YVHgetProcessRouteList } from '@/api/mes/production/process-route' import { ProductApi } from '@/api/erp/product/product' +import { useWindowSize } from '@vueuse/core' + +const { width } = useWindowSize() +const isMobile = computed(() => width.value < 768) const emits = defineEmits(['success']) diff --git a/src/views/mes/production/workorder/components/OperationDetailDialog.vue b/src/views/mes/production/workorder/components/OperationDetailDialog.vue index 117da3f..b4e083a 100644 --- a/src/views/mes/production/workorder/components/OperationDetailDialog.vue +++ b/src/views/mes/production/workorder/components/OperationDetailDialog.vue @@ -1,5 +1,87 @@ - + + + + + + 工序参数 + + + {{ formatDetailFieldValue(field) }} + + + + + + + 执行信息 + + {{ + currentDetailOperation?.currentExecution?.workerName || '-' + }} + + + {{ + currentDetailOperation?.currentExecution?.equipmentName || '-' + }} + + + {{ + currentDetailOperation?.currentExecution?.startTime || '-' + }} + + + {{ + currentDetailOperation?.currentExecution?.endTime || '-' + }} + + + + + 数量统计 + + + 投入数量 + {{ + currentDetailOperation?.currentExecution?.inputQuantity || '-' + }} + + + 产出数量 + {{ + currentDetailOperation?.currentExecution?.outputQuantity || '-' + }} + + + 合格数量 + {{ + currentDetailOperation?.currentExecution?.qualifiedQuantity || '-' + }} + + + 不合格数量 + {{ + currentDetailOperation?.currentExecution?.unqualifiedQuantity || '-' + }} + + + + + + + + + + + @@ -60,6 +142,10 @@ - diff --git a/src/views/mes/production/workorder/components/OperationStartDialog.vue b/src/views/mes/production/workorder/components/OperationStartDialog.vue index 1b82d5b..420241b 100644 --- a/src/views/mes/production/workorder/components/OperationStartDialog.vue +++ b/src/views/mes/production/workorder/components/OperationStartDialog.vue @@ -1,5 +1,53 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + import { computed, reactive, ref, watch } from 'vue' import { useUserStore } from '@/store/modules/user' +import { useWindowSize } from '@vueuse/core' + +const { width } = useWindowSize() +const isMobile = computed(() => width.value < 768) interface EquipmentOption { id: number @@ -124,3 +176,12 @@ const handleSubmit = () => { }) } + + diff --git a/src/views/mes/production/workorder/index.vue b/src/views/mes/production/workorder/index.vue index b1e774c..4931c16 100644 --- a/src/views/mes/production/workorder/index.vue +++ b/src/views/mes/production/workorder/index.vue @@ -1,88 +1,223 @@ - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - 搜索 - 重置 - - 新增 - - item.id))" - v-hasPermi="['mes:production-order:delete']" - :disabled="selectionList.length === 0" - > - 删除 - - - - + + + + + + - - - + + 全部 + 已审核 + 生产中 + 已完成 + + + + + + + + + + {{ row.code }} + {{ getStatusText(row.status) }} + + + + 产品 + {{ row.productName }} + + + 产品编码 + {{ row.productCode }} + + + 计划时间 + {{ formatDateTime(row.planStartTime) }} ~ {{ formatDateTime(row.planEndTime) }} + + + + {{ row.planQuantity || 0 }} + 计划数量 + + + {{ row.producedQuantity || 0 }} + 已完成 + + + + {{ row.planQuantity > 0 ? Math.round((row.producedQuantity || 0) / row.planQuantity * 100) : 0 }}% + + 完成率 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 重置 + 确认筛选 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + 新增 + + item.id))" + v-hasPermi="['mes:production-order:delete']" + :disabled="selectionList.length === 0" + > + 删除 + + + + + + + + - - - - + + + + + @@ -368,8 +504,9 @@ + +