|
|
@@ -19,7 +19,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="proceeds-box">
|
|
|
- <h6>收款<span>（{{proceedsNumber}}单）</span></h6>
|
|
|
+ <h6>收款<span>（{{total_count}}单）</span></h6>
|
|
|
<label v-if="proceedsPriceArr.length==2">￥{{proceedsPriceArr[0]}}.<b>{{proceedsPriceArr[1]}}</b><span>元</span></label>
|
|
|
</div>
|
|
|
<div class="search-box">
|
|
|
@@ -142,33 +142,33 @@
|
|
|
prop="sn"
|
|
|
label="交易单号"
|
|
|
sortable="custom"
|
|
|
- width="200"
|
|
|
+ width="128"
|
|
|
class-name="user-info">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="order_time"
|
|
|
label="交易时间"
|
|
|
- width="112">
|
|
|
+ width="165">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="name"
|
|
|
label="购买商品"
|
|
|
- width="56">
|
|
|
+ min-width="220">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="goods_type"
|
|
|
label="商品类型"
|
|
|
- width="120" >
|
|
|
+ width="128" >
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="goods_study_phase_name"
|
|
|
label="学段"
|
|
|
- min-width="200">
|
|
|
+ width="64">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="goods_price"
|
|
|
label="价格"
|
|
|
- width="144">
|
|
|
+ width="140">
|
|
|
<template slot-scope="scope">
|
|
|
<span class="currectPrice">￥{{scope.row.goods_price_discount | cutMoneyFiter}}</span>
|
|
|
<span class="oldPrice" v-if="scope.row.goods_price!==scope.row.goods_price_discount">(￥{{scope.row.goods_price | cutMoneyFiter}})</span>
|
|
|
@@ -177,30 +177,50 @@
|
|
|
<el-table-column
|
|
|
prop="discount_code"
|
|
|
label="兑换码"
|
|
|
- width="96" >
|
|
|
+ width="144" >
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="order_amount"
|
|
|
label="支付金额"
|
|
|
sortable="custom"
|
|
|
- width="160">
|
|
|
+ width="104">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="pay_type_name"
|
|
|
label="支付渠道"
|
|
|
- width="96" >
|
|
|
+ width="104" >
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="order_amount"
|
|
|
label="支付流水"
|
|
|
sortable="custom"
|
|
|
- width="160">
|
|
|
+ width="144">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="person_name"
|
|
|
+ label="购买者"
|
|
|
+ sortable="custom"
|
|
|
+ width="109">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="person_city_name"
|
|
|
+ label="客户所在省市"
|
|
|
+ width="224">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.person_province_name+'/'+scope.row.person_city_name}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="person_org_name"
|
|
|
+ label="客户所在机构"
|
|
|
+ sortable="custom"
|
|
|
+ width="224">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="order_status"
|
|
|
label="交易状态"
|
|
|
sortable="custom"
|
|
|
- width="160">
|
|
|
+ width="112">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
fixed="right"
|
|
|
@@ -211,15 +231,15 @@
|
|
|
@click.native.prevent="handleEdit(scope.row)"
|
|
|
type="text"
|
|
|
size="small"
|
|
|
- class="primary-btn">
|
|
|
+ class="red-btn">
|
|
|
退款
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
@click.native.prevent="handleUp(scope.row, scope.$index)"
|
|
|
type="text"
|
|
|
size="small"
|
|
|
- class="primary-btn"
|
|
|
- v-if="scope.row.status===0">
|
|
|
+ class="red-btn"
|
|
|
+ v-if="scope.row.is_use_discount_code==='true'">
|
|
|
撤回
|
|
|
</el-button>
|
|
|
</template>
|
|
|
@@ -456,19 +476,27 @@ export default {
|
|
|
order_column_list = ['create_time:desc']
|
|
|
}
|
|
|
let data = {
|
|
|
- search_content:this.searchInput.trim(),
|
|
|
- account_type:this.searchType,
|
|
|
- status:this.searchStatus,
|
|
|
+ content:this.searchInput.trim(),
|
|
|
page_capacity:this.pageSize,
|
|
|
cur_page:this.pageNumber,
|
|
|
- order_column_list: order_column_list
|
|
|
+ order_column_list: order_column_list,
|
|
|
+ pay_status: this.searchStatus,
|
|
|
+ pay_date_begin: this.validity?this.validity[0]:'',
|
|
|
+ pay_date_end: this.validity?this.validity[1]:'',
|
|
|
+ goods_study_phase: this.searchStudy,
|
|
|
+ goods_type: this.searchGoodsType,
|
|
|
+ discount_code_use_status: this.searchIsCDKEY,
|
|
|
+ person_org_id: this.searchOrgid,
|
|
|
+ person_province_city_id: this.searchArea.length>0?this.searchArea[1]:'',
|
|
|
+ pay_type: this.searchChannel
|
|
|
}
|
|
|
getLogin(MethodName, data)
|
|
|
.then((res) => {
|
|
|
this.tableLoading = false
|
|
|
if(res.status===1){
|
|
|
- this.tableData = res.order_list
|
|
|
- this.total_count = res.total_count
|
|
|
+ this.tableData = res.order_list
|
|
|
+ this.total_count = res.total_count
|
|
|
+ this.proceedsPriceArr = cutMoneyFiter(res.sum_info.order_amount).split('.')
|
|
|
}
|
|
|
})
|
|
|
.catch(() => {
|
|
|
@@ -511,7 +539,7 @@ export default {
|
|
|
},
|
|
|
//计算table高度(动态设置table高度)
|
|
|
getTableHeight() {
|
|
|
- let tableH = 370; //距离页面下方的高度
|
|
|
+ let tableH = 570; //距离页面下方的高度
|
|
|
let tableHeightDetil = window.innerHeight - tableH;
|
|
|
if (tableHeightDetil <= 300) {
|
|
|
this.tableHeight = 300;
|
|
|
@@ -549,7 +577,6 @@ export default {
|
|
|
this.getTableHeight();
|
|
|
this.getOrgList()
|
|
|
this.getList()
|
|
|
- this.proceedsPriceArr = cutMoneyFiter(this.proceedsPrice).split('.')
|
|
|
},
|
|
|
//生命周期 - 挂载完成（可以访问DOM元素）
|
|
|
mounted() {
|
natasha