From 17c50f7b2747a23a5fd49b74d5cb66dfbeeac099 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 18 Sep 2024 14:50:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BD=A6=E9=97=B4=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=97=B6=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=BAcount=5Fcando?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/check_form.vue  |  5 ++---
 src/views/wpm_gx/mlog_detail.vue | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/views/wpm_gx/check_form.vue b/src/views/wpm_gx/check_form.vue
index 8c8c25f5..fc3a507d 100644
--- a/src/views/wpm_gx/check_form.vue
+++ b/src/views/wpm_gx/check_form.vue
@@ -347,10 +347,10 @@ export default {
 		};
 	},
 	mounted() {
-		this.batchCount = this.itemObj.count;
+		this.batchCount = this.itemObj.count_cando;
 		this.form.batch = this.itemObj.batch;
 		this.form.wm = this.itemObj.id;
-		this.form.count = this.itemObj.count;
+		this.form.count = this.itemObj.count_cando;
 		this.form.supplier = this.itemObj.supplier;
 		this.deptID = this.$TOOL.data.get('gx_deptID');
 		this.getUsers();
@@ -361,7 +361,6 @@ export default {
 			this.mode = mode;
 			this.modeTitle = mode+'抽检';
 			this.visible = true;
-			
 			return this;
 		},
 		getUsers(){
diff --git a/src/views/wpm_gx/mlog_detail.vue b/src/views/wpm_gx/mlog_detail.vue
index b8739c55..6181d17a 100644
--- a/src/views/wpm_gx/mlog_detail.vue
+++ b/src/views/wpm_gx/mlog_detail.vue
@@ -72,10 +72,10 @@
 					>放行审批</el-button>
 				</div>
 			</el-card>
-			<!-- 物料消耗 -->
+			<!-- 输入物料 -->
 			<el-card
 				style="width: 100%; margin: 1vh 0"
-				header="物料消耗"
+				header="输入物料"
 				shadow="never"
 			>
 				<div>
@@ -141,7 +141,7 @@
 					</el-table-column>
 				</scTable>
 			</el-card>
-			<!-- 物料消耗编辑 -->
+			<!-- 输入物料编辑 -->
 			<el-dialog v-model="saveInDialog" title="编辑">
 				<el-form
 					:model="saveInForm"
@@ -181,8 +181,8 @@
 					>
 				</template>
 			</el-dialog>
-			<!-- 产出物料 -->
-			<el-card style="width: 100%" header="产出物料" shadow="never">
+			<!-- 输出物料 -->
+			<el-card style="width: 100%" header="输出物料" shadow="never">
 				<scTable
 					ref="tableOut"
 					:apiObj="apiObj"