From 6cd400618f18f69bf354099274c5a7fe2646d173 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期日, 22 十二月 2024 21:44:14 +0800
Subject: [PATCH] 1.花材统计报表

---
 pages/statistics-analysis/flower-material/index.vue |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/statistics-analysis/flower-material/index.vue b/pages/statistics-analysis/flower-material/index.vue
index 7f7e304..7566304 100644
--- a/pages/statistics-analysis/flower-material/index.vue
+++ b/pages/statistics-analysis/flower-material/index.vue
@@ -90,7 +90,9 @@
           { label: '注册手机号', prop: 'loginName', minWidth: '120px' },
           { label: '联系方式', prop: 'contactTel', minWidth: '120px' },
           { label: '所属集货站', prop: 'stationName', minWidth: '120px' },
-          { label: '品类', prop: 'categoryName', minWidth: '120px' },
+          // { label: '品类', prop: 'categoryName', minWidth: '120px' },
+          { label: '品类', prop: 'parentCategoryName', minWidth: '120px' },
+          
           { label: '商品名称', prop: 'flowerName', minWidth: 150, },
           { label: '等级', prop: 'flowerLevelStr', minWidth: 80 },
           { label: '商品规格', prop: 'flowerUnit',  minWidth: 80 },
@@ -119,7 +121,9 @@
                 span: 24,
                 searchImmediately: true,
               },
-              { ...getSupplierListWithIdConfig(), label: '供应商' },
+              // { ...getSupplierListWithIdConfig(), label: '供应商' },
+              { label: '供应商名称', id: 'supplierName', type: 'input' },
+              { label: '供应商ID', id: 'supplierId', type: 'input' },
               { label: '注册手机号', id: 'loginName', type: 'input' },
               { label: '联系方式', id: 'contactTel',type: 'input'},
               {

--
Gitblit v1.9.3