diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index 1adabaa0..dbc2ec58 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -11,10 +11,11 @@
 			</div>
 			<div class="right-panel">
 				<el-select
-					v-model="query.state"
+					v-model="queryState"
 					placeholder="物料状态"
 					clearable
 					style="width: 250px"
+					@change="searchStateChange"
 				>
 					<el-option
 						v-for="item in stateOptions"
@@ -262,7 +263,8 @@ export default {
 			tableData: [],
 			selection: [],
 			stateOptions:[
-				{ value: 10, name: "合格"},
+				{ value: 100, name: "完全合格"},
+				{ value: 101, name: "合格B类"},
 				{ value: 20, name: "不合格"},
 				{ value: 30, name: "返工"},
 			],
@@ -270,6 +272,7 @@ export default {
 				search: "",
 				material: "",
 			},
+			queryState: null,
 			codeText2: "",
 			codeText4: "",
 			cate_type:'',
@@ -342,6 +345,24 @@ export default {
 			this.$refs.table_wm.queryData(this.queryWm);
 			this.materialsVisible = false;
 		},
+		searchStateChange(){
+			let that = this;
+			that.query.state = null;
+			that.query.defect__isnull = null;
+			if(that.queryState==100){
+				that.query.state = 10;
+				that.query.defect__isnull = true;
+			}else if(that.queryState==101){
+			    that.query.state = 10;
+				that.query.defect__isnull = false;
+			}else if(that.queryState==20){
+			    that.query.state = 20;
+				that.query.defect__isnull = null;
+			}else if(that.queryState==30){
+			    that.query.state = 30;
+				that.query.defect__isnull = null;
+			}
+		},
 		//领料
 		tomio(type) {
 			let that = this;
diff --git a/src/views/wpm_gx/inmOut.vue b/src/views/wpm_gx/inmOut.vue
index 2155e1a3..86667216 100644
--- a/src/views/wpm_gx/inmOut.vue
+++ b/src/views/wpm_gx/inmOut.vue
@@ -305,23 +305,20 @@ export default {
 		},
 		searchStateChange(){
 			let that = this;
-			switch(that.queryState){
-				case 100:
-					that.query.state = 10;
-					that.query.defect__isnull = true;
-					break;
-				case 101:
-					that.query.state = 10;
-					that.query.defect__isnull = false;
-					break;
-				case 20:
-					that.query.state = 20;
-					that.query.defect__isnull = null;
-					break;
-				case 30:
-					that.query.state = 30;
-					that.query.defect__isnull = null;
-					break;
+			that.query.state = null;
+			that.query.defect__isnull = null;
+			if(that.queryState==100){
+				that.query.state = 10;
+				that.query.defect__isnull = true;
+			}else if(that.queryState==101){
+			    that.query.state = 10;
+				that.query.defect__isnull = false;
+			}else if(that.queryState==20){
+			    that.query.state = 20;
+				that.query.defect__isnull = null;
+			}else if(that.queryState==30){
+			    that.query.state = 30;
+				that.query.defect__isnull = null;
 			}
 		},
 		tomio(type) {