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

修改显示

Browse Source
master
夜笙歌 2 months ago
parent c4396d1a02
commit fd422fae5e
1 changed files with 125 additions and 118 deletions
Show Stats Download Patch File Download Diff File

105
src/views/mes/materialBom/index.vue
Unescape Escape View File

@ -18,17 +18,19 @@
@node-click="handleNodeClick" @node-click="handleNodeClick"
> >
<template #default="{ node, data }"> <template #default="{ node, data }">
<div> <div style="width: 100%">
<el-button type="primary" link @click="fun(data)" v-if="node.activeFlag && node.activeFlag!==MATERIAL_BOM_ACTIVE_FLAG.ACTIVE"> <el-tooltip :content="`${data.label}`" style="width: 100%">
发布 <div class="custom-tree-node"
</el-button> style="display: inline-block;vertical-align: top;max-width: 80%;overflow: hidden;">
<el-tooltip :content="`${data.label}`"> <span
<div class="custom-tree-node" style="display: inline-block;vertical-align: center"> :style="{backgroundColor:getColor(data)?.[0],color:getColor(data)?.[1],verticalAlign: 'center'}">{{ node.label
<span :style="{backgroundColor:getColor(data)?.[0],color:getColor(data)?.[1]}">{{ node.label
}}</span> }}</span>
</div> </div>
</el-tooltip> </el-tooltip>
<el-button type="primary" link @click="fun(data)"
style=" vertical-align: top; ">
上传
</el-button>
</div> </div>
</template> </template>
</el-tree> </el-tree>
@ -42,7 +44,8 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button v-has-permi="['mes:materialBom:add']" type="primary" plain icon="Plus" <el-button v-has-permi="['mes:materialBom:add']" type="primary" plain icon="Plus"
@click="addNewMaterialBomVersion()" :loading="btnLoading" :disabled="addNewMaterialBomVersionBtnDisabled">{{addNewMaterialBomVersionBtnText}} @click="addNewMaterialBomVersion()" :loading="btnLoading"
:disabled="addNewMaterialBomVersionBtnDisabled">{{ addNewMaterialBomVersionBtnText }}
</el-button> </el-button>
</el-col> </el-col>
</el-row> </el-row>
@ -59,7 +62,8 @@
<el-form-item label='状态' prop='activeFlag' style="width:260px"> <el-form-item label='状态' prop='activeFlag' style="width:260px">
<el-select v-model='parentForm.activeFlag' disabled> <el-select v-model='parentForm.activeFlag' disabled>
<el-option v-for='dict in material_bom_active_flag' :key='dict.value' :label='dict.label' :value='dict.value' /> <el-option v-for='dict in material_bom_active_flag' :key='dict.value' :label='dict.label'
:value='dict.value' />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -78,8 +82,6 @@
</el-form-item> </el-form-item>
<!-- <el-form-item label="BOM版本" prop='materialBomVersion' :model="parentForm">--> <!-- <el-form-item label="BOM版本" prop='materialBomVersion' :model="parentForm">-->
<!-- <el-select v-model="parentForm.materialBomVersion"--> <!-- <el-select v-model="parentForm.materialBomVersion"-->
<!-- placeholder="请选择" style="width:200px">--> <!-- placeholder="请选择" style="width:200px">-->
@ -277,17 +279,17 @@ import {
addBatchMaterialBom, addBatchMaterialBom,
getUnitInfoList, getMaterialBomVersionList, getParentMaterialBom, deleteMaterialBoms, getUnitInfoList, getMaterialBomVersionList, getParentMaterialBom, deleteMaterialBoms,
selectNextMaterialBomVersion selectNextMaterialBomVersion
} from "@/api/mes/materialBom"; } from '@/api/mes/materialBom';
import { MaterialBomVO, MaterialBomForm, MaterialBomQuery } from '@/api/mes/materialBom/types'; import { MaterialBomVO, MaterialBomForm, MaterialBomQuery } from '@/api/mes/materialBom/types';
import { BaseMaterialTypeVO } from '@/api/mes/baseMaterialType/types'; import { BaseMaterialTypeVO } from '@/api/mes/baseMaterialType/types';
import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue'; import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
import { to } from 'await-to-js'; import { to } from 'await-to-js';
import {nextTick} from "vue"; import { nextTick } from 'vue';
import {MaterialBomVersionVO} from "@/api/mes/materialBomVersion/types"; import { MaterialBomVersionVO } from '@/api/mes/materialBomVersion/types';
import {BaseMeasurementUnitInfoVO} from "@/api/mes/baseMeasurementUnitInfo/types"; import { BaseMeasurementUnitInfoVO } from '@/api/mes/baseMeasurementUnitInfo/types';
import {BaseStructureBomTreeVO} from "@/api/mes/baseStructureBom/types"; import { BaseStructureBomTreeVO } from '@/api/mes/baseStructureBom/types';
const materialTypeId = ref(0);//此值是传给选择物料信息弹框使用 const materialTypeId = ref(0);//此值是传给选择物料信息弹框使用
@ -330,13 +332,13 @@ const SELECT_MATERIAL_MODEL = ref({
PARENT_SELECT: '1',//父级物料选择 PARENT_SELECT: '1',//父级物料选择
CHILD_SELECT: '2',//子级物料选择 CHILD_SELECT: '2',//子级物料选择
DIALOG_CHILD_SELECT: '3'//弹窗子级选择 DIALOG_CHILD_SELECT: '3'//弹窗子级选择
}) });
const MATERIAL_BOM_ACTIVE_FLAG = ref({ const MATERIAL_BOM_ACTIVE_FLAG = ref({
ACTIVE: '1',//启用 ACTIVE: '1',//启用
HISTORY: '2',//历史 HISTORY: '2',//历史
DESIGN: '3'//设计中 DESIGN: '3'//设计中
}) });
const addNewMaterialBomVersionBtnText = ref('新增中'); const addNewMaterialBomVersionBtnText = ref('新增中');
const addNewMaterialBomVersionBtnDisabled = ref(true); const addNewMaterialBomVersionBtnDisabled = ref(true);
@ -390,7 +392,7 @@ const initParentFormData: MaterialBomForm = {
attachId: undefined, attachId: undefined,
activeFlag: undefined, activeFlag: undefined,
remark: undefined, remark: undefined,
materialTypeName: undefined, materialTypeName: undefined
}; };
const initFormData: MaterialBomForm = { const initFormData: MaterialBomForm = {
@ -414,7 +416,7 @@ const initFormData: MaterialBomForm = {
attachId: undefined, attachId: undefined,
activeFlag: undefined, activeFlag: undefined,
remark: undefined, remark: undefined,
materialTypeName: undefined, materialTypeName: undefined
}; };
const data = reactive<PageData<MaterialBomForm, MaterialBomQuery>>({ const data = reactive<PageData<MaterialBomForm, MaterialBomQuery>>({
@ -432,31 +434,31 @@ const data = reactive<PageData<MaterialBomForm, MaterialBomQuery>>({
}, },
rules: { rules: {
materialTypeId: [ materialTypeId: [
{required: true, message: "物料类型不能为空", trigger: "blur"} { required: true, message: '物料类型不能为空', trigger: 'blur' }
], ],
materialBomVersion: [ materialBomVersion: [
{required: true, message: "BOM版本不能为空", trigger: "blur"} { required: true, message: 'BOM版本不能为空', trigger: 'blur' }
], ],
materialName: [ materialName: [
{required: true, message: "物料名称不能为空", trigger: "blur"} { required: true, message: '物料名称不能为空', trigger: 'blur' }
], ],
standardAmount: [ standardAmount: [
{required: true, message: "子物料数量不能为空", trigger: "blur"} { required: true, message: '子物料数量不能为空', trigger: 'blur' }
] ]
}, },
parentRules: { parentRules: {
parentMaterialName: [ parentMaterialName: [
{required: true, message: "父物料名称不能为空", trigger: "blur"} { required: true, message: '父物料名称不能为空', trigger: 'blur' }
], ],
materialBomVersion: [ materialBomVersion: [
{required: true, message: "BOM版本不能为空", trigger: "blur"} { required: true, message: 'BOM版本不能为空', trigger: 'blur' }
], ],
parentStandardAmount: [ parentStandardAmount: [
{required: true, message: "父物料数量不能为空", trigger: "blur"} { required: true, message: '父物料数量不能为空', trigger: 'blur' }
], ],
parentUnitId: [ parentUnitId: [
{required: true, message: "父物料单位不能为空", trigger: "blur"} { required: true, message: '父物料单位不能为空', trigger: 'blur' }
] ]
} }
@ -471,7 +473,7 @@ const parentQueryParams = ref({
materialName: undefined, materialName: undefined,
materialBomVersion: undefined, materialBomVersion: undefined,
params: {} params: {}
}) });
const { queryParams, form, rules, parentForm, parentRules } = toRefs(data); const { queryParams, form, rules, parentForm, parentRules } = toRefs(data);
@ -502,7 +504,7 @@ const getTreeSelect = async () => {
id: virtualTopNodeId,//materialBomId id: virtualTopNodeId,//materialBomId
parentId: -1, parentId: -1,
materialId: 0, materialId: 0,
label: "生产BOM", label: '生产BOM',
children: res.data children: res.data
}; };
materialBomOptions.value.push(initialTree); materialBomOptions.value.push(initialTree);
@ -512,7 +514,7 @@ const getTreeSelect = async () => {
if (!focusKeyNode.value) {//如果之前没有focus if (!focusKeyNode.value) {//如果之前没有focus
focusKeyNode.value = { treeKey: virtualTopNodeId }; focusKeyNode.value = { treeKey: virtualTopNodeId };
} else { } else {
const clickNode = findObjectByTreeKey(materialBomOptions.value, focusKeyNode.value.treeKey) const clickNode = findObjectByTreeKey(materialBomOptions.value, focusKeyNode.value.treeKey);
if (!clickNode) { if (!clickNode) {
focusKeyNode.value = undefined; focusKeyNode.value = undefined;
@ -534,7 +536,7 @@ const getTreeSelect = async () => {
nextTick(function() { nextTick(function() {
materialBomTreeRef.value?.setCurrentKey(focusKeyNode.value.treeKey, true); materialBomTreeRef.value?.setCurrentKey(focusKeyNode.value.treeKey, true);
}) });
loading.value = false; loading.value = false;
treeLoading.value = false; treeLoading.value = false;
@ -567,12 +569,12 @@ const getList = async () => {
const resetParentQueryParams = () => { const resetParentQueryParams = () => {
parentQueryParams.value.parentId = undefined;//是当前节点的materialId parentQueryParams.value.parentId = undefined;//是当前节点的materialId
parentQueryParams.value.materialBomVersion = undefined; parentQueryParams.value.materialBomVersion = undefined;
} };
const resetQueryParams = () => { const resetQueryParams = () => {
queryParams.value.parentId = undefined;//materialid queryParams.value.parentId = undefined;//materialid
queryParams.value.parentMaterialTypeId = undefined; queryParams.value.parentMaterialTypeId = undefined;
} };
/** 节点单击事件 */ /** 节点单击事件 */
const handleNodeClick = (data: MaterialBomVO) => { const handleNodeClick = (data: MaterialBomVO) => {
@ -606,11 +608,11 @@ const handleNodeClick = (data: MaterialBomVO) => {
const handleBtnStatus = () => { const handleBtnStatus = () => {
if (parentForm.value.materialBomVersion && parentForm.value.materialBomVersion !== '') { if (parentForm.value.materialBomVersion && parentForm.value.materialBomVersion !== '') {
addNewMaterialBomVersionBtnDisabled.value = false; addNewMaterialBomVersionBtnDisabled.value = false;
addNewMaterialBomVersionBtnText.value = "新增版本"; addNewMaterialBomVersionBtnText.value = '新增版本';
publishBtnDisplay.value = parentForm.value.activeFlag !== MATERIAL_BOM_ACTIVE_FLAG.value.ACTIVE; publishBtnDisplay.value = parentForm.value.activeFlag !== MATERIAL_BOM_ACTIVE_FLAG.value.ACTIVE;
} else { } else {
addNewMaterialBomVersionBtnDisabled.value = true; addNewMaterialBomVersionBtnDisabled.value = true;
addNewMaterialBomVersionBtnText.value = "新增中"; addNewMaterialBomVersionBtnText.value = '新增中';
publishBtnDisplay.value = false; publishBtnDisplay.value = false;
} }
@ -619,10 +621,10 @@ const handleBtnStatus = () =>{
const clickDisplay = () => { const clickDisplay = () => {
if (queryParams.value.parentId === 0) { if (queryParams.value.parentId === 0) {
parentFormDisplay.value = false; parentFormDisplay.value = false;
childTableTitle.value = "顶级物料"; childTableTitle.value = '顶级物料';
} else { } else {
parentFormDisplay.value = true; parentFormDisplay.value = true;
childTableTitle.value = "子级物料"; childTableTitle.value = '子级物料';
} }
}; };
@ -664,7 +666,7 @@ const handleDelete = async (row?: MaterialBomVO) => {
}); });
// alert(JSON.stringify(toDeleteMaterialBoms.value)) // alert(JSON.stringify(toDeleteMaterialBoms.value))
if (toDeleteMaterialBoms.value.length > 0) { if (toDeleteMaterialBoms.value.length > 0) {
await deleteMaterialBoms(toDeleteMaterialBoms.value) await deleteMaterialBoms(toDeleteMaterialBoms.value);
await getTreeSelect(); await getTreeSelect();
} }
@ -810,7 +812,7 @@ const handleMaterialSelect = (row, selectMode) => {
} else if (selectMode === SELECT_MATERIAL_MODEL.value.CHILD_SELECT) {//子级选择物料需要传值materialTypeId } else if (selectMode === SELECT_MATERIAL_MODEL.value.CHILD_SELECT) {//子级选择物料需要传值materialTypeId
materialTypeId.value = row.materialTypeId; materialTypeId.value = row.materialTypeId;
} else { } else {
materialTypeId.value = undefined materialTypeId.value = undefined;
} }
materialOpen.value = true; materialOpen.value = true;
}; };
@ -881,9 +883,9 @@ const submitBatchSaveMaterialBoms = async () => {
await addBatchMaterialBom(saveMaterialBomList.value); await addBatchMaterialBom(saveMaterialBomList.value);
proxy?.$modal.msgSuccess('操作成功'); proxy?.$modal.msgSuccess('操作成功');
focusKeyNode.value.treeKey = parentForm.value.parentId + "-" + parentForm.value.materialBomVersion; focusKeyNode.value.treeKey = parentForm.value.parentId + '-' + parentForm.value.materialBomVersion;
focusKeyNode.value.materialId = parentForm.value.parentId; focusKeyNode.value.materialId = parentForm.value.parentId;
focusKeyNode.value.materialTypeId = parentForm.value.parentMaterialTypeId focusKeyNode.value.materialTypeId = parentForm.value.parentMaterialTypeId;
focusKeyNode.value.materialBomVersion = parentForm.value.materialBomVersion; focusKeyNode.value.materialBomVersion = parentForm.value.materialBomVersion;
focusKeyNode.value.parentUnitId = parentForm.value.parentUnitId; focusKeyNode.value.parentUnitId = parentForm.value.parentUnitId;
focusKeyNode.value.parentStandardAmount = parentForm.value.parentStandardAmount; focusKeyNode.value.parentStandardAmount = parentForm.value.parentStandardAmount;
@ -899,7 +901,7 @@ const submitBatchSaveMaterialBoms = async () => {
} }
} }
}); });
} };
/** 初始化单位数据 */ /** 初始化单位数据 */
@ -938,9 +940,9 @@ const getParentMaterialBomInfo = async () => {
parentForm.value.activeFlag = MATERIAL_BOM_ACTIVE_FLAG.value.DESIGN; parentForm.value.activeFlag = MATERIAL_BOM_ACTIVE_FLAG.value.DESIGN;
} }
queryParams.value.parentId = parentForm.value.parentId queryParams.value.parentId = parentForm.value.parentId;
queryParams.value.parentMaterialTypeId = parentForm.value.parentMaterialTypeId queryParams.value.parentMaterialTypeId = parentForm.value.parentMaterialTypeId;
queryParams.value.materialBomVersion = parentForm.value.materialBomVersion queryParams.value.materialBomVersion = parentForm.value.materialBomVersion;
handleQuery(); handleQuery();
btnLoading.value = false; btnLoading.value = false;
}; };
@ -955,7 +957,7 @@ const findObjectByTreeKey = (list, targetTreeKey) => {
} }
} }
return null; return null;
} };
/** 基于当前父级物料和版本，新增物料bom版本 */ /** 基于当前父级物料和版本，新增物料bom版本 */
const addNewMaterialBomVersion = async () => { const addNewMaterialBomVersion = async () => {
@ -997,4 +999,9 @@ const getColor = (e) => {
}; };
</script> </script>
<style lang="scss" scoped></style> <style lang="less" scoped>
:deep(.el-tree-node__content) {
width: 100%;
}
</style>

Write Preview
Loading…
Cancel
Save