From 09c8a305b2d8bbc66a6479a0fe374e38ae98dc1e Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Tue, 16 Jul 2024 23:46:40 +0800
Subject: [PATCH] fix plan
---
src/api/mes/task/index.ts | 23 ++++++
.../mes/machine/MachineComponentForm.vue | 44 +++++++++-
src/views/mes/plan/PlanForm.vue | 82 +++++++++++++++----
3 files changed, 130 insertions(+), 19 deletions(-)
diff --git a/src/api/mes/task/index.ts b/src/api/mes/task/index.ts
index 4bfef8dc..6ea315de 100644
--- a/src/api/mes/task/index.ts
+++ b/src/api/mes/task/index.ts
@@ -21,6 +21,29 @@ export interface ItemRequisitionAndStockVO {
stockNumber: number // 编码
stockWorkshopNumber: number // 编码
}
+
+// 生产任务单明细 VO
+export interface TaskDetailVO {
+ id: number // ID
+ productId: number // 产品ID
+ productName: number // 产品ID
+ unitId: number // 单位ID
+ unitName: number // 单位ID
+ taskId: number // task ID
+ number: number // 数量
+ planNumber: number //已经计划的数量
+ packageSize: number // 打包要求(每包/个)
+ projectName: string // 项目名称
+ techRequirements: string // 技术要求
+ remark: string // 备注
+ isEnable: boolean // 是否启用
+ packageNumber: number // 打包数量
+ finishDate: Date // 工厂完成
+ boxingDate: Date // 装柜时间
+ arriveDate: Date // 到达时间
+ barCode: string // 条码
+ attachment: string // 附件
+}
// 生产任务单 API
export const TaskApi = {
// 查询生产任务单分页
diff --git a/src/views/mes/machine/MachineComponentForm.vue b/src/views/mes/machine/MachineComponentForm.vue
index e4221187..62168207 100644
--- a/src/views/mes/machine/MachineComponentForm.vue
+++ b/src/views/mes/machine/MachineComponentForm.vue
@@ -121,7 +121,46 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
确 定
@@ -180,6 +219,9 @@ const open = async (type: string, id?: number) => {
formLoading.value = true
try {
formData.value = await MachineComponentApi.getMachineComponent(id)
+ if(formData.value.outgoingReport===null || formData.value.outgoingReport===undefined){
+ formData.value.outgoingReport = ''
+ }
} finally {
formLoading.value = false
}
diff --git a/src/views/mes/plan/PlanForm.vue b/src/views/mes/plan/PlanForm.vue
index ded3f5ab..b90d9455 100644
--- a/src/views/mes/plan/PlanForm.vue
+++ b/src/views/mes/plan/PlanForm.vue
@@ -17,7 +17,7 @@
clearable
filterable
placeholder="请选择"
- class="!w-1/1"
+ @change="handleTaskChange"
>
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+ {{ dict.label }}
+
+
+
@@ -82,14 +114,16 @@
import { PlanApi, PlanVO } from '@/api/mes/plan'
import * as UserApi from "@/api/system/user";
-import {TaskApi, TaskVO} from "@/api/mes/task";
+import {TaskApi, TaskDetailVO, TaskVO} from "@/api/mes/task";
import {ProductApi, ProductVO} from "@/api/erp/product/product";
+import {getIntDictOptions,DICT_TYPE} from "@/utils/dict";
/** 生产计划 表单 */
defineOptions({ name: 'PlanForm' })
const userList = ref([]) // 用户列表
const productList = ref([]) // 用户列表
const taskList = ref([]) // 用户列表
+const taskDetailList = ref([]) // 用户列表
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
@@ -116,10 +150,11 @@ const formData = ref({
endTime: undefined,
productionManagerId: undefined,
remark: undefined,
+ groupType: undefined,
isEnable: undefined
})
const formRules = reactive({
- productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
+ taskDetailId: [{ required: true, message: '明细项不能为空', trigger: 'blur' }],
taskId: [{ required: true, message: '任务单不能为空', trigger: 'blur' }],
planNumber: [{ required: true, message: '成型数量不能为空', trigger: 'blur' }],
reyaNumber: [{ required: true, message: '热压数量不能为空', trigger: 'blur' }],
@@ -134,6 +169,7 @@ const open = async (type: string, id?: number,
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
+ editDisable.value = false
resetForm()
if(taskId)
formData.value.taskId = taskId
@@ -161,7 +197,7 @@ const open = async (type: string, id?: number,
// 加载用户列表
userList.value = await UserApi.getSimpleUserList()
// 列表
- productList.value = await ProductApi.getMesProductSimpleList()
+ //productList.value = await ProductApi.getMesProductSimpleList()
// 列表
taskList.value = await TaskApi.getPlanTaskList()
}
@@ -208,8 +244,18 @@ const resetForm = () => {
endTime: undefined,
productionManagerId: undefined,
remark: undefined,
+ groupType: undefined,
isEnable: undefined
}
formRef.value?.resetFields()
}
+
+/** 任务单变化 */
+const handleTaskChange = async(e) => {
+ taskDetailList.value =await TaskApi.getTaskDetailListByTaskId(formData.value.taskId)
+}
+/** 明细变化 */
+const handleTaskDetailChange = async(e) => {
+ console.log(e)
+}