yinq
/
XMXS-OS-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - add生产BOM

Browse Source
main
yinq 6 months ago
parent 54c15a0556
commit e43388d875
4 changed files with 195 additions and 139 deletions
Show Stats Download Patch File Download Diff File

9
src/api/mes/prod/prodBomInfo.js
Unescape Escape View File

@ -51,3 +51,12 @@ export function findOrderBomList(query) {
params: query
})
}
// 查询生产BOM树列表
export function productionBomTreeList(query) {
return request({
url: '/mes/prod/prodBomInfo/productionBomTreeList',
method: 'get',
params: query
})
}

BIN
src/assets/images/profile.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 16 KiB

279
src/views/mes/prod/prodBomInfo/childIndex.vue
Unescape Escape View File

@ -1,14 +1,14 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="物料编码" prop="materialCode">
<el-input
v-model="queryParams.materialCode"
placeholder="请输入物料编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="物料编码" prop="materialCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.materialCode"-->
<!-- placeholder="请输入物料编码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
@ -32,7 +32,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['base:orderBomInfo:add']"
>新增</el-button>
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -41,7 +42,8 @@
icon="el-icon-sort"
size="mini"
@click="toggleExpandAll"
>展开/折叠</el-button>
>展开/折叠
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -50,7 +52,8 @@
icon="el-icon-close"
size="mini"
@click="handleClose"
>关闭</el-button>
>关闭
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
@ -68,12 +71,16 @@
<el-table-column label="物料名称" align="center" prop="materialName"/>
<el-table-column label="物料类别" align="center" prop="materialType">
<template slot-scope="scope">
<dict-tag :options="dict.type.material_type" :value="scope.row.materialType"/>
<dict-tag :options="dict.type.material_subclass" :value="scope.row.materialType"/>
</template>
</el-table-column>
<el-table-column label="标准数量" align="center" prop="standardAmount"/>
<el-table-column label="父级编号" align="center" prop="parentId" />
<el-table-column label="工厂编号" align="center" prop="factoryCode" />
<el-table-column label="计量单位" align="center" prop="materialUnit">
<template slot-scope="scope">
<dict-tag :options="dict.type.material_unit" :value="scope.row.materialUnit"/>
</template>
</el-table-column>
<el-table-column label="工厂名称" align="center" prop="factoryName"/>
<!-- <el-table-column label="排序" align="center" prop="sort" />-->
<!-- <el-table-column label="销售凭证" align="center" prop="vbeln" />-->
<!-- <el-table-column label="销售单据项目" align="center" prop="vbpos" />-->
@ -94,7 +101,7 @@
<!-- <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template slot-scope="scope">
<el-button
size="mini"
@ -102,65 +109,72 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['base:orderBomInfo:edit']"
>修改</el-button>
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['base:orderBomInfo:add']"
>新增</el-button>
>新增
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['base:orderBomInfo:remove']"
>删除</el-button>
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 添加或修改订单BOM对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="父级编号" prop="parentId">
<treeselect v-model="form.parentId" :options="orderBomInfoOptions" :normalizer="normalizer" placeholder="请选择父级编号" />
</el-form-item>
<el-form-item label="BOM编号" prop="bomCode">
<el-input v-model="form.bomCode" placeholder="请输入BOM编号" />
</el-form-item>
<el-form-item label="物料编码" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请输入物料编码" />
<treeselect v-model="form.parentId" :options="orderBomInfoOptions" :normalizer="normalizer"
placeholder="请选择父级编号"
/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物料名称" />
<!-- <el-form-item label="BOM编号" prop="bomCode">-->
<!-- <el-input v-model="form.bomCode" placeholder="请输入BOM编号"/>-->
<!-- </el-form-item>-->
<el-form-item label="子物料编号" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请输入成品物料编号" disabled/>
</el-form-item>
<el-form-item label="物料类别" prop="materialType">
<el-select v-model="form.materialType" placeholder="请选择物料类别">
<el-option
v-for="dict in dict.type.material_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
<el-form-item label="子物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物料名称">
<el-button slot="append" icon="el-icon-search" @click="handleMaterialAdd"></el-button>
</el-input>
</el-form-item>
<!-- <el-form-item label="物料类别" prop="materialType">-->
<!-- <el-select v-model="form.materialType" placeholder="请选择物料类别">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.material_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="标准数量" prop="standardAmount">
<el-input v-model="form.standardAmount" placeholder="请输入标准数量" />
</el-form-item>
<el-form-item label="工厂编号" prop="factoryCode">
<el-input v-model="form.factoryCode" placeholder="请输入工厂编号" />
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序" />
</el-form-item>
<el-form-item label="销售凭证" prop="vbeln">
<el-input v-model="form.vbeln" placeholder="请输入销售凭证" />
</el-form-item>
<el-form-item label="销售单据项目" prop="vbpos">
<el-input v-model="form.vbpos" placeholder="请输入销售单据项目" />
<el-input-number v-model="form.standardAmount" placeholder="请输入标准数量"/>
</el-form-item>
<!-- <el-form-item label="工厂编号" prop="factoryCode">-->
<!-- <el-input v-model="form.factoryCode" placeholder="请输入工厂编号"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="排序" prop="sort">-->
<!-- <el-input v-model="form.sort" placeholder="请输入排序"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="销售凭证" prop="vbeln">-->
<!-- <el-input v-model="form.vbeln" placeholder="请输入销售凭证"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="销售单据项目" prop="vbpos">-->
<!-- <el-input v-model="form.vbpos" placeholder="请输入销售单据项目"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="启用标识" prop="isFlag">-->
<!-- <el-radio-group v-model="form.isFlag">-->
<!-- <el-radio-->
@ -176,6 +190,16 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 添加物料信息对话框 -->
<el-dialog title="添加成品BOM明细" :visible.sync="materialOpen" width="900px" append-to-body>
<add-bom @selection="handleSelection" ref="materialRef"></add-bom>
<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>
</template>
@ -185,15 +209,17 @@ import {
delProdBomInfo,
addProdBomInfo,
updateProdBomInfo,
findOrderBomList
productionBomTreeList, findOrderBomList
} from '@/api/mes/prod/prodBomInfo'
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import addBom from '@//views/mes/prod/prodBomInfo/addBom.vue'
export default {
name: "OrderBomInfo",
dicts: ['material_type', 'is_flag'],
name: 'OrderBomInfo',
dicts: ['material_subclass', 'is_flag', 'material_unit'],
components: {
'add-bom': addBom,
Treeselect
},
data() {
@ -207,13 +233,15 @@ export default {
// 订单BOM树选项
orderBomInfoOptions: [],
// 弹出层标题
title: "",
title: '',
// 是否显示弹出层
open: false,
// 是否展开，默认全部展开
isExpandAll: true,
// 重新渲染表格状态
refreshTable: true,
// 是否显示物料弹出层
materialOpen: false,
// 查询参数
queryParams: {
bomCode: null,
@ -236,48 +264,51 @@ export default {
// 表单参数
form: {},
// 表单校验
rules: {
rules: {}
}
};
},
created() {
this.queryParams.ancestors = this.$route.params && this.$route.params.materialCode;
console.log( this.queryParams.ancestors)
this.getList();
this.queryParams.objId = this.$route.params && this.$route.params.materialCode
this.getList()
},
methods: {
/** 查询订单BOM列表 */
getList() {
this.loading = true;
findOrderBomList(this.queryParams).then(response => {
this.orderBomInfoList = this.handleTree(response.data, "materialCode", "parentId");
this.loading = false;
});
this.loading = true
productionBomTreeList(this.queryParams).then(response => {
this.orderBomInfoList = this.handleTree(response.data, 'objId', 'parentId')
this.loading = false
})
},
/** 转换订单BOM数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
delete node.children
}
return {
id: node.materialCode,
id: node.objId,
label: node.materialName,
children: node.children
};
}
},
handleSelection(selection) {
this.ids = selection.map(item => item.objId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 查询订单BOM下拉树结构 */
getTreeselect() {
findOrderBomList().then(response => {
this.orderBomInfoOptions = [];
const data = { materialCode: 0, materialName: '顶级节点', children: [] };
data.children = this.handleTree(response.data, "materialCode", "parentId");
this.orderBomInfoOptions.push(data);
});
this.orderBomInfoOptions = []
const data = { objId: 0, materialName: '顶级节点', children: [] }
data.children = this.handleTree(response.data, 'objId', 'parentId')
this.orderBomInfoOptions.push(data)
})
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
this.open = false
this.reset()
},
// 表单重置
reset() {
@ -299,85 +330,101 @@ export default {
vbeln: null,
vbpos: null,
ancestors: null
};
this.resetForm("form");
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.getList();
this.getList()
},
/** 新增按钮操作 */
handleMaterialAdd() {
this.materialOpen = true
// this.title = "添加订单BOM";
},
/** 提交物料信息按钮 */
submitMaterialForm() {
let selectedRow = this.$refs.materialRef.selectedRow
// this.form.bomCode = selectedRow.bomCode;
this.form.materialCode = selectedRow.materialCode
this.form.materialName = selectedRow.materialName
this.form.factoryCode = selectedRow.factoryCode
this.form.materialType = selectedRow.materialSubclass
this.materialOpen = false
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
this.resetForm('queryForm')
this.handleQuery()
},
/** 新增按钮操作 */
handleAdd(row) {
this.reset();
this.getTreeselect();
if (row != null && row.materialCode) {
this.form.parentId = row.materialCode;
this.reset()
this.getTreeselect()
if (row != null && row.objId) {
this.form.parentId = row.objId
} else {
this.form.parentId = 0;
this.form.parentId = 0
}
this.open = true;
this.title = "添加订单BOM";
this.open = true
this.title = '添加订单BOM'
},
/** 返回按钮操作 */
handleClose() {
const obj = { path: "/base/orderBomInfo" };
this.$tab.closeOpenPage(obj);
const obj = { path: '/prod/prodBomInfo' }
this.$tab.closeOpenPage(obj)
},
/** 展开/折叠操作 */
toggleExpandAll() {
this.refreshTable = false;
this.isExpandAll = !this.isExpandAll;
this.refreshTable = false
this.isExpandAll = !this.isExpandAll
this.$nextTick(() => {
this.refreshTable = true;
});
this.refreshTable = true
})
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.getTreeselect();
this.reset()
this.getTreeselect()
if (row != null) {
this.form.parentId = row.parentId;
this.form.parentId = row.parentId
}
getProdBomInfo(row.objId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改订单BOM";
});
this.form = response.data
this.open = true
this.title = '修改订单BOM'
})
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updateProdBomInfo(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addProdBomInfo(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
});
})
},
/** 删除按钮操作 */
handleDelete(row) {
this.$modal.confirm('是否确认删除订单BOM编号为"' + row.objId + '"的数据项？').then(function() {
return delProdBomInfo(row.objId);
return delProdBomInfo(row.objId)
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
}
}
}
};
</script>

32
src/views/mes/prod/prodBomInfo/index.vue
Unescape Escape View File

@ -94,7 +94,7 @@
<el-table-column label="BOM编号" align="center" prop="bomCode" v-if="columns[1].visible"/>
<el-table-column label="成品物料编号" align="center" prop="materialCode" v-if="columns[2].visible">
<template slot-scope="scope">
<router-link :to="'/production/bom-info/index/' + scope.row.materialCode" class="link-type">
<router-link :to="'/production/bom-info/index/' + scope.row.objId" class="link-type">
<span>{{ scope.row.materialCode }}</span>
</router-link>
</template>
@ -107,13 +107,13 @@
</el-table-column>
<el-table-column label="标准数量" align="center" prop="standardAmount" v-if="columns[5].visible"/>
<!-- <el-table-column label="父物料编号" align="center" prop="parentId" v-if="columns[6].visible"/>-->
<el-table-column label="工厂名称" align="center" prop="plantName" v-if="columns[7].visible"/>
<el-table-column label="工厂名称" align="center" prop="factoryName" v-if="columns[7].visible"/>
<!-- <el-table-column label="产线/工位" align="center" prop="productLineCode" v-if="columns[8].visible"/>-->
<!-- <el-table-column label="工单编号" align="center" prop="orderCode" v-if="columns[14].visible"/>-->
<el-table-column label="是否可生产" align="center" prop="isPlanToStation" v-if="columns[9].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_release" :value="scope.row.isPlanToStation"/>
</template>
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.is_release" :value="scope.row.isPlanToStation"/>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[10].visible"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[11].visible">
@ -127,7 +127,7 @@
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope">
<el-button
size="mini"
@ -200,7 +200,7 @@
<el-radio
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="parseInt(dict.value)"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
@ -225,17 +225,17 @@
<script>
import {
listProdBomInfo,
getProdBomInfo,
c,
delProdBomInfo,
addProdBomInfo,
updateProdBomInfo
updateProdBomInfo, getProdBomInfo
} from '@/api/mes/prod/prodBomInfo'
import {getBaseFactoryList} from "@//api/mes/base/baseFactory";
import addBom from '@//views/mes/prod/prodBomInfo/addBom.vue';
export default {
name: 'ProdBomInfo',
dicts: ['is_flag'],
dicts: ['is_flag','material_subclass'],
components: {
'add-bom': addBom
},
@ -307,11 +307,11 @@ export default {
factoryList: []
};
},
create() {
created() {
// getBaseFactoryList().then(response => {
// this.factoryList = response.data;
// });
this.getList();
getBaseFactoryList().then(response => {
this.factoryList = response.data;
});
},
methods: {
/** 查询生产BOM列表 */
@ -337,11 +337,11 @@ export default {
materialName: null,
materialType: 1,
standardAmount: 1,
parentId: null,
parentId: 0,
plantCode: null,
productLineCode: null,
isPlanToStation: null,
isFlag: 0,
isFlag: '0',
createBy: null,
createTime: null,
updateBy: null,

Write Preview
Loading…
Cancel
Save