From d9daef3587506394350457b42cfdd47eb3345220 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 29 Dec 2025 10:45:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=A6=85=E9=81=93284?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlogb_form.vue | 32 ++++++++++++++++++--------------
 src/views/wpm_bx/mlogs.vue      |  2 ++
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue
index 3c71303e..cc0a7d42 100644
--- a/src/views/wpm_bx/mlogb_form.vue
+++ b/src/views/wpm_bx/mlogb_form.vue
@@ -8,17 +8,17 @@
 		@closed="$emit('closed')"
 	>
 		<el-container v-loading="loading">
-			<el-main style="padding: 0 20px 20px 20px">
+			<el-main style="padding: 0">
 				<el-form
 					ref="dialogForm"
 					:model="form"
 					:rules="rules"
 					label-position="right"
 					label-width="80px"
-					style="padding: 0 10px"
+					style="padding: 0"
 				>
 					<el-row>
-						<el-col v-if="!hasRoute&&!is_fix">
+						<el-col :md="12" :sm="12" :xs="24" v-if="!isfix&&!hasRoute">
 							<el-form-item label="工艺步骤" prop="route">
 								<el-select
 									v-model="form.route"
@@ -74,13 +74,15 @@
 										:label="item.batch"
 										:value="item.id"
 									>
+									<span>{{ item.batch }}</span>
+									<span v-if="item.defect_name&&item.defect_name!==null">({{ item.defect_name }})</span>
+									<span style="float: right;">{{ item.count_cando }}</span>
 									</el-option>
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col>
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="物料扫码" style="display: flex;">
-								<!-- <scScanner @scanResult="formWminChange"></scScanner> -->
 								<el-input ref="codeInput" v-model="wm_in" clearable @change="formWminChange(wm_in)" style="width: 200px;margin-left: 4px;"></el-input>
 							</el-form-item>
 						</el-col>
@@ -221,14 +223,16 @@ export default {
 		this.params.mlog = this.mlog;
 		let arr = this.$route.path.split("/");
 		this.mgroup_code = arr[2];
-		this.getMlogbIn();
-		this.getMtask();
-		this.getMaterial();
-		this.getParentList();
-		this.getEquipment();
-		if(!this.hasRoute){
-			this.getRoute();
-		}
+		this.$nextTick(()=>{
+		   this.getMlogbIn();
+			this.getMtask();
+			this.getMaterial();
+			this.getParentList();
+			this.getEquipment();
+			if(!this.hasRoute&&!this.isfix){
+				this.getRoute();
+			}
+		})
 	},
 	methods: {
 		open() {
@@ -307,7 +311,7 @@ export default {
 				obj.route =that.routeId;
 			}
 			obj.page =0;
-			if(that.is_fix){//来料未完成的返修品&&出料已完成的返修品和不合格品
+			if(that.isfix ){//来料未完成的返修品&&出料已完成的返修品和不合格品
 				obj.tag = 'canfix';
 			}else{
 				if(that.materialIn!==null&&that.materialIn!==''){
diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue
index bc281519..4d82d9fb 100644
--- a/src/views/wpm_bx/mlogs.vue
+++ b/src/views/wpm_bx/mlogs.vue
@@ -3,12 +3,14 @@
 		<el-header>
 			<div class="left-panel">
 				<el-button
+				    v-if="route_code!=='chengpingfanxiu'"
 					type="primary"
 					icon="el-icon-plus"
 					@click="table_add2"
 					v-auth="'mlog.create'"
 				>快速报工</el-button>
 				<el-button
+					v-if="route_code!=='chengpingfanxiu'"
 					type="primary"
 					icon="el-icon-plus"
 					@click="table_add"