mes/mes-lxsm-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工艺流程对应的产品

Browse Source
This commit is contained in:
JinLu.Yin 2022-05-14 14:32:36 +08:00
parent 9f0cabd691
commit f5f79fa16d
6 changed files with 455 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/api/mes/pro/routeproduct.js Normal file
View File

@ -0,0 +1,53 @@
import request from '@/utils/request'
// 查询产品制程列表
export function listRouteproduct(query) {
return request({
url: '/mes/pro/routeproduct/list',
method: 'get',
params: query
})
}
// 查询产品制程详细
export function getRouteproduct(recordId) {
return request({
url: '/mes/pro/routeproduct/' + recordId,
method: 'get'
})
}
// 新增产品制程
export function addRouteproduct(data) {
return request({
url: '/mes/pro/routeproduct',
method: 'post',
data: data
})
}
// 修改产品制程
export function updateRouteproduct(data) {
return request({
url: '/mes/pro/routeproduct',
method: 'put',
data: data
})
}
// 修改产品制程
export function moveRouteproduct(data) {
return request({
url: '/mes/pro/routeproduct/move',
method: 'put',
data: data
})
}
// 删除产品制程
export function delRouteproduct(recordId) {
return request({
url: '/mes/pro/routeproduct/' + recordId,
method: 'delete'
})
}

4
src/views/mes/md/mditem/components/itembom.vue
View File

@ -78,7 +78,7 @@
<el-input v-model="form.unitOfMeasure" readonly placeholder="请输入BOM物料单位" />
</el-form-item>
<el-form-item label="物料使用比例" prop="quantity">
<el-input-number :precision="2" :step="0.1" :min="0" v-model="form.quantity" placeholder="请输入物料使用比例" />
<el-input-number :precision="4" :step="0.1" :min="0" v-model="form.quantity" placeholder="请输入物料使用比例" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@ -124,7 +124,7 @@ components: { ItemSelect },
queryParams: {
pageNum: 1,
pageSize: 10,
itemId: null,
itemId: this.itemId,
bomItemId: null,
bomItemCode: null,
bomItemName: null,

2
src/views/mes/md/workstation/components/tool.vue
View File

@ -79,7 +79,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
workstationId: null,
workstationId: this.workstationId,
toolTypeId: null,
toolTypeCode: null,
toolTypeName: null,

17
src/views/mes/pro/proroute/index.vue
View File

@ -96,7 +96,7 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" v-if="optType !='view'" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@ -181,8 +181,14 @@
</el-col>
</el-row>
</el-form>
<el-divider content-position="center" v-if="form.routeId !=null">工艺组成</el-divider>
<Routeprocess v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeprocess>
<el-tabs type="border-card" v-if="form.routeId != null">
<el-tab-pane label="组成工序">
<Routeprocess v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeprocess>
</el-tab-pane>
<el-tab-pane label="关联产品">
<Routeproduct v-if="form.routeId !=null" :optType="optType" :routeId="form.routeId"></Routeproduct>
</el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
<el-button type="primary" @click="submitForm" v-else>确 定</el-button>
@ -195,11 +201,12 @@
<script>
import { listProroute, getProroute, delProroute, addProroute, updateProroute } from "@/api/mes/pro/proroute";
import Routeprocess from "./routeprocess";
import Routeproduct from "./product";
import {genCode} from "@/api/system/autocode/rule"
export default {
name: "Proroute",
dicts: ['sys_yes_no'],
components: {Routeprocess},
components: {Routeprocess,Routeproduct},
data() {
return {
//自动生成编码
@ -313,7 +320,7 @@ export default {
getProroute(routeId).then(response => {
this.form = response.data;
this.open = true;
this.title = "查看工序信息";
this.title = "查看工艺线路信息";
this.optType = "view";
});
},

383
src/views/mes/pro/proroute/product.vue Normal file
View File

@ -0,0 +1,383 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="产品物料编码" prop="itemCode">
<el-input
v-model="queryParams.itemCode"
placeholder="请输入产品物料编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品物料名称" prop="itemName">
<el-input
v-model="queryParams.itemName"
placeholder="请输入产品物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" v-if="optType !='view'" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:pro:routeproduct:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes:pro:routeproduct:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:pro:routeproduct:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['mes:pro:routeproduct:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="routeproductList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" >
</el-table-column>
<el-table-column label="产品物料名称" width="150px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="生产数量" align="center" prop="quantity" />
<el-table-column label="生产用时" align="center" prop="productionTime" />
<el-table-column label="时间单位" align="center" prop="timeUnitType">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_time_type" :value="scope.row.timeUnitType"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" v-if="optType !='view'" width="100px" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:routeproduct:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:routeproduct:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改产品制程对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="8">
<el-form-item label="产品物料编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入产品编号" >
<el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
</el-input>
<ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品物料名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入产品物料名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位" prop="unitOfMeasure">
<el-input v-model="form.unitOfMeasure" placeholder="请输入单位" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="规格型号" prop="specification">
<el-input v-model="form.specification" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="生产数量" prop="quantity">
<el-input-number :min="1" v-model="form.quantity" placeholder="请输入生产数量" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="生产用时" prop="productionTime">
<el-input-number :min="1" :step="1" v-model="form.productionTime" placeholder="请输入生产用时" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="时间单位" prop="timeUnitType">
<el-select v-model="form.timeUnitType" placeholder="请选择时间单位">
<el-option
v-for="dict in dict.type.mes_time_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
<el-button type="primary" @click="submitForm" v-else>确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listRouteproduct, getRouteproduct, delRouteproduct, addRouteproduct, updateRouteproduct, moveRouteproduct } from "@/api/mes/pro/routeproduct";
import ItemSelect from "@/components/itemSelect/single.vue";
export default {
name: "Routeproduct",
dicts: ['mes_time_type'],
components: {ItemSelect},
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 产品制程表格数据
routeproductList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
routeId: this.routeId,
itemId: null,
itemCode: null,
itemName: null,
specification: null,
unitOfMeasure: null,
quantity: null,
productionTime: null,
timeUnitType: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
itemId: [
{ required: true, message: "产品物料不能为空", trigger: "blur" }
]
}
};
},
props :{
routeId: undefined,
optType: undefined
},
created() {
this.getList();
},
methods: {
/** 查询产品制程列表 */
getList() {
this.loading = true;
listRouteproduct(this.queryParams).then(response => {
this.routeproductList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//物料选择弹出框
handleSelectProduct(){
this.$refs.itemSelect.showFlag = true;
},
//物料选择弹出框
onItemSelected(obj){
if(obj != undefined && obj != null){
this.form.itemId = obj.itemId;
this.form.itemCode = obj.itemCode;
this.form.itemName = obj.itemName;
this.form.specification = obj.specification;
this.form.unitOfMeasure = obj.unitOfMeasure;
}
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
recordId: null,
routeId: this.routeId,
itemId: null,
itemCode: null,
itemName: null,
specification: null,
unitOfMeasure: null,
quantity: null,
productionTime: null,
timeUnitType: null,
remark: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.recordId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加产品制程";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const recordId = row.recordId || this.ids
getRouteproduct(recordId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改产品制程";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.recordId != null) {
updateRouteproduct(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addRouteproduct(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
// this.$confirm('此产品已经配置过工艺路线，是否切换为当前工艺路线？', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(
// moveRouteproduct(this.form).then(response =>{
// this.$modal.msgSuccess("切换成功");
// this.open = false;
// this.getList();
// })
// ).catch(
// () => {
// this.$message({
// type: 'info',
// message: '已取消'
// });
// });
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const recordIds = row.recordId || this.ids;
this.$modal.confirm('是否确认删除产品制程编号为"' + recordIds + '"的数据项？').then(function() {
return delRouteproduct(recordIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('pro/routeproduct/export', {
...this.queryParams
}, `routeproduct_${new Date().getTime()}.xlsx`)
}
}
};
</script>

8
src/views/mes/pro/proroute/routeprocess.vue
View File

@ -52,24 +52,24 @@
<el-table-column label="等待时间" align="center" prop="defaultSufTime" />
<el-table-column label="甘特图显示颜色" align="center" prop="colorCode" >
<template slot-scope="scope">
<el-color-picker v-model="scope.row.colorCode" disabled="true"></el-color-picker>
<el-color-picker v-model="scope.row.colorCode" disabled></el-color-picker>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" v-if="optType !='view'" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" fixed="right" width="150px" v-if="optType !='view'" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['pro:routeprocess:edit']"
v-hasPermi="['mes:pro:routeprocess:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['pro:routeprocess:remove']"
v-hasPermi="['mes:pro:routeprocess:remove']"
>删除</el-button>
</template>
</el-table-column>