From 5318f7a1523d9a71f7cbb60b114af369ed83c1ca Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 17 Dec 2024 23:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=88=97=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/material/MaterialList.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index 966f43643..ca6cb25aa 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -184,6 +184,11 @@
               <a-tag v-if="record.enableSerialNumber==1" color="orange">序</a-tag>
               <a-tag v-if="record.enableBatchNumber==1" color="orange">批</a-tag>
             </template>
+            <template slot="customRenderInitialStock" slot-scope="text, record">
+              <a-tooltip :title="record.bigUnitInitialStock">
+                {{text}}
+              </a-tooltip>
+            </template>
             <template slot="customRenderStock" slot-scope="text, record">
               <a-tooltip :title="record.bigUnitStock">
                 {{text}}
@@ -301,6 +306,9 @@
           {title: '基础重量', dataIndex: 'weight', width: 80},
           {title: '保质期', dataIndex: 'expiryNum', width: 60},
           {title: '制造商', dataIndex: 'mfrs', width: 120, ellipsis:true},
+          {title: '初始库存', dataIndex: 'initialStock', width: 80,
+            scopedSlots: { customRender: 'customRenderInitialStock' }
+          },
           {title: '库存', dataIndex: 'stock', width: 80,
             scopedSlots: { customRender: 'customRenderStock' }
           },