fix:统计添加Column筛选

This commit is contained in:
shijing 2025-05-26 11:26:38 +08:00
parent 60ee27cb44
commit be38399cde
10 changed files with 110 additions and 348 deletions

View File

@ -28,15 +28,15 @@
<el-button @click="handleExport('1')" class="tables" type="primary">导出</el-button>
<el-table :data="dataList" id="exportDiv1" :height="tableHeight" :summary-method="getSummaries" show-summary>
<el-table-column type="index" width="50" />
<el-table-column label="物料名" prop="物料名">
<el-table-column label="物料名" prop="物料名" sortable>
</el-table-column>
<el-table-column label="月份" prop="月" v-if="queryType == '年'">
<el-table-column label="月份" prop="月" v-if="queryType == ''" sortable>
</el-table-column>
<el-table-column label="周" prop="周" v-else>
<el-table-column label="周" prop="周" v-else sortable>
</el-table-column>
<el-table-column label="规格" prop="规格">
<el-table-column label="规格" prop="规格" sortable>
</el-table-column>
<el-table-column label="型号" prop="型号">
<el-table-column label="型号" prop="型号" sortable>
</el-table-column>
<el-table-column label="桶数" prop="合格数">
</el-table-column>

View File

@ -98,28 +98,14 @@
: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="周" sortable/>
<el-table-column v-else width="60" label="月份" prop="月" sortable/>
<el-table-column label="名称" prop="物料名" sortable>
</el-table-column>
<el-table-column label="规格" prop="规格">
<el-table-column label="规格" prop="规格" sortable>
</el-table-column>
<el-table-column label="型号" prop="型号">
<el-table-column label="型号" prop="型号" sortable>
</el-table-column>
<el-table-column label="数量" prop="数量">
</el-table-column>
@ -153,28 +139,14 @@
: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="周" sortable/>
<el-table-column v-else width="70" label="月份" prop="月" sortable/>
<el-table-column label="名称" prop="物料名" sortable>
</el-table-column>
<el-table-column label="规格" prop="规格">
<el-table-column label="规格" prop="规格" sortable>
</el-table-column>
<el-table-column label="型号" prop="型号">
<el-table-column label="型号" prop="型号" sortable>
</el-table-column>
<el-table-column label="数量" prop="数量">
</el-table-column>

View File

@ -62,14 +62,7 @@
<el-col>
<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"
@ -84,28 +77,14 @@
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="周" sortable/>
<el-table-column v-else width="60" label="月份" prop="月" sortable/>
<el-table-column label="名称" prop="物料名" sortable>
</el-table-column>
<el-table-column label="规格" prop="规格">
<el-table-column label="规格" prop="规格" sortable>
</el-table-column>
<el-table-column label="型号" prop="型号">
<el-table-column label="型号" prop="型号" sortable>
</el-table-column>
<el-table-column label="数量" prop="数量">
</el-table-column>
@ -140,28 +119,14 @@
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="周" sortable/>
<el-table-column v-else width="70" label="月份" prop="月" sortable/>
<el-table-column label="名称" prop="物料名" sortable>
</el-table-column>
<el-table-column label="规格" prop="规格">
<el-table-column label="规格" prop="规格" sortable>
</el-table-column>
<el-table-column label="型号" prop="型号">
<el-table-column label="型号" prop="型号" sortable>
</el-table-column>
<el-table-column label="数量" prop="数量">
</el-table-column>

View File

@ -60,29 +60,15 @@
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" sortable>
</el-table-column>
<el-table-column
label="月份"
prop="月"
v-if="queryType == '年'"
width="50"
>
<el-table-column label="月份" prop="月" v-if="queryType == ''" width="60" sortable>
</el-table-column>
<el-table-column
label="周"
prop="周"
v-else
width="50"
>
<el-table-column label="周" prop="周" v-else width="60" sortable>
</el-table-column>
<el-table-column label="型号" prop="型号">
<el-table-column label="型号" prop="型号" sortable>
</el-table-column>
<el-table-column label="规格" prop="规格">
<el-table-column label="规格" prop="规格" sortable>
</el-table-column>
<el-table-column label="任务数" prop="任务数">
</el-table-column>
@ -90,10 +76,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">
@ -128,23 +111,15 @@
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" sortable>
</el-table-column>
<el-table-column
label="月份"
prop="月"
v-if="queryType == '年'"
>
<el-table-column label="月份" prop="月" v-if="queryType == ''" width="60" sortable>
</el-table-column>
<el-table-column label="周" prop="周" v-else>
<el-table-column label="周" prop="周" v-else width="60" sortable>
</el-table-column>
<el-table-column label="型号" prop="型号">
<el-table-column label="型号" prop="型号" sortable>
</el-table-column>
<el-table-column label="规格" prop="规格">
<el-table-column label="规格" prop="规格" sortable>
</el-table-column>
<el-table-column label="任务数" prop="任务数">
</el-table-column>
@ -152,10 +127,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">
@ -190,28 +162,17 @@
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" sortable>
</el-table-column>
<el-table-column
label="物料系列"
prop="物料系列"
>
<el-table-column label="物料系列" prop="物料系列" min-width="100" sortable>
</el-table-column>
<el-table-column
label="月份"
prop="月"
v-if="queryType == '年'"
>
<el-table-column label="月份" prop="月" sortable v-if="queryType == '年'">
</el-table-column>
<el-table-column label="周" prop="周" v-else>
<el-table-column label="周" prop="周" v-else sortable>
</el-table-column>
<el-table-column label="型号" prop="型号">
<el-table-column label="型号" prop="型号" sortable>
</el-table-column>
<el-table-column label="规格" prop="规格">
<el-table-column label="规格" prop="规格" sortable>
</el-table-column>
<el-table-column label="任务数" prop="任务数">
</el-table-column>
@ -219,10 +180,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">

View File

@ -59,13 +59,9 @@
show-summary
>
<el-table-column type="index" width="50" />
<el-table-column label="工段" prop="工段">
<el-table-column label="工段" prop="工段" sortable>
</el-table-column>
<el-table-column
label="物料名"
prop="物料名"
min-width="100"
>
<el-table-column label="物料名" prop="物料名" min-width="100" sortable>
</el-table-column>
<el-table-column label="任务数" prop="任务数">
</el-table-column>

View File

@ -54,25 +54,15 @@
: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" sortable>
</el-table-column>
<el-table-column label="型号" prop="型号">
<el-table-column label="型号" prop="型号" sortable>
</el-table-column>
<el-table-column label="规格" prop="规格">
<el-table-column label="规格" prop="规格" sortable>
</el-table-column>
<el-table-column label="出料数" prop="生产数">
</el-table-column>
@ -83,10 +73,7 @@
<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="条纹">
@ -123,25 +110,15 @@
: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" sortable>
</el-table-column>
<el-table-column label="型号" prop="型号">
<el-table-column label="型号" prop="型号" sortable>
</el-table-column>
<el-table-column label="规格" prop="规格">
<el-table-column label="规格" prop="规格" sortable>
</el-table-column>
<el-table-column label="出料数" prop="生产数">
</el-table-column>
@ -152,10 +129,7 @@
<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="条纹">
@ -196,25 +170,15 @@
: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" sortable>
</el-table-column>
<el-table-column label="型号" prop="型号">
<el-table-column label="型号" prop="型号" sortable>
</el-table-column>
<el-table-column label="规格" prop="规格">
<el-table-column label="规格" prop="规格" sortable>
</el-table-column>
<el-table-column label="出料数" prop="生产数">
</el-table-column>
@ -225,10 +189,7 @@
<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="条纹">

View File

@ -54,15 +54,15 @@
<el-button @click="handleExport('1')" class="tables" type="primary">导出</el-button>
<el-table :data="tableData" :height="500" id="exportDiv1" :summary-method="getSummaries" show-summary>
<el-table-column type="index" width="50" />
<el-table-column label="日期" prop="date">
<el-table-column label="日期" prop="date" sortable>
<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="规格" sortable>
</el-table-column>
<el-table-column label="型号" prop="型号">
<el-table-column label="型号" prop="型号" sortable>
</el-table-column>
<el-table-column label="合格数" prop="合格数">
</el-table-column>

View File

@ -42,13 +42,10 @@
: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 label="物料名" prop="material_name" sortable/>
<el-table-column label="型号" prop="material_model" sortable/>
<el-table-column label="规格" prop="material_specification" sortable/>
<el-table-column prop="dept_name" label="完成车间" sortable/>
<el-table-column label="库存总数" prop="count" />
</scTable>
<scTable
@ -69,22 +66,11 @@
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" sortable/>
<el-table-column label="型号" prop="model" sortable/>
<el-table-column label="规格" prop="specification" sortable/>
<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"
@ -92,24 +78,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>
@ -172,9 +144,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>
@ -188,71 +158,25 @@
:summary-method="getSummaries"
show-summary
>
<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-column label="物料名" prop="物料名" sortable></el-table-column>
<el-table-column label="型号" prop="型号" sortable></el-table-column>
<el-table-column label="规格" prop="规格" sortable></el-table-column>
<el-table-column label="出入库类型">
<span>{{ mio_type_name }}</span>
</el-table-column>
<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>
<el-table-column label="执行车间" prop="执行车间" sortable></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>

View File

@ -71,11 +71,7 @@
show-summary
>
<el-table-column type="index" width="50" />
<el-table-column
label="任务编号"
prop="number"
min-width="100px"
>
<el-table-column label="任务编号" prop="number" min-width="100px" sortable>
</el-table-column>
<el-table-column label="计划数" prop="count">
</el-table-column>
@ -102,11 +98,7 @@
show-summary
>
<el-table-column type="index" width="50" />
<el-table-column
label="任务编号"
prop="number"
min-width="100px"
>
<el-table-column label="任务编号" prop="number" min-width="100px" sortable>
</el-table-column>
<el-table-column label="计划数" prop="count">
</el-table-column>
@ -133,11 +125,7 @@
show-summary
>
<el-table-column type="index" width="50" />
<el-table-column
label="任务编号"
prop="number"
min-width="100px"
>
<el-table-column label="任务编号" prop="number" min-width="100px" sortable>
</el-table-column>
<el-table-column label="计划数" prop="count">
</el-table-column>
@ -184,8 +172,8 @@ export default {
series: {
name: "7车间完成率",
type: "pie",
radius: ["40%", "70%"],
center: ["50%", "60%"],
radius: ["35%", "65%"],
center: ["50%", "58%"],
label: {
show: true,
position: "outside",
@ -200,7 +188,6 @@ export default {
option2: {
title: {
text: "10车间完成率",
// subtext: '',
},
tooltip: {
trigger: "item",
@ -213,8 +200,8 @@ export default {
series: {
name: "10车间完成率",
type: "pie",
radius: ["40%", "70%"],
center: ["50%", "60%"],
radius: ["35%", "65%"],
center: ["50%", "58%"],
label: {
show: true,
position: "outside",
@ -241,8 +228,8 @@ export default {
series: {
name: "6车间完成率",
type: "pie",
radius: ["40%", "70%"],
center: ["50%", "60%"],
radius: ["35%", "65%"],
center: ["50%", "58%"],
label: {
show: true,
position: "outside",
@ -282,8 +269,7 @@ export default {
this.currentYear = year;
this.currentMonth = month > 9 ? month : "0" + month;
this.start_date = year + "-" + month + "-01";
this.end_date =
year + "-" + month + "-" + new Date(year, month, 0).getDate();
this.end_date = year + "-" + month + "-" + days;
let month1 = month > 9 ? month : "0" + month;
this.queryDate = year + "-" + month1;
let height = document.getElementById("elMain").clientHeight - 40;

View File

@ -59,14 +59,14 @@
show-summary
>
<el-table-column type="index" width="50" />
<el-table-column label="日期" prop="date">
<el-table-column label="日期" prop="date" width="90" sortable>
<template #default="scope">
{{ scope.row. }}-{{ scope.row. }}
</template>
</el-table-column>
<el-table-column label="操作人" prop="操作人">
<el-table-column label="操作人" prop="操作人" width="90" sortable>
</el-table-column>
<el-table-column label="工段" prop="工段">
<el-table-column label="工段" prop="工段" width="80" sortable>
</el-table-column>
<el-table-column label="车间">
{{ queryBelongDept }}