feat: 禅道324

src/views/wpm_bx/inmIn.vue

@@ -16,6 +16,21 @@
 					style="--el-switch-on-color: #67c23a; --el-switch-off-color: #0052d9"
 					@change="showWprListChange"
 				></el-switch>
+				<el-select
+					v-if="route_code=='shangpaipingmo'"
+					v-model="query.current_merged"
+					placeholder="合批状态"
+					clearable
+					style="width: 250px"
+					@change="handleQuery"
+				>
+					<el-option
+						v-for="item in mergedOptions"
+						:key="item.value"
+						:label="item.name"
+						:value="item.value"
+					/>
+				</el-select>
 				<el-select
 					v-model="query.state"
 					placeholder="物料状态"
@@ -359,6 +374,7 @@ export default {
 			query: {
 				search: "",
 				state: null,
+				current_merged:null,
 			},
 			dialog: {
 				save: false,
@@ -376,6 +392,10 @@ export default {
 				{ value: 20, name: "不合格"},
 				{ value: 30, name: "返工"},
 			],
+			mergedOptions:[
+				{ value: false, name: "未合批"},
+				{ value: true, name: "已合批"},
+			],
 			queryWm: {
 				search: "",
 				material: "",
@@ -524,7 +544,15 @@ export default {
 		},
 		//搜索
 		handleQuery() {
-			this.$refs.table.queryData(this.query);
+			console.log('this.query',this.query)
+			let obj = Object.assign(this.query);
+			for(let key in obj){
+				if(obj[key]==null||obj==''){
+					delete obj[key];
+				}
+			}
+			console.log('obj',obj);
+			this.$refs.table.queryData(obj);
 		},
 		
 		showWpr(row){