Skip to content

C
CRM
Commit 442d33aa authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

parents cdf9f93a d06f98fb
Hide whitespace changes
Inline Side-by-side
Showing with 253 additions and 117 deletions
src/components/customerManage/orderDetailsDrawer.vue
View file @ 442d33aa
<style>
.orderDetails-box{
height: 100%;
}
.orderDetails-header{
height: 83px;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 30px;
}
.orderDetails-header .left {
display: flex;
align-items: center;
}
.orderDetails-body{
height: calc(100% - 83px);
}
.orderDetails-body .order-info {
height: 115px;
padding: 30px;
box-sizing: border-box;
font-size: 12px;
background-color: #f6f4fc;
}
.orderDetails-body .order-info .order-lable-box {
color: #999999;
}
</style>
.orderDetails-box {
height: 100%;
}
.orderDetails-header {
height: 83px;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 30px;
}
.orderDetails-header .left {
display: flex;
align-items: center;
}
.orderDetails-body {
height: calc(100% - 83px);
}
.orderDetails-body .order-info {
height: 115px;
padding: 30px;
box-sizing: border-box;
font-size: 12px;
background-color: #f6f4fc;
}
.orderDetails-body .order-info .order-lable-box {
color: #999999;
}
</style>
<template>
<div class="orderDetails-box">
<div class="orderDetails-header">
......@@ -56,7 +56,7 @@
</el-tab-pane>
<el-tab-pane label="订单核算" name="2">
<orderProfits :orderId="orderId"></orderProfits>
</el-tab-pane>
<el-tab-pane label="订单日志" name="3">
......@@ -68,92 +68,99 @@
</div>
</template>
<script>
// import Activity from "../guestManagement/Activity";
export default {
components: {
// Activity,
},
props:{
// CustomerId: {
// type: Number,
// default: 0
// }
},
data() {
return {
activeName: '1',
detailsData: {},
loading: true,
};
},watch:{
CustomerId: {
handler(val, oldVal){
this.init()
this.activeName = '1'
},
deep:true
import orderProfits from "./orderProfits.vue";
// import Activity from "../guestManagement/Activity";
export default {
components: {
// Activity,
orderProfits,
},
props: {
orderId: {
type: Number,
required: true,
},
},
data() {
return {
activeName: "1",
detailsData: {},
loading: true,
};
},
watch: {
CustomerId: {
handler(val, oldVal) {
this.init();
this.activeName = "1";
},
deep: true,
},
},
mounted() {
let $this = this;
$this.init();
// 监听修改更新界面
this.MsgBus.$on("RefreshInfoBox", function() {
$this.init();
});
},
methods: {
init() {
return;
this.apipost(
"/api/Customer/GetAllCustmersModel",
{ CustomerId: this.CustomerId },
(res) => {
if (res.data.resultCode == 1) {
let data = res.data.data;
if (!data.HousePhotos) {
data.HousePhotos = [];
}
if (!data.BusinessCardPhotos) {
data.BusinessCardPhotos = [];
}
if (!data.Images) {
data.Images = [];
}
if (!data.CustomerSourceType) {
data.CustomerSourceType = "";
}
if (!data.CustomerSource) {
data.CustomerSource = "";
}
if (!data.Province) {
data.Province = "";
}
if (!data.Country) {
data.Country = "";
}
if (!data.City) {
data.City = "";
}
},
mounted() {
let $this = this
$this.init()
// 监听修改更新界面
this.MsgBus.$on('RefreshInfoBox', function () {
$this.init()
})
},
methods: {
init(){
return
this.apipost('/api/Customer/GetAllCustmersModel', {CustomerId: this.CustomerId}, res=>{
if (res.data.resultCode == 1) {
let data = res.data.data
if(!data.HousePhotos){
data.HousePhotos = []
}
if(!data.BusinessCardPhotos){
data.BusinessCardPhotos = []
}
if(!data.Images){
data.Images = []
}
if(!data.CustomerSourceType){
data.CustomerSourceType = ''
}
if(!data.CustomerSource){
data.CustomerSource = ''
}
if(!data.Province){
data.Province = ''
}
if(!data.Country){
data.Country = ''
}
if(!data.City){
data.City = ''
}
if(!data.District){
data.District = ''
}
this.detailsData = data
this.loading = true
}
})
},
handleCommand(command){
if (command === 'z') {
this.$emit('transferS', 3);
} else if (command === 'g') {
this.$emit('watersS', 1)
}
},
handleClick(tab, event) {},
editCust(){
this.$emit('editCustS', 1)
},
handleClose(done) {
done();
if (!data.District) {
data.District = "";
}
this.detailsData = data;
this.loading = true;
}
}
}
</script>
\ No newline at end of file
);
},
handleCommand(command) {
if (command === "z") {
this.$emit("transferS", 3);
} else if (command === "g") {
this.$emit("watersS", 1);
}
},
handleClick(tab, event) {},
editCust() {
this.$emit("editCustS", 1);
},
handleClose(done) {
done();
},
},
};
</script>
src/components/customerManage/orderList.vue
View file @ 442d33aa
......@@ -229,7 +229,7 @@
</el-drawer>
<!-- 单号抽屉 -->
<el-drawer :with-header="false" size='70%' :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
<orderDetailsDrawer />
<orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" />
</el-drawer>
</div>
......@@ -293,7 +293,8 @@
drawer: false,
orderDrawer: false,
CustomerId: '',
CustomerName: ''
CustomerName: '',
currentOrder:null
};
},
created() {
......@@ -390,6 +391,7 @@
},
// 点击单号
clickSingleNumber(item){
this.currentOrder=item
this.orderDrawer = true
},
handleClose(done) {
......
src/components/customerManage/orderProfits.vue 0 → 100644
View file @ 442d33aa
<template>
<div style="padding:0 20px 20px 20px;">
<div style="font-size:16px;">订单利润核算表</div>
<div class="Team_Content" v-loading="loading">
<el-row :gutter="12" v-if="d">
<el-col :span="5">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_shou">
<i class="iconfont icon-qian"></i>
</span>团费收入
</div>
<div class="Team_Incontent">
<div>应收：<span>￥{{DataList.TeamBalance.ShouldReceive}}</span></div>
<div>实收：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualReceive}}</span></div>
<div>待收：<span class="Team_Coins">￥{{DataList.TeamBalance.WaitRecive}}</span></div>
<div>
注：应收=订单应收总额，实收=订单实收总额
</div>
</div>
</div>
</el-col>
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_shou">
<i class="iconfont icon-qian"></i>
</span>其他
</div>
<div class="Team_Incontent">
<div>应收：<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div>
<div>实收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalsf)}}</span></div>
<div>待收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalyf-moneyAll.otheryTotalsf)}}</span></div>
<div>
注：此处不进入'利润'计算，单纯只统计除团费外的其他总收入
</div>
</div>
</div>
</el-col>
<el-col :span="5">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_zhichu">
<i class="iconfont icon-qian"></i>
</span>支出
</div>
<div class="Team_Incontent">
<div>应付：<span>￥{{DataList.TeamBalance.ShouldPay}}</span></div>
<div>实付：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualPay}}</span></div>
<div>待付：<span class="Team_Coins">￥{{DataList.TeamBalance.WaitPay}}</span></div>
<div>
注：成本单据总额(包含退款)+提成-小费收入-地接收入
</div>
</div>
</div>
</el-col>
<el-col :span="5">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
<i class="iconfont icon-qian"></i>
</span>利润（计算规则请看注解）
</div>
<div class="Team_Incontent">
<div>实际利润：<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
<div>当前利润：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
<div>
注：实收-(应付/实付)+佣金收入+自费收入+其他收入
-联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出
</div>
</div>
</div>
</el-col>
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
<i class="iconfont icon-qian"></i>
</span>提成
</div>
<div class="Team_Incontent" style="margin-bottom:0;">
<div class="TeamExpectList">
<template v-for="subItem in DataList.ExpectedCutList">
<div style="margin-bottom:5px;">{{subItem.BranchName}} ￥{{subItem.expectedCut}} </div>
</template>
</div>
</div>
<div>联运成本：<span>￥{{DataList.LYCB}}</span></div>
<div>额外返佣：<span>￥{{DataList.EWFY}}</span></div>
<div>OP提成：<span>￥{{DataList.OpCommMoney}}</span></div>
<div>票务提成：<span>￥{{DataList.AirCommMoney}}</span></div>
</div>
</el-col>
</el-row>
</div>
</div>
</template>
<script>
export default {
props: ["orderId"],
data() {
return {
loading: true,
d: null,
};
},
methods: {
init() {
this.apipost2(
"crm_post_GetCRMGuestOrderCheck",
{ OrderId: this.orderId },
(res) => {
if (res.data.resultCode == 1) {
this.d = res.data.data;
console.log(d);
}
},
(err) => {}
);
},
},
};
</script>
<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