From 33216e297db718f1d5cfab35aeea114b48f87f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 11 Aug 2021 00:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/material/MaterialList.vue | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index 66474520..3c2d4637 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -93,6 +93,10 @@
                 <a>删除</a>
               </a-popconfirm>
             </span>
+            <span slot="customRenderUnit" slot-scope="text, record">
+              {{text?text:record.unitName}}
+              <a-tag v-if="record.sku">SKU</a-tag>
+            </span>
             <template slot="customRenderEnabled" slot-scope="enabled">
               <a-tag v-if="enabled" color="green">启用</a-tag>
               <a-tag v-if="!enabled" color="orange">禁用</a-tag>
@@ -165,15 +169,8 @@
           {title: '颜色', dataIndex: 'color', width: 50},
           {title: '类别', dataIndex: 'categoryName', width: 80},
           {title: '扩展信息', dataIndex: 'materialOther', width: 100},
-          {
-            title: '单位', dataIndex: 'unit', width: 100, customRender: function (text, record, index) {
-              if(text) {
-                let showSku = record.sku?'[sku]':''
-                return text + showSku;
-              } else {
-                return record.unitName;
-              }
-            }
+          {title: '单位', dataIndex: 'unit', width: 100,
+            scopedSlots: { customRender: 'customRenderUnit' }
           },
           {title: '安全存量', dataIndex: 'safetyStock', width: 80},
           {title: '库存', dataIndex: 'stock', width: 70},