From 0ea22848bfae84f5888b1137f73a2181136d18ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 18 Nov 2022 23:30:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=BA=93=E5=AD=98=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E7=9A=84=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=A4=A7=E7=9A=84?=
 =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D=E7=9A=84=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=8F=90=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   | 9 ++++++++-
 jshERP-web/src/views/report/InOutStockReport.vue | 9 ++++++++-
 jshERP-web/src/views/report/MaterialStock.vue    | 9 ++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index 6b47ac9e..9a94b3b6 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -146,6 +146,11 @@
                 <a-icon v-if="record.imgName" style="font-size: 18px" theme="twoTone" type="file-image" />
               </a-popover>
             </template>
+            <template slot="customRenderStock" slot-scope="text, record">
+              <a-tooltip :title="record.bigUnitStock">
+                {{text}}
+              </a-tooltip>
+            </template>
             <template slot="customRenderEnabled" slot-scope="enabled">
               <a-tag v-if="enabled" color="green">启用</a-tag>
               <a-tag v-if="!enabled" color="orange">禁用</a-tag>
@@ -254,7 +259,9 @@
           },
           {title: '基础重量', dataIndex: 'weight', width: 80},
           {title: '保质期', dataIndex: 'expiryNum', width: 60},
-          {title: '库存', dataIndex: 'stock', width: 80},
+          {title: '库存', dataIndex: 'stock', width: 80,
+            scopedSlots: { customRender: 'customRenderStock' }
+          },
           {title: '采购价', dataIndex: 'purchaseDecimal', width: 80},
           {title: '零售价', dataIndex: 'commodityDecimal', width: 80},
           {title: '销售价', dataIndex: 'wholesaleDecimal', width: 80},
diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue
index 2a0c7fb4..054c3cfa 100644
--- a/jshERP-web/src/views/report/InOutStockReport.vue
+++ b/jshERP-web/src/views/report/InOutStockReport.vue
@@ -60,6 +60,11 @@
             :scroll="scroll"
             :loading="loading"
             @change="handleTableChange">
+            <template slot="customRenderStock" slot-scope="text, record">
+              <a-tooltip :title="record.bigUnitStock">
+                {{text}}
+              </a-tooltip>
+            </template>
           </a-table>
           <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
             <a-col :md="24" :sm="24">
@@ -140,7 +145,9 @@
           {title: '上月结存数量', dataIndex: 'prevSum', sorter: (a, b) => a.prevSum - b.prevSum, width: 80},
           {title: '入库数量', dataIndex: 'inSum', sorter: (a, b) => a.inSum - b.inSum, width: 60},
           {title: '出库数量', dataIndex: 'outSum', sorter: (a, b) => a.outSum - b.outSum, width: 60},
-          {title: '本月结存数量', dataIndex: 'thisSum', sorter: (a, b) => a.thisSum - b.thisSum, width: 80},
+          {title: '本月结存数量', dataIndex: 'thisSum', sorter: (a, b) => a.thisSum - b.thisSum, width: 80,
+            scopedSlots: { customRender: 'customRenderStock' }
+          },
           {title: '结存金额', dataIndex: 'thisAllPrice', sorter: (a, b) => a.thisAllPrice - b.thisAllPrice, width: 60}
         ],
         url: {
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 91486475..2374793e 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -72,6 +72,11 @@
               <span slot="action" slot-scope="text, record">
                 <a @click="showMaterialInOutList(record)">{{record.id?'流水':''}}</a>
               </span>
+              <template slot="customRenderStock" slot-scope="text, record">
+                <a-tooltip :title="record.bigUnitStock">
+                  {{text}}
+                </a-tooltip>
+              </template>
           </a-table>
           <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
             <a-col :md="24" :sm="24">
@@ -158,7 +163,9 @@
           {title: '单位', dataIndex: 'unitName', width: 60, ellipsis:true},
           {title: '单价', dataIndex: 'purchaseDecimal', sorter: (a, b) => a.purchaseDecimal - b.purchaseDecimal, width: 60},
           {title: '初始库存', dataIndex: 'initialStock', sorter: (a, b) => a.initialStock - b.initialStock, width: 60},
-          {title: '库存', dataIndex: 'currentStock', sorter: (a, b) => a.currentStock - b.currentStock, width: 60},
+          {title: '库存', dataIndex: 'currentStock', sorter: (a, b) => a.currentStock - b.currentStock, width: 60,
+            scopedSlots: { customRender: 'customRenderStock' }
+          },
           {title: '库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice, width: 80}
         ],
         url: {