diff --git a/src/views/statistics/bxerp/paoaomian.vue b/src/views/statistics/bxerp/paoaomian.vue
new file mode 100644
index 00000000..f0b71043
--- /dev/null
+++ b/src/views/statistics/bxerp/paoaomian.vue
@@ -0,0 +1,189 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
+				<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_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="批次号" fixed="left">
+					<template #default="scope">
+						<span>{{ scope.row.data.抛凹面检测_批次号 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="板号" prop="number" 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="炸废" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.抛凹面检测_缺陷项_炸废==undefined?scope.row.data.抛凹面检测_缺陷项_炸废:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="麻点" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.抛凹面检测_缺陷项_麻点==undefined?scope.row.data.抛凹面检测_缺陷项_麻点:0 }}</span>
+					</template>
+				</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>
+				<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>
+				<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>
+				<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="colorheader7">
+					<template #default="scope">
+						<span>{{ scope.row.data.抛凹面检测_缺陷项_硌点?scope.row.data.抛凹面检测_缺陷项_硌点:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="亮道" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.抛凹面检测_缺陷项_亮道?scope.row.data.抛凹面检测_缺陷项_亮道:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="偏" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.抛凹面检测_缺陷项_偏?scope.row.data.抛凹面检测_缺陷项_偏:0 }}</span>
+					</template>
+				</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>
+				<el-table-column label="备注" align="center" class-name="colorheader4">
+					<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:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"抛凹面检测_批次号"}]],
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.wpr.query,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"抛凹面检测_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__抛凹面检测_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'data__抛凹面检测_日期';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'data__抛凹面检测_日期';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material__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/paoaomianTotal.vue b/src/views/statistics/bxerp/paoaomianTotal.vue
new file mode 100644
index 00000000..37fd6a2b
--- /dev/null
+++ b/src/views/statistics/bxerp/paoaomianTotal.vue
@@ -0,0 +1,262 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
+				<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" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.抛凹面检测_日期 }}
+					</template>
+				</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="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="colorheader2">
+					<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="colorheader3">
+					<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="colorheader4">
+					<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="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 = 'data__抛凹面检测_日期';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+			obj2.field = 'data__抛凹面检测_日期';
+			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/paojiao.vue b/src/views/statistics/bxerp/paojiao.vue
new file mode 100644
index 00000000..a71712ab
--- /dev/null
+++ b/src/views/statistics/bxerp/paojiao.vue
@@ -0,0 +1,184 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
+				<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_name" fixed="left" min-width="100">
+					<template #default="scope">
+						<span>{{ scope.row.material_name.split('|')[0] }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="批次号" fixed="left">
+					<template #default="scope">
+						<span>{{ scope.row.data.抛角检测_批次号 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="板号" prop="number" 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="角小" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.抛角检测_缺陷项_角小==undefined?scope.row.data.抛角检测_缺陷项_角小:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="抛角麻点" align="center" class-name="colorheader2">
+					<template #default="scope">
+						<span>{{ scope.row.data.抛角检测_缺陷项_抛角麻点==undefined?scope.row.data.抛角检测_缺陷项_抛角麻点:0 }}</span>
+					</template>
+				</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>
+				<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>
+				<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>
+				<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="colorheader7">
+					<template #default="scope">
+						<span>{{ scope.row.data.抛角检测_缺陷项_炸?scope.row.data.抛角检测_缺陷项_炸:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="抛角人" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span>{{ scope.row.data.抛角_操作人?scope.row.data.抛角_操作人:'' }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="抛光人" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data['角面/柱面抛光_操作人']?scope.row.data['角面/柱面抛光_操作人']:'' }}</span>
+					</template>
+				</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:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"抛角检测_批次号"}]],
+			},
+			query:{
+				name__contains:'',
+				batch__contains:'',
+				last_time__gte:'',
+				last_time__lte:'',
+			},
+			apiObj: this.$API.wpm.wpr.query,
+			options:[],
+			tableData:[],
+		};
+	},
+	methods: {
+		handleQuery(){
+			let that = this;
+			let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"抛角检测_批次号"}]];
+			let obj = {},obj1 = {},obj2 = {},obj3 = {};
+			obj.field = 'data__抛角检测_批次号';
+			obj.value = that.query.batch__contains;
+			obj.compare = '';
+
+			obj1.field = 'data__抛角检测_日期';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+
+			obj2.field = 'data__抛角检测_日期';
+			obj2.value = that.query.last_time__lte;
+			obj2.compare = 'lte';
+
+			obj3.field = 'material__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/paojiaoTotal.vue b/src/views/statistics/bxerp/paojiaoTotal.vue
new file mode 100644
index 00000000..86cf46bd
--- /dev/null
+++ b/src/views/statistics/bxerp/paojiaoTotal.vue
@@ -0,0 +1,226 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="right-panel">
+				<el-date-picker
+					v-model="query.last_time__gte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="开始时间"
+					style="width: 150px"
+				/>
+				<el-date-picker
+					v-model="query.last_time__lte"
+					type="date"
+					value-format="YYYY-MM-DD"
+					placeholder="结束时间"
+					style="margin-left: 2px; width: 150px"
+				/>
+				<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" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.抛角检测_日期 }}
+					</template>
+				</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 = 'data__抛角检测_日期';
+			obj1.value = that.query.last_time__gte;
+			obj1.compare = 'gte';
+			obj2.field = 'data__抛角检测_日期';
+			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/zhongjian1.vue b/src/views/statistics/bxerp/zhongjian1.vue
index b7facfa1..a55c7c30 100644
--- a/src/views/statistics/bxerp/zhongjian1.vue
+++ b/src/views/statistics/bxerp/zhongjian1.vue
@@ -151,7 +151,33 @@
 						<span>{{ scope.row.data.中检一_缺陷项_坑?scope.row.data.中检一_缺陷项_坑:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="备注" align="center" class-name="colorheader5">
+				<el-table-column label="粘头人" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span>{{ scope.row.data.手工粘头_操作人?scope.row.data.手工粘头_操作人:'' }}</span>
+						<span>{{ scope.row.data.光锥粘头_操作人?scope.row.data.光锥粘头_操作人:'' }}</span>
+						<span>{{ scope.row.data.自动粘头_操作人?scope.row.data.自动粘头_操作人:'' }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="开台人" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span>{{ scope.row.data.一体刀_操作人?scope.row.data.一体刀_操作人:'' }}</span>
+						<span>{{ scope.row.data.磨床开台_操作人?scope.row.data.磨床开台_操作人:'' }}</span>
+						<span>{{ scope.row.data.光锥一体刀_操作人?scope.row.data.光锥一体刀_操作人:'' }}</span>
+						<span>{{ scope.row.data.小批量一体刀_操作人?scope.row.data.小批量一体刀_操作人:'' }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="拆头人" align="center" class-name="colorheader7">
+					<template #default="scope">
+						<span>{{ scope.row.data.拆头_操作人?scope.row.data.拆头_操作人:'' }}</span>
+						<span>{{ scope.row.data.光锥拆头_操作人?scope.row.data.光锥拆头_操作人:'' }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="喷码人" align="center" class-name="colorheader1">
+					<template #default="scope">
+						<span>{{ scope.row.data.喷码_操作人?scope.row.data.喷码_操作人:'' }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader2">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷项_备注 }}</span>
 					</template>
diff --git a/src/views/statistics/bxerp/zhongjian2.vue b/src/views/statistics/bxerp/zhongjian2.vue
index d2571f48..0bb6ac60 100644
--- a/src/views/statistics/bxerp/zhongjian2.vue
+++ b/src/views/statistics/bxerp/zhongjian2.vue
@@ -146,7 +146,19 @@
 						<span>{{ scope.row.data.中检二_缺陷项_凹面硌点?scope.row.data.中检二_缺陷项_凹面硌点:0 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="备注" align="center" class-name="colorheader4">
+				<el-table-column label="铣磨人" align="center" class-name="colorheader4">
+					<template #default="scope">
+						<span>{{ scope.row.data.铣磨_操作人?scope.row.data.铣磨_操作人:'' }}</span>
+						<span>{{ scope.row.data.光锥铣磨_操作人?scope.row.data.光锥铣磨_操作人:'' }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="倒角人" align="center" class-name="colorheader5">
+					<template #default="scope">
+						<span>{{ scope.row.data.倒角_操作人?scope.row.data.倒角_操作人:'' }}</span>
+						<span>{{ scope.row.data.光锥倒角_操作人?scope.row.data.光锥倒角_操作人:'' }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader6">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检二_缺陷项_备注 }}</span>
 					</template>