Skip to content

C
CRM
Commit c0a4a152 authored by 罗超's avatar 罗超
Browse files
Options

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

parents c88c37b7 0ced251a
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 63 deletions
src/App.vue
View file @ c0a4a152
......@@ -27,15 +27,14 @@ export default {
</script>
<style>
@import './assets/css/tablevoerride.css';
@import './assets/global/font.css';
@import '//at.alicdn.com/t/font_1627123_wc1bt4oc9pm.css';
@import url('//at.alicdn.com/t/font_1655735_w2e0nofnibn.css');
/* @import './assets/css/common.css'; */
@import './assets/css/init.css';
@import './assets/css/tablevoerride.css';
.el-table__fixed-body-wrapper .el-table__body{
padding-bottom:8px !important;
}
body,html{
padding: 0px;
margin: 0px;
......
src/assets/css/init.css
View file @ c0a4a152
......@@ -254,4 +254,4 @@ textarea{
.MyEditForm-item .el-input.is-disabled .el-input__inner{
background-color: white;
border-color: white;
}
\ No newline at end of file
}
src/components/Home.vue
View file @ c0a4a152
......@@ -15,8 +15,10 @@
<div class="result">{{Briefing.customerNum}}</div>
<div class="eq">
较上月
<i class="iconfont iconzujiantubiaokupx_- red"></i>
<span class="val red">{{Briefing.customerRate}}%</span>
<i class="iconfont iconzujiantubiaokupx_- red" v-if="Briefing.customerRate > 0"></i>
<i class="iconfont iconic_trending_down_px green" v-if="Briefing.customerRate < 0"></i>
<i class="iconfont iconchiping" v-else></i>
<span class="val" :class="{'red': Briefing.customerRate > 0, 'green': Briefing.customerRate < 0}">{{Briefing.customerRate}}%</span>
</div>
</div>
<div class="shang-list-item">
......@@ -27,8 +29,10 @@
<div class="result">{{Briefing.contactNum}}</div>
<div class="eq">
较上月
<i class="iconfont iconic_trending_down_px green"></i>
<span class="val green">{{Briefing.contactRate}}%</span>
<i class="iconfont iconzujiantubiaokupx_- red" v-if="Briefing.contactRate > 0"></i>
<i class="iconfont iconic_trending_down_px green" v-if="Briefing.contactRate < 0"></i>
<i class="iconfont iconchiping" v-else></i>
<span class="val" :class="{'red': Briefing.contactRate > 0, 'green': Briefing.contactRate < 0}">{{Briefing.contactRate}}%</span>
</div>
</div>
<div class="shang-list-item">
......@@ -39,8 +43,10 @@
<div class="result">{{Briefing.businessNum}}</div>
<div class="eq">
较上月
<i class="iconfont iconchiping"></i>
<span class="val red">{{Briefing.businessRate}}</span>
<i class="iconfont iconzujiantubiaokupx_- red" v-if="Briefing.businessRate > 0"></i>
<i class="iconfont iconic_trending_down_px green" v-if="Briefing.businessRate < 0"></i>
<i class="iconfont iconchiping" v-else></i>
<span class="val" :class="{'red': Briefing.businessRate > 0, 'green': Briefing.businessRate < 0}">{{Briefing.businessRate}}</span>
</div>
</div>
<div class="shang-list-item">
......@@ -51,8 +57,10 @@
<div class="result">{{Briefing.orderNum}}</div>
<div class="eq">
较上月
<i class="iconfont iconzujiantubiaokupx_- red"></i>
<span class="val red">{{Briefing.orderRate}}%</span>
<i class="iconfont iconzujiantubiaokupx_- red" v-if="Briefing.orderRate > 0"></i>
<i class="iconfont iconic_trending_down_px green" v-if="Briefing.orderRate < 0"></i>
<i class="iconfont iconchiping" v-else></i>
<span class="val" :class="{'red': Briefing.orderRate > 0, 'green': Briefing.orderRate < 0}">{{Briefing.orderRate}}%</span>
</div>
</div>
<div class="shang-list-item">
......@@ -63,8 +71,10 @@
<div class="result">{{Briefing.orderPriceNum}}</div>
<div class="eq">
较上月
<i class="iconfont iconic_trending_down_px green"></i>
<span class="val green">{{Briefing.orderPriceRate}}%</span>
<i class="iconfont iconzujiantubiaokupx_- red" v-if="Briefing.orderPriceRate > 0"></i>
<i class="iconfont iconic_trending_down_px green" v-if="Briefing.orderPriceRate < 0"></i>
<i class="iconfont iconchiping" v-else></i>
<span class="val" :class="{'red': Briefing.orderPriceRate > 0, 'green': Briefing.orderPriceRate < 0}">{{Briefing.orderPriceRate}}%</span>
</div>
</div>
<div class="shang-list-item">
......@@ -75,11 +85,13 @@
<div class="result">{{Briefing.financePriceNum}}</div>
<div class="eq">
较上月
<i class="iconfont iconzujiantubiaokupx_- red"></i>
<span class="val red">{{Briefing.financePriceRate}}%</span>
<i class="iconfont iconzujiantubiaokupx_- red" v-if="Briefing.financePriceRate > 0"></i>
<i class="iconfont iconic_trending_down_px green" v-else-if="Briefing.financePriceRate < 0"></i>
<i class="iconfont iconchiping" v-else></i>
<span class="val" :class="{'red': Briefing.financePriceRate > 0, 'green': Briefing.financePriceRate < 0}">{{Briefing.financePriceRate}}%</span>
</div>
</div>
<div class="shang-list-item">
<!-- <div class="shang-list-item">
<div class="icon yellow">
<i class="iconfont iconbaifang"></i>
</div>
......@@ -87,7 +99,9 @@
<div class="result">9</div>
<div class="eq">
较上月
<i class="iconfont iconzujiantubiaokupx_- red"></i>
<i class="iconfont iconzujiantubiaokupx_- red" v-if="Briefing.financePriceRate > 0"></i>
<i class="iconfont iconic_trending_down_px green" v-if="Briefing.financePriceRate < 0"></i>
<i class="iconfont iconchiping" v-else></i>
<span class="val red">100%</span>
</div>
</div>
......@@ -102,7 +116,7 @@
<i class="iconfont iconzujiantubiaokupx_- red"></i>
<span class="val red">40%</span>
</div>
</div>
</div> -->
</div>
</el-card>
</el-col>
......@@ -322,7 +336,7 @@
<span>销售漏斗</span>
</el-col>
<el-col :span="12" class="option-item" style="">
<el-select v-model="rankType" size="mini" style="width:120px;" placeholder="请选择">
<el-select v-model="rankType2" size="mini" style="width:120px;" placeholder="请选择">
<el-option label="商机漏斗图" value="1"></el-option>
</el-select>
</el-col>
......@@ -353,6 +367,7 @@ export default {
data() {
return {
rankType: 1,
rankType2: '1',
RankingList: [],
Briefing: {model: {TotalPrice: 0}}
};
......
src/components/assembly/customerInfoBox.vue
View file @ c0a4a152
......@@ -70,7 +70,7 @@
</div>
<div class="right">
<el-button class="crm-btn query-btn" @click="editCust" v-if="detailsData.IsRead === 0">编辑</el-button>
<el-button class="crm-btn easy-btn iconfont iconwancheng" v-if="detailsData.IsRead === 0">更改成交状态</el-button>
<!-- <el-button class="crm-btn easy-btn iconfont iconwancheng" v-if="detailsData.IsRead === 0">更改成交状态</el-button> -->
<el-dropdown @command="handleCommand" style="top: 1px;" v-if="detailsData.IsRead === 0">
<el-button class="crm-btn crm-btn-more easy-btn margin-right0">
<i class="iconfont icongengduo"></i>
......@@ -78,8 +78,8 @@
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="z"><i class="iconfont iconplus-transfer"></i> 转移</el-dropdown-item>
<el-dropdown-item command="g"><i class="iconfont icongonghaiguanli"></i> 放入公海</el-dropdown-item>
<el-dropdown-item command="s"><i class="iconfont iconsuoguan"></i> 锁定</el-dropdown-item>
<el-dropdown-item command="j"><i class="iconfont iconsuokai"></i> 解锁</el-dropdown-item>
<!-- <el-dropdown-item command="s"><i class="iconfont iconsuoguan"></i> 锁定</el-dropdown-item>
<el-dropdown-item command="j"><i class="iconfont iconsuokai"></i> 解锁</el-dropdown-item> -->
<el-dropdown-item command="d"><i class="iconfont icondelete"></i> 删除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -121,10 +121,10 @@
<el-tab-pane label="商机" name="5">
<Business v-if="activeName === '5'" :ID="CustomerId"/>
</el-tab-pane>
<el-tab-pane label="订单" name="6">
<el-tab-pane label="订单" name="6" v-if="false">
<Agreement />
</el-tab-pane>
<el-tab-pane label="回款" name="7">
<el-tab-pane label="回款" name="7" v-if="false">
<MoneyBack />
</el-tab-pane>
<el-tab-pane label="附件" name="8">
......
src/components/businessManagement/businessManagement.vue
View file @ c0a4a152
<style>
@import '../../assets/css/customerManage.css';
.el-table__fixed-body-wrapper table{
padding-bottom: 8px!important;
}
</style>
<template>
<div class="customerManage">
......
src/components/clueManagement/clueManagement.vue
View file @ c0a4a152
......@@ -20,6 +20,9 @@
color: rgb(35, 98, 251);
border-color: rgb(35, 98, 251);
} */
.el-table__fixed-body-wrapper table{
padding-bottom: 8px!important;
}
</style>
<template>
<div class="customerManage">
......
src/components/contactsManagement/contactsManagement.vue
View file @ c0a4a152
<style>
@import '../../assets/css/customerManage.css';
.el-table__fixed-body-wrapper table{
padding-bottom: 8px!important;
}
</style>
<template>
<div class="customerManage">
......
src/components/contractManagement/contractManagement.vue
View file @ c0a4a152
......@@ -10,6 +10,9 @@
.query-box .el-col-4>div{
flex: 4
}
.el-table__fixed-body-wrapper table{
padding-bottom: 8px!important;
}
</style>
<template>
<div class="customerManage">
......
src/components/customerManage/customerManage.vue
View file @ c0a4a152
<style>
@import '../../assets/css/customerManage.css';
.el-table__fixed-body-wrapper table{
padding-bottom: 8px!important;
}
</style>
<template>
<div class="customerManage">
......@@ -511,23 +514,28 @@ export default {
name: '放入公海',
class:'iconfont icongonghaiguanli',
myFun: this.waters
},{
name: '更改成交状态',
class:'iconfont iconwancheng',
myFun: this.changeState
},{
},
// {
// name: '更改成交状态',
// class:'iconfont iconwancheng',
// myFun: this.changeState
// },
{
name: '删除',
class:'iconfont icondelete',
myFun: this.delete
},{
name: '锁定',
class:'iconfont iconsuoguan',
myFun: this.locking
},{
name: '解锁',
class:'iconfont iconsuokai',
myFun: this.Unlock
},{
},
// {
// name: '锁定',
// class:'iconfont iconsuoguan',
// myFun: this.locking
// },
// {
// name: '解锁',
// class:'iconfont iconsuokai',
// myFun: this.Unlock
// },
{
name: '添加团队成员',
class:'iconfont icontianjia',
myFun: this.addCust
......
src/components/guestManagement/customerInfoBox.vue
View file @ c0a4a152
......@@ -111,10 +111,10 @@
<el-tab-pane label="商机" name="5">
<Business v-if="activeName === '5'" :ID="CustomerId"/>
</el-tab-pane>
<el-tab-pane label="订单" name="6">
<el-tab-pane label="订单" name="6" v-if="false">
<Agreement />
</el-tab-pane>
<el-tab-pane label="回款" name="7">
<el-tab-pane label="回款" name="7" v-if="false">
<MoneyBack />
</el-tab-pane>
<el-tab-pane label="附件" name="8">
......
src/components/guestManagement/guestManagement.vue
View file @ c0a4a152
<style>
@import '../../assets/css/customerManage.css';
.el-table__fixed-body-wrapper table{
padding-bottom: 8px!important;
}
</style>
<template>
<div class="customerManage">
......
src/components/waitMatter/waitMatter.vue
View file @ c0a4a152
......@@ -105,23 +105,24 @@ export default {
text:　'分配给我的客户',
class: 'iconfont iconkehu',
style: 'background-color: rgb(25, 181, 246);'
},{
text:　'待审核合同',
class: 'iconfont iconcompany',
style: 'background-color: rgb(253, 91, 74);'
},{
text:　'待审核回款',
class: 'iconfont iconcompany',
style: 'background-color: rgb(255, 185, 64);'
},{
text:　'待回款提醒',
class: 'iconfont iconcompany',
style: 'background-color: rgb(255, 122, 56);'
},{
text:　'即将到期的合同',
class: 'iconfont iconcompany',
style: 'background-color: rgb(35, 98, 251);'
},
}
// ,{
// text:　'待审核合同',
// class: 'iconfont iconcompany',
// style: 'background-color: rgb(253, 91, 74);'
// },{
// text:　'待审核回款',
// class: 'iconfont iconcompany',
// style: 'background-color: rgb(255, 185, 64);'
// },{
// text:　'待回款提醒',
// class: 'iconfont iconcompany',
// style: 'background-color: rgb(255, 122, 56);'
// },{
// text:　'即将到期的合同',
// class: 'iconfont iconcompany',
// style: 'background-color: rgb(35, 98, 251);'
// },
]
}
},
......
src/components/watersManagement/customerInfoBox.vue
View file @ c0a4a152
......@@ -117,10 +117,10 @@
<el-tab-pane label="商机" name="5">
<Business v-if="activeName === '5'" :ID="CustomerId"/>
</el-tab-pane>
<el-tab-pane label="订单" name="6">
<el-tab-pane label="订单" name="6" v-if="false">
<Agreement />
</el-tab-pane>
<el-tab-pane label="回款" name="7">
<el-tab-pane label="回款" name="7" v-if="false">
<MoneyBack />
</el-tab-pane>
<el-tab-pane label="附件" name="8">
......
src/plugins/index.js
View file @ c0a4a152
......@@ -15,9 +15,9 @@ export default {
let locationName = window.location.hostname;
if (this.isOnline()) {
if (window.location.host.indexOf('testb2b.oytour.com') != -1)
domainUrl = "crm.oytour.com"
domainUrl = "http://crm.oytour.com"
else if (window.location.host.indexOf('oytour.com') != -1)
domainUrl = "crm.oytour.com"
domainUrl = "http://crm.oytour.com"
}
var obj = {
//主地址
......
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