From fe312b455c2f9f81c49ca2c96eeb9ca8ed667900 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 27 Nov 2024 17:14:08 +0800
Subject: [PATCH] fix:coding#628

---
 src/views/wpm_gx/f_mlogs_form.vue | 14 ++++++++------
 src/views/wpm_gx/mlog_form.vue    | 16 +++++++++++++---
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue
index 3b3f6e25..16d2043b 100644
--- a/src/views/wpm_gx/f_mlogs_form.vue
+++ b/src/views/wpm_gx/f_mlogs_form.vue
@@ -59,18 +59,18 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<!-- <el-col :md="12" :sm="24">
-							<el-form-item label="批次序号" prop="qp_num">
+						<el-col :md="12" :sm="24" v-if="mgroupName=='成品抛'">
+							<el-form-item label="批次序号">
 								<el-input-number
-									v-model="form.qp_num"
+									v-model="form.index"
 									:min="0"
 									:max="99"
-									placeholder="该设备的第几炉"
-									class="width100"
+									placeholder="第几炉,追加到批次"
+									style="width: 100%"
 									controls-position="right"
 								/>
 							</el-form-item>
-						</el-col> -->
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="开始时间" prop="work_start_time">
 								<el-date-picker
@@ -406,6 +406,7 @@ export default {
 				work_end_time:[{required: true,message: "请选择生产开始时间",trigger: "blur",},],
 				route: [{required: true,message: "请选择工艺路线",trigger: "blur",},]
 			},
+			mgroupName:'',
 			materialCount:1,//领料批次现有库存数
 			material_in:'',
 			material_out:'',
@@ -443,6 +444,7 @@ export default {
 			let that = this;
 			that.$API.mtm.mgroup.item.req(that.mgroup).then((res) => {
 				that.deptId = res.belong_dept;
+				that.mgroupName = res.name;
 				that.process = res.process;
 				that.getEquipment();
 			});
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index f4719102..6282588f 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -35,7 +35,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="24" v-if="form.mtype == 20">
 							<el-form-item
 								label="外协单位"
 								prop="supplier"
@@ -57,8 +57,6 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-					</el-row>
-					<el-row>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="工艺路线" prop="route">
 								<el-select
@@ -106,6 +104,18 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24" v-if="mgroupName=='磨抛一次抛'">
+							<el-form-item label="批次序号">
+								<el-input-number
+									v-model="form.index"
+									:min="0"
+									:max="99"
+									placeholder="第几炉,追加到批次"
+									style="width: 100%"
+									controls-position="right"
+								/>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item
 								label="开始时间"