Commit 2f1b2e70 authored by zhengke's avatar zhengke

no message

parent a658080f
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
<p class="CreateByName-text">引流人:{{item.CreateByName}}</p> <p class="CreateByName-text">引流人:{{item.CreateByName}}</p>
<p class="CreateByName-text">业务员:<span class="colorblue">{{item.EnterName}}</span></p> <p class="CreateByName-text">业务员:<span class="colorblue">{{item.EnterName}}</span></p>
<p>{{item.CreateTime}}</p> <p>{{item.CreateTime}}</p>
<p class="CreateByName-text Commission cp" v-if="item.Commission" @click="commissionDetails(item)">提成:<span>{{item.Commission}}</span></p>
</td> </td>
<td style="border:none" min-width="6.5%"> <td style="border:none" min-width="6.5%">
<p class="colorblue font-color-link" <p class="colorblue font-color-link"
...@@ -270,17 +271,20 @@ ...@@ -270,17 +271,20 @@
<el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose"> <el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
<orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" :activeNameNum="activeNameNum" /> <orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" :activeNameNum="activeNameNum" />
</el-drawer> </el-drawer>
<!-- 提成详情 -->
<commissionPopUp v-if="commissionPopUpVisible" :parameters="parameters"></commissionPopUp>
</div> </div>
</template> </template>
<script> <script>
import customerInfoBox from "../guestManagement/customerInfoBox"; import customerInfoBox from "../guestManagement/customerInfoBox";
import orderDetailsDrawer from "./orderDetailsDrawer"; import orderDetailsDrawer from "./orderDetailsDrawer";
import commissionPopUp from "../dialogModel/commissionPopUp";
export default { export default {
components: { components: {
customerInfoBox, customerInfoBox,
orderDetailsDrawer, orderDetailsDrawer,
commissionPopUp
}, },
props: { props: {
//订单 //订单
...@@ -299,6 +303,8 @@ export default { ...@@ -299,6 +303,8 @@ export default {
}, },
data() { data() {
return { return {
commissionPopUpVisible:false,
parameters:{},
receiptType:{}, receiptType:{},
activeNameNum:"1", activeNameNum:"1",
MultipleChoiceList: [ //多选项目 MultipleChoiceList: [ //多选项目
...@@ -365,9 +371,17 @@ export default { ...@@ -365,9 +371,17 @@ export default {
} }
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); let $this = this;
this.MsgBus.$on("closeaddContacts", function() {
$this.commissionPopUpVisible = false;
});
}, },
methods: { methods: {
// 提成列表
commissionDetails(item){
this.parameters = item
this.commissionPopUpVisible = true
},
// 多选发生变化 // 多选发生变化
clickMultipleChoice(row, index, num) { clickMultipleChoice(row, index, num) {
if (num == 1) { if (num == 1) {
...@@ -1277,6 +1291,11 @@ export default { ...@@ -1277,6 +1291,11 @@ export default {
.CreateByName-text { .CreateByName-text {
margin-bottom: 10px; margin-bottom: 10px;
} }
.CreateByName-text.Commission {
color: red;
margin-top: 10px;
margin-bottom: 0;
}
.colorblue { .colorblue {
color: #2961fe; color: #2961fe;
......
<style scoped>
.addContacts .add-tit {
display: flex;
justify-content: space-between;
align-items: center;
height: 20px;
}
.addContacts .add-tit p {
display: flex;
align-items: center;
font-weight: bold;
color: rgba(17, 17, 17, 1);
font-size: 14px;
}
.addContacts .add-tit p span {
display: inline-block;
width: 6px;
height: 6px;
background: #409efe;
border-radius: 50%;
margin-right: 10px;
}
.addContacts .el-dialog__header {
padding: 15px 20px;
background: rgba(255, 255, 255, 1);
}
.addContacts .dialog-footer {
text-align: center;
background-color: rgba(248, 250, 251, 1);
padding-bottom: 20px;
}
.addContacts .el-dialog__footer {
padding: 0;
}
</style>
<template>
<el-dialog @closed="closedDialog" :modal="false" :visible.sync="dialogTableVisible" :close-on-click-modal="false" class="addContacts">
<div class="add-tit" slot="title">
<p><span></span>提成列表</p>
<span icon="el-icon-close"></span>
</div>
<div class="form-box">
<el-table
v-loading="loading"
ref="multipleTable"
:data="dataList"
style="width: 100%"
row-class-name="font-size-12">
<!-- <el-table-column fixed type="selection" width="40"></el-table-column> -->
<el-table-column
label="类型"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.EmpType!=1?'引流':'销售'}}
</template>
</el-table-column>
<el-table-column
prop="BranchName"
label="公司"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="DeptName"
label="部门"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="岗位"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.PostName?scope.row.PostName:'-'}}
</template>
</el-table-column>
<el-table-column
prop="EmName"
label="姓名"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="OrderId"
label="订单号"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="OrderProfit"
label="订单利润"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="Commission"
label="提成"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="提成比例"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.CommissionRate}}%
</template>
</el-table-column>
<el-table-column
prop="BonusMoney"
label="年终"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="年终比例"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.BonusRate}}%
</template>
</el-table-column>
<el-table-column
prop="Month"
label="期数"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="备注"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.Remark?scope.row.Remark:'-'}}
</template>
</el-table-column>
<!-- <el-table-column
prop="IsFirstContact"
label="操作"
show-overflow-tooltip>
<template slot-scope="scope">
</template>
</el-table-column> -->
</el-table>
<!-- 分页 -->
<el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[15, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" class="add-box-btn" @click="dialogTableVisible = false">确 定</el-button>
<el-button class="add-box-btn add-box-cancel" @click="dialogTableVisible = false">取 消
</el-button>
</div>
</el-dialog>
</template>
<script>
export default {
props: {
parameters:{
type: Object,
default: true
}
},
data() {
return {
total:0,
dataList:[],
msg: {
pageIndex: 1,
pageSize: 20,
// EmpId: -1,
// PeriodsId: -1,
// EmpType: '-1',
OrderId:''
},
loading:false,
dialogTableVisible:false
};
},
watch: {},
created(){
},
mounted() {
this.msg.OrderId = this.parameters.OrderId
this.dialogTableVisible = true
this.getList()
},
methods: {
//获取数据
getList() {
this.loading = true;
this.apipost(
"/api/Commission/GetCommissionOrderDetialPageList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.Error(res.data.message);
}
}
);
},
handleSizeChange(val) {
this.msg.pageSize = val;
this.getList();
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
closedDialog(){
this.MsgBus.$emit("closeaddContacts");
}
},
};
</script>
\ No newline at end of file
...@@ -434,9 +434,12 @@ ...@@ -434,9 +434,12 @@
</el-table-column> </el-table-column>
<el-table-column prop="Commission" label="提成"> <el-table-column prop="Commission" label="提成">
<template slot-scope="scope"> <template slot-scope="scope">
<span> <span v-if="scope.row.Commission>0" class="Commission" @click="commissionDetails(scope.row)">
{{scope.row.Commission}} {{scope.row.Commission}}
</span> </span>
<span v-else class="Commission">
-
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Profit" label="订单毛利"> <el-table-column prop="Profit" label="订单毛利">
...@@ -474,16 +477,20 @@ ...@@ -474,16 +477,20 @@
<el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :append-to-body="true" :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose"> <el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :append-to-body="true" :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
<orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" :activeNameNum="activeNameNum"/> <orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" :activeNameNum="activeNameNum"/>
</el-drawer> </el-drawer>
<!-- 提成详情 -->
<commissionPopUp v-if="commissionPopUpVisible" :parameters="parameters"></commissionPopUp>
</div> </div>
</template> </template>
<script> <script>
import customerInfoBox from "../guestManagement/customerInfoBox"; import customerInfoBox from "../guestManagement/customerInfoBox";
import orderDetailsDrawer from "../customerManage/orderDetailsDrawer"; import orderDetailsDrawer from "../customerManage/orderDetailsDrawer";
import commissionPopUp from "../dialogModel/commissionPopUp";
export default { export default {
components: { components: {
customerInfoBox, customerInfoBox,
orderDetailsDrawer orderDetailsDrawer,
commissionPopUp
}, },
created() { created() {
// erp自动登陆传过来的参数 // erp自动登陆传过来的参数
...@@ -499,10 +506,14 @@ export default { ...@@ -499,10 +506,14 @@ export default {
this.MsgBus.$on("closeGetList", function () { this.MsgBus.$on("closeGetList", function () {
$this.getList(); $this.getList();
}); });
this.MsgBus.$on("closeaddContacts", function() {
$this.commissionPopUpVisible = false;
});
this.getList(); this.getList();
}, },
data() { data() {
return { return {
commissionPopUpVisible:false,
loading: false, loading: false,
ticketingStatusList: [], // 出票状态 ticketingStatusList: [], // 出票状态
total: 0, total: 0,
...@@ -552,6 +563,11 @@ export default { ...@@ -552,6 +563,11 @@ export default {
}; };
}, },
methods: { methods: {
// 提成列表
commissionDetails(item){
this.parameters = item
this.commissionPopUpVisible = true
},
// 点击单号 // 点击单号
clickSingleNumber(item) { clickSingleNumber(item) {
this.currentOrder = item; this.currentOrder = item;
...@@ -731,4 +747,8 @@ export default { ...@@ -731,4 +747,8 @@ export default {
text-decoration: underline; text-decoration: underline;
} }
} }
.Commission{
cursor: pointer;
color: red;
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment