总公司业绩全部筛选

src/views/financial/memberPerformance.vue

@@ -2,42 +2,53 @@
 	<div class="app-container calendar-list-container" v-loading="loading">
 		<el-row>
 			<el-form :inline="true">
-				<el-form-item label="统计类型">
-					<el-radio-group v-model="listquery.type" @change="changeType">
-						<el-radio-button label="0">收入</el-radio-button>
-						<el-radio-button label="1">支出</el-radio-button>
-					</el-radio-group>
+				<el-col :span="3">
+					<el-form-item label="统计类型">
+						<el-radio-group v-model="listquery.type" @change="changeType">
+							<el-radio-button label="0">收入</el-radio-button>
+							<el-radio-button label="1">支出</el-radio-button>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+
+				<el-form-item label="下单时间">
+					<el-date-picker v-model="time" type="daterange" placeholder="请选择下单时间" @change="changeTime"></el-date-picker>
 				</el-form-item>
 
-				<el-date-picker v-model="time" type="daterange" placeholder="请选择下单时间" @change="changeTime"></el-date-picker>
+				<el-form-item label="订单类型">
+					<el-select v-model="listquery.orderType" clearable placeholder="请选择订单类型" @change="changeStaff">
+						<el-option label="全部" value>全部</el-option>
+						<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
 
-				<el-select v-model="listquery.orderType" clearable placeholder="请选择订单类型" @change="changeStaff">
-					<el-option value='全部'></el-option>
-					<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-				</el-select>
+				<el-form-item label="所属公司">
+					<el-select
+						v-show="listquery.type == 0"
+						v-model="listquery.companyId"
+						filterable
+						placeholder="请选择业绩所属公司"
+						clearable
+						@change="changeCompany"
+					>
+						<el-option label="全部" value>全部</el-option>
+						<el-option v-for="item in allCompaniesArr" :key="item.id" :label="item.name" :value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
 
-				<el-select
-					v-show="listquery.type == 0"
-					v-model="listquery.companyId"
-					filterable
-					placeholder="请选择业绩所属公司"
-					clearable
-					@change="changeCompany"
-				>
-					<el-option value='全部'></el-option>
-					<el-option v-for="item in allCompaniesArr" :key="item.id" :label="item.name" :value="item.id"></el-option>
-				</el-select>
+				<el-form-item label="支付方式">
+					<el-select
+						v-model="listquery.paymentMethod"
+						clearable
+						placeholder="请选择支付方式"
+						@change="changeWay"
+						v-show="listquery.type == 0"
+					>
+						<el-option label="全部" value>全部</el-option>
+						<el-option v-for="item in payArr" :key="item.id" :label="item.name" :value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
 
-				<el-select
-					v-model="listquery.paymentMethod"
-					clearable
-					placeholder="请选择支付方式"
-					@change="changeWay"
-					v-show="listquery.type == 0"
-				>
-					<el-option value='全部'></el-option>
-					<el-option v-for="item in payArr" :key="item.id" :label="item.name" :value="item.id"></el-option>
-				</el-select>
 				<el-button type="primary" @click="clearSearch">清空搜索</el-button>
 				<el-button type="primary" :loading="excelLoading" @click="downloadExcel">导出报表</el-button>
 			</el-form>
@@ -78,8 +89,8 @@
 				</li>
 			</ul>-->
 		</div>
-
-		<el-table :data="tableData" border style="width: 100%" header-align="center" height="450">
+		<!-- :height="tabHeight" -->
+		<el-table :data="tableData" border style="width: 100%" header-align="center">
 			<el-table-column prop="crtTime" label="下单日期" align="center" v-if="listquery.type == 0"></el-table-column>
 			<el-table-column prop="time" label="退款日期" align="center" v-else></el-table-column>
 			<el-table-column prop="no" label="订单ID" align="center"></el-table-column>
@@ -123,6 +134,7 @@ export default {
 	},
 	data() {
 		return {
+			tabHeight: '800',
 			loading: false,
 			total: null,
 			information: {},
@@ -179,7 +191,7 @@ export default {
 				page: 1,
 				limit: 10,
 				companyId: null, //业绩所属公司
-				paymentMethod: null, //支付方式
+				paymentMethod: null //支付方式
 				// type: this.listquery.type
 			}
 		},
@@ -195,12 +207,13 @@ export default {
 			this.getList()
 		},
 		//统计类型筛选
-		changeType() {
+		changeType(val) {
 			this.listquery.page = 1
 			this.getList()
+			val == 0 ? (this.tabHeight = 500) : (this.tableData = 800)
 		},
 		//支付方式筛选
-		changeWay() {
+		changeWay(val) {
 			this.listquery.page = 1
 			this.getList()
 		},
@@ -226,9 +239,6 @@ export default {
 		//列表数据
 		getList() {
 			this.loading = true
-			// if (this.listquery.orderType == '全部') this.listquery.orderType = null
-			// if (this.listquery.companyId == '全部') this.listquery.companyId = null
-			// if (this.listquery.type == '全部') this.listquery.type = null
 			companyList(this.listquery).then(data => {
 				if (data.status == 200) {
 					if (this.listquery.type == 0) {