From b3acb107e140495cc64745353eb976dcffdfd327 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 22 Apr 2025 11:34:59 +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      | 7 +++++--
 src/views/wpm_gx/handover_form.vue | 5 +----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 0c506ffe..b85da9e9 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -130,6 +130,9 @@
 						<el-tag v-if="scope.row.type == 40" type="danger"
 							>报废</el-tag
 						>
+						<el-tag v-if="scope.row.type == 60" type="warning"
+							>退料</el-tag
+						>
 					</template>
 				</el-table-column>
 				<el-table-column
@@ -429,9 +432,9 @@ export default {
 				obj.count = item.count;
 				form.handoverb.push(obj)
 			})
-			form.send_user = that.$TOOL.data.get('USER_INFO').content.id;
+			form.send_user = that.$TOOL.data.get('USER_INFO').id;
 			form.send_date = that.$TOOL.dateFormat2(new Date());
-			form.type = 'back';
+			form.type = 60;
 			that.$API.wpm.handover.create.req(form).then((res) => {
 				that.$message.success("操作成功");
 			}).catch((err) => {
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index d3439ac5..4c81f5f9 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -542,7 +542,7 @@ export default {
 						that.form.recive_mgroup = that.form.send_mgroup;
 						that.form.mtype = that.mtype;
 					}
-					if(that.form.new_batch!==''){
+					if(that.change_batch){
 						that.form.mtype=30;
 						that.mtype==30
 					}
@@ -557,9 +557,6 @@ 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;