From 0935d7bbcd36fcad1144f3a4cdc6a3448068f18a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 14 Dec 2021 23:17:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E7=9A=84=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecgbiz/modal/JSelectMaterialModal.vue          |  4 ++--
 jshERP-web/src/views/material/MaterialList.vue       | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
index 8f94c8c0..c27ca301 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
@@ -102,7 +102,7 @@
         categoryTree:[],
         columns: [
           {dataIndex: 'mBarCode', title: '条码', width: 100, align: 'left'},
-          {dataIndex: 'name', title: '名称', width: 120},
+          {dataIndex: 'name', title: '名称', width: 120, ellipsis:true},
           {dataIndex: 'categoryName', title: '类别', width: 80},
           {dataIndex: 'standard', title: '规格', width: 80},
           {dataIndex: 'model', title: '型号', width: 80},
@@ -110,7 +110,7 @@
           {dataIndex: 'unit', title: '单位', width: 70, ellipsis:true},
           {dataIndex: 'sku', title: '多属性', width: 80},
           {dataIndex: 'stock', title: '库存', width: 60},
-          {dataIndex: 'expand', title: '扩展信息', width: 80},
+          {dataIndex: 'expand', title: '扩展信息', width: 80, ellipsis:true},
           {dataIndex: 'enableSerialNumber', title: '序列号', width: 60, align: "center",
             scopedSlots: { customRender: 'customRenderEnableSerialNumber' }
           },
diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index ff0843de..f482b3cf 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -155,12 +155,12 @@
         // 表头
         columns: [
           {title: '条码', dataIndex: 'mBarCode', width: '8%'},
-          {title: '名称', dataIndex: 'name', width: '10%'},
-          {title: '规格', dataIndex: 'standard', width: '6%'},
-          {title: '型号', dataIndex: 'model', width: '6%'},
-          {title: '颜色', dataIndex: 'color', width: '4%'},
-          {title: '类别', dataIndex: 'categoryName', width: '6%'},
-          {title: '扩展信息', dataIndex: 'materialOther', width: '6%'},
+          {title: '名称', dataIndex: 'name', width: '10%', ellipsis:true},
+          {title: '规格', dataIndex: 'standard', width: '6%', ellipsis:true},
+          {title: '型号', dataIndex: 'model', width: '6%', ellipsis:true},
+          {title: '颜色', dataIndex: 'color', width: '4%', ellipsis:true},
+          {title: '类别', dataIndex: 'categoryName', width: '6%', ellipsis:true},
+          {title: '扩展信息', dataIndex: 'materialOther', width: '6%', ellipsis:true},
           {title: '单位', dataIndex: 'unit', width: '6%', ellipsis:true,
             customRender:function (t,r,index) {
               if (r) {