From e9177c2eec9edb2d469472050a0f3f9816a640da Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 11 Apr 2025 15:24:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:fmlog=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=89=A9=E6=96=99=E5=8F=AA=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=9C=AA=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/f_mlogs_form.vue | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/wpm_gx/f_mlogs_form.vue b/src/views/wpm_gx/f_mlogs_form.vue
index a12a11fa..be6673fe 100644
--- a/src/views/wpm_gx/f_mlogs_form.vue
+++ b/src/views/wpm_gx/f_mlogs_form.vue
@@ -31,14 +31,9 @@
 										:label="item.batch"
 										:value="item.id"
 									>
-										<div
-											style="
-												display: flex;
-												justify-content: space-between;
-											"
-										>
-											<span style="flex:1;margin-right:15px!important;">{{ item.batch }}</span>
-											<span style="flex:1;">{{ item.count }}</span>
+										<div style="position:relative;width:100%">
+											<span style="margin-right:15px!important;">{{ item.batch }}</span>
+											<span style="position:absolute;right:0">{{ item.count }}</span>
 										</div>
 									</el-option>
 								</el-select>
@@ -478,7 +473,14 @@ export default {
 		//获取车间物料
 		getMaterial() {
 			let that = this;
-			that.$API.wpm.wmaterial.list.req({mtaskx:that.mtask,mgroupx: that.mgroup,material: that.material_in,page: 0,}).then((res) => {
+			that.$API.wpm.wmaterial.list.req({
+				mtaskx:that.mtask,
+				mgroup: that.mgroup,
+				material: that.material_in,
+				tag:'todo',
+				page: 0,
+				state:10
+			}).then((res) => {
 				that.materialOptions = res;
 				if(that.codeText!==''){
 					res.forEach(item=>{
@@ -510,7 +512,7 @@ export default {
 			let that = this;
 			that.mode = mode;
 			that.visible = true;
-			if(codeText!==''){
+			if(codeText&&codeText!==''){
 				that.codeText = codeText;
 				let id = codeText.split('#')[1];
 				that.$API.cm.labelmat.item.req(id).then((res) => {