fix:光子统计部分更新
This commit is contained in:
parent
1a4449e766
commit
073fd4eb9d
|
|
@ -15,29 +15,47 @@
|
|||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main>
|
||||
<el-main id="mainDom">
|
||||
<el-card shadow="never" style="margin-bottom: 8px;">
|
||||
<el-row :gutter="10">
|
||||
<el-col :lg="12">
|
||||
<el-col :lg="11">
|
||||
<el-card shadow="never">
|
||||
<div id="bachart1" style="width:100%;height:300px;"></div>
|
||||
<!-- <scEcharts height="300px" :option="option"></scEcharts> -->
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :lg="12">
|
||||
<el-col :lg="13">
|
||||
<el-card shadow="never" style="position: relative;">
|
||||
<el-button @click="handleExport('1')" class="tables" type="primary">导出</el-button>
|
||||
<el-table :data="tableData7" id="exportDiv1" :height="300">
|
||||
<el-table :data="dataList" id="exportDiv1" :height="tableHeight" :summary-method="getSummaries" show-summary>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="物料名" prop="物料名">
|
||||
<el-table-column label="物料名" prop="物料名"
|
||||
:filters="nameFilters"
|
||||
:filter-method="filterName"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="月份" prop="月" v-if="queryType == '年'">
|
||||
<el-table-column
|
||||
v-if="queryType == '年'"
|
||||
label="月份" prop="月"
|
||||
:filters="dateFilters"
|
||||
:filter-method="filterMonth"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="周" prop="周" v-else>
|
||||
<el-table-column
|
||||
v-else
|
||||
label="周" prop="周"
|
||||
:filters="dateFilters"
|
||||
:filter-method="filterWeek"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="规格">
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters"
|
||||
:filter-method="filterSpecs"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
<el-table-column label="型号" prop="型号"
|
||||
:filters="modelFilters"
|
||||
:filter-method="filterModel"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="桶数" prop="合格数">
|
||||
</el-table-column>
|
||||
|
|
@ -48,37 +66,7 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<el-card shadow="never" style="margin-bottom: 8px;">
|
||||
<el-row :gutter="10">
|
||||
<el-col :lg="12">
|
||||
<el-card shadow="never">
|
||||
<div id="bachart2" style="width:100%;height:300px;"></div>
|
||||
<!-- <scEcharts height="300px" :option="option"></scEcharts> -->
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :lg="12">
|
||||
<el-card shadow="never" style="position: relative;">
|
||||
<el-button @click="handleExport('2')" class="tables" type="primary">导出</el-button>
|
||||
<el-table :data="tableData10" id="exportDiv2" :height="300">
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="物料名" prop="物料名">
|
||||
</el-table-column>
|
||||
<el-table-column label="月份" prop="月" v-if="queryType == '年'">
|
||||
</el-table-column>
|
||||
<el-table-column label="周" prop="周" v-else>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="规格">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" prop="数量">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-main>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
<script>
|
||||
|
|
@ -96,6 +84,7 @@ export default {
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
tableHeight: 300,
|
||||
queryType: '月',
|
||||
queryDate: '',
|
||||
start_date: '',
|
||||
|
|
@ -131,10 +120,15 @@ export default {
|
|||
barWidth: '15px',
|
||||
}]
|
||||
},
|
||||
tableData7: [],
|
||||
dataList: [],
|
||||
tableData10: [],
|
||||
firstWeekNum: 1,
|
||||
endWeekNum: 4,
|
||||
nameFilters: [],
|
||||
dateFilters:[],
|
||||
specsFilters:[],
|
||||
modelFilters:[],
|
||||
monthFilters:[1,2,3,4,5,,6,7,8,9,10,11,12],
|
||||
monthList: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
|
||||
}
|
||||
},
|
||||
|
|
@ -146,20 +140,23 @@ export default {
|
|||
let days = new Date(year, month, 0).getDate();
|
||||
that.currentYear = year;
|
||||
that.currentMonth = month;
|
||||
that.firstWeekNum = that.getWeekOfYear(year,month,1);
|
||||
that.endWeekNum = that.getWeekOfYear(year,month,days);
|
||||
month = month < 10 ? '0' + month : month;
|
||||
that.start_date = year + '-' + month + '-01';
|
||||
that.end_date = year + '-' + month + '-' + new Date(year, month, 0).getDate();
|
||||
let month1 = month;
|
||||
if (month1 < 10) { month1 = '0' + month1 }
|
||||
that.queryDate = year + '-' + month1;
|
||||
that.firstWeekNum = that.getWeekOfYear(new Date(that.start_date));
|
||||
that.endWeekNum = that.getWeekOfYear(new Date(that.end_date));
|
||||
that.end_date = year + '-' + month + '-' + days;
|
||||
that.queryDate = year + '-' + month;
|
||||
let duration = that.endWeekNum - that.firstWeekNum + 1;
|
||||
for (let i = 1; i <= duration; i++) {
|
||||
that.xAxisOrigin.push('第' + i + '周');
|
||||
}
|
||||
that.xAxisData = that.xAxisOrigin;
|
||||
that.getData7();
|
||||
that.getData10();
|
||||
let height = document.getElementById('mainDom').clientHeight;
|
||||
console.log('height',height);
|
||||
height= height-60;
|
||||
that.tableHeight = height;
|
||||
document.getElementById('bachart1').style.height = height + 'px';
|
||||
that.getDataHL();
|
||||
},
|
||||
methods: {
|
||||
setChart(name, option = null) {
|
||||
|
|
@ -181,18 +178,21 @@ export default {
|
|||
console.log(value)
|
||||
this.queryDate = '';
|
||||
},
|
||||
getWeekOfYear(date) {
|
||||
var target = new Date(date.getFullYear(), date.getMonth(), date.getDate()); // 创建目标日期对象
|
||||
var firstDayOfYear = new Date(target.getFullYear(), 0, 1); // 创建当前年份第一天的日期对象
|
||||
if (target.getTime() == firstDayOfYear.getTime()) {
|
||||
return 1;
|
||||
} else {
|
||||
return Math.ceil((target - firstDayOfYear + 8 * (firstDayOfYear.getTimezoneOffset() / 480)) / 604800000);
|
||||
}
|
||||
// 计算两者之间相隔的周数并返回结果
|
||||
getWeekOfYear(a,b,c) {
|
||||
var date1 = new Date(a, parseInt(b) - 1, c), //当前日期
|
||||
date2 = new Date(a, 0, 1), //当年第一天
|
||||
// d是当前日期是今年第多少天
|
||||
d = Math.round((date1.valueOf() - date2.valueOf()) / 86400000);
|
||||
// d + 当前年的第一天的周差距的和在除以7就是本年第几周
|
||||
return Math.ceil((d + (date2.getDay() + 1 - 1)) / 7);
|
||||
},
|
||||
getData7() {
|
||||
getDataHL() {
|
||||
let that = this;
|
||||
let dateList = [],specsList=[],modelList=[];
|
||||
that.dateFilters = [];
|
||||
that.nameFilters = [];
|
||||
that.modelFilters = [];
|
||||
that.specsFilters = [];
|
||||
let obj = {
|
||||
query: { start_date: that.start_date, end_date: that.end_date, mgroup_name: "混料", is_count_utask: -1 },
|
||||
};
|
||||
|
|
@ -201,29 +201,53 @@ export default {
|
|||
option.title.text = '混料统计';
|
||||
let exec = that.queryType == '月' ? 'lineWeek' : 'lineMonth';
|
||||
that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
|
||||
let tableData7 = res.data2.ds0 ? res.data2.ds0 : [];
|
||||
that.tableData7 = tableData7;
|
||||
debugger;
|
||||
if (tableData7.length > 0) {
|
||||
debugger;
|
||||
let dataList = res.data2.ds0 ? res.data2.ds0 : [];
|
||||
that.dataList = dataList;
|
||||
if (dataList.length > 0) {
|
||||
option.series = [];
|
||||
let seriesData = [], nameList = [];
|
||||
tableData7.forEach(ite => {
|
||||
dataList.forEach(ite => {
|
||||
if (nameList.indexOf(ite.物料名) > -1) { } else {
|
||||
nameList.push(ite.物料名);
|
||||
seriesData.push([])
|
||||
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);
|
||||
}
|
||||
})
|
||||
tableData7.forEach(item => {
|
||||
dataList.forEach(item => {
|
||||
let indexX = 0, indexY = 0;
|
||||
if (that.queryType == '月') {
|
||||
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 {
|
||||
that.dateFilters = [1,2,3,4,5,6,7,8,9,10,11,12];
|
||||
indexX = nameList.indexOf(item.物料名);
|
||||
indexY = item.月 - 1;
|
||||
}
|
||||
seriesData[indexX][indexY] = item.合格数;
|
||||
seriesData[indexX][indexY] += item.合格数;
|
||||
});
|
||||
for (let n = 0; n < seriesData.length; n++) {
|
||||
let obj = {};
|
||||
|
|
@ -240,88 +264,84 @@ export default {
|
|||
}
|
||||
});
|
||||
},
|
||||
getData10() {
|
||||
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() {
|
||||
let that = this;
|
||||
if (this.queryType == '月') {
|
||||
if (this.queryDate !== '' && this.queryDate !== null) {
|
||||
this.start_date = this.queryDate + '-01';
|
||||
let arr = this.queryDate.split('-');
|
||||
this.end_date = this.queryDate + '-' + new Date(arr[0], arr[1], 0).getDate();
|
||||
this.firstWeekNum = this.getWeekOfYear(new Date(this.start_date));
|
||||
this.endWeekNum = this.getWeekOfYear(new Date(this.end_date));
|
||||
let duration = this.endWeekNum - this.firstWeekNum + 1;
|
||||
if (that.queryType == '月') {
|
||||
if (that.queryDate !== '' && that.queryDate !== null) {
|
||||
let arr = that.queryDate.split('-');
|
||||
let year = arr[0];
|
||||
let month = arr[1];
|
||||
let days = new Date(year, month, 0).getDate();
|
||||
that.start_date = that.queryDate + '-01';
|
||||
that.end_date = that.queryDate + '-' + days;
|
||||
that.firstWeekNum = that.getWeekOfYear(year,month,1);
|
||||
that.endWeekNum = that.getWeekOfYear(year,month,days);
|
||||
let duration = that.endWeekNum - that.firstWeekNum + 1;
|
||||
let xAxisData = [];
|
||||
for (let i = 1; i <= duration; i++) {
|
||||
xAxisData.push('第' + i + '周');
|
||||
}
|
||||
that.xAxisData = xAxisData;
|
||||
} else {
|
||||
this.start_date = this.currentYear + '-' + this.currentMonth + '-01';
|
||||
this.end_date = this.currentYear + '-' + this.currentMonth + '-' + new Date(this.currentYear, this.currentMonth, 0).getDate();
|
||||
let date = new Date(this.start_date);
|
||||
this.firstWeekNum = this.getWeekOfYear(date);
|
||||
this.xAxisData = this.xAxisOrigin;
|
||||
that.start_date = that.currentYear + '-' + that.currentMonth + '-01';
|
||||
that.end_date = that.currentYear + '-' + that.currentMonth + '-' + new Date(that.currentYear, that.currentMonth, 0).getDate();
|
||||
that.firstWeekNum = that.getWeekOfYear(that.currentYear,that.currentMonth,1);
|
||||
that.xAxisData = that.xAxisOrigin;
|
||||
}
|
||||
} else {
|
||||
if (this.queryDate !== '' && this.queryDate !== null) {
|
||||
this.start_date = this.queryDate + '-01-01';
|
||||
this.end_date = this.queryDate + '-12-31';
|
||||
if (that.queryDate !== '' && that.queryDate !== null) {
|
||||
that.start_date = that.queryDate + '-01-01';
|
||||
that.end_date = that.queryDate + '-12-31';
|
||||
} else {
|
||||
this.start_date = this.currentYear + '-01-01';
|
||||
this.end_date = this.currentYear + '-12-31';
|
||||
that.start_date = that.currentYear + '-01-01';
|
||||
that.end_date = that.currentYear + '-12-31';
|
||||
}
|
||||
that.xAxisData = that.monthList;
|
||||
}
|
||||
this.getData7();
|
||||
this.getData10();
|
||||
that.getDataHL();
|
||||
},
|
||||
getSummaries({ columns, data }) {
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = "合计";
|
||||
return;
|
||||
}
|
||||
if (index == 5||index == 6) {
|
||||
const values = data.map((item) =>
|
||||
Number(item[column.property])
|
||||
);
|
||||
if (!values.every((value) => Number.isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr); //Number转换为数值
|
||||
let sum = Number(
|
||||
Number(prev) + Number(curr)
|
||||
).toFixed(2); //toFixed(2)数据项保留两位小数
|
||||
if (!isNaN(value)) {
|
||||
return sum;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
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) {
|
||||
this.exportLoading = true;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,21 @@
|
|||
<el-header>
|
||||
<div class="right-panel">
|
||||
<h2>产品交付统计</h2>
|
||||
<el-select
|
||||
<xtSelect
|
||||
:apiObj="apiObjMaterial"
|
||||
:params = "paramsMaterial"
|
||||
v-model="materialSale"
|
||||
v-model:label="materialName"
|
||||
v-model:obj="materialItem"
|
||||
@change="materialSaleChange"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="名称" prop="name"></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="count"></el-table-column>
|
||||
</xtSelect>
|
||||
<!-- <el-select
|
||||
v-model="materialSale"
|
||||
clearable
|
||||
@change="materialSaleChange"
|
||||
|
|
@ -53,7 +67,7 @@
|
|||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-select> -->
|
||||
</div>
|
||||
</el-header>
|
||||
<el-row>
|
||||
|
|
@ -81,32 +95,34 @@
|
|||
:data="tableData1"
|
||||
id="exportDiv1"
|
||||
:height="tableHeight"
|
||||
:summary-method="getSummaries" show-summary
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="年份"
|
||||
prop="年"
|
||||
width="80"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="queryType == '月'"
|
||||
width="50"
|
||||
label="周"
|
||||
prop="周"
|
||||
/>
|
||||
<el-table-column
|
||||
v-else
|
||||
width="50"
|
||||
label="月份"
|
||||
prop="月"
|
||||
/>
|
||||
<el-table-column label="名称" prop="物料名">
|
||||
<el-table-column label="年份" prop="年" width="70"/>
|
||||
<el-table-column v-if="queryType == '月'" width="60" label="周" prop="周"
|
||||
:filters="dateFilters"
|
||||
: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 label="规格" prop="规格">
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters"
|
||||
:filter-method="filterSpecs"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
<el-table-column label="型号" prop="型号"
|
||||
:filters="modelFilters"
|
||||
:filter-method="filterModel"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" prop="count">
|
||||
<el-table-column label="数量" prop="数量">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
|
|
@ -134,30 +150,33 @@
|
|||
id="exportDiv2"
|
||||
:height="rightHeight"
|
||||
hideDo
|
||||
hidePagination
|
||||
:summary-method="getSummaries" show-summary
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="年份"
|
||||
prop="年"
|
||||
width="80"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="queryType == '月'"
|
||||
width="50"
|
||||
label="周"
|
||||
prop="周"
|
||||
/>
|
||||
<el-table-column
|
||||
v-else
|
||||
width="50"
|
||||
label="月份"
|
||||
prop="月"
|
||||
/>
|
||||
<el-table-column label="名称" prop="物料名">
|
||||
<el-table-column label="年份" prop="年" width="70"/>
|
||||
<el-table-column v-if="queryType == '月'" width="70" label="周" prop="周"
|
||||
:filters="dateFilters2"
|
||||
: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 label="规格" prop="规格">
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters2"
|
||||
:filter-method="filterSpecs2"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
<el-table-column label="型号" prop="型号"
|
||||
:filters="modelFilters2"
|
||||
:filter-method="filterModel2"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" prop="数量">
|
||||
</el-table-column>
|
||||
|
|
@ -188,6 +207,7 @@ export default {
|
|||
end_date: "",
|
||||
currentYear: "",
|
||||
currentMonth: "",
|
||||
materialName: "",
|
||||
xAxisOrigin: [],
|
||||
xAxisData: [],
|
||||
typeOptions: ["月", "年"],
|
||||
|
|
@ -225,22 +245,20 @@ export default {
|
|||
rightHeight: 0,
|
||||
tableData1: [],
|
||||
tableData2: [],
|
||||
nameFilters: [],
|
||||
dateFilters: [],
|
||||
modelFilters: [],
|
||||
specsFilters: [],
|
||||
nameFilters2: [],
|
||||
dateFilters2: [],
|
||||
modelFilters2: [],
|
||||
specsFilters2: [],
|
||||
firstWeekNum: 1,
|
||||
endWeekNum: 4,
|
||||
monthList: [
|
||||
"一月",
|
||||
"二月",
|
||||
"三月",
|
||||
"四月",
|
||||
"五月",
|
||||
"六月",
|
||||
"七月",
|
||||
"八月",
|
||||
"九月",
|
||||
"十月",
|
||||
"十一月",
|
||||
"十二月",
|
||||
],
|
||||
monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
|
||||
materialItem:{},
|
||||
paramsMaterial:{type__in : "10"},
|
||||
apiObjMaterial:this.$API.mtm.material.list,
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -251,16 +269,12 @@ export default {
|
|||
let days = new Date(year, month, 0).getDate();
|
||||
that.currentYear = year;
|
||||
that.currentMonth = month;
|
||||
that.firstWeekNum = that.getWeekOfYear(year,month,1);
|
||||
that.endWeekNum = that.getWeekOfYear(year,month,days);
|
||||
month = month < 10 ? "0" + month : month;
|
||||
that.start_date = year + "-" + month + "-01";
|
||||
that.end_date =
|
||||
year + "-" + month + "-" + new Date(year, month, 0).getDate();
|
||||
let month1 = month;
|
||||
if (month1 < 10) {
|
||||
month1 = "0" + month1;
|
||||
}
|
||||
that.queryDate = year + "-" + month1;
|
||||
that.firstWeekNum = that.getWeekOfYear(new Date(that.start_date));
|
||||
that.endWeekNum = that.getWeekOfYear(new Date(that.end_date));
|
||||
that.end_date =year + "-" + month + "-" + days;
|
||||
that.queryDate = year + "-" + month;
|
||||
let duration = that.endWeekNum - that.firstWeekNum + 1;
|
||||
for (let i = 1; i <= duration; i++) {
|
||||
that.xAxisOrigin.push("第" + i + "周");
|
||||
|
|
@ -272,17 +286,16 @@ export default {
|
|||
that.rightHeight = height - 115;
|
||||
that.getTable();
|
||||
that.setChart("bachart1", that.basicOption);
|
||||
this.getSaleOption();
|
||||
// this.getSaleOption();
|
||||
},
|
||||
methods: {
|
||||
setChart(name, option = null) {
|
||||
// 根据name 渲染数据, option需填写，否则option为模拟数据
|
||||
var myChart = echarts.getInstanceByDom(
|
||||
document.getElementById(name)
|
||||
);
|
||||
if (myChart == undefined) {
|
||||
myChart = echarts.init(document.getElementById(name), "T");
|
||||
var myChart = echarts.getInstanceByDom(document.getElementById(name));
|
||||
if (myChart != null) {
|
||||
myChart.dispose(); // 销毁之前的实例
|
||||
}
|
||||
myChart = echarts.init(document.getElementById(name), "T");
|
||||
if (option == null) {
|
||||
option = Object.assign({}, this.basicOption);
|
||||
}
|
||||
|
|
@ -296,24 +309,13 @@ export default {
|
|||
console.log(value);
|
||||
this.queryDate = "";
|
||||
},
|
||||
getWeekOfYear(date) {
|
||||
var target = new Date(
|
||||
date.getFullYear(),
|
||||
date.getMonth(),
|
||||
date.getDate()
|
||||
); // 创建目标日期对象
|
||||
var firstDayOfYear = new Date(target.getFullYear(), 0, 1); // 创建当前年份第一天的日期对象
|
||||
if (target.getTime() == firstDayOfYear.getTime()) {
|
||||
return 1;
|
||||
} else {
|
||||
return Math.ceil(
|
||||
(target -
|
||||
firstDayOfYear +
|
||||
8 * (firstDayOfYear.getTimezoneOffset() / 480)) /
|
||||
604800000
|
||||
);
|
||||
}
|
||||
// 计算两者之间相隔的周数并返回结果
|
||||
getWeekOfYear(a,b,c) {
|
||||
var date1 = new Date(a, parseInt(b) - 1, c), //当前日期
|
||||
date2 = new Date(a, 0, 1), //当年第一天
|
||||
// d是当前日期是今年第多少天
|
||||
d = Math.round((date1.valueOf() - date2.valueOf()) / 86400000);
|
||||
// d + 当前年的第一天的周差距的和在除以7就是本年第几周
|
||||
return Math.ceil((d + (date2.getDay() + 1 - 1)) / 7);
|
||||
},
|
||||
materialSaleChange() {
|
||||
this.getSaleData();
|
||||
|
|
@ -331,8 +333,12 @@ export default {
|
|||
//交付物料
|
||||
getSaleData() {
|
||||
let that = this;
|
||||
let option = deepCopy(that.basicOption);
|
||||
option.xAxis.data = that.xAxisData;
|
||||
that.tableData1 = [];
|
||||
that.nameFilters = [];
|
||||
that.dateFilters = [];
|
||||
that.modelFilters = [];
|
||||
that.specsFilters = [];
|
||||
let nameList=[],dateList = [],specsList=[],modelList=[];
|
||||
let exec = that.queryType == "月" ? "saleOutWeek" : "saleOutMonth";
|
||||
let obj = {
|
||||
query: {
|
||||
|
|
@ -343,30 +349,63 @@ export default {
|
|||
},
|
||||
};
|
||||
that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
|
||||
console.log("getSaleData", res);
|
||||
option.series.data = [];
|
||||
if (res.data2.ds0) {
|
||||
if (res.data2.ds0&&res.data2.ds0.length>0) {
|
||||
let data = res.data2.ds0;
|
||||
that.tableData1 = data;
|
||||
if (data.length > 0) {
|
||||
let seriesData = [];
|
||||
data.forEach((item) => {
|
||||
if (that.queryType == "月") {
|
||||
let index = item.周 - that.firstWeekNum;
|
||||
seriesData[index] = item.数量;
|
||||
} else {
|
||||
let index = item.月 - 1;
|
||||
seriesData[index] = item.数量;
|
||||
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);
|
||||
}
|
||||
});
|
||||
option.series.data = seriesData;
|
||||
}
|
||||
}else{
|
||||
that.dateFilters = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
|
||||
}
|
||||
})
|
||||
that.setChartData(data);
|
||||
}else{
|
||||
let option = deepCopy(that.basicOption);
|
||||
option.xAxis.data = that.xAxisData;
|
||||
that.setChart("bachart1",option);
|
||||
}
|
||||
that.setChart("bachart1", option);
|
||||
});
|
||||
},
|
||||
getTable() {
|
||||
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 = {
|
||||
query: {
|
||||
start_date: that.start_date,
|
||||
|
|
@ -379,7 +418,50 @@ export default {
|
|||
that.tableData2 = [];
|
||||
if (res.data2.ds0) {
|
||||
let data = res.data2.ds0;
|
||||
that.tableData1 = 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);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
|
@ -387,48 +469,33 @@ export default {
|
|||
let that = this;
|
||||
if (this.queryType == "月") {
|
||||
if (this.queryDate !== "" && this.queryDate !== null) {
|
||||
this.start_date = this.queryDate + "-01";
|
||||
let arr = this.queryDate.split("-");
|
||||
this.end_date =
|
||||
this.queryDate +
|
||||
"-" +
|
||||
new Date(arr[0], arr[1], 0).getDate();
|
||||
this.firstWeekNum = this.getWeekOfYear(
|
||||
new Date(this.start_date)
|
||||
);
|
||||
this.endWeekNum = this.getWeekOfYear(
|
||||
new Date(this.end_date)
|
||||
);
|
||||
let duration = this.endWeekNum - this.firstWeekNum + 1;
|
||||
let arr = that.queryDate.split("-");
|
||||
let year = arr[0];
|
||||
let month = arr[1];
|
||||
let days = new Date(year, month, 0).getDate();
|
||||
that.start_date = that.queryDate + "-01";
|
||||
that.end_date =that.queryDate +"-" +days;
|
||||
that.firstWeekNum = that.getWeekOfYear(year,month,1);
|
||||
that.endWeekNum = that.getWeekOfYear(year,month,days);
|
||||
let duration = that.endWeekNum - that.firstWeekNum + 1;
|
||||
let xAxisData = [];
|
||||
for (let i = 1; i <= duration; i++) {
|
||||
xAxisData.push("第" + i + "周");
|
||||
}
|
||||
that.xAxisData = xAxisData;
|
||||
} else {
|
||||
this.start_date =
|
||||
this.currentYear + "-" + this.currentMonth + "-01";
|
||||
this.end_date =
|
||||
this.currentYear +
|
||||
"-" +
|
||||
this.currentMonth +
|
||||
"-" +
|
||||
new Date(
|
||||
this.currentYear,
|
||||
this.currentMonth,
|
||||
0
|
||||
).getDate();
|
||||
let date = new Date(this.start_date);
|
||||
this.firstWeekNum = this.getWeekOfYear(date);
|
||||
this.xAxisData = this.xAxisOrigin;
|
||||
that.start_date =that.currentYear + "-" + that.currentMonth + "-01";
|
||||
that.end_date =that.currentYear +"-" +that.currentMonth +"-" +new Date(that.currentYear,that.currentMonth,0).getDate();
|
||||
that.firstWeekNum = that.getWeekOfYear(that.currentYear,that.currentMonth,1);
|
||||
that.xAxisData = that.xAxisOrigin;
|
||||
}
|
||||
} else {
|
||||
if (this.queryDate !== "" && this.queryDate !== null) {
|
||||
this.start_date = this.queryDate + "-01-01";
|
||||
this.end_date = this.queryDate + "-12-31";
|
||||
if (that.queryDate !== "" && that.queryDate !== null) {
|
||||
that.start_date = that.queryDate + "-01-01";
|
||||
that.end_date = that.queryDate + "-12-31";
|
||||
} else {
|
||||
this.start_date = this.currentYear + "-01-01";
|
||||
this.end_date = this.currentYear + "-12-31";
|
||||
that.start_date = that.currentYear + "-01-01";
|
||||
that.end_date = that.currentYear + "-12-31";
|
||||
}
|
||||
that.xAxisData = that.monthList;
|
||||
}
|
||||
|
|
@ -437,6 +504,99 @@ export default {
|
|||
that.getSaleData();
|
||||
}
|
||||
},
|
||||
getSummaries({ columns, data }) {
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = "合计";
|
||||
return;
|
||||
}
|
||||
if (index == 6) {
|
||||
const values = data.map((item) =>
|
||||
Number(item[column.property])
|
||||
);
|
||||
if (!values.every((value) => Number.isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr); //Number转换为数值
|
||||
let sum = Number(
|
||||
Number(prev) + Number(curr)
|
||||
).toFixed(2); //toFixed(2)数据项保留两位小数
|
||||
if (!isNaN(value)) {
|
||||
return sum;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
return sums;
|
||||
},
|
||||
setChartData(data){
|
||||
let that = this;
|
||||
let option = deepCopy(that.basicOption);
|
||||
option.xAxis.data = that.xAxisData;
|
||||
option.series=[];
|
||||
let materials = [],seriesData = [];
|
||||
data.forEach((item) => {
|
||||
if(materials.indexOf(item.物料名) == -1){
|
||||
materials.push(item.物料名);
|
||||
}
|
||||
})
|
||||
materials.forEach((item) => {
|
||||
let obj = {};
|
||||
obj.name = item;
|
||||
obj.type = "bar";
|
||||
obj.stack = "Ad";
|
||||
obj.barWidth = "15px";
|
||||
obj.data = [0,0,0,0,0,0,0,0,0,0,0,0];
|
||||
seriesData.push(obj);
|
||||
})
|
||||
data.forEach((item) => {
|
||||
let index = 0;let indexY = 0;
|
||||
if (that.queryType == "月") {
|
||||
index = item.周 - that.firstWeekNum;
|
||||
} else {
|
||||
index = item.月 - 1;
|
||||
}
|
||||
indexY = materials.indexOf(item.物料名);
|
||||
seriesData[indexY].data[index] = item.数量;
|
||||
});
|
||||
option.series = seriesData;
|
||||
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) {
|
||||
this.exportLoading = true;
|
||||
let id = "#exportDiv" + val;
|
||||
|
|
|
|||
|
|
@ -41,37 +41,27 @@
|
|||
<el-header>
|
||||
<div class="right-panel">
|
||||
<h2>采购统计</h2>
|
||||
<el-select
|
||||
<xtSelect
|
||||
:apiObj="apiObjMaterial"
|
||||
:params = "paramsMaterial"
|
||||
v-model="materialIn"
|
||||
clearable
|
||||
filterable
|
||||
v-model:label="materialName"
|
||||
v-model:obj="materialItem"
|
||||
@change="materialInChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in inmOption"
|
||||
:key="item.id"
|
||||
:label="item.full_name"
|
||||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="名称" prop="name"></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="count"></el-table-column>
|
||||
</xtSelect>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-row>
|
||||
<el-col>
|
||||
<div
|
||||
id="bachart1"
|
||||
style="width: 100%; height: 300px"
|
||||
></div>
|
||||
<div id="bachart1" style="width: 100%; height: 300px"></div>
|
||||
</el-col>
|
||||
<el-card
|
||||
shadow="never"
|
||||
style="
|
||||
width: 100%;
|
||||
position: relative;
|
||||
margin-top: 20px;
|
||||
"
|
||||
>
|
||||
<el-card shadow="never" style="width: 100%;position: relative;margin-top: 20px;">
|
||||
<el-button
|
||||
@click="handleExport('1')"
|
||||
class="tables"
|
||||
|
|
@ -82,30 +72,33 @@
|
|||
:data="tableData1"
|
||||
id="exportDiv1"
|
||||
:height="tableHeight"
|
||||
:summary-method="getSummaries"
|
||||
show-summary
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="年份"
|
||||
prop="年"
|
||||
width="80"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="queryType == '月'"
|
||||
width="50"
|
||||
label="周"
|
||||
prop="周"
|
||||
/>
|
||||
<el-table-column
|
||||
v-else
|
||||
width="50"
|
||||
label="月份"
|
||||
prop="月"
|
||||
/>
|
||||
<el-table-column label="名称" prop="物料名">
|
||||
<el-table-column label="年份" prop="年" width="80"/>
|
||||
<el-table-column v-if="queryType == '月'" width="60" label="周" prop="周"
|
||||
:filters="dateFilters"
|
||||
: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 label="规格" prop="规格">
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters"
|
||||
:filter-method="filterSpecs"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
<el-table-column label="型号" prop="型号"
|
||||
:filters="modelFilters"
|
||||
:filter-method="filterModel"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" prop="数量">
|
||||
</el-table-column>
|
||||
|
|
@ -129,36 +122,39 @@
|
|||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
|
||||
<scTable
|
||||
:data="tableData2"
|
||||
id="exportDiv2"
|
||||
:height="rightHeight"
|
||||
hideDo
|
||||
hidePagination
|
||||
:summary-method="getSummaries"
|
||||
show-summary
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="年份"
|
||||
prop="年"
|
||||
width="80"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="queryType == '月'"
|
||||
width="50"
|
||||
label="周"
|
||||
prop="周"
|
||||
/>
|
||||
<el-table-column
|
||||
v-else
|
||||
width="50"
|
||||
label="月份"
|
||||
prop="月"
|
||||
/>
|
||||
<el-table-column label="名称" prop="物料名">
|
||||
<el-table-column label="年份" prop="年" width="80"/>
|
||||
<el-table-column v-if="queryType == '月'" width="70" label="周" prop="周"
|
||||
:filters="dateFilters2"
|
||||
: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 label="规格" prop="规格">
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters2"
|
||||
:filter-method="filterSpecs2"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
<el-table-column label="型号" prop="型号"
|
||||
:filters="modelFilters2"
|
||||
:filter-method="filterModel2"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" prop="数量">
|
||||
</el-table-column>
|
||||
|
|
@ -227,6 +223,7 @@ export default {
|
|||
tableData1: [],
|
||||
tableData2: [],
|
||||
materialIn: "",
|
||||
materialName: "",
|
||||
firstWeekNum: 1,
|
||||
endWeekNum: 1,
|
||||
product: "",
|
||||
|
|
@ -234,20 +231,18 @@ export default {
|
|||
outData: [],
|
||||
inmOption: [],
|
||||
outOption: [],
|
||||
monthList: [
|
||||
"一月",
|
||||
"二月",
|
||||
"三月",
|
||||
"四月",
|
||||
"五月",
|
||||
"六月",
|
||||
"七月",
|
||||
"八月",
|
||||
"九月",
|
||||
"十月",
|
||||
"十一月",
|
||||
"十二月",
|
||||
],
|
||||
nameFilters: [],
|
||||
dateFilters: [],
|
||||
modelFilters: [],
|
||||
specsFilters: [],
|
||||
nameFilters2: [],
|
||||
dateFilters2: [],
|
||||
modelFilters2: [],
|
||||
specsFilters2: [],
|
||||
monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
|
||||
materialItem:{},
|
||||
apiObjMaterial:this.$API.mtm.material.list,
|
||||
paramsMaterial:{type__in : "30,40,50,60,70"}
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -258,18 +253,12 @@ export default {
|
|||
let days = new Date(year, month, 0).getDate();
|
||||
that.currentYear = year;
|
||||
that.currentMonth = month;
|
||||
that.firstWeekNum = that.getWeekOfYear(year,month,1);
|
||||
that.endWeekNum = that.getWeekOfYear(year,month,days);
|
||||
month = month < 10 ? "0" + month : month;
|
||||
that.start_date = year + "-" + month + "-01";
|
||||
that.end_date =
|
||||
year + "-" + month + "-" + new Date(year, month, 0).getDate();
|
||||
let month1 = month;
|
||||
if (month1 < 10) {
|
||||
month1 = "0" + month1;
|
||||
}
|
||||
that.queryDate = year + "-" + month1;
|
||||
that.firstWeekNum = that.getWeekOfYear(new Date(that.start_date));
|
||||
that.endWeekNum = that.getWeekOfYear(new Date(that.end_date));
|
||||
// console.log('that.firstWeekNum',that.firstWeekNum)
|
||||
// console.log('that.endWeekNum',that.endWeekNum)
|
||||
that.end_date =year + "-" + month + "-" + days;
|
||||
that.queryDate = year + "-" + month;
|
||||
let duration = that.endWeekNum - that.firstWeekNum + 1;
|
||||
for (let i = 1; i <= duration; i++) {
|
||||
that.xAxisOrigin.push("第" + i + "周");
|
||||
|
|
@ -280,17 +269,15 @@ export default {
|
|||
that.rightHeight = height - 115;
|
||||
that.tableHeight = height - 140 - chartheight;
|
||||
that.setChart("bachart1", that.basicOption);
|
||||
this.getInmOption();
|
||||
this.getTable();
|
||||
that.getTable();
|
||||
},
|
||||
methods: {
|
||||
setChart(name, option = null) {
|
||||
var myChart = echarts.getInstanceByDom(
|
||||
document.getElementById(name)
|
||||
);
|
||||
if (myChart == undefined) {
|
||||
myChart = echarts.init(document.getElementById(name), "T");
|
||||
var myChart = echarts.getInstanceByDom(document.getElementById(name));
|
||||
if (myChart != null) {
|
||||
myChart.dispose(); // 销毁之前的实例
|
||||
}
|
||||
myChart = echarts.init(document.getElementById(name), "T");
|
||||
if (option == null) {
|
||||
option = Object.assign({}, this.basicOption);
|
||||
}
|
||||
|
|
@ -300,29 +287,24 @@ export default {
|
|||
} catch (error) {}
|
||||
}, 500);
|
||||
},
|
||||
getWeekOfYear(date) {
|
||||
var target = new Date(
|
||||
date.getFullYear(),
|
||||
date.getMonth(),
|
||||
date.getDate()
|
||||
); //目标日期
|
||||
var firstDayOfYear = new Date(target.getFullYear(), 0, 1); // 当前年份第一天
|
||||
if (target.getTime() == firstDayOfYear.getTime()) {
|
||||
return 1;
|
||||
} else {
|
||||
return Math.ceil(
|
||||
(target -
|
||||
firstDayOfYear +
|
||||
8 * (firstDayOfYear.getTimezoneOffset() / 480)) /
|
||||
604800000
|
||||
);
|
||||
}
|
||||
},
|
||||
getWeekOfYear(a,b,c) {
|
||||
var date1 = new Date(a, parseInt(b) - 1, c), //当前日期
|
||||
date2 = new Date(a, 0, 1), //当年第一天
|
||||
// d是当前日期是今年第多少天
|
||||
d = Math.round((date1.valueOf() - date2.valueOf()) / 86400000);
|
||||
// d + 当前年的第一天的周差距的和在除以7就是本年第几周
|
||||
return Math.ceil((d + (date2.getDay() + 1 - 1)) / 7);
|
||||
},
|
||||
queryTypeChange(value) {
|
||||
console.log(value);
|
||||
this.queryDate = "";
|
||||
},
|
||||
materialInChange() {
|
||||
materialInChange(data) {
|
||||
let that = this;
|
||||
that.materialIn = that.materialItem.id;
|
||||
let option = deepCopy(that.basicOption);
|
||||
option.xAxis.data = that.xAxisData;
|
||||
that.setChart("bachart1",option);
|
||||
this.getInmData();
|
||||
},
|
||||
//采购物料选项
|
||||
|
|
@ -333,21 +315,17 @@ export default {
|
|||
obj.type__in = "30,40,50,60,70";
|
||||
that.$API.mtm.material.list.req(obj).then((res) => {
|
||||
that.inmOption = res;
|
||||
// that.materialIn = res[1].id;
|
||||
// let arr = [];
|
||||
// res.forEach(item=>{
|
||||
// if(item.type==30){
|
||||
// arr.push(item)
|
||||
// }
|
||||
// });
|
||||
// that.getInmData();
|
||||
});
|
||||
},
|
||||
//采购物料
|
||||
getInmData() {
|
||||
let that = this;
|
||||
let option = deepCopy(that.basicOption);
|
||||
option.xAxis.data = that.xAxisData;
|
||||
that.tableData1 = [];
|
||||
that.nameFilters = [];
|
||||
that.dateFilters = [];
|
||||
that.modelFilters = [];
|
||||
that.specsFilters = [];
|
||||
let nameList=[],dateList = [],specsList=[],modelList=[];
|
||||
let exec = that.queryType == "月" ? "saleOutWeek" : "saleOutMonth";
|
||||
let obj = {
|
||||
query: {
|
||||
|
|
@ -358,26 +336,50 @@ export default {
|
|||
},
|
||||
};
|
||||
that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
|
||||
console.log("getInmData", res);
|
||||
option.series.data = [];
|
||||
if (res.data2.ds0) {
|
||||
if (res.data2.ds0&&res.data2.ds0.length>0) {
|
||||
let data = res.data2.ds0;
|
||||
that.tableData1 = data;
|
||||
if (data.length > 0) {
|
||||
let seriesData = [];
|
||||
data.forEach((item) => {
|
||||
if (that.queryType == "月") {
|
||||
let index = item.周 - that.firstWeekNum;
|
||||
seriesData[index] = item.数量;
|
||||
} else {
|
||||
let index = item.月 - 1;
|
||||
seriesData[index] = item.数量;
|
||||
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);
|
||||
}
|
||||
});
|
||||
option.series.data = seriesData;
|
||||
}
|
||||
}else{
|
||||
that.dateFilters = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
|
||||
}
|
||||
})
|
||||
that.setChartData(data);
|
||||
}else{
|
||||
let option = deepCopy(that.basicOption);
|
||||
option.xAxis.data = that.xAxisData;
|
||||
that.setChart("bachart1",option);
|
||||
}
|
||||
that.setChart("bachart1", option);
|
||||
});
|
||||
},
|
||||
getTable() {
|
||||
|
|
@ -389,12 +391,65 @@ export default {
|
|||
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";
|
||||
that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
|
||||
that.tableData2 = [];
|
||||
that.tableData1 = [];
|
||||
if (res.data2.ds0) {
|
||||
let data = res.data2.ds0;
|
||||
that.tableData1 = 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);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
|
@ -402,18 +457,14 @@ export default {
|
|||
let that = this;
|
||||
if (that.queryType == "月") {
|
||||
if (that.queryDate !== "" && that.queryDate !== null) {
|
||||
that.start_date = that.queryDate + "-01";
|
||||
let arr = that.queryDate.split("-");
|
||||
that.end_date =
|
||||
that.queryDate +
|
||||
"-" +
|
||||
new Date(arr[0], arr[1], 0).getDate();
|
||||
that.firstWeekNum = that.getWeekOfYear(
|
||||
new Date(that.start_date)
|
||||
);
|
||||
that.endWeekNum = that.getWeekOfYear(
|
||||
new Date(that.end_date)
|
||||
);
|
||||
let year = arr[0];
|
||||
let month = arr[1];
|
||||
let days = new Date(year, month, 0).getDate();
|
||||
that.start_date = that.queryDate + "-01";
|
||||
that.end_date =that.queryDate +"-" +days;
|
||||
that.firstWeekNum = that.getWeekOfYear(year,month,1);
|
||||
that.endWeekNum = that.getWeekOfYear(year,month,days);
|
||||
let duration = that.endWeekNum - that.firstWeekNum + 1;
|
||||
let xAxisData = [];
|
||||
for (let i = 1; i <= duration; i++) {
|
||||
|
|
@ -421,20 +472,9 @@ export default {
|
|||
}
|
||||
that.xAxisData = xAxisData;
|
||||
} else {
|
||||
that.start_date =
|
||||
that.currentYear + "-" + that.currentMonth + "-01";
|
||||
that.end_date =
|
||||
that.currentYear +
|
||||
"-" +
|
||||
that.currentMonth +
|
||||
"-" +
|
||||
new Date(
|
||||
that.currentYear,
|
||||
that.currentMonth,
|
||||
0
|
||||
).getDate();
|
||||
let date = new Date(that.start_date);
|
||||
that.firstWeekNum = that.getWeekOfYear(date);
|
||||
that.start_date =that.currentYear + "-" + that.currentMonth + "-01";
|
||||
that.end_date =that.currentYear +"-" +that.currentMonth +"-" +new Date(that.currentYear,that.currentMonth,0).getDate();
|
||||
that.firstWeekNum = that.getWeekOfYear(that.currentYear,that.currentMonth,1);
|
||||
that.xAxisData = that.xAxisOrigin;
|
||||
}
|
||||
} else {
|
||||
|
|
@ -452,6 +492,99 @@ export default {
|
|||
that.getInmData();
|
||||
}
|
||||
},
|
||||
setChartData(data){
|
||||
let that = this;
|
||||
let option = deepCopy(that.basicOption);
|
||||
option.xAxis.data = that.xAxisData;
|
||||
option.series=[];
|
||||
let materials = [],seriesData = [];
|
||||
data.forEach((item) => {
|
||||
if(materials.indexOf(item.物料名) == -1){
|
||||
materials.push(item.物料名);
|
||||
}
|
||||
})
|
||||
materials.forEach((item) => {
|
||||
let obj = {};
|
||||
obj.name = item;
|
||||
obj.type = "bar";
|
||||
obj.stack = "Ad";
|
||||
obj.barWidth = "15px";
|
||||
obj.data = [0,0,0,0,0,0,0,0,0,0,0,0];
|
||||
seriesData.push(obj);
|
||||
})
|
||||
data.forEach((item) => {
|
||||
let index = 0;let indexY = 0;
|
||||
if (that.queryType == "月") {
|
||||
index = item.周 - that.firstWeekNum;
|
||||
} else {
|
||||
index = item.月 - 1;
|
||||
}
|
||||
indexY = materials.indexOf(item.物料名);
|
||||
seriesData[indexY].data[index] = item.数量;
|
||||
});
|
||||
option.series = seriesData;
|
||||
that.setChart("bachart1", option);
|
||||
},
|
||||
getSummaries({ columns, data }) {
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = "合计";
|
||||
return;
|
||||
}
|
||||
if (index == 6) {
|
||||
const values = data.map((item) =>
|
||||
Number(item[column.property])
|
||||
);
|
||||
if (!values.every((value) => Number.isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr); //Number转换为数值
|
||||
let sum = Number(
|
||||
Number(prev) + Number(curr)
|
||||
).toFixed(2); //toFixed(2)数据项保留两位小数
|
||||
if (!isNaN(value)) {
|
||||
return sum;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
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) {
|
||||
this.exportLoading = true;
|
||||
let id = "#exportDiv" + val;
|
||||
|
|
|
|||
|
|
@ -56,31 +56,34 @@
|
|||
:data="tableData7"
|
||||
id="exportDiv7"
|
||||
:height="300"
|
||||
:summary-method="getSummaries"
|
||||
show-summary
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="物料名"
|
||||
prop="物料名"
|
||||
min-width="100"
|
||||
>
|
||||
<el-table-column label="物料名" prop="物料名" min-width="100"
|
||||
:filters="nameFilters7"
|
||||
:filter-method="filterName7"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="月份"
|
||||
prop="月"
|
||||
v-if="queryType == '年'"
|
||||
width="50"
|
||||
>
|
||||
<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
|
||||
label="周"
|
||||
prop="周"
|
||||
v-else
|
||||
width="50"
|
||||
>
|
||||
<el-table-column label="周" prop="周" v-else width="60"
|
||||
:filters="dateFilters7"
|
||||
:filter-method="filterDate7"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
<el-table-column label="型号" prop="型号"
|
||||
:filters="modelFilters7"
|
||||
:filter-method="filterModel7"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="规格">
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters7"
|
||||
:filter-method="filterSpecs7"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
</el-table-column>
|
||||
|
|
@ -88,10 +91,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="合格数" prop="合格数">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="不合格数"
|
||||
prop="不合格数"
|
||||
>
|
||||
<el-table-column label="不合格数" prop="不合格数">
|
||||
</el-table-column>
|
||||
<el-table-column label="合格率" prop="合格率">
|
||||
<template #default="scope">
|
||||
|
|
@ -122,25 +122,34 @@
|
|||
:data="tableData10"
|
||||
id="exportDiv10"
|
||||
:height="300"
|
||||
:summary-method="getSummaries"
|
||||
show-summary
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="物料名"
|
||||
prop="物料名"
|
||||
min-width="100"
|
||||
>
|
||||
<el-table-column label="物料名" prop="物料名" min-width="100"
|
||||
:filters="nameFilters"
|
||||
:filter-method="filterName"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="月份"
|
||||
prop="月"
|
||||
v-if="queryType == '年'"
|
||||
>
|
||||
<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 label="周" prop="周" v-else>
|
||||
<el-table-column label="周" prop="周" v-else width="60"
|
||||
:filters="dateFilters"
|
||||
:filter-method="filterDate"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
<el-table-column label="型号" prop="型号"
|
||||
:filters="modelFilters"
|
||||
:filter-method="filterModel"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="规格">
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters"
|
||||
:filter-method="filterSpecs"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
</el-table-column>
|
||||
|
|
@ -148,10 +157,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="合格数" prop="合格数">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="不合格数"
|
||||
prop="不合格数"
|
||||
>
|
||||
<el-table-column label="不合格数" prop="不合格数">
|
||||
</el-table-column>
|
||||
<el-table-column label="合格率" prop="合格率">
|
||||
<template #default="scope">
|
||||
|
|
@ -182,25 +188,39 @@
|
|||
:data="tableData6"
|
||||
id="exportDiv6"
|
||||
:height="300"
|
||||
:summary-method="getSummaries2"
|
||||
show-summary
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="物料名"
|
||||
prop="物料名"
|
||||
min-width="100"
|
||||
>
|
||||
<el-table-column label="物料名" prop="物料名" min-width="100"
|
||||
:filters="nameFilters6"
|
||||
:filter-method="filterName6"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="月份"
|
||||
prop="月"
|
||||
v-if="queryType == '年'"
|
||||
>
|
||||
<el-table-column label="物料系列" prop="物料系列" min-width="100"
|
||||
:filters="xilieFilters6"
|
||||
:filter-method="filterXilie6"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="周" prop="周" v-else>
|
||||
<el-table-column label="月份" prop="月" v-if="queryType == '年'"
|
||||
:filters="dateFilters6"
|
||||
:filter-method="filterDate6"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
<el-table-column label="周" prop="周" v-else
|
||||
:filters="dateFilters6"
|
||||
:filter-method="filterDate6"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="规格">
|
||||
<el-table-column label="型号" prop="型号"
|
||||
:filters="modelFilters6"
|
||||
:filter-method="filterModel6"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters6"
|
||||
:filter-method="filterSpecs6"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
</el-table-column>
|
||||
|
|
@ -208,10 +228,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="合格数" prop="合格数">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="不合格数"
|
||||
prop="不合格数"
|
||||
>
|
||||
<el-table-column label="不合格数" prop="不合格数">
|
||||
</el-table-column>
|
||||
<el-table-column label="合格率" prop="合格率">
|
||||
<template #default="scope">
|
||||
|
|
@ -223,44 +240,6 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<el-card shadow="never" style="margin-bottom: 8px">
|
||||
<el-row :gutter="10">
|
||||
<el-col :lg="12">
|
||||
<el-card shadow="never">
|
||||
<div id="bachart4"></div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :lg="12">
|
||||
<el-card shadow="never" style="position: relative">
|
||||
<el-button
|
||||
@click="handleExport('AVG')"
|
||||
class="tables"
|
||||
type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
<el-table
|
||||
:data="tableDataAVG"
|
||||
id="exportDivAVG"
|
||||
:height="300"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="物料名" prop="物料名">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="月份"
|
||||
prop="月"
|
||||
v-if="queryType == '年'"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="周" prop="周" v-else>
|
||||
</el-table-column>
|
||||
<el-table-column label="合格数" prop="count_ok">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
|
|
@ -319,7 +298,19 @@ export default {
|
|||
tableData6: [],
|
||||
tableData7: [],
|
||||
tableData10: [],
|
||||
tableDataAVG: [],
|
||||
nameFilters: [],
|
||||
dateFilters: [],
|
||||
modelFilters: [],
|
||||
specsFilters: [],
|
||||
nameFilters6: [],
|
||||
xilieFilters6: [],
|
||||
dateFilters6: [],
|
||||
modelFilters6: [],
|
||||
specsFilters6: [],
|
||||
nameFilters7: [],
|
||||
dateFilters7: [],
|
||||
modelFilters7: [],
|
||||
specsFilters7: [],
|
||||
firstWeekNum: 1,
|
||||
endWeekNum: 4,
|
||||
monthList: [
|
||||
|
|
@ -346,16 +337,12 @@ export default {
|
|||
let days = new Date(year, month, 0).getDate();
|
||||
that.currentYear = year;
|
||||
that.currentMonth = month;
|
||||
that.firstWeekNum = that.getWeekOfYear(year,month,1);
|
||||
that.endWeekNum = that.getWeekOfYear(year,month,days);
|
||||
month = month < 10 ? "0" + month : month;
|
||||
that.start_date = year + "-" + month + "-01";
|
||||
that.end_date =
|
||||
year + "-" + month + "-" + new Date(year, month, 0).getDate();
|
||||
let month1 = month;
|
||||
if (month1 < 10) {
|
||||
month1 = "0" + month1;
|
||||
}
|
||||
that.queryDate = year + "-" + month1;
|
||||
that.firstWeekNum = that.getWeekOfYear(new Date(that.start_date));
|
||||
that.endWeekNum = that.getWeekOfYear(new Date(that.end_date));
|
||||
that.end_date =year + "-" + month + "-" + days;
|
||||
that.queryDate = year + "-" + month;
|
||||
let duration = that.endWeekNum - that.firstWeekNum + 1;
|
||||
for (let i = 1; i <= duration; i++) {
|
||||
that.xAxisOrigin.push("第" + i + "周");
|
||||
|
|
@ -364,7 +351,6 @@ export default {
|
|||
that.getData6();
|
||||
that.getData7();
|
||||
that.getData10();
|
||||
that.getDataDAVG();
|
||||
},
|
||||
methods: {
|
||||
setChart(name, option = null) {
|
||||
|
|
@ -388,27 +374,22 @@ export default {
|
|||
console.log(value);
|
||||
this.queryDate = "";
|
||||
},
|
||||
getWeekOfYear(date) {
|
||||
var target = new Date(
|
||||
date.getFullYear(),
|
||||
date.getMonth(),
|
||||
date.getDate()
|
||||
); // 创建目标日期对象
|
||||
var firstDayOfYear = new Date(target.getFullYear(), 0, 1); // 创建当前年份第一天的日期对象
|
||||
if (target.getTime() == firstDayOfYear.getTime()) {
|
||||
return 1;
|
||||
} else {
|
||||
return Math.ceil(
|
||||
(target -
|
||||
firstDayOfYear +
|
||||
8 * (firstDayOfYear.getTimezoneOffset() / 480)) /
|
||||
604800000
|
||||
);
|
||||
}
|
||||
// 计算两者之间相隔的周数并返回结果
|
||||
},
|
||||
getWeekOfYear(a,b,c) {
|
||||
var date1 = new Date(a, parseInt(b) - 1, c), //当前日期
|
||||
date2 = new Date(a, 0, 1), //当年第一天
|
||||
// d是当前日期是今年第多少天
|
||||
d = Math.round((date1.valueOf() - date2.valueOf()) / 86400000);
|
||||
// d + 当前年的第一天的周差距的和在除以7就是本年第几周
|
||||
return Math.ceil((d + (date2.getDay() + 1 - 1)) / 7);
|
||||
},
|
||||
getData6() {
|
||||
let that = this;
|
||||
let dateList = [],specsList=[],modelList=[],xilieList=[];
|
||||
that.nameFilters6 = [];
|
||||
that.dateFilters6 = [];
|
||||
that.xilieFilters6 = [];
|
||||
that.modelFilters6 = [];
|
||||
that.specsFilters6 = [];
|
||||
let option = deepCopy(that.basicOption);
|
||||
option.xAxis.data = that.xAxisData;
|
||||
option.title.text = "6车间";
|
||||
|
|
@ -421,31 +402,72 @@ export default {
|
|||
},
|
||||
};
|
||||
that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
|
||||
// console.log('6生产车间统计:',res);
|
||||
let tableData6 = res.data2.ds0 ? res.data2.ds0 : [];
|
||||
that.tableData6 = tableData6;
|
||||
if (tableData6.length > 0) {
|
||||
option.series = [];
|
||||
let seriesData = [],
|
||||
nameList = [];
|
||||
let seriesData = [],nameList = [];
|
||||
tableData6.forEach((ite) => {
|
||||
if (nameList.indexOf(ite.物料名) > -1) {
|
||||
} else {
|
||||
}else {
|
||||
nameList.push(ite.物料名);
|
||||
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 == "月") {
|
||||
tableData6.forEach((item) => {
|
||||
let indexX = nameList.indexOf(item.物料名);
|
||||
let indexY = item.周 - that.firstWeekNum;
|
||||
seriesData[indexX][indexY] = item.合格数;
|
||||
if(seriesData[indexX][indexY]){
|
||||
seriesData[indexX][indexY] += item.合格数;
|
||||
}else{
|
||||
seriesData[indexX][indexY] =0;
|
||||
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 {
|
||||
that.dateFilters6 = [1,2,3,4,5,6,7,8,9,10,11,12];
|
||||
tableData6.forEach((item) => {
|
||||
let indexX = nameList.indexOf(item.物料名);
|
||||
let indexY = item.month - 1;
|
||||
seriesData[indexX][indexY] = item.合格数;
|
||||
if(seriesData[indexX][indexY]){
|
||||
seriesData[indexX][indexY] += item.合格数;
|
||||
}else{
|
||||
seriesData[indexX][indexY] =0;
|
||||
seriesData[indexX][indexY] += item.合格数;
|
||||
}
|
||||
});
|
||||
}
|
||||
for (let n = 0; n < seriesData.length; n++) {
|
||||
|
|
@ -465,6 +487,11 @@ export default {
|
|||
},
|
||||
getData7() {
|
||||
let that = this;
|
||||
let dateList = [],specsList=[],modelList=[];
|
||||
that.nameFilters7 = [];
|
||||
that.dateFilters7 = [];
|
||||
that.modelFilters7 = [];
|
||||
that.specsFilters7 = [];
|
||||
let obj = {
|
||||
query: {
|
||||
start_date: that.start_date,
|
||||
|
|
@ -480,9 +507,7 @@ export default {
|
|||
console.log("7生产车间统计:", res);
|
||||
let tableData7 = res.data2.ds0 ? res.data2.ds0 : [];
|
||||
that.tableData7 = tableData7;
|
||||
debugger;
|
||||
if (tableData7.length > 0) {
|
||||
debugger;
|
||||
option.series = [];
|
||||
let seriesData = [],
|
||||
nameList = [];
|
||||
|
|
@ -491,7 +516,25 @@ export default {
|
|||
} else {
|
||||
nameList.push(ite.物料名);
|
||||
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) => {
|
||||
let indexX = 0,
|
||||
|
|
@ -499,11 +542,24 @@ export default {
|
|||
if (that.queryType == "月") {
|
||||
indexX = nameList.indexOf(item.物料名);
|
||||
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 {
|
||||
that.dateFilters7 = [1,2,3,4,5,6,7,8,9,10,11,12];
|
||||
indexX = nameList.indexOf(item.物料名);
|
||||
indexY = item.月 - 1;
|
||||
}
|
||||
seriesData[indexX][indexY] = item.合格数;
|
||||
if(seriesData[indexX][indexY]){
|
||||
seriesData[indexX][indexY] += item.合格数;
|
||||
}else{
|
||||
seriesData[indexX][indexY] =0;
|
||||
seriesData[indexX][indexY] += item.合格数;
|
||||
}
|
||||
});
|
||||
for (let n = 0; n < seriesData.length; n++) {
|
||||
let obj = {};
|
||||
|
|
@ -522,6 +578,11 @@ export default {
|
|||
},
|
||||
getData10() {
|
||||
let that = this;
|
||||
let dateList = [],specsList=[],modelList=[];
|
||||
that.nameFilters = [];
|
||||
that.dateFilters = [];
|
||||
that.modelFilters = [];
|
||||
that.specsFilters = [];
|
||||
let option = deepCopy(that.basicOption);
|
||||
option.xAxis.data = that.xAxisData;
|
||||
option.title.text = "预制管（10车间）";
|
||||
|
|
@ -534,7 +595,6 @@ export default {
|
|||
};
|
||||
let exec = that.queryType == "月" ? "lineWeek" : "lineMonth";
|
||||
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) {
|
||||
|
|
@ -546,7 +606,25 @@ export default {
|
|||
} else {
|
||||
nameList.push(ite.物料名);
|
||||
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) => {
|
||||
let indexX = 0,
|
||||
|
|
@ -554,11 +632,24 @@ export default {
|
|||
if (that.queryType == "月") {
|
||||
indexX = nameList.indexOf(item.物料名);
|
||||
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 {
|
||||
that.dateFilters = [1,2,3,4,5,6,7,8,9,10,11,12];
|
||||
indexX = nameList.indexOf(item.物料名);
|
||||
indexY = item.月 - 1;
|
||||
}
|
||||
seriesData[indexX][indexY] = item.合格数;
|
||||
if(seriesData[indexX][indexY]){
|
||||
seriesData[indexX][indexY] += item.合格数;
|
||||
}else{
|
||||
seriesData[indexX][indexY] =0;
|
||||
seriesData[indexX][indexY] += item.合格数;
|
||||
}
|
||||
});
|
||||
for (let n = 0; n < seriesData.length; n++) {
|
||||
let obj = {};
|
||||
|
|
@ -575,95 +666,155 @@ export default {
|
|||
}
|
||||
});
|
||||
},
|
||||
getDataDAVG() {
|
||||
let that = this;
|
||||
let option = deepCopy(that.basicOption);
|
||||
option.xAxis.data = that.xAxisData;
|
||||
option.title.text = "AVG";
|
||||
let obj = {
|
||||
query: { start_date: that.start_date, end_date: that.end_date },
|
||||
};
|
||||
let exec = that.queryType == "月" ? "AVGWeek" : "AVGMonth";
|
||||
that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
|
||||
// console.log('AVG统计:',res);
|
||||
let tableDataAVG = res.data2.ds0 ? res.data2.ds0 : [];
|
||||
let seriesData = [];
|
||||
if (tableDataAVG.length > 0) {
|
||||
tableDataAVG.forEach((item) => {
|
||||
let index = 0;
|
||||
if (that.queryType == "月") {
|
||||
index = item.month - 1;
|
||||
} else {
|
||||
index = item.周 - that.firstWeekNum;
|
||||
}
|
||||
seriesData[index] = item.合格数;
|
||||
});
|
||||
let obj = {};
|
||||
obj.name = "AVG";
|
||||
obj.type = "bar";
|
||||
obj.barWidth = "15px";
|
||||
obj.data = seriesData;
|
||||
option.series.push(obj);
|
||||
that.setChart("bachart4", option);
|
||||
} else {
|
||||
that.setChart("bachart4", option);
|
||||
getSummaries({ columns, data }) {
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = "合计";
|
||||
return;
|
||||
}
|
||||
if (index == 5||index == 6||index == 7||index == 8) {
|
||||
const values = data.map((item) =>
|
||||
Number(item[column.property])
|
||||
);
|
||||
if (!values.every((value) => Number.isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr); //Number转换为数值
|
||||
let sum = Number(
|
||||
Number(prev) + Number(curr)
|
||||
).toFixed(2); //toFixed(2)数据项保留两位小数
|
||||
if (!isNaN(value)) {
|
||||
return sum;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
return sums;
|
||||
},
|
||||
getSummaries2({ columns, data }) {
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = "合计";
|
||||
return;
|
||||
}
|
||||
if (index == 6||index == 7||index == 8||index == 9) {
|
||||
const values = data.map((item) =>
|
||||
Number(item[column.property])
|
||||
);
|
||||
if (!values.every((value) => Number.isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr); //Number转换为数值
|
||||
let sum = Number(
|
||||
Number(prev) + Number(curr)
|
||||
).toFixed(2); //toFixed(2)数据项保留两位小数
|
||||
if (!isNaN(value)) {
|
||||
return sum;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
return sums;
|
||||
},
|
||||
handleQuery() {
|
||||
let that = this;
|
||||
if (this.queryType == "月") {
|
||||
if (this.queryDate !== "" && this.queryDate !== null) {
|
||||
this.start_date = this.queryDate + "-01";
|
||||
let arr = this.queryDate.split("-");
|
||||
this.end_date =
|
||||
this.queryDate +
|
||||
"-" +
|
||||
new Date(arr[0], arr[1], 0).getDate();
|
||||
this.firstWeekNum = this.getWeekOfYear(
|
||||
new Date(this.start_date)
|
||||
);
|
||||
this.endWeekNum = this.getWeekOfYear(
|
||||
new Date(this.end_date)
|
||||
);
|
||||
let duration = this.endWeekNum - this.firstWeekNum + 1;
|
||||
if (that.queryType == "月") {
|
||||
if (that.queryDate !== "" && that.queryDate !== null) {
|
||||
let arr = that.queryDate.split("-");
|
||||
let year = arr[0];
|
||||
let month = arr[1];
|
||||
let days = new Date(year, month, 0).getDate();
|
||||
that.start_date = that.queryDate + "-01";
|
||||
that.end_date =that.queryDate +"-" +days;
|
||||
that.firstWeekNum = that.getWeekOfYear(year,month,1);
|
||||
that.endWeekNum = that.getWeekOfYear(year,month,days);
|
||||
let duration = that.endWeekNum - that.firstWeekNum + 1;
|
||||
let xAxisData = [];
|
||||
for (let i = 1; i <= duration; i++) {
|
||||
xAxisData.push("第" + i + "周");
|
||||
}
|
||||
that.xAxisData = xAxisData;
|
||||
} else {
|
||||
this.start_date =
|
||||
this.currentYear + "-" + this.currentMonth + "-01";
|
||||
this.end_date =
|
||||
this.currentYear +
|
||||
"-" +
|
||||
this.currentMonth +
|
||||
"-" +
|
||||
new Date(
|
||||
this.currentYear,
|
||||
this.currentMonth,
|
||||
0
|
||||
).getDate();
|
||||
let date = new Date(this.start_date);
|
||||
this.firstWeekNum = this.getWeekOfYear(date);
|
||||
this.xAxisData = this.xAxisOrigin;
|
||||
that.start_date =that.currentYear + "-" + that.currentMonth + "-01";
|
||||
that.end_date =that.currentYear +"-" +that.currentMonth +"-" +new Date(that.currentYear,that.currentMonth,0).getDate();
|
||||
that.firstWeekNum = that.getWeekOfYear(that.currentYear,that.currentMonth,1);;
|
||||
that.xAxisData = that.xAxisOrigin;
|
||||
}
|
||||
} else {
|
||||
if (this.queryDate !== "" && this.queryDate !== null) {
|
||||
this.start_date = this.queryDate + "-01-01";
|
||||
this.end_date = this.queryDate + "-12-31";
|
||||
if (that.queryDate !== "" && that.queryDate !== null) {
|
||||
that.start_date = that.queryDate + "-01-01";
|
||||
that.end_date = that.queryDate + "-12-31";
|
||||
} else {
|
||||
this.start_date = this.currentYear + "-01-01";
|
||||
this.end_date = this.currentYear + "-12-31";
|
||||
that.start_date = that.currentYear + "-01-01";
|
||||
that.end_date = that.currentYear + "-12-31";
|
||||
}
|
||||
that.xAxisData = that.monthList;
|
||||
}
|
||||
this.getData6();
|
||||
this.getData7();
|
||||
this.getData10();
|
||||
this.getDataDAVG();
|
||||
that.getData6();
|
||||
that.getData7();
|
||||
that.getData10();
|
||||
// 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) {
|
||||
this.exportLoading = true;
|
||||
let id = "#exportDiv" + val;
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<el-row :gutter="10">
|
||||
<el-col :lg="12">
|
||||
<el-card shadow="never">
|
||||
<scEcharts height="300px" :option="option"></scEcharts>
|
||||
<scEcharts id="bachart1" height="300px" :option="option"></scEcharts>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :lg="12">
|
||||
|
|
@ -55,15 +55,19 @@
|
|||
:data="tableData"
|
||||
:height="tableHeight"
|
||||
id="exportDiv"
|
||||
:summary-method="getSummaries"
|
||||
show-summary
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="工段" prop="工段">
|
||||
<el-table-column label="工段" prop="工段"
|
||||
:filters="mgroupFilters"
|
||||
:filter-method="filterMgroup"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="物料名"
|
||||
prop="物料名"
|
||||
min-width="100"
|
||||
>
|
||||
<el-table-column label="物料名" prop="物料名" min-width="100"
|
||||
:filters="nameFilters"
|
||||
:filter-method="filterName"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="任务数" prop="任务数">
|
||||
</el-table-column>
|
||||
|
|
@ -75,12 +79,14 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="完成进度" prop="完成进度">
|
||||
<template #default="scope">
|
||||
{{ Math.round(scope.row.完成进度 * 100) }}%
|
||||
<span v-if="scope.row.完成进度&&scope.row.完成进度>0">{{(scope.row.完成进度).toFixed(2)}}%</span>
|
||||
<span v-else>{{scope.row.完成进度}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="合格率" prop="合格率">
|
||||
<template #default="scope">
|
||||
{{ Math.round(scope.row.合格率 * 100) }}%
|
||||
<span v-if="scope.row.合格率&&scope.row.合格率>0">{{(scope.row.合格率).toFixed(2)}}%</span>
|
||||
<span v-else>{{scope.row.合格率}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -125,33 +131,10 @@ export default {
|
|||
yAxis: {
|
||||
type: "value",
|
||||
},
|
||||
series: [
|
||||
{
|
||||
name: "光纤预制棒",
|
||||
data: [0, 0, 0, 0, 0, 0, 0, 0],
|
||||
type: "bar",
|
||||
label: {
|
||||
show: true,
|
||||
position: "top",
|
||||
formatter: "{c}",
|
||||
color: "rgb(64,158,255)",
|
||||
},
|
||||
barWidth: "15px",
|
||||
},
|
||||
{
|
||||
name: "光纤预制管",
|
||||
data: [0, 0, 0, 0, 0, 0, 0, 0],
|
||||
type: "bar",
|
||||
label: {
|
||||
show: true,
|
||||
position: "top",
|
||||
formatter: "{c}",
|
||||
color: "rgb(64,158,255)",
|
||||
},
|
||||
barWidth: "15px",
|
||||
},
|
||||
],
|
||||
series: [],
|
||||
},
|
||||
nameFilters: [],
|
||||
mgroupFilters: [],
|
||||
processData: [],
|
||||
xAxisData: [],
|
||||
tableData: [],
|
||||
|
|
@ -164,13 +147,14 @@ export default {
|
|||
let month = date.getMonth() + 1;
|
||||
let days = new Date(year, month, 0).getDate();
|
||||
that.currentYear = year;
|
||||
that.currentMonth = month > 9 ? month : "0" + month;
|
||||
that.currentMonth = month;
|
||||
month = month > 9 ? month : "0" + month;
|
||||
that.start_date = year + "-" + month + "-01";
|
||||
that.end_date =
|
||||
year + "-" + month + "-" + new Date(year, month, 0).getDate();
|
||||
let month1 = month > 9 ? month : "0" + month;
|
||||
that.queryDate = year + "-" + month1;
|
||||
that.tableHeight = document.getElementById("elMain").clientHeight - 40;
|
||||
that.end_date =year + "-" + month + "-" + days;
|
||||
that.queryDate = year + "-" + month;
|
||||
let height = document.getElementById("elMain").clientHeight - 40;
|
||||
that.tableHeight = height;
|
||||
document.getElementById('bachart1').style.height = height + 'px';
|
||||
that.getData6();
|
||||
},
|
||||
methods: {
|
||||
|
|
@ -180,6 +164,8 @@ export default {
|
|||
},
|
||||
getData6() {
|
||||
let that = this;
|
||||
that.nameFilters = [];
|
||||
that.mgroupFilters = [];
|
||||
let obj = {
|
||||
query: {
|
||||
start_date: this.start_date,
|
||||
|
|
@ -191,6 +177,7 @@ export default {
|
|||
is_count_utask: -1,
|
||||
select_cols_mgroup: ", mgroup.name AS 工段",
|
||||
group_bys_mgroup: ", mgroup.name",
|
||||
order_bys_mgroup:",工段"
|
||||
},
|
||||
raise_exception: true,
|
||||
};
|
||||
|
|
@ -201,9 +188,7 @@ export default {
|
|||
",EXTRACT ( MONTH FROM mlog.handle_date )";
|
||||
obj.query.order_bys_date = ", 月";
|
||||
}
|
||||
let xAxisData = [],
|
||||
data1 = [],
|
||||
data0 = [];
|
||||
let xAxisData = [],nameData=[],seriesData=[];
|
||||
that.$API.bi.dataset.exec.req("lineWeek", obj).then((res) => {
|
||||
let data = res.data2.ds0;
|
||||
that.tableData = data;
|
||||
|
|
@ -211,19 +196,40 @@ export default {
|
|||
if (xAxisData.indexOf(item.工段) > -1) {
|
||||
} else {
|
||||
xAxisData.push(item.工段);
|
||||
let obj = {};
|
||||
obj.text = item.工段;
|
||||
obj.value = item.工段;
|
||||
that.mgroupFilters.push(obj);
|
||||
}
|
||||
console.log("xAxisData:", xAxisData);
|
||||
let index = xAxisData.indexOf(item.工段);
|
||||
if (item.物料名.indexOf("棒") > -1) {
|
||||
data0[index] = item.合格数;
|
||||
if (nameData.indexOf(item.物料名) > -1) {
|
||||
} else {
|
||||
data1[index] = item.合格数;
|
||||
let obj0 = {};
|
||||
obj0.text = item.物料名;
|
||||
obj0.value = item.物料名;
|
||||
that.nameFilters.push(obj0);
|
||||
nameData.push(item.物料名);
|
||||
let obj = {
|
||||
name:'',
|
||||
type: "bar",
|
||||
label:{
|
||||
show: true,
|
||||
position: "top",
|
||||
formatter: "{c}",
|
||||
color: "rgb(64,158,255)",
|
||||
},
|
||||
barWidth: "15px",
|
||||
data:[0, 0, 0, 0, 0, 0, 0, 0],
|
||||
};
|
||||
obj.name=item.物料名,
|
||||
seriesData.push(obj);
|
||||
}
|
||||
let index = xAxisData.indexOf(item.工段);
|
||||
let indexY = nameData.indexOf(item.物料名);
|
||||
seriesData[indexY].data[index] += item.合格数;
|
||||
});
|
||||
that.xAxisData = xAxisData;
|
||||
that.option.xAxis.data = that.xAxisData;
|
||||
that.option.series[0].data = data0;
|
||||
that.option.series[1].data = data1;
|
||||
that.option.series = seriesData;
|
||||
});
|
||||
},
|
||||
handleQuery() {
|
||||
|
|
@ -231,10 +237,7 @@ export default {
|
|||
if (this.queryType == "月") {
|
||||
this.start_date = this.queryDate + "-01";
|
||||
let arr = this.queryDate.split("-");
|
||||
this.end_date =
|
||||
this.queryDate +
|
||||
"-" +
|
||||
new Date(arr[0], arr[1], 0).getDate();
|
||||
this.end_date =this.queryDate +"-" +new Date(arr[0], arr[1], 0).getDate();
|
||||
} else {
|
||||
this.start_date = this.queryDate + "-01-01";
|
||||
this.end_date = this.queryDate + "-12-31";
|
||||
|
|
@ -260,6 +263,40 @@ export default {
|
|||
}
|
||||
this.getData6();
|
||||
},
|
||||
getSummaries({ columns, data }) {
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = "合计";
|
||||
return;
|
||||
}
|
||||
if (index == 3||index == 4||index == 5||index == 6) {
|
||||
const values = data.map((item) =>
|
||||
Number(item[column.property])
|
||||
);
|
||||
if (!values.every((value) => Number.isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr); //Number转换为数值
|
||||
let sum = Number(
|
||||
Number(prev) + Number(curr)
|
||||
).toFixed(2); //toFixed(2)数据项保留两位小数
|
||||
if (!isNaN(value)) {
|
||||
return sum;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
return sums;
|
||||
},
|
||||
filterName(value, row) {
|
||||
return row.物料名 === value;
|
||||
},
|
||||
filterMgroup(value, row) {
|
||||
return row.工段 === value;
|
||||
},
|
||||
handleExport() {
|
||||
this.exportLoading = true;
|
||||
this.$XLSX("#exportDiv", "工序合格数");
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
<el-card shadow="never" style="margin-bottom: 8px">
|
||||
<el-row :gutter="15">
|
||||
<el-col :lg="8">
|
||||
<scEcharts height="300px" :option="option1"></scEcharts>
|
||||
<scEcharts height="400px" :option="option1"></scEcharts>
|
||||
</el-col>
|
||||
<el-col :lg="16" style="position: relative">
|
||||
<el-button
|
||||
|
|
@ -50,45 +50,39 @@
|
|||
<el-table
|
||||
:data="tableData7"
|
||||
id="exportDiv7"
|
||||
:height="300"
|
||||
:height="400"
|
||||
:summary-method="getSummaries"
|
||||
show-summary
|
||||
>
|
||||
<el-table-column
|
||||
label="年"
|
||||
prop="年"
|
||||
v-if="queryType == '年'"
|
||||
width="60"
|
||||
>
|
||||
<el-table-column label="年" prop="年" v-if="queryType == '年'" width="60">
|
||||
</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 label="物料名" prop="物料名">
|
||||
<el-table-column label="物料名" prop="物料名" width="100"
|
||||
:filters="nameFilters7"
|
||||
:filter-method="filterName7"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
<el-table-column label="型号" prop="型号"
|
||||
:filters="modelFilters7"
|
||||
:filter-method="filterModel7"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="规格">
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters7"
|
||||
:filter-method="filterSpecs7"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="出料数" prop="出料数">
|
||||
<el-table-column label="出料数" prop="生产数">
|
||||
</el-table-column>
|
||||
<el-table-column label="合格数" prop="合格数">
|
||||
</el-table-column>
|
||||
<el-table-column label="合格率" prop="合格率">
|
||||
<template #default="scope">
|
||||
<span
|
||||
>{{
|
||||
Math.round(scope.row.合格率)
|
||||
}}%</span
|
||||
>
|
||||
<span>{{Math.round(scope.row.合格率)}}%</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="不合格原因及数量"
|
||||
align="center"
|
||||
>
|
||||
<el-table-column label="不合格原因及数量" align="center">
|
||||
<el-table-column label="炸纹" prop="炸纹">
|
||||
</el-table-column>
|
||||
<el-table-column label="条纹" prop="条纹">
|
||||
|
|
@ -109,7 +103,7 @@
|
|||
<el-card shadow="never" style="margin-bottom: 8px">
|
||||
<el-row :gutter="15">
|
||||
<el-col :lg="8">
|
||||
<scEcharts height="300px" :option="option2"></scEcharts>
|
||||
<scEcharts height="400px" :option="option2"></scEcharts>
|
||||
</el-col>
|
||||
<el-col :lg="16" style="position: relative">
|
||||
<el-button
|
||||
|
|
@ -121,27 +115,28 @@
|
|||
<el-table
|
||||
:data="tableData10"
|
||||
id="exportDiv10"
|
||||
:height="300"
|
||||
:height="400"
|
||||
:summary-method="getSummaries"
|
||||
show-summary
|
||||
>
|
||||
<el-table-column
|
||||
label="年"
|
||||
prop="年"
|
||||
v-if="queryType == '年'"
|
||||
width="60"
|
||||
>
|
||||
<el-table-column label="年" prop="年" v-if="queryType == '年'" width="60">
|
||||
</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 label="物料名" prop="物料名">
|
||||
<el-table-column label="物料名" prop="物料名" width="100"
|
||||
:filters="nameFilters10"
|
||||
:filter-method="filterName10"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
<el-table-column label="型号" prop="型号"
|
||||
:filters="modelFilters10"
|
||||
:filter-method="filterModel10"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="规格">
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters10"
|
||||
:filter-method="filterSpecs10"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="出料数" prop="生产数">
|
||||
</el-table-column>
|
||||
|
|
@ -149,17 +144,10 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="合格率">
|
||||
<template #default="scope">
|
||||
<span
|
||||
>{{
|
||||
Math.round(scope.row.合格率)
|
||||
}}%</span
|
||||
>
|
||||
<span>{{Math.round(scope.row.合格率)}}%</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="不合格原因及数量"
|
||||
align="center"
|
||||
>
|
||||
<el-table-column label="不合格原因及数量" align="center">
|
||||
<el-table-column label="椭圆/弯曲" prop="弯曲">
|
||||
</el-table-column>
|
||||
<el-table-column label="条纹" prop="条纹">
|
||||
|
|
@ -184,7 +172,7 @@
|
|||
<el-card shadow="never" style="margin-bottom: 8px">
|
||||
<el-row :gutter="15">
|
||||
<el-col :lg="8">
|
||||
<scEcharts height="300px" :option="option3"></scEcharts>
|
||||
<scEcharts height="400px" :option="option3"></scEcharts>
|
||||
</el-col>
|
||||
<el-col :lg="16" style="position: relative">
|
||||
<el-button
|
||||
|
|
@ -196,45 +184,39 @@
|
|||
<el-table
|
||||
:data="tableData8"
|
||||
id="exportDiv8"
|
||||
:height="300"
|
||||
:height="400"
|
||||
:summary-method="getSummaries"
|
||||
show-summary
|
||||
>
|
||||
<el-table-column
|
||||
label="年"
|
||||
prop="年"
|
||||
v-if="queryType == '年'"
|
||||
width="60"
|
||||
>
|
||||
<el-table-column label="年" prop="年" v-if="queryType == '年'" width="60">
|
||||
</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 label="物料名" prop="物料名">
|
||||
<el-table-column label="物料名" prop="物料名" width="100"
|
||||
:filters="nameFilters"
|
||||
:filter-method="filterName"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
<el-table-column label="型号" prop="型号"
|
||||
:filters="modelFilters"
|
||||
:filter-method="filterModel"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="规格">
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters"
|
||||
:filter-method="filterSpecs"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="出料数" prop=" 生产数">
|
||||
<el-table-column label="出料数" prop="生产数">
|
||||
</el-table-column>
|
||||
<el-table-column label="合格数" prop="合格数">
|
||||
</el-table-column>
|
||||
<el-table-column label="合格率">
|
||||
<template #default="scope">
|
||||
<span
|
||||
>{{
|
||||
Math.round(scope.row.合格率)
|
||||
}}%</span
|
||||
>
|
||||
<span>{{Math.round(scope.row.合格率)}}%</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="不合格原因及数量"
|
||||
align="center"
|
||||
>
|
||||
<el-table-column label="不合格原因及数量" align="center">
|
||||
<el-table-column label="椭圆/弯曲" prop="弯曲">
|
||||
</el-table-column>
|
||||
<el-table-column label="条纹" prop="条纹">
|
||||
|
|
@ -249,7 +231,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="气线" prop="气线">
|
||||
</el-table-column>
|
||||
<el-table-column label="相中破" prop="相中破">
|
||||
<el-table-column label="箱中破" prop="箱中破">
|
||||
</el-table-column>
|
||||
<el-table-column label="合计" prop="不合格数">
|
||||
</el-table-column>
|
||||
|
|
@ -301,8 +283,8 @@ export default {
|
|||
series: {
|
||||
name: "7车间预制棒",
|
||||
type: "pie",
|
||||
radius: ["40%", "70%"],
|
||||
center: ["50%", "60%"],
|
||||
radius: ["35%", "65%"],
|
||||
center: ["50%", "55%"],
|
||||
label: {
|
||||
show: true,
|
||||
position: "outside",
|
||||
|
|
@ -330,8 +312,8 @@ export default {
|
|||
series: {
|
||||
name: "10车间预制管",
|
||||
type: "pie",
|
||||
radius: ["40%", "70%"],
|
||||
center: ["50%", "60%"],
|
||||
radius: ["35%", "65%"],
|
||||
center: ["50%", "55%"],
|
||||
label: {
|
||||
show: true,
|
||||
position: "outside",
|
||||
|
|
@ -360,8 +342,8 @@ export default {
|
|||
series: {
|
||||
name: "退火预制管",
|
||||
type: "pie",
|
||||
radius: ["40%", "70%"],
|
||||
center: ["50%", "60%"],
|
||||
radius: ["35%", "65%"],
|
||||
center: ["50%", "55%"],
|
||||
label: {
|
||||
show: true,
|
||||
position: "outside",
|
||||
|
|
@ -383,6 +365,15 @@ export default {
|
|||
tableData7: [],
|
||||
tableData10: [],
|
||||
tableData8: [],
|
||||
nameFilters: [],
|
||||
specsFilters:[],
|
||||
modelFilters:[],
|
||||
nameFilters7: [],
|
||||
specsFilters7:[],
|
||||
modelFilters7:[],
|
||||
nameFilters10: [],
|
||||
specsFilters10:[],
|
||||
modelFilters10:[],
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -396,7 +387,7 @@ export default {
|
|||
this.queryDate = year + "-" + month;
|
||||
this.start_date = year + "-" + month + "-01";
|
||||
this.end_date =
|
||||
year + "-" + month + "-" + new Date(year, month, 0).getDate();
|
||||
year + "-" + month + "-" + days;
|
||||
this.getData();
|
||||
this.getData7();
|
||||
this.getData10();
|
||||
|
|
@ -409,6 +400,10 @@ export default {
|
|||
getData() {
|
||||
let that = this;
|
||||
that.tableData8 = [];
|
||||
that.nameFilters = [];
|
||||
that.modelFilters = [];
|
||||
that.specsFilters = [];
|
||||
let nameList=[],specsList=[],modelList=[];
|
||||
let exec = that.queryType == "月" ? "lineMonth" : "lineYear";
|
||||
let obj = {
|
||||
query: {
|
||||
|
|
@ -419,10 +414,32 @@ export default {
|
|||
},
|
||||
};
|
||||
that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
|
||||
console.log("退火车间统计:", res);
|
||||
if (res.data2.ds0) {
|
||||
let data = res.data2.ds0;
|
||||
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 {
|
||||
that.tableData8 = [];
|
||||
}
|
||||
|
|
@ -442,6 +459,15 @@ export default {
|
|||
that.$API.bi.dataset.exec.req(exec, obj2).then((res2) => {
|
||||
console.log("退火车间统计:", res2);
|
||||
if (res2.data2.ds0) {
|
||||
that.option3.series.data[0].value=0;
|
||||
that.option3.series.data[1].value=0;
|
||||
that.option3.series.data[2].value=0;
|
||||
that.option3.series.data[3].value=0;
|
||||
that.option3.series.data[4].value=0;
|
||||
that.option3.series.data[5].value=0;
|
||||
that.option3.series.data[6].value=0;
|
||||
that.option3.series.data[7].value=0;
|
||||
that.option3.series.data[8].value=0;
|
||||
let data = res2.data2.ds0;
|
||||
if (data.length > 0) {
|
||||
data.forEach((item) => {
|
||||
|
|
@ -462,6 +488,10 @@ export default {
|
|||
getData7() {
|
||||
let that = this;
|
||||
that.tableData7 = [];
|
||||
that.nameFilters7 = [];
|
||||
that.modelFilters7 = [];
|
||||
that.specsFilters7 = [];
|
||||
let nameList=[],specsList=[],modelList=[];
|
||||
let obj = {
|
||||
query: {
|
||||
start_date: this.start_date,
|
||||
|
|
@ -471,10 +501,32 @@ export default {
|
|||
};
|
||||
let exec = that.queryType == "月" ? "lineMonth" : "lineYear";
|
||||
that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
|
||||
console.log("7生产车间统计:", res);
|
||||
if (res.data2.ds0) {
|
||||
let data = res.data2.ds0;
|
||||
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 {
|
||||
that.tableData7 = [];
|
||||
}
|
||||
|
|
@ -493,6 +545,12 @@ export default {
|
|||
that.$API.bi.dataset.exec.req(exec, obj2).then((res2) => {
|
||||
console.log("7生产车间统计:", res2);
|
||||
if (res2.data2.ds0) {
|
||||
that.option1.series.data[0].value=0;
|
||||
that.option1.series.data[1].value=0;
|
||||
that.option1.series.data[2].value=0;
|
||||
that.option1.series.data[3].value=0;
|
||||
that.option1.series.data[4].value=0;
|
||||
that.option1.series.data[5].value=0;
|
||||
let data = res2.data2.ds0;
|
||||
if (data.length > 0) {
|
||||
data.forEach((item) => {
|
||||
|
|
@ -510,6 +568,10 @@ export default {
|
|||
getData10() {
|
||||
let that = this;
|
||||
that.tableData10 = [];
|
||||
that.nameFilters10 = [];
|
||||
that.modelFilters10 = [];
|
||||
that.specsFilters10 = [];
|
||||
let nameList=[],specsList=[],modelList=[];
|
||||
let obj = {
|
||||
query: {
|
||||
start_date: this.start_date,
|
||||
|
|
@ -519,10 +581,32 @@ export default {
|
|||
};
|
||||
let exec = that.queryType == "月" ? "lineMonth" : "lineYear";
|
||||
that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
|
||||
console.log("10生产车间统计:", res);
|
||||
if (res.data2.ds0) {
|
||||
let data = res.data2.ds0;
|
||||
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 {
|
||||
that.tableData10 = [];
|
||||
}
|
||||
|
|
@ -539,9 +623,15 @@ export default {
|
|||
},
|
||||
};
|
||||
that.$API.bi.dataset.exec.req(exec, obj2).then((res2) => {
|
||||
console.log("10生产车间统计:", res2);
|
||||
if (res2.data2.ds0) {
|
||||
let data = res2.data2.ds0;
|
||||
that.option2.series.data[0].value=0;
|
||||
that.option2.series.data[1].value=0;
|
||||
that.option2.series.data[2].value=0;
|
||||
that.option2.series.data[3].value=0;
|
||||
that.option2.series.data[4].value=0;
|
||||
that.option2.series.data[5].value=0;
|
||||
that.option2.series.data[6].value=0;
|
||||
if (data.length > 0) {
|
||||
data.forEach((item) => {
|
||||
that.option2.series.data[0].value += item.合格数;
|
||||
|
|
@ -593,6 +683,61 @@ export default {
|
|||
this.getData7();
|
||||
this.getData10();
|
||||
},
|
||||
getSummaries({ columns, data }) {
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = "合计";
|
||||
return;
|
||||
}
|
||||
if (index == 4||index == 5) {
|
||||
const values = data.map((item) =>
|
||||
Number(item[column.property])
|
||||
);
|
||||
if (!values.every((value) => Number.isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr); //Number转换为数值
|
||||
let sum = Number(
|
||||
Number(prev) + Number(curr)
|
||||
).toFixed(2); //toFixed(2)数据项保留两位小数
|
||||
if (!isNaN(value)) {
|
||||
return sum;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
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) {
|
||||
this.exportLoading = true;
|
||||
let id = "#exportDiv" + val;
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@
|
|||
<el-card shadow="never" style="margin-bottom: 8px;">
|
||||
<el-header>
|
||||
<div class="right-panel">
|
||||
<h2>各工序检验</h2>
|
||||
<el-select v-model="process" clearable @change="processChange">
|
||||
<el-option v-for="item in processOption"
|
||||
<h2>各工段检验</h2>
|
||||
<el-select v-model="mgroup" clearable @change="mgroupChange">
|
||||
<el-option v-for="item in mgroupOption"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
|
|
@ -52,17 +52,26 @@
|
|||
</el-col>
|
||||
<el-col :lg="16" style="position: relative;">
|
||||
<el-button @click="handleExport('1')" class="tables" type="primary">导出</el-button>
|
||||
<el-table :data="tableData" :height="500" id="exportDiv1">
|
||||
<el-table :data="tableData" :height="500" id="exportDiv1" :summary-method="getSummaries" show-summary>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="日期" prop="date">
|
||||
<el-table-column label="日期" prop="date"
|
||||
:filters="dateFilters"
|
||||
:filter-method="filterDate"
|
||||
filter-placement="bottom-end">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.年 }}</span>
|
||||
<span v-if="scope.row.月">-{{ scope.row.月 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="规格">
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters"
|
||||
:filter-method="filterSpecs"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号" prop="型号">
|
||||
<el-table-column label="型号" prop="型号"
|
||||
:filters="modelFilters"
|
||||
:filter-method="filterModel"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="合格数" prop="合格数">
|
||||
</el-table-column>
|
||||
|
|
@ -125,10 +134,13 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
process:'',
|
||||
processName:'',
|
||||
processOption:[],
|
||||
mgroup:'',
|
||||
mgroupName:'',
|
||||
mgroupOption:[],
|
||||
tableData:[],
|
||||
dateFilters:[],
|
||||
specsFilters:[],
|
||||
modelFilters:[],
|
||||
}
|
||||
},
|
||||
mounted(){
|
||||
|
|
@ -141,37 +153,39 @@
|
|||
this.currentYear = year;
|
||||
this.currentMonth = month;
|
||||
this.queryDate = year + '-' + month;
|
||||
// this.start_date =year+'-'+month+'-01';
|
||||
// this.end_date = year+'-'+month+'-'+new Date(year, month, 0).getDate();
|
||||
this.start_date ='2023-01-01';
|
||||
this.end_date = '2023-12-31';
|
||||
this.getProcess();
|
||||
this.start_date =year+'-'+month+'-01';
|
||||
this.end_date = year+'-'+month+'-'+new Date(year, month, 0).getDate();
|
||||
this.getMgroup();
|
||||
},
|
||||
methods:{
|
||||
queryTypeChange(value){
|
||||
console.log(value)
|
||||
this.queryDate = '';
|
||||
},
|
||||
getProcess(){
|
||||
this.$API.mtm.process.list.req({cate:'粗加工',page:0}).then((res) => {
|
||||
this.processOption = res;
|
||||
this.process = res[0].id;
|
||||
this.processName = res[0].name;
|
||||
getMgroup(){
|
||||
this.$API.mtm.mgroup.list.req({belong_dept__name:'6车间',page:0}).then((res) => {
|
||||
this.mgroupOption = res;
|
||||
this.mgroup = res[0].id;
|
||||
this.mgroupName = res[0].name;
|
||||
this.getData();
|
||||
});
|
||||
},
|
||||
processChange() {
|
||||
this.processName = this.processOption.find(item => item.id === this.process).name;
|
||||
mgroupChange() {
|
||||
this.mgroupName = this.mgroupOption.find(item => item.id === this.mgroup).name;
|
||||
this.getData();
|
||||
},
|
||||
getData(){
|
||||
let that = this;
|
||||
that.dateFilters = [];
|
||||
that.modelFilters = [];
|
||||
that.specsFilters = [];
|
||||
let dateList=[],specsList=[],modelList=[];
|
||||
let exec = that.queryType=='月'?'lineMonth':'lineYear';
|
||||
let obj = {
|
||||
query: {
|
||||
end_date: that.end_date,
|
||||
start_date: that.start_date,
|
||||
mgroup_name: that.processName,group_bys_mgroup: ", mgroup.name",
|
||||
mgroup_name: that.mgroupName,group_bys_mgroup: ", mgroup.name",
|
||||
group_bys_material: "",order_bys_material: "",
|
||||
select_cols_mgroup: ", mgroup.name AS 工段",
|
||||
select_cols_material: "",
|
||||
|
|
@ -180,7 +194,6 @@
|
|||
};
|
||||
//获取echarts数据
|
||||
that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
|
||||
console.log('获取echarts数据:', res);
|
||||
if (res.data2.ds0) {
|
||||
let data = res.data2.ds0;
|
||||
let seriesData = [
|
||||
|
|
@ -203,22 +216,48 @@
|
|||
})
|
||||
})
|
||||
}
|
||||
console.log('seriesData:', seriesData);
|
||||
that.option1.series[0].data = seriesData;
|
||||
}
|
||||
});
|
||||
let obj2 = {
|
||||
query: {
|
||||
start_date: that.start_date, end_date: that.end_date,
|
||||
mgroup_name: that.processName,group_bys_mgroup: ", mgroup.name",
|
||||
mgroup_name: that.mgroupName,group_bys_mgroup: ", mgroup.name",
|
||||
select_cols_mgroup: ", mgroup.name AS 工段",
|
||||
is_count_utask: -1
|
||||
},
|
||||
};
|
||||
//获取table数据
|
||||
that.$API.bi.dataset.exec.req(exec, obj2).then((res2) => {
|
||||
console.log('获取table数据:', 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(){
|
||||
|
|
@ -242,6 +281,47 @@
|
|||
}
|
||||
this.getData();
|
||||
},
|
||||
getSummaries({ columns, data }) {
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = "合计";
|
||||
return;
|
||||
}
|
||||
if (index == 4) {
|
||||
const values = data.map((item) =>
|
||||
Number(item[column.property])
|
||||
);
|
||||
if (!values.every((value) => Number.isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr); //Number转换为数值
|
||||
let sum = Number(
|
||||
Number(prev) + Number(curr)
|
||||
).toFixed(2); //toFixed(2)数据项保留两位小数
|
||||
if (!isNaN(value)) {
|
||||
return sum;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
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) {
|
||||
this.exportLoading = true;
|
||||
let id = '#exportDiv' + val;
|
||||
|
|
|
|||
|
|
@ -32,56 +32,59 @@
|
|||
</el-header>
|
||||
<el-main>
|
||||
<scTable
|
||||
v-show="params.type == 10 || params.type == 20"
|
||||
v-if="params.type == 10 || params.type == 20"
|
||||
ref="tables1"
|
||||
:data="tableData1"
|
||||
id="exportDiv1"
|
||||
stripe
|
||||
hideDo
|
||||
hidePagination
|
||||
:summary-method="getSummaries" show-summary
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="物料名" prop="material_name" />
|
||||
<el-table-column label="型号" prop="material_model" />
|
||||
<el-table-column
|
||||
label="规格"
|
||||
prop="material_specification"
|
||||
/>
|
||||
<el-table-column prop="dept_name" label="完成车间" />
|
||||
<el-table-column type="index" width="50"/>
|
||||
<el-table-column label="物料名" prop="material_name"
|
||||
:filters="nameFilters1"
|
||||
:filter-method="filterName1"
|
||||
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" />
|
||||
</scTable>
|
||||
<scTable
|
||||
v-show="
|
||||
params.type == 30 ||
|
||||
params.type == 40 ||
|
||||
params.type == 50 ||
|
||||
params.type == 60 ||
|
||||
params.type == 70
|
||||
"
|
||||
ref="tables1"
|
||||
:apiObj="apiObj"
|
||||
:params="params"
|
||||
id="exportDiv1"
|
||||
v-else
|
||||
ref="tables11"
|
||||
:data="tableData11"
|
||||
id="exportDiv11"
|
||||
stripe
|
||||
hideDo
|
||||
:summary-method="getSummaries2"
|
||||
show-summary
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column
|
||||
label="物料名"
|
||||
prop="name"
|
||||
></el-table-column>
|
||||
<el-table-column label="型号" prop="model">
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="specification">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="库存总数"
|
||||
prop="count_mb"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="周预估值"
|
||||
v-if="params.type == 30"
|
||||
>
|
||||
<el-table-column label="物料名" prop="name"
|
||||
:filters="nameFilters11"
|
||||
: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="周预估值" v-if="params.type == 30">
|
||||
<template #default="scope">
|
||||
<el-input
|
||||
v-model="scope.row.week_esitimate_consume"
|
||||
|
|
@ -89,24 +92,10 @@
|
|||
></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="可用天数"
|
||||
v-if="params.type == 30"
|
||||
>
|
||||
<el-table-column label="可用天数" v-if="params.type == 30">
|
||||
<template #default="scope">
|
||||
<span
|
||||
v-if="
|
||||
scope.row.week_esitimate_consume &&
|
||||
scope.row.week_esitimate_consume !==
|
||||
null
|
||||
"
|
||||
>
|
||||
{{
|
||||
Math.floor(
|
||||
scope.row.count_mb /
|
||||
scope.row.week_esitimate_consume
|
||||
) * 7
|
||||
}}
|
||||
<span v-if="scope.row.week_esitimate_consume &&scope.row.week_esitimate_consume !==null">
|
||||
{{Math.floor(scope.row.count_mb /scope.row.week_esitimate_consume) * 7}}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -169,9 +158,7 @@
|
|||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
<el-button @click="handleExport('2')" type="primary"
|
||||
>导出</el-button
|
||||
>
|
||||
<el-button @click="handleExport('2')" type="primary">导出</el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main>
|
||||
|
|
@ -182,71 +169,44 @@
|
|||
stripe
|
||||
hideDo
|
||||
hidePagination
|
||||
:summary-method="getSummaries"
|
||||
show-summary
|
||||
>
|
||||
<el-table-column
|
||||
label="物料名"
|
||||
prop="物料名"
|
||||
<el-table-column label="物料名" prop="物料名"
|
||||
:filters="nameFilters2"
|
||||
: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="型号"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="规格"
|
||||
prop="规格"
|
||||
<el-table-column label="规格" prop="规格"
|
||||
:filters="specsFilters2"
|
||||
:filter-method="filterSpecs2"
|
||||
filter-placement="bottom-end"
|
||||
></el-table-column>
|
||||
<el-table-column label="出入库类型">
|
||||
<span>{{ mio_type_name }}</span>
|
||||
</el-table-column>
|
||||
<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="执行车间"
|
||||
: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')">
|
||||
<el-table-column label="月入库总数" prop="数量"></el-table-column>
|
||||
</template>
|
||||
<template
|
||||
v-if="
|
||||
queryType == '月' &&
|
||||
(query.mio_type == 'do_out' ||
|
||||
query.mio_type == 'sale_out' ||
|
||||
query.mio_type == 'other_out')
|
||||
"
|
||||
>
|
||||
<template v-if="queryType == '月' &&(query.mio_type == 'do_out' ||query.mio_type == 'sale_out' ||query.mio_type == 'other_out')">
|
||||
<el-table-column label="月出库数量" prop="数量">
|
||||
</el-table-column>
|
||||
</template>
|
||||
<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>
|
||||
<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>
|
||||
</template>
|
||||
<template
|
||||
v-if="
|
||||
queryType == '年' &&
|
||||
(query.mio_type == 'do_out' ||
|
||||
query.mio_type == 'sale_out' ||
|
||||
query.mio_type == 'other_out')
|
||||
"
|
||||
>
|
||||
<el-table-column
|
||||
label="年出库总数"
|
||||
prop="数量"
|
||||
></el-table-column>
|
||||
<template v-if="queryType == '年' &&(query.mio_type == 'do_out'||query.mio_type == 'sale_out'||query.mio_type == 'other_out')">
|
||||
<el-table-column label="年出库总数" prop="数量"></el-table-column>
|
||||
</template>
|
||||
</scTable>
|
||||
</el-main>
|
||||
|
|
@ -280,6 +240,18 @@ export default {
|
|||
currentLastDay: "",
|
||||
tableData: [],
|
||||
tableData1: [],
|
||||
tableData11: [],
|
||||
nameFilters1: [],
|
||||
deptFilters1: [],
|
||||
modelFilters1: [],
|
||||
specsFilters1: [],
|
||||
nameFilters11: [],
|
||||
modelFilters11: [],
|
||||
specsFilters11: [],
|
||||
nameFilters2: [],
|
||||
deptFilters2: [],
|
||||
modelFilters2: [],
|
||||
specsFilters2: [],
|
||||
typeOptions: ["月", "年"],
|
||||
materialTypeOptions: [
|
||||
{ id: 10, name: "成品" },
|
||||
|
|
@ -301,51 +273,125 @@ export default {
|
|||
that.currentLastDay = lastDay;
|
||||
that.queryDate = that.currentYear + "-" + that.currentMonth;
|
||||
that.start_date = that.currentYear + "-" + that.currentMonth + "-01";
|
||||
that.end_date =
|
||||
that.currentYear + "-" + that.currentMonth + "-" + lastDay;
|
||||
that.end_date = that.currentYear + "-" + that.currentMonth + "-" + lastDay;
|
||||
that.getTableData();
|
||||
console.log(that.mio_type_name);
|
||||
this.materialTypeChange();
|
||||
that.getTableData1();
|
||||
},
|
||||
methods: {
|
||||
queryTypeChnge() {
|
||||
this.query.queryDate = "";
|
||||
},
|
||||
materialTypeChange() {
|
||||
getTableData1() {
|
||||
let that = this;
|
||||
that.tableData1 = [];
|
||||
if (that.params.type == 10 || that.params.type == 20) {
|
||||
let obj = {
|
||||
query: {
|
||||
material_types: that.params.type,
|
||||
},
|
||||
};
|
||||
that.$API.bi.dataset.exec
|
||||
.req("materialCount", obj)
|
||||
.then((res) => {
|
||||
if (res.data2.ds0) {
|
||||
that.tableData1 = res.data2.ds0;
|
||||
that.nameFilters1 = [];
|
||||
that.deptFilters1 = [];
|
||||
that.modelFilters1 = [];
|
||||
that.specsFilters1 = [];
|
||||
let nameList=[],deptList = [],specsList=[],modelList=[];
|
||||
let obj = {
|
||||
query: {
|
||||
material_types: that.params.type,
|
||||
},
|
||||
};
|
||||
that.$API.bi.dataset.exec.req("materialCount", obj).then((res) => {
|
||||
if (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);
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
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);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
that.$refs.tables1.refresh();
|
||||
}
|
||||
});
|
||||
},
|
||||
materialTypeChange(){
|
||||
let that = this;
|
||||
if(that.params.type == 10 || that.params.type == 20){
|
||||
that.getTableData1();
|
||||
}else{
|
||||
that.getTableData11();
|
||||
}
|
||||
},
|
||||
//更改周预估用量
|
||||
weekcountChange(row) {
|
||||
let obj = {
|
||||
week_esitimate_consume: row.week_esitimate_consume,
|
||||
};
|
||||
this.$API.mtm.material.setWeekConsume
|
||||
.req(row.id, obj)
|
||||
.then((res) => {
|
||||
console.log(res);
|
||||
this.$refs.tables1.refresh();
|
||||
});
|
||||
let obj = {week_esitimate_consume: row.week_esitimate_consume};
|
||||
this.$API.mtm.material.setWeekConsume.req(row.id, obj).then((res) => {
|
||||
this.$refs.tables1.refresh();
|
||||
});
|
||||
},
|
||||
//获取表格数据
|
||||
getTableData() {
|
||||
let that = this;
|
||||
that.nameFilters2 = [];
|
||||
that.deptFilters2 = [];
|
||||
that.modelFilters2 = [];
|
||||
that.specsFilters2 = [];
|
||||
let nameList=[],deptList = [],specsList=[],modelList=[];
|
||||
let exec = that.queryType == "月" ? "saleOutMonth" : "saleOutYear";
|
||||
let obj = {
|
||||
query: {
|
||||
|
|
@ -358,6 +404,38 @@ export default {
|
|||
if (res.data2.ds0) {
|
||||
let data = res.data2.ds0;
|
||||
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);
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
|
|
@ -367,7 +445,6 @@ export default {
|
|||
this.mio_type_name = this.mioTypeEnum.values[key].text;
|
||||
}
|
||||
}
|
||||
console.log(this.mio_type_name);
|
||||
this.getTableData();
|
||||
},
|
||||
handleQuery() {
|
||||
|
|
@ -401,6 +478,92 @@ export default {
|
|||
}
|
||||
this.getTableData();
|
||||
},
|
||||
getSummaries({ columns, data }) {
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = "合计";
|
||||
return;
|
||||
}
|
||||
if (index == 5) {
|
||||
const values = data.map((item) =>
|
||||
Number(item[column.property])
|
||||
);
|
||||
if (!values.every((value) => Number.isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr);
|
||||
let sum = Number(Number(prev) + Number(curr)).toFixed(2);
|
||||
if (!isNaN(value)) {
|
||||
return sum;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
return sums;
|
||||
},
|
||||
getSummaries2({ columns, data }) {
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = "合计";
|
||||
return;
|
||||
}
|
||||
if (index == 4) {
|
||||
const values = data.map((item) =>
|
||||
Number(item[column.property])
|
||||
);
|
||||
if (!values.every((value) => Number.isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr);
|
||||
let sum = Number(Number(prev) + Number(curr)).toFixed(2);
|
||||
if (!isNaN(value)) {
|
||||
return sum;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
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) {
|
||||
this.exportLoading = true;
|
||||
let id = "#exportDiv" + val;
|
||||
|
|
|
|||
|
|
@ -55,16 +55,24 @@
|
|||
id="exportDiv"
|
||||
style="width: 100%"
|
||||
:height="chartHeight"
|
||||
:summary-method="getSummaries"
|
||||
show-summary
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="日期" prop="date">
|
||||
<el-table-column label="日期" prop="date" width="90">
|
||||
<template #default="scope">
|
||||
{{ scope.row.年 }}-{{ scope.row.月 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作人" prop="操作人">
|
||||
<el-table-column label="操作人" prop="操作人" width="90"
|
||||
:filters="userFilters"
|
||||
:filter-method="filterUser"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="工段" prop="工段">
|
||||
<el-table-column label="工段" prop="工段" width="80"
|
||||
:filters="mgroupFilters"
|
||||
:filter-method="filterMgroup"
|
||||
filter-placement="bottom-end">
|
||||
</el-table-column>
|
||||
<el-table-column label="车间">
|
||||
{{ queryBelongDept }}
|
||||
|
|
@ -105,6 +113,9 @@ export default {
|
|||
currentMonth: "",
|
||||
deptData: [],
|
||||
tableData: [],
|
||||
dateFilters:[],
|
||||
userFilters:[],
|
||||
mgroupFilters:[],
|
||||
option: {
|
||||
title: {
|
||||
text: "人员统计",
|
||||
|
|
@ -144,28 +155,30 @@ export default {
|
|||
this.currentYear = year;
|
||||
this.currentMonth = month;
|
||||
this.start_date = year + "-" + month + "-01";
|
||||
this.end_date =
|
||||
year + "-" + month + "-" + new Date(year, month, 0).getDate();
|
||||
this.end_date =year + "-" + month + "-" + days;
|
||||
month = month < 10 ? "0" + month : month;
|
||||
this.queryDate = year + "-" + month;
|
||||
this.getData();
|
||||
this.getDept();
|
||||
let mainHeight = document.getElementById("elMain").clientHeight;
|
||||
this.chartHeight = mainHeight - 40 + "px";
|
||||
},
|
||||
methods: {
|
||||
getDept() {
|
||||
this.$API.system.dept.list
|
||||
.req({ page: 0, type: "dept" })
|
||||
.then((res) => {
|
||||
this.deptData = res;
|
||||
this.queryBelongDept = res[0].name;
|
||||
});
|
||||
let that = this;
|
||||
this.$API.system.dept.list.req({ page: 0, type: "dept" }).then((res) => {
|
||||
that.deptData = res;
|
||||
that.queryBelongDept = res[0].name;
|
||||
that.getData();
|
||||
});
|
||||
},
|
||||
queryTypeChange(value) {
|
||||
this.queryDate = "";
|
||||
},
|
||||
getData() {
|
||||
let that = this;
|
||||
that.userFilters = [];
|
||||
that.mgroupFilters = [];
|
||||
let userList=[],mgroupList=[];
|
||||
let obj = {
|
||||
query: {
|
||||
start_date: this.start_date,
|
||||
|
|
@ -174,17 +187,27 @@ export default {
|
|||
},
|
||||
};
|
||||
that.$API.bi.dataset.exec.req("performance", obj).then((res) => {
|
||||
console.log("绩效统计:", res);
|
||||
let data = res.data2.ds0;
|
||||
let seriesData = [],
|
||||
yAxisData = [];
|
||||
data.forEach((item) => {
|
||||
seriesData.push(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.option.yAxis.data = yAxisData;
|
||||
that.option.series.data = seriesData;
|
||||
|
|
@ -211,6 +234,40 @@ export default {
|
|||
console.log("查询query", this.start_date, this.end_date);
|
||||
this.getData();
|
||||
},
|
||||
getSummaries({ columns, data }) {
|
||||
const sums = [];
|
||||
columns.forEach((column, index) => {
|
||||
if (index === 0) {
|
||||
sums[index] = "合计";
|
||||
return;
|
||||
}
|
||||
if (index == 5||index == 6||index == 7) {
|
||||
const values = data.map((item) =>
|
||||
Number(item[column.property])
|
||||
);
|
||||
if (!values.every((value) => Number.isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr); //Number转换为数值
|
||||
let sum = Number(
|
||||
Number(prev) + Number(curr)
|
||||
).toFixed(2); //toFixed(2)数据项保留两位小数
|
||||
if (!isNaN(value)) {
|
||||
return sum;
|
||||
} else {
|
||||
return prev;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
return sums;
|
||||
},
|
||||
filterUser(value, row) {
|
||||
return row.操作人 === value;
|
||||
},
|
||||
filterMgroup(value, row) {
|
||||
return row.工段 === value;
|
||||
},
|
||||
handleExport() {
|
||||
this.exportLoading = true;
|
||||
this.$XLSX("#exportDiv", "人员统计");
|
||||
|
|
|
|||
Loading…
Reference in New Issue