From 0ebd53c34148d66b18ebdbe2ed04d3d6772eb16e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 9 Jan 2026 15:27:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A6=85=E9=81=93281?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/defect.vue     | 27 ++++++++++++++++-------
 src/views/statistics/bxerp/defectPBHZ.vue |  6 ++---
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/views/statistics/bxerp/defect.vue b/src/views/statistics/bxerp/defect.vue
index 1931a9cc..5045d9e1 100644
--- a/src/views/statistics/bxerp/defect.vue
+++ b/src/views/statistics/bxerp/defect.vue
@@ -35,9 +35,9 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
-				<el-table-column label="工段">{{ query.mgroup_name }}
-				</el-table-column>
                 <el-table-column label="员工" prop="员工">
+				</el-table-column>
+				<el-table-column label="物料名" prop="物料名" :filters="nameFilters" :filter-method="filterName" filter-placement="bottom-end">
 				</el-table-column>
 				<el-table-column label="总数">
 					<template #default="scope">
@@ -64,19 +64,18 @@
 				</el-table-column>
 				<el-table-column label="长点率">
 					<template #default="scope">
-						<span v-if="scope.row.暗点不合格">{{((scope.row.长点数/scope.row.总切片数)*100).toFixed(2) }}%</span>
-						<span v-else>0%</span>
+						<span>{{((scope.row.长点数/scope.row.总切片数)*100).toFixed(2) }}%</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="加工率">
 					<template #default="scope">
-						<span v-if="scope.row.总切片完全合格数">{{((scope.row.加工率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
+						<span>{{((scope.row.加工率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
 					</template>
 				</el-table-column>
 				<el-table-column label="合格率" prop="合格率">
 					<!-- 暗点合格并且剪切合格的板段数：在暗点合格含里刨除剪切可加工和剪切不合格 -->
 					<template #default="scope">
-						<span v-if="scope.row.总切片完全合格数">{{((scope.row.暗点合格.仅/scope.row.总切片数)*100).toFixed(2) }}%</span>
+						<span>{{((scope.row.合格率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
 					</template>
 				</el-table-column>
 			</scTable>
@@ -108,6 +107,7 @@ export default {
             mgroups: [],
 			tableData:[],
 			detailRow:[],
+			nameFilters:[],
 		};
 	},
     mounted() {
@@ -127,11 +127,16 @@ export default {
         },
         getData(){
             let that = this;
+			let nameList = [],names = [];
             let params = {};
             params.query = that.query;
-			that.$API.bi.dataset.exec.req('product_defect_pb', params).then((res) => {
+			that.$API.bi.dataset.exec.req('product_defect_pb_m', 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){
@@ -159,12 +164,18 @@ export default {
 					item.加工率数 = count1;//总数-暗点不合格.含-暗点重.含-剪切不合格.含+两个组合数；
 					item.合格率数 = count_hgls;//：在暗点合格含里刨除剪切可加工和剪切不合格
 				})
-				that.tableData = data;
+				that.$nextTick(() => {
+                  	that.nameFilters = nameList;
+					that.tableData = data;
+                })
 			});
         },
 		deptChange(){
 			this.getData();
 		},
+		filterName(value, row) {
+			return row.物料名 == value;
+		},
 		handleClick(row){
 			let that = this;
 			that.userName = row.员工;
diff --git a/src/views/statistics/bxerp/defectPBHZ.vue b/src/views/statistics/bxerp/defectPBHZ.vue
index 398457c3..45f91db9 100644
--- a/src/views/statistics/bxerp/defectPBHZ.vue
+++ b/src/views/statistics/bxerp/defectPBHZ.vue
@@ -35,7 +35,7 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
-                <el-table-column label="员工" prop="员工" :filters="nameFilters" :filter-method="filterName" filter-placement="bottom-end" >
+                <el-table-column label="员工" prop="员工" :filters="userFilters" :filter-method="filterName" filter-placement="bottom-end" >
 				</el-table-column>
 				<el-table-column label="切片后缀" prop="切片后缀" :filters="houzhuiFilters" :filter-method="filterHouzhui" filter-placement="bottom-end">
 				</el-table-column>
@@ -112,7 +112,7 @@ export default {
 			},
 			users:[],
 			detailRow:[],
-			nameFilters:[],
+			userFilters:[],
 			houzhuiFilters:[],
 			tableData:[],
 		};
@@ -178,7 +178,7 @@ export default {
 					item.合格率数 = count_hgls;//：在暗点合格含里刨除剪切可加工和剪切不合格
 				})
 				 that.$nextTick(() => {
-                  	that.nameFilters = userList;
+                  	that.userFilters = userList;
 					that.houzhuiFilters = houzhuiList;
 					that.tableData = data;
                 })