From e15f03142a45688f25bc101233b4e41898209b0c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 29 Jul 2024 17:01:03 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=85=89=E8=8A=AF=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=98=BE=E7=A4=BA=E5=8D=95=E4=BB=B7=E5=92=8C=E6=80=BB?=
 =?UTF-8?q?=E4=BB=B7=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=8D=8A=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=8D=95=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/materials_form_gx.vue |  3 +--
 src/views/mtm/materials_gx.vue      | 15 +++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/mtm/materials_form_gx.vue b/src/views/mtm/materials_form_gx.vue
index eb8b5e19..4620327f 100644
--- a/src/views/mtm/materials_form_gx.vue
+++ b/src/views/mtm/materials_form_gx.vue
@@ -93,7 +93,7 @@
 							</el-form-item>
 						</el-col>
 						<!-- 光芯 -->
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="24" v-if="form.type !== 20">
 							<el-form-item label="物料单价">
 								<el-input-number
 									v-model="form.unit_price"
@@ -102,7 +102,6 @@
 								/>
 							</el-form-item>
 						</el-col>
-
 						<el-col :md="12" :sm="24">
 							<el-form-item label="是否隐藏" prop="is_hidden">
 								<el-switch v-model="form.is_hidden" />
diff --git a/src/views/mtm/materials_gx.vue b/src/views/mtm/materials_gx.vue
index a3caee2e..9bcb57f8 100644
--- a/src/views/mtm/materials_gx.vue
+++ b/src/views/mtm/materials_gx.vue
@@ -107,13 +107,16 @@
 							width="80"
 						>
 						</el-table-column>
-						<el-table-column label="总库存" prop="count" width="80">
+						<el-table-column label="总库存" prop="count">
 						</el-table-column>
-						<el-table-column
-							label="安全库存"
-							prop="count_safe"
-							width="80"
-						>
+						<el-table-column label="安全库存" prop="count_safe">
+						</el-table-column>
+						<el-table-column label="单价" prop="unit_price">
+						</el-table-column>
+						<el-table-column label="总价" prop="count_safe">
+							<template #default="scope">
+								{{ scope.row.unit_price * scope.row.count }}
+							</template>
 						</el-table-column>
 						<el-table-column
 							v-if="materialType == ''"