From e8508bfc671098cdfb28177162a2551e3fdb686e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 22 Jan 2025 09:42:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:mlogbw=E8=BE=93=E5=87=BA=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlogbw_check.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index 62515d76..9eb7f4ab 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -7,10 +7,11 @@
 		@closed="$emit('closed')"
 	>
 		<el-container>
-			<el-main>
+			<el-main id="mlogbwMain">
 				<sc-form-table
 				hideDelete
-				id="mlogbwList"
+				id="mlogbwlist"
+				:tableHeight="tableHeight"
 				v-model="mlogbwlist"
 				:addTemplate="addTemplate"
 				placeholder="暂无数据"
@@ -209,6 +210,7 @@ export default {
                 note: "",
                 isEdit: true,
             },
+			tableHeight:500,
 			apiObjPrint:this.$API.cm.labelmat.fromWm,
 			printer_name:localStorage.getItem("printer_name")
 		};
@@ -224,6 +226,10 @@ export default {
 			this.mode = mode;
 			console.log(this.mode);
 			this.visible = true;
+			setTimeout(() => {
+				this.tableHeight = document.getElementById('mlogbwMain').clientHeight-20;
+			},500)
+			
 		},
 		getdefects(){
 			let that = this;
@@ -322,7 +328,7 @@ export default {
 			//qct不为空，有检验表
 			if(that.qct!==null&&that.qct!==''){
 				//检验表已经填过
-				if(row.ftest!==null){
+				if(row.ftest!==null&&row.ftest!==undefined&&row.ftest!==''){
 					console.log('已填过');
 					obj.ftest =row.ftest;
 					obj.ftest.ftestdefects.forEach((item) => {
@@ -480,7 +486,4 @@ export default {
 .width-100{
 	width: 100%;
 }
-#mlogbwList .el-table--default .cell{
-	padding: 0 5px !important;
-}
 </style>