|
|
|
|
@ -1,137 +1,32 @@
|
|
|
|
|
<template>
|
|
|
|
|
<div class="app-container">
|
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
<el-button
|
|
|
|
|
type="primary"
|
|
|
|
|
plain
|
|
|
|
|
icon="el-icon-plus"
|
|
|
|
|
size="mini"
|
|
|
|
|
@click="handleSelectMaterial"
|
|
|
|
|
>新增</el-button>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
<el-button
|
|
|
|
|
type="success"
|
|
|
|
|
plain
|
|
|
|
|
icon="el-icon-edit"
|
|
|
|
|
size="mini"
|
|
|
|
|
:disabled="single"
|
|
|
|
|
@click="handleUpdate"
|
|
|
|
|
>修改</el-button>
|
|
|
|
|
</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>
|
|
|
|
|
<el-table v-loading="loading" :data="itemList" @selection-change="handleSelectionChange" ref="myTable" >
|
|
|
|
|
<el-table-column width="50" align="center" type="selection">
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<!-- 序号 -->
|
|
|
|
|
<el-table-column label="工单编码" width="150" align="left" prop="workorderCode" :show-overflow-tooltip="true" />
|
|
|
|
|
<el-table-column label="物料编码" width="180" align="left" prop="materialCode" :show-overflow-tooltip="true" />
|
|
|
|
|
<el-table-column label="物料名称" width="260" align="left" prop="materialName" :show-overflow-tooltip="true" />
|
|
|
|
|
<el-table-column label="损耗数量" align="center" prop="quantity">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-input type="number" size="small" v-model="scope.row.quantity" @change="handleEdit(scope.$index,scope.row)"></el-input>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="单位" align="center" prop="unit"/>
|
|
|
|
|
<el-table-column label="反冲物料标识X" align="center" prop="recoil"/>
|
|
|
|
|
<el-table-column label="母工单编码" align="center" prop="parentOrder"/>
|
|
|
|
|
</el-table>
|
|
|
|
|
<div slot="footer" class="button-container">
|
|
|
|
|
<el-button type="primary" @click="submitBomForm">确 定</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
|
import { addConsumes } from "@/api/mes/reportWorkConsume";
|
|
|
|
|
import { listReportWorkConsume, getReportWorkConsume, delReportWorkConsume, addReportWorkConsume, updateReportWorkConsume } from "@/api/mes/reportWorkConsume";
|
|
|
|
|
import ItemSelectMaterail from "./selectMaterial.vue";
|
|
|
|
|
import { getPrepareList } from "@/api/mes/reportWork";
|
|
|
|
|
export default {
|
|
|
|
|
name: "ReportWorkConsume",
|
|
|
|
|
dicts: ["unit"],
|
|
|
|
|
components: {ItemSelectMaterail},
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
// 遮罩层
|
|
|
|
|
@ -146,8 +41,8 @@ export default {
|
|
|
|
|
showSearch: true,
|
|
|
|
|
// 总条数
|
|
|
|
|
total: 0,
|
|
|
|
|
// 生产报工物料消耗表格数据
|
|
|
|
|
reportWorkConsumeList: [],
|
|
|
|
|
//表格数据
|
|
|
|
|
itemList: [],
|
|
|
|
|
// 弹出层标题
|
|
|
|
|
title: "",
|
|
|
|
|
// 是否显示弹出层
|
|
|
|
|
@ -156,7 +51,7 @@ export default {
|
|
|
|
|
queryParams: {
|
|
|
|
|
pageNum: 1,
|
|
|
|
|
pageSize: 10,
|
|
|
|
|
workorderCode: null,
|
|
|
|
|
workorderCode: this.workorderCode,
|
|
|
|
|
materialCode: null,
|
|
|
|
|
materialName: null,
|
|
|
|
|
materialSpc: null,
|
|
|
|
|
@ -166,80 +61,47 @@ export default {
|
|
|
|
|
attr2: null,
|
|
|
|
|
attr3: null,
|
|
|
|
|
attr4: null,
|
|
|
|
|
factoryCode: null,
|
|
|
|
|
reportCode :this.reportCode,
|
|
|
|
|
productCode: this.productCode
|
|
|
|
|
factoryCode: null
|
|
|
|
|
},
|
|
|
|
|
// 表单参数
|
|
|
|
|
form: {},
|
|
|
|
|
// 表单校验
|
|
|
|
|
rules: {
|
|
|
|
|
workorderCode: [
|
|
|
|
|
{ required: true, message: "工单编码不能为空", trigger: "blur" }
|
|
|
|
|
],
|
|
|
|
|
materialCode: [
|
|
|
|
|
{ required: true, message: "物料编号不能为空", trigger: "blur" }
|
|
|
|
|
],
|
|
|
|
|
materialName: [
|
|
|
|
|
{ required: true, message: "物料名称不能为空", trigger: "blur" }
|
|
|
|
|
],
|
|
|
|
|
unit: [
|
|
|
|
|
{ required: true, message: "单位不能为空", trigger: "blur" }
|
|
|
|
|
],
|
|
|
|
|
}
|
|
|
|
|
rules: {},
|
|
|
|
|
selectionRows:[]
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
props: {
|
|
|
|
|
workorderCode:null,
|
|
|
|
|
productCode:null,
|
|
|
|
|
reportCode: null,
|
|
|
|
|
optType: undefined,
|
|
|
|
|
workorderCode:null
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
|
this.getList();
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
/** 查询生产报工物料消耗列表 */
|
|
|
|
|
/** 查询表格列表*/
|
|
|
|
|
getList() {
|
|
|
|
|
this.loading = true;
|
|
|
|
|
listReportWorkConsume(this.queryParams).then(response => {
|
|
|
|
|
console.log('报工编号',this.queryParams.reportCode);
|
|
|
|
|
this.reportWorkConsumeList = response.rows;
|
|
|
|
|
this.total = response.total;
|
|
|
|
|
getPrepareList(this.queryParams).then(response => {
|
|
|
|
|
this.itemList = response;
|
|
|
|
|
this.loading = false;
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
},
|
|
|
|
|
getListByOrderCode(workorderCode){
|
|
|
|
|
this.loading = true;
|
|
|
|
|
this.queryParams.workorderCode = workorderCode;
|
|
|
|
|
getPrepareList(this.queryParams).then(response => {
|
|
|
|
|
this.itemList = response;
|
|
|
|
|
this.loading = false;
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
);
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
// 取消按钮
|
|
|
|
|
cancel() {
|
|
|
|
|
this.open = false;
|
|
|
|
|
this.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() {
|
|
|
|
|
@ -253,84 +115,27 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
// 多选框选中数据
|
|
|
|
|
handleSelectionChange(selection) {
|
|
|
|
|
this.ids = selection.map(item => item.recordId)
|
|
|
|
|
this.single = selection.length!==1
|
|
|
|
|
this.multiple = !selection.length
|
|
|
|
|
this.selectionRows = selection
|
|
|
|
|
},
|
|
|
|
|
/** 新增按钮操作 */
|
|
|
|
|
handleAdd() {
|
|
|
|
|
this.reset();
|
|
|
|
|
this.open = true;
|
|
|
|
|
this.title = "添加生产报工物料消耗";
|
|
|
|
|
handleEdit(index, row) {
|
|
|
|
|
console.log('row:',index, row);
|
|
|
|
|
},
|
|
|
|
|
/** 修改按钮操作 */
|
|
|
|
|
handleUpdate(row) {
|
|
|
|
|
submitBomForm() {
|
|
|
|
|
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();
|
|
|
|
|
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>
|
|
|
|
|
<style>
|
|
|
|
|
.button-container {
|
|
|
|
|
text-align: center;
|
|
|
|
|
}
|
|
|
|
|
</style>
|
zhaoxiaolin
10 months ago