From 4e3d51ebf28d4399ce6021840632b9c4fb2a3cbf Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 22 Apr 2025 11:26:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=B2=E6=8E=A5=E5=8F=97=E7=9A=84?=
 =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E6=B7=BB=E5=8A=A0=E9=80=80=E5=9B=9E=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover.vue      | 32 +++++++++++++++++++++++++++++-
 src/views/wpm_gx/handover_form.vue |  7 +++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 72d2a0f6..0c506ffe 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -166,9 +166,16 @@
 							link
 							size="small"
 							@click="table_receive(scope.row)"
-							type="success"
+							type="primary"
 							v-if="scope.row.recive_mgroup == mgroupId&&scope.row.submit_time == null"
 						>接收</el-button>
+						<el-button
+							link
+							size="small"
+							@click="table_reBack(scope.row)"
+							type="danger"
+							v-if="scope.row.recive_mgroup == mgroupId&&scope.row.submit_time!== null&&scope.row.type == 10&&scope.row.mtype == 10"
+						>退回</el-button>
 						<el-button
 							link
 							size="small"
@@ -408,6 +415,29 @@ export default {
 				that.$refs.table.queryData(that.query);
 			});
 		},
+		//退回
+		table_reBack(row){
+			let that = this;
+			let form = {};
+			form.send_mgroup = row.recive_mgroup;
+			form.recive_mgroup = row.send_mgroup;
+			form.handoverb =[];
+			row.handoverb.forEach((item) => {
+			    let obj = {};
+				obj.wm = item.wm_to;
+				obj.batch = item.batch;
+				obj.count = item.count;
+				form.handoverb.push(obj)
+			})
+			form.send_user = that.$TOOL.data.get('USER_INFO').content.id;
+			form.send_date = that.$TOOL.dateFormat2(new Date());
+			form.type = 'back';
+			that.$API.wpm.handover.create.req(form).then((res) => {
+				that.$message.success("操作成功");
+			}).catch((err) => {
+				return err;
+			});
+		},
 		table_print(row) {
 			let that = this;
 			that.handoverItem = row;
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 5bb66cc4..d3439ac5 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -542,6 +542,10 @@ export default {
 						that.form.recive_mgroup = that.form.send_mgroup;
 						that.form.mtype = that.mtype;
 					}
+					if(that.form.new_batch!==''){
+						that.form.mtype=30;
+						that.mtype==30
+					}
 					if(that.mtype==20||that.mtype==30||that.type==40){
 						that.$API.wpm.handover.createsubmit.req(that.form).then((res) => {
 							that.isSaveing = false;
@@ -553,6 +557,9 @@ export default {
 							return err;
 						});	
 					}else{
+						if(that.form.new_batch!==''){
+							that.form.mtype=30;
+						}
 						if (that.mode == "add") {
 							that.$API.wpm.handover.create.req(that.form).then((res) => {
 								that.isSaveing = false;