From 8922fb610ddc2e92ed1f5eed9e43ca737e4ff3a6 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 24 Sep 2025 13:05:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BA=A4=E6=8E=A5=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=EF=BC=8C=E6=94=B9=E7=89=88=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=89=B9=E6=AC=A1=E5=8F=B7=EF=BC=8C=E5=8E=9F?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=8F=B7+g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/handover_form.vue | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index ba533c47..1ccfccb8 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-dialog
-		:title="titleMap[mode]"
+		:title="titleMap[mode+type]"
 		v-model="visible"
 		width="1000px"
 		:size="1000"
@@ -191,7 +191,7 @@
 				</el-col>
 				<el-col :md="12" :sm="24">
 					<el-form-item label="更改批次">	
-						<el-switch v-model="change_batch"></el-switch>
+						<el-switch v-model="change_batch" :disabled="type==50"></el-switch>
 					</el-form-item>
 				</el-col>
 				<el-col :md="12" :sm="24" v-if="type==50">
@@ -255,8 +255,14 @@ export default {
 			loading: false,
 			mode: "add",
 			titleMap: {
-				add: "新增交接记录",
-				edit: "编辑交接记录",
+				add10: "新增交接记录",
+				add20: "新增返工记录",
+				add40: "新增废品入库",
+				add50: "新增改版记录",
+				edit10: "编辑交接记录",
+				edit20: "编辑返工记录",
+				edit40: "编辑废品入库",
+				edit50: "编辑改版记录",
 				show: "查看交接记录",
 			},
 			lists:[],//交接数组
@@ -354,6 +360,9 @@ export default {
 	mounted() {
 		let that  = this;
 		that.form.type = that.type;
+		if(that.type==50){
+		    that.change_batch = true;
+		}
 		let materialObj = that.$TOOL.data.get("MATERIAL_OBJECT");
 		that.materialObj = materialObj;
 		that.form.handle_date =that.form.send_date =this.$TOOL.dateFormat2(new Date());
@@ -384,8 +393,6 @@ export default {
 			}
 		}else if(that.type==40){//废品入库
 		    that.getMaterialNotok();
-		}else if(that.type==60){
-		    
 		}
 		that.getMgroupOptions();
 	},
@@ -579,7 +586,7 @@ export default {
 		},
 		clearSelect(){
 			let that = this;
-			that.totalCount = 0;
+			that.totalCount = 0;                                                                                                                                                                                 
 			that.form.handoverb = [];
 		},
 		 materialChange() {
@@ -589,6 +596,7 @@ export default {
 				data = that.materialOptions.filter((item) => {
 					return that.selectItems.indexOf(item.id)>-1;
 				});
+				that.form.new_batch = data[0].batch+'g';
 				let materialId = data[0].material;
 				if(that.type==50){}else{
 					let params = {
@@ -765,6 +773,7 @@ export default {
 					let hasArr = [];
 					that.materialOptions.forEach((item) => {
 						if(item.batch == res.batch){
+							that.form.new_batch = res.batch+'g';
 							hasArr.push(item);
 							let params = {material: item.material,type: that.type};
 							that.$API.wpm.handover.mgroups.req(params).then((res0) => {
@@ -818,6 +827,7 @@ export default {
 					if(arr2.length>0){
 						that.$message.error("该批次已存在")
 					}else{
+						that.form.new_batch = arr[0].batch+'g';
 						let params = {material: arr[0].material,type: that.type};
 						that.$API.wpm.handover.mgroups.req(params).then((res0) => {
 							that.mgroupOptions = res0;
@@ -872,6 +882,7 @@ export default {
 						}else{//handoverb里没有有这个物料批次
 							that.materialOptions.forEach((item) => {
 								if(item.id == res[0].wm){
+									that.form.new_batch = item.batch+'g';
 									let params = {material: item.material,type: that.type};
 										that.$API.wpm.handover.mgroups.req(params).then((res1) => {
 										that.mgroupOptions = res1;