Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报工

Browse Source
master
zhaoxiaolin 12 months ago
parent 67e18ea1f2
commit 096fe84a27
5 changed files with 707 additions and 529 deletions
Show Stats Download Patch File Download Diff File

31
src/api/mes/reportWork.js
Unescape Escape View File

@ -135,9 +135,9 @@ export function getMesListEquip(query) {
}); });
} }
//报工按钮 //报工按钮
export function reportSap(reportCode) { export function reportSap(workorderCode) {
const data = { const data = {
reportCode workorderCode
} }
return request({ return request({
url: '/mes/reportWork/reportSap', url: '/mes/reportWork/reportSap',
@ -174,3 +174,30 @@ export function getBatchList(workorderCode) {
data: data data: data
}); });
} }
// 查询报工详细列表
export function getReportList(query) {
return request({
url: '/mes/reportWork/getReportList',
method: 'get',
params: query
});
}
// 提交报工详细列表
export function submitReportPS(data) {
return request({
url: '/mes/reportWork/submitReportPS',
method: 'post',
data: data
});
}
// 查询物料管理列表
export function getPrepareList(query) {
return request({
url: '/mes/reportWork/getPrepareList',
method: 'get',
params: query
});
}

26
src/api/mes/reportWorkConsume.js
Unescape Escape View File

@ -51,3 +51,29 @@ export function delReportWorkConsume(recordId) {
method: 'delete' method: 'delete'
}); });
} }
// 查询报工物料损耗详细列表
export function getConsumeList(query) {
return request({
url: '/mes/reportWorkConsume/getConsumeList',
method: 'get',
params: query
});
}
// 提交报工物料损耗详细列表
export function submitConsumePS(data) {
return request({
url: '/mes/reportWorkConsume/submitConsumePS',
method: 'post',
data: data
});
}
/**提交报工信息**/
export function submitReportInfo(data) {
return request({
url: '/mes/reportWorkConsume/submitReportInfo',
method: 'post',
data: data
});
}

855
src/views/mes/reportWork/index.vue
View File

File diff suppressed because it is too large Load Diff

311
src/views/mes/reportWork/reportWorkConsume.vue
Unescape Escape View File

@ -1,137 +1,32 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row :gutter="10" class="mb8"> <el-table v-loading="loading" :data="itemList" @selection-change="handleSelectionChange" ref="myTable" >
<el-col :span="1.5"> <el-table-column width="50" align="center" type="selection">
<el-button </el-table-column>
type="primary" <!-- 序号 -->
plain <el-table-column label="工单编码" width="150" align="left" prop="workorderCode" :show-overflow-tooltip="true" />
icon="el-icon-plus" <el-table-column label="物料编码" width="180" align="left" prop="materialCode" :show-overflow-tooltip="true" />
size="mini" <el-table-column label="物料名称" width="260" align="left" prop="materialName" :show-overflow-tooltip="true" />
@click="handleSelectMaterial" <el-table-column label="损耗数量" align="center" prop="quantity">
>新增</el-button> <template slot-scope="scope">
</el-col> <el-input type="number" size="small" v-model="scope.row.quantity" @change="handleEdit(scope.$index,scope.row)"></el-input>
<el-col :span="1.5"> </template>
<el-button </el-table-column>
type="success" <el-table-column label="单位" align="center" prop="unit"/>
plain <el-table-column label="反冲物料标识X" align="center" prop="recoil"/>
icon="el-icon-edit" <el-table-column label="母工单编码" align="center" prop="parentOrder"/>
size="mini" </el-table>
:disabled="single" <div slot="footer" class="button-container">
@click="handleUpdate" <el-button type="primary" @click="submitBomForm">确 定</el-button>
>修改</el-button> </div>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="reportWorkConsumeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="工单编码" align="center" prop="workorderCode" width="200"/>
<el-table-column label="物料编号" align="center" prop="materialCode" width="200"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="200"/>
<el-table-column label="物料规格型号" align="center" prop="materialSpc" width="200" v-if="false"/>
<el-table-column label="数量" align="center" prop="quantity" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="操作" v-if="optType !='view'" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</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="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="工单号" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请输入物料编号" disabled/>
</el-form-item>
<el-form-item label="报工单号" prop="reportCode">
<el-input v-model="form.reportCode" placeholder="请输入物料编号" disabled/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请选择物料名称" disabled>
</el-input>
</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="materialSpc">
<el-input v-model="form.materialSpc" placeholder="请输入物料规格型号" disabled/>
</el-form-item>-->
<el-form-item label="单位" prop="unit">
<el-select v-model="form.unit" placeholder="请选择单位" width="100%">
<el-option
v-for="dict in dict.type.unit"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-input type="number" v-model="form.quantity" placeholder="请输入数量" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!--物料选择弹窗-->
<ItemSelectMaterail
ref="itemSelectMaterial"
@onSelected="onSelectMaterial"
></ItemSelectMaterail>
</div> </div>
</template> </template>
<script> <script>
import { addConsumes } from "@/api/mes/reportWorkConsume"; import { getPrepareList } from "@/api/mes/reportWork";
import { listReportWorkConsume, getReportWorkConsume, delReportWorkConsume, addReportWorkConsume, updateReportWorkConsume } from "@/api/mes/reportWorkConsume";
import ItemSelectMaterail from "./selectMaterial.vue";
export default { export default {
name: "ReportWorkConsume", name: "ReportWorkConsume",
dicts: ["unit"], dicts: ["unit"],
components: {ItemSelectMaterail},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -146,8 +41,8 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 生产报工物料消耗表格数据 //表格数据
reportWorkConsumeList: [], itemList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@ -156,7 +51,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
workorderCode: null, workorderCode: this.workorderCode,
materialCode: null, materialCode: null,
materialName: null, materialName: null,
materialSpc: null, materialSpc: null,
@ -166,80 +61,47 @@ export default {
attr2: null, attr2: null,
attr3: null, attr3: null,
attr4: null, attr4: null,
factoryCode: null, factoryCode: null
reportCode :this.reportCode,
productCode: this.productCode
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {},
workorderCode: [ selectionRows:[]
{ required: true, message: "工单编码不能为空", trigger: "blur" }
],
materialCode: [
{ required: true, message: "物料编号不能为空", trigger: "blur" }
],
materialName: [
{ required: true, message: "物料名称不能为空", trigger: "blur" }
],
unit: [
{ required: true, message: "单位不能为空", trigger: "blur" }
],
}
}; };
}, },
props: { props: {
workorderCode:null, workorderCode:null
productCode:null,
reportCode: null,
optType: undefined,
}, },
created() { created() {
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询生产报工物料消耗列表 */ /** 查询表格列表*/
getList() { getList() {
this.loading = true; this.loading = true;
listReportWorkConsume(this.queryParams).then(response => { getPrepareList(this.queryParams).then(response => {
console.log('报工编号',this.queryParams.reportCode); this.itemList = response;
this.reportWorkConsumeList = response.rows; this.loading = false;
this.total = response.total; }
);
},
getListByOrderCode(workorderCode){
this.loading = true;
this.queryParams.workorderCode = workorderCode;
getPrepareList(this.queryParams).then(response => {
this.itemList = response;
this.loading = false; this.loading = false;
}); }
);
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false;
this.reset(); this.reset();
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.form = {
recordId: null,
workorderCode: null,
materialCode: null,
materialName: null,
materialSpc: null,
quantity: null,
unit: null,
remark: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
factoryCode: null,
reportCode: this.reportCode,
productCode: this.productCode,
workorderCode: this.workorderCode
};
this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
@ -253,84 +115,27 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.recordId) this.selectionRows = selection
this.single = selection.length!==1
this.multiple = !selection.length
}, },
/** 新增按钮操作 */ handleEdit(index, row) {
handleAdd() { console.log('row:',index, row);
this.reset();
this.open = true;
this.title = "添加生产报工物料消耗";
}, },
/** 修改按钮操作 */ submitBomForm() {
handleUpdate(row) { if ( this.selectionRows==0) {
this.$modal.msgError(`请选择数据`);
return false;
}else{
this.$modal.msgSuccess("报工损耗确认成功");
};
this.$emit('onSelected', this.$refs.myTable.selection);
this.showFlag = false;
this.reset(); this.reset();
const recordId = row.recordId || this.ids
getReportWorkConsume(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) {
updateReportWorkConsume(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addReportWorkConsume(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const recordIds = row.recordId || this.ids;
this.$modal.confirm('是否确认删除生产报工物料消耗编号为"' + recordIds + '"的数据项？').then(function() {
return delReportWorkConsume(recordIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/reportWorkConsume/export', {
...this.queryParams
}, `reportWorkConsume_${new Date().getTime()}.xlsx`)
},
/**物料选择弹出框**/
handleSelectMaterial() {
this.$refs.itemSelectMaterial.showFlag = true;
this.$refs.itemSelectMaterial.init(this.productCode,this.workorderCode);
},
//物料选择确认
onSelectMaterial(objs) {
let _this = this;
objs.forEach(function(item,index,arr){
item.reportCode=_this.reportCode,
item.productCode= _this.productCode,
item.workorderCode= _this.workorderCode,
item.materialCode = item.component,
item.materialName = item.componentName
})
addConsumes(objs).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}, },
} }
}; };
</script> </script>
<style>
.button-container {
text-align: center;
}
</style>

9
src/views/mes/reportWork/selectWorkOrder.vue
Unescape Escape View File

@ -26,16 +26,21 @@
<el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" > <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
<el-table-column width="50" align="center" type="selection"/> <el-table-column width="50" align="center" type="selection"/>
<el-table-column label="生产日期" align="left" prop="productDate" width="100"/> <el-table-column label="生产日期" align="left" prop="productDate" width="100"/>
<el-table-column label="工单编号" align="left" prop="workorderCode" width="150"/> <el-table-column label="工单编号" align="left" prop="workorderCode" width="180"/>
<el-table-column label="订单编号" align="left" prop="orderCode" width="120"/> <el-table-column label="订单编号" align="left" prop="orderCode" width="120"/>
<el-table-column label="产品编码" align="left" prop="productCode" width="180" /> <el-table-column label="产品编码" align="left" prop="productCode" width="180" />
<el-table-column label="产品名称" align="left" prop="productName" width="180"/> <el-table-column label="产品名称" align="left" prop="productName" width="180"/>
<el-table-column label="规格型号" align="left" prop="productSpc" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="left" prop="productSpc" :show-overflow-tooltip="true" />
<el-table-column label="计划生产数量" align="left" prop="quantitySplit" width="100" /> <el-table-column label="排产数量" align="left" prop="quantitySplit" width="100" />
<el-table-column label="单位" align="left" prop="unit" :show-overflow-tooltip="true" /> <el-table-column label="单位" align="left" prop="unit" :show-overflow-tooltip="true" />
<el-table-column label="班次ID" align="left" prop="shiftId" :show-overflow-tooltip="true" v-if="false"/> <el-table-column label="班次ID" align="left" prop="shiftId" :show-overflow-tooltip="true" v-if="false"/>
<el-table-column label="班次名称" align="left" prop="shiftName" :show-overflow-tooltip="true" /> <el-table-column label="班次名称" align="left" prop="shiftName" :show-overflow-tooltip="true" />
<el-table-column label="生产线体" align="left" prop="prodLineCode" :show-overflow-tooltip="true" width="100"/> <el-table-column label="生产线体" align="left" prop="prodLineCode" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="工单编号(子)" align="left" prop="workorderCodes" width="150"/>
<el-table-column label="产品编码(子)" align="left" prop="productCodes" width="180" />
<el-table-column label="产品名称(子)" align="left" prop="productNames" width="180"/>
<el-table-column label="排产数量(子)" align="left" prop="quantitySplits" width="100" />
<el-table-column label="单位(子)" align="left" prop="units" :show-overflow-tooltip="true" />
</el-table> </el-table>
<pagination <pagination

Write Preview
Loading…
Cancel
Save