From 65df17fe051f1306553c0acbbfacef89536ee4ae Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 5 Aug 2026 13:29:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=B4=81=E5=87=80=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E5=8A=A0=E5=8E=9F=E6=96=99=E7=BB=9F=E8=AE=A1=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/bxerp/workHoursJJ.vue | 190 ++++++++++++++------- 1 file changed, 129 insertions(+), 61 deletions(-) diff --git a/src/views/statistics/bxerp/workHoursJJ.vue b/src/views/statistics/bxerp/workHoursJJ.vue index 4b5c5a7f..c333bf7b 100644 --- a/src/views/statistics/bxerp/workHoursJJ.vue +++ b/src/views/statistics/bxerp/workHoursJJ.vue @@ -33,7 +33,49 @@ :label="tab" style="height: 100%;" > - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { - 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; + if (that.query.mgroup_name == '原料统计') { + if (that.query.start_date == '' || that.query.start_date == null) { + that.query.start_date = that.start_date; + } + if (that.query.end_date == '' || that.query.end_date == null) { + that.query.end_date = that.end_date; + } + let params = { query: { start_date: that.query.start_date, end_date: that.query.end_date } }; + console.log('params', params); + that.$API.bi.dataset.exec.req('raw_material_stat', params).then((res) => { + let data = (res && res.data2 && res.data2.ds0) ? res.data2.ds0 : []; + const timeFields = ['拉单丝_时间','排一次棒_时间','一次复丝_时间','排二次棒_时间','二次复丝_时间','排板_时间']; + data.forEach(row => { + timeFields.forEach(f => { + if (row[f]) row[f] = String(row[f]).substring(0, 16); + }); + }); + that.$nextTick(() => { + console.log('rawMaterialData', data); + that.rawMaterialData = data; + }); }); - that.$nextTick(() => { - console.log('data', data); - that.nameFilters = nameList; - that.tableData = data; - that.showTable = true; - }); - }); + return; + }else{ + let params = {}, biStr = '', nameList = [], names = []; + let query = that.query; + 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() { this.getData();