From fb42cc177a8e2fc9b6cf22c4ad4591a34c4e9454 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 14 Nov 2025 13:44:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A6=85=E9=81=93152=E8=BE=85=E6=96=99?=
 =?UTF-8?q?=E5=BA=93=E6=B7=BB=E5=8A=A0=E5=BE=85=E9=87=87=E8=B4=AD=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/helpso.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/inm/helpso.vue b/src/views/inm/helpso.vue
index 738d4958..a28b2738 100644
--- a/src/views/inm/helpso.vue
+++ b/src/views/inm/helpso.vue
@@ -60,11 +60,6 @@
 						<span v-if="scope.row.material_&&scope.row.material_.model">{{ scope.row.material_.model }}</span>
 					</template>
 				</el-table-column>
-				<!-- 
-					:filters="unitFilters"
-					:filter-method="filterUnitDate"
-					filter-placement="bottom-end"
-				 -->
 				<el-table-column label="单位">
 					<template #default="scope">
 						<span v-if="scope.row.material_&&scope.row.material_.unit">{{ scope.row.material_.unit }}</span>
@@ -84,7 +79,15 @@
 				</el-table-column>
 				<el-table-column label="总金额" prop="expiration_date" sortable>
 					<template #default="scope">
-						<span v-if="scope.row.material_&&scope.row.material_.unit_price">{{  Number(scope.row.material_.unit_price)*Number(scope.row.count) }}</span>
+						<!-- <span v-if="scope.row.material_&&scope.row.material_.unit_price">{{ Math.round(Number(scope.row.material_.unit_price)*Number(scope.row.count)) }}</span> -->
+						<span v-if="scope.row.material_&&scope.row.material_.unit_price">{{ (Number(scope.row.material_.unit_price)*Number(scope.row.count)) }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="库存状态" prop="count">
+					<template #default="scope">
+						<span v-if="Number(scope.row.count)>Number(scope.row.material_.count_safe)">正常</span>
+						<span v-else-if="Number(scope.row.count)==Number(scope.row.material_.count_safe)">临界</span>
+						<span v-else>待采购</span>
 					</template>
 				</el-table-column>
 			</scTable>