diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index 0038ea92..897b65a8 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -22,12 +22,9 @@
 					<el-descriptions-item label="工段名称">{{
 						mlogItem.mgroup_name
 					}}</el-descriptions-item>
-					<el-descriptions-item label="生产设备">{{
+					<el-descriptions-item label="生产设备" v-if="mlogItem.equipment_name!==null">{{
 						mlogItem.equipment_name
 					}}</el-descriptions-item>
-					<el-descriptions-item label="预计工时">{{
-						mlogItem.hour_work
-					}}</el-descriptions-item>
 					<el-descriptions-item label="部门/车间">{{
 						mlogItem.belong_dept_name
 					}}</el-descriptions-item>
@@ -598,9 +595,12 @@ export default {
 			that.$API.wpm.mlog.item.req(that.mlogId).then((res) => {
 				that.mlogItem = res;
 				that.checkTableShow = true;
+				that.isSubmit = res.submit_time==null?false:true;
 				if(that.processType=='10'&&that.mlogItem.material_out_&&that.mlogItem.material_out_.tracking==20){
 					that.getMlogbw();
-					that.getdefects(that.mlogItem.qct);
+					if(that.mlogItem.qct!==null){
+						that.getdefects(that.mlogItem.qct);
+					}
 				}
 				if(res.route!==null){
 					that.hasRoute = true;
@@ -916,7 +916,6 @@ 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.material_in = row.material_in;
 			that.material_out = row.material_out;