Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/views/wpm_gx/handover.vue

@@ -361,6 +361,7 @@ export default {
 			typeOptions: [
 				{ name: "交送", value: "send" },
 				{ name: "接收", value: "recive" },
+				{ name: "合批", value: "hepi" },
 			],
 			searchType: "",
 			options: ["交送", "接收"],
@@ -502,6 +503,8 @@ export default {
 					that.query.recive_mgroup = that.mgroupId;
 					that.query.send_mgroup = "";
 				}
+			}else if (that.searchType == "hepi") {
+				that.query.mtype =30;
 			} else {
 				that.query.send_mgroup = "";
 				that.query.recive_mgroup = "";