From a80fcaaf130286f215a35aa62450421b480b4d5a Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 二月 2025 11:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 admin/src/views/stock/components/inventoryDetails.vue |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/admin/src/views/stock/components/inventoryDetails.vue b/admin/src/views/stock/components/inventoryDetails.vue
index 790d7bf..b47d41c 100644
--- a/admin/src/views/stock/components/inventoryDetails.vue
+++ b/admin/src/views/stock/components/inventoryDetails.vue
@@ -68,7 +68,13 @@
                         <el-table-column prop="materialUnitName" label="鍗曚綅" show-overflow-tooltip />
                         <el-table-column prop="warehouseName" label="鎵�鍦ㄤ粨搴�" show-overflow-tooltip />
                         <el-table-column prop="stock" label="璐﹂潰鏁伴噺" show-overflow-tooltip />
-                        <el-table-column prop="actStock" label="鐩樼偣鏁伴噺" show-overflow-tooltip />
+                        <el-table-column label="鐩樼偣鏁伴噺" show-overflow-tooltip>
+                            <template slot-scope="{row}">
+                                <span style="color: red;" v-if="row.type === 1">{{row.actStock}}</span>
+                                <span style="color: green;" v-else-if="row.type === 2">{{row.actStock}}</span>
+                                <span v-else>{{row.actStock}}</span>
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="remark" label="澶囨敞" show-overflow-tooltip />
                     </el-table>
                 </div>

--
Gitblit v1.9.3