From 7f036f734312be58650c8c648bbbb0ad1cffef11 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 13 Mar 2025 09:55:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4mlog=5Fdetail=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=93=8D=E4=BD=9C=E5=90=8E=E7=9A=84=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8Amlogbw=5Fcheck=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BE=93=E5=87=BA=E6=97=B6=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index eb46e4ee..64e2dfa6 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -614,10 +614,12 @@ export default {
 		},
 		scheckClose(){
 			this.dialog.check_single = false;
+			this.$refs.tableIn.refresh();
 			this.$refs.tableOut.refresh();
 		},
 		checkDialogClose(){
 			this.dialog.check = false;
+			this.$refs.tableIn.refresh();
 			this.$refs.tableOut.refresh();
 		},
 		handlePrint(){
diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue
index a29f4e49..de990c3c 100644
--- a/src/views/wpm_bx/mlogb_form.vue
+++ b/src/views/wpm_bx/mlogb_form.vue
@@ -34,7 +34,7 @@
 							</el-option>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="批次号" prop="wm_in">
+					<el-form-item label="批次号" required>
 						<el-input  ref="codeInput" v-model="wm_in" clearable @change="formWminChange(wm_in)"></el-input>
 					</el-form-item>
 					<el-form-item label="使用数量" prop="count_use">
@@ -205,6 +205,7 @@ export default {
 		//扫描后处理方法
 		formWminChange(code){
 			let that = this,codeId='',arr=[];
+			code = code.replace(/(^\s*)|(\s*$)/g, "");
 			if(code.indexOf("#")>-1){
 				let arrs = code.split("#");
 				codeId = arrs[1];
diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index a8d5233c..9178d2f4 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -39,8 +39,8 @@
 				>
 					<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> -->
+							<span v-if="!scope.row.isEdit&&mode == 'outs'">{{ scope.row.number }}</span>
+							<el-input v-if="scope.row.isEdit&&mode == 'outs'" v-model="scope.row.number" placeholder="物料编号"></el-input>
 							<el-select
 								v-if="scope.row.isEdit&&mode == 'ins'"
 								v-model="scope.row.wpr"
@@ -57,7 +57,7 @@
 								>
 								</el-option>
 							</el-select>
-							<span v-else>{{ scope.row.number }}</span>
+							<span v-if="!scope.row.isEdit&&mode == 'ins'">{{ scope.row.number }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column prop="note" :label="item.testitem_name" v-for="item in qct_testitems" :key="item.id" width="150px">
@@ -522,9 +522,10 @@ export default {
 		},
 		getList(){
 			let that = this;
+			
 			that.$API.wpm.mlogbw.list.req(that.params).then((res) => {
+				that.mlogbwlist = [];
 				if(res.length>0){
-					that.mlogbwlist = [];
 					res.forEach((item) => {
 						let obj = {};
 					    obj = Object.assign({},item);
@@ -654,9 +655,8 @@ export default {
 				type: "warning",
 			}).then(() => {
                 that.$API.wpm.mlogbw.delete.req(id).then((res) => {
+					that.getList();
                     that.$message.success("删除成功");
-                    that.getList();
-                    return res;
                 }).catch((err) => {
                     return err;
                 });