wanma-benteng
/
new-admin-view
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复：代理审核页面渲染错误导致内容不显示 

优化：佣金明细添加发起人佣金和外勤佣金
This commit is contained in:
wuhui_zzw 2024-02-02 15:00:04 +08:00
parent 40e55902fe
commit 8b0e8418e4
2 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/marketing/agent/apply/index.vue
View File

@ -9,10 +9,10 @@
<el-input style="width: 350px" v-model="tableFrom.uid" placeholder="请输入申请人uid" class="selWidth"></el-input>
</el-form-item>
<el-form-item label="联系人姓名：" label-width="100px" style="display: inline-block;">
<el-input style="width: 350px" v-model="tableFrom.contacts_name" placeholder="请输入联系人姓名" class="selWidth"></el-input>
<el-input style="width: 350px" v-model="tableFrom.contact_name" placeholder="请输入联系人姓名" class="selWidth"></el-input>
</el-form-item>
<el-form-item label="联系电话：" label-width="100px" style="display: inline-block;">
<el-input style="width: 350px" v-model="tableFrom.contacts_phone" placeholder="请输入联系电话" class="selWidth"></el-input>
<el-input style="width: 350px" v-model="tableFrom.contact_phone" placeholder="请输入联系电话" class="selWidth"></el-input>
</el-form-item>
<el-form-item label="状态：" label-width="100px" style="display: inline-block;">
<el-select v-model="tableFrom.status" clearable filterable placeholder="请选择" class="selWidth">
@ -108,7 +108,7 @@
</el-table-column>
<el-table-column label="状态" min-width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.orderInfo.status != 3" type="info">待支付</el-tag>
<el-tag v-if="scope.row.orderInfo && scope.row.orderInfo.status != 3" type="info">待支付</el-tag>
<template v-else>
<el-tag v-if="scope.row.status == 0" type="primary">待审核</el-tag>
<el-tag v-if="scope.row.status == 1" type="success">已通过</el-tag>
@ -119,7 +119,7 @@
<el-table-column label="申请时间" prop="create_time" min-width="150" align="center"/>
<el-table-column label="操作" min-width="280" fixed="right" align="center">
<template slot-scope="scope">
<template v-if="scope.row.status == 0 && scope.row.orderInfo.status == 3">
<template v-if="scope.row.status == 0 && scope.row.orderInfo && scope.row.orderInfo.status == 3">
<el-button type="success" size="small" @click="toExamine(scope.row.id, 1)">通过</el-button>
<el-button type="danger" size="small" @click="toExamine(scope.row.id, 2)">驳回</el-button>
</template>
@ -256,8 +256,8 @@ export default {
page: 1,
limit: 20,
uid: "",
contacts_name: "",
contacts_phone: "",
contact_name: "",
contact_phone: "",
status: "",
agent_type: ""
},

48
src/views/marketing/agent/commission/index.vue
View File

@ -21,11 +21,17 @@
<!--表格信息-->
<el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
<el-table-column prop="id" label="ID" min-width="50" align="center"/>
<el-table-column label="订单信息" min-width="160" align="center">
<el-table-column label="订单信息" min-width="180" align="center">
<template slot-scope="scope">
<div class="order-content">
{{ scope.row.userOrder.title}} <br />
{{ scope.row.userOrder.order_sn}}
<template v-if="scope.row.source == 1">
邀请代理奖励 <br />
{{ scope.row.storeOrder ? scope.row.storeOrder.order_sn : ''}}
</template>
<template v-else>
{{ scope.row.userOrder ? scope.row.userOrder.title : ''}} <br />
{{ scope.row.userOrder ? scope.row.userOrder.order_sn : ''}}
</template>
</div>
</template>
</el-table-column>
@ -137,6 +143,42 @@
</div>
</template>
</el-table-column>
<el-table-column label="发起人佣金" min-width="200" align="center">
<template slot-scope="scope">
<div class="user-content">
<div class="user-avatar" v-if="scope.row.initiator">
<img :src="scope.row.initiator.avatar || moren" />
</div>
<div class="user-info">
<div class="nickname" v-if="scope.row.initiator">
{{ scope.row.initiator.nickname }}
<div class="user-id">{{ scope.row.initiator.uid }}</div>
</div>
<div class="agent-type-text">
<el-tag type="info" effect="dark" size="small">{{ scope.row.initiator_brokerage || 0.00 }}</el-tag>
</div>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="外勤佣金" min-width="200" align="center">
<template slot-scope="scope">
<div class="user-content">
<div class="user-avatar" v-if="scope.row.fieldStaff">
<img :src="scope.row.fieldStaff.avatar || moren" />
</div>
<div class="user-info">
<div class="nickname" v-if="scope.row.fieldStaff">
{{ scope.row.fieldStaff.nickname }}
<div class="user-id">{{ scope.row.fieldStaff.uid }}</div>
</div>
<div class="agent-type-text">
<el-tag type="info" effect="dark" size="small">{{ scope.row.field_staff_brokerage || 0.00 }}</el-tag>
</div>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="平台佣金" prop="platform_brokerage" min-width="130" align="center"/>
<el-table-column label="下单时间" prop="create_time" min-width="150" align="center"/>
</el-table>