Commit 985684aa authored by liudong1993's avatar liudong1993

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

parents 7c6628d4 578ffd59
...@@ -70,10 +70,13 @@ export default { ...@@ -70,10 +70,13 @@ export default {
@import url("//at.alicdn.com/t/font_1627123_grz80mbm3sv.css"); @import url("//at.alicdn.com/t/font_1627123_grz80mbm3sv.css");
/* @import './assets/css/common.css'; */ /* @import './assets/css/common.css'; */
@font-face { @font-face {
font-family: 'iconfont'; /* Project id 1627123 */ font-family: "iconfont"; /* Project id 1627123 */
src: url('//at.alicdn.com/t/font_1627123_zynqp2as0d.woff2?t=1652257333900') format('woff2'), src: url("//at.alicdn.com/t/font_1627123_zynqp2as0d.woff2?t=1652257333900")
url('//at.alicdn.com/t/font_1627123_zynqp2as0d.woff?t=1652257333900') format('woff'), format("woff2"),
url('//at.alicdn.com/t/font_1627123_zynqp2as0d.ttf?t=1652257333900') format('truetype'); url("//at.alicdn.com/t/font_1627123_zynqp2as0d.woff?t=1652257333900")
format("woff"),
url("//at.alicdn.com/t/font_1627123_zynqp2as0d.ttf?t=1652257333900")
format("truetype");
} }
@import "./assets/css/init.css"; @import "./assets/css/init.css";
body, body,
...@@ -92,7 +95,15 @@ html { ...@@ -92,7 +95,15 @@ html {
.el-scrollbar { .el-scrollbar {
height: 100%; height: 100%;
} }
.hide-tabs-content .el-tabs__header {
margin: 0 !important;
}
.hide-tabs-content .el-tabs__content {
display: none !important;
}
.hide-tabs-content .el-tabs__nav-wrap::after {
background: none !important;
}
.el-scrollbar__wrap { .el-scrollbar__wrap {
overflow: auto !important; overflow: auto !important;
width: 100%; width: 100%;
......
...@@ -1104,15 +1104,7 @@ export default { ...@@ -1104,15 +1104,7 @@ export default {
.loudou-card .el-card__header { .loudou-card .el-card__header {
border: none; border: none;
} }
.hide-tabs-content .el-tabs__header {
margin: 0 !important;
}
.hide-tabs-content .el-tabs__content {
display: none !important;
}
.hide-tabs-content .el-tabs__nav-wrap::after {
background: none !important;
}
.hide_input_time { .hide_input_time {
position: relative !important; position: relative !important;
} }
......
...@@ -6,9 +6,7 @@ ...@@ -6,9 +6,7 @@
} }
</style> </style>
<template> <template>
<div>
<clueComponent :isDrawer="isDrawer"></clueComponent> <clueComponent :isDrawer="isDrawer"></clueComponent>
</div>
</template> </template>
<script> <script>
import clueComponent from "./clueComponent"; import clueComponent from "./clueComponent";
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</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"
@click="openNameDetails(item)">{{item.GuestName}}</p> @click="openNameDetails(item)">{{item.GuestName?item.GuestName:'-'}}</p>
<p>{{item.MobilePhone}}</p> <p>{{item.MobilePhone}}</p>
</td> </td>
<td style="border:none">{{item.GuestCount}}</td> <td style="border:none">{{item.GuestCount}}</td>
......
...@@ -1114,10 +1114,8 @@ ...@@ -1114,10 +1114,8 @@
{ {
Name: '收损完结', Name: '收损完结',
Id: '9', Id: '9',
show: (item.OrderStatus == 3 || item.OrderStatus == show: (item.OrderStatus == 1 || item.OrderStatus == 3 || item.OrderStatus ==
4) && item.DueinMoney == 0 && item.OrderStatus != 4 || item.OrderStatus == 5) && item.DueinMoney == 0 ? true : false
2 && item.OrderStatus != 5 && item.OrderStatus !=
6 ? true : false
}, },
{ {
Name: '订单完结', Name: '订单完结',
......
This diff is collapsed.
...@@ -33,58 +33,118 @@ ...@@ -33,58 +33,118 @@
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="PushCount" label="引流总数"> <el-table-column label="引流总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,1,'0')">{{scope.row.PushCount}}</span>
<span v-else>{{scope.row.PushCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="EffectiveCount" label="有效总数"> <el-table-column label="有效总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,1,'1')">{{scope.row.EffectiveCount}}</span>
<span v-else>{{scope.row.EffectiveCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="InvalidCount" label="无效总数"> <el-table-column label="无效总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,1,'2')">{{scope.row.InvalidCount}}</span>
<span v-else>{{scope.row.InvalidCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="RedBookCount" label="小红书总数"> <el-table-column label="小红书总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,2,'7')">{{scope.row.RedBookCount}}</span>
<span v-else>{{scope.row.RedBookCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="DouYinCount" label="抖音总数"> <el-table-column prop="DouYinCount" label="抖音总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,2,'9')">{{scope.row.DouYinCount}}</span>
<span v-else>{{scope.row.DouYinCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="FlyingPigCount" label="飞猪总数"> <el-table-column label="飞猪总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,2,'8')">{{scope.row.FlyingPigCount}}</span>
<span v-else>{{scope.row.FlyingPigCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="GroupChatCount" label="社群聊天总数"> <el-table-column label="社群聊天总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,2,'1')">{{scope.row.GroupChatCount}}</span>
<span v-else>{{scope.row.GroupChatCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="OfflineVisitCount" label="线下拜访总数"> <el-table-column label="线下拜访总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,2,'2')">{{scope.row.OfflineVisitCount}}</span>
<span v-else>{{scope.row.OfflineVisitCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="StraightCustomerCount" label="直客介绍总数"> <el-table-column label="直客介绍总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,2,'3')">{{scope.row.StraightCustomerCount}}</span>
<span v-else>{{scope.row.StraightCustomerCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="PeerCount" label="同业介绍总数"> <el-table-column label="同业介绍总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,2,'4')">{{scope.row.PeerCount}}</span>
<span v-else>{{scope.row.PeerCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="OtherCount" label="其他介绍总数"> <el-table-column label="其他介绍总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,2,'6')">{{scope.row.OtherCount}}</span>
<span v-else>{{scope.row.OtherCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="OrderCount" label="订单总数"> <el-table-column label="订单总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,3,'')">{{scope.row.OrderCount}}</span>
<span v-else>{{scope.row.OrderCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="TicketOrderCount" label="机票订单总数"> <el-table-column label="机票订单总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,3,'1')">{{scope.row.TicketOrderCount}}</span>
<span v-else>{{scope.row.TicketOrderCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="VisaOrderCount" label="签证订单总数"> <el-table-column label="签证订单总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,3,'2')">{{scope.row.VisaOrderCount}}</span>
<span v-else>{{scope.row.VisaOrderCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="GroundOrderCount" label="地接订单总数"> <el-table-column label="地接订单总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,3,'3')">{{scope.row.GroundOrderCount}}</span>
<span v-else>{{scope.row.GroundOrderCount}} </span>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="ComboOrderCount" label="套餐订单总数"> <el-table-column label="套餐订单总数">
<template slot-scope="scope">
<span v-if="scope.row.YearStr>0&&scope.row.MonthStr>0" class="pointer" @click="seeDetails(scope.row,3,'4')">{{scope.row.ComboOrderCount}}</span>
<span v-else>{{scope.row.ComboOrderCount}} </span>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-drawer :with-header="false" size='70%' :visible.sync="drawer" direction="rtl" :before-close="handleClose"> <el-drawer :with-header="false" size='80%' :visible.sync="drawer" direction="rtl" :before-close="handleClose">
<clueComponent :isDrawer="isDrawer" :queryTime="queryTime"></clueComponent> <rightDrawer v-if="drawer"></rightDrawer>
</el-drawer> </el-drawer>
</div> </div>
</template> </template>
<script> <script>
import clueComponent from "@/components/clueManagement/clueComponent"; import rightDrawer from "../../components/workStatistics/rightDrawer.vue";
export default { export default {
components: { components: {
clueComponent, rightDrawer,
}, },
data() { data() {
return { return {
queryTime: {
StartTime: "",
EndTime: "",
},
drawer: false, drawer: false,
isDrawer: true, isDrawer: true,
msg: { msg: {
...@@ -95,6 +155,14 @@ export default { ...@@ -95,6 +155,14 @@ export default {
total: 0, total: 0,
tableData: [], tableData: [],
loading: false, loading: false,
selfParams: {
queryTime: {},
},
};
},
provide() {
return {
selfParams: this.selfParams,
}; };
}, },
created() { created() {
...@@ -111,15 +179,30 @@ export default { ...@@ -111,15 +179,30 @@ export default {
done(); done();
}, },
// 查看详情 // 查看详情
seeDetails(row) { seeDetails(row, type = 0, val = "0") {
var d = new Date(); var d = new Date();
var currentY = this.msg.YearStr; var currentY = this.msg.YearStr;
var currentM = this.msg.MonthStr; var currentM = this.msg.MonthStr;
var MonthDayNum = new Date(currentY, currentM, 0).getDate(); //计算当月的天数 var MonthDayNum = new Date(currentY, currentM, 0).getDate(); //计算当月的天数
this.queryTime.StartTime = this.msg.YearStr + "-" + row.DateStr; this.selfParams.queryTime.StartTime =
this.queryTime.EndTime = this.msg.YearStr + "-" + row.DateStr; this.msg.YearStr + "-" + row.DateStr;
this.selfParams.queryTime.EndTime = this.msg.YearStr + "-" + row.DateStr;
delete this.selfParams.queryTime.ClueState;
delete this.selfParams.queryTime.CustomerSourceType;
this.selfParams.queryTime.OrderType = "";
this.selfParams.queryTime.queryType = type;
this.selfParams.queryTime.queryVal = val;
if (type == 1) {
this.selfParams.queryTime.ClueState = val;
} else if (type == 2) {
this.selfParams.queryTime.CustomerSourceType = val;
} else if (type == 3) {
this.selfParams.queryTime.OrderType = val;
}
this.drawer = true; this.drawer = true;
}, },
init() { init() {
if (this.loading) return; if (this.loading) return;
this.loading = true; this.loading = true;
......
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