jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新代码

Browse Source
This commit is contained in:
guaishoudemao
2021-02-06 16:42:26 +08:00
parent f376e4302b
commit a0f56c53fe
80 changed files with 3056 additions and 2156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
admin/src/views/financial/brokerage/index.vue
View File

@@ -43,21 +43,26 @@
min-width="130"
/>
<el-table-column
sortable
prop="totalBrokerage"
label="总佣金金额"
min-width="120"
/>
<el-table-column
sortable
label="账户余额"
min-width="100"
prop="nowMoney"
/>
<el-table-column
sortable
:default-sort = "{prop: 'brokerage', order: 'descending'}"
prop="brokerage"
label="账户佣金"
min-width="200"
/>
<el-table-column
sortable
prop="totalExtract"
label="到账佣金"
min-width="150"
@@ -116,17 +121,12 @@
highlight-current-row
>
<el-table-column
prop="nickName"
label="昵称"
width="80"
/>
<el-table-column
prop="number"
prop="price"
label="佣金金额"
min-width="100"
/>
<el-table-column
prop="createTime"
prop="updateTime"
label="获得时间"
min-width="120"
/>

5
admin/src/views/financial/commission/withdrawal/index.vue
View File

@@ -139,7 +139,8 @@
/>
<el-table-column label="操作" min-width="80" fixed="right" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
<el-button v-if="scope.row.status !== 1" type="text" size="small" @click="handleEdit(scope.row)">编辑</el-button>
<span v-else>无</span>
</template>
</el-table-column>
</el-table>
@@ -345,6 +346,6 @@
<style scoped>
.selWidth{
width: 300px;
width: 350px;
}
</style>

42
admin/src/views/financial/record/charge/index.vue
View File

@@ -10,13 +10,13 @@
</el-radio-group>
<el-date-picker v-model="timeVal" value-format="yyyy-MM-dd" format="yyyy-MM-dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" @change="onchangeTime" />
</el-form-item>
<el-form-item label="是否支付：">
<el-radio-group v-model="tableFrom.paid" type="button" size="small" @change="getList(1)">
<el-radio-button label="">全部</el-radio-button>
<el-radio-button label="1">已支付</el-radio-button>
<el-radio-button label="0">未支付</el-radio-button>
</el-radio-group>
</el-form-item>
<!--<el-form-item label="是否支付：">-->
<!--<el-radio-group v-model="tableFrom.paid" type="button" size="small" @change="getList(1)">-->
<!--<el-radio-button label="">全部</el-radio-button>-->
<!--<el-radio-button label="1">已支付</el-radio-button>-->
<!--<el-radio-button label="0">未支付</el-radio-button>-->
<!--</el-radio-group>-->
<!--</el-form-item>-->
<el-form-item label="关键字：" class="width100">
<el-input v-model="tableFrom.keywords" placeholder="微信昵称/姓名/订单号" class="selWidth" size="small" clearable>
<el-button slot="append" icon="el-icon-search" size="small" @click="getList(1)" />
@@ -76,14 +76,14 @@
prop="givePrice"
:sort-method="(a,b)=>{return a.givePrice - b.givePrice}"
/>
<el-table-column
label="是否支付"
min-width="80"
>
<template slot-scope="scope">
<span class="spBlock">{{ scope.row.paid | payStatusFilter }}</span>
</template>
</el-table-column>
<!--<el-table-column-->
<!--label="是否支付"-->
<!--min-width="80"-->
<!--&gt;-->
<!--<template slot-scope="scope">-->
<!--<span class="spBlock">{{ scope.row.paid | payStatusFilter }}</span>-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column
label="充值类型"
min-width="80"
@@ -100,12 +100,12 @@
<span class="spBlock">{{ scope.row.payTime || '无' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" min-width="120" fixed="right" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleDelete(scope.row)" v-if="!scope.row.paid">删除</el-button>
<el-button type="text" size="small" @click="handleRefund(scope.row)" v-if="parseFloat(scope.row.refundPrice) <= 0 && scope.row.paid">退款</el-button>
</template>
</el-table-column>
<!--<el-table-column label="操作" min-width="120" fixed="right" align="center">-->
<!--<template slot-scope="scope">-->
<!--<el-button type="text" size="small" @click="handleDelete(scope.row)" v-if="!scope.row.paid">删除</el-button>-->
<!--<el-button type="text" size="small" @click="handleRefund(scope.row)" v-if="parseFloat(scope.row.refundPrice) <= 0 && scope.row.paid">退款</el-button>-->
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div class="block">
<el-pagination