|
@@ -33,7 +33,7 @@
|
|
|
<el-select v-if="tabs_index != 1" @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="payInfo" placeholder="付款项目" clearable>
|
|
|
<el-option v-for="item in paymentProjectList" :key="item" :label="item" :value="item"> </el-option>
|
|
|
</el-select>
|
|
|
- <el-select v-if="tabs_index == 1" @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="vipType" placeholder="会员类型" clearable>
|
|
|
+ <el-select v-if="tabs_index == 1" @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="vipType" placeholder="会员类型" clearable>
|
|
|
<el-option v-for="item in vipTypeList" :key="item.key" :label="item.lable" :value="item.key"> </el-option>
|
|
|
</el-select>
|
|
|
<el-select @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="paymentType" placeholder="支付渠道" clearable>
|
|
@@ -144,11 +144,10 @@ export default {
|
|
|
dialogVisible: false, // 退款的弹框
|
|
|
refundTextarea: "", // 退款原因
|
|
|
orderRefundCode: "",
|
|
|
- vipType:'',
|
|
|
- vipTypeList:[
|
|
|
- { lable: "小程序", key: 1 },
|
|
|
- { lable: "PC", key: 2 },
|
|
|
- { lable: "H5", key: 3 },
|
|
|
+ vipType: "",
|
|
|
+ vipTypeList: [
|
|
|
+ { lable: "日卡", key: "日卡" },
|
|
|
+ { lable: "月卡", key: "月卡" },
|
|
|
],
|
|
|
};
|
|
|
},
|
|
@@ -201,8 +200,8 @@ export default {
|
|
|
PageSize: this.page_size,
|
|
|
CurrentIndex: this.page_no,
|
|
|
AdminId: salesArr.join(","),
|
|
|
- StartDate: this.timeRange.length ? this.timeRange[0] : "",
|
|
|
- EndDate: this.timeRange.length ? this.timeRange[1] : "",
|
|
|
+ StartDate: this.timeRange && this.timeRange.length ? this.timeRange[0] : "",
|
|
|
+ EndDate: this.timeRange && this.timeRange.length ? this.timeRange[1] : "",
|
|
|
OrderType: this.tabs_index,
|
|
|
PaymentProject: this.payInfo,
|
|
|
OrderCode: this.orderNumber,
|
|
@@ -210,15 +209,16 @@ export default {
|
|
|
OrderStatus: this.payStatus,
|
|
|
ShareId: salesArrRai.join(","),
|
|
|
PaymentType: this.paymentType,
|
|
|
+ PaymentProject: this.vipType,
|
|
|
});
|
|
|
if (res.Ret === 200) {
|
|
|
this.tableOrderData = res.Data.List;
|
|
|
this.total = res.Data.Paging.Totals || 0;
|
|
|
}
|
|
|
- console.log(res);
|
|
|
},
|
|
|
tabActive(item) {
|
|
|
if (this.tabs_index == item.key) return;
|
|
|
+ this.vipType = "";
|
|
|
this.tableColums = tableColums(item.key);
|
|
|
this.tabs_index = item.key;
|
|
|
this.handleSelectChange();
|