fix:光子统计分析9个页面添加筛选

This commit is contained in:
shijing 2025-05-27 16:35:28 +08:00
parent be38399cde
commit f6802cb5b0
9 changed files with 1165 additions and 187 deletions

View File

@ -28,15 +28,34 @@
<el-button @click="handleExport('1')" class="tables" type="primary">导出</el-button> <el-button @click="handleExport('1')" class="tables" type="primary">导出</el-button>
<el-table :data="dataList" id="exportDiv1" :height="tableHeight" :summary-method="getSummaries" show-summary> <el-table :data="dataList" id="exportDiv1" :height="tableHeight" :summary-method="getSummaries" show-summary>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="物料名" prop="物料名" sortable> <el-table-column label="物料名" prop="物料名"
:filters="nameFilters"
:filter-method="filterName"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="月份" prop="月" v-if="queryType == ''" sortable> <el-table-column
v-if="queryType == '年'"
label="月份" prop="月"
:filters="dateFilters"
:filter-method="filterMonth"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="周" prop="周" v-else sortable> <el-table-column
v-else
label="周" prop="周"
:filters="dateFilters"
:filter-method="filterWeek"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" sortable> <el-table-column label="规格" prop="规格"
:filters="specsFilters"
:filter-method="filterSpecs"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" sortable> <el-table-column label="型号" prop="型号"
:filters="modelFilters"
:filter-method="filterModel"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="桶数" prop="合格数"> <el-table-column label="桶数" prop="合格数">
</el-table-column> </el-table-column>
@ -105,6 +124,11 @@ export default {
tableData10: [], tableData10: [],
firstWeekNum: 1, firstWeekNum: 1,
endWeekNum: 4, endWeekNum: 4,
nameFilters: [],
dateFilters:[],
specsFilters:[],
modelFilters:[],
monthFilters:[1,2,3,4,5,,6,7,8,9,10,11,12],
monthList: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'] monthList: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
} }
}, },
@ -164,6 +188,11 @@ export default {
}, },
getDataHL() { getDataHL() {
let that = this; let that = this;
let dateList = [],specsList=[],modelList=[];
that.dateFilters = [];
that.nameFilters = [];
that.modelFilters = [];
that.specsFilters = [];
let obj = { let obj = {
query: { start_date: that.start_date, end_date: that.end_date, mgroup_name: "混料", is_count_utask: -1 }, query: { start_date: that.start_date, end_date: that.end_date, mgroup_name: "混料", is_count_utask: -1 },
}; };
@ -181,6 +210,24 @@ export default {
if (nameList.indexOf(ite.物料名) > -1) { } else { if (nameList.indexOf(ite.物料名) > -1) { } else {
nameList.push(ite.物料名); nameList.push(ite.物料名);
seriesData.push([0,0,0,0,0,0,0,0,0,0,0,0]) seriesData.push([0,0,0,0,0,0,0,0,0,0,0,0])
let obj = {};
obj.text = ite.物料名;
obj.value = ite.物料名;
that.nameFilters.push(obj);
}
if(modelList.indexOf(ite.型号)>-1){}else{
modelList.push(ite.型号);
let obj2 = {};
obj2.text = ite.型号;
obj2.value = ite.型号;
that.modelFilters.push(obj2);
}
if(specsList.indexOf(ite.规格)>-1){}else{
specsList.push(ite.规格);
let obj3 = {};
obj3.text = ite.规格;
obj3.value = ite.规格;
that.specsFilters.push(obj3);
} }
}) })
dataList.forEach(item => { dataList.forEach(item => {
@ -188,7 +235,15 @@ export default {
if (that.queryType == '月') { if (that.queryType == '月') {
indexX = nameList.indexOf(item.物料名); indexX = nameList.indexOf(item.物料名);
indexY = item. - that.firstWeekNum; indexY = item. - that.firstWeekNum;
if(dateList.indexOf(item.)>-1){}else{
dateList.push(item.);
let obj = {};
obj.text = item.;
obj.value = item.;
that.dateFilters.push(obj);
}
} else { } else {
that.dateFilters = [1,2,3,4,5,6,7,8,9,10,11,12];
indexX = nameList.indexOf(item.物料名); indexX = nameList.indexOf(item.物料名);
indexY = item. - 1; indexY = item. - 1;
} }
@ -209,54 +264,6 @@ export default {
} }
}); });
}, },
getDataHLXH() {
let that = this;
let option = deepCopy(that.basicOption);
option.xAxis.data = that.xAxisData;
option.title.text = '混料消耗统计';
let obj = {
query: { start_date: that.start_date, end_date: that.end_date, mio_type: "do_in", material_type: 30, material_id: "" },
};
let exec = that.queryType == '月' ? 'saleOutWeek' : 'saleOutMonth';
that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
// console.log('10:',res);
let tableData10 = res.data2.ds0 ? res.data2.ds0 : [];
that.tableData10 = tableData10;
if (tableData10.length > 0) {
option.series = [];
let seriesData = [], nameList = [];
tableData10.forEach(ite => {
if (nameList.indexOf(ite.物料名) > -1) { } else {
nameList.push(ite.物料名);
seriesData.push([])
}
})
tableData10.forEach(item => {
let indexX = 0, indexY = 0;
if (that.queryType == '月') {
indexX = nameList.indexOf(item.物料名);
indexY = item. - that.firstWeekNum;
} else {
indexX = nameList.indexOf(item.物料名);
indexY = item. - 1;
}
seriesData[indexX][indexY] = item.合格数;
});
for (let n = 0; n < seriesData.length; n++) {
let obj = {};
obj.name = nameList[n];
obj.stack = 'Ad';
obj.type = 'bar';
obj.barWidth = '15px';
obj.data = seriesData[n];
option.series.push(obj)
}
that.setChart("bachart2", option);
} else {
that.setChart("bachart2", option);
}
});
},
handleQuery() { handleQuery() {
let that = this; let that = this;
if (that.queryType == '月') { if (that.queryType == '月') {
@ -321,6 +328,21 @@ export default {
}); });
return sums; return sums;
}, },
filterName(value, row) {
return row.物料名 === value;
},
filterMonth(value, row) {
return row. === value;
},
filterWeek(value, row) {
return row. === value;
},
filterSpecs(value, row) {
return row.规格 === value;
},
filterModel(value, row) {
return row.型号 === value;
},
handleExport(val) { handleExport(val) {
this.exportLoading = true; this.exportLoading = true;
let id = '#exportDiv' + val; let id = '#exportDiv' + val;

View File

@ -99,13 +99,28 @@
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="年份" prop="年" width="70"/> <el-table-column label="年份" prop="年" width="70"/>
<el-table-column v-if="queryType == ''" width="60" label="周" prop="周" sortable/> <el-table-column v-if="queryType == ''" width="60" label="周" prop="周"
<el-table-column v-else width="60" label="月份" prop="月" sortable/> :filters="dateFilters"
<el-table-column label="名称" prop="物料名" sortable> :filter-method="filterDate"
filter-placement="bottom-end"/>
<el-table-column v-else width="60" label="月份" prop="月"
:filters="dateFilters"
:filter-method="filterDate"
filter-placement="bottom-end"/>
<el-table-column label="名称" prop="物料名"
:filters="nameFilters"
:filter-method="filterName"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" sortable> <el-table-column label="规格" prop="规格"
:filters="specsFilters"
:filter-method="filterSpecs"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" sortable> <el-table-column label="型号" prop="型号"
:filters="modelFilters"
:filter-method="filterModel"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="数量" prop="数量"> <el-table-column label="数量" prop="数量">
</el-table-column> </el-table-column>
@ -140,13 +155,28 @@
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="年份" prop="年" width="70"/> <el-table-column label="年份" prop="年" width="70"/>
<el-table-column v-if="queryType == ''" width="70" label="周" prop="周" sortable/> <el-table-column v-if="queryType == ''" width="70" label="周" prop="周"
<el-table-column v-else width="70" label="月份" prop="月" sortable/> :filters="dateFilters2"
<el-table-column label="名称" prop="物料名" sortable> :filter-method="filterDate2"
filter-placement="bottom-end"/>
<el-table-column v-else width="70" label="月份" prop="月"
:filters="dateFilters2"
:filter-method="filterDate2"
filter-placement="bottom-end"/>
<el-table-column label="名称" prop="物料名"
:filters="nameFilters2"
:filter-method="filterName2"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" sortable> <el-table-column label="规格" prop="规格"
:filters="specsFilters2"
:filter-method="filterSpecs2"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" sortable> <el-table-column label="型号" prop="型号"
:filters="modelFilters2"
:filter-method="filterModel2"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="数量" prop="数量"> <el-table-column label="数量" prop="数量">
</el-table-column> </el-table-column>
@ -215,6 +245,14 @@ export default {
rightHeight: 0, rightHeight: 0,
tableData1: [], tableData1: [],
tableData2: [], tableData2: [],
nameFilters: [],
dateFilters: [],
modelFilters: [],
specsFilters: [],
nameFilters2: [],
dateFilters2: [],
modelFilters2: [],
specsFilters2: [],
firstWeekNum: 1, firstWeekNum: 1,
endWeekNum: 4, endWeekNum: 4,
monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"], monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
@ -295,6 +333,12 @@ export default {
// //
getSaleData() { getSaleData() {
let that = this; let that = this;
that.tableData1 = [];
that.nameFilters = [];
that.dateFilters = [];
that.modelFilters = [];
that.specsFilters = [];
let nameList=[],dateList = [],specsList=[],modelList=[];
let exec = that.queryType == "月" ? "saleOutWeek" : "saleOutMonth"; let exec = that.queryType == "月" ? "saleOutWeek" : "saleOutMonth";
let obj = { let obj = {
query: { query: {
@ -306,8 +350,44 @@ export default {
}; };
that.$API.bi.dataset.exec.req(exec, obj).then((res) => { that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
if (res.data2.ds0&&res.data2.ds0.length>0) { if (res.data2.ds0&&res.data2.ds0.length>0) {
that.tableData1 = res.data2.ds0; let data = res.data2.ds0;
that.setChartData(res.data2.ds0); that.tableData1 = data;
data.forEach((ite) => {
if (nameList.indexOf(ite.物料名) > -1) {
} else {
nameList.push(ite.物料名);
let obj = {};
obj.text = ite.物料名;
obj.value = ite.物料名;
that.nameFilters.push(obj);
}
if(modelList.indexOf(ite.型号)>-1){}else{
modelList.push(ite.型号);
let obj2 = {};
obj2.text = ite.型号;
obj2.value = ite.型号;
that.modelFilters.push(obj2);
}
if(specsList.indexOf(ite.规格)>-1){}else{
specsList.push(ite.规格);
let obj3 = {};
obj3.text = ite.规格;
obj3.value = ite.规格;
that.specsFilters.push(obj3);
}
if(that.queryType == "月"){
if(dateList.indexOf(ite.)>-1){}else{
dateList.push(ite.);
let obj4 = {};
obj4.text = ite.;
obj4.value = ite.;
that.dateFilters.push(obj4);
}
}else{
that.dateFilters = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
}
})
that.setChartData(data);
}else{ }else{
let option = deepCopy(that.basicOption); let option = deepCopy(that.basicOption);
option.xAxis.data = that.xAxisData; option.xAxis.data = that.xAxisData;
@ -317,6 +397,15 @@ export default {
}, },
getTable() { getTable() {
let that = this; let that = this;
that.nameFilters = [];
that.dateFilters = [];
that.modelFilters = [];
that.specsFilters = [];
that.nameFilters2 = [];
that.dateFilters2 = [];
that.modelFilters2 = [];
that.specsFilters2 = [];
let nameList=[],dateList = [],specsList=[],modelList=[];
let obj = { let obj = {
query: { query: {
start_date: that.start_date, start_date: that.start_date,
@ -331,6 +420,47 @@ export default {
let data = res.data2.ds0; let data = res.data2.ds0;
that.tableData1 = data; that.tableData1 = data;
that.tableData2 = data; that.tableData2 = data;
if(data.length>0){
data.forEach((ite) => {
if (nameList.indexOf(ite.物料名) > -1) {
} else {
nameList.push(ite.物料名);
let obj = {};
obj.text = ite.物料名;
obj.value = ite.物料名;
that.nameFilters.push(obj);
}
if(modelList.indexOf(ite.型号)>-1){}else{
modelList.push(ite.型号);
let obj2 = {};
obj2.text = ite.型号;
obj2.value = ite.型号;
that.modelFilters.push(obj2);
}
if(specsList.indexOf(ite.规格)>-1){}else{
specsList.push(ite.规格);
let obj3 = {};
obj3.text = ite.规格;
obj3.value = ite.规格;
that.specsFilters.push(obj3);
}
if(that.queryType == "月"){
if(dateList.indexOf(ite.)>-1){}else{
dateList.push(ite.);
let obj4 = {};
obj4.text = ite.;
obj4.value = ite.;
that.dateFilters.push(obj4);
}
}else{
that.dateFilters = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
}
that.nameFilters2 = that.nameFilters;
that.modelFilters2 = that.modelFilters;
that.specsFilters2 = that.specsFilters;
that.dateFilters2 = that.dateFilters;
})
}
that.setChartData(data); that.setChartData(data);
} }
}); });
@ -434,6 +564,38 @@ export default {
}); });
option.series = seriesData; option.series = seriesData;
that.setChart("bachart1", option); that.setChart("bachart1", option);
},
filterName(value, row) {
return row.物料名 === value;
},
filterDate(value, row) {
if (this.queryType == "月") {
return row. === value;
}else{
return row. === value;
}
},
filterSpecs(value, row) {
return row.规格 === value;
},
filterModel(value, row) {
return row.型号 === value;
},
filterName2(value, row) {
return row.物料名 === value;
},
filterDate2(value, row) {
if (this.queryType == "月") {
return row. === value;
}else{
return row. === value;
}
},
filterSpecs2(value, row) {
return row.规格 === value;
},
filterModel2(value, row) {
return row.型号 === value;
}, },
handleExport(val) { handleExport(val) {
this.exportLoading = true; this.exportLoading = true;

View File

@ -50,7 +50,6 @@
@change="materialInChange" @change="materialInChange"
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<!-- <el-table-column label="物料编号" prop="number"></el-table-column> -->
<el-table-column label="名称" prop="name"></el-table-column> <el-table-column label="名称" prop="name"></el-table-column>
<el-table-column label="规格" prop="specification"></el-table-column> <el-table-column label="规格" prop="specification"></el-table-column>
<el-table-column label="型号" prop="model"></el-table-column> <el-table-column label="型号" prop="model"></el-table-column>
@ -78,13 +77,28 @@
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="年份" prop="年" width="80"/> <el-table-column label="年份" prop="年" width="80"/>
<el-table-column v-if="queryType == ''" width="60" label="周" prop="周" sortable/> <el-table-column v-if="queryType == ''" width="60" label="周" prop="周"
<el-table-column v-else width="60" label="月份" prop="月" sortable/> :filters="dateFilters"
<el-table-column label="名称" prop="物料名" sortable> :filter-method="filterDate"
filter-placement="bottom-end"/>
<el-table-column v-else width="60" label="月份" prop="月"
:filters="dateFilters"
:filter-method="filterDate"
filter-placement="bottom-end"/>
<el-table-column label="名称" prop="物料名"
:filters="nameFilters"
:filter-method="filterName"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" sortable> <el-table-column label="规格" prop="规格"
:filters="specsFilters"
:filter-method="filterSpecs"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" sortable> <el-table-column label="型号" prop="型号"
:filters="modelFilters"
:filter-method="filterModel"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="数量" prop="数量"> <el-table-column label="数量" prop="数量">
</el-table-column> </el-table-column>
@ -108,7 +122,6 @@
type="primary" type="primary"
>导出</el-button >导出</el-button
> >
<scTable <scTable
:data="tableData2" :data="tableData2"
id="exportDiv2" id="exportDiv2"
@ -120,13 +133,28 @@
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="年份" prop="年" width="80"/> <el-table-column label="年份" prop="年" width="80"/>
<el-table-column v-if="queryType == ''" width="70" label="周" prop="周" sortable/> <el-table-column v-if="queryType == ''" width="70" label="周" prop="周"
<el-table-column v-else width="70" label="月份" prop="月" sortable/> :filters="dateFilters2"
<el-table-column label="名称" prop="物料名" sortable> :filter-method="filterDate2"
filter-placement="bottom-end"/>
<el-table-column v-else width="70" label="月份" prop="月"
:filters="dateFilters2"
:filter-method="filterDate2"
filter-placement="bottom-end"/>
<el-table-column label="名称" prop="物料名"
:filters="nameFilters2"
:filter-method="filterName2"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" sortable> <el-table-column label="规格" prop="规格"
:filters="specsFilters2"
:filter-method="filterSpecs2"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" sortable> <el-table-column label="型号" prop="型号"
:filters="modelFilters2"
:filter-method="filterModel2"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="数量" prop="数量"> <el-table-column label="数量" prop="数量">
</el-table-column> </el-table-column>
@ -203,6 +231,14 @@ export default {
outData: [], outData: [],
inmOption: [], inmOption: [],
outOption: [], outOption: [],
nameFilters: [],
dateFilters: [],
modelFilters: [],
specsFilters: [],
nameFilters2: [],
dateFilters2: [],
modelFilters2: [],
specsFilters2: [],
monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"], monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
materialItem:{}, materialItem:{},
apiObjMaterial:this.$API.mtm.material.list, apiObjMaterial:this.$API.mtm.material.list,
@ -233,7 +269,6 @@ export default {
that.rightHeight = height - 115; that.rightHeight = height - 115;
that.tableHeight = height - 140 - chartheight; that.tableHeight = height - 140 - chartheight;
that.setChart("bachart1", that.basicOption); that.setChart("bachart1", that.basicOption);
// that.getInmOption();
that.getTable(); that.getTable();
}, },
methods: { methods: {
@ -266,12 +301,9 @@ export default {
}, },
materialInChange(data) { materialInChange(data) {
let that = this; let that = this;
console.log(that.materialItem);
console.log(that.materialItem.id);
that.materialIn = that.materialItem.id; that.materialIn = that.materialItem.id;
let option = deepCopy(that.basicOption); let option = deepCopy(that.basicOption);
option.xAxis.data = that.xAxisData; option.xAxis.data = that.xAxisData;
console.log(option);
that.setChart("bachart1",option); that.setChart("bachart1",option);
this.getInmData(); this.getInmData();
}, },
@ -289,6 +321,11 @@ export default {
getInmData() { getInmData() {
let that = this; let that = this;
that.tableData1 = []; that.tableData1 = [];
that.nameFilters = [];
that.dateFilters = [];
that.modelFilters = [];
that.specsFilters = [];
let nameList=[],dateList = [],specsList=[],modelList=[];
let exec = that.queryType == "月" ? "saleOutWeek" : "saleOutMonth"; let exec = that.queryType == "月" ? "saleOutWeek" : "saleOutMonth";
let obj = { let obj = {
query: { query: {
@ -300,8 +337,44 @@ export default {
}; };
that.$API.bi.dataset.exec.req(exec, obj).then((res) => { that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
if (res.data2.ds0&&res.data2.ds0.length>0) { if (res.data2.ds0&&res.data2.ds0.length>0) {
that.tableData1 = res.data2.ds0; let data = res.data2.ds0;
that.setChartData(res.data2.ds0); that.tableData1 = data;
data.forEach((ite) => {
if (nameList.indexOf(ite.物料名) > -1) {
} else {
nameList.push(ite.物料名);
let obj = {};
obj.text = ite.物料名;
obj.value = ite.物料名;
that.nameFilters.push(obj);
}
if(modelList.indexOf(ite.型号)>-1){}else{
modelList.push(ite.型号);
let obj2 = {};
obj2.text = ite.型号;
obj2.value = ite.型号;
that.modelFilters.push(obj2);
}
if(specsList.indexOf(ite.规格)>-1){}else{
specsList.push(ite.规格);
let obj3 = {};
obj3.text = ite.规格;
obj3.value = ite.规格;
that.specsFilters.push(obj3);
}
if(that.queryType == "月"){
if(dateList.indexOf(ite.)>-1){}else{
dateList.push(ite.);
let obj4 = {};
obj4.text = ite.;
obj4.value = ite.;
that.dateFilters.push(obj4);
}
}else{
that.dateFilters = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
}
})
that.setChartData(data);
}else{ }else{
let option = deepCopy(that.basicOption); let option = deepCopy(that.basicOption);
option.xAxis.data = that.xAxisData; option.xAxis.data = that.xAxisData;
@ -318,13 +391,64 @@ export default {
mio_type: "pur_in", mio_type: "pur_in",
}, },
}; };
that.nameFilters = [];
that.dateFilters = [];
that.modelFilters = [];
that.specsFilters = [];
that.nameFilters2 = [];
that.dateFilters2 = [];
that.modelFilters2 = [];
that.specsFilters2 = [];
let nameList=[],dateList = [],specsList=[],modelList=[];
let exec = that.queryType == "月" ? "saleOutWeek" : "saleOutMonth"; let exec = that.queryType == "月" ? "saleOutWeek" : "saleOutMonth";
that.$API.bi.dataset.exec.req(exec, obj).then((res) => { that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
that.tableData2 = []; that.tableData2 = [];
that.tableData1 = [];
if (res.data2.ds0) { if (res.data2.ds0) {
let data = res.data2.ds0; let data = res.data2.ds0;
that.tableData1 = data; that.tableData1 = data;
that.tableData2 = data; that.tableData2 = data;
if(data.length>0){
data.forEach((ite) => {
if (nameList.indexOf(ite.物料名) > -1) {
} else {
nameList.push(ite.物料名);
let obj = {};
obj.text = ite.物料名;
obj.value = ite.物料名;
that.nameFilters.push(obj);
}
if(modelList.indexOf(ite.型号)>-1){}else{
modelList.push(ite.型号);
let obj2 = {};
obj2.text = ite.型号;
obj2.value = ite.型号;
that.modelFilters.push(obj2);
}
if(specsList.indexOf(ite.规格)>-1){}else{
specsList.push(ite.规格);
let obj3 = {};
obj3.text = ite.规格;
obj3.value = ite.规格;
that.specsFilters.push(obj3);
}
if(that.queryType == "月"){
if(dateList.indexOf(ite.)>-1){}else{
dateList.push(ite.);
let obj4 = {};
obj4.text = ite.;
obj4.value = ite.;
that.dateFilters.push(obj4);
}
}else{
that.dateFilters = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
}
that.nameFilters2 = that.nameFilters;
that.modelFilters2 = that.modelFilters;
that.specsFilters2 = that.specsFilters;
that.dateFilters2 = that.dateFilters;
})
}
that.setChartData(data); that.setChartData(data);
} }
}); });
@ -428,6 +552,38 @@ export default {
} }
}); });
return sums; return sums;
},
filterName(value, row) {
return row.物料名 === value;
},
filterDate(value, row) {
if (this.queryType == "月") {
return row. === value;
}else{
return row. === value;
}
},
filterSpecs(value, row) {
return row.规格 === value;
},
filterModel(value, row) {
return row.型号 === value;
},
filterName2(value, row) {
return row.物料名 === value;
},
filterDate2(value, row) {
if (this.queryType == "月") {
return row. === value;
}else{
return row. === value;
}
},
filterSpecs2(value, row) {
return row.规格 === value;
},
filterModel2(value, row) {
return row.型号 === value;
}, },
handleExport(val) { handleExport(val) {
this.exportLoading = true; this.exportLoading = true;

View File

@ -60,15 +60,30 @@
show-summary show-summary
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="物料名" prop="物料名" min-width="100" sortable> <el-table-column label="物料名" prop="物料名" min-width="100"
:filters="nameFilters7"
:filter-method="filterName7"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="月份" prop="月" v-if="queryType == ''" width="60" sortable> <el-table-column label="月份" prop="月" v-if="queryType == ''" width="60"
:filters="dateFilters7"
:filter-method="filterDate7"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="周" prop="周" v-else width="60" sortable> <el-table-column label="周" prop="周" v-else width="60"
:filters="dateFilters7"
:filter-method="filterDate7"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" sortable> <el-table-column label="型号" prop="型号"
:filters="modelFilters7"
:filter-method="filterModel7"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" sortable> <el-table-column label="规格" prop="规格"
:filters="specsFilters7"
:filter-method="filterSpecs7"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="任务数" prop="任务数"> <el-table-column label="任务数" prop="任务数">
</el-table-column> </el-table-column>
@ -111,15 +126,30 @@
show-summary show-summary
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="物料名" prop="物料名" min-width="100" sortable> <el-table-column label="物料名" prop="物料名" min-width="100"
:filters="nameFilters"
:filter-method="filterName"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="月份" prop="月" v-if="queryType == ''" width="60" sortable> <el-table-column label="月份" prop="月" v-if="queryType == ''" width="60"
:filters="dateFilters"
:filter-method="filterDate"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="周" prop="周" v-else width="60" sortable> <el-table-column label="周" prop="周" v-else width="60"
:filters="dateFilters"
:filter-method="filterDate"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" sortable> <el-table-column label="型号" prop="型号"
:filters="modelFilters"
:filter-method="filterModel"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" sortable> <el-table-column label="规格" prop="规格"
:filters="specsFilters"
:filter-method="filterSpecs"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="任务数" prop="任务数"> <el-table-column label="任务数" prop="任务数">
</el-table-column> </el-table-column>
@ -162,17 +192,35 @@
show-summary show-summary
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="物料名" prop="物料名" min-width="100" sortable> <el-table-column label="物料名" prop="物料名" min-width="100"
:filters="nameFilters6"
:filter-method="filterName6"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="物料系列" prop="物料系列" min-width="100" sortable> <el-table-column label="物料系列" prop="物料系列" min-width="100"
:filters="xilieFilters6"
:filter-method="filterXilie6"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="月份" prop="月" sortable v-if="queryType == '年'"> <el-table-column label="月份" prop="月" v-if="queryType == ''"
:filters="dateFilters6"
:filter-method="filterDate6"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="周" prop="周" v-else sortable> <el-table-column label="周" prop="周" v-else
:filters="dateFilters6"
:filter-method="filterDate6"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" sortable> <el-table-column label="型号" prop="型号"
:filters="modelFilters6"
:filter-method="filterModel6"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" sortable> <el-table-column label="规格" prop="规格"
:filters="specsFilters6"
:filter-method="filterSpecs6"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="任务数" prop="任务数"> <el-table-column label="任务数" prop="任务数">
</el-table-column> </el-table-column>
@ -250,7 +298,19 @@ export default {
tableData6: [], tableData6: [],
tableData7: [], tableData7: [],
tableData10: [], tableData10: [],
tableDataAVG: [], nameFilters: [],
dateFilters: [],
modelFilters: [],
specsFilters: [],
nameFilters6: [],
xilieFilters6: [],
dateFilters6: [],
modelFilters6: [],
specsFilters6: [],
nameFilters7: [],
dateFilters7: [],
modelFilters7: [],
specsFilters7: [],
firstWeekNum: 1, firstWeekNum: 1,
endWeekNum: 4, endWeekNum: 4,
monthList: [ monthList: [
@ -324,6 +384,12 @@ export default {
}, },
getData6() { getData6() {
let that = this; let that = this;
let dateList = [],specsList=[],modelList=[],xilieList=[];
that.nameFilters6 = [];
that.dateFilters6 = [];
that.xilieFilters6 = [];
that.modelFilters6 = [];
that.specsFilters6 = [];
let option = deepCopy(that.basicOption); let option = deepCopy(that.basicOption);
option.xAxis.data = that.xAxisData; option.xAxis.data = that.xAxisData;
option.title.text = "6车间"; option.title.text = "6车间";
@ -340,13 +406,37 @@ export default {
that.tableData6 = tableData6; that.tableData6 = tableData6;
if (tableData6.length > 0) { if (tableData6.length > 0) {
option.series = []; option.series = [];
let seriesData = [], let seriesData = [],nameList = [];
nameList = [];
tableData6.forEach((ite) => { tableData6.forEach((ite) => {
if (nameList.indexOf(ite.物料名) > -1) { if (nameList.indexOf(ite.物料名) > -1) {
} else { }else {
nameList.push(ite.物料名); nameList.push(ite.物料名);
seriesData.push([]); seriesData.push([]);
let obj = {};
obj.text = ite.物料名;
obj.value = ite.物料名;
that.nameFilters6.push(obj);
}
if(xilieList.indexOf(ite.物料系列)>-1){}else{
xilieList.push(ite.物料系列);
let obj2 = {};
obj2.text = ite.物料系列;
obj2.value = ite.物料系列;
that.xilieFilters6.push(obj2);
}
if(specsList.indexOf(ite.规格)>-1){}else{
specsList.push(ite.规格);
let obj3 = {};
obj3.text = ite.规格;
obj3.value = ite.规格;
that.specsFilters6.push(obj3);
}
if(modelList.indexOf(ite.型号)>-1){}else{
modelList.push(ite.型号);
let obj4 = {};
obj4.text = ite.型号;
obj4.value = ite.型号;
that.modelFilters6.push(obj4);
} }
}); });
if (that.queryType == "月") { if (that.queryType == "月") {
@ -359,8 +449,16 @@ export default {
seriesData[indexX][indexY] =0; seriesData[indexX][indexY] =0;
seriesData[indexX][indexY] += item.合格数; seriesData[indexX][indexY] += item.合格数;
} }
if(dateList.indexOf(item.)>-1){}else{
dateList.push(item.);
let obj = {};
obj.text = item.;
obj.value = item.;
that.dateFilters6.push(obj);
}
}); });
} else { } else {
that.dateFilters6 = [1,2,3,4,5,6,7,8,9,10,11,12];
tableData6.forEach((item) => { tableData6.forEach((item) => {
let indexX = nameList.indexOf(item.物料名); let indexX = nameList.indexOf(item.物料名);
let indexY = item.month - 1; let indexY = item.month - 1;
@ -389,6 +487,11 @@ export default {
}, },
getData7() { getData7() {
let that = this; let that = this;
let dateList = [],specsList=[],modelList=[];
that.nameFilters7 = [];
that.dateFilters7 = [];
that.modelFilters7 = [];
that.specsFilters7 = [];
let obj = { let obj = {
query: { query: {
start_date: that.start_date, start_date: that.start_date,
@ -404,9 +507,7 @@ export default {
console.log("7生产车间统计:", res); console.log("7生产车间统计:", res);
let tableData7 = res.data2.ds0 ? res.data2.ds0 : []; let tableData7 = res.data2.ds0 ? res.data2.ds0 : [];
that.tableData7 = tableData7; that.tableData7 = tableData7;
debugger;
if (tableData7.length > 0) { if (tableData7.length > 0) {
debugger;
option.series = []; option.series = [];
let seriesData = [], let seriesData = [],
nameList = []; nameList = [];
@ -415,6 +516,24 @@ export default {
} else { } else {
nameList.push(ite.物料名); nameList.push(ite.物料名);
seriesData.push([]); seriesData.push([]);
let obj = {};
obj.text = ite.物料名;
obj.value = ite.物料名;
that.nameFilters7.push(obj);
}
if(modelList.indexOf(ite.型号)>-1){}else{
modelList.push(ite.型号);
let obj2 = {};
obj2.text = ite.型号;
obj2.value = ite.型号;
that.modelFilters7.push(obj2);
}
if(specsList.indexOf(ite.规格)>-1){}else{
specsList.push(ite.规格);
let obj3 = {};
obj3.text = ite.规格;
obj3.value = ite.规格;
that.specsFilters7.push(obj3);
} }
}); });
tableData7.forEach((item) => { tableData7.forEach((item) => {
@ -423,7 +542,15 @@ export default {
if (that.queryType == "月") { if (that.queryType == "月") {
indexX = nameList.indexOf(item.物料名); indexX = nameList.indexOf(item.物料名);
indexY = item. - that.firstWeekNum; indexY = item. - that.firstWeekNum;
if(dateList.indexOf(item.)>-1){}else{
dateList.push(item.);
let obj = {};
obj.text = item.;
obj.value = item.;
that.dateFilters7.push(obj);
}
} else { } else {
that.dateFilters7 = [1,2,3,4,5,6,7,8,9,10,11,12];
indexX = nameList.indexOf(item.物料名); indexX = nameList.indexOf(item.物料名);
indexY = item. - 1; indexY = item. - 1;
} }
@ -451,6 +578,11 @@ export default {
}, },
getData10() { getData10() {
let that = this; let that = this;
let dateList = [],specsList=[],modelList=[];
that.nameFilters = [];
that.dateFilters = [];
that.modelFilters = [];
that.specsFilters = [];
let option = deepCopy(that.basicOption); let option = deepCopy(that.basicOption);
option.xAxis.data = that.xAxisData; option.xAxis.data = that.xAxisData;
option.title.text = "预制管10车间"; option.title.text = "预制管10车间";
@ -463,7 +595,6 @@ export default {
}; };
let exec = that.queryType == "月" ? "lineWeek" : "lineMonth"; let exec = that.queryType == "月" ? "lineWeek" : "lineMonth";
that.$API.bi.dataset.exec.req(exec, obj).then((res) => { that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
// console.log('10:',res);
let tableData10 = res.data2.ds0 ? res.data2.ds0 : []; let tableData10 = res.data2.ds0 ? res.data2.ds0 : [];
that.tableData10 = tableData10; that.tableData10 = tableData10;
if (tableData10.length > 0) { if (tableData10.length > 0) {
@ -475,6 +606,24 @@ export default {
} else { } else {
nameList.push(ite.物料名); nameList.push(ite.物料名);
seriesData.push([]); seriesData.push([]);
let obj = {};
obj.text = ite.物料名;
obj.value = ite.物料名;
that.nameFilters.push(obj);
}
if(modelList.indexOf(ite.型号)>-1){}else{
modelList.push(ite.型号);
let obj2 = {};
obj2.text = ite.型号;
obj2.value = ite.型号;
that.modelFilters.push(obj2);
}
if(specsList.indexOf(ite.规格)>-1){}else{
specsList.push(ite.规格);
let obj3 = {};
obj3.text = ite.规格;
obj3.value = ite.规格;
that.specsFilters.push(obj3);
} }
}); });
tableData10.forEach((item) => { tableData10.forEach((item) => {
@ -483,7 +632,15 @@ export default {
if (that.queryType == "月") { if (that.queryType == "月") {
indexX = nameList.indexOf(item.物料名); indexX = nameList.indexOf(item.物料名);
indexY = item. - that.firstWeekNum; indexY = item. - that.firstWeekNum;
if(dateList.indexOf(item.)>-1){}else{
dateList.push(item.);
let obj = {};
obj.text = item.;
obj.value = item.;
that.dateFilters.push(obj);
}
} else { } else {
that.dateFilters = [1,2,3,4,5,6,7,8,9,10,11,12];
indexX = nameList.indexOf(item.物料名); indexX = nameList.indexOf(item.物料名);
indexY = item. - 1; indexY = item. - 1;
} }
@ -603,6 +760,60 @@ export default {
that.getData7(); that.getData7();
that.getData10(); that.getData10();
// that.getDataDAVG(); // that.getDataDAVG();
},
//6
filterName6(value, row) {
return row.物料名 === value;
},
filterXilie6(value, row) {
return row.物料系列 === value;
},
filterDate6(value, row) {
if (this.queryType == "月") {
return row. === value;
}else{
return row. === value;
}
},
filterSpecs6(value, row) {
return row.规格 === value;
},
filterModel6(value, row) {
return row.型号 === value;
},
//7
filterName7(value, row) {
return row.物料名 === value;
},
filterDate7(value, row) {
if (this.queryType == "月") {
return row. === value;
}else{
return row. === value;
}
},
filterSpecs7(value, row) {
return row.规格 === value;
},
filterModel7(value, row) {
return row.型号 === value;
},
//10
filterName(value, row) {
return row.物料名 === value;
},
filterDate(value, row) {
if (this.queryType == "月") {
return row. === value;
}else{
return row. === value;
}
},
filterSpecs(value, row) {
return row.规格 === value;
},
filterModel(value, row) {
return row.型号 === value;
}, },
handleExport(val) { handleExport(val) {
this.exportLoading = true; this.exportLoading = true;

View File

@ -59,9 +59,15 @@
show-summary show-summary
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="工段" prop="工段" sortable> <el-table-column label="工段" prop="工段"
:filters="mgroupFilters"
:filter-method="filterMgroup"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名" min-width="100" sortable> <el-table-column label="物料名" prop="物料名" min-width="100"
:filters="nameFilters"
:filter-method="filterName"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="任务数" prop="任务数"> <el-table-column label="任务数" prop="任务数">
</el-table-column> </el-table-column>
@ -127,6 +133,8 @@ export default {
}, },
series: [], series: [],
}, },
nameFilters: [],
mgroupFilters: [],
processData: [], processData: [],
xAxisData: [], xAxisData: [],
tableData: [], tableData: [],
@ -156,6 +164,8 @@ export default {
}, },
getData6() { getData6() {
let that = this; let that = this;
that.nameFilters = [];
that.mgroupFilters = [];
let obj = { let obj = {
query: { query: {
start_date: this.start_date, start_date: this.start_date,
@ -186,9 +196,17 @@ export default {
if (xAxisData.indexOf(item.工段) > -1) { if (xAxisData.indexOf(item.工段) > -1) {
} else { } else {
xAxisData.push(item.工段); xAxisData.push(item.工段);
let obj = {};
obj.text = item.工段;
obj.value = item.工段;
that.mgroupFilters.push(obj);
} }
if (nameData.indexOf(item.物料名) > -1) { if (nameData.indexOf(item.物料名) > -1) {
} else { } else {
let obj0 = {};
obj0.text = item.物料名;
obj0.value = item.物料名;
that.nameFilters.push(obj0);
nameData.push(item.物料名); nameData.push(item.物料名);
let obj = { let obj = {
name:'', name:'',
@ -205,8 +223,6 @@ export default {
obj.name=item.物料名, obj.name=item.物料名,
seriesData.push(obj); seriesData.push(obj);
} }
console.log("xAxisData:", xAxisData);
console.log("nameData:", nameData);
let index = xAxisData.indexOf(item.工段); let index = xAxisData.indexOf(item.工段);
let indexY = nameData.indexOf(item.物料名); let indexY = nameData.indexOf(item.物料名);
seriesData[indexY].data[index] += item.合格数; seriesData[indexY].data[index] += item.合格数;
@ -274,6 +290,12 @@ export default {
} }
}); });
return sums; return sums;
},
filterName(value, row) {
return row.物料名 === value;
},
filterMgroup(value, row) {
return row.工段 === value;
}, },
handleExport() { handleExport() {
this.exportLoading = true; this.exportLoading = true;

View File

@ -58,11 +58,20 @@
</el-table-column> </el-table-column>
<el-table-column label="月" prop="月" v-else width="60"> <el-table-column label="月" prop="月" v-else width="60">
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名" width="100" sortable> <el-table-column label="物料名" prop="物料名" width="100"
:filters="nameFilters7"
:filter-method="filterName7"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" sortable> <el-table-column label="型号" prop="型号"
:filters="modelFilters7"
:filter-method="filterModel7"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" sortable> <el-table-column label="规格" prop="规格"
:filters="specsFilters7"
:filter-method="filterSpecs7"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="出料数" prop="生产数"> <el-table-column label="出料数" prop="生产数">
</el-table-column> </el-table-column>
@ -114,11 +123,20 @@
</el-table-column> </el-table-column>
<el-table-column label="月" prop="月" v-else width="60"> <el-table-column label="月" prop="月" v-else width="60">
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名" width="100" sortable> <el-table-column label="物料名" prop="物料名" width="100"
:filters="nameFilters10"
:filter-method="filterName10"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" sortable> <el-table-column label="型号" prop="型号"
:filters="modelFilters10"
:filter-method="filterModel10"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" sortable> <el-table-column label="规格" prop="规格"
:filters="specsFilters10"
:filter-method="filterSpecs10"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="出料数" prop="生产数"> <el-table-column label="出料数" prop="生产数">
</el-table-column> </el-table-column>
@ -174,11 +192,20 @@
</el-table-column> </el-table-column>
<el-table-column label="月" prop="月" v-else width="60"> <el-table-column label="月" prop="月" v-else width="60">
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名" width="100" sortable> <el-table-column label="物料名" prop="物料名" width="100"
:filters="nameFilters"
:filter-method="filterName"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" sortable> <el-table-column label="型号" prop="型号"
:filters="modelFilters"
:filter-method="filterModel"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" sortable> <el-table-column label="规格" prop="规格"
:filters="specsFilters"
:filter-method="filterSpecs"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="出料数" prop="生产数"> <el-table-column label="出料数" prop="生产数">
</el-table-column> </el-table-column>
@ -338,6 +365,15 @@ export default {
tableData7: [], tableData7: [],
tableData10: [], tableData10: [],
tableData8: [], tableData8: [],
nameFilters: [],
specsFilters:[],
modelFilters:[],
nameFilters7: [],
specsFilters7:[],
modelFilters7:[],
nameFilters10: [],
specsFilters10:[],
modelFilters10:[],
}; };
}, },
mounted() { mounted() {
@ -351,7 +387,7 @@ export default {
this.queryDate = year + "-" + month; this.queryDate = year + "-" + month;
this.start_date = year + "-" + month + "-01"; this.start_date = year + "-" + month + "-01";
this.end_date = this.end_date =
year + "-" + month + "-" + new Date(year, month, 0).getDate(); year + "-" + month + "-" + days;
this.getData(); this.getData();
this.getData7(); this.getData7();
this.getData10(); this.getData10();
@ -364,6 +400,10 @@ export default {
getData() { getData() {
let that = this; let that = this;
that.tableData8 = []; that.tableData8 = [];
that.nameFilters = [];
that.modelFilters = [];
that.specsFilters = [];
let nameList=[],specsList=[],modelList=[];
let exec = that.queryType == "月" ? "lineMonth" : "lineYear"; let exec = that.queryType == "月" ? "lineMonth" : "lineYear";
let obj = { let obj = {
query: { query: {
@ -374,10 +414,32 @@ export default {
}, },
}; };
that.$API.bi.dataset.exec.req(exec, obj).then((res) => { that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
console.log("退火车间统计:", res);
if (res.data2.ds0) { if (res.data2.ds0) {
let data = res.data2.ds0; let data = res.data2.ds0;
that.tableData8 = data; that.tableData8 = data;
data.forEach((item) => {
if(nameList.indexOf(item.物料名)>-1){}else{
nameList.push(item.物料名);
let obj = {};
obj.text = item.物料名;
obj.value = item.物料名;
that.nameFilters.push(obj);
}
if(modelList.indexOf(item.型号)>-1){}else{
modelList.push(item.型号);
let obj2 = {};
obj2.text = item.型号;
obj2.value = item.型号;
that.modelFilters.push(obj2);
}
if(specsList.indexOf(item.规格)>-1){}else{
specsList.push(item.规格);
let obj3 = {};
obj3.text = item.规格;
obj3.value = item.规格;
that.specsFilters.push(obj3);
}
})
} else { } else {
that.tableData8 = []; that.tableData8 = [];
} }
@ -426,6 +488,10 @@ export default {
getData7() { getData7() {
let that = this; let that = this;
that.tableData7 = []; that.tableData7 = [];
that.nameFilters7 = [];
that.modelFilters7 = [];
that.specsFilters7 = [];
let nameList=[],specsList=[],modelList=[];
let obj = { let obj = {
query: { query: {
start_date: this.start_date, start_date: this.start_date,
@ -435,10 +501,32 @@ export default {
}; };
let exec = that.queryType == "月" ? "lineMonth" : "lineYear"; let exec = that.queryType == "月" ? "lineMonth" : "lineYear";
that.$API.bi.dataset.exec.req(exec, obj).then((res) => { that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
console.log("7生产车间统计:", res);
if (res.data2.ds0) { if (res.data2.ds0) {
let data = res.data2.ds0; let data = res.data2.ds0;
that.tableData7 = data; that.tableData7 = data;
data.forEach((item) => {
if(nameList.indexOf(item.物料名)>-1){}else{
nameList.push(item.物料名);
let obj = {};
obj.text = item.物料名;
obj.value = item.物料名;
that.nameFilters7.push(obj);
}
if(modelList.indexOf(item.型号)>-1){}else{
modelList.push(item.型号);
let obj2 = {};
obj2.text = item.型号;
obj2.value = item.型号;
that.modelFilters7.push(obj2);
}
if(specsList.indexOf(item.规格)>-1){}else{
specsList.push(item.规格);
let obj3 = {};
obj3.text = item.规格;
obj3.value = item.规格;
that.specsFilters7.push(obj3);
}
})
} else { } else {
that.tableData7 = []; that.tableData7 = [];
} }
@ -480,6 +568,10 @@ export default {
getData10() { getData10() {
let that = this; let that = this;
that.tableData10 = []; that.tableData10 = [];
that.nameFilters10 = [];
that.modelFilters10 = [];
that.specsFilters10 = [];
let nameList=[],specsList=[],modelList=[];
let obj = { let obj = {
query: { query: {
start_date: this.start_date, start_date: this.start_date,
@ -489,10 +581,32 @@ export default {
}; };
let exec = that.queryType == "月" ? "lineMonth" : "lineYear"; let exec = that.queryType == "月" ? "lineMonth" : "lineYear";
that.$API.bi.dataset.exec.req(exec, obj).then((res) => { that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
console.log("10生产车间统计:", res);
if (res.data2.ds0) { if (res.data2.ds0) {
let data = res.data2.ds0; let data = res.data2.ds0;
that.tableData10 = data; that.tableData10 = data;
data.forEach((item) => {
if(nameList.indexOf(item.物料名)>-1){}else{
nameList.push(item.物料名);
let obj = {};
obj.text = item.物料名;
obj.value = item.物料名;
that.nameFilters10.push(obj);
}
if(modelList.indexOf(item.型号)>-1){}else{
modelList.push(item.型号);
let obj2 = {};
obj2.text = item.型号;
obj2.value = item.型号;
that.modelFilters10.push(obj2);
}
if(specsList.indexOf(item.规格)>-1){}else{
specsList.push(item.规格);
let obj3 = {};
obj3.text = item.规格;
obj3.value = item.规格;
that.specsFilters10.push(obj3);
}
})
} else { } else {
that.tableData10 = []; that.tableData10 = [];
} }
@ -509,7 +623,6 @@ export default {
}, },
}; };
that.$API.bi.dataset.exec.req(exec, obj2).then((res2) => { that.$API.bi.dataset.exec.req(exec, obj2).then((res2) => {
console.log("10生产车间统计:", res2);
if (res2.data2.ds0) { if (res2.data2.ds0) {
let data = res2.data2.ds0; let data = res2.data2.ds0;
that.option2.series.data[0].value=0; that.option2.series.data[0].value=0;
@ -597,6 +710,33 @@ export default {
} }
}); });
return sums; return sums;
},
filterName(value, row) {
return row.物料名 === value;
},
filterSpecs(value, row) {
return row.规格 === value;
},
filterModel(value, row) {
return row.型号 === value;
},
filterName7(value, row) {
return row.物料名 === value;
},
filterSpecs7(value, row) {
return row.规格 === value;
},
filterModel7(value, row) {
return row.型号 === value;
},
filterName10(value, row) {
return row.物料名 === value;
},
filterSpecs10(value, row) {
return row.规格 === value;
},
filterModel10(value, row) {
return row.型号 === value;
}, },
handleExport(val) { handleExport(val) {
this.exportLoading = true; this.exportLoading = true;

View File

@ -54,15 +54,24 @@
<el-button @click="handleExport('1')" class="tables" type="primary">导出</el-button> <el-button @click="handleExport('1')" class="tables" type="primary">导出</el-button>
<el-table :data="tableData" :height="500" id="exportDiv1" :summary-method="getSummaries" show-summary> <el-table :data="tableData" :height="500" id="exportDiv1" :summary-method="getSummaries" show-summary>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="日期" prop="date" sortable> <el-table-column label="日期" prop="date"
:filters="dateFilters"
:filter-method="filterDate"
filter-placement="bottom-end">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row. }}</span> <span>{{ scope.row. }}</span>
<span v-if="scope.row.月">-{{ scope.row.月 }}</span> <span v-if="scope.row.月">-{{ scope.row.月 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="规格" sortable> <el-table-column label="规格" prop="规格"
:filters="specsFilters"
:filter-method="filterSpecs"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" sortable> <el-table-column label="型号" prop="型号"
:filters="modelFilters"
:filter-method="filterModel"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="合格数" prop="合格数"> <el-table-column label="合格数" prop="合格数">
</el-table-column> </el-table-column>
@ -129,6 +138,9 @@
mgroupName:'', mgroupName:'',
mgroupOption:[], mgroupOption:[],
tableData:[], tableData:[],
dateFilters:[],
specsFilters:[],
modelFilters:[],
} }
}, },
mounted(){ mounted(){
@ -164,6 +176,10 @@
}, },
getData(){ getData(){
let that = this; let that = this;
that.dateFilters = [];
that.modelFilters = [];
that.specsFilters = [];
let dateList=[],specsList=[],modelList=[];
let exec = that.queryType=='月'?'lineMonth':'lineYear'; let exec = that.queryType=='月'?'lineMonth':'lineYear';
let obj = { let obj = {
query: { query: {
@ -213,8 +229,35 @@
}; };
//table //table
that.$API.bi.dataset.exec.req(exec, obj2).then((res2) => { that.$API.bi.dataset.exec.req(exec, obj2).then((res2) => {
console.log('获取table数据:', res2.data2.ds0);
that.tableData = res2.data2.ds0; that.tableData = res2.data2.ds0;
let data = res2.data2.ds0;
data.forEach((item) => {
let date =item.;
if(that.queryType=='月'){
date =item.+'-'+item.;
}
if(dateList.indexOf(date)>-1){}else{
dateList.push(date);
let obj = {};
obj.text = date;
obj.value = date;
that.dateFilters.push(obj);
}
if(modelList.indexOf(item.型号)>-1){}else{
modelList.push(item.型号);
let obj2 = {};
obj2.text = item.型号;
obj2.value = item.型号;
that.modelFilters.push(obj2);
}
if(specsList.indexOf(item.规格)>-1){}else{
specsList.push(item.规格);
let obj3 = {};
obj3.text = item.规格;
obj3.value = item.规格;
that.specsFilters.push(obj3);
}
})
}); });
}, },
handleQuery(){ handleQuery(){
@ -266,6 +309,19 @@
}); });
return sums; return sums;
}, },
filterDate(value, row) {
let date = row.;
if(this.queryType=='月'){
date =row.+'-'+row.;
}
return date === value;
},
filterSpecs(value, row) {
return row.规格 === value;
},
filterModel(value, row) {
return row.型号 === value;
},
handleExport(val) { handleExport(val) {
this.exportLoading = true; this.exportLoading = true;
let id = '#exportDiv' + val; let id = '#exportDiv' + val;

View File

@ -32,7 +32,7 @@
</el-header> </el-header>
<el-main> <el-main>
<scTable <scTable
v-show="params.type == 10 || params.type == 20" v-if="params.type == 10 || params.type == 20"
ref="tables1" ref="tables1"
:data="tableData1" :data="tableData1"
id="exportDiv1" id="exportDiv1"
@ -42,33 +42,47 @@
:summary-method="getSummaries" show-summary :summary-method="getSummaries" show-summary
> >
<el-table-column type="index" width="50"/> <el-table-column type="index" width="50"/>
<el-table-column label="物料名" prop="material_name" sortable/> <el-table-column label="物料名" prop="material_name"
<el-table-column label="型号" prop="material_model" sortable/> :filters="nameFilters1"
<el-table-column label="规格" prop="material_specification" sortable/> :filter-method="filterName1"
<el-table-column prop="dept_name" label="完成车间" sortable/> filter-placement="bottom-end"/>
<el-table-column label="型号" prop="material_model"
:filters="modelFilters1"
:filter-method="filterModel1"
filter-placement="bottom-end"/>
<el-table-column label="规格" prop="material_specification"
:filters="specsFilters1"
:filter-method="filterSpecs1"
filter-placement="bottom-end"/>
<el-table-column prop="dept_name" label="完成车间"
:filters="deptFilters1"
:filter-method="filterDept1"
filter-placement="bottom-end"/>
<el-table-column label="库存总数" prop="count" /> <el-table-column label="库存总数" prop="count" />
</scTable> </scTable>
<scTable <scTable
v-show=" v-else
params.type == 30 || ref="tables11"
params.type == 40 || :data="tableData11"
params.type == 50 || id="exportDiv11"
params.type == 60 ||
params.type == 70
"
ref="tables1"
:apiObj="apiObj"
:params="params"
id="exportDiv1"
stripe stripe
hideDo hideDo
:summary-method="getSummaries2" :summary-method="getSummaries2"
show-summary show-summary
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="物料名" prop="name" sortable/> <el-table-column label="物料名" prop="name"
<el-table-column label="型号" prop="model" sortable/> :filters="nameFilters11"
<el-table-column label="规格" prop="specification" sortable/> :filter-method="filterName11"
filter-placement="bottom-end"/>
<el-table-column label="型号" prop="model"
:filters="modelFilters11"
:filter-method="filterModel11"
filter-placement="bottom-end"/>
<el-table-column label="规格" prop="specification"
:filters="specsFilters11"
:filter-method="filterSpecs11"
filter-placement="bottom-end"/>
<el-table-column label="库存总数" prop="count_mb"/> <el-table-column label="库存总数" prop="count_mb"/>
<el-table-column label="周预估值" v-if="params.type == 30"> <el-table-column label="周预估值" v-if="params.type == 30">
<template #default="scope"> <template #default="scope">
@ -158,13 +172,29 @@
:summary-method="getSummaries" :summary-method="getSummaries"
show-summary show-summary
> >
<el-table-column label="物料名" prop="物料名" sortable></el-table-column> <el-table-column label="物料名" prop="物料名"
<el-table-column label="型号" prop="型号" sortable></el-table-column> :filters="nameFilters2"
<el-table-column label="规格" prop="规格" sortable></el-table-column> :filter-method="filterName2"
filter-placement="bottom-end">
</el-table-column>
<el-table-column label="型号" prop="型号"
:filters="modelFilters2"
:filter-method="filterModel2"
filter-placement="bottom-end"
></el-table-column>
<el-table-column label="规格" prop="规格"
:filters="specsFilters2"
:filter-method="filterSpecs2"
filter-placement="bottom-end"
></el-table-column>
<el-table-column label="出入库类型"> <el-table-column label="出入库类型">
<span>{{ mio_type_name }}</span> <span>{{ mio_type_name }}</span>
</el-table-column> </el-table-column>
<el-table-column label="执行车间" prop="执行车间" sortable></el-table-column> <el-table-column label="执行车间" prop="执行车间"
:filters="deptFilters2"
:filter-method="filterDept2"
filter-placement="bottom-end">
</el-table-column>
<template v-if="queryType == '月' &&(query.mio_type == 'pur_in' ||query.mio_type == 'do_in' ||query.mio_type == 'other_in')"> <template v-if="queryType == '月' &&(query.mio_type == 'pur_in' ||query.mio_type == 'do_in' ||query.mio_type == 'other_in')">
<el-table-column label="月入库总数" prop="数量"></el-table-column> <el-table-column label="月入库总数" prop="数量"></el-table-column>
</template> </template>
@ -210,6 +240,18 @@ export default {
currentLastDay: "", currentLastDay: "",
tableData: [], tableData: [],
tableData1: [], tableData1: [],
tableData11: [],
nameFilters1: [],
deptFilters1: [],
modelFilters1: [],
specsFilters1: [],
nameFilters11: [],
modelFilters11: [],
specsFilters11: [],
nameFilters2: [],
deptFilters2: [],
modelFilters2: [],
specsFilters2: [],
typeOptions: ["月", "年"], typeOptions: ["月", "年"],
materialTypeOptions: [ materialTypeOptions: [
{ id: 10, name: "成品" }, { id: 10, name: "成品" },
@ -231,51 +273,125 @@ export default {
that.currentLastDay = lastDay; that.currentLastDay = lastDay;
that.queryDate = that.currentYear + "-" + that.currentMonth; that.queryDate = that.currentYear + "-" + that.currentMonth;
that.start_date = that.currentYear + "-" + that.currentMonth + "-01"; that.start_date = that.currentYear + "-" + that.currentMonth + "-01";
that.end_date = that.end_date = that.currentYear + "-" + that.currentMonth + "-" + lastDay;
that.currentYear + "-" + that.currentMonth + "-" + lastDay;
that.getTableData(); that.getTableData();
console.log(that.mio_type_name); that.getTableData1();
this.materialTypeChange();
}, },
methods: { methods: {
queryTypeChnge() { queryTypeChnge() {
this.query.queryDate = ""; this.query.queryDate = "";
}, },
materialTypeChange() { getTableData1() {
let that = this; let that = this;
that.tableData1 = []; that.tableData1 = [];
if (that.params.type == 10 || that.params.type == 20) { that.nameFilters1 = [];
that.deptFilters1 = [];
that.modelFilters1 = [];
that.specsFilters1 = [];
let nameList=[],deptList = [],specsList=[],modelList=[];
let obj = { let obj = {
query: { query: {
material_types: that.params.type, material_types: that.params.type,
}, },
}; };
that.$API.bi.dataset.exec that.$API.bi.dataset.exec.req("materialCount", obj).then((res) => {
.req("materialCount", obj)
.then((res) => {
if (res.data2.ds0) { if (res.data2.ds0) {
that.tableData1 = res.data2.ds0; let data = res.data2.ds0;
that.tableData1 = data;
if(data.length>0){
data.forEach((ite) => {
if (nameList.indexOf(ite.material_name) > -1) {} else {
nameList.push(ite.material_name);
let obj = {};
obj.text = ite.material_name;
obj.value = ite.material_name;
that.nameFilters1.push(obj);
}
if(modelList.indexOf(ite.material_model)>-1){}else{
modelList.push(ite.material_model);
let obj2 = {};
obj2.text = ite.material_model;
obj2.value = ite.material_model;
that.modelFilters1.push(obj2);
}
if(specsList.indexOf(ite.material_specification)>-1){}else{
specsList.push(ite.material_specification);
let obj3 = {};
obj3.text = ite.material_specificationv;
obj3.value = ite.material_specification;
that.specsFilters1.push(obj3);
}
if(deptList.indexOf(ite.dept_name)>-1){}else{
deptList.push(ite.dept_name);
let obj4 = {};
obj4.text = ite.dept_name;
obj4.value = ite.dept_name;
that.deptFilters1.push(obj4);
}
})
}
} }
}); });
} else { },
that.$refs.tables1.refresh(); getTableData11(){
let that = this;
that.tableData11 = [];
that.nameFilters11 = [];
that.modelFilters11 = [];
that.specsFilters11 = [];
let nameList=[],specsList=[],modelList=[];
this.$API.mtm.material.list.req(that.params).then((res) => {
that.tableData11 = res.results;
if(res.results.length>0){
res.results.forEach((ite) =>{
if (nameList.indexOf(ite.name) > -1) {} else {
nameList.push(ite.name);
let obj = {};
obj.text = ite.name;
obj.value = ite.name;
that.nameFilters11.push(obj);
}
if(modelList.indexOf(ite.model)>-1){}else{
modelList.push(ite.model);
let obj2 = {};
obj2.text = ite.model;
obj2.value = ite.model;
that.modelFilters11.push(obj2);
}
if(specsList.indexOf(ite.specification)>-1){}else{
specsList.push(ite.specification);
let obj3 = {};
obj3.text = ite.specification;
obj3.value = ite.specification;
that.specsFilters11.push(obj3);
}
});
}
});
},
materialTypeChange(){
let that = this;
if(that.params.type == 10 || that.params.type == 20){
that.getTableData1();
}else{
that.getTableData11();
} }
}, },
// //
weekcountChange(row) { weekcountChange(row) {
let obj = { let obj = {week_esitimate_consume: row.week_esitimate_consume};
week_esitimate_consume: row.week_esitimate_consume, this.$API.mtm.material.setWeekConsume.req(row.id, obj).then((res) => {
};
this.$API.mtm.material.setWeekConsume
.req(row.id, obj)
.then((res) => {
console.log(res);
this.$refs.tables1.refresh(); this.$refs.tables1.refresh();
}); });
}, },
// //
getTableData() { getTableData() {
let that = this; let that = this;
that.nameFilters2 = [];
that.deptFilters2 = [];
that.modelFilters2 = [];
that.specsFilters2 = [];
let nameList=[],deptList = [],specsList=[],modelList=[];
let exec = that.queryType == "月" ? "saleOutMonth" : "saleOutYear"; let exec = that.queryType == "月" ? "saleOutMonth" : "saleOutYear";
let obj = { let obj = {
query: { query: {
@ -288,6 +404,38 @@ export default {
if (res.data2.ds0) { if (res.data2.ds0) {
let data = res.data2.ds0; let data = res.data2.ds0;
that.tableData = data; that.tableData = data;
if(data.length>0){
data.forEach((ite) => {
if (nameList.indexOf(ite.物料名) > -1) {} else {
nameList.push(ite.物料名);
let obj = {};
obj.text = ite.物料名;
obj.value = ite.物料名;
that.nameFilters2.push(obj);
}
if(modelList.indexOf(ite.型号)>-1){}else{
modelList.push(ite.型号);
let obj2 = {};
obj2.text = ite.型号;
obj2.value = ite.型号;
that.modelFilters2.push(obj2);
}
if(specsList.indexOf(ite.规格)>-1){}else{
specsList.push(ite.规格);
let obj3 = {};
obj3.text = ite.规格;
obj3.value = ite.规格;
that.specsFilters2.push(obj3);
}
if(deptList.indexOf(ite.执行车间)>-1){}else{
deptList.push(ite.执行车间);
let obj4 = {};
obj4.text = ite.执行车间;
obj4.value = ite.执行车间;
that.deptFilters2.push(obj4);
}
})
}
} }
}); });
}, },
@ -297,7 +445,6 @@ export default {
this.mio_type_name = this.mioTypeEnum.values[key].text; this.mio_type_name = this.mioTypeEnum.values[key].text;
} }
} }
console.log(this.mio_type_name);
this.getTableData(); this.getTableData();
}, },
handleQuery() { handleQuery() {
@ -383,6 +530,40 @@ export default {
}); });
return sums; return sums;
}, },
filterName1(value, row) {
return row.物料名 == value;
},
filterSpecs1(value, row) {
return row.规格 == value;
},
filterModel1(value, row) {
return row.型号 == value;
},
filterDept1(value, row) {
return row.完成车间 == value;
},
filterName11(value, row) {
return row.物料名 == value;
},
filterSpecs11(value, row) {
return row.规格 == value;
},
filterModel11(value, row) {
return row.型号 == value;
},
filterName2(value, row) {
return row.物料名 == value;
},
filterSpecs2(value, row) {
return row.规格 == value;
},
filterModel2(value, row) {
return row.型号 == value;
},
filterDept2(value, row) {
return row.执行车间 == value;
},
handleExport(val) { handleExport(val) {
this.exportLoading = true; this.exportLoading = true;
let id = "#exportDiv" + val; let id = "#exportDiv" + val;

View File

@ -59,14 +59,20 @@
show-summary show-summary
> >
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="日期" prop="date" width="90" sortable> <el-table-column label="日期" prop="date" width="90">
<template #default="scope"> <template #default="scope">
{{ scope.row. }}-{{ scope.row. }} {{ scope.row. }}-{{ scope.row. }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人" prop="操作人" width="90" sortable> <el-table-column label="操作人" prop="操作人" width="90"
:filters="userFilters"
:filter-method="filterUser"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="工段" prop="工段" width="80" sortable> <el-table-column label="工段" prop="工段" width="80"
:filters="mgroupFilters"
:filter-method="filterMgroup"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="车间"> <el-table-column label="车间">
{{ queryBelongDept }} {{ queryBelongDept }}
@ -107,6 +113,9 @@ export default {
currentMonth: "", currentMonth: "",
deptData: [], deptData: [],
tableData: [], tableData: [],
dateFilters:[],
userFilters:[],
mgroupFilters:[],
option: { option: {
title: { title: {
text: "人员统计", text: "人员统计",
@ -167,6 +176,9 @@ export default {
}, },
getData() { getData() {
let that = this; let that = this;
that.userFilters = [];
that.mgroupFilters = [];
let userList=[],mgroupList=[];
let obj = { let obj = {
query: { query: {
start_date: this.start_date, start_date: this.start_date,
@ -175,17 +187,27 @@ export default {
}, },
}; };
that.$API.bi.dataset.exec.req("performance", obj).then((res) => { that.$API.bi.dataset.exec.req("performance", obj).then((res) => {
console.log("绩效统计:", res);
let data = res.data2.ds0; let data = res.data2.ds0;
let seriesData = [], let seriesData = [],
yAxisData = []; yAxisData = [];
data.forEach((item) => { data.forEach((item) => {
seriesData.push(item.合格数); seriesData.push(item.合格数);
yAxisData.push(item.操作人 + "∙" + item.工段); yAxisData.push(item.操作人 + "∙" + item.工段);
if(userList.indexOf(item.操作人)>-1){}else{
userList.push(item.操作人);
let obj2 = {};
obj2.text = item.操作人;
obj2.value = item.操作人;
that.userFilters.push(obj2);
}
if(mgroupList.indexOf(item.工段)>-1){}else{
mgroupList.push(item.工段);
let obj3 = {};
obj3.text = item.工段;
obj3.value = item.工段;
that.mgroupFilters.push(obj3);
}
}); });
console.log(yAxisData);
console.log(seriesData);
console.log(data);
that.tableData = data; that.tableData = data;
that.option.yAxis.data = yAxisData; that.option.yAxis.data = yAxisData;
that.option.series.data = seriesData; that.option.series.data = seriesData;
@ -239,6 +261,12 @@ export default {
} }
}); });
return sums; return sums;
},
filterUser(value, row) {
return row.操作人 === value;
},
filterMgroup(value, row) {
return row.工段 === value;
}, },
handleExport() { handleExport() {
this.exportLoading = true; this.exportLoading = true;