xins
/
hwmom-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 优化生产计划添加

Browse Source
master
yinq 1 month ago
parent f34444f709
commit 10f4c87b14
2 changed files with 90 additions and 19 deletions
Show Stats Download Patch File Download Diff File

5
src/views/mes/materialBom/addBom.vue
Unescape Escape View File

@ -118,6 +118,8 @@ const isExpandAll = ref(true);
const loading = ref(false);
const tableRef = ref()
const materialIdForm = defineProps(['materialIdForm']);
const queryFormRef = ref<ElFormInstance>();
const materialBomFormRef = ref<ElFormInstance>();
@ -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;

104
src/views/mes/planInfo/index.vue
Unescape Escape View File

@ -361,7 +361,7 @@
<!-- 添加物料BOM信息对话框 -->
<el-dialog title='选择物料BOM信息' v-model='materialBomOpen' append-to-body>
<BomSelect @selection='handleSelection' ref='bomSelectRef' v-if='materialBomOpen'></BomSelect>
<BomSelect @selection='handleSelection' ref='bomSelectRef' v-if='materialBomOpen' :materialIdForm="materialIdForm" ></BomSelect>
<div slot='footer' class='dialog-footer'>
<el-button type='primary' @click='submitMaterialBomForm'>确 定</el-button>
<el-button @click='materialBomOpen = false'>取 消</el-button>
@ -378,9 +378,32 @@
</el-dialog>
<!-- 批量添加半制品计划信息对话框 -->
<el-dialog :title='sfpBatchDialog.title' v-model='sfpBatchDialog.visible' width='800px' append-to-body>
<el-dialog :title='sfpBatchDialog.title' v-model='sfpBatchDialog.visible' width='1000px' append-to-body>
<template #header='{ close, titleId, titleClass }'>
<div class='my-header'>
{{ sfpBatchDialog.title }}
</div>
</template>
<el-container style='height: 500px; border: 1px solid #eee'>
<div style='width: 400px; height: 100%; overflow: auto'>
<el-divider content-position='center'>机台信息</el-divider>
<div style='margin-bottom: 8px'>
<span style='font-weight:700; padding: 0 4px'>已勾选机台:</span>
<el-tag type='primary' v-for='tag in machineNameTags'>{{ tag }}</el-tag>
</div>
<el-form ref='queryFormRef' :model='machineQueryParams' :inline='true' label-width='68px'>
<span style='font-weight:700; padding: 0 4px'>
机台编号
</span>
<el-input v-model='machineQueryParams.machineCode' placeholder='请输入机台编号' clearable style='width: 120px;' />
<span style='font-weight:700; padding: 0 4px'>
机台名称
</span>
<el-input v-model='machineQueryParams.machineName' placeholder='请输入机台名称' clearable style='width: 120px;' />
<el-form-item>
<el-button type='primary' icon='Search' @click='handleMachineQuery'>搜索</el-button>
</el-form-item>
</el-form>
<el-table v-loading='loading' :data='prodBaseMachineInfoList'
@selection-change='handleSelectionMachineChange'>
<el-table-column type='selection' width='55' align='center' />
@ -471,9 +494,32 @@
</el-dialog>
<!-- 批量添加成型计划信息对话框 -->
<el-dialog :title='formingBatchDialog.title' v-model='formingBatchDialog.visible' width='800px' append-to-body>
<el-dialog v-model='formingBatchDialog.visible' width='1000px' append-to-body>
<template #header='{ close, titleId, titleClass }'>
<div class='my-header'>
{{ formingBatchDialog.title }}
</div>
</template>
<el-container style='height: 500px; border: 1px solid #eee'>
<div style='width: 400px; height: 100%; overflow: auto'>
<el-divider content-position='center'>机台信息</el-divider>
<div style='margin-bottom: 8px'>
<span style='font-weight:700; padding: 0 4px'>已勾选机台:</span>
<el-tag type='primary' v-for='tag in machineNameTags'>{{ tag }}</el-tag>
</div>
<el-form ref='queryFormRef' :model='machineQueryParams' :inline='true' label-width='68px'>
<span style='font-weight:700; padding: 0 4px'>
机台编号
</span>
<el-input v-model='machineQueryParams.machineCode' placeholder='请输入机台编号' clearable style='width: 120px;' />
<span style='font-weight:700; padding: 0 4px'>
机台名称
</span>
<el-input v-model='machineQueryParams.machineName' placeholder='请输入机台名称' clearable style='width: 120px;' />
<el-form-item>
<el-button type='primary' icon='Search' @click='handleMachineQuery'>搜索</el-button>
</el-form-item>
</el-form>
<el-table v-loading='loading' :data='prodBaseMachineInfoList'
@selection-change='handleSelectionMachineChange'>
<el-table-column type='selection' width='55' align='center' />
@ -563,21 +609,21 @@
<el-container style='height: 500px; border: 1px solid #eee'>
<div style='width: 400px; height: 100%; overflow: auto'>
<el-divider content-position='center'>机台信息</el-divider>
<div style="margin-bottom: 8px">
<el-tag type="primary" v-for="i in tags">{{ i }}</el-tag>
<div style='margin-bottom: 8px'>
<span style='font-weight:700; padding: 0 4px'>已勾选机台:</span>
<el-tag type='primary' v-for='tag in machineNameTags'>{{ tag }}</el-tag>
</div>
<el-form ref='queryFormRef' :model='queryParams' :inline='true' label-width='68px'>
<span label='机台编号' prop='machineCode' style='font-weight:700; padding: 0 4px'>
<el-form ref='queryFormRef' :model='machineQueryParams' :inline='true' label-width='68px'>
<span style='font-weight:700; padding: 0 4px'>
机台编号
</span>
<el-input v-model='queryParams.machineCode' placeholder='请输入机台编号' clearable style='width: 120px;' />
<span label='机台编号' prop='machineCode' style='font-weight:700; padding: 0 4px'>
<el-input v-model='machineQueryParams.machineCode' placeholder='请输入机台编号' clearable style='width: 120px;' />
<span style='font-weight:700; padding: 0 4px'>
机台名称
</span>
<el-input v-model='queryParams.machineName' placeholder='请输入机台名称' clearable style='width: 120px;' />
<el-input v-model='machineQueryParams.machineName' placeholder='请输入机台名称' clearable style='width: 120px;' />
<el-form-item>
<el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
<el-button icon='Refresh' @click='resetQuery'>重置</el-button>
<el-button type='primary' icon='Search' @click='handleMachineQuery'>搜索</el-button>
</el-form-item>
</el-form>
<el-table v-loading='loading' :data='prodBaseMachineInfoList'
@ -824,6 +870,7 @@ const materialBomOpen = ref(false);
const bomSelectRef = ref();
const materialOpen = ref(false);
const materialSelectRef = ref();
const materialIdForm = ref();
const workshopId = ref();
@ -831,6 +878,8 @@ const prodBaseMachineInfoList = ref<ProdBaseMachineInfoVO[]>([]);
const machineIds = ref<Array<string | number>>([]);
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<FieldOption[]>([
{ 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<PageData<PlanInfoForm, PlanInfoQuery>>({
});
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();

Write Preview
Loading…
Cancel
Save