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

fix:洁净车间加原料统计表

This commit is contained in:
shijing 2026-08-05 13:29:09 +08:00
parent f5d73eb46c
commit 65df17fe05
1 changed files with 129 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
src/views/statistics/bxerp/workHoursJJ.vue
View File

@ -33,7 +33,49 @@
:label="tab" :label="tab"
style="height: 100%;" style="height: 100%;"
> >
<el-container v-if="query.mgroup_name === tab"> <el-container v-if="query.mgroup_name === tab && tab === '原料统计'">
<el-main>
<scTable
ref="tableRawMaterial"
:data="rawMaterialData"
row-key="产品编号"
hidePagination
hideDo
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品编号" prop="产品编号" align="center" min-width="110"/>
<el-table-column label="原料编号" prop="原料编号" align="center" min-width="110"/>
<el-table-column label="棒日期" prop="棒编号" align="center" min-width="110"/>
<el-table-column label="管日期" prop="管编号" align="center" min-width="110"/>
<el-table-column label="拉单丝" align="center">
<el-table-column label="人员" prop="拉单丝_人员" align="center" min-width="90"/>
<el-table-column label="时间" prop="拉单丝_时间" align="center" min-width="110"/>
</el-table-column>
<el-table-column label="排一次棒" align="center">
<el-table-column label="人员" prop="排一次棒_人员" align="center" min-width="90"/>
<el-table-column label="时间" prop="排一次棒_时间" align="center" min-width="110"/>
</el-table-column>
<el-table-column label="一次复丝" align="center">
<el-table-column label="人员" prop="一次复丝_人员" align="center" min-width="90"/>
<el-table-column label="时间" prop="一次复丝_时间" align="center" min-width="110"/>
</el-table-column>
<el-table-column label="排二次棒" align="center">
<el-table-column label="人员" prop="排二次棒_人员" align="center" min-width="90"/>
<el-table-column label="时间" prop="排二次棒_时间" align="center" min-width="110"/>
</el-table-column>
<el-table-column label="二次复丝" align="center">
<el-table-column label="人员" prop="二次复丝_人员" align="center" min-width="90"/>
<el-table-column label="时间" prop="二次复丝_时间" align="center" min-width="110"/>
</el-table-column>
<el-table-column label="排板" align="center">
<el-table-column label="人员" prop="排板_人员" align="center" min-width="90"/>
<el-table-column label="时间" prop="排板_时间" align="center" min-width="110"/>
</el-table-column>
</scTable>
</el-main>
</el-container>
<el-container v-else-if="query.mgroup_name === tab">
<el-main> <el-main>
<scTable <scTable
v-if="showTable" v-if="showTable"
@ -108,7 +150,7 @@ export default {
visible: false, visible: false,
showTable: false, showTable: false,
userName: '', userName: '',
tabs: ['拉单丝' , '一次复丝', '排一次棒', '二次复丝', '排二次棒'], tabs: ['原料统计', '拉单丝' , '一次复丝', '排一次棒', '二次复丝', '排二次棒'],
query: { query: {
end_date: '', end_date: '',
start_date: '', start_date: '',
@ -118,6 +160,7 @@ export default {
start_date: '', start_date: '',
mgruops: [], mgruops: [],
tableData: [], tableData: [],
rawMaterialData: [],
detailRow: [], detailRow: [],
nameFilters: [] nameFilters: []
}; };
@ -132,66 +175,91 @@ export default {
methods: { methods: {
getData() { getData() {
let that = this; let that = this;
let params = {}, biStr = '', nameList = [], names = []; if (that.query.mgroup_name == '原料统计') {
let query = that.query; if (that.query.start_date == '' || that.query.start_date == null) {
if (that.query.start_date == '' || that.query.start_date == null) { that.query.start_date = that.start_date;
that.query.start_date = query.start_date = that.start_date; }
} else { if (that.query.end_date == '' || that.query.end_date == null) {
query.start_date = that.query.start_date; that.query.end_date = that.end_date;
} }
if (that.query.end_date == '' || that.query.end_date == null) { let params = { query: { start_date: that.query.start_date, end_date: that.query.end_date } };
that.query.end_date = query.end_date = that.end_date; console.log('params', params);
} else { that.$API.bi.dataset.exec.req('raw_material_stat', params).then((res) => {
query.end_date = that.query.end_date; let data = (res && res.data2 && res.data2.ds0) ? res.data2.ds0 : [];
} const timeFields = ['拉单丝_时间','排一次棒_时间','一次复丝_时间','排二次棒_时间','二次复丝_时间','排板_时间'];
params.query = query; data.forEach(row => {
console.log('params', params); timeFields.forEach(f => {
if (that.query.mgroup_name == '拉单丝') { if (row[f]) row[f] = String(row[f]).substring(0, 16);
biStr = 'product_defect_lds'; });
} else if (that.query.mgroup_name == '一次复丝' || that.query.mgroup_name == '排一次棒' || that.query.mgroup_name == '二次复丝' || that.query.mgroup_name == '排二次棒') { });
biStr = 'product_defect_jjcj'; that.$nextTick(() => {
} console.log('rawMaterialData', data);
that.$API.bi.dataset.exec.req(biStr, params).then((res) => { that.rawMaterialData = data;
let data = res.data2.ds0; });
data.forEach(item => {
if (names.indexOf(item.物料名) > -1) {} else {
names.push(item.物料名);
nameList.push({ text: item.物料名, value: item.物料名 });
}
if (item.缺陷分布 !== null) {
let defect = JSON.parse(item.缺陷分布);
for (let key in defect) {
item[key] = defect[key];
}
}
item.长点数 = item.暗点不合格 ? item.暗点重 ? item.暗点不合格.含 + item.暗点重.含 : item.暗点不合格.含 : item.暗点重 ? item.暗点重.含 : 0;
item.剪切合格 = item['剪切￠18.3mm不合格'] ? item['剪切￠18.3mm可加工'] ? item.总切片数 - item['剪切￠18.3mm可加工'].含 - item['剪切￠18.3mm不合格'].含 : item.总切片数 - item['剪切￠18.3mm不合格'].含 : item['剪切￠18.3mm可加工'] ? item.总切片数 - item['剪切￠18.3mm可加工'].含 : item.总切片数;
let count_hgls = item.暗点合格 ? item.暗点合格.含 : 0;
let count1 = item['剪切￠18.3mm不合格'] ? item.总切片数 - item.长点数 - item['剪切￠18.3mm不合格'].含 : item.总切片数 - item.长点数;
if (item['剪切￠18.3mm不合格'] && item['剪切￠18.3mm不合格'].组 !== null) {
if (item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点不合格']) {
count1 = count1 + item['剪切￠18.3mm不合格+暗点不合格'];
}
if (item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点重']) {
count1 = count1 + item['剪切￠18.3mm不合格+暗点重'];
}
if (item['剪切￠18.3mm可加工'].组['剪切￠18.3mm可加工+暗点合格']) {
count_hgls = count_hgls - item['剪切￠18.3mm可加工'].组['剪切￠18.3mm可加工+暗点合格'];
}
if (item['剪切￠18.3mm可加工'].组['剪切￠18.3mm不合格+暗点合格']) {
count_hgls = count_hgls - item['剪切￠18.3mm不合格+暗点合格'];
}
}
item.加工率数 = count1;
item.合格率数 = count_hgls;
}); });
that.$nextTick(() => { return;
console.log('data', data); }else{
that.nameFilters = nameList; let params = {}, biStr = '', nameList = [], names = [];
that.tableData = data; let query = that.query;
that.showTable = true; if (that.query.start_date == '' || that.query.start_date == null) {
}); that.query.start_date = query.start_date = that.start_date;
}); } else {
query.start_date = that.query.start_date;
}
if (that.query.end_date == '' || that.query.end_date == null) {
that.query.end_date = query.end_date = that.end_date;
} else {
query.end_date = that.query.end_date;
}
params.query = query;
console.log('params', params);
if (that.query.mgroup_name == '拉单丝') {
biStr = 'product_defect_lds';
} else if (that.query.mgroup_name == '一次复丝' || that.query.mgroup_name == '排一次棒' || that.query.mgroup_name == '二次复丝' || that.query.mgroup_name == '排二次棒') {
biStr = 'product_defect_jjcj';
}
that.$API.bi.dataset.exec.req(biStr, params).then((res) => {
let data = res.data2.ds0;
data.forEach(item => {
if (names.indexOf(item.物料名) > -1) {} else {
names.push(item.物料名);
nameList.push({ text: item.物料名, value: item.物料名 });
}
if (item.缺陷分布 !== null) {
let defect = JSON.parse(item.缺陷分布);
for (let key in defect) {
item[key] = defect[key];
}
}
item.长点数 = item.暗点不合格 ? item.暗点重 ? item.暗点不合格.含 + item.暗点重.含 : item.暗点不合格.含 : item.暗点重 ? item.暗点重.含 : 0;
item.剪切合格 = item['剪切￠18.3mm不合格'] ? item['剪切￠18.3mm可加工'] ? item.总切片数 - item['剪切￠18.3mm可加工'].含 - item['剪切￠18.3mm不合格'].含 : item.总切片数 - item['剪切￠18.3mm不合格'].含 : item['剪切￠18.3mm可加工'] ? item.总切片数 - item['剪切￠18.3mm可加工'].含 : item.总切片数;
let count_hgls = item.暗点合格 ? item.暗点合格.含 : 0;
let count1 = item['剪切￠18.3mm不合格'] ? item.总切片数 - item.长点数 - item['剪切￠18.3mm不合格'].含 : item.总切片数 - item.长点数;
if (item['剪切￠18.3mm不合格'] && item['剪切￠18.3mm不合格'].组 !== null) {
if (item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点不合格']) {
count1 = count1 + item['剪切￠18.3mm不合格+暗点不合格'];
}
if (item['剪切￠18.3mm不合格'].组['剪切￠18.3mm不合格+暗点重']) {
count1 = count1 + item['剪切￠18.3mm不合格+暗点重'];
}
if (item['剪切￠18.3mm可加工'].组['剪切￠18.3mm可加工+暗点合格']) {
count_hgls = count_hgls - item['剪切￠18.3mm可加工'].组['剪切￠18.3mm可加工+暗点合格'];
}
if (item['剪切￠18.3mm可加工'].组['剪切￠18.3mm不合格+暗点合格']) {
count_hgls = count_hgls - item['剪切￠18.3mm不合格+暗点合格'];
}
}
item.加工率数 = count1;
item.合格率数 = count_hgls;
});
that.$nextTick(() => {
console.log('data', data);
that.nameFilters = nameList;
that.tableData = data;
that.showTable = true;
});
});
}
}, },
handleQuery2() { handleQuery2() {
this.getData(); this.getData();