fix:
This commit is contained in:
parent
1e9fd15561
commit
5f7a15c05c
|
|
@ -1015,7 +1015,7 @@ export default {
|
||||||
queryDate:'',
|
queryDate:'',
|
||||||
currentYear: "",
|
currentYear: "",
|
||||||
currentMonth: "",
|
currentMonth: "",
|
||||||
nameList: [],
|
mgroupList: ['外协白片抛', '扫边A', '黑化', '退火', '减薄A', '减薄B', '精雕', '外协出司检', '外协一次抛', '磨抛一次抛', '外扫', '扫边B', '倒角','成品抛', '一次超洗', '尺寸检验', '二次超洗', '外观检验', '三次超洗'],
|
||||||
basicOption: {
|
basicOption: {
|
||||||
backgroundColor: "transparent",
|
backgroundColor: "transparent",
|
||||||
title: {
|
title: {
|
||||||
|
|
@ -1084,7 +1084,6 @@ export default {
|
||||||
dateArr.push(item);
|
dateArr.push(item);
|
||||||
}
|
}
|
||||||
that.weekDateList = dateArr;
|
that.weekDateList = dateArr;
|
||||||
// console.log('dateArr',dateArr);
|
|
||||||
that.query.start_date =first.toISOString().split('T')[0];
|
that.query.start_date =first.toISOString().split('T')[0];
|
||||||
that.query.end_date =last.toISOString().split('T')[0];
|
that.query.end_date =last.toISOString().split('T')[0];
|
||||||
that.options.forEach((item,index)=>{
|
that.options.forEach((item,index)=>{
|
||||||
|
|
@ -1113,7 +1112,9 @@ export default {
|
||||||
that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => {
|
that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => {
|
||||||
let arr = [];
|
let arr = [];
|
||||||
res.forEach(item=>{
|
res.forEach(item=>{
|
||||||
arr.push(item.name)
|
if(that.mgroupList.indexOf(item.name)>-1){
|
||||||
|
arr.push(item.name)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
that.query.mgroup_name = arr[0];
|
that.query.mgroup_name = arr[0];
|
||||||
that.options = arr;
|
that.options = arr;
|
||||||
|
|
@ -1150,7 +1151,6 @@ export default {
|
||||||
option.series.push(obj)
|
option.series.push(obj)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
that.nameList = nameList;
|
|
||||||
tableData.forEach((item) => {
|
tableData.forEach((item) => {
|
||||||
let indexX = nameList.indexOf(item.物料名);
|
let indexX = nameList.indexOf(item.物料名);
|
||||||
dataList[indexX].push(item);
|
dataList[indexX].push(item);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue