Browse Source

筛选条件动态时间范围设置

zhuth 6 years ago
parent
commit
1d64eea6fd

+ 1 - 5
src/components/common/filterBox/filter.jsx

@@ -166,13 +166,9 @@ class Filter extends React.Component {
     generateTimeTags = (filter, index, defaultValue) => {
         const timeTypes = [
             { dynamic: true, label: '今天', name: 'today' },
-            { dynamic: true, label: '昨天', name: 'yesterday' },
-            { dynamic: true, label: '本周', name: 'week' },
-            { dynamic: true, label: '上周', name: 'lastweek' },
             { dynamic: true, label: '本月', name: 'month' },
             { dynamic: true, label: '上月', name: 'lastmonth' },
-            { dynamic: true, label: '本季度', name: 'quarter' },
-            { dynamic: true, label: '上季度', name: 'lastquarter' },
+            { dynamic: true, label: '近半年', name: 'halfyear' },
             { dynamic: true, label: '本年', name: 'year' },
             { dynamic: true, label: '上年', name: 'lastyear' },
         ]

+ 1 - 5
src/components/common/filterBox/filter2.jsx

@@ -35,13 +35,9 @@ class Filter extends React.Component {
     generateTimeTags = (filter, index, defaultValue) => {
         const timeTypes = [
             { dynamic: true, label: '今天', name: 'today' },
-            { dynamic: true, label: '昨天', name: 'yesterday' },
-            { dynamic: true, label: '本周', name: 'week' },
-            { dynamic: true, label: '上周', name: 'lastweek' },
             { dynamic: true, label: '本月', name: 'month' },
             { dynamic: true, label: '上月', name: 'lastmonth' },
-            { dynamic: true, label: '本季度', name: 'quarter' },
-            { dynamic: true, label: '上季度', name: 'lastquarter' },
+            { dynamic: true, label: '近半年', name: 'halfyear' },
             { dynamic: true, label: '本年', name: 'year' },
             { dynamic: true, label: '上年', name: 'lastyear' },
         ]

+ 2 - 6
src/components/common/filterBox/filterBox.jsx

@@ -212,14 +212,10 @@ class FilterBox extends React.Component {
 
     generateTimeTags = (filter, index, defaultValue) => {
         const timeTypes = [
-            { dynamic: true, label: '今天', name: 'today', format: () => {console.log(11);return 'today'} },
-            { dynamic: true, label: '昨天', name: 'yesterday' },
-            { dynamic: true, label: '本周', name: 'week' },
-            { dynamic: true, label: '上周', name: 'lastweek' },
+            { dynamic: true, label: '今天', name: 'today' },
             { dynamic: true, label: '本月', name: 'month' },
             { dynamic: true, label: '上月', name: 'lastmonth' },
-            { dynamic: true, label: '本季度', name: 'quarter' },
-            { dynamic: true, label: '上季度', name: 'lastquarter' },
+            { dynamic: true, label: '近半年', name: 'halfyear' },
             { dynamic: true, label: '本年', name: 'year' },
             { dynamic: true, label: '上年', name: 'lastyear' },
         ]

+ 2 - 6
src/components/common/filterBox/filterBox2.jsx

@@ -362,14 +362,10 @@ class FilterBox extends React.Component {
 
     generateTimeTags = (filter, index, defaultValue) => {
         const timeTypes = [
-            { dynamic: true, label: '今天', name: 'today', format: () => {console.log(11);return 'today'} },
-            { dynamic: true, label: '昨天', name: 'yesterday' },
-            { dynamic: true, label: '本周', name: 'week' },
-            { dynamic: true, label: '上周', name: 'lastweek' },
+            { dynamic: true, label: '今天', name: 'today' },
             { dynamic: true, label: '本月', name: 'month' },
             { dynamic: true, label: '上月', name: 'lastmonth' },
-            { dynamic: true, label: '本季度', name: 'quarter' },
-            { dynamic: true, label: '上季度', name: 'lastquarter' },
+            { dynamic: true, label: '近半年', name: 'halfyear' },
             { dynamic: true, label: '本年', name: 'year' },
             { dynamic: true, label: '上年', name: 'lastyear' },
         ]