From ebad387933c7ed8dd47dd12b7a7d8d8f6c072421 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 13 Feb 2025 11:04:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AF=A6=E6=83=85=E5=9B=BA=E5=AE=9A=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E7=BC=96=E8=BE=91=E5=88=97=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E6=A3=80=E6=B5=8B=E9=A1=B9=E7=9A=84=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlog_detail.vue  |  5 ++++-
 src/views/wpm_bx/mlogbw_check.vue | 12 ++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index fdc7ed37..75fa6c89 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -300,7 +300,7 @@
 							<el-link
 								:underline="false"
 								type="primary"
-								v-if="mlogItem.submit_time == null&&mlogItem.material_out_&&mlogItem.material_out_.tracking==20"
+								v-if="mlogItem.material_out_&&mlogItem.material_out_.tracking==20"
 								@click="table_out_check_single(scope.row,'outs')"
 							>详情</el-link>
 						</template>
@@ -356,6 +356,7 @@
 				ref="checkDialogSingle"
 				:mlogb="mlogb"
 				:wm = "wm"
+				:isSubmit="isSubmit"
 				:batchNumber="batchNumber"
 				:handle_user="handle_user"
 				:handle_date="handle_date"
@@ -482,6 +483,7 @@ export default {
 			qct:null,
 			defectlist:[],
 			batchNumber:'',
+			isSubmit:false,
 		};
 	},
 	mounted() {
@@ -597,6 +599,7 @@ export default {
 			let that = this;
 			that.mlogb = row.id;
 			that.wm = row.wm_in;
+			that.isSubmit = that.mlogItem.submit_time == null ? false : true;
 			that.batchNumber = row.batch;
 			that.handle_date=that.mlogItem.handle_date;
 			that.handle_user = that.mlogItem.handle_user;
diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index 2f0bb8d6..98b5fd93 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -16,7 +16,7 @@
 				:addTemplate="addTemplate"
 				placeholder="暂无数据"
 			>
-				<el-table-column prop="number" label="物料编号">
+				<el-table-column prop="number" label="物料编号" fixed min-width="120px">
 					<template #default="scope">
 						<span v-if="!scope.row.isEdit">{{ scope.row.number }}</span>
 						<el-input v-if="scope.row.isEdit&&mode == 'outs'" v-model="scope.row.number" placeholder="物料编号"></el-input>
@@ -38,7 +38,7 @@
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="note" :label="item.testitem_name" v-for="item in qct_testitems" :key="item.id">
+				<el-table-column prop="note" :label="item.testitem_name" v-for="item in qct_testitems" :key="item.id" width="150px">
 					<template #default="scope">
 						<el-input-number
 							v-if="item.testitem_field_type=='input-number'"
@@ -103,7 +103,7 @@
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="note" :label="item.defect_name" v-for="item in qct_defects" :key="item.id" width="70px">
+				<el-table-column prop="note" :label="item.defect_name" v-for="item in qct_defects" :key="item.id" width="80px">
 					<template #default="scope">
 						<el-switch 
 							:disabled="!scope.row.isEdit"
@@ -119,7 +119,7 @@
 						<el-input v-else v-model="scope.row.note" placeholder="备注"></el-input>
 					</template>
 				</el-table-column>
-				<el-table-column prop="open" label="操作" width="60" align="center">
+				<el-table-column prop="open" label="操作" width="60" align="center" v-if="!isSubmit">
 					<template #default="scope">
 						<el-button
 							v-if="scope.row.isEdit"
@@ -185,6 +185,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		isSubmit:{
+			type: Boolean,
+			default: false,
+		},
 	},
 	emits: ["success", "closed"],
 	data() {