From b00aa14c4016dd13a31ed8c2af0bf4c58a9ec403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 15 Dec 2022 22:58:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=89=B9=E5=8F=B7=E5=92=8C?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecgbiz/modal/JSelectMaterialModal.vue   | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
index b647b5a3..f8fd71d0 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
@@ -92,13 +92,10 @@
                 <a-icon v-if="record.imgName" style="font-size: 18px" theme="twoTone" type="file-image" />
               </a-popover>
             </template>
-            <template slot="customRenderEnableSerialNumber" slot-scope="enableSerialNumber">
-              <a-tag v-if="enableSerialNumber==1" color="green">有</a-tag>
-              <a-tag v-if="enableSerialNumber==0" color="orange">无</a-tag>
-            </template>
-            <template slot="customRenderEnableBatchNumber" slot-scope="enableBatchNumber">
-              <a-tag v-if="enableBatchNumber==1" color="green">有</a-tag>
-              <a-tag v-if="enableBatchNumber==0" color="orange">无</a-tag>
+            <template slot="customName" slot-scope="text, record">
+              {{record.name}}
+              <a-tag v-if="record.enableSerialNumber==1" color="orange">序</a-tag>
+              <a-tag v-if="record.enableBatchNumber==1" color="orange">批</a-tag>
             </template>
           </a-table>
         </div>
@@ -144,7 +141,7 @@
         categoryTree:[],
         columns: [
           {dataIndex: 'mBarCode', title: '条码', scopedSlots: { customRender: 'customBarCode' }},
-          {dataIndex: 'name', title: '名称'},
+          {dataIndex: 'name', title: '名称', scopedSlots: { customRender: 'customName' }},
           {dataIndex: 'categoryName', title: '类别'},
           {dataIndex: 'standard', title: '规格'},
           {dataIndex: 'model', title: '型号'},
@@ -152,13 +149,7 @@
           {dataIndex: 'unit', title: '单位'},
           {dataIndex: 'sku', title: '多属性'},
           {dataIndex: 'stock', title: '库存'},
-          {dataIndex: 'expand', title: '扩展信息'},
-          {dataIndex: 'enableSerialNumber', title: '序列号', align: "center",
-            scopedSlots: { customRender: 'customRenderEnableSerialNumber' }
-          },
-          {dataIndex: 'enableBatchNumber', title: '批号', align: "center",
-            scopedSlots: { customRender: 'customRenderEnableBatchNumber' }
-          }
+          {dataIndex: 'expand', title: '扩展信息'}
         ],
         scrollTrigger: {},
         dataSource: [],