From 8bf82762bc4dc9639063728c9d056d5ac6035787 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 11 Dec 2024 14:56:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/process.vue      | 13 +++++++++----
 src/views/mtm/process_form.vue |  7 +++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/mtm/process.vue b/src/views/mtm/process.vue
index d3fa094d..d84405bd 100644
--- a/src/views/mtm/process.vue
+++ b/src/views/mtm/process.vue
@@ -47,14 +47,18 @@
 					prop="cate"
 					min-width="150"
 				></el-table-column>
-				<el-table-column label="批号追加设备" min-width="60">
+				<el-table-column label="批号追加设备" min-width="60" v-if="baseCode!=='bxerp'">
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.batch_append_equip">
 							是
 						</el-tag>
-						<!-- <el-icon v-if="scope.row.batch_append_equip" color="green">
-							<CircleCheckFilled />
-						</el-icon> -->
+					</template>
+				</el-table-column>
+				<el-table-column label="是否自检" min-width="60" v-if="baseCode =='bxerp'">
+					<template #default="scope">
+						<el-tag type="success" v-if="scope.row.into_wm_mgroup">
+							是
+						</el-tag>
 					</template>
 				</el-table-column>
 				<el-table-column label="交接到工段" min-width="60">
@@ -147,6 +151,7 @@ export default {
 				50: "加工工具",
 				60: "辅助工装",
 			},
+			baseCode :this.$TOOL.data.get('BASE_INFO').base.base_code
 		};
 	},
 	methods: {
diff --git a/src/views/mtm/process_form.vue b/src/views/mtm/process_form.vue
index cd3f6268..af9a1aaa 100644
--- a/src/views/mtm/process_form.vue
+++ b/src/views/mtm/process_form.vue
@@ -45,6 +45,13 @@
 								></el-switch>
 							</el-form-item>
 						</el-col>
+						<el-col :span="12" v-if="baseCode=='bxerp'">
+							<el-form-item label="是否自检">
+								<el-switch
+									v-model="form.into_wm_mgroup"
+								></el-switch>
+							</el-form-item>
+						</el-col>
 						<el-col :span="12">
 							<el-form-item label="交接到工段">
 								<el-switch

From e32d444e5769e7b1647f64e1bea142da8a776fbe Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 11 Dec 2024 14:56:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/config/route.js b/src/config/route.js
index a02e310b..e3604c77 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -1639,6 +1639,17 @@ const routes = [
 					},
 				],
 			},
+			{
+				path: "/mlog_bx",
+				name: "mlog_bx",
+				meta: {
+					title: "生产执行",
+					icon: "el-icon-histogram",
+					type: "menu",
+					perms: ["wpm_bx"],
+				},
+				component: "wpm_gx/mlog_bx",
+			},
 			//检验管理 qm
 			{
 				name: "qm",

From 69307c7590464008eda0ff9af8983bbd1ee8ca59 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 11 Dec 2024 14:58:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/handover.vue | 159 +++++++++++++---------------------
 src/views/wpm_gx/inm.vue      |  97 ++++++++++++---------
 src/views/wpm_gx/mlog_bx.vue  | 116 +++++++++++++++++++++++++
 src/views/wpm_gx/mlogs.vue    |  32 +++++--
 src/views/wpm_gx/mtask.vue    |  28 ++++--
 5 files changed, 278 insertions(+), 154 deletions(-)
 create mode 100644 src/views/wpm_gx/mlog_bx.vue

diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index d1ab097e..9b7da4f9 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="mgroupName!=='切片'"
+					v-if="mgroup_name!=='切片'&&mgroup_name!=='拉单丝'&&mgroup_name!=='一次复丝'&&mgroup_name!=='二次复丝'&&mgroup_name!=='切丝排版'"
 					>返工</el-button
 				>
 				<el-button
@@ -27,7 +27,7 @@
 					icon="el-icon-plus"
 					@click="table_add(30)"
 					v-auth="'handover.create'"
-					v-if="mgroupName=='一次超洗'||mgroupName=='二次超洗'"
+					v-if="mgroup_name=='一次超洗'||mgroup_name=='二次超洗'"
 					>检验</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="mgroupName=='size'||mgroupName=='facade'">
+					<template #default="scope" v-if="mgroup_name=='size'||mgroup_name=='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="mgroupName"
+		:mgroupName="mgroup_name"
 		:mgroupId="mgroupId"
 		@success="handleSaveSuccess"
 		@closed="dialog.save = false"
@@ -279,92 +279,70 @@ export default {
 			printer_name: "",
 			printVisible:false,
 			setNameVisible: false,
-			testCode: "mat:3689278065261125632",
+			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() {
-		let that = this;
-		console.log('that.mgroupName',that.mgroupName);
-		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){
-					that.deptId = res[0].id;
-					that.params.dept=res[0].id;
-					console.log('that.deptId',that.deptId);
-				}
-				that.apiObj = that.$API.wpm.handover.list;
-			})
-		}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){
-					that.deptId = res[0].id;
-					that.params.dept=res[0].id;
-					console.log('that.deptId',that.deptId);
-				}
-				that.apiObj = that.$API.wpm.handover.list;
-			})
-		}else{//工段交接
-			that.printer_name = localStorage.getItem("printer_name");
-			that.$API.mtm.mgroup.list
-			.req({ page: 0, name: that.mgroupName })
-			.then((res) => {
-				if (res.length < 1) {
-					that.$message.error("获取工段错误");
-					return;
-				}
-				that.$TOOL.data.set('gx_deptID',res[0].belong_dept)
-				that.mgroupId = res[0].id;
-				that.processId = res[0].process;
-				that.processCate = res[0].process_cate;
-				that.params.mgroup = that.mgroupId;
-				that.apiObj = that.$API.wpm.handover.list;
-			});
-		}
+		// this.getMgroupInfo();
 	},
 	methods: {
+		getMgroupInfo(){
+			let that = this;
+			console.log('that.mgroup_name',that.mgroup_name);
+			if(that.mgroup_name=="size"){//尺寸检验
+				// that.params.material__process__name="一次超洗";
+				that.$API.system.dept.list.req({name__contains:'尺寸',page:0}).then((res) => {
+					if(res.length>0){
+						that.deptId = res[0].id;
+						that.params.dept=res[0].id;
+					}
+					that.apiObj = that.$API.wpm.handover.list;
+					that.$refs.table.refresh();
+				})
+			}else if(that.mgroup_name=="facade"){//外观检验
+				// that.params.material__process__name="二次超洗";
+				that.$API.system.dept.list.req({name__contains:'外观',page:0}).then((res) => {
+					if(res.length>0){
+						that.deptId = res[0].id;
+						that.params.dept=res[0].id;
+					}
+					that.apiObj = that.$API.wpm.handover.list;
+					that.$refs.table.refresh();
+				})
+			}else{//工段交接
+				that.printer_name = localStorage.getItem("printer_name");
+				that.$API.mtm.mgroup.list
+				.req({ page: 0, name: that.mgroup_name })
+				.then((res) => {
+					if (res.length < 1) {
+						that.$message.error("获取工段错误");
+						return;
+					}
+					that.$TOOL.data.set('gx_deptID',res[0].belong_dept)
+					that.mgroupId = res[0].id;
+					that.processId = res[0].process;
+					that.processCate = res[0].process_cate;
+					that.params.mgroup = that.mgroupId;
+					that.apiObj = that.$API.wpm.handover.list;
+					that.$refs.table.refresh();
+				});
+			}
+		},
 		printSetting(){
 			this.setNameVisible = true;
 		},
-		handoverPrint(row) {
-			let that = this;
-			let str = [
-				"SIZE 60 mm,90 mm",
-				"GAP 0 mm,0 mm",
-				"CLS",
-				'QRCODE 0,60,H,5,A,0,"' +that.testCode +'"',
-				"WINTEXT 0,200,36,0,0,0,Simhei," +row.material_name,
-				"WINTEXT 0,240,36,0,0,0,Simhei,批次：" +
-					row.batch,
-				]; 
-			if(row.wm_notok_sign!==null){
-				str.push("WINTEXT 0,280,36,0,0,0,Simhei,不合格原因：" +
-						row.wm_notok_sign,)
-			}
-			//供应商----原料、辅料
-			// if(row.type==30||row.type==40){
-			// 	str.push("WINTEXT 50,460,36,0,0,0,Simhei,供应商：" +
-			// 			row.supplier_name,)
-			// }
-			str.push("PRINT 1",)
-			// let str = [
-			// 	"SIZE 60 mm,90 mm",
-			// 	"GAP 0 mm,0 mm",
-			// 	"CLS",
-			// 	"WINTEXT 0,10,36,0,0,0,Simhei," +row.material_name,
-			// 	'QRCODE 0,60,H,5,A,0,"' +that.testCode +'"',
-			// 	"WINTEXT 50,340,36,0,0,0,Simhei,批次：" +
-			// 		row.batch,
-			// 	"WINTEXT 50,400,36,0,0,0,Simhei,不合格原因：" +
-			// 		row.wm_notok_sign,
-			// 	"PRINT 1",
-			// ];
-			let obj = {};
-			obj.printer_commands = str;
-			obj.printer_name = that.printer_name;
-			this.$API.wpm.prints.req(obj).then((response) => {});
-		},
 		//添加
 		table_add(type) {
 			this.dialog.save = true;
@@ -410,7 +388,7 @@ export default {
 		searchTypeQuery() {
 			let that = this;
 			if (that.searchType == "send") {
-				if(that.mgroupName=="size"||that.mgroupName=="facade"){
+				if(that.mgroup_name=="size"||that.mgroup_name=="facade"){
 					that.query.send_dept = that.deptId;
 					that.query.recive_dept = "";
 				}else{
@@ -418,7 +396,7 @@ export default {
 					that.query.recive_mgroup = "";
 				}
 			} else if (that.searchType == "recive") {
-				if(that.mgroupName=="size"||that.mgroupName=="facade"){
+				if(that.mgroup_name=="size"||that.mgroup_name=="facade"){
 					that.query.send_dept = "";
 					that.query.recive_dept =that.deptId;
 				}else{
@@ -445,19 +423,6 @@ export default {
 			let that = this;
 			that.handoverItem = row;
 			that.printVisible = true;
-			//打印
-			// if (
-			// 	that.printer_name == null ||
-			// 	that.printer_name == "" ||
-			// 	that.printer_name == undefined
-			// ) {
-			// 	this.setNameVisible = true;
-			// } else {
-			// 	that.$API.wpm.handover.item.req(row.id).then((res) => {
-			// 		that.handoverItem = res;
-			// 		that.handoverPrint(row);
-			// 	});
-			// }
 		},
 		savePrinter() {
 			let that = this;
diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index 811280ae..fd48c6ea 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -13,9 +13,6 @@
 					报废</el-button>
 			</div>
 			<div class="right-panel">
-				<!-- <el-button type="primary" @click="materialsChoses('wm')"
-					>选择物料</el-button
-				> -->
 				<el-select
 					v-model="query.state"
 					placeholder="物料状态"
@@ -142,7 +139,7 @@
 			v-if="dialog.save"
 			ref="saveDialog"
 			:mgroup="mgroupId"
-			:mgroupName="mgroupName"
+			:mgroupName="mgroup_name"
 			:itemObj = "checkItem"
 			@success="handleSaveSuccess"
 			@closed="dialog.save = false"
@@ -152,7 +149,7 @@
 			v-if="dialog.scrap"
 			ref="scrapDialog"
 			:type="type"
-			:mgroupName="mgroupName"
+			:mgroupName="mgroup_name"
 			:mgroupId="mgroupId"
 			@success="handleScrapSuccess"
 			@closed="dialog.scrap = false"
@@ -248,47 +245,63 @@ export default {
 			visibleDrawer: false,
 			apiObjPrint:this.$API.cm.labelmat.fromWm,
 			wmId:'',
+			mgroup_name:''
 		};
 	},
-	mounted() {
-		let that = this;
-		console.log(that.mgroupName);
-		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){
-					that.params.mgroupx = null;
-					that.params.belong_dept=res[0].id;
-				}
-				that.apiObj = that.$API.wpm.wmaterial.list;
-			})
-		}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){
-					that.params.mgroupx = null;
-					that.params.belong_dept=res[0].id;
-				}
-				that.apiObj = that.$API.wpm.wmaterial.list;
-			})
-		}else{
-			that.$API.mtm.mgroup.list
-			.req({ page: 0, name: that.mgroupName })
-			.then((res) => {
-				if (res.length < 1) {
-					that.$message.error("获取工段错误");
-					return;
-				}
-				that.mgroupId = res[0].id;
-				that.$TOOL.data.set('gx_deptID',res[0].belong_dept)
-				that.process = res[0].process;
-				that.params.mgroupx = res[0].id;
-				that.params.belong_dept = res[0].belong_dept;
-				that.apiObj = that.$API.wpm.wmaterial.list;
-			});
-		}
+	mounted() {},
+	watch: {
+		mgroupName: {
+			handler: function (newval,odlval) {
+				let that = this;
+				that.params.mgroupx = "";
+				that.apiObj = null;
+				that.mgroup_name  = newval;
+				that.getMgroupInfo();
+			},
+		},
 	},
 	methods: {
+		getMgroupInfo(){
+			let that = this;
+			console.log(that.mgroupName);
+			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){
+						that.params.mgroupx = null;
+						that.params.belong_dept=res[0].id;
+					}
+					that.apiObj = that.$API.wpm.wmaterial.list;
+					that.$refs.table.refresh();
+				})
+			}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){
+						that.params.mgroupx = null;
+						that.params.belong_dept=res[0].id;
+					}
+					that.apiObj = that.$API.wpm.wmaterial.list;
+					that.$refs.table.refresh();
+				})
+			}else{
+				that.$API.mtm.mgroup.list
+				.req({ page: 0, name: that.mgroupName })
+				.then((res) => {
+					if (res.length < 1) {
+						that.$message.error("获取工段错误");
+						return;
+					}
+					that.mgroupId = res[0].id;
+					that.$TOOL.data.set('gx_deptID',res[0].belong_dept)
+					that.process = res[0].process;
+					that.params.mgroupx = res[0].id;
+					that.params.belong_dept = res[0].belong_dept;
+					that.apiObj = that.$API.wpm.wmaterial.list;
+					that.$refs.table.refresh();
+				});
+			}
+		},
 		add() {
 			this.dialog.save = true;
 			this.$nextTick(() => {
diff --git a/src/views/wpm_gx/mlog_bx.vue b/src/views/wpm_gx/mlog_bx.vue
new file mode 100644
index 00000000..281fe1d7
--- /dev/null
+++ b/src/views/wpm_gx/mlog_bx.vue
@@ -0,0 +1,116 @@
+<template>
+	<el-container>	
+		<el-aside style="width: 100px;background: #ffffff;">
+			<ul style="padding-left: 7px;">
+				<li 
+					v-for="(item,index) in mgroups" 
+					:key="item.id" 
+					:class="['mgroupItem',selectedIndex === index?'mgroupItemActive':'']"
+					@click="changeMgroup(item.id,index)"
+				>{{item.name}}</li>
+			</ul>
+		</el-aside>
+		<el-main>
+			<el-container>
+				<el-header>
+					<el-segmented
+						v-model="values"
+						:options="options"
+						size="default"
+					></el-segmented>
+				</el-header>
+				<el-main id="elMain" class="nopadding">
+					<!-- 日志 -->
+					<mlogs
+						v-if="values == '日志'"
+						:mgroupName="mgroupName"
+						style="height: 60%"
+					></mlogs>
+					<mtask
+						v-if="values == '日志'"
+						:mgroupName="mgroupName"
+						style="height: 40%"
+					></mtask>
+					<!-- 交接记录 -->
+					<handover
+						v-else-if="values == '交接记录'"
+						:mgroupName="mgroupName"
+					></handover>
+					<!-- 库存 -->
+					<inm v-else-if="values == '库存'" :mgroupName="mgroupName"></inm>
+					
+				</el-main>
+			</el-container>
+		</el-main>
+	</el-container>
+</template>
+<script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
+export default {
+	name: "bx",
+	components: { inm, mlogs, mtask, handover },
+	data() {
+		return {
+			mgroups:[],
+			tableHieght: 200,
+			options: ["日志", "交接记录", "库存"],
+			values: "日志",
+			mgroupName: "",
+			mgroupId: "",
+			selectedIndex:0,
+		};
+	},
+	created() {
+		let that = this;
+	    that.getMgroups();
+	},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+		
+	},
+	methods: {
+		handleChange(value) {
+			this.value = value;
+			console.log("Selected value:", value);
+		},
+		getMgroups(){
+			let that = this;
+			that.$API.mtm.mgroup.list.req({page:0}).then((res) => {
+				that.mgroups = res;
+				that.mgroupName = res[0].name;
+			});
+		},
+		changeMgroup(id,index){
+			let that = this;
+			that.selectedIndex = index;
+			console.log(that.selectedIndex);
+			that.mgroupId = id;
+			that.mgroupName = that.mgroups[index].name;
+		},
+	},
+};
+</script>
+<style scoped>
+.countBlock {
+	width: 80px;
+	color: #ffffff;
+	text-align: center;
+}
+.mgroupItem{
+	height: 35px;
+	width: 80px;
+	line-height: 35px;
+	margin: 5px 0;
+	text-align: center;
+	color: #6e80ff;
+}
+.mgroupItem:hover,.mgroupItemActive{
+	color: #6e80ff;
+	background: rgba(83, 109, 254, 0.2);
+}
+</style>
diff --git a/src/views/wpm_gx/mlogs.vue b/src/views/wpm_gx/mlogs.vue
index 41f6fc11..ce321a34 100644
--- a/src/views/wpm_gx/mlogs.vue
+++ b/src/views/wpm_gx/mlogs.vue
@@ -54,7 +54,7 @@
 					prop="equipment_name"
 					min-width="150"
 				></el-table-column>
-				<el-table-column label="进度" prop="belong_dept_name"  v-if="mgroupName=='黑化'||mgroupName=='退火'">
+				<el-table-column label="进度" prop="belong_dept_name"  v-if="mgroup_name=='黑化'||mgroup_name=='退火'">
 					<template #default="scope">
 						<el-progress id="progressbwlq" :percentage="customMethod(scope.row,1)" :stroke-width="20" :color="customMethod(scope.row,2)" :text-inside="true"><span>{{customMethod(scope.row,3)}}</span></el-progress>
 					</template>
@@ -72,7 +72,7 @@
 					prop="handle_user_name"
 					width="80"
 				></el-table-column>
-				<el-table-column label="保温剩余时间" v-if="mgroupName=='黑化'||mgroupName=='退火'">
+				<el-table-column label="保温剩余时间" v-if="mgroup_name=='黑化'||mgroup_name=='退火'">
 					<template #default="scope">
 						{{ getRemaTime(scope.row) }}
 					</template>
@@ -146,7 +146,7 @@
 			:process="processId"
 			:mgroup="mgroupId"
 			:dept="deptId"
-			:mgroupName = "mgroupName"
+			:mgroup_name = "mgroup_name"
 			@success="handleSaveSuccess"
 			@closed="dialog.save = false"
 		>
@@ -193,13 +193,27 @@ export default {
 			deptId: null,
 			processId: "",
 			processCate: "",
+			mgroup_name:''
 		};
 	},
+	watch: {
+		mgroupName: {
+			handler: function (newval,odlval) {
+				let that = this;
+				that.params.mgroup = "";
+				that.apiObj = null;
+				that.mgroup_name  = newval;
+				that.getMgroupInfo();
+			},
+		},
+	},
 	mounted() {
-		let that = this;
-		that.$API.mtm.mgroup.list
-			.req({ page: 0, name: that.mgroupName })
-			.then((res) => {
+		// this.getMgroupInfo();
+	},
+	methods: {
+		getMgroupInfo(){
+			let that = this;
+			that.$API.mtm.mgroup.list.req({ page: 0, name: that.mgroup_name }).then((res) => {
 				if (res.length < 1) {
 					that.$message.error("获取工段错误");
 					return;
@@ -210,9 +224,9 @@ export default {
 				that.processCate = res[0].process_cate;
 				that.params.mgroup = res[0].id;
 				that.apiObj = that.$API.wpm.mlog.list;
+				that.$refs.table.refresh();
 			});
-	},
-	methods: {
+		},
 		getRemaTime(row){
 			if(row.work_start_time !== null){
 				let times = 0;
diff --git a/src/views/wpm_gx/mtask.vue b/src/views/wpm_gx/mtask.vue
index 4223eb7a..469cd07e 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="mgroupName!='切片'">
+				<el-table-column label="可用批" v-if="mgroup_name!='切片'">
 					<template #default="scope">
 						<el-button 
 							link
@@ -138,13 +138,29 @@ 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() {
-		let that = this;
-		that.$API.mtm.mgroup.list
-			.req({ page: 0, name: that.mgroupName })
+		this.getMgroupInfo();
+	},
+	methods: {
+		getMgroupInfo(){
+			let that = this;
+			that.$API.mtm.mgroup.list
+			.req({ page: 0, name: that.mgroup_name })
 			.then((res) => {
 				if(res.length>0){
 					that.mgroupId = res[0].id;
@@ -153,13 +169,13 @@ export default {
 					that.processCate = res[0].process_cate;
 					that.params.mgroup = res[0].id;
 					that.apiObj = this.$API.pm.mtask.list;
+					that.$refs.table.refresh();
 				}else{
 					that.$message.error("获取工段错误");
 					return;
 				}
 			});
-	},
-	methods: {
+		},
 		viewBatches(row){
 			this.dialogVisible = true;
 			this.$nextTick(() => {

From bb314a30a22d5807a32ccf92180d1e5f92fdf06d Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 11 Dec 2024 15:53:18 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=E7=89=A9=E6=96=99=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=88=90=E5=93=81=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=BA=B8=E5=92=8C?=
 =?UTF-8?q?=E5=9B=BE=E7=BA=B8=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/materials_form_gx.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/mtm/materials_form_gx.vue b/src/views/mtm/materials_form_gx.vue
index 88a370da..1287d8ba 100644
--- a/src/views/mtm/materials_form_gx.vue
+++ b/src/views/mtm/materials_form_gx.vue
@@ -49,7 +49,6 @@
 								/>
 							</el-form-item>
 						</el-col>
-
 						<el-col :md="12" :sm="24">
 							<el-form-item label="规格">
 								<el-input
@@ -114,6 +113,16 @@
 								<el-switch v-model="form.is_hidden" />
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24" v-if="form.type==10">
+							<el-form-item label="产品图纸">
+								<sc-upload v-model="form.photo" :modelValue="form.photo" title="产品图纸"></sc-upload>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24" v-if="form.type==10">
+							<el-form-item label="图纸编号">
+								<el-input v-model="form.photo_number" placeholder="图纸编号"/>
+							</el-form-item>
+						</el-col>
 					</el-row>
 				</el-form>
 			</el-main>