update mes工序工艺关联设备类型

master
yinq 3 days ago
parent 7a91ec6de8
commit afe9bb8abc

@ -245,7 +245,7 @@ const columns = ref<FieldOption[]>([
{ key: 7, label: `物料`, visible: true },
{ key: 8, label: `投料工位`, visible: true },
{ key: 9, label: `扫描结果`, visible: true },
{ key: 10, label: `记录人名称`, visible: true },
{ key: 10, label: `记录人名称`, visible: false },
{ key: 11, label: `备注`, visible: false },
{ key: 12, label: `创建部门`, visible: false },
{ key: 13, label: `记录人`, visible: false },

@ -57,11 +57,7 @@
<el-table-column label='工序名称' align='center' prop='processName' v-if='columns[2].visible' />
<el-table-column label='工艺名称' align='center' prop='technologyName' v-if='columns[15].visible' />
<el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[3].visible' width='180' />
<el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[4].visible'>
<template #default='scope'>
<dict-tag :options='mes_machine_type' :value='scope.row.machineType' />
</template>
</el-table-column>
<el-table-column label='机台类型' align='center' prop='deviceTypeName' v-if='columns[4].visible' />
<el-table-column label='工艺类型' align='center' prop='technologyType' v-if='columns[5].visible'>
<template #default='scope'>
<dict-tag :options='mes_technology_type' :value='scope.row.technologyType' />
@ -130,11 +126,11 @@
<el-form-item label='机台类型' prop='machineType'>
<el-select v-model='form.machineType' placeholder='请选择机台类型'>
<el-option
v-for='dict in mes_machine_type'
:key='dict.value'
:label='dict.label'
:value='dict.value'
></el-option>
v-for='item in deviceTypeList'
:key='item.deviceTypeId'
:label='item.deviceTypeName'
:value='item.deviceTypeId'
/>
</el-select>
</el-form-item>
<el-form-item label='工艺类型' prop='technologyType'>
@ -348,6 +344,7 @@ import {
import { TechnologyInfoVO, TechnologyInfoQuery, TechnologyInfoForm } from '@/api/mes/technologyInfo/types';
import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
import { getBaseDeviceTypeList } from '@/api/mes/baseDeviceType';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -394,6 +391,13 @@ const getProcessInfoListSelect = async () => {
processInfoList.value = res.data;
};
/** 查询机台类型下拉框结构 */
const deviceTypeList = ref([]);
const getSelectBaseDeviceTypeList = async () => {
let res = await getBaseDeviceTypeList({ deviceCategoryId: 2 });
deviceTypeList.value = res.data;
};
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `主键标识`, visible: false },
@ -655,6 +659,7 @@ const handleProdLineSelectionChange = (selection) => {
onMounted(() => {
getProcessInfoListSelect();
getSelectBaseDeviceTypeList();
getList();
});
</script>

@ -81,11 +81,7 @@
<el-table-column label='工序名称' align='center' prop='processName' v-if='columns[2].visible' />
<el-table-column label='工艺名称' align='center' prop='technologyName' v-if='columns[15].visible' />
<el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[3].visible' width='180' />
<el-table-column label='机台类型' align='center' prop='machineType' v-if='columns[4].visible'>
<template #default='scope'>
<dict-tag :options='mes_machine_type' :value='scope.row.machineType' />
</template>
</el-table-column>
<el-table-column label='机台类型' align='center' prop='deviceTypeName' v-if='columns[4].visible' />
<el-table-column label='工艺类型' align='center' prop='technologyType' v-if='columns[5].visible'>
<template #default='scope'>
<dict-tag :options='mes_technology_type' :value='scope.row.technologyType' />
@ -154,11 +150,11 @@
<el-form-item label='机台类型' prop='machineType'>
<el-select v-model='form.machineType' placeholder='请选择机台类型'>
<el-option
v-for='dict in mes_machine_type'
:key='dict.value'
:label='dict.label'
:value='dict.value'
></el-option>
v-for='item in deviceTypeList'
:key='item.deviceTypeId'
:label='item.deviceTypeName'
:value='item.deviceTypeId'
/>
</el-select>
</el-form-item>
<el-form-item label='工艺类型' prop='technologyType'>
@ -347,6 +343,7 @@ import {
import { TechnologyInfoVO, TechnologyInfoQuery, TechnologyInfoForm } from '@/api/mes/technologyInfo/types';
import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
import { getBaseDeviceTypeList } from '@/api/mes/baseDeviceType';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -392,6 +389,13 @@ const getProcessInfoListSelect = async () => {
processInfoList.value = res.data;
};
/** 查询机台类型下拉框结构 */
const deviceTypeList = ref([]);
const getSelectBaseDeviceTypeList = async () => {
let res = await getBaseDeviceTypeList({ deviceCategoryId: 1 });
deviceTypeList.value = res.data;
};
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `主键标识`, visible: false },
@ -651,6 +655,7 @@ const handleProdLineSelectionChange = (selection) => {
};
onMounted(() => {
getSelectBaseDeviceTypeList();
getProcessInfoListSelect();
getList();
});

Loading…
Cancel
Save