This commit is contained in:
shilixia 2021-11-24 10:37:05 +08:00
parent a4c37d5255
commit 58a05bb2f2
4 changed files with 48 additions and 29 deletions

View File

@ -142,7 +142,7 @@
label="物料:" label="物料:"
:prop="'details.' + index + '.material'" :prop="'details.' + index + '.material'"
> >
<el-select v-model="item.material" size="small"> <el-select v-model="item.material" filterable size="small">
<el-option <el-option
v-for="item in materialoptions" v-for="item in materialoptions"
:key="item.value" :key="item.value"

View File

@ -431,6 +431,7 @@ export default {
this.innerVisible = false; this.innerVisible = false;
this.outerVisible = false; this.outerVisible = false;
this.getList(); this.getList();
this.getList1();
} }
}); });
}, },
@ -445,6 +446,7 @@ export default {
if (res.code >= 200) { if (res.code >= 200) {
this.$message.success("入库成功!"); this.$message.success("入库成功!");
this.dialogFormVisible=false; this.dialogFormVisible=false;
this.getList1();
} }
}); });
} }

View File

@ -373,6 +373,11 @@
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="生产计划编号">
<template slot-scope="scope">{{
scope.row.subproduction_plan
}}</template>
</el-table-column>
<el-table-column label="物料名称"> <el-table-column label="物料名称">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.material_.name scope.row.material_.name
@ -386,14 +391,7 @@
<el-table-column label="应产数量"> <el-table-column label="应产数量">
<template slot-scope="scope">{{ scope.row.count }}</template> <template slot-scope="scope">{{ scope.row.count }}</template>
</el-table-column> </el-table-column>
<el-table-column label="实际产出数量">
<template slot-scope="scope">{{
scope.row.count_real
}}</template>
</el-table-column>
<el-table-column label="检验合格数量">
<template slot-scope="scope">{{ scope.row.count_ok }}</template>
</el-table-column>
<el-table-column label="本操作产出数量" width="140px"> <el-table-column label="本操作产出数量" width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
@ -588,9 +586,9 @@ export default {
this.getList(); //边角料 this.getList(); //边角料
this.getpwpList(); //半成品 this.getpwpList(); //半成品
this.getequList(); //设备 this.getequList(); //设备
this.getrecordList(); //自定义表 this.getrecordLists(); //自定义表
this.getinputList(); //物料消耗 this.getinputLists(); //物料消耗
this.getoutputList(); //产出物料 this.getoutputLists(); //产出物料
this.getwmaterialList(); this.getwmaterialList();
this.getprogressList(); //产出物料调出 this.getprogressList(); //产出物料调出
}, },
@ -673,7 +671,7 @@ export default {
}); });
}, },
//操作自定义表 //操作自定义表
getrecordList() { getrecordLists() {
getrecordList({ operation: this.id, page: 0 }).then((response) => { getrecordList({ operation: this.id, page: 0 }).then((response) => {
if (response.data) { if (response.data) {
this.recordData = response.data; this.recordData = response.data;
@ -707,15 +705,16 @@ export default {
this.record.record_data = _this.record_data; this.record.record_data = _this.record_data;
createRecord(this.formID, this.record).then((res) => { createRecord(this.formID, this.record).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.getrecordLists();
this.$message.success("创建成功!"); this.$message.success("创建成功!");
this.getrecordList();
this.dialogVisibleForm = false; this.dialogVisibleForm = false;
} }
}); });
}, },
//操作消耗物料列表 //操作消耗物料列表
getinputList() { getinputLists() {
getinputList({ operation: this.id, page: 0 }).then((response) => { getinputList({ operation: this.id, page: 0 }).then((response) => {
if (response.data) { if (response.data) {
this.inputData = response.data; this.inputData = response.data;
@ -740,13 +739,13 @@ export default {
createInput(this.picks).then((res) => { createInput(this.picks).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.$message.success("创建成功!"); this.$message.success("创建成功!");
this.getinputList(); this.getinputLists();
this.dialogTablepick = false; this.dialogTablepick = false;
} }
}); });
}, },
//操作产出物料列表 //操作产出物料列表
getoutputList() { getoutputLists() {
getoutputList({ operation: this.id, page: 0 }).then((response) => { getoutputList({ operation: this.id, page: 0 }).then((response) => {
if (response.data) { if (response.data) {
this.outputData = response.data; this.outputData = response.data;
@ -772,8 +771,9 @@ export default {
this.output.count = scope.row.output_count; this.output.count = scope.row.output_count;
createOutput(this.output).then((res) => { createOutput(this.output).then((res) => {
if (res.code >= 200) { if (res.code >= 200) {
this.getoutputLists();
this.$message.success("创建成功!"); this.$message.success("创建成功!");
this.getoutputList();
this.dialogTableoutput = false; this.dialogTableoutput = false;
} }
}); });

View File

@ -19,6 +19,16 @@
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="生产计划编号">
<template slot-scope="scope">{{
scope.row.number
}}</template>
</el-table-column>
<el-table-column label="生产主产品">
<template slot-scope="scope" >{{
scope.row.main_product_.name
}}</template>
</el-table-column>
<el-table-column label="名称"> <el-table-column label="名称">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.subproduction_.name scope.row.subproduction_.name
@ -59,15 +69,13 @@
<el-tag v-else>已领料</el-tag> <el-tag v-else>已领料</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="生产主产品">
<template slot-scope="scope" >{{ <el-table-column label="计划/生产/合格">
scope.row.main_product_.name
}}</template>
</el-table-column>
<el-table-column label="生产进度">
<template slot-scope="scope" <template slot-scope="scope"
>{{ scope.row.main_count_real }}/{{ >{{
scope.row.main_count scope.row.main_count
}}/{{ scope.row.main_count_real }}/{{
scope.row.main_count_ok
}}</template }}</template
> >
</el-table-column> </el-table-column>
@ -131,6 +139,9 @@
> >
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="子计划编号">
<template slot-scope="scope">{{scope.row.subproduction_plan}}</template>
</el-table-column>
<el-table-column label="半成品编号"> <el-table-column label="半成品编号">
<template slot-scope="scope">{{ scope.row.number }}</template> <template slot-scope="scope">{{ scope.row.number }}</template>
@ -176,7 +187,11 @@
max-height="400" max-height="400"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="子计划编号">
<template slot-scope="scope">{{
scope.row.subproduction_plan
}}</template>
</el-table-column>
<el-table-column label="物料名称"> <el-table-column label="物料名称">
<template slot-scope="scope">{{ <template slot-scope="scope">{{
scope.row.material_.name scope.row.material_.name
@ -201,6 +216,7 @@
</el-tabs> </el-tabs>
<el-dialog title="领半成品" :visible.sync="dialogTableVisiblepick"> <el-dialog title="领半成品" :visible.sync="dialogTableVisiblepick">
<el-table :data="bcplist" style="width: 100%"> <el-table :data="bcplist" style="width: 100%">
<el-table-column prop="material_.name" label="物料名称"> <el-table-column prop="material_.name" label="物料名称">
</el-table-column> </el-table-column>
<el-table-column prop="material_.number" label="物料编号"> <el-table-column prop="material_.number" label="物料编号">
@ -250,6 +266,7 @@
> >
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="半成品编号"> <el-table-column label="半成品编号">
<template slot-scope="scope">{{ scope.row.number }}</template> <template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column> </el-table-column>
@ -317,9 +334,9 @@
<el-table-column prop="warehouse_.name" label="物料所在仓库"> <el-table-column prop="warehouse_.name" label="物料所在仓库">
</el-table-column> </el-table-column>
<el-table-column prop="count" label="物料总数量"> </el-table-column> <el-table-column prop="count" label="物料总数量"> </el-table-column>
<el-table-column label="输入领料数量" width="140px"> <el-table-column label="输入领料数量" width="140px" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-form :model="scope.row" widht="100px"> <el-form :model="scope.row" v-if="scope.row.material_.type!=2" widht="100px">
<el-form-item size="mini"> <el-form-item size="mini">
<el-input-number <el-input-number
v-model="scope.row.pick_count" v-model="scope.row.pick_count"