From 6159a5216fc8e9e789b4640c29e0a416008e7e4f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期日, 22 十二月 2024 21:46:27 +0800
Subject: [PATCH] 1.行政区划对接-高德 2.行政区划对接-腾讯

---
 pages/statistics-analysis/flower-material/index.vue |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/pages/statistics-analysis/flower-material/index.vue b/pages/statistics-analysis/flower-material/index.vue
index 0c9f19f..7566304 100644
--- a/pages/statistics-analysis/flower-material/index.vue
+++ b/pages/statistics-analysis/flower-material/index.vue
@@ -52,6 +52,7 @@
         hasDelete: false,
         viewText: '明细',
         hasExport: true,
+        hasOperation: false,
         exportUrl: 'flower/v2/statistic-analysis/flower-material/export',
         exportText: '导出',
         onResetView: (row) => {
@@ -89,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 },
@@ -118,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'},
               {
@@ -143,7 +148,7 @@
                 },
               },
               {
-                label: '等级:',
+                label: '等级',
                 id: 'flowerLevel',
                 type: 'bus-select-dict',
                 el: {
@@ -155,6 +160,32 @@
                 },
 
               },
+              {
+                label: '排序字段',
+                id: 'orderField',
+                type: 'bus-select-dict',
+                el: {
+                  code: 'FLOWER_MATERIAL_FIELD',
+                  // multiple: true,
+                  clearable: true,
+                  filterable: true,
+                  style: 'width:100%',
+                },
+
+              },
+              {
+                label: '排序方式',
+                id: 'orderType',
+                type: 'bus-select-dict',
+                el: {
+                  code: 'ORDER_BY',
+                  // multiple: true,
+                  clearable: true,
+                  filterable: true,
+                  style: 'width:100%',
+                },
+
+              },
               
             ],
           },

--
Gitblit v1.9.3