update 选择添加BOM页面、物料页面

master
yinq 5 days ago
parent e937db72ee
commit 34f2be6dde

@ -218,6 +218,20 @@ export const dynamicRoutes: RouteRecordRaw[] = [
meta: { title: '请假申请', activeMenu: '/workflow/leave', noCache: true } meta: { title: '请假申请', activeMenu: '/workflow/leave', noCache: true }
} }
] ]
},
{
path: '/mes/product-plan',
component: Layout,
hidden: true,
permissions: ['mes:orderInfo:edit'],
children: [
{
path: 'index/:productOrderId(\\d+)',
component: () => import('@/views/mes/orderInfo/editProductPlan.vue'),
name: 'productPlanEdit',
meta: { title: '生产派工', activeMenu: '/mes/productplan', noCache: true }
}
]
} }
]; ];

@ -0,0 +1,482 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="物料编码" prop="materialCode">
<el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料大类" prop="materialCategories">
<el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类" clearable >
<el-option v-for="dict in mes_material_categories" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<el-table v-loading="loading"
:data="baseMaterialInfoList"
ref="tableRef"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
highlight-current-row
>
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column label="主键标识" align="center" prop="materialId" v-if="columns[0].visible"/>-->
<!-- <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>-->
<el-table-column label="ERP信息" align="center" prop="erpId" v-if="columns[0].visible"/>
<el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible" width="100"/>
<el-table-column label="旧物料编码" align="center" prop="oldMaterialCode" v-if="columns[2].visible" width="100"/>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible" width="150"/>
<el-table-column label="物料类型ID" align="center" prop="materialTypeId" v-if="columns[4].visible"/>
<el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[5].visible">
<template #default="scope">
<dict-tag :options="mes_material_categories" :value="scope.row.materialCategories"/>
</template>
</el-table-column>
<el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[6].visible"/>
<el-table-column label="批次标识" align="center" prop="batchFlag" v-if="columns[7].visible">
<template #default="scope">
<dict-tag :options="mes_batch_flag" :value="scope.row.batchFlag"/>
</template>
</el-table-column>
<el-table-column label="小批次数量" align="center" prop="batchAmount" v-if="columns[8].visible"/>
<el-table-column label="计量单位ID" align="center" prop="materialUnitId" v-if="columns[9].visible"/>
<el-table-column label="计量单位名称" align="center" prop="materialUnit" v-if="columns[10].visible" width="120"/>
<el-table-column label="物料组" align="center" prop="materialMatkl" v-if="columns[11].visible"/>
<el-table-column label="物料规格" align="center" prop="materialSpec" v-if="columns[12].visible"/>
<el-table-column label="净重" align="center" prop="netWeight" v-if="columns[13].visible"/>
<el-table-column label="毛重" align="center" prop="grossWeight" v-if="columns[14].visible"/>
<el-table-column label="绑定标识" align="center" prop="alwaysFlag" v-if="columns[15].visible">
<template #default="scope">
<dict-tag :options="always_flag" :value="scope.row.alwaysFlag"/>
</template>
</el-table-column>
<el-table-column label="所属工厂" align="center" prop="factoryName" v-if="columns[16].visible"/>
<el-table-column label="创建组织" align="center" prop="createOrgId" v-if="columns[17].visible"/>
<el-table-column label="使用组织" align="center" prop="useOrgId" v-if="columns[18].visible"/>
<el-table-column label="所属产线" align="center" prop="prodLineId" v-if="columns[19].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[20].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
</template>
</el-table-column>
<el-table-column label="删除标识" align="center" prop="deletedFlag" v-if="columns[21].visible">
<template #default="scope">
<dict-tag :options="deleted_flag" :value="scope.row.deletedFlag"/>
</template>
</el-table-column>
<el-table-column label="采购计价单位" align="center" prop="purchasePriceUnitId" v-if="columns[22].visible"/>
<el-table-column label="审核日期" align="center" prop="approveDate" width="180" v-if="columns[23].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.approveDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="erp最后更新日期" align="center" prop="erpModifyDate" width="180" v-if="columns[24].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.erpModifyDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="最大库存数量" align="center" prop="maxStockAmount" v-if="columns[25].visible"/>
<el-table-column label="最小库存数量" align="center" prop="minStockAmount" v-if="columns[26].visible"/>
<el-table-column label="安全库存数量" align="center" prop="safeStockAmount" v-if="columns[27].visible"/>
<el-table-column label="申请标识" align="center" prop="applyFlag" v-if="columns[28].visible">
<template #default="scope">
<dict-tag :options="apply_flag" :value="scope.row.applyFlag"/>
</template>
</el-table-column>
<el-table-column label="物料分类" align="center" prop="materialClassfication" v-if="columns[29].visible">
<template #default="scope">
<dict-tag :options="material_classfication" :value="scope.row.materialClassfication"/>
</template>
</el-table-column>
<el-table-column label="自动出库标识" align="center" prop="autoOutstockFlag" v-if="columns[30].visible">
<template #default="scope">
<dict-tag :options="auto_outstock_flag" :value="scope.row.autoOutstockFlag"/>
</template>
</el-table-column>
<el-table-column label="辅料标识" align="center" prop="accessoriesFlag" v-if="columns[31].visible">
<template #default="scope">
<dict-tag :options="mes_accessories_flag" :value="scope.row.accessoriesFlag"/>
</template>
</el-table-column>
<el-table-column label="低值易耗品标识(1是 0否)" align="center" prop="lowValueConsumableFlag" v-if="columns[32].visible">
<template #default="scope">
<dict-tag :options="mes_low_value_consumable_flag" :value="scope.row.lowValueConsumableFlag"/>
</template>
</el-table-column>
<el-table-column label="品牌" align="center" prop="brand" v-if="columns[33].visible"/>
<el-table-column label="层级" align="center" prop="plyrating" v-if="columns[34].visible"/>
<el-table-column label="花纹" align="center" prop="pattern" v-if="columns[35].visible"/>
<el-table-column label="速度级别" align="center" prop="speedLevel" v-if="columns[36].visible"/>
<el-table-column label="负荷载重" align="center" prop="load" v-if="columns[37].visible"/>
<el-table-column label="轮胎标记" align="center" prop="tireMarkings" v-if="columns[38].visible">
<template #default="scope">
<dict-tag :options="tire_markings" :value="scope.row.tireMarkings"/>
</template>
</el-table-column>
<el-table-column label="最小停放时间" align="center" prop="minParkingTime" v-if="columns[39].visible"/>
<el-table-column label="最大停放时间" align="center" prop="maxParkingTime" v-if="columns[40].visible"/>
<el-table-column label="标准重量" align="center" prop="standardWeight" v-if="columns[41].visible"/>
<el-table-column label="标准重量上限" align="center" prop="weightUpperLimit" v-if="columns[42].visible"/>
<el-table-column label="标准重量下限" align="center" prop="weightLowerLimit" v-if="columns[43].visible"/>
<el-table-column label="内胎标记" align="center" prop="innerTubeFlag" v-if="columns[44].visible">
<template #default="scope">
<dict-tag :options="inner_tube_flag" :value="scope.row.innerTubeFlag"/>
</template>
</el-table-column>
<el-table-column label="销售类型" align="center" prop="saleType" v-if="columns[45].visible">
<template #default="scope">
<dict-tag :options="sale_type" :value="scope.row.saleType"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[46].visible"/>
<!-- <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[49].visible"/>
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[50].visible"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[51].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[52].visible"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[53].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>-->
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
</div>
</template>
<script setup name="BaseMaterialInfo" lang="ts">
import { listBaseMaterialInfo, getBaseMaterialInfo, delBaseMaterialInfo, addBaseMaterialInfo, updateBaseMaterialInfo } from '@/api/mes/baseMaterialInfo';
import { BaseMaterialInfoVO, BaseMaterialInfoQuery, BaseMaterialInfoForm } from '@/api/mes/baseMaterialInfo/types';
import { getFactoryList } from "@/api/mes/baseFactoryInfo";
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { apply_flag, inner_tube_flag,
mes_material_categories, always_flag, mes_accessories_flag,
auto_outstock_flag, mes_batch_flag, active_flag, sale_type, deleted_flag, tire_markings,
material_classfication, mes_low_value_consumable_flag } = toRefs<any>(proxy?.useDict('apply_flag', 'inner_tube_flag', 'mes_material_categories', 'always_flag', 'mes_accessories_flag', 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag'));
const baseMaterialInfoList = ref<BaseMaterialInfoVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const dateRangeApproveDate = ref<[DateModelType, DateModelType]>(['', '']);
const queryFormRef = ref<ElFormInstance>();
const baseMaterialInfoFormRef = ref<ElFormInstance>();
const selectedRow = ref({});
const tableRef = ref()
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
//
const columns = ref<FieldOption[]>([
/* { key: 0, label: ``, visible: true },
{ key: 1, label: `租户编号`, visible: true },*/
{ key: 0, label: `ERP信息`, visible: false },
{ key: 1, label: `物料编码`, visible: true },
{ key: 2, label: `旧物料编码`, visible: true },
{ key: 3, label: `物料名称`, visible: true },
{ key: 4, label: `物料类型ID`, visible: false },
{ key: 5, label: `物料大类`, visible: true },
{ key: 6, label: `物料小类`, visible: true },
{ key: 7, label: `批次标识`, visible: false },
{ key: 8, label: `小批次数量`, visible: false },
{ key: 9, label: `计量单位ID`, visible: false },
{ key: 10, label: `计量单位名称`, visible: true },
{ key: 11, label: `物料组`, visible: false },
{ key: 12, label: `物料规格`, visible: true },
{ key: 13, label: `净重`, visible: false },
{ key: 14, label: `毛重`, visible: false },
{ key: 15, label: `绑定标识`, visible: false },
{ key: 16, label: `所属工厂`, visible: false },
{ key: 17, label: `创建组织`, visible: false },
{ key: 18, label: `使用组织`, visible: false },
{ key: 19, label: `所属产线`, visible: false },
{ key: 20, label: `激活标识`, visible: false },
{ key: 21, label: `删除标识`, visible: false },
{ key: 22, label: `采购计价单位`, visible: false },
{ key: 23, label: `审核日期`, visible: false },
{ key: 24, label: `erp最后更新日期`, visible: false },
{ key: 25, label: `最大库存数量`, visible: false },
{ key: 26, label: `最小库存数量`, visible: false },
{ key: 27, label: `安全库存数量`, visible: false },
{ key: 28, label: `申请标识`, visible: false },
{ key: 29, label: `物料分类`, visible: false },
{ key: 30, label: `自动出库标识`, visible: false },
{ key: 31, label: `辅料标识`, visible: false },
{ key: 32, label: `低值易耗品标识`, visible: false },
{ key: 33, label: `品牌`, visible: true },
{ key: 34, label: `层级`, visible: true },
{ key: 35, label: `花纹`, visible: true },
{ key: 36, label: `速度级别`, visible: true },
{ key: 37, label: `负荷载重`, visible: true },
{ key: 38, label: `轮胎标记`, visible: true },
{ key: 39, label: `最小停放时间`, visible: false },
{ key: 40, label: `最大停放时间`, visible: false },
{ key: 41, label: `标准重量`, visible: false },
{ key: 42, label: `标准重量上限`, visible: false },
{ key: 43, label: `标准重量下限`, visible: false },
{ key: 44, label: `内胎标记`, visible: false },
{ key: 45, label: `销售类型`, visible: false },
{ key: 46, label: `备注`, visible: false },
/* { key: 49, label: ``, visible: true },
{ key: 50, label: `创建人`, visible: true },
{ key: 51, label: `创建时间`, visible: true },
{ key: 52, label: `更新人`, visible: true },
{ key: 53, label: `更新时间`, visible: true },*/
]);
const initFormData: BaseMaterialInfoForm = {
materialId: undefined,
erpId: undefined,
materialCode: undefined,
oldMaterialCode: undefined,
materialName: undefined,
materialTypeId: undefined,
materialCategories: undefined,
materialSubclass: undefined,
batchFlag: undefined,
batchAmount: undefined,
materialUnitId: undefined,
materialUnit: undefined,
materialMatkl: undefined,
materialSpec: undefined,
netWeight: undefined,
grossWeight: undefined,
alwaysFlag: undefined,
factoryId: undefined,
createOrgId: undefined,
useOrgId: undefined,
prodLineId: undefined,
activeFlag: '1',
deletedFlag: undefined,
purchasePriceUnitId: undefined,
approveDate: undefined,
erpModifyDate: undefined,
maxStockAmount: undefined,
minStockAmount: undefined,
safeStockAmount: undefined,
applyFlag: undefined,
materialClassfication: undefined,
autoOutstockFlag: undefined,
accessoriesFlag: undefined,
lowValueConsumableFlag: undefined,
brand: undefined,
plyrating: undefined,
pattern: undefined,
speedLevel: undefined,
load: undefined,
tireMarkings: undefined,
minParkingTime: undefined,
maxParkingTime: undefined,
standardWeight: undefined,
weightUpperLimit: undefined,
weightLowerLimit: undefined,
innerTubeFlag: undefined,
saleType: undefined,
remark: undefined,
}
const data = reactive<PageData<BaseMaterialInfoForm, BaseMaterialInfoQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
materialId: undefined,
erpId: undefined,
materialCode: undefined,
oldMaterialCode: undefined,
materialName: undefined,
materialTypeId: undefined,
materialCategories: undefined,
materialSubclass: undefined,
batchFlag: undefined,
batchAmount: undefined,
materialUnitId: undefined,
materialUnit: undefined,
materialMatkl: undefined,
materialSpec: undefined,
netWeight: undefined,
grossWeight: undefined,
alwaysFlag: undefined,
factoryId: undefined,
createOrgId: undefined,
useOrgId: undefined,
prodLineId: undefined,
activeFlag: undefined,
deletedFlag: undefined,
purchasePriceUnitId: undefined,
erpModifyDate: undefined,
maxStockAmount: undefined,
minStockAmount: undefined,
safeStockAmount: undefined,
applyFlag: undefined,
materialClassfication: undefined,
autoOutstockFlag: undefined,
accessoriesFlag: undefined,
lowValueConsumableFlag: undefined,
brand: undefined,
plyrating: undefined,
pattern: undefined,
speedLevel: undefined,
load: undefined,
tireMarkings: undefined,
minParkingTime: undefined,
maxParkingTime: undefined,
standardWeight: undefined,
weightUpperLimit: undefined,
weightLowerLimit: undefined,
innerTubeFlag: undefined,
saleType: undefined,
params: {
approveDate: undefined,
}
},
rules: {
erpId: [
{ required: true, message: "ERP信息不能为空", trigger: "blur" }
],
materialCode: [
{ required: true, message: "物料编码不能为空", trigger: "blur" }
],
materialName: [
{ required: true, message: "物料名称不能为空", trigger: "blur" }
],
}
});
const { queryParams, form, rules } = toRefs(data);
/** 下拉框查询工厂信息列表 */
let factoryList = ref([])
const getFactorySelect = async () => {
let res = await getFactoryList(null);
factoryList.value = res.data;
}
/** 查询物料信息列表 */
const getList = async () => {
loading.value = true;
queryParams.value.params = {};
proxy?.addDateRange(queryParams.value, dateRangeApproveDate.value, 'ApproveDate');
const res = await listBaseMaterialInfo(queryParams.value);
baseMaterialInfoList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
baseMaterialInfoFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
dateRangeApproveDate.value = ['', ''];
queryFormRef.value?.resetFields();
handleQuery();
}
// /** */
// const handleSelectionChange = (selection: BaseMaterialInfoVO[]) => {
// ids.value = selection.map(item => item.materialId);
// single.value = selection.length != 1;
// multiple.value = !selection.length;
// }
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加物料信息";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: BaseMaterialInfoVO) => {
reset();
const _materialId = row?.materialId || ids.value[0]
const res = await getBaseMaterialInfo(_materialId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改物料信息";
}
/** 提交按钮 */
const submitForm = () => {
baseMaterialInfoFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.materialId) {
await updateBaseMaterialInfo(form.value).finally(() => buttonLoading.value = false);
} else {
await addBaseMaterialInfo(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: BaseMaterialInfoVO) => {
const _materialIds = row?.materialId || ids.value;
await proxy?.$modal.confirm('是否确认删除物料信息编号为"' + _materialIds + '"的数据项?').finally(() => loading.value = false);
await delBaseMaterialInfo(_materialIds);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('mes/baseMaterialInfo/export', {
...queryParams.value
}, `baseMaterialInfo_${new Date().getTime()}.xlsx`)
}
/** 选中列赋值 */
const handleRowClick = (row) =>{
selectedRow.value = row
};
defineExpose({tableRef})
onMounted(() => {
getFactorySelect();
getList();
});
</script>

@ -104,12 +104,9 @@
import { import {
listMaterialBom listMaterialBom
} from '@/api/mes/materialBom'; } from '@/api/mes/materialBom';
import { MaterialBomVO, MaterialBomQuery, MaterialBomForm } from '@/api/mes/materialBom/types'; import {MaterialBomQuery, MaterialBomForm } from '@/api/mes/materialBom/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
;
const { mes_check_type, material_classfication, active_flag } = toRefs<any>(proxy?.useDict('mes_check_type', 'material_classfication', 'active_flag')); const { mes_check_type, material_classfication, active_flag } = toRefs<any>(proxy?.useDict('mes_check_type', 'material_classfication', 'active_flag'));
@ -192,8 +189,6 @@ const getList = async () => {
loading.value = false; loading.value = false;
}; };
// //
const cancel = () => { const cancel = () => {
reset(); reset();
@ -216,10 +211,10 @@ const resetQuery = () => {
queryFormRef.value?.resetFields(); queryFormRef.value?.resetFields();
handleQuery(); handleQuery();
}; };
//
/** 选中列赋值 */
const handleRowClick = (row) =>{ const handleRowClick = (row) =>{
selectedRow.value = row selectedRow.value = row
console.log(selectedRow.value);
}; };
onMounted(() => { onMounted(() => {

@ -52,7 +52,7 @@
> >
<!-- <el-table-column label='主键标识' align='center' prop='materialBomId' />--> <!-- <el-table-column label='主键标识' align='center' prop='materialBomId' />-->
<!-- <el-table-column label='父级标识' align='center' prop='parentId' />--> <!-- <el-table-column label='父级标识' align='center' prop='parentId' />-->
<el-table-column label='物料ID' align='center' prop='materialId' /> <!-- <el-table-column label='物料ID' align='center' prop='materialId' />-->
<el-table-column label='物料名称' align='center' prop='materialName' /> <el-table-column label='物料名称' align='center' prop='materialName' />
<el-table-column label='bom说明' align='center' prop='materialBomDesc' /> <el-table-column label='bom说明' align='center' prop='materialBomDesc' />
<el-table-column label='bom版本' align='center' prop='materialBomVersion' /> <el-table-column label='bom版本' align='center' prop='materialBomVersion' />
@ -126,11 +126,12 @@
check-strictly check-strictly
/> />
</el-form-item> </el-form-item>
<el-form-item label='物料ID' prop='materialId'> <el-form-item label='物料名称' prop='materialId'>
<el-input v-model='form.materialId' placeholder='请输入物料ID' /> <el-input v-model="form.materialName" placeholder="请点击检索物料" @click="handleMaterialAdd" readonly>
</el-form-item> <template #append>
<el-form-item label='物料名称' prop='materialName'> <el-icon class="el-input__icon" ><search/></el-icon>
<el-input v-model='form.materialName' placeholder='请输入物料名称' /> </template>
</el-input>
</el-form-item> </el-form-item>
<el-form-item label='bom说明' prop='materialBomDesc'> <el-form-item label='bom说明' prop='materialBomDesc'>
<el-input v-model='form.materialBomDesc' placeholder='请输入bom说明' /> <el-input v-model='form.materialBomDesc' placeholder='请输入bom说明' />
@ -142,7 +143,7 @@
<!-- <el-input v-model='form.ancestors' placeholder='请输入祖级列表' />--> <!-- <el-input v-model='form.ancestors' placeholder='请输入祖级列表' />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label='标准数量' prop='standardAmount'> <el-form-item label='标准数量' prop='standardAmount'>
<el-input-number v-model='form.standardAmount' placeholder='请输入标准数量' /> <el-input-number v-model='form.standardAmount' placeholder='请输入标准数量' style="width: 200px;" />
</el-form-item> </el-form-item>
<!-- <el-form-item label='顶级标识' prop='topFlag'>--> <!-- <el-form-item label='顶级标识' prop='topFlag'>-->
<!-- <el-input v-model='form.topFlag' placeholder='请输入顶级标识' />--> <!-- <el-input v-model='form.topFlag' placeholder='请输入顶级标识' />-->
@ -197,6 +198,16 @@
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
<!-- 添加物料信息对话框 -->
<el-dialog title="选择物料信息" v-model="materialOpen" width='1200px' append-to-body>
<MaterialSelect @selection="handleSelection" ref="materialSelectRef" v-if="materialOpen"></MaterialSelect>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitMaterialForm"> </el-button>
<el-button @click="materialOpen = false"> </el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -209,6 +220,7 @@ import {
updateMaterialBom updateMaterialBom
} from '@/api/mes/materialBom'; } from '@/api/mes/materialBom';
import { MaterialBomVO, MaterialBomQuery, MaterialBomForm } from '@/api/mes/materialBom/types'; import { MaterialBomVO, MaterialBomQuery, MaterialBomForm } from '@/api/mes/materialBom/types';
import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
type MaterialBomOption = { type MaterialBomOption = {
materialBomId: number; materialBomId: number;
@ -231,6 +243,9 @@ const loading = ref(false);
const queryFormRef = ref<ElFormInstance>(); const queryFormRef = ref<ElFormInstance>();
const materialBomFormRef = ref<ElFormInstance>(); const materialBomFormRef = ref<ElFormInstance>();
const materialBomTableRef = ref<ElTableInstance>(); const materialBomTableRef = ref<ElTableInstance>();
const materialOpen = ref(false);
const materialSelectRef = ref();
const dialog = reactive<DialogOption>({ const dialog = reactive<DialogOption>({
visible: false, visible: false,
@ -246,7 +261,7 @@ const initFormData: MaterialBomForm = {
materialBomDesc: undefined, materialBomDesc: undefined,
materialBomVersion: undefined, materialBomVersion: undefined,
ancestors: undefined, ancestors: undefined,
standardAmount: undefined, standardAmount: 1,
topFlag: undefined, topFlag: undefined,
checkType: '1', checkType: '1',
projectId: undefined, projectId: undefined,
@ -284,8 +299,8 @@ const data = reactive<PageData<MaterialBomForm, MaterialBomQuery>>({
parentId: [ parentId: [
{ required: true, message: '父级标识不能为空', trigger: 'blur' } { required: true, message: '父级标识不能为空', trigger: 'blur' }
], ],
materialId: [ materialName: [
{ required: true, message: '物料ID不能为空', trigger: 'blur' } { required: true, message: '物料名称不能为空', trigger: 'blur' }
] ]
} }
}); });
@ -402,6 +417,19 @@ const handleDelete = async (row: MaterialBomVO) => {
proxy?.$modal.msgSuccess('删除成功'); proxy?.$modal.msgSuccess('删除成功');
}; };
/** 新增按钮操作 */
const handleMaterialAdd = () => {
materialOpen.value = true;
}
/** 提交物料BOM信息按钮 */
const submitMaterialForm = () => {
let selectedRow = materialSelectRef.value.tableRef.store.states.currentRow.value;
form.value.materialId = selectedRow.materialId
form.value.materialName = selectedRow.materialName
materialOpen.value = false;
}
onMounted(() => { onMounted(() => {
getList(); getList();
}); });

@ -182,15 +182,22 @@
<el-form-item label="物料名称" prop="materialId"> <el-form-item label="物料名称" prop="materialId">
<el-input v-model="form.materialId" placeholder="请输入物料名称" /> <el-input v-model="form.materialId" placeholder="请输入物料名称" />
</el-form-item> </el-form-item>
<el-form-item label="物料BOM" prop="materialBomId"> <el-form-item label="物料BOM" prop="materialName">
<el-input v-model="form.materialBomId" placeholder="请点击右侧检索子BOM" @click="handleMaterialAdd" readonly> <el-input v-model="form.materialName" placeholder="请点击检索物料BOM" @click="handleMaterialBomAdd" readonly>
<template #append> <template #append>
<el-icon class="el-input__icon" ><search /></el-icon> <el-icon class="el-input__icon" ><search/></el-icon>
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="工序名称" prop="processId"> <el-form-item label="工序名称" prop="processId">
<el-input v-model="form.processId" placeholder="请输入工序名称" /> <el-select v-model="form.processId" placeholder="请选择工序">
<el-option
v-for="item in processList"
:key="item.processId"
:label="item.processName"
:value="item.processId"
/>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="顺序" prop="processOrder">--> <!-- <el-form-item label="顺序" prop="processOrder">-->
<!-- <el-input-number v-model="form.processOrder" placeholder="请输入顺序" style="width: 200px;"/>--> <!-- <el-input-number v-model="form.processOrder" placeholder="请输入顺序" style="width: 200px;"/>-->
@ -208,7 +215,7 @@
<!-- </el-radio-group>--> <!-- </el-radio-group>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="下达类型" prop="releaseType"> <el-form-item label="下达类型" prop="releaseType">
<el-radio-group v-model="form.releaseType"> <el-radio-group v-model="form.releaseType" :disabled="true" >
<el-radio <el-radio
v-for="dict in mes_release_type" v-for="dict in mes_release_type"
:key="dict.value" :key="dict.value"
@ -217,7 +224,14 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="下达ID" prop="releaseId"> <el-form-item label="下达ID" prop="releaseId">
<el-input v-model="form.releaseId" placeholder="请输入下达ID" /> <el-select v-model="form.releaseId" placeholder="请选择">
<el-option
v-for="item in stationList"
:key="item.stationId"
:label="item.stationName"
:value="item.stationId"
/>
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="单位生产时间(秒)" prop="productionTime">--> <!-- <el-form-item label="单位生产时间(秒)" prop="productionTime">-->
<!-- <el-input v-model="form.productionTime" placeholder="请输入单位生产时间(秒)" />--> <!-- <el-input v-model="form.productionTime" placeholder="请输入单位生产时间(秒)" />-->
@ -225,9 +239,9 @@
<el-form-item label="计划数量" prop="planAmount"> <el-form-item label="计划数量" prop="planAmount">
<el-input-number v-model="form.planAmount" placeholder="请输入计划数量" style="width: 200px;" /> <el-input-number v-model="form.planAmount" placeholder="请输入计划数量" style="width: 200px;" />
</el-form-item> </el-form-item>
<el-form-item label="派工数量" prop="dispatchAmount"> <!-- <el-form-item label="派工数量" prop="dispatchAmount">-->
<el-input-number v-model="form.dispatchAmount" placeholder="请输入派工数量" style="width: 200px;" /> <!-- <el-input-number v-model="form.dispatchAmount" placeholder="请输入派工数量" style="width: 200px;" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="计划开始时间" prop="planBeginTime"> <el-form-item label="计划开始时间" prop="planBeginTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.planBeginTime" v-model="form.planBeginTime"
@ -290,12 +304,12 @@
</template> </template>
</el-dialog> </el-dialog>
<!-- 添加物料信息对话框 --> <!-- 添加物料BOM信息对话框 -->
<el-dialog title="选择物料信息" v-model="materialOpen" append-to-body> <el-dialog title="选择物料BOM信息" v-model="materialBomOpen" append-to-body>
<BomSelect @selection="handleSelection" ref="bomSelectRef" v-if="materialOpen"></BomSelect> <BomSelect @selection="handleSelection" ref="bomSelectRef" v-if="materialBomOpen"></BomSelect>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitMaterialForm"> </el-button> <el-button type="primary" @click="submitMaterialBomForm"> </el-button>
<el-button @click="materialOpen = false"> </el-button> <el-button @click="materialBomOpen = false"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -308,6 +322,8 @@ import { PlanInfoVO, PlanInfoQuery, PlanInfoForm } from '@/api/mes/planInfo/type
import { getBaseShiftInfoList } from '@/api/mes/baseShiftInfo'; import { getBaseShiftInfoList } from '@/api/mes/baseShiftInfo';
import { getBaseClassTeamInfoList } from '@/api/mes/baseClassTeamInfo'; import { getBaseClassTeamInfoList } from '@/api/mes/baseClassTeamInfo';
import BomSelect from '@/views/mes/materialBom/addBom.vue'; import BomSelect from '@/views/mes/materialBom/addBom.vue';
import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
import { getStationInfoList } from '@/api/mes/baseStationInfo';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { mes_import_flag, active_flag, mes_plan_status, mes_release_type, mes_finish_flag, mes_model_code } = toRefs<any>(proxy?.useDict('mes_import_flag', 'active_flag', 'mes_plan_status', 'mes_release_type', 'mes_finish_flag', 'mes_model_code')); const { mes_import_flag, active_flag, mes_plan_status, mes_release_type, mes_finish_flag, mes_model_code } = toRefs<any>(proxy?.useDict('mes_import_flag', 'active_flag', 'mes_plan_status', 'mes_release_type', 'mes_finish_flag', 'mes_model_code'));
@ -331,8 +347,9 @@ const dialog = reactive<DialogOption>({
const shiftList = ref([]); const shiftList = ref([]);
const classTeamList = ref([]); const classTeamList = ref([]);
const processList = ref([]);
const materialOpen = ref(false); let stationList = ref([]);
const materialBomOpen = ref(false);
const bomSelectRef = ref(); const bomSelectRef = ref();
/*获取班次下拉框*/ /*获取班次下拉框*/
@ -347,6 +364,17 @@ const getClassTeamSelect = async () => {
classTeamList.value = res.data; classTeamList.value = res.data;
}; };
/*获取工序下拉框*/
const getProcessSelect = async () => {
let res = await getProcessInfoList(null);
processList.value = res.data;
};
/*获取工位下拉框*/
const getStationSelect = async () => {
let res = await getStationInfoList(null);
stationList.value = res.data;
};
// //
const columns = ref<FieldOption[]>([ const columns = ref<FieldOption[]>([
@ -402,10 +430,10 @@ const initFormData: PlanInfoForm = {
processOrder: undefined, processOrder: undefined,
lastProcessId: undefined, lastProcessId: undefined,
finalProcessFlag: undefined, finalProcessFlag: undefined,
releaseType: undefined, releaseType: '1',
releaseId: undefined, releaseId: undefined,
productionTime: undefined, productionTime: undefined,
planAmount: undefined, planAmount: 1,
dispatchAmount: undefined, dispatchAmount: undefined,
completeAmount: undefined, completeAmount: undefined,
planBeginTime: undefined, planBeginTime: undefined,
@ -461,21 +489,18 @@ const data = reactive<PageData<PlanInfoForm, PlanInfoQuery>>({
} }
}, },
rules: { rules: {
planCode: [
{ required: true, message: "计划编号不能为空", trigger: "blur" }
],
materialId: [ materialId: [
{ required: true, message: "物料名称不能为空", trigger: "blur" } { required: true, message: "物料名称不能为空", trigger: "blur" }
], ],
materialBomId: [ processId: [
{ required: true, message: "工序不能为空", trigger: "blur" }
],
materialName: [
{ required: true, message: "物料BOM不能为空", trigger: "blur" } { required: true, message: "物料BOM不能为空", trigger: "blur" }
], ],
planAmount: [ planAmount: [
{ required: true, message: "计划数量不能为空", trigger: "blur" } { required: true, message: "计划数量不能为空", trigger: "blur" }
], ],
dispatchAmount: [
{ required: true, message: "派工数量不能为空", trigger: "blur" }
],
} }
}); });
@ -574,27 +599,23 @@ const handleExport = () => {
} }
/** 新增按钮操作 */ /** 新增按钮操作 */
const handleMaterialAdd = () => { const handleMaterialBomAdd = () => {
materialOpen.value = true; materialBomOpen.value = true;
// bomSelectRef.value.open();
} }
/** 提交物料信息按钮 */ /** 提交物料BOM信息按钮 */
const submitMaterialForm = () => { const submitMaterialBomForm = () => {
console.log("bomSelectRef.value",bomSelectRef.value.tableRef.store.states.currentRow.value);
let selectedRow = bomSelectRef.value.tableRef.store.states.currentRow.value; let selectedRow = bomSelectRef.value.tableRef.store.states.currentRow.value;
console.log(selectedRow,form.value); form.value.materialBomId = selectedRow.materialBomId
form.value.materialName = selectedRow.materialName form.value.materialName = selectedRow.materialName
console.log(selectedRow,form.value); materialBomOpen.value = false;
// this.$set(form, "materialId", selectedRow.materialId);
// this.$set(form, "materialName", selectedRow.materialName);
// this.$set(form, "erpMaterialId", selectedRow.erpId);
// materialOpen.value = false;
} }
onMounted(() => { onMounted(() => {
getShiftSelect(); getShiftSelect();
getClassTeamSelect(); getClassTeamSelect();
getProcessSelect();
getStationSelect();
getList(); getList();
}); });
</script> </script>

Loading…
Cancel
Save