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) => {