From 7ef0c9a64b487bfbcf659f6fba4c26a84bd79a9b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 6 Jan 2026 11:26:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A6=85=E9=81=93143?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/cpccjcTotal.vue    | 210 +++++++
 src/views/statistics/bxerp/cpwgfj1Total.vue   | 498 +++++++++++++++++
 src/views/statistics/bxerp/cpwgfj2Total.vue   | 498 +++++++++++++++++
 src/views/statistics/bxerp/cpwgnzcjTotal.vue  | 515 ++++++++++++++++++
 src/views/statistics/bxerp/cpwgnzfjTotal.vue  | 503 +++++++++++++++++
 src/views/statistics/bxerp/cpxnjyTotal.vue    | 282 ++++++++++
 src/views/statistics/bxerp/cpzjTotal.vue      | 359 ++++++++++++
 src/views/statistics/bxerp/fenjianTotal.vue   | 137 +++--
 src/views/statistics/bxerp/gzcpjcTotal.vue    | 222 ++++++++
 src/views/statistics/bxerp/maopiTotal.vue     |  74 ++-
 src/views/statistics/bxerp/niuzhuanTotal.vue  | 475 ++++++++--------
 .../statistics/bxerp/zhongjian1Total.vue      | 347 ++++++++++++
 .../statistics/bxerp/zhongjian2Total.vue      | 317 +++++++++++
 13 files changed, 4126 insertions(+), 311 deletions(-)
 create mode 100644 src/views/statistics/bxerp/cpccjcTotal.vue
 create mode 100644 src/views/statistics/bxerp/cpwgfj1Total.vue
 create mode 100644 src/views/statistics/bxerp/cpwgfj2Total.vue
 create mode 100644 src/views/statistics/bxerp/cpwgnzcjTotal.vue
 create mode 100644 src/views/statistics/bxerp/cpwgnzfjTotal.vue
 create mode 100644 src/views/statistics/bxerp/cpxnjyTotal.vue
 create mode 100644 src/views/statistics/bxerp/cpzjTotal.vue
 create mode 100644 src/views/statistics/bxerp/gzcpjcTotal.vue
 create mode 100644 src/views/statistics/bxerp/zhongjian1Total.vue
 create mode 100644 src/views/statistics/bxerp/zhongjian2Total.vue

diff --git a/src/views/statistics/bxerp/cpccjcTotal.vue b/src/views/statistics/bxerp/cpccjcTotal.vue
new file mode 100644
index 00000000..2af123cf
--- /dev/null
+++ b/src/views/statistics/bxerp/cpccjcTotal.vue
@@ -0,0 +1,210 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-input v-model="query.batch__contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="params"
+				id="exportDiv"
+				row-key="id"
+				stripe
+			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
+				<el-table-column label="批次号" prop="batch" fixed="left">
+				</el-table-column>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
+				</el-table-column>
+				<el-table-column label="检测数" fixed="left">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品尺寸检测_count_use }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="倒角" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品尺寸检测_含缺陷_倒角 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品尺寸检测_含缺陷_倒角_比例">{{scope.row.data.成品尺寸检测_含缺陷_倒角_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="垂直度" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ 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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="尖角" align="center" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品尺寸检测_含缺陷_尖角 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品尺寸检测_含缺陷_尖角_比例">{{scope.row.data.成品尺寸检测_含缺陷_尖角_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="有效" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品尺寸检测_含缺陷_有效 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品尺寸检测_含缺陷_有效_比例">{{scope.row.data.成品尺寸检测_含缺陷_有效_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="面型" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ 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>
+				<el-table-column label="台径小" align="center" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品尺寸检测_含缺陷_台径小 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品尺寸检测_含缺陷_台径小_比例">{{scope.row.data.成品尺寸检测_含缺陷_台径小_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="台径大" align="center" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品尺寸检测_含缺陷_台径大 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品尺寸检测_含缺陷_台径大_比例">{{scope.row.data.成品尺寸检测_含缺陷_台径大_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="合格" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品尺寸检测_count_ok }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品尺寸检测_合格率">{{scope.row.data.成品尺寸检测_合格率 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品尺寸检测_缺陷项_备注 }}</span>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "statistics_guan",
+	data() {
+		return {
+			params: {
+				ordering:'-data__成品尺寸检测_小日期',
+				querys:[[{field:"data__has_key",compare:"",value:"成品尺寸检测_日期"}]]
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.batchstquery,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品尺寸检测_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material_start__name';
+			obj3.value = that.query.name__contains;
+			obj3.compare = 'contains';
+			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){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+	},
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/statistics/bxerp/cpwgfj1Total.vue b/src/views/statistics/bxerp/cpwgfj1Total.vue
new file mode 100644
index 00000000..0f6d83ed
--- /dev/null
+++ b/src/views/statistics/bxerp/cpwgfj1Total.vue
@@ -0,0 +1,498 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-input v-model="query.batch__contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="params"
+				id="exportDiv"
+				row-key="id"
+				stripe
+			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
+				<el-table-column label="批次号" prop="batch" fixed="left">
+				</el-table-column>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
+				</el-table-column>
+				<el-table-column label="检测数" fixed="left">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检一_count_use }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="划伤" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_划伤 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_划伤_比例">{{scope.row.data.成品外观复检一_含缺陷_划伤_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="腐蚀" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ 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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="崩边" align="center" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_崩边 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_崩边_比例">{{scope.row.data.成品外观复检一_含缺陷_崩边_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="纹路" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_纹路 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_纹路_比例">{{scope.row.data.成品外观复检一_含缺陷_纹路_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="平台" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ 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>
+				<el-table-column label="硌/坑" align="center" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data['成品外观复检一_含缺陷_硌/坑'] }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data['成品外观复检一_含缺陷_硌/坑_比例']">{{scope.row.data['成品外观复检一_含缺陷_硌/坑_比例']}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="麻点" align="center" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_麻点 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_麻点_比例">{{scope.row.data.成品外观复检一_含缺陷_麻点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="台阶" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_台阶 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_台阶_比例">{{scope.row.data.成品外观复检一_含缺陷_台阶_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="柱面" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ 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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="污染" align="center" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_污染 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_污染_比例">{{scope.row.data.成品外观复检一_含缺陷_污染_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="粗糙度" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_粗糙度 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_粗糙度_比例">{{scope.row.data.成品外观复检一_含缺陷_粗糙度_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="角偏" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ 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>
+				<el-table-column label="水印" align="center" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_水印 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_水印_比例">{{scope.row.data.成品外观复检一_含缺陷_水印_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="毛坯长点" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_毛坯长点?scope.row.data.成品外观复检一_含缺陷_毛坯长点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_毛坯长点_比例">{{ scope.row.data.成品外观复检一_含缺陷_毛坯长点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="毛坯点多" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_毛坯点多?scope.row.data.成品外观复检一_含缺陷_毛坯点多:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_毛坯点多_比例">{{ scope.row.data.成品外观复检一_含缺陷_毛坯点多_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="白边" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_白边?scope.row.data.成品外观复检一_含缺陷_白边:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="扭后点" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_扭后点?scope.row.data.成品外观复检一_含缺陷_扭后点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_扭后点_比例">{{ scope.row.data.成品外观复检一_含缺陷_扭后点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="黑网" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_黑网?scope.row.data.成品外观复检一_含缺陷_黑网:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_黑网_比例">{{ scope.row.data.成品外观复检一_含缺陷_黑网_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="白网" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_白网?scope.row.data.成品外观复检一_含缺陷_白网:0}}</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>
+				<el-table-column label="小网废" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_小网废?scope.row.data.成品外观复检一_含缺陷_小网废:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_小网废_比例">{{ scope.row.data.成品外观复检一_含缺陷_小网废_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="花朵重" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_花朵重?scope.row.data.成品外观复检一_含缺陷_花朵重:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_花朵重_比例">{{ scope.row.data.成品外观复检一_含缺陷_花朵重_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="花丝" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_花丝?scope.row.data.成品外观复检一_含缺陷_花丝:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_花丝_比例">{{ scope.row.data.成品外观复检一_含缺陷_花丝_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="六角" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_六角?scope.row.data.成品外观复检一_含缺陷_六角:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="六角白点" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_六角白点?scope.row.data.成品外观复检一_含缺陷_六角白点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_六角白点_比例">{{ scope.row.data.成品外观复检一_含缺陷_六角白点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="六角黑点" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_六角黑点?scope.row.data.成品外观复检一_含缺陷_六角黑点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_六角黑点_比例">{{ scope.row.data.成品外观复检一_含缺陷_六角黑点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="复丝结构" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_复丝结构?scope.row.data.成品外观复检一_含缺陷_复丝结构:0}}</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>
+				<el-table-column label="炫光" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_炫光?scope.row.data.成品外观复检一_含缺陷_炫光:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_炫光_比例">{{ scope.row.data.成品外观复检一_含缺陷_炫光_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="畸变" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_畸变?scope.row.data.成品外观复检一_含缺陷_畸变:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_畸变_比例">{{ scope.row.data.成品外观复检一_含缺陷_畸变_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="包边丝" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_包边丝?scope.row.data.成品外观复检一_含缺陷_包边丝:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_包边丝_比例">{{ scope.row.data.成品外观复检一_含缺陷_包边丝_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="偏心" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_偏心?scope.row.data.成品外观复检一_含缺陷_偏心:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="炸废" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_含缺陷_炸废?scope.row.data.成品外观复检一_含缺陷_炸废:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_含缺陷_炸废_比例">{{ scope.row.data.成品外观复检一_含缺陷_炸废_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="合格" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检一_count_ok }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检一_合格率">{{scope.row.data.成品外观复检一_合格率}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检一_缺陷项_备注 }}</span>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "statistics_guan",
+	data() {
+		return {
+			params: {
+				ordering:'-data__成品外观复检一_小日期',
+				querys:[[{field:"data__has_key",compare:"",value:"成品外观复检一_日期"}]]
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.batchstquery,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"data__has_key",compare:"",value:"成品外观复检一_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品外观复检一_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material_start__name';
+			obj3.value = that.query.name__contains;
+			obj3.compare = 'contains';
+			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){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+	},
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/statistics/bxerp/cpwgfj2Total.vue b/src/views/statistics/bxerp/cpwgfj2Total.vue
new file mode 100644
index 00000000..996e6df5
--- /dev/null
+++ b/src/views/statistics/bxerp/cpwgfj2Total.vue
@@ -0,0 +1,498 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-input v-model="query.batch__contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="params"
+				id="exportDiv"
+				row-key="id"
+				stripe
+			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
+				<el-table-column label="批次号" prop="batch" fixed="left">
+				</el-table-column>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
+				</el-table-column>
+				<el-table-column label="检测数" fixed="left">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检二_count_use }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="划伤" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_划伤 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_划伤_比例">{{scope.row.data.成品外观复检二_含缺陷_划伤_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="腐蚀" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ 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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="崩边" align="center" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_崩边 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_崩边_比例">{{scope.row.data.成品外观复检二_含缺陷_崩边_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="纹路" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_纹路 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_纹路_比例">{{scope.row.data.成品外观复检二_含缺陷_纹路_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="平台" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ 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>
+				<el-table-column label="硌/坑" align="center" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data['成品外观复检二_含缺陷_硌/坑'] }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data['成品外观复检二_含缺陷_硌/坑_比例']">{{scope.row.data['成品外观复检二_含缺陷_硌/坑_比例']}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="麻点" align="center" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_麻点 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_麻点_比例">{{scope.row.data.成品外观复检二_含缺陷_麻点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="台阶" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_台阶 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_台阶_比例">{{scope.row.data.成品外观复检二_含缺陷_台阶_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="柱面" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ 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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="污染" align="center" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_污染 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_污染_比例">{{scope.row.data.成品外观复检二_含缺陷_污染_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="粗糙度" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_粗糙度 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_粗糙度_比例">{{scope.row.data.成品外观复检二_含缺陷_粗糙度_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="角偏" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ 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>
+				<el-table-column label="水印" align="center" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_水印 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_水印_比例">{{scope.row.data.成品外观复检二_含缺陷_水印_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="毛坯长点" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_毛坯长点?scope.row.data.成品外观复检二_含缺陷_毛坯长点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_毛坯长点_比例">{{ scope.row.data.成品外观复检二_含缺陷_毛坯长点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="毛坯点多" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_毛坯点多?scope.row.data.成品外观复检二_含缺陷_毛坯点多:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_毛坯点多_比例">{{ scope.row.data.成品外观复检二_含缺陷_毛坯点多_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="白边" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_白边?scope.row.data.成品外观复检二_含缺陷_白边:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="扭后点" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_扭后点?scope.row.data.成品外观复检二_含缺陷_扭后点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_扭后点_比例">{{ scope.row.data.成品外观复检二_含缺陷_扭后点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="黑网" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_黑网?scope.row.data.成品外观复检二_含缺陷_黑网:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_黑网_比例">{{ scope.row.data.成品外观复检二_含缺陷_黑网_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="白网" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_白网?scope.row.data.成品外观复检二_含缺陷_白网:0}}</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>
+				<el-table-column label="小网废" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_小网废?scope.row.data.成品外观复检二_含缺陷_小网废:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_小网废_比例">{{ scope.row.data.成品外观复检二_含缺陷_小网废_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="花朵重" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_花朵重?scope.row.data.成品外观复检二_含缺陷_花朵重:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_花朵重_比例">{{ scope.row.data.成品外观复检二_含缺陷_花朵重_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="花丝" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_花丝?scope.row.data.成品外观复检二_含缺陷_花丝:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_花丝_比例">{{ scope.row.data.成品外观复检二_含缺陷_花丝_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="六角" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_六角?scope.row.data.成品外观复检二_含缺陷_六角:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="六角白点" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_六角白点?scope.row.data.成品外观复检二_含缺陷_六角白点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_六角白点_比例">{{ scope.row.data.成品外观复检二_含缺陷_六角白点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="六角黑点" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_六角黑点?scope.row.data.成品外观复检二_含缺陷_六角黑点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_六角黑点_比例">{{ scope.row.data.成品外观复检二_含缺陷_六角黑点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="复丝结构" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_复丝结构?scope.row.data.成品外观复检二_含缺陷_复丝结构:0}}</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>
+				<el-table-column label="炫光" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_炫光?scope.row.data.成品外观复检二_含缺陷_炫光:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_炫光_比例">{{ scope.row.data.成品外观复检二_含缺陷_炫光_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="畸变" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_畸变?scope.row.data.成品外观复检二_含缺陷_畸变:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_畸变_比例">{{ scope.row.data.成品外观复检二_含缺陷_畸变_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="包边丝" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_包边丝?scope.row.data.成品外观复检二_含缺陷_包边丝:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_包边丝_比例">{{ scope.row.data.成品外观复检二_含缺陷_包边丝_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="偏心" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_偏心?scope.row.data.成品外观复检二_含缺陷_偏心:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="炸废" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_含缺陷_炸废?scope.row.data.成品外观复检二_含缺陷_炸废:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_含缺陷_炸废_比例">{{ scope.row.data.成品外观复检二_含缺陷_炸废_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="合格" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品外观复检二_count_ok }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品外观复检二_合格率">{{scope.row.data.成品外观复检二_合格率}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品外观复检二_缺陷项_备注 }}</span>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "statistics_guan",
+	data() {
+		return {
+			params: {
+				ordering:'-data__成品外观复检二_小日期',
+				querys:[[{field:"data__has_key",compare:"",value:"成品外观复检二_日期"}]]
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.batchstquery,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"data__has_key",compare:"",value:"成品外观复检二_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品外观复检二_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material_start__name';
+			obj3.value = that.query.name__contains;
+			obj3.compare = 'contains';
+			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){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+	},
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/statistics/bxerp/cpwgnzcjTotal.vue b/src/views/statistics/bxerp/cpwgnzcjTotal.vue
new file mode 100644
index 00000000..a8e53757
--- /dev/null
+++ b/src/views/statistics/bxerp/cpwgnzcjTotal.vue
@@ -0,0 +1,515 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-input v-model="query.batch__contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="params"
+				id="exportDiv"
+				row-key="id"
+				stripe
+			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
+				<el-table-column label="批次编号" fixed="left" prop="batch">
+				</el-table-column>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
+				</el-table-column>
+				<el-table-column label="初检数" fixed="left">
+					<template #default="scope">
+						{{ scope.row.data.成品内外初检_count_use }}
+					</template>
+				</el-table-column>
+				<el-table-column label="毛坯长点" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_毛坯长点?scope.row.data.成品内外初检_含缺陷_毛坯长点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_毛坯长点_比例">{{ scope.row.data.成品内外初检_含缺陷_毛坯长点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="毛坯点多" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_毛坯点多?scope.row.data.成品内外初检_含缺陷_毛坯点多:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="白边" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_白边?scope.row.data.成品内外初检_含缺陷_白边:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_白边_比例">{{ scope.row.data.成品内外初检_含缺陷_白边_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="扭后点" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_扭后点?scope.row.data.成品内外初检_含缺陷_扭后点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_扭后点_比例">{{ scope.row.data.成品内外初检_含缺陷_扭后点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="黑网" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_黑网?scope.row.data.成品内外初检_含缺陷_黑网:0}}</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>
+				<el-table-column label="白网" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_白网?scope.row.data.成品内外初检_含缺陷_白网:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_白网_比例">{{ scope.row.data.成品内外初检_含缺陷_白网_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="小网" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_小网?scope.row.data.成品内外初检_含缺陷_小网:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_小网_比例">{{ scope.row.data.成品内外初检_含缺陷_小网_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="花丝" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_花丝?scope.row.data.成品内外初检_含缺陷_花丝:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_花丝_比例">{{ scope.row.data.成品内外初检_含缺陷_花丝_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="花朵" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_花朵?scope.row.data.成品内外初检_含缺陷_花朵:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="六角" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_六角?scope.row.data.成品内外初检_含缺陷_六角:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_六角_比例">{{ scope.row.data.成品内外初检_含缺陷_六角_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="六角白点" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_六角白点?scope.row.data.成品内外初检_含缺陷_六角白点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_六角白点_比例">{{ scope.row.data.成品内外初检_含缺陷_六角白点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="六角黑点" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_六角黑点?scope.row.data.成品内外初检_含缺陷_六角黑点:0}}</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>
+				<el-table-column label="复丝结构" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_复丝结构?scope.row.data.成品内外初检_含缺陷_复丝结构:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_复丝结构_比例">{{ scope.row.data.成品内外初检_含缺陷_复丝结构_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="炫光" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_炫光?scope.row.data.成品内外初检_含缺陷_炫光:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_炫光_比例">{{ scope.row.data.成品内外初检_含缺陷_炫光_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="包边丝" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_包边丝?scope.row.data.成品内外初检_含缺陷_包边丝:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_包边丝_比例">{{ scope.row.data.成品内外初检_含缺陷_包边丝_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="畸变" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_畸变?scope.row.data.成品内外初检_含缺陷_畸变:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="偏心" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_偏心?scope.row.data.成品内外初检_含缺陷_偏心:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_偏心_比例">{{ scope.row.data.成品内外初检_含缺陷_偏心_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="划伤" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_划伤?scope.row.data.成品内外初检_含缺陷_划伤:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_划伤_比例">{{ scope.row.data.成品内外初检_含缺陷_划伤_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="腐蚀" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_腐蚀?scope.row.data.成品内外初检_含缺陷_腐蚀:0}}</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>
+				<el-table-column label="崩边" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_崩边?scope.row.data.成品内外初检_含缺陷_崩边:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_崩边_比例">{{ scope.row.data.成品内外初检_含缺陷_崩边_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="纹路" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_纹路?scope.row.data.成品内外初检_含缺陷_纹路:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_纹路_比例">{{ scope.row.data.成品内外初检_含缺陷_纹路_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="平台" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_平台?scope.row.data.成品内外初检_含缺陷_平台:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_平台_比例">{{ scope.row.data.成品内外初检_含缺陷_平台_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="硌/坑" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data['成品内外初检_含缺陷_硌/坑']?scope.row.data['成品内外初检_含缺陷_硌/坑']:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="麻点" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_麻点?scope.row.data.成品内外初检_含缺陷_麻点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_麻点_比例">{{ scope.row.data.成品内外初检_含缺陷_麻点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="台阶" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_台阶?scope.row.data.成品内外初检_含缺陷_台阶:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_台阶_比例">{{ scope.row.data.成品内外初检_含缺陷_台阶_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="柱面" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_柱面?scope.row.data.成品内外初检_含缺陷_柱面:0}}</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>
+				<el-table-column label="污染" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_污染?scope.row.data.成品内外初检_含缺陷_污染:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_污染_比例">{{ scope.row.data.成品内外初检_含缺陷_污染_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="粗糙度" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_粗糙度?scope.row.data.成品内外初检_含缺陷_粗糙度:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_粗糙度_比例">{{ scope.row.data.成品内外初检_含缺陷_粗糙度_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="水印" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_水印?scope.row.data.成品内外初检_含缺陷_水印:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_水印_比例">{{ scope.row.data.成品内外初检_含缺陷_水印_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="角偏" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_角偏?scope.row.data.成品内外初检_含缺陷_角偏:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="亮斑" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_亮斑?scope.row.data.成品内外初检_含缺陷_亮斑:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_亮斑_比例">{{ scope.row.data.成品内外初检_含缺陷_亮斑_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="炸废" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_含缺陷_炸废?scope.row.data.成品内外初检_含缺陷_炸废:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内外初检_含缺陷_炸废_比例">{{ scope.row.data.成品内外初检_含缺陷_炸废_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="合格数" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内外初检_count_ok }} </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>
+				<el-table-column label="备注" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内外初检_缺陷_备注 }}</span>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "statistics_guan",
+	data() {
+		return {
+			params: {
+				ordering:'-data__成品内外初检_小日期',
+				querys:[[{field:"data__has_key",compare:"",value:"成品内外初检_日期"}]],
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.batchstquery,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"data__has_key",compare:"",value:"成品内外初检_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品内外初检_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material_start__name';
+			obj3.value = that.query.name__contains;
+			obj3.compare = 'contains';
+
+			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){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+		getCountQt(data,type){
+			let count_qt = 0,count = 0;
+		   
+		}
+	},
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/statistics/bxerp/cpwgnzfjTotal.vue b/src/views/statistics/bxerp/cpwgnzfjTotal.vue
new file mode 100644
index 00000000..94ef2701
--- /dev/null
+++ b/src/views/statistics/bxerp/cpwgnzfjTotal.vue
@@ -0,0 +1,503 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-input v-model="query.batch__contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="params"
+				id="exportDiv"
+				row-key="id"
+				stripe
+			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
+				<el-table-column label="批次编号" fixed="left" prop="batch">
+				</el-table-column>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
+				</el-table-column>
+				<el-table-column label="初检数" fixed="left">
+					<template #default="scope">
+						{{ scope.row.data.成品内质复检_count_use }}
+					</template>
+				</el-table-column>
+				<el-table-column label="毛坯长点" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_毛坯长点?scope.row.data.成品内质复检_含缺陷_毛坯长点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_毛坯长点_比例">{{ scope.row.data.成品内质复检_含缺陷_毛坯长点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="毛坯点多" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_毛坯点多?scope.row.data.成品内质复检_含缺陷_毛坯点多:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="扭后点" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_扭后点?scope.row.data.成品内质复检_含缺陷_扭后点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_扭后点_比例">{{ scope.row.data.成品内质复检_含缺陷_扭后点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="黑网" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_黑网?scope.row.data.成品内质复检_含缺陷_黑网:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_黑网_比例">{{ scope.row.data.成品内质复检_含缺陷_黑网_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="白网" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_白网?scope.row.data.成品内质复检_含缺陷_白网:0}}</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>
+				<el-table-column label="小网" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_小网?scope.row.data.成品内质复检_含缺陷_小网:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_小网_比例">{{ scope.row.data.成品内质复检_含缺陷_小网_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="花丝" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_花丝?scope.row.data.成品内质复检_含缺陷_花丝:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_花丝_比例">{{ scope.row.data.成品内质复检_含缺陷_花丝_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="花朵重" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_花朵重?scope.row.data.成品内质复检_含缺陷_花朵重:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_花朵重_比例">{{ scope.row.data.成品内质复检_含缺陷_花朵重_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="六角" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_六角?scope.row.data.成品内质复检_含缺陷_六角:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="六角白点" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_六角白点?scope.row.data.成品内质复检_含缺陷_六角白点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_六角白点_比例">{{ scope.row.data.成品内质复检_含缺陷_六角白点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="六角黑点" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_六角黑点?scope.row.data.成品内质复检_含缺陷_六角黑点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_六角黑点_比例">{{ scope.row.data.成品内质复检_含缺陷_六角黑点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="白边" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_白边?scope.row.data.成品内质复检_含缺陷_白边:0}}</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>
+				<el-table-column label="复丝结构" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_复丝结构?scope.row.data.成品内质复检_含缺陷_复丝结构:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_复丝结构_比例">{{ scope.row.data.成品内质复检_含缺陷_复丝结构_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="炫光" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_炫光?scope.row.data.成品内质复检_含缺陷_炫光:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_炫光_比例">{{ scope.row.data.成品内质复检_含缺陷_炫光_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="包边丝" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_包边丝?scope.row.data.成品内质复检_含缺陷_包边丝:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_包边丝_比例">{{ scope.row.data.成品内质复检_含缺陷_包边丝_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="畸变" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_畸变?scope.row.data.成品内质复检_含缺陷_畸变:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="偏心" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_偏心?scope.row.data.成品内质复检_含缺陷_偏心:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_偏心_比例">{{ scope.row.data.成品内质复检_含缺陷_偏心_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="划伤" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_划伤?scope.row.data.成品内质复检_含缺陷_划伤:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_划伤_比例">{{ scope.row.data.成品内质复检_含缺陷_划伤_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="腐蚀" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_腐蚀?scope.row.data.成品内质复检_含缺陷_腐蚀:0}}</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>
+				<el-table-column label="崩边" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_崩边?scope.row.data.成品内质复检_含缺陷_崩边:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_崩边_比例">{{ scope.row.data.成品内质复检_含缺陷_崩边_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="纹路" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_纹路?scope.row.data.成品内质复检_含缺陷_纹路:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_纹路_比例">{{ scope.row.data.成品内质复检_含缺陷_纹路_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="平台" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_平台?scope.row.data.成品内质复检_含缺陷_平台:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_平台_比例">{{ scope.row.data.成品内质复检_含缺陷_平台_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="硌/坑" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data['成品内质复检_含缺陷_硌/坑']?scope.row.data['成品内质复检_含缺陷_硌/坑']:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="麻点" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_麻点?scope.row.data.成品内质复检_含缺陷_麻点:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_麻点_比例">{{ scope.row.data.成品内质复检_含缺陷_麻点_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="台阶" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_台阶?scope.row.data.成品内质复检_含缺陷_台阶:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_台阶_比例">{{ scope.row.data.成品内质复检_含缺陷_台阶_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="柱面" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_柱面?scope.row.data.成品内质复检_含缺陷_柱面:0}}</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>
+				<el-table-column label="污染" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_污染?scope.row.data.成品内质复检_含缺陷_污染:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_污染_比例">{{ scope.row.data.成品内质复检_含缺陷_污染_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="粗糙度" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_粗糙度?scope.row.data.成品内质复检_含缺陷_粗糙度:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_粗糙度_比例">{{ scope.row.data.成品内质复检_含缺陷_粗糙度_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="水印" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_水印?scope.row.data.成品内质复检_含缺陷_水印:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_水印_比例">{{ scope.row.data.成品内质复检_含缺陷_水印_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="角偏" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_角偏?scope.row.data.成品内质复检_含缺陷_角偏:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="亮斑" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_含缺陷_亮斑?scope.row.data.成品内质复检_含缺陷_亮斑:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_含缺陷_亮斑_比例">{{ scope.row.data.成品内质复检_含缺陷_亮斑_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="合格数" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品内质复检_count_ok }} </span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品内质复检_合格率">{{ scope.row.data.成品内质复检_合格率 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品内质复检_缺陷_备注 }}</span>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "statistics_guan",
+	data() {
+		return {
+			params: {
+				ordering:'-data__成品内质复检_小日期',
+				querys:[[{field:"data__has_key",compare:"",value:"成品内质复检_日期"}]],
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.batchstquery,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"data__has_key",compare:"",value:"成品内质复检_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品内质复检_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material_start__name';
+			obj3.value = that.query.name__contains;
+			obj3.compare = 'contains';
+
+			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){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+		getCountQt(data,type){
+			let count_qt = 0,count = 0;
+		   
+		}
+	},
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/statistics/bxerp/cpxnjyTotal.vue b/src/views/statistics/bxerp/cpxnjyTotal.vue
new file mode 100644
index 00000000..e3a8c0f8
--- /dev/null
+++ b/src/views/statistics/bxerp/cpxnjyTotal.vue
@@ -0,0 +1,282 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-input v-model="query.batch__contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="params"
+				id="exportDiv"
+				row-key="id"
+				stripe
+			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
+				<el-table-column label="批次号" prop="batch" fixed="left">
+				</el-table-column>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
+				</el-table-column>
+				<el-table-column label="检测数" fixed="left">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品性能检测_count_use }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="剪切" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品性能检测_含缺陷_剪切 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品性能检测_含缺陷_剪切_比例">{{scope.row.data.成品性能检测_含缺陷_剪切_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="分辨率" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ 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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="直区" align="center" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品性能检测_含缺陷_直区 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品性能检测_含缺陷_直区_比例">{{scope.row.data.成品性能检测_含缺陷_直区_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="角偏" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品性能检测_含缺陷_角偏 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品性能检测_含缺陷_角偏_比例">{{scope.row.data.成品性能检测_含缺陷_角偏_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="S畸变不合格" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品性能检测_含缺陷_S畸变不合格 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader5">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品性能检测_含缺陷_S畸变不合格_比例">{{scope.row.data.成品性能检测_含缺陷_S畸变不合格_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="扭转角不合格" align="center" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品性能检测_含缺陷_扭转角不合格 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品性能检测_含缺陷_扭转角不合格_比例">{{scope.row.data.成品性能检测_含缺陷_扭转角不合格_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="白边" align="center" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品性能检测_含缺陷_白边 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品性能检测_含缺陷_白边_比例">{{scope.row.data.成品性能检测_含缺陷_白边_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="放大率" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品性能检测_含缺陷_放大率 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品性能检测_含缺陷_放大率_比例">{{scope.row.data.成品性能检测_含缺陷_放大率_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="复丝阴影" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ 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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="灰边" align="center" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品性能检测_含缺陷_灰边 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品性能检测_含缺陷_灰边_比例">{{scope.row.data.成品性能检测_含缺陷_灰边_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="气密性" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品性能检测_含缺陷_气密性 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品性能检测_含缺陷_气密性_比例">{{scope.row.data.成品性能检测_含缺陷_气密性_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="像位移不合格" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ 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>
+				<el-table-column label="垂直度" align="center" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品性能检测_含缺陷_垂直度 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品性能检测_含缺陷_垂直度_比例">{{scope.row.data.成品性能检测_含缺陷_垂直度_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="合格" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品性能检测_count_ok }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品性能检测_合格率">{{scope.row.data.成品性能检测_合格率}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品性能检测_缺陷项_备注 }}</span>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "statistics_guan",
+	data() {
+		return {
+			params: {
+				ordering:'-data__成品性能检测_小日期',
+				querys:[[{field:"data__has_key",compare:"",value:"成品性能检测_日期"}]]
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.batchstquery,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"data__has_key",compare:"",value:"成品性能检测_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品性能检测_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material_start__name';
+			obj3.value = that.query.name__contains;
+			obj3.compare = 'contains';
+			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){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+	},
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/statistics/bxerp/cpzjTotal.vue b/src/views/statistics/bxerp/cpzjTotal.vue
new file mode 100644
index 00000000..866c9741
--- /dev/null
+++ b/src/views/statistics/bxerp/cpzjTotal.vue
@@ -0,0 +1,359 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-input v-model="query.batch__contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="params"
+				id="exportDiv"
+				row-key="id"
+				stripe
+			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
+				<el-table-column label="批次编号" fixed="left" prop="batch">
+				</el-table-column>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
+				</el-table-column>
+				<el-table-column label="自检数" fixed="left">
+					<template #default="scope">
+						{{ scope.row.data.成品自检_count_use }}
+					</template>
+				</el-table-column>
+				<el-table-column label="腐蚀" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_腐蚀?scope.row.data.成品自检_含缺陷_腐蚀:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_含缺陷_腐蚀A_比例">{{ scope.row.data.成品自检_含缺陷_腐蚀A_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="亮道" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_亮道?scope.row.data.成品自检_含缺陷_亮道:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="大/凹面坑" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data['成品自检_含缺陷_大/凹面坑']?scope.row.data['成品自检_含缺陷_大/凹面坑']:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data['成品自检_含缺陷_大/凹面坑_比例']">{{ scope.row.data['成品自检_含缺陷_大/凹面坑_比例']}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="小面坑" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_小面坑?scope.row.data.成品自检_含缺陷_小面坑:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_含缺陷_小面坑_比例">{{ scope.row.data.成品自检_含缺陷_小面坑_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="台划" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_台划?scope.row.data.成品自检_含缺陷_台划:0}}</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>
+				<el-table-column label="平面划" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_平面划?scope.row.data.成品自检_含缺陷_平面划:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_含缺陷_平面划_比例">{{ scope.row.data.成品自检_含缺陷_平面划_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="圆角划" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_圆角划?scope.row.data.成品自检_含缺陷_圆角划:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_含缺陷_圆角划_比例">{{ scope.row.data.成品自检_含缺陷_圆角划_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="倒角麻" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_倒角麻?scope.row.data.成品自检_含缺陷_倒角麻:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_含缺陷_倒角麻_比例">{{ scope.row.data.成品自检_含缺陷_倒角麻_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="大/凹面麻" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data['成品自检_含缺陷_大/凹面麻']?scope.row.data['成品自检_含缺陷_大/凹面麻']:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="小面麻" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_小面麻?scope.row.data.成品自检_含缺陷_小面麻:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_含缺陷_小面麻_比例">{{ scope.row.data.成品自检_含缺陷_小面麻_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="炸废" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_炸废?scope.row.data.成品自检_含缺陷_炸废:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_含缺陷_炸废_比例">{{ scope.row.data.成品自检_含缺陷_炸废_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="台" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_台?scope.row.data.成品自检_含缺陷_台:0}}</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>
+				<el-table-column label="小崩" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_小崩?scope.row.data.成品自检_含缺陷_小崩:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_含缺陷_小崩_比例">{{ scope.row.data.成品自检_含缺陷_小崩_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="前角崩" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_前角崩?scope.row.data.成品自检_含缺陷_前角崩:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_含缺陷_前角崩_比例">{{ scope.row.data.成品自检_含缺陷_前角崩_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="平面硌" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_平面硌?scope.row.data.成品自检_含缺陷_平面硌:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_含缺陷_平面硌_比例">{{ scope.row.data.成品自检_含缺陷_平面硌_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="小柱划" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_小柱划?scope.row.data.成品自检_含缺陷_小柱划:0}}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="总厚" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_总厚?scope.row.data.成品自检_含缺陷_总厚:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_含缺陷_总厚_比例">{{ scope.row.data.成品自检_含缺陷_总厚_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="大外划硌" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_大外划硌?scope.row.data.成品自检_含缺陷_大外划硌:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_含缺陷_大外划硌_比例">{{ scope.row.data.成品自检_含缺陷_大外划硌_比例}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="台高" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_含缺陷_台高?scope.row.data.成品自检_含缺陷_台高:0}}</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>
+				<el-table-column label="合格数" align="center" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.成品自检_count_ok }} </span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.成品自检_合格率">{{ scope.row.data.成品自检_合格率 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span>{{ scope.row.data.成品自检_缺陷_备注 }}</span>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "statistics_guan",
+	data() {
+		return {
+			params: {
+				ordering:'-data__成品自检_小日期',
+				querys:[[{field:"data__has_key",compare:"",value:"成品自检_日期"}]],
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.batchstquery,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"data__has_key",compare:"",value:"成品自检_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__成品自检_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material_start__name';
+			obj3.value = that.query.name__contains;
+			obj3.compare = 'contains';
+
+			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){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+		getCountQt(data,type){
+			let count_qt = 0,count = 0;
+		   
+		}
+	},
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/statistics/bxerp/fenjianTotal.vue b/src/views/statistics/bxerp/fenjianTotal.vue
index 139c15de..5e2566ba 100644
--- a/src/views/statistics/bxerp/fenjianTotal.vue
+++ b/src/views/statistics/bxerp/fenjianTotal.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,11 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-				>导出</el-button>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -30,60 +30,102 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
-				<el-table-column label="批次号" fixed="left">
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
+				<el-table-column label="批次号" prop="batch" fixed="left">
+				</el-table-column>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
+				</el-table-column>
+				<el-table-column label="分检数" fixed="left">
 					<template #default="scope">
-						<span>{{ scope.row.data.分检_批次号 }}</span>
+						<span>{{ scope.row.data.分检_count_use }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="版型" prop="number" fixed="left">
-				</el-table-column>
-				<el-table-column label="分检数" prop="number" fixed="left">
-				</el-table-column>
 				<el-table-column label="S畸变" align="center" class-name="colorheader1">
-					<el-table-column label="差值" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
 						<template #default="scope">
-							<span>{{ scope.row.data.分检_检测项_S畸变 }}</span>
+							<span>{{ scope.row.data.分检_含缺陷_S畸变不合格 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader1">
+					<el-table-column label="比例" class-name="colorheader1">
 						<template #default="scope">
-							<span>{{scope.row.data.分检_缺陷项_S畸变不合格?1-scope.row.data.分检_缺陷项_S畸变不合格:1 }}</span>
+							<span v-if="scope.row.data.分检_含缺陷_S畸变不合格_比例">{{ scope.row.data.分检_含缺陷_S畸变不合格_比例 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
 				<el-table-column label="像位移" align="center" class-name="colorheader2">
-					<el-table-column label="差值" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
 						<template #default="scope">
-							<span>{{ scope.row.data.分检_检测项_像位移 }}</span>
+							<span>{{ scope.row.data.分检_含缺陷_像位移不合格 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="合格数" class-name="colorheader2">
+					<el-table-column label="比例" class-name="colorheader2">
 						<template #default="scope">
-							<span>{{ scope.row.data.分检_缺陷项_像位移不合格?1-scope.row.data.分检_缺陷项_像位移不合格:1 }}</span>
+							<span v-if="scope.row.data.分检_含缺陷_像位移不合格_比例">{{ scope.row.data.分检_含缺陷_像位移不合格_比例 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
 				<el-table-column label="炸废" align="center" class-name="colorheader3">
-					<template #default="scope">
-						<span>{{ scope.row.data.分检_缺陷项_炸废?scope.row.data.分检_缺陷项_炸废:0 }}</span>
-					</template>
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.分检_含缺陷_炸废 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.分检_含缺陷_炸废_比例">{{ scope.row.data.分检_含缺陷_炸废_比例 }}%</span>
+						</template>
+					</el-table-column>
 				</el-table-column>
 				<el-table-column label="放大率" align="center" class-name="colorheader4">
-					<template #default="scope">
-						<span>{{ scope.row.data.分检_缺陷项_放大率?scope.row.data.分检_缺陷项_放大率:0 }}</span>
-					</template>
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.分检_含缺陷_放大率 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.分检_含缺陷_放大率_比例">{{ scope.row.data.分检_含缺陷_放大率_比例 }}%</span>
+						</template>
+					</el-table-column>
 				</el-table-column>
 				<el-table-column label="角偏" align="center" class-name="colorheader5">
-					<template #default="scope">
-						<span>{{ scope.row.data.分检_缺陷项_角偏?scope.row.data.分检_缺陷项_角偏:0 }}</span>
-					</template>
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ 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>
 				<el-table-column label="扭转角不合格" align="center" class-name="colorheader6">
-					<template #default="scope">
-						<span>{{scope.row.data.分检_缺陷项_扭转角不合格?scope.row.data.分检_缺陷项_扭转角不合格:0}}</span>
-					</template>
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.分检_含缺陷_扭转角不合格 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.分检_含缺陷_扭转角不合格_比例">{{ scope.row.data.分检_含缺陷_扭转角不合格_比例 }}%</span>
+						</template>
+					</el-table-column>
 				</el-table-column>
-				<el-table-column label="备注" align="center" class-name="colorheader7">
+				<el-table-column label="合格" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.分检_count_ok }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.分检_合格率">{{scope.row.data.分检_合格率 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader1">
 					<template #default="scope">
 						<span>{{ scope.row.data.分检_缺陷项_备注 }}</span>
 					</template>
@@ -99,8 +141,8 @@ export default {
 	data() {
 		return {
 			params: {
-				ordering:'data__分检_批次号',
-				querys:[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"分检_批次号"}]],
+				ordering:'-data__分检_小日期',
+				querys:[[{field:"data__has_key",compare:"",value:"分检_日期"}]]
 			},
 			query:{
 				name__contains:'',
@@ -108,7 +150,7 @@ export default {
 				last_time__gte:'',
 				last_time__lte:'',
 			},
-			apiObj: this.$API.wpm.wpr.query,
+			apiObj: this.$API.wpm.batchstquery,
 			options:[],
 			tableData:[],
 		};
@@ -117,13 +159,34 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"data__has_key",compare:"",value:"分检_批次号"}]];
-			let obj = {};
-			obj.field = 'batch';
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__分检_批次号';
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material_start__name';
+			obj3.value = that.query.name__contains;
+			obj3.compare = 'contains';
 			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){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},
diff --git a/src/views/statistics/bxerp/gzcpjcTotal.vue b/src/views/statistics/bxerp/gzcpjcTotal.vue
new file mode 100644
index 00000000..221ac1c7
--- /dev/null
+++ b/src/views/statistics/bxerp/gzcpjcTotal.vue
@@ -0,0 +1,222 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-input v-model="query.batch__contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="params"
+				id="exportDiv"
+				row-key="id"
+				stripe
+			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
+				<el-table-column label="批次号" prop="batch" fixed="left">
+				</el-table-column>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
+				</el-table-column>
+				<el-table-column label="检测数" fixed="left">
+					<template #default="scope">
+						<span>{{ scope.row.data.光锥成品检测_count_use }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="放大率" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.光锥成品检测_含缺陷_放大率 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.光锥成品检测_含缺陷_放大率_比例">{{scope.row.data.光锥成品检测_含缺陷_放大率_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="方台" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ 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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="缺角" align="center" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.光锥成品检测_含缺陷_缺角 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.光锥成品检测_含缺陷_缺角_比例">{{scope.row.data.光锥成品检测_含缺陷_缺角_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="畸变" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.光锥成品检测_含缺陷_畸变 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.光锥成品检测_含缺陷_畸变_比例">{{scope.row.data.光锥成品检测_含缺陷_畸变_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="高度" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ 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>
+				<el-table-column label="外径" align="center" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.光锥成品检测_含缺陷_外径 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.光锥成品检测_含缺陷_外径_比例">{{scope.row.data.光锥成品检测_含缺陷_外径_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="小经" align="center" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.光锥成品检测_含缺陷_小经 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.光锥成品检测_含缺陷_小经_比例">{{scope.row.data.光锥成品检测_含缺陷_小经_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="凹面直径" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.光锥成品检测_含缺陷_凹面直径 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.光锥成品检测_含缺陷_凹面直径_比例">{{scope.row.data.光锥成品检测_含缺陷_凹面直径_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="合格" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.光锥成品检测_count_ok }}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.光锥成品检测_缺陷项_备注 }}</span>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "statistics_guan",
+	data() {
+		return {
+			params: {
+				ordering:'-data__光锥成品检测_小日期',
+				querys:[[{field:"data__has_key",compare:"",value:"光锥成品检测_日期"}]]
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.batchstquery,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"data__has_key",compare:"",value:"光锥成品检测_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__扭后检测_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material_start__name';
+			obj3.value = that.query.name__contains;
+			obj3.compare = 'contains';
+			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){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+	},
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/statistics/bxerp/maopiTotal.vue b/src/views/statistics/bxerp/maopiTotal.vue
index 6d814183..3fc3cde2 100644
--- a/src/views/statistics/bxerp/maopiTotal.vue
+++ b/src/views/statistics/bxerp/maopiTotal.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,11 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-				>导出</el-button>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -29,17 +29,17 @@
 				row-key="id"
 				stripe
 			>
-				<el-table-column label="单号" prop="batch" align="center" fixed="left">
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
+				<el-table-column label="批次单号" prop="batch" align="center" fixed="left">
 				</el-table-column>
 				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
 					<template #default="scope">
 						{{ scope.row.data.毛坯检测_日期 }}
 					</template>
 				</el-table-column>
-				<el-table-column label="版型" prop="number" fixed="left">
-					<template #default="scope">
-						{{ scope.row.material_start_name }}{{ scope.row.material_start_model }}
-					</template>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
 				</el-table-column>
 				<el-table-column label="共检" fixed="left">
 					<template #default="scope">
@@ -115,7 +115,7 @@
 					</el-table-column>
 					<el-table-column label="比率" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{  scope.row.data.毛坯检测_含缺陷_暗点合格_比例?scope.row.data.毛坯检测_含缺陷_暗点合格_比例:0 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_含缺陷_暗点合格_比例">{{  scope.row.data.毛坯检测_含缺陷_暗点合格_比例 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="长点数" class-name="colorheader4">
@@ -125,7 +125,7 @@
 					</el-table-column>
 					<el-table-column label="比率" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{  scope.row.data.毛坯检测_含缺陷_暗点不合格_比例?scope.row.data.毛坯检测_含缺陷_暗点不合格_比例:0 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_含缺陷_暗点不合格_比例">{{  scope.row.data.毛坯检测_含缺陷_暗点不合格_比例 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="可加工" class-name="colorheader4">
@@ -149,7 +149,7 @@
 					</el-table-column>
 					<el-table-column label="比率" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_含缺陷_暗点重_比例?scope.row.data.毛坯检测_含缺陷_暗点重_比例:0 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_含缺陷_暗点重_比例">{{ scope.row.data.毛坯检测_含缺陷_暗点重_比例 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -161,7 +161,7 @@
 					</el-table-column>
 					<el-table-column label="比率" align="center" class-name="colorheader6">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_含缺陷_花丝_比例?scope.row.data.毛坯检测_含缺陷_花丝_比例:0 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_含缺陷_花丝_比例">{{ scope.row.data.毛坯检测_含缺陷_花丝_比例 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -173,7 +173,7 @@
 					</el-table-column>
 					<el-table-column label="比率" align="center" class-name="colorheader7">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_含缺陷_网格_比例?scope.row.data.毛坯检测_含缺陷_网格_比例:0 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_含缺陷_网格_比例">{{ scope.row.data.毛坯检测_含缺陷_网格_比例 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -185,7 +185,7 @@
 					</el-table-column>
 					<el-table-column label="比率" class-name="colorheader1">
 						<template #default="scope">
-							<span>{{  scope.row.data.毛坯检测_含缺陷_花朵轻_比例?scope.row.data.毛坯检测_含缺陷_花朵轻_比例:0 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_含缺陷_花朵轻_比例">{{  scope.row.data.毛坯检测_含缺陷_花朵轻_比例 }}%</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="重数量" class-name="colorheader1">
@@ -195,7 +195,7 @@
 					</el-table-column>
 					<el-table-column label="比率" class-name="colorheader1">
 						<template #default="scope">
-							<span>{{  scope.row.data.毛坯检测_含缺陷_花朵重_比例?scope.row.data.毛坯检测_含缺陷_花朵重_比例:0 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_含缺陷_花朵重_比例">{{  scope.row.data.毛坯检测_含缺陷_花朵重_比例 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -207,7 +207,7 @@
 					</el-table-column>
 					<el-table-column label="比率" align="center" class-name="colorheader2">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_含缺陷_S畸变不合格_比例?scope.row.data.毛坯检测_含缺陷_S畸变不合格_比例:0 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_含缺陷_S畸变不合格_比例">{{ scope.row.data.毛坯检测_含缺陷_S畸变不合格_比例 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -219,7 +219,7 @@
 					</el-table-column>
 					<el-table-column label="比率" align="center" class-name="colorheader3">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_含缺陷_弓形畸变不合格_比例?scope.row.data.毛坯检测_含缺陷_弓形畸变不合格_比例:0 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_含缺陷_弓形畸变不合格_比例">{{ scope.row.data.毛坯检测_含缺陷_弓形畸变不合格_比例 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -231,7 +231,7 @@
 					</el-table-column>
 					<el-table-column label="比率" align="center" class-name="colorheader4">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_含缺陷_炸废_比例?scope.row.data.毛坯检测_含缺陷_炸废_比例:0 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_含缺陷_炸废_比例">{{ scope.row.data.毛坯检测_含缺陷_炸废_比例 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -243,7 +243,7 @@
 					</el-table-column>
 					<el-table-column label="比率" align="center" class-name="colorheader5">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_含缺陷_角偏_比例?scope.row.data.毛坯检测_含缺陷_角偏_比例:0 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_含缺陷_角偏_比例">{{ scope.row.data.毛坯检测_含缺陷_角偏_比例 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -255,11 +255,23 @@
 					</el-table-column>
 					<el-table-column label="比率" align="center" class-name="colorheader6">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_含缺陷_色差_比例?scope.row.data.毛坯检测_含缺陷_色差_比例:0 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_含缺陷_色差_比例">{{ scope.row.data.毛坯检测_含缺陷_色差_比例 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="总加工数" align="center" class-name="colorheader7">
+				<el-table-column label="改实验" align="center" class-name="colorheader6">
+					<el-table-column label="数量" align="center" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.毛坯检测_含缺陷_改实验?scope.row.data.毛坯检测_含缺陷_改实验:0 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比率" align="center" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.毛坯检测_含缺陷_改实验_比例">{{ scope.row.data.毛坯检测_含缺陷_改实验_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="总加工数" align="center" class-name="colorheader7">	
 					<el-table-column label="数量" class-name="colorheader7">
 						<template #default="scope">
 							<span>{{ scope.row.data.毛坯检测_count_ok }}</span>
@@ -267,7 +279,7 @@
 					</el-table-column>
 					<el-table-column label="合格率" class-name="colorheader7">
 						<template #default="scope">
-							<span>{{ scope.row.data.毛坯检测_合格率 }}%</span>
+							<span v-if="scope.row.data.毛坯检测_合格率">{{ scope.row.data.毛坯检测_合格率 }}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
@@ -291,7 +303,10 @@ export default {
 				querys:[[{field:"data__has_key",compare:"",value:"毛坯检测_日期"}]],
 			},
 			query:{
-				batch__contains:''
+				batch__contains:'',
+				name__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
 			},
 			apiObj: this.$API.wpm.batchstquery,
 			options:[],
@@ -302,13 +317,20 @@ export default {
 		handleQuery(){
 			let that = this;
 			let querys = [[{field:"data__has_key",compare:"",value:"毛坯检测_日期"}]];
-			let obj = {};
+			let obj = {},obj2 = {};
 			obj.field = 'batch';
 			obj.value = that.query.batch__contains;
 			obj.compare = '';
+			obj2.field = 'material_start__name';
+			obj2.value = that.query.name__contains;
+			obj2.compare = 'contains';
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
 			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj2);
+			}
+
 			that.params.querys = querys;
 			this.$refs.table.queryData(that.params);
 		},
diff --git a/src/views/statistics/bxerp/niuzhuanTotal.vue b/src/views/statistics/bxerp/niuzhuanTotal.vue
index ff38f37b..e5f97524 100644
--- a/src/views/statistics/bxerp/niuzhuanTotal.vue
+++ b/src/views/statistics/bxerp/niuzhuanTotal.vue
@@ -2,6 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
 				<el-input v-model="query.batch__contains" 
 					placeholder="批次号" 
 					clearable 
@@ -12,11 +17,6 @@
 					icon="el-icon-search"
 					@click="handleQuery"
 				></el-button>
-				<el-button
-					@click="handleExport"
-					class="tables"
-					type="primary"
-				>导出</el-button>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -29,345 +29,324 @@
 				row-key="id"
 				stripe
 			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
 				<el-table-column label="批次编号" fixed="left" prop="batch">
 				</el-table-column>
-				<el-table-column label="版型" prop="number" fixed="left">
-					<template #default="scope">
-						{{ scope.row.material_start_name }}{{ scope.row.material_start_model }}
-					</template>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
 				</el-table-column>
 				<el-table-column label="扭转数" fixed="left">
 					<template #default="scope">
 						{{ scope.row.data.扭后检测_count_use }}
 					</template>
 				</el-table-column>
-				<el-table-column label="扭后内质" align="center" class-name="colorheader1">
-					<el-table-column label="合格" class-name="colorheader1">
-						<el-table-column label="数量" class-name="colorheader1">
-							<template #default="scope">
-								<span v-if="scope.row.data.扭后检测_含缺陷_暗点不合格&&scope.row.data.扭后检测_含缺陷_暗点重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_暗点不合格 - scope.row.data.扭后检测_含缺陷_暗点重 }}</span>
-								<span v-else>
-									<span v-if="scope.row.data.扭后检测_含缺陷_暗点重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_暗点重 }}</span>
-									<span v-else-if="scope.row.data.扭后检测_含缺陷_暗点不合格">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_暗点不合格 }}</span>
-									<span v-else>{{ scope.row.data.扭后检测_count_use }}</span>
-								</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="比例" class-name="colorheader1">
-							<template #default="scope">
-								<span v-if="scope.row.data.扭后检测_含缺陷_暗点不合格&&scope.row.data.扭后检测_含缺陷_暗点重">{{100- scope.row.data.扭后检测_含缺陷_暗点不合格_比例 - scope.row.data.扭后检测_含缺陷_暗点重_比例 }}%</span>
-								<span v-else>
-									<span v-if="scope.row.data.扭后检测_含缺陷_暗点重">{{ 100 - scope.row.data.扭后检测_含缺陷_暗点重_比例 }}%</span>
-									<span v-else-if="scope.row.data.扭后检测_含缺陷_暗点不合格">{{100- scope.row.data.扭后检测_含缺陷_暗点不合格_比例 }}%</span>
-									<span v-else>100%</span>
-								</span>
-							</template>
-						</el-table-column>
+				<el-table-column label="扭转角不合格" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_扭转角不合格}}</span>
+						</template>
 					</el-table-column>
-					<el-table-column label="可加工" class-name="colorheader1">
-						<el-table-column label="数量" class-name="colorheader1">	
-							<template #default="scope">
-								<span>{{ scope.row.data.扭后检测_含缺陷_暗点不合格?scope.row.data.扭后检测_含缺陷_暗点不合格:0 }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="比例" class-name="colorheader1">
-							<template #default="scope">
-								<span>{{  scope.row.data.扭后检测_含缺陷_暗点不合格?scope.row.data.扭后检测_含缺陷_暗点不合格_比例:0 }}%</span>
-							</template>
-						</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.扭后检测_含缺陷_扭转角不合格_比例">{{scope.row.data.扭后检测_含缺陷_扭转角不合格_比例 }}%</span>
+						</template>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="黑网格" align="center" class-name="colorheader2">
-					<el-table-column label="无" class-name="colorheader2">
+				<el-table-column label="扭后内质" align="center" class-name="colorheader2">
+					<el-table-column label="合格" class-name="colorheader2">
 						<el-table-column label="数量" class-name="colorheader2">
 							<template #default="scope">
-								<span v-if="scope.row.data.扭后检测_含缺陷_黑网轻&&scope.row.data.扭后检测_含缺陷_黑网重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_黑网轻 - scope.row.data.扭后检测_含缺陷_黑网重 }}</span>
-								<span v-else>
-									<span v-if="scope.row.data.扭后检测_含缺陷_黑网轻">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_黑网轻 }}</span>
-									<span v-else-if="scope.row.data.扭后检测_含缺陷_黑网重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_黑网重 }}</span>
-									<span v-else>{{ scope.row.data.扭后检测_count_use }}</span>
-								</span>
+								<span v-if="scope.row.data.扭后检测_含缺陷_暗点合格">{{ scope.row.data.扭后检测_含缺陷_暗点合格?扭后检测_含缺陷_暗点合格:0 }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="比例" class-name="colorheader2">
 							<template #default="scope">
-								<span v-if="scope.row.data.扭后检测_含缺陷_黑网轻&&scope.row.data.扭后检测_含缺陷_黑网重">{{100- scope.row.data.扭后检测_含缺陷_黑网重_比例 - scope.row.data.扭后检测_含缺陷_黑网轻_比例 }}%</span>
+								<span v-if="scope.row.data.扭后检测_含缺陷_暗点合格_比例">{{scope.row.data.扭后检测_含缺陷_暗点合格_比例 }}%</span>
+							</template>
+						</el-table-column>
+					</el-table-column>
+					<el-table-column label="可加工" class-name="colorheader2">
+						<el-table-column label="数量" class-name="colorheader2">	
+							<template #default="scope">
+								<span>{{ scope.row.data.扭后检测_含缺陷_暗点不合格?scope.row.data.扭后检测_含缺陷_暗点合格?scope.row.data.扭后检测_count_use-scope.row.data.扭后检测_含缺陷_暗点不合格-scope.row.data.扭后检测_含缺陷_暗点合格:scope.row.data.扭后检测_count_use-scope.row.data.扭后检测_含缺陷_暗点不合格:scope.row.data.扭后检测_count_use }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="比例" class-name="colorheader2">
+							<template #default="scope">
+								<span v-if="scope.row.data.扭后检测_含缺陷_暗点不合格_比例">
+									<span v-if="scope.row.data.扭后检测_含缺陷_暗点合格_比例">{{100-scope.row.data.扭后检测_含缺陷_暗点不合格_比例-scope.row.data.扭后检测_含缺陷_暗点合格_比例 }}%</span>
+									<span v-else>{{ 100-scope.row.data.扭后检测_含缺陷_暗点不合格_比例 }}%</span>
+								</span>
 								<span v-else>
-									<span v-if="scope.row.data.扭后检测_含缺陷_黑网轻">{{ 100 - scope.row.data.扭后检测_含缺陷_黑网轻_比例 }}%</span>
-									<span v-else-if="scope.row.data.扭后检测_含缺陷_黑网重">{{100- scope.row.data.扭后检测_含缺陷_黑网重_比例 }}%</span>
-									<span v-else>100%</span>
+									<span v-if="scope.row.data.扭后检测_含缺陷_暗点合格_比例">{{100-scope.row.data.扭后检测_含缺陷_暗点合格_比例 }}%</span>
+									<span>100%</span>
 								</span>
 							</template>
 						</el-table-column>
 					</el-table-column>
-					<el-table-column label="轻" class-name="colorheader2">
+					<el-table-column label="不合格" class-name="colorheader2">
 						<el-table-column label="数量" class-name="colorheader2">
+							<template #default="scope">
+								<span v-if="scope.row.data.扭后检测_含缺陷_暗点不合格">{{ scope.row.data.扭后检测_含缺陷_暗点不合格?scope.row.data.扭后检测_含缺陷_暗点不合格:0 }}</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>
+							</template>
+						</el-table-column>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="黑网格" align="center" class-name="colorheader3">
+					<el-table-column label="轻" class-name="colorheader3">
+						<el-table-column label="数量" class-name="colorheader3">
 							<template #default="scope">
 								<span>{{ scope.row.data.扭后检测_含缺陷_黑网轻?scope.row.data.扭后检测_含缺陷_黑网轻:0 }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="比例" class-name="colorheader2">
+						<el-table-column label="比例" class-name="colorheader3">
 							<template #default="scope">
 								<span>{{  scope.row.data.扭后检测_含缺陷_黑网轻_比例?scope.row.data.扭后检测_含缺陷_黑网轻_比例:0 }}%</span>
 							</template>
 						</el-table-column>
 					</el-table-column>
-					<el-table-column label="重" class-name="colorheader2">
-						<el-table-column label="数量" class-name="colorheader2">
-							<template #default="scope">
-								<span>{{ scope.row.data.扭后检测_含缺陷_黑网重?scope.row.data.扭后检测_含缺陷_黑网重:0 }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="比例" class-name="colorheader2">
-							<template #default="scope">
-								<span>{{  scope.row.data.扭后检测_含缺陷_黑网重_比例?scope.row.data.扭后检测_含缺陷_黑网重_比例:0 }}%</span>
-							</template>
-						</el-table-column>
-					</el-table-column>
-				</el-table-column>
-				<el-table-column label="白网格" align="center" class-name="colorheader3">
-					<el-table-column label="无" class-name="colorheader3">
-						<el-table-column label="数量" class-name="colorheader3">
-							<template #default="scope">
-								<span v-if="scope.row.data.扭后检测_含缺陷_白网轻&&scope.row.data.扭后检测_含缺陷_白网重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_白网轻 - scope.row.data.扭后检测_含缺陷_白网重 }}</span>
-								<span v-else>
-									<span v-if="scope.row.data.扭后检测_含缺陷_白网轻">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_白网轻 }}</span>
-									<span v-else-if="scope.row.data.扭后检测_含缺陷_白网重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_白网重 }}</span>
-									<span v-else>{{ scope.row.data.扭后检测_count_use }}</span>
-								</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="比例" class-name="colorheader3">
-							<template #default="scope">
-								<span v-if="scope.row.data.扭后检测_含缺陷_白网轻&&scope.row.data.扭后检测_含缺陷_白网重">{{100- scope.row.data.扭后检测_含缺陷_白网重_比例 - scope.row.data.扭后检测_含缺陷_白网轻_比例 }}%</span>
-								<span v-else>
-									<span v-if="scope.row.data.扭后检测_含缺陷_白网轻">{{ 100 - scope.row.data.扭后检测_含缺陷_白网轻_比例 }}%</span>
-									<span v-else-if="scope.row.data.扭后检测_含缺陷_白网重">{{100- scope.row.data.扭后检测_含缺陷_白网重_比例 }}%</span>
-									<span v-else>100%</span>
-								</span>
-							</template>
-						</el-table-column>
-					</el-table-column>
-					<el-table-column label="轻" class-name="colorheader3">
-						<el-table-column label="数量" class-name="colorheader3">
-							<template #default="scope">
-								<span>{{ scope.row.data.扭后检测_含缺陷_白网轻?scope.row.data.扭后检测_含缺陷_白网轻:0 }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="比例" class-name="colorheader3">
-							<template #default="scope">
-								<span>{{  scope.row.data.扭后检测_含缺陷_白网轻_比例?scope.row.data.扭后检测_含缺陷_白网轻_比例:0 }}%</span>
-							</template>
-						</el-table-column>
-					</el-table-column>
 					<el-table-column label="重" class-name="colorheader3">
 						<el-table-column label="数量" class-name="colorheader3">
 							<template #default="scope">
-								<span>{{ scope.row.data.扭后检测_含缺陷_白网重?scope.row.data.扭后检测_含缺陷_白网重:0 }}</span>
+								<span>{{ scope.row.data.扭后检测_含缺陷_黑网重?scope.row.data.扭后检测_含缺陷_黑网重:0 }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="比例" class-name="colorheader3">
 							<template #default="scope">
-								<span>{{  scope.row.data.扭后检测_含缺陷_白网重_比例?scope.row.data.扭后检测_含缺陷_白网重_比例:0 }}%</span>
+								<span>{{  scope.row.data.扭后检测_含缺陷_黑网重_比例?scope.row.data.扭后检测_含缺陷_黑网重_比例:0 }}%</span>
+							</template>
+						</el-table-column>
+					</el-table-column>
+					<el-table-column label="废" class-name="colorheader3">
+						<el-table-column label="数量" class-name="colorheader3">
+							<template #default="scope">
+								<span>{{ scope.row.data.扭后检测_含缺陷_黑网废?scope.row.data.扭后检测_含缺陷_黑网废:0 }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="比例" class-name="colorheader3">
+							<template #default="scope">
+								<span v-if="scope.row.data.扭后检测_含缺陷_黑网废_比例">{{scope.row.data.扭后检测_含缺陷_黑网废_比例 }}%</span>
 							</template>
 						</el-table-column>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="小网" align="center" class-name="colorheader4">
-					<el-table-column label="无" class-name="colorheader4">
-						<el-table-column label="数量" class-name="colorheader4">
-							<template #default="scope">
-								<span v-if="scope.row.data.扭后检测_含缺陷_小网轻&&scope.row.data.扭后检测_含缺陷_小网重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_小网轻 - scope.row.data.扭后检测_含缺陷_小网重 }}</span>
-								<span v-else>
-									<span v-if="scope.row.data.扭后检测_含缺陷_小网轻">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_小网轻 }}</span>
-									<span v-else-if="scope.row.data.扭后检测_含缺陷_小网重">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_小网重 }}</span>
-									<span v-else>{{ scope.row.data.扭后检测_count_use }}</span>
-								</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="比例" class-name="colorheader4">
-							<template #default="scope">
-								<span v-if="scope.row.data.扭后检测_含缺陷_小网轻&&scope.row.data.扭后检测_含缺陷_小网重">{{100- scope.row.data.扭后检测_含缺陷_小网重_比例 - scope.row.data.扭后检测_含缺陷_小网轻_比例 }}%</span>
-								<span v-else>
-									<span v-if="scope.row.data.扭后检测_含缺陷_小网轻">{{ 100 - scope.row.data.扭后检测_含缺陷_小网轻_比例 }}%</span>
-									<span v-else-if="scope.row.data.扭后检测_含缺陷_小网重">{{100- scope.row.data.扭后检测_含缺陷_小网重_比例 }}%</span>
-									<span v-else>100%</span>
-								</span>
-							</template>
-						</el-table-column>
-					</el-table-column>
+				<el-table-column label="白网格" align="center" class-name="colorheader4">
 					<el-table-column label="轻" class-name="colorheader4">
 						<el-table-column label="数量" class-name="colorheader4">
 							<template #default="scope">
-								<span>{{ scope.row.data.扭后检测_含缺陷_小网轻?scope.row.data.扭后检测_含缺陷_小网轻:0 }}</span>
+								<span>{{ scope.row.data.扭后检测_含缺陷_白网轻?scope.row.data.扭后检测_含缺陷_白网轻:0 }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="比例" class-name="colorheader4">
 							<template #default="scope">
-								<span>{{  scope.row.data.扭后检测_含缺陷_小网轻_比例?scope.row.data.扭后检测_含缺陷_小网轻_比例:0 }}%</span>
+								<span>{{  scope.row.data.扭后检测_含缺陷_白网轻_比例?scope.row.data.扭后检测_含缺陷_白网轻_比例:0 }}%</span>
 							</template>
 						</el-table-column>
 					</el-table-column>
 					<el-table-column label="重" class-name="colorheader4">
 						<el-table-column label="数量" class-name="colorheader4">
 							<template #default="scope">
-								<span>{{ scope.row.data.扭后检测_含缺陷_小网重?scope.row.data.扭后检测_含缺陷_小网重:0 }}</span>
+								<span>{{ scope.row.data.扭后检测_含缺陷_白网重?scope.row.data.扭后检测_含缺陷_白网重:0 }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="比例" class-name="colorheader4">
+							<template #default="scope">
+								<span>{{  scope.row.data.扭后检测_含缺陷_白网重_比例?scope.row.data.扭后检测_含缺陷_白网重_比例:0 }}%</span>
+							</template>
+						</el-table-column>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="小网" align="center" class-name="colorheader5">
+					<el-table-column label="轻" class-name="colorheader5">
+						<el-table-column label="数量" class-name="colorheader5">
+							<template #default="scope">
+								<span>{{ scope.row.data.扭后检测_含缺陷_小网轻?scope.row.data.扭后检测_含缺陷_小网轻:0 }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="比例" class-name="colorheader5">
+							<template #default="scope">
+								<span>{{  scope.row.data.扭后检测_含缺陷_小网轻_比例?scope.row.data.扭后检测_含缺陷_小网轻_比例:0 }}%</span>
+							</template>
+						</el-table-column>
+					</el-table-column>
+					<el-table-column label="重" class-name="colorheader5">
+						<el-table-column label="数量" class-name="colorheader5">
+							<template #default="scope">
+								<span>{{ scope.row.data.扭后检测_含缺陷_小网重?scope.row.data.扭后检测_含缺陷_小网重:0 }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="比例" class-name="colorheader5">
 							<template #default="scope">
 								<span>{{  scope.row.data.扭后检测_含缺陷_小网重_比例?scope.row.data.扭后检测_含缺陷_小网重_比例:0 }}%</span>
 							</template>
 						</el-table-column>
 					</el-table-column>
-				</el-table-column>
-				<el-table-column label="分辨率" align="center" class-name="colorheader5">
-					<el-table-column label="测试数量" class-name="colorheader5">
-						<template #default="scope">
-							<span>{{ scope.row.data.扭后检测_count_use }} </span>
-						</template>
-					</el-table-column>
-					<el-table-column label="国内" class-name="colorheader5">
+					<el-table-column label="废" class-name="colorheader5">
 						<el-table-column label="数量" class-name="colorheader5">
 							<template #default="scope">
-								<span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率:0}}</span>
+								<span>{{ scope.row.data.扭后检测_含缺陷_小网废?scope.row.data.扭后检测_含缺陷_小网废:0 }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="比例" class-name="colorheader5">
 							<template #default="scope">
-								<span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率_比例:0}}%</span>
-							</template>
-						</el-table-column>
-					</el-table-column>
-					<el-table-column label="出口" class-name="colorheader5">
-						<el-table-column label="数量" class-name="colorheader5">
-							<template #default="scope">
-								<span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率:0}}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="比例" class-name="colorheader5">
-							<template #default="scope">
-								<span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率_比例:0}}%</span>
-							</template>
-						</el-table-column>
-					</el-table-column>
-					<el-table-column label="不合格" class-name="colorheader5">
-						<el-table-column label="数量" class-name="colorheader5">
-							<template #default="scope">
-								<span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率:0}}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="比例" class-name="colorheader5">
-							<template #default="scope">
-								<span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率_比例:0}}%</span>
+								<span>{{  scope.row.data.扭后检测_含缺陷_小网废_比例?scope.row.data.扭后检测_含缺陷_小网废_比例:0 }}%</span>
 							</template>
 						</el-table-column>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="加工数" align="center" class-name="colorheader6">
+				<el-table-column label="分辨率" align="center" class-name="colorheader6">
 					<el-table-column label="数量" class-name="colorheader6">
 						<template #default="scope">
-							<span>{{ scope.row.data.扭后检测_count_ok }} </span>
+							<span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率:0}}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="比例" class-name="colorheader6">
 						<template #default="scope">
-							<span>{{ scope.row.data.扭后检测_合格率 }}</span>
+							<span>{{ scope.row.data.扭后检测_含缺陷_分辨率?scope.row.data.扭后检测_含缺陷_分辨率_比例:0}}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="毛坯扭送" align="center" class-name="colorheader7">
+				<el-table-column label="扭送损失" align="center" class-name="colorheader7">
+					<el-table-column label="炸纹" class-name="colorheader7">
+						<el-table-column label="数量" class-name="colorheader7">
+							<template #default="scope">
+								<span>{{ scope.row.data.扭后检测_含缺陷_扭后炸纹?扭后检测_含缺陷_扭后炸纹:0 }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="比例" class-name="colorheader7">
+							<template #default="scope">
+								<span>{{  scope.row.data.扭后检测_含缺陷_扭后炸纹?scope.row.data.扭后检测_含缺陷_扭后炸纹_比列:0 }}%</span>
+							</template>
+						</el-table-column>
+					</el-table-column>
+					<el-table-column label="炸废" class-name="colorheader7">
+						<el-table-column label="数量" class-name="colorheader7">
+							<template #default="scope">
+								<span>{{ scope.row.data.扭后检测_含缺陷_扭后炸废?扭后检测_含缺陷_扭后炸废:0 }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="比例" class-name="colorheader7">
+							<template #default="scope">
+								<span>{{  scope.row.data.扭后检测_含缺陷_扭后炸废?scope.row.data.扭后检测_含缺陷_扭后炸废_比列:0 }}%</span>
+							</template>
+						</el-table-column>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="改直" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_改直?scope.row.data.扭后检测_含缺陷_改直:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_改直?scope.row.data.扭后检测_含缺陷_改直_比例:0}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="S畸变不合格" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_S畸变不合格?scope.row.data.扭后检测_含缺陷_S畸变不合格:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_S畸变不合格?scope.row.data.扭后检测_含缺陷_S畸变不合格_比例:0}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="弓形畸变不合格" align="center" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_弓形畸变不合格?scope.row.data.扭后检测_含缺陷_弓形畸变不合格:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_弓形畸变不合格?scope.row.data.扭后检测_含缺陷_弓形畸变不合格_比例:0}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="角偏" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_角偏?scope.row.data.扭后检测_含缺陷_角偏:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_角偏?scope.row.data.扭后检测_含缺陷_角偏_比例:0}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="花丝" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_花丝?scope.row.data.扭后检测_含缺陷_花丝:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_花丝?scope.row.data.扭后检测_含缺陷_花丝_比例:0}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="高差" align="center" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_高差?scope.row.data.扭后检测_含缺陷_高差:0}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_含缺陷_高差?scope.row.data.扭后检测_含缺陷_高差_比例:0}}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="色差" align="center" class-name="colorheader7">
 					<el-table-column label="数量" class-name="colorheader7">
 						<template #default="scope">
-							<span>{{ scope.row.data.扭后检测_count_ok }} </span>
+							<span>{{ scope.row.data.扭后检测_含缺陷_色差?scope.row.data.扭后检测_含缺陷_色差:0}}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="时间" class-name="colorheader7">
+					<el-table-column label="比例" class-name="colorheader7">
 						<template #default="scope">
-							<span>{{ scope.row.data.扭后检测_合格率 }}</span>
+							<span>{{ scope.row.data.扭后检测_含缺陷_色差?scope.row.data.扭后检测_含缺陷_色差_比例:0}}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="扭送损失" align="center" class-name="colorheader1">
-					<el-table-column label="炸裂情况" class-name="colorheader1">
-						<el-table-column label="完好" class-name="colorheader1">
-							<el-table-column label="数量" class-name="colorheader1">
-								<template #default="scope">
-									<span v-if="scope.row.data.扭后检测_含缺陷_扭后炸纹&&scope.row.data.扭后检测_含缺陷_扭后炸废">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_扭后炸纹 - scope.row.data.扭后检测_含缺陷_扭后炸废 }}</span>
-								<span v-else>
-									<span v-if="scope.row.data.扭后检测_含缺陷_扭后炸纹">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_扭后炸纹 }}</span>
-									<span v-else-if="scope.row.data.扭后检测_含缺陷_扭后炸废">{{ scope.row.data.扭后检测_count_use - scope.row.data.扭后检测_含缺陷_扭后炸废 }}</span>
-									<span v-else>{{ scope.row.data.扭后检测_count_use }}</span>
-								</span>
-								</template>
-							</el-table-column>
-							<el-table-column label="比例" class-name="colorheader1">
-								<template #default="scope">
-									<span v-if="scope.row.data.扭后检测_含缺陷_扭后炸纹&&scope.row.data.扭后检测_含缺陷_扭后炸废">{{100- scope.row.data.扭后检测_含缺陷_扭后炸纹 - scope.row.data.扭后检测_含缺陷_扭后炸废 }}%</span>
-									<span v-else>
-										<span v-if="scope.row.data.扭后检测_含缺陷_扭后炸纹">{{ 100 - scope.row.data.扭后检测_含缺陷_扭后炸纹_比例 }}</span>
-										<span v-else-if="scope.row.data.扭后检测_含缺陷_扭后炸废">{{100- scope.row.data.扭后检测_含缺陷_扭后炸废_比例 }}%</span>
-										<span v-else>100%</span>
-									</span>
-								</template>
-							</el-table-column>
-						</el-table-column>
-						<el-table-column label="崩炸" class-name="colorheader1">
-							<el-table-column label="数量" class-name="colorheader1">
-								<template #default="scope">
-									<span>{{ scope.row.data.扭后检测_含缺陷_扭后炸纹?扭后检测_含缺陷_扭后炸纹:0 }}</span>
-								</template>
-							</el-table-column>
-							<el-table-column label="比例" class-name="colorheader1">
-								<template #default="scope">
-									<span>{{  scope.row.data.扭后检测_含缺陷_扭后炸纹?scope.row.data.扭后检测_含缺陷_扭后炸纹_比列:0 }}%</span>
-								</template>
-							</el-table-column>
-						</el-table-column>
-						<el-table-column label="炸废" class-name="colorheader1">
-							<el-table-column label="数量" class-name="colorheader1">
-								<template #default="scope">
-									<span>{{ scope.row.data.扭后检测_含缺陷_扭后炸废?扭后检测_含缺陷_扭后炸废:0 }}</span>
-								</template>
-							</el-table-column>
-							<el-table-column label="比例" class-name="colorheader1">
-								<template #default="scope">
-									<span>{{  scope.row.data.扭后检测_含缺陷_扭后炸废?scope.row.data.扭后检测_含缺陷_扭后炸废_比列:0 }}%</span>
-								</template>
-							</el-table-column>
-						</el-table-column>
-					</el-table-column>
-					<!-- <el-table-column label="扭转角" class-name="colorheader1">
+				<el-table-column label="改实验" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
 						<template #default="scope">
-							<span>{{ scope.row.data.扭后检测_含缺陷_扭转角不合格 }} </span>
+							<span>{{ scope.row.data.扭后检测_含缺陷_改实验?scope.row.data.扭后检测_含缺陷_改实验:0}}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="改直" class-name="colorheader1">
+					<el-table-column label="比例" class-name="colorheader1">
 						<template #default="scope">
-							<span>{{ scope.row.data.扭后检测_合格率 }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="外圆大" class-name="colorheader1">
-						<template #default="scope">
-							<span>{{ scope.row.data.扭后检测_count_ok }} </span>
-						</template>
-					</el-table-column> -->
-					<el-table-column label="合计" class-name="colorheader1">
-						<template #default="scope">
-							<span>{{ scope.row.data.扭后检测_count_ok }} </span>
-						</template>
-					</el-table-column>
-					<el-table-column label="合格率" class-name="colorheader1">
-						<template #default="scope">
-							<span>{{ scope.row.data.扭后检测_合格率 }}</span>
+							<span>{{ scope.row.data.扭后检测_含缺陷_改实验?scope.row.data.扭后检测_含缺陷_改实验_比例:0}}%</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<!-- <el-table-column label="外形偏(0.5mm)" align="center" class-name="colorheader2">
-				</el-table-column> -->
-				<el-table-column label="实验名称备注" prop="batch" align="center" class-name="colorheader3">
+				<el-table-column label="合格数"  class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.扭后检测_count_ok }}</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>
+						</template>
+					</el-table-column>
 				</el-table-column>
-				<el-table-column label="检测设备" align="center" class-name="colorheader4">
+				<el-table-column label="备注" align="center" class-name="colorheader3">
 					<template #default="scope">
 						<span>{{ scope.row.data.扭后检测_缺陷_备注 }}</span>
 					</template>
@@ -400,7 +379,7 @@ export default {
 	methods: {
 		handleQuery(){
 			let that = this;
-			let querys = [[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]];
+			let querys = [[{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]];
 			let obj = {},obj1 = {},obj2 = {},obj3 = {};
 			obj.field = 'data__扭后检测_批次号';
 			obj.value = that.query.batch__contains;
@@ -414,9 +393,9 @@ export default {
 			obj2.value = that.query.last_time__lte;
 			obj2.compare = 'lte';
 
-			obj3.field = 'data__扭后检测_物料名';
+			obj3.field = 'material_start__name';
 			obj3.value = that.query.name__contains;
-			obj3.compare = '';
+			obj3.compare = 'contains';
 
 			if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
 				querys[0].push(obj);
diff --git a/src/views/statistics/bxerp/zhongjian1Total.vue b/src/views/statistics/bxerp/zhongjian1Total.vue
new file mode 100644
index 00000000..1c0414f2
--- /dev/null
+++ b/src/views/statistics/bxerp/zhongjian1Total.vue
@@ -0,0 +1,347 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-input v-model="query.batch__contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="params"
+				id="exportDiv"
+				row-key="id"
+				stripe
+			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
+				<el-table-column label="批次编号" fixed="left" prop="batch">
+				</el-table-column>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
+				</el-table-column>
+				<el-table-column label="中检数" fixed="left">
+					<template #default="scope">
+						<span>{{ scope.row.data.中检一_count_use }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="炸" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检一_含缺陷_炸}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检一_含缺陷_炸_比例">{{scope.row.data.中检一_含缺陷_炸_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="偏" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ 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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="掉头" align="center" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检一_含缺陷_掉头}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检一_含缺陷_掉头_比例">{{scope.row.data.中检一_含缺陷_掉头_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="台阶划伤" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检一_含缺陷_台阶划伤}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检一_含缺陷_台阶划伤_比例">{{scope.row.data.中检一_含缺陷_台阶划伤_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="柱面划伤" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ 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>
+				<el-table-column label="台棱" align="center" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检一_含缺陷_台棱}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检一_含缺陷_台棱_比例">{{scope.row.data.中检一_含缺陷_台棱_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="台糙" align="center" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检一_含缺陷_台糙}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检一_含缺陷_台糙_比例">{{scope.row.data.中检一_含缺陷_台糙_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="尺寸大/小" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data['中检一_含缺陷_尺寸大/小']}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data['中检一_含缺陷_尺寸大/小_比例']">{{scope.row.data['中检一_含缺陷_尺寸大/小_比例'] }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="崩" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ 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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="修崩/炸" align="center" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data['中检一_含缺陷_修崩/炸']}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data['中检一_含缺陷_修崩/炸_比例']">{{scope.row.data['中检一_含缺陷_修崩/炸_比例'] }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="拆头" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检一_含缺陷_拆头}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检一_含缺陷_拆头_比例">{{scope.row.data.中检一_含缺陷_拆头_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="外黑" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ 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>
+				<el-table-column label="外磕" align="center" class-name="colorheader6">
+					<el-table-column label="数量" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检一_含缺陷_外磕}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检一_含缺陷_外磕_比例">{{scope.row.data.中检一_含缺陷_外磕_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="打毛/打台" align="center" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data['中检一_含缺陷_打毛/打台']}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data['中检一_含缺陷_打毛/打台_比例']">{{scope.row.data['中检一_含缺陷_打毛/打台_比例'] }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="喷码" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检一_含缺陷_喷码}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检一_含缺陷_喷码_比例">{{scope.row.data.中检一_含缺陷_喷码_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="掉皮" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ 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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="量崩" align="center" class-name="colorheader3">
+					<el-table-column label="数量" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检一_含缺陷_量崩}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检一_含缺陷_量崩_比例">{{scope.row.data.中检一_含缺陷_量崩_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="坑" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检一_含缺陷_坑}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检一_含缺陷_坑_比例">{{scope.row.data.中检一_含缺陷_坑_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="合格"  class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检一_count_ok }}</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>
+				<el-table-column label="备注" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span>{{ scope.row.data.中检一_缺陷_备注 }}</span>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "statistics_guan",
+	data() {
+		return {
+			params: {
+				ordering:'-data__中检一_小日期',
+				querys:[[{field:"data__has_key",compare:"",value:"中检一_日期"}]],
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.batchstquery,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"data__has_key",compare:"",value:"中检一_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__中检一_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material_start__name';
+			obj3.value = that.query.name__contains;
+			obj3.compare = 'contains';
+
+			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){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+		getCountQt(data,type){
+			let count_qt = 0,count = 0;
+		   
+		}
+	},
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/statistics/bxerp/zhongjian2Total.vue b/src/views/statistics/bxerp/zhongjian2Total.vue
new file mode 100644
index 00000000..6ba31728
--- /dev/null
+++ b/src/views/statistics/bxerp/zhongjian2Total.vue
@@ -0,0 +1,317 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-input v-model="query.name__contains" 
+					placeholder="产品名称" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-input v-model="query.batch__contains" 
+					placeholder="批次号" 
+					clearable 
+					style="width: 200px;"
+				></el-input>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				:params="params"
+				:query="params"
+				id="exportDiv"
+				row-key="id"
+				stripe
+			>
+				<el-table-column type="index" width="50"  fixed="left"/>
+				<el-table-column label="产品名称" prop="material_start_name" fixed="left" min-width="100">
+				</el-table-column>
+				<el-table-column label="批次编号" fixed="left" prop="batch">
+				</el-table-column>
+				<el-table-column label="版型" prop="material_start_model" fixed="left">
+				</el-table-column>
+				<el-table-column label="中检数" fixed="left">
+					<template #default="scope">
+						<span>{{ scope.row.data.中检二_count_use }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="炸废" align="center" class-name="colorheader1">
+					<el-table-column label="数量" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_炸废}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_炸废_比例">{{scope.row.data.中检二_含缺陷_炸废_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="崩" align="center" class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ 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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="划伤" align="center" class-name="colorheader3">
+					<el-table-column label="少" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_划伤少?scope.row.data.中检二_含缺陷_划伤少:0 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比率" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_划伤少_比例">{{ scope.row.data.中检二_含缺陷_划伤少_比例 }}%</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="多" class-name="colorheader3">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_划伤多?scope.row.data.中检二_含缺陷_划伤多:0 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比率" class-name="colorheader3">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_划伤多_比例">{{ scope.row.data.中检二_含缺陷_划伤多_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="斜角/圆角" align="center" class-name="colorheader4">
+					<el-table-column label="数量" class-name="colorheader4">
+						<template #default="scope">
+							<span>{{ scope.row.data['中检二_含缺陷_斜角/圆角']}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader4">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_斜角/圆角_比例">{{scope.row.data.中检二_含缺陷_斜角/圆角_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="角偏" align="center" class-name="colorheader5">
+					<el-table-column label="数量" class-name="colorheader5">
+						<template #default="scope">
+							<span>{{ 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>
+				<el-table-column label="圆角" align="center" class-name="colorheader6">
+					<el-table-column label="划伤" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_圆角划伤}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_圆角划伤_比例">{{scope.row.data.中检二_含缺陷_圆角划伤_比例 }}%</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="抛小" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_圆角抛小}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_圆角抛小_比例">{{scope.row.data.中检二_含缺陷_圆角抛小_比例 }}%</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="高亮" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_圆角高亮}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_圆角高亮_比例">{{scope.row.data.中检二_含缺陷_圆角高亮_比例 }}%</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="麻点" class-name="colorheader6">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_圆角麻点}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader6">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_圆角麻点_比例">{{scope.row.data.中检二_含缺陷_圆角麻点_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="圆角没抛到/抛光尺寸不足" align="center" class-name="colorheader7">
+					<el-table-column label="数量" class-name="colorheader7">
+						<template #default="scope">
+							<span>{{ scope.row.data['中检二_含缺陷_圆角没抛到/抛光尺寸不足']}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader7">
+						<template #default="scope">
+							<span v-if="scope.row.data['中检二_含缺陷_圆角没抛到/抛光尺寸不足_比例']">{{scope.row.data['中检二_含缺陷_圆角没抛到/抛光尺寸不足_比例'] }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="凹面" align="center" class-name="colorheader1">
+					<el-table-column label="偏" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_凹面偏}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_凹面偏_比例">{{scope.row.data.中检二_含缺陷_凹面偏_比例 }}%</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="炸废" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_凹面炸废}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_凹面炸废_比例">{{scope.row.data.中检二_含缺陷_凹面炸废_比例 }}%</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="崩边" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_凹面崩边}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_凹面崩边_比例">{{scope.row.data.中检二_含缺陷_凹面崩边_比例 }}%</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="划伤" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_凹面划伤}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_凹面划伤_比例">{{scope.row.data.中检二_含缺陷_凹面划伤_比例 }}%</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="麻点" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_凹面麻点}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_凹面麻点_比例">{{scope.row.data.中检二_含缺陷_凹面麻点_比例 }}%</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="硌点" class-name="colorheader1">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_含缺陷_凹面硌点}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="比例" class-name="colorheader1">
+						<template #default="scope">
+							<span v-if="scope.row.data.中检二_含缺陷_凹面硌点_比例">{{scope.row.data.中检二_含缺陷_凹面硌点_比例 }}%</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="合格"  class-name="colorheader2">
+					<el-table-column label="数量" class-name="colorheader2">
+						<template #default="scope">
+							<span>{{ scope.row.data.中检二_count_ok }}</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>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader3">
+					<template #default="scope">
+						<span>{{ scope.row.data.中检二_缺陷_备注 }}</span>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+export default {
+	name: "statistics_guan",
+	data() {
+		return {
+			params: {
+				ordering:'-data__中检二_小日期',
+				querys:[[{field:"data__has_key",compare:"",value:"中检二_日期"}]],
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.batchstquery,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"data__has_key",compare:"",value:"中检二_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__中检二_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'last_time';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'last_time';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material_start__name';
+			obj3.value = that.query.name__contains;
+			obj3.compare = 'contains';
+
+			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){
+				querys[0].push(obj1);
+			}
+			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+				querys[0].push(obj2);
+			}
+			if(that.query.name__contains!==''&&that.query.name__contains!==null){
+				querys[0].push(obj3);
+			}
+			that.params.querys = querys;
+			this.$refs.table.queryData(that.params);
+		},
+		getCountQt(data,type){
+			let count_qt = 0,count = 0;
+		   
+		}
+	},
+};
+</script>
+
+<style scoped>
+</style>