zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:棒管综合统计调整

This commit is contained in:
shijing 2025-07-15 15:17:21 +08:00
parent 0113d7a9ef
commit eacbfea375
2 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/views/statistics/statistics_bang.vue
View File

@ -43,7 +43,7 @@
ref="table"
:apiObj="apiObj"
:params="params"
:query="query"
:query="params"
id="exportDiv"
stripe
>
@ -459,6 +459,11 @@
<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count }}</span>
</template>
</el-table-column>
<el-table-column label="合格率" class-name="colorheader5">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_合格率 }}</span>
</template>
</el-table-column>
<el-table-column label="不合格数" class-name="colorheader5">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_count_notok }}</span>
@ -489,11 +494,6 @@
<span v-if="scope.row.data">{{ getCountQt(scope.row.data,'六车间生产入库') }}</span>
</template>
</el-table-column>
<el-table-column label="合格率" class-name="colorheader5">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_合格率 }}</span>
</template>
</el-table-column>
<el-table-column label="日期" class-name="colorheader5" min-width="160">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间生产入库_检验日期 }}</span>
@ -505,6 +505,11 @@
</template>
</el-table-column>
</el-table-column>
<el-table-column label="发货检验数" class-name="colorheader6">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.销售发货_count }}</span>
</template>
</el-table-column>
<el-table-column label="6号领取加工-发货合格率" class-name="colorheader6">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.六车间_批次发货合格率 }}</span>
@ -529,16 +534,15 @@ export default {
data() {
return {
params: {
ordering:'-last_time,-first_time',
material_start__cate:'棒',
last_time_isnull:false,
ordering:'-data__棒料成型_小日期',
querys : [[{field:"data__has_key",compare:"",value:"棒料成型_日期"}]]
},
query:{
batch__contains:'',
last_time__gte:'',
last_time__lte:'',
},
apiObj: this.$API.wpm.batchst,
apiObj: this.$API.wpm.batchstquery,
options:[],
tableData:[],
};
@ -546,33 +550,25 @@ export default {
methods: {
handleQuery(){
let that = this;
let querys = [],arr1=[],arr2=[];
let querys = [[{field:"data__has_key",compare:"",value:"棒料成型_日期"}],];
let obj = {},obj1 = {},obj2 = {};
obj.field = 'batch__contains';
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time__gte';
obj1.field = 'last_time';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time__gte';
obj2.value = that.query.last_time__gte;
obj2.compare = 'gte';
if((that.query.last_time__gte==''||that.query.last_time__gte==null)&&(that.query.last_time__lte==''||that.query.last_time__lte==null)&&that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys.push(obj);
obj2.field = 'last_time';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys[0].push(obj);
}
if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){
arr1.push(obj1);
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
arr1.push(obj);
}
querys.push(arr1)
querys[0].push(obj1);
}
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
arr2.push(obj2);
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
arr2.push(obj);
}
querys.push(arr2)
querys[0].push(obj2);
}
let params = {};
params.querys = querys;

39
src/views/statistics/statistics_guan.vue
View File

@ -43,7 +43,7 @@
ref="table"
:apiObj="apiObj"
:params="params"
:query="query"
:query="params"
id="exportDiv"
stripe
>
@ -129,12 +129,12 @@
</el-table-column>
<el-table-column label="合格数" class-name="colorheader2">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.十车间入库_抽检合格数 }}</span>
<span v-if="scope.row.data">{{ scope.row.data.十车间入库_合格数 }}</span>
</template>
</el-table-column>
<el-table-column label="合格率" class-name="colorheader2">
<template #default="scope">
<span v-if="scope.row.data">{{ scope.row.data.十车间入库_抽检合格率 }}</span>
<span v-if="scope.row.data">{{ scope.row.data.十车间入库_合格率 }}</span>
</template>
</el-table-column>
<el-table-column label="不合格数" class-name="colorheader2">
@ -591,9 +591,8 @@ export default {
data() {
return {
params: {
ordering:'-last_time',
material_start__cate:'管',
last_time_isnull:false,
ordering:'-data__管料成型_小日期',
querys : [[{field:"data__has_key",compare:"",value:"管料成型_日期"}]]
},
query:{
batch__contains:'',
@ -601,7 +600,7 @@ export default {
last_time__lte:'',
},
apiObj: this.$API.wpm.batchst,
apiObj: this.$API.wpm.batchstquery,
options:[],
tableData:[],
};
@ -609,33 +608,25 @@ export default {
methods: {
handleQuery(){
let that = this;
let querys = [],arr1=[],arr2=[];
let querys = [[{field:"data__has_key",compare:"",value:"管料成型_日期"}]];
let obj = {},obj1 = {},obj2 = {};
obj.field = 'batch__contains';
obj.value = that.query.batch__contains;
obj.compare = '';
obj1.field = 'last_time__gte';
obj1.field = 'last_time';
obj1.value = that.query.last_time__gte;
obj1.compare = 'gte';
obj2.field = 'last_time__gte';
obj2.value = that.query.last_time__gte;
obj2.compare = 'gte';
if((that.query.last_time__gte==''||that.query.last_time__gte==null)&&(that.query.last_time__lte==''||that.query.last_time__lte==null)&&that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys.push(obj);
obj2.field = 'last_time';
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys[0].push(obj);
}
if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){
arr1.push(obj1);
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
arr1.push(obj);
}
querys.push(arr1)
querys[0].push(obj1);
}
if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
arr2.push(obj2);
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
arr2.push(obj);
}
querys.push(arr2)
querys[0].push(obj2);
}
let params = {};
params.querys = querys;