From ce57e0c5e137857faa1436c981b3af206127ccee Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 17 Dec 2024 10:28:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover.vue | 34 ++++++++++------------------------
 src/views/wpm_gx/inm.vue      | 18 ++++--------------
 src/views/wpm_gx/mtask.vue    | 16 ++--------------
 3 files changed, 16 insertions(+), 52 deletions(-)

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 9b7da4f9..cb05fae0 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -14,7 +14,7 @@
 					icon="el-icon-plus"
 					@click="table_add(20)"
 					v-auth="'handover.create'"
-					v-if="mgroup_name!=='切片'&&mgroup_name!=='拉单丝'&&mgroup_name!=='一次复丝'&&mgroup_name!=='二次复丝'&&mgroup_name!=='切丝排版'"
+					v-if="mgroupName!=='切片'&&mgroupName!=='拉单丝'&&mgroupName!=='一次复丝'&&mgroupName!=='二次复丝'&&mgroupName!=='切丝排版'"
 					>返工</el-button
 				>
 				<el-button
@@ -27,7 +27,7 @@
 					icon="el-icon-plus"
 					@click="table_add(30)"
 					v-auth="'handover.create'"
-					v-if="mgroup_name=='一次超洗'||mgroup_name=='二次超洗'"
+					v-if="mgroupName=='一次超洗'||mgroupName=='二次超洗'"
 					>检验</el-button
 				>
 			</div>
@@ -104,7 +104,7 @@
 				</el-table-column>
 				<el-table-column label="数量" prop="count" width="80"></el-table-column>
 				<el-table-column label="交接类型" prop="type" width="100">
-					<template #default="scope" v-if="mgroup_name=='size'||mgroup_name=='facade'">
+					<template #default="scope" v-if="mgroupName=='size'||mgroupName=='facade'">
 						<el-text v-if="scope.row.send_dept == deptId" type="primary">交送</el-text>
 						<el-text v-if="scope.row.recive_dept == deptId" type="success">接收</el-text>
 					</template>
@@ -211,7 +211,7 @@
 		v-if="dialog.save"
 		ref="saveDialog"
 		:type="type"
-		:mgroupName="mgroup_name"
+		:mgroupName="mgroupName"
 		:mgroupId="mgroupId"
 		@success="handleSaveSuccess"
 		@closed="dialog.save = false"
@@ -279,29 +279,15 @@ export default {
 			printer_name: "",
 			printVisible:false,
 			setNameVisible: false,
-			mgroup_name:'',
 		};
 	},
-	watch: {
-		mgroupName: {
-			handler: function (newval,odlval) {
-				let that = this;
-				that.params.dept = "";
-				that.params.mgroup = "";
-				that.apiObj = null;
-				that.mgroup_name  = newval;
-				that.getMgroupInfo();
-			},
-		},
-	},
 	mounted() {
-		// this.getMgroupInfo();
+		this.getMgroupInfo();
 	},
 	methods: {
 		getMgroupInfo(){
 			let that = this;
-			console.log('that.mgroup_name',that.mgroup_name);
-			if(that.mgroup_name=="size"){//尺寸检验
+			if(that.mgroupName=="size"){//尺寸检验
 				// that.params.material__process__name="一次超洗";
 				that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => {
 					if(res.length>0){
@@ -311,7 +297,7 @@ export default {
 					that.apiObj = that.$API.wpm.handover.list;
 					that.$refs.table.refresh();
 				})
-			}else if(that.mgroup_name=="facade"){//外观检验
+			}else if(that.mgroupName=="facade"){//外观检验
 				// that.params.material__process__name="二次超洗";
 				that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => {
 					if(res.length>0){
@@ -324,7 +310,7 @@ export default {
 			}else{//工段交接
 				that.printer_name = localStorage.getItem("printer_name");
 				that.$API.mtm.mgroup.list
-				.req({ page: 0, name: that.mgroup_name })
+				.req({ page: 0, name: that.mgroupName })
 				.then((res) => {
 					if (res.length < 1) {
 						that.$message.error("获取工段错误");
@@ -388,7 +374,7 @@ export default {
 		searchTypeQuery() {
 			let that = this;
 			if (that.searchType == "send") {
-				if(that.mgroup_name=="size"||that.mgroup_name=="facade"){
+				if(that.mgroupName=="size"||that.mgroupName=="facade"){
 					that.query.send_dept = that.deptId;
 					that.query.recive_dept = "";
 				}else{
@@ -396,7 +382,7 @@ export default {
 					that.query.recive_mgroup = "";
 				}
 			} else if (that.searchType == "recive") {
-				if(that.mgroup_name=="size"||that.mgroup_name=="facade"){
+				if(that.mgroupName=="size"||that.mgroupName=="facade"){
 					that.query.send_dept = "";
 					that.query.recive_dept =that.deptId;
 				}else{
diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index fd48c6ea..b8a6ef88 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -139,7 +139,7 @@
 			v-if="dialog.save"
 			ref="saveDialog"
 			:mgroup="mgroupId"
-			:mgroupName="mgroup_name"
+			:mgroupName="mgroupName"
 			:itemObj = "checkItem"
 			@success="handleSaveSuccess"
 			@closed="dialog.save = false"
@@ -149,7 +149,7 @@
 			v-if="dialog.scrap"
 			ref="scrapDialog"
 			:type="type"
-			:mgroupName="mgroup_name"
+			:mgroupName="mgroupName"
 			:mgroupId="mgroupId"
 			@success="handleScrapSuccess"
 			@closed="dialog.scrap = false"
@@ -245,20 +245,10 @@ export default {
 			visibleDrawer: false,
 			apiObjPrint:this.$API.cm.labelmat.fromWm,
 			wmId:'',
-			mgroup_name:''
 		};
 	},
-	mounted() {},
-	watch: {
-		mgroupName: {
-			handler: function (newval,odlval) {
-				let that = this;
-				that.params.mgroupx = "";
-				that.apiObj = null;
-				that.mgroup_name  = newval;
-				that.getMgroupInfo();
-			},
-		},
+	mounted() {
+		this.getMgroupInfo();
 	},
 	methods: {
 		getMgroupInfo(){
diff --git a/src/views/wpm_gx/mtask.vue b/src/views/wpm_gx/mtask.vue
index 469cd07e..d7d40ab2 100644
--- a/src/views/wpm_gx/mtask.vue
+++ b/src/views/wpm_gx/mtask.vue
@@ -27,7 +27,7 @@
 						</span>
 					</template>
 				</el-table-column>
-				<el-table-column label="可用批" v-if="mgroup_name!='切片'">
+				<el-table-column label="可用批" v-if="mgroupName!='切片'">
 					<template #default="scope">
 						<el-button 
 							link
@@ -138,21 +138,9 @@ export default {
 			// 	40: "已提交",
 			// },
 			deptId: null,
-			mgroup_name:'',
 			deliverShow:false,
 		};
 	},
-	watch: {
-		mgroupName: {
-			handler: function (newval,odlval) {
-				let that = this;
-				that.params.mgroup = "";
-				that.apiObj = null;
-				that.mgroup_name  = newval;
-				that.getMgroupInfo();
-			},
-		},
-	},
 	mounted() {
 		this.getMgroupInfo();
 	},
@@ -160,7 +148,7 @@ export default {
 		getMgroupInfo(){
 			let that = this;
 			that.$API.mtm.mgroup.list
-			.req({ page: 0, name: that.mgroup_name })
+			.req({ page: 0, name: that.mgroupName })
 			.then((res) => {
 				if(res.length>0){
 					that.mgroupId = res[0].id;