From eac434c0ea756bd4a3f436a31c18997509f07b13 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 5 Sep 2024 14:40:49 +0800
Subject: [PATCH] fix:

---
 src/views/wpm_gx/check_form.vue  | 2 +-
 src/views/wpm_gx/mlog_detail.vue | 6 ++++++
 src/views/wpm_gx/mlog_form.vue   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/wpm_gx/check_form.vue b/src/views/wpm_gx/check_form.vue
index 4cdbf452..8c8c25f5 100644
--- a/src/views/wpm_gx/check_form.vue
+++ b/src/views/wpm_gx/check_form.vue
@@ -400,7 +400,7 @@ export default {
 			if(this.form.type2==10){//抽检
 				this.form.count_sampling_ok = this.form.count_sampling - this.form.count_notok;
 				this.count_ok_rate = ((this.form.count_sampling_ok/this.form.count_sampling)*100).toFixed(2);
-			}else{//全检
+			}else if(this.form.type2==20){//全检
 				this.form.count_ok = this.form.count - this.form.count_notok;
 				this.count_ok_rate = ((this.form.count_ok/this.form.count)*100).toFixed(2);
 			}
diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index a2aca7d7..e819dd94 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -10,6 +10,12 @@
 			<el-card style="width: 100%" header="基本信息" shadow="never">
 				<el-descriptions>
 					<el-descriptions-item label="工艺路线">{{
+						mlogItem.routepack_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="输入物料">{{
+						mlogItem.material_in_name
+					}}</el-descriptions-item>
+					<el-descriptions-item label="输出物料">{{
 						mlogItem.material_out_name
 					}}</el-descriptions-item>
 					<el-descriptions-item label="工段名称">{{
diff --git a/src/views/wpm_gx/mlog_form.vue b/src/views/wpm_gx/mlog_form.vue
index 1d0bc810..af70a6ed 100644
--- a/src/views/wpm_gx/mlog_form.vue
+++ b/src/views/wpm_gx/mlog_form.vue
@@ -312,6 +312,7 @@ export default {
 			});
 		},
 		getEquipment() {
+			let that = this;
 			this.$API.em.equipment.list.req({ page: 0, type: 10,mgroup:that.mgroup}).then((res) => {
 				this.options = res;
 			});