From d97aa847682861561b801e24377d1f0f61eb17b3 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 25 Apr 2025 11:33:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:fmlog=E5=B1=82=E7=BB=84=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=BF=94=E5=B7=A5=E5=8F=AF=E9=80=89=E6=8B=A9=E8=BF=94=E4=BF=AE?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/f_mlogs_form.vue | 27 ++++++++++++++++++---------
 src/views/wpm_gx/fmlog_detail.vue |  3 +++
 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 8389b718..d05f77dd 100644
--- a/src/views/wpm_gx/f_mlogs_form.vue
+++ b/src/views/wpm_gx/f_mlogs_form.vue
@@ -21,8 +21,9 @@
 							<el-form-item label="批次号" prop="wm_in">
 								<el-select
 									v-model="form.wm_in"
-									placeholder="交接物料"
+									placeholder="交接物料批次号"
 									class="width100"
+									filterable
 									@change="changeMaterial"
 								>
 									<el-option
@@ -342,6 +343,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		is_fix: {
+		    type: Boolean,
+			default: false,
+		}
 	},
 	computed: {
 		title() {
@@ -504,14 +509,18 @@ export default {
 		//获取车间物料
 		getMaterial() {
 			let that = this;
-			that.$API.wpm.wmaterial.list.req({
-				mtaskx:that.mtask,
-				mgroup: that.mgroup,
-				material: that.material_in,
-				tag:'todo',
-				page: 0,
-				state:10
-			}).then((res) => {
+			let params = {};
+			params.mtaskx = that.mtask;
+			params.mgroup = that.mgroup;
+			params.tag = 'todo';
+			params.page = 0;
+			if(that.is_fix){
+				params.state = 30;
+			}else{
+				params.state = 10;
+				params.material = that.material_in;
+			}
+			that.$API.wpm.wmaterial.list.req(params).then((res) => {
 				that.materialOptions = res;
 				if(that.codeText!==''){
 					res.forEach(item=>{
diff --git a/src/views/wpm_gx/fmlog_detail.vue b/src/views/wpm_gx/fmlog_detail.vue
index 54c29816..cc2fbe3d 100644
--- a/src/views/wpm_gx/fmlog_detail.vue
+++ b/src/views/wpm_gx/fmlog_detail.vue
@@ -123,6 +123,7 @@
 				:fmlog="fmlogId"
 				:mgroup="mgroup"
 				:route="route"
+				:is_fix="is_fix"
 				:process="processId"
 				@success="handleSaveSuccess"
 				@closed="dialog.save = false"
@@ -210,6 +211,7 @@ export default {
 			batchContains:[],
 			test_file:'',
 			deptId: "",
+			is_fix:false,
 			visible: false,
 			isSaveing: false,
 			printVisible:false,
@@ -250,6 +252,7 @@ export default {
 			that.$API.wpm.fmlog.item.req(that.fmlogId).then((res) => {
 				that.fmlogItem = res;
 				that.route = res.route;
+				that.is_fix = res.is_fix;
 				that.paramsWm.mgroup = res.mgroup;
 				that.apiObjWm = that.$API.wpm.wmaterial.list;
 				that.getMlogs();