From 10f4c87b14ae85a65d28256774e13fed9d2b01ce Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 25 Feb 2025 09:01:09 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/materialBom/addBom.vue | 5 ++ src/views/mes/planInfo/index.vue | 104 ++++++++++++++++++++++----- 2 files changed, 90 insertions(+), 19 deletions(-) diff --git a/src/views/mes/materialBom/addBom.vue b/src/views/mes/materialBom/addBom.vue index 07c85f1..64f4f0a 100644 --- a/src/views/mes/materialBom/addBom.vue +++ b/src/views/mes/materialBom/addBom.vue @@ -118,6 +118,8 @@ const isExpandAll = ref(true); const loading = ref(false); const tableRef = ref() +const materialIdForm = defineProps(['materialIdForm']); + const queryFormRef = ref(); const materialBomFormRef = ref(); @@ -184,6 +186,9 @@ const { queryParams, form, rules } = toRefs(data); /** 查询物料BOM信息列表 */ const getList = async () => { loading.value = true; + if (materialIdForm.materialIdForm !== null){ + queryParams.value.materialId = materialIdForm.materialIdForm + } const res = await listMaterialBom(queryParams.value); materialBomList.value = res.data; loading.value = false; diff --git a/src/views/mes/planInfo/index.vue b/src/views/mes/planInfo/index.vue index 17f1041..3fe094a 100644 --- a/src/views/mes/planInfo/index.vue +++ b/src/views/mes/planInfo/index.vue @@ -361,7 +361,7 @@ - +
确 定 取 消 @@ -378,9 +378,32 @@ - + +
+ 机台信息 +
+ 已勾选机台: + {{ tag }} +
+ + + 机台编号 + + + + 机台名称 + + + + 搜索 + + @@ -471,9 +494,32 @@ - + +
+ 机台信息 +
+ 已勾选机台: + {{ tag }} +
+ + + 机台编号 + + + + 机台名称 + + + + 搜索 + + @@ -563,21 +609,21 @@
机台信息 -
- {{ i }} +
+ 已勾选机台: + {{ tag }}
- - + + 机台编号 - - + + 机台名称 - + - 搜索 - 重置 + 搜索 ([]); const machineIds = ref>([]); +const machineQueryParams = ref({}); + /*获取班次下拉框*/ const getShiftSelect = async () => { let res = await getBaseShiftInfoList(null); @@ -849,9 +898,10 @@ const getProcessSelect = async () => { processList.value = res.data.filter(item => item.processId !== 17 && item.processId !== 18); }; -/*获取工位下拉框*/ +/*获取机台下拉框*/ const getReleaseSelect = async () => { - let res = await getProdBaseMachineInfoList({ processId: form.value.processId }); + // machineQueryParams.value.processId = form.value.processId; + let res = await getProdBaseMachineInfoList(machineQueryParams.value); releaseList.value = res.data; prodBaseMachineInfoList.value = res.data; }; @@ -875,13 +925,13 @@ const columns = ref([ { key: 14, label: `下达ID`, visible: true }, { key: 15, label: `单位生产时间(秒)`, visible: false }, { key: 16, label: `计划数量`, visible: true }, - { key: 17, label: `派工数量`, visible: true }, + { key: 17, label: `派工数量`, visible: false }, { key: 18, label: `完成数量`, visible: true }, { key: 19, label: `计划时间`, visible: true }, { key: 20, label: `计划结束时间`, visible: false }, { key: 21, label: `实际开始时间`, visible: true }, { key: 22, label: `实际完成时间`, visible: true }, - { key: 23, label: `附件信息`, visible: true }, + { key: 23, label: `附件信息`, visible: false }, { key: 24, label: `计划状态`, visible: true }, { key: 25, label: `导入类型`, visible: false }, { key: 26, label: `完成标识`, visible: true }, @@ -990,7 +1040,7 @@ const data = reactive>({ }); const { queryParams, form, rules } = toRefs(data); -const tags = ref([]); +const machineNameTags = ref([]); const getWorkshopId = async () => { const router = useRouter(); @@ -1045,7 +1095,7 @@ const handleSelectionChange = (selection: PlanInfoVO[]) => { /** 选择机台条数 */ const handleSelectionMachineChange = (selection: ProdBaseMachineInfoVO[]) => { machineIds.value = selection.map(item => item.machineId); - tags.value = selection.map(item => item.machineName); + machineNameTags.value = selection.map(item => item.machineName); }; /** 新增按钮操作 */ @@ -1061,6 +1111,8 @@ const handleSfpBatchAdd = () => { machineIds.value = []; sfpBatchDialog.visible = true; sfpBatchDialog.title = '添加半制品生产计划信息'; + machineQueryParams.value = {}; + getReleaseSelect(); }; /** 新增成型按钮操作 */ @@ -1070,6 +1122,8 @@ const handleFormingBatchAdd = () => { formingBatchDialog.visible = true; formingBatchDialog.title = '添加成型生产计划信息'; form.value.processId = 17; + machineQueryParams.value = {}; + getReleaseSelect(); }; /** 新增硫化按钮操作 */ @@ -1079,6 +1133,8 @@ const handleVulBatchAdd = () => { vulBatchDialog.visible = true; vulBatchDialog.title = '添加硫化生产计划信息'; form.value.processId = 18; + machineQueryParams.value = {}; + getReleaseSelect(); }; /** 修改按钮操作 */ @@ -1200,8 +1256,12 @@ const handleExport = () => { }, `planInfo_${new Date().getTime()}.xlsx`); }; -/** 新增按钮操作 */ +/** 新增物料BOM按钮操作 */ const handleMaterialBomAdd = () => { + if (form.value.materialId == null){ + proxy?.$modal.msgWarning('请先选择物料！'); + return; + } materialBomOpen.value = true; }; @@ -1223,9 +1283,15 @@ const submitMaterialForm = () => { let selectedRow = materialSelectRef.value.tableRef.store.states.currentRow.value; form.value.materialId = selectedRow.materialId; form.value.materialName = selectedRow.materialName; + materialIdForm.value =selectedRow.materialId; materialOpen.value = false; }; +/** 搜索机台信息按钮操作 */ +function handleMachineQuery() { + getReleaseSelect(); +} + onMounted(() => { getWorkshopId(); getShiftSelect();