From eb016141d6175c9509b7a2a22113e5bf2ce17492 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 28 Apr 2025 15:13:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0label=EF=BC=8Cprocess=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=AA=E5=8F=B7=E8=BD=AC=E6=89=B9=E5=8F=B7=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E8=BF=94=E5=B7=A5=E5=92=8C=E6=AD=A3=E5=B8=B8=E4=BA=A4=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/mainso.vue             |  4 ++--
 src/views/inm/mioitem.vue            |  4 ++--
 src/views/inm/mioitem_form.vue       |  4 ++--
 src/views/mtm/process_form.vue       |  8 ++++----
 src/views/template/printmaterial.vue |  4 ++--
 src/views/wpm_bx/inm.vue             |  4 ++--
 src/views/wpm_bx/mlog_detail.vue     | 29 +++++++++++++++-------------
 src/views/wpm_bx/mlogbw_check.vue    |  4 ++--
 8 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/views/inm/mainso.vue b/src/views/inm/mainso.vue
index ddafbb76..4d77e39a 100644
--- a/src/views/inm/mainso.vue
+++ b/src/views/inm/mainso.vue
@@ -191,8 +191,8 @@ export default {
 								"REFERENCE 0,0",
 								'QRCODE 30,400,H,5,A,0,"' +code +'"',
 								"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
-								"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch,
-								"WINTEXT 280,550,28,90,0,0,Simhei," + row.count,
+								"WINTEXT 240,550,28,90,0,0,Simhei,"+"批次号：" + res.batch,
+								"WINTEXT 280,550,28,90,0,0,Simhei," +"数量："  + row.count,
 								"PRINT 1",
 							]; 
 							let obj = {};
diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue
index cb0f5906..ee619c38 100644
--- a/src/views/inm/mioitem.vue
+++ b/src/views/inm/mioitem.vue
@@ -489,8 +489,8 @@ export default {
 							"REFERENCE 0,0",
 							'QRCODE 30,400,H,5,A,0,"' +code +'"',
 							"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
-							"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch,
-							"WINTEXT 280,550,28,90,0,0,Simhei," + row.count,
+							"WINTEXT 240,550,28,90,0,0,Simhei,"  +"批次号："+ res.batch,
+							"WINTEXT 280,550,28,90,0,0,Simhei,"  +"数量：" + row.count,
 							"PRINT 1",
 						]; 
 						let obj = {};
diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue
index 1b6ee82b..592226e3 100644
--- a/src/views/inm/mioitem_form.vue
+++ b/src/views/inm/mioitem_form.vue
@@ -111,7 +111,7 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
-				<el-col :md="12" :sm="24" v-if="mTracking==20&&(form.type == 'do_in' ||form.type == 'pur_in'||form.type == 'other_in')">
+				<el-col :md="12" :sm="24" v-if="mTracking==20&&(form.type == 'pur_in'||form.type == 'other_in')">
 					<el-form-item label="数量">
 						<el-input-number
 							v-model="form.count"
@@ -133,7 +133,7 @@
 					</el-form-item>
 				</el-col>
 			</el-row>
-			<el-row v-if="mTracking==20&&form.count>1&&(form.type == 'do_in'||form.type == 'pur_in'||form.type == 'other_in')">
+			<el-row v-if="mTracking==20&&form.count>1&&(form.type == 'pur_in'||form.type == 'other_in')">
 				<el-col :md="12" :sm="24" v-for="i in form.count" :key="i">
 					<el-form-item :label="'编号'+i">
 						<!-- <el-input-number v-if="i==1" v-model="mioitems[0]" @change="firstNumberChange" placeholder="请输入编号" controls-position="right" style="width:100%"/> -->
diff --git a/src/views/mtm/process_form.vue b/src/views/mtm/process_form.vue
index 37fc0d95..da342dcc 100644
--- a/src/views/mtm/process_form.vue
+++ b/src/views/mtm/process_form.vue
@@ -73,13 +73,13 @@
 								></el-switch>
 							</el-form-item>
 						</el-col>
-						<!-- <el-col :span="12" v-if="baseCode=='bxerp'">
-							<el-form-item label="是否自检">
+						<el-col :span="12" v-if="baseCode=='bxerp'">
+							<el-form-item label="个号转批号">
 								<el-switch
-									v-model="form.into_wm_mgroup"
+									v-model="form.number_to_batch"
 								></el-switch>
 							</el-form-item>
-						</el-col> -->
+						</el-col>
 						<el-col :span="12">
 							<el-form-item label="交接到工段">
 								<el-switch
diff --git a/src/views/template/printmaterial.vue b/src/views/template/printmaterial.vue
index b7778071..de465546 100644
--- a/src/views/template/printmaterial.vue
+++ b/src/views/template/printmaterial.vue
@@ -86,8 +86,8 @@ export default {
 					"REFERENCE 0,0",
 					'QRCODE 30,400,H,5,A,0,"' +code +'"',
 					"WINTEXT 30,380,28,90,0,0,Simhei,容器容量:" + that.counts,
-					"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
-					"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch,
+					"WINTEXT 200,550,28,90,0,0,Simhei," +"批次号："+ res.material_name,
+					"WINTEXT 240,550,28,90,0,0,Simhei," +"数量："  + res.batch,
 					]; 
                     //供应商（仅原料、辅料）
                     if(that.mtype==40||that.mtype==30){
diff --git a/src/views/wpm_bx/inm.vue b/src/views/wpm_bx/inm.vue
index b312bbf7..cd8fb954 100644
--- a/src/views/wpm_bx/inm.vue
+++ b/src/views/wpm_bx/inm.vue
@@ -491,8 +491,8 @@ export default {
 							"REFERENCE 0,0",
 							'QRCODE 30,400,H,5,A,0,"' +code +'"',
 							"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
-							"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch,
-							"WINTEXT 280,550,28,90,0,0,Simhei," + row.count,
+							"WINTEXT 240,550,28,90,0,0,Simhei," +"批次号：" + res.batch,
+							"WINTEXT 280,550,28,90,0,0,Simhei," +"数量：" + row.count,
 							"PRINT 1",
 						]; 
 						let obj = {};
diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index 16012a16..d8a53e22 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -10,15 +10,15 @@
 		<div>
 			<el-card style="width: 100%" header="基本信息" shadow="never">
 				<el-descriptions>
-					<el-descriptions-item label="工艺路线" v-if="!mlogItem.is_fix">{{
-						mlogItem.routepack_name
-					}}</el-descriptions-item>
-					<el-descriptions-item label="输入物料" v-if="!mlogItem.is_fix">{{
-						mlogItem.material_in_name
-					}}</el-descriptions-item>
-					<el-descriptions-item label="输出物料" v-if="!mlogItem.is_fix">{{
-						mlogItem.material_out_name
-					}}</el-descriptions-item>
+					<el-descriptions-item label="工艺路线" v-if="!mlogItem.is_fix" style="width: 100%;">
+						{{mlogItem.material_in_name}}->{{mlogItem.material_out_name}}
+					</el-descriptions-item>
+					<el-descriptions-item label="返工" v-if="mlogItem.is_fix">
+						<span v-if="mlogItem.material_in_name!==null">{{mlogItem.material_in_name}}</span>
+						<span v-if="mlogItem.material_out_name!==null">->{{mlogItem.material_out_name}}</span>
+					</el-descriptions-item>
+				</el-descriptions>
+				<el-descriptions>
 					<el-descriptions-item label="工段名称">{{
 						mlogItem.mgroup_name
 					}}</el-descriptions-item>
@@ -39,11 +39,14 @@
 							{{item.value}}
 						</el-descriptions-item>
 					</template>
+					<el-descriptions-item label="创建时间">{{
+						mlogItem.create_time
+					}}</el-descriptions-item>
 					<el-descriptions-item label="开始时间">{{
 						mlogItem.work_start_time
 					}}</el-descriptions-item>
-					<el-descriptions-item label="创建时间">{{
-						mlogItem.create_time
+					<el-descriptions-item label="结束时间">{{
+						mlogItem.work_end_time
 					}}</el-descriptions-item>
 					<el-descriptions-item label="指导文件" v-if="route_file!==null">
 						<el-button @click="showFile">查看</el-button>
@@ -822,8 +825,8 @@ export default {
 					"REFERENCE 0,0",
 					'QRCODE 30,400,H,5,A,0,"' +code +'"',
 					"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
-					"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch,
-					"WINTEXT 280,550,28,90,0,0,Simhei," + row.count,
+					"WINTEXT 240,550,28,90,0,0,Simhei,"  +"批次号："+ res.batch,
+					"WINTEXT 280,550,28,90,0,0,Simhei,"  +"数量：" + row.count,
 					"PRINT 1",
 				]; 
 				let obj = {};
diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index d8a4ab7a..755d4921 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -785,8 +785,8 @@ export default {
 					"REFERENCE 0,0",
 					'QRCODE 30,400,H,5,A,0,"' +code +'"',
 					"WINTEXT 200,550,28,90,0,0,Simhei," + res.material_name,
-					"WINTEXT 240,550,28,90,0,0,Simhei," + res.batch,
-					"WINTEXT 280,550,28,90,0,0,Simhei," + row.count,
+					"WINTEXT 240,550,28,90,0,0,Simhei," +"批次号：" + res.batch,
+					"WINTEXT 280,550,28,90,0,0,Simhei," +"数量："  + row.count,
 					"PRINT 1",
 				]; 
 				let obj = {};