From f98d719c24d640cf366656da18883e58d9aec7df Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 19 Jan 2026 10:07:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A6=85=E9=81=93301=E7=83=AD=E5=8E=8B?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/bxerp/ryProductData.vue | 98 ++++++++++----------
 1 file changed, 48 insertions(+), 50 deletions(-)

diff --git a/src/views/statistics/bxerp/ryProductData.vue b/src/views/statistics/bxerp/ryProductData.vue
index 7c02547e..8f9b2d86 100644
--- a/src/views/statistics/bxerp/ryProductData.vue
+++ b/src/views/statistics/bxerp/ryProductData.vue
@@ -39,91 +39,97 @@
 				stripe
 			>
 				<el-table-column type="index" width="50"  fixed="left"/>
-				<el-table-column label="日期" fixed="left" prop="date" width="90">
+				<el-table-column label="日期" fixed="left" width="90">
+					<template #default="scope">
+						<span>{{ scope.row.data.装炉压板出炉_日期?scope.row.data.装炉压板出炉_日期:'' }}</span>
+					</template>
 				</el-table-column>
-				<el-table-column label="板号" prop="number" fixed="left">
+				<el-table-column label="板号" prop="number" fixed="left">	
+					<template #default="scope">
+						<span>{{ scope.row.data.装模_批次号?scope.row.data.装模_批次号:'' }}</span>
+					</template>	
 				</el-table-column>
-				<el-table-column label="压前对边" align="center" class-name="colorheader1">
+				<el-table-column label="压前对边" align="center">
 					<template #default="scope">
 						<span>{{ scope.row.data.排板_检测项_对边==undefined?scope.row.data.排板_检测项_对边:'' }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="模具号" align="center" class-name="colorheader2">
+				<el-table-column label="模具号" align="center">
 					<template #default="scope">
 						<span>{{ scope.row.data.装模_检测项_模具号==undefined?scope.row.data.装模_检测项_模具号:'' }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="对模具" align="center" class-name="colorheader3">
+				<el-table-column label="对模具人" align="center">
+					<template #default="scope">
+						<span>{{ scope.row.data.装模_操作人?scope.row.data.装模_操作人:0 }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="丝高" align="center">
 					<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">
+				<el-table-column label="炉号" align="center">
 					<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">
+				<el-table-column label="装炉人" align="center">
 					<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">
+				<el-table-column label="压板温度" align="center">
 					<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">
+				<el-table-column label="压力" align="center">
 					<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">
+				<el-table-column label="下压刻度" align="center">
 					<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">
+				<el-table-column label="压板用时" align="center">
 					<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">
+				<el-table-column label="压板人" align="center">
 					<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">
+				<el-table-column label="压后上边" align="center">
 					<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="压后下边" align="center" class-name="colorheader7">
+				<el-table-column label="压后下边" align="center">
 					<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="对边差" align="center" class-name="colorheader7">
+				<!-- <el-table-column label="对边差" align="center">
 					<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="压后伸长" align="center">
+					<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">
+				<el-table-column label="备注" align="center">
 					<template #default="scope">
 						<span>{{ scope.row.data.装炉压板出炉_备注 }}</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="日期" align="center" class-name="colorheader7">
+				<el-table-column label="日期" align="center">
 					<template #default="scope">
 						<span>{{ scope.row.data.装炉压板出炉_压板出炉_日期?scope.row.data.装炉压板出炉_压板出炉_日期:0 }}</span>
 					</template>
@@ -139,8 +145,8 @@ export default {
 	data() {
 		return {
 			params: {
-				ordering:'data__成品尺寸检测_批次号',
-				querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]],
+				ordering:'data__装炉压板出炉_批次号',
+				querys:[[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"装炉压板出炉_批次号"}]],
 			},
 			query:{
 				number_contains:'',
@@ -155,36 +161,28 @@ export default {
 	methods: {
 		handleQuery(){
 			let that = this;
-			let querys = [[{field:"wm",value:false,compare:"isnull"},{field:"data__has_key",compare:"",value:"成品尺寸检测_批次号"}]];
+			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.field = 'data__装炉压板出炉_批次号';
+			obj.value = that.query.number_contains;
 			obj.compare = '';
 
-			obj1.field = 'data__成品尺寸检测_日期';
-			obj1.value = that.query.last_time__gte;
+			obj1.field = 'data__装炉压板出炉_日期';
+			obj1.value = that.query.time_gte;
 			obj1.compare = 'gte';
 
-			obj2.field = 'data__成品尺寸检测_日期';
-			obj2.value = that.query.last_time__lte;
+			obj2.field = 'data__装炉压板出炉_日期';
+			obj2.value = that.query.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){
+			if(that.query.number_contains!==''&&that.query.number_contains!==null){
 				querys[0].push(obj);
 			}
-			if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){
+			if(that.query.time_gte!==''&&that.query.time_gte!==null){
 				querys[0].push(obj1);
 			}
-			if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){
+			if(that.query.time_lte!==''&&that.query.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);
 		},