fix:交接完善2

src/views/wpm_bx/handover_form.vue

@@ -413,16 +413,14 @@ export default {
 			that.getUserList();
 		}
 		//获取交送物料
-		if(that.type==10||that.type==50){//正常交接
+		if(that.type==10){//正常交接
 			that.getMaterial();
 		}else if(that.type==20){//返工交接
-			if(that.mgroupName=='废品库'){
+			that.getMaterialOkFangong();
-				that.getMaterialFP();
+		}else if(that.type==40){//废品入库不合格物料
-			}else{
-				that.getMaterialOkFangong();
-			}
-		}else if(that.type==40){//废品入库
 		    that.getMaterialNotok();
+		}else if(that.type==50){//废品库物料
+		    that.getMaterialFP();
 		}
 		that.getMgroupOptions();
 	},
@@ -478,15 +476,10 @@ export default {
 			let that = this;
 			var req = {
 				page: 0,
+				state:10,
+				tag:that.tag,
 				mgroupx:that.mgroupId
 			};
-			if(that.type==50){
-				req.state = 50;
-				req.state_all= 1;
-			}else{
-				req.state = 10;
-				req.tag = that.tag;
-			}
 			that.materialOptions = [];
 			this.$API.wpm.wmaterial.list.req(req).then((res) => {
 				that.materialOptions = res.filter(item=>{
@@ -514,9 +507,13 @@ export default {
 			that.materialOptions = [];
 			var obj = {
 				page: 0,
-				state : 50,
 				state_all: 1
 			};
+			if(that.isFeiPinku){
+				obj.state = 50;
+			}else{
+				obj.mgroupx=that.mgroupId;
+			}
 			that.$API.wpm.wmaterial.list.req(obj).then((res) => {
 				that.materialOptions = res.filter(item=>{
 					return item.count_canhandover>0;