From 3382a2c8769dcaea6bc39be3686cd30d6c9b602f Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 14 Mar 2025 09:50:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=97=B6=E8=BE=93=E5=85=A5=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E4=B8=8D=E6=9F=A5=E8=AF=A2qct,=E8=BE=93=E5=85=A5=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=B7=BB=E5=8A=A0=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlog_detail.vue  | 24 ++++--------------------
 src/views/wpm_bx/mlogb_form.vue   | 30 +++++++++++++++++++++++++++++-
 src/views/wpm_bx/mlogbw_check.vue |  2 +-
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index 64e2dfa6..7b1ce139 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -552,26 +552,10 @@ export default {
 			that.handle_date=that.mlogItem.handle_date;
 			that.handle_user = that.mlogItem.handle_user;
 			that.dialog.check_single = true;
-			if(row.qct==null&&!that.mlogItem.is_fix){
-				that.$API.qm.qct.list.req({qctmat__material:row.material_out,page:0}).then((res)=>{
-				    if(res.length>0){
-						that.qct = res[0].id;
-						console.log('that.qct',that.qct);
-						that.$nextTick(() => {
-							that.$refs.checkDialogSingle.open(type,that.qct);
-						});
-					}else{
-						that.$nextTick(() => {
-							that.$refs.checkDialogSingle.open(type);
-						});
-					}
-				})
-			}else{
-				that.qct = row.qct;
-				that.$nextTick(() => {
-					that.$refs.checkDialogSingle.open(type,that.qct);
-				});
-			}
+			that.qct = row.qct;
+			that.$nextTick(() => {
+				that.$refs.checkDialogSingle.open(type,that.qct);
+			});
 		},
 		//表单提交方法
 		mlogSubmit() {
diff --git a/src/views/wpm_bx/mlogb_form.vue b/src/views/wpm_bx/mlogb_form.vue
index bab8a033..40d9ed33 100644
--- a/src/views/wpm_bx/mlogb_form.vue
+++ b/src/views/wpm_bx/mlogb_form.vue
@@ -34,7 +34,24 @@
 							</el-option>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="批次号" required>
+					<el-form-item label="批次选择">
+						<el-select
+							v-model="batchs"
+							placeholder="批次选择"
+							clearable
+							style="width: 100%"
+							@change="changeMaterial"
+						>
+							<el-option
+								v-for="item in materialOptions"
+								:key="item.id"
+								:label="item.batch"
+								:value="item.id"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item label="物料扫码">
 						<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">
@@ -106,6 +123,7 @@ export default {
 	emits: ["success", "closed"],
 	data() {
 		return {
+			batchs:"",
 			loading: false,
 			mode: "add",
 			titleMap: {
@@ -213,6 +231,16 @@ export default {
 				that.materialOptions = res;
 			});
 		},
+		changeMaterial(){
+			let that = this;
+			that.materialOptions.forEach(item=>{
+			    if(item.id == that.batchs){
+					that.form.batch = item.batch;
+					that.form.wm_in = item.id;
+					that.form.count_use = item.count_cando;
+				}
+			})
+		},
 		//扫描后处理方法
 		formWminChange(code){
 			let that = this,codeId='',arr=[];
diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index d7102689..480d0299 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -452,7 +452,7 @@ export default {
 			}
 			that.$API.mtm.mgroup.item.req(that.mgroup).then((res) => {
 				that.process_type=res.process_type;
-				if(that.mode == 'outs'){//输入
+				if(that.mode == 'outs'&&qct!==''&&qct!==null){//输出
 					that.getdefects();
 				}else{
 					that.getList();