业绩统计

src/views/statistics/orderStatistics.vue

@@ -22,19 +22,19 @@
 					</el-form-item>
 					<el-form-item label="订单状态">
 						<el-select v-model="listQuery.orderState" clearable placeholder="请选择">
-							<!-- <el-option label="全部" :value="null"></el-option> -->
+					  	<!-- <el-option :value='null'>全部</el-option> -->
 							<el-option v-for="item in orderArr" :key="item.id" :label="item.name" :value="item.id"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item label="订单来源">
 						<el-select v-model="listQuery.orderOrigin" clearable placeholder="请选择">
-							<!-- <el-option label="全部" :value="null"></el-option> -->
+							<el-option label="全部" :value="null"></el-option>
 							<el-option v-for="item in orderOriginArr" :key="item.id" :label="item.name" :value="item.id"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item label="支付方式">
 						<el-select v-model="listQuery.payWay" clearable placeholder="请选择">
-							<!-- <el-option label="全部" :value="null"></el-option> -->
+							<el-option label="全部" :value="null"></el-option>
 							<el-option v-for="item in payWayArr" :key="item.id" :label="item.name" :value="item.id"></el-option>
 						</el-select>
 					</el-form-item>
@@ -70,13 +70,13 @@ import { objDeepCopy } from '../../utils'
 export default {
 	data: function() {
 		this.extend = {
-			'xAxis.0.axisLabel.rotate': 45
+			// 'xAxis.0.axisLabel.rotate': 45
     }
     this.dataZoom = [
         {
           type: 'slider',
           start: 0,
-          end: 20
+          end: 30
         }
       ]
 		this.chartSettings = {
@@ -113,13 +113,17 @@ export default {
 				page: 1, //当前页
 				limit: 10, //每页条数
 				statisticalWay: 1, //统计方式
-				orderState: 1, //订单状态
-				orderOrigin: 1, //来源
-				payWay: 1, //支付方式
+				orderState: '', //订单状态
+				orderOrigin: null, //来源
+				payWay: null, //支付方式
 				statisticalSigns: ['aa_ota'] //筛选
 			},
 			//订单状态
 			orderArr: [
+        {
+          name:"全部",
+          id:'',
+        },
 				{
 					name: '未完成',
 					id: 0
@@ -289,9 +293,9 @@ export default {
 				page: 1, //当前页
 				limit: 10, //每页条数
 				statisticalWay: 1, //统计方式
-				orderState: 1, //订单状态
-				orderOrigin: 1, //来源
-				payWay: 1, //支付方式
+				orderState:null, //订单状态
+				orderOrigin: null, //来源
+				payWay: null, //支付方式
 				statisticalSigns: ['aa_ota'] //筛选
 			}
 			this.time = null
@@ -307,15 +311,14 @@ export default {
           let way = this.listQuery.statisticalWay
           var x
           var y
-          let dateIndex = way == 3 ?1:way == 2?1:2
-          let orderIndex = way == 1 ? 3 : 0
+          let dateIndex = way == 1 ?2:way == 2?1:1
+          let orderIndex = way == 1 ?3:way==2? 2 : 2
 					for (let i = 0; i < choose.length; i++) {
-
 						if (info[choose[i]] != '') {
 							params[choose[i]] = {
 								columns: [
-									Object.keys(info[choose[i]][0])[dateIndex],
-									Object.keys(info[choose[i]][0])[orderIndex]
+									Object.keys(info[choose[i]][0])[dateIndex], //年费
+									Object.keys(info[choose[i]][0])[orderIndex]  //金额
                 ],
                 rows: info[choose[i]].sort(function(a,b){
                     if(way===1){