fix:玻纤首页数据调整
This commit is contained in:
parent
15aa2ca1d2
commit
a5770cd4f5
|
|
@ -21,17 +21,17 @@
|
||||||
<div class="retangleWrap">
|
<div class="retangleWrap">
|
||||||
<div class="retangleContainer">
|
<div class="retangleContainer">
|
||||||
<div class="retangleTitle">
|
<div class="retangleTitle">
|
||||||
<div class="title">待接收的物料</div>
|
<div class="title">设备列表</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="retangleTable">
|
<div class="retangleTable">
|
||||||
<el-table
|
<el-table
|
||||||
:data="tableData"
|
:data="tableDataEq"
|
||||||
style="width: 100%; height: 285px"
|
style="width: 100%; height: 285px"
|
||||||
>
|
>
|
||||||
<el-table-column prop="name" label="物料名称"/>
|
<el-table-column prop="name" label="设备名称"/>
|
||||||
<el-table-column prop="model" label="型号"/>
|
<el-table-column prop="number" label="设备编号"/>
|
||||||
<el-table-column prop="specification" label="规格"/>
|
<el-table-column prop="model" label="设备型号"/>
|
||||||
<el-table-column prop="count" label="数量"/>
|
<el-table-column prop="belong_dept_name" label="所属部门"/>
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -41,17 +41,16 @@
|
||||||
<div class="retangleWrap" style="padding: 25px 0 0 0;">
|
<div class="retangleWrap" style="padding: 25px 0 0 0;">
|
||||||
<div class="retangleContainer">
|
<div class="retangleContainer">
|
||||||
<div class="retangleTitle">
|
<div class="retangleTitle">
|
||||||
<div class="title">待填日志的物料</div>
|
<div class="title">车间物料</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="retangleTable">
|
<div class="retangleTable">
|
||||||
<el-table
|
<el-table
|
||||||
:data="tableData"
|
:data="tableDataIn"
|
||||||
style="width: 100%; height: 285px"
|
style="width: 100%; height: 285px"
|
||||||
>
|
>
|
||||||
<el-table-column prop="name" label="物料名称"/>
|
<el-table-column prop="material_name" label="物料名称" min-width="120"/>
|
||||||
<el-table-column prop="model" label="型号"/>
|
<el-table-column prop="mgroup_name" label="所属工段" min-width="60"/>
|
||||||
<el-table-column prop="specification" label="规格"/>
|
<el-table-column prop="count" label="数量" min-width="60"/>
|
||||||
<el-table-column prop="count" label="数量"/>
|
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -61,11 +60,11 @@
|
||||||
<div class="retangleWrap">
|
<div class="retangleWrap">
|
||||||
<div class="retangleContainer">
|
<div class="retangleContainer">
|
||||||
<div class="retangleTitle">
|
<div class="retangleTitle">
|
||||||
<div class="title">待交送的物料</div>
|
<div class="title">半成品库存统计</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="retangleTable">
|
<div class="retangleTable">
|
||||||
<el-table
|
<el-table
|
||||||
:data="tableData"
|
:data="tableDataOut"
|
||||||
style="width: 100%; height: 285px"
|
style="width: 100%; height: 285px"
|
||||||
>
|
>
|
||||||
<el-table-column prop="name" label="物料名称"/>
|
<el-table-column prop="name" label="物料名称"/>
|
||||||
|
|
@ -83,7 +82,7 @@
|
||||||
<div class="retangleWrap" style="padding: 25px 0 0 20px;">
|
<div class="retangleWrap" style="padding: 25px 0 0 20px;">
|
||||||
<div class="retangleContainer">
|
<div class="retangleContainer">
|
||||||
<div class="retangleTitle">
|
<div class="retangleTitle">
|
||||||
<div class="title">生产任务列表</div>
|
<div class="title">成品库存统计</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="retangleTable">
|
<div class="retangleTable">
|
||||||
<el-table
|
<el-table
|
||||||
|
|
@ -121,6 +120,9 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
tableData: [],
|
tableData: [],
|
||||||
|
tableDataIn: [],
|
||||||
|
tableDataEq: [],
|
||||||
|
tableDataOut: [],
|
||||||
materialType: 20,
|
materialType: 20,
|
||||||
option: {
|
option: {
|
||||||
tooltip: {
|
tooltip: {
|
||||||
|
|
@ -174,14 +176,16 @@ export default {
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.$emit("on-mounted");
|
this.$emit("on-mounted");
|
||||||
//1、生产设备
|
//生产设备
|
||||||
this.getEquipmentList();
|
this.getEquipmentList();
|
||||||
//2、半成品库车间库存
|
//车间物料
|
||||||
|
this.getMaterialInList();
|
||||||
|
//成品库车间库存
|
||||||
|
this.getMaterialOutList();
|
||||||
|
//半成品库车间库存
|
||||||
this.getMaterialList();
|
this.getMaterialList();
|
||||||
this.getMaterialRecive();//待接收
|
//任务列表
|
||||||
this.getMaterialMlog();//待加工
|
// this.getMtaskLists();
|
||||||
this.getMaterialSend();//已加工
|
|
||||||
this.getMtaskLists();//任务列表
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 动态绑定Class
|
// 动态绑定Class
|
||||||
|
|
@ -199,30 +203,33 @@ export default {
|
||||||
return classInfo;
|
return classInfo;
|
||||||
},
|
},
|
||||||
//生产设备
|
//生产设备
|
||||||
getEquipmentList(){},
|
getEquipmentList(){
|
||||||
//半成品库车间库存
|
|
||||||
getMaterialList() {
|
|
||||||
let that = this;
|
let that = this;
|
||||||
let nameList = [], countList = [];
|
that.$API.em.equipment.list.req({ page: 0, type: 10 }).then((res) => {
|
||||||
that.$API.mtm.material.list.req({ page: 0, type: that.materialType,count__gt:0 }).then((res) => {
|
that.tableDataEq = res;
|
||||||
that.tableData = res;
|
});
|
||||||
res.forEach(item => {
|
},
|
||||||
let index = nameList.indexOf(item.name);
|
//车间物料
|
||||||
if(index<0){
|
getMaterialInList(){
|
||||||
nameList.push(item.name);
|
let that = this;
|
||||||
countList.push(item.count);
|
that.$API.wpm.wmaterial.list.req({ page: 0, material__type: '20',count__gte:1 }).then((res) => {
|
||||||
}
|
that.tableDataIn = res;
|
||||||
});
|
});
|
||||||
that.option.xAxis.data = nameList;
|
},
|
||||||
that.option.series.data = countList;
|
//半成品库存统计
|
||||||
|
getMaterialOutList(){
|
||||||
|
let that = this;
|
||||||
|
that.$API.mtm.material.list.req({ page: 0, material__type: 20,count__gt:0 }).then((res) => {
|
||||||
|
that.tableDataOut = res;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
//成品库车间库存
|
||||||
|
getMaterialList() {
|
||||||
|
let that = this;
|
||||||
|
that.$API.mtm.material.list.req({ page: 0, material__type: 10,count__gt:0 }).then((res) => {
|
||||||
|
that.tableData = res;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//待接收
|
|
||||||
getMaterialRecive(){},
|
|
||||||
//待加工
|
|
||||||
getMaterialMlog(){},
|
|
||||||
//已加工
|
|
||||||
getMaterialSend(){},
|
|
||||||
//任务列表
|
//任务列表
|
||||||
getMtaskLists(){},
|
getMtaskLists(){},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue