Skip to content

C
CRM
Commit 0721495e authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 61487bd8 e7c86e1e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1262 additions and 322 deletions
src/components/assembly/Activity.vue
View file @ 0721495e
...@@ -365,10 +365,10 @@ ...@@ -365,10 +365,10 @@
<span>附件</span> <span>附件</span>
</div> </div>
</el-upload> </el-upload>
<div class="ctrl-btn"> <!-- <div class="ctrl-btn">
<i class="iconfont iconguanlianbg"></i> <i class="iconfont iconguanlianbg"></i>
<span>关联商机</span> <span>关联商机</span>
</div> </div> -->
<!-- <div> <!-- <div>
<i class="iconfont iconkehu"></i> <i class="iconfont iconkehu"></i>
<span>关联联系人</span> <span>关联联系人</span>
......
src/components/businessManagement/Activity.vue
View file @ 0721495e
...@@ -362,10 +362,10 @@ ...@@ -362,10 +362,10 @@
<span>附件</span> <span>附件</span>
</div> </div>
</el-upload> </el-upload>
<div class="ctrl-btn" v-show="false"> <!-- <div class="ctrl-btn" v-show="false">
<i class="iconfont iconguanlianbg"></i> <i class="iconfont iconguanlianbg"></i>
<span>关联商机</span> <span>关联商机</span>
</div> </div> -->
<!-- <div> <!-- <div>
<i class="iconfont iconkehu"></i> <i class="iconfont iconkehu"></i>
<span>关联联系人</span> <span>关联联系人</span>
......
src/components/businessManagement/businessManagement.vue
View file @ 0721495e
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
</div> </div>
<div class="rightmenu"> <div class="rightmenu">
<el-button icon="el-icon-plus" class="crm-btn org-btn" @click="BusinessId = 0, dialogBusinessVisibleName = '新建商机', dialogBusinessVisible=true">新建商机</el-button> <el-button icon="el-icon-plus" class="crm-btn org-btn" @click="BusinessId = 0, dialogBusinessVisibleName = '新建商机', dialogBusinessVisible=true">新建商机</el-button>
<el-dropdown> <el-dropdown @command="handleCommand">
<el-button class="crm-btn crm-btn-more easy-btn margin-right0"> <el-button class="crm-btn crm-btn-more easy-btn margin-right0">
<i class="iconfont icongengduo"></i> <i class="iconfont icongengduo"></i>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> <el-dropdown-item command="1"><i class="iconfont icondaochu"></i> 导入</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -491,6 +491,9 @@ export default { ...@@ -491,6 +491,9 @@ export default {
this.MsgBus.$off('editScene'); this.MsgBus.$off('editScene');
}, },
methods: { methods: {
handleCommand(command){
this.$message.warning('功能正在开发中~');
},
changeWhere(item){ changeWhere(item){
this.msg.ID = item.ID this.msg.ID = item.ID
this.sceneID = item.ID this.sceneID = item.ID
......
src/components/clueManagement/clueManagement.vue
View file @ 0721495e
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
<el-dropdown-item command="2"><i class="iconfont icontongxunlu"></i> 直客线索</el-dropdown-item> <el-dropdown-item command="2"><i class="iconfont icontongxunlu"></i> 直客线索</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-dropdown> <el-dropdown @command="handleCommand">
<el-button class="crm-btn crm-btn-more easy-btn margin-right0"> <el-button class="crm-btn crm-btn-more easy-btn margin-right0">
<i class="iconfont icongengduo"></i> <i class="iconfont icongengduo"></i>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item><i class="iconfont icondaoru"></i> 导入</el-dropdown-item> <el-dropdown-item command="3"><i class="iconfont icondaoru"></i> 导入</el-dropdown-item>
<el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> <!-- <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> -->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
label="客户级别" label="客户级别"
sortable sortable
width="100" width="100"
v-if="queryType[5].show" v-if="queryType[5].show && msg.CustomerType === 0"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -514,8 +514,10 @@ export default { ...@@ -514,8 +514,10 @@ export default {
if (command === '1') { if (command === '1') {
this.dialogTableVisibleName = '新建线索' this.dialogTableVisibleName = '新建线索'
this.dialogTableVisible = true this.dialogTableVisible = true
} else { } else if (command === '2') {
this.guestDialogBoxShow = true this.guestDialogBoxShow = true
} else if (command === '3') {
this.$message.warning('功能正在开发中~');
} }
}, },
Employee(){ Employee(){
......
src/components/contactsManagement/contactsManagement.vue
View file @ 0721495e
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
</div> </div>
<div class="rightmenu"> <div class="rightmenu">
<el-button icon="el-icon-plus" class="crm-btn org-btn" @click="BusinessId = 0, dialogBusinessVisibleName = '新建联系人', dialogBusinessVisible=true">新建联系人</el-button> <el-button icon="el-icon-plus" class="crm-btn org-btn" @click="BusinessId = 0, dialogBusinessVisibleName = '新建联系人', dialogBusinessVisible=true">新建联系人</el-button>
<el-dropdown> <el-dropdown @command="handleCommand">
<el-button class="crm-btn crm-btn-more easy-btn margin-right0"> <el-button class="crm-btn crm-btn-more easy-btn margin-right0">
<i class="iconfont icongengduo"></i> <i class="iconfont icongengduo"></i>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> <el-dropdown-item command="1"><i class="iconfont icondaochu"></i> 导入</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -455,6 +455,9 @@ export default { ...@@ -455,6 +455,9 @@ export default {
this.MsgBus.$off('editScene'); this.MsgBus.$off('editScene');
}, },
methods: { methods: {
handleCommand(command){
this.$message.warning('功能正在开发中~');
},
changeWhere(item){ changeWhere(item){
this.msg.ID = item.ID this.msg.ID = item.ID
this.sceneID = item.ID this.sceneID = item.ID
......
src/components/contractManagement/contractManagement.vue
View file @ 0721495e
...@@ -32,14 +32,14 @@ ...@@ -32,14 +32,14 @@
<el-dropdown-item command="3"><i class="iconfont iconweituoweixuanzhong"></i> 单项委托合同</el-dropdown-item> <el-dropdown-item command="3"><i class="iconfont iconweituoweixuanzhong"></i> 单项委托合同</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-dropdown> <!-- <el-dropdown>
<el-button class="crm-btn crm-btn-more easy-btn margin-right0"> <el-button class="crm-btn crm-btn-more easy-btn margin-right0">
<i class="iconfont icongengduo"></i> <i class="iconfont icongengduo"></i>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown> -->
</div> </div>
</div> </div>
<div class="query-box"> <div class="query-box">
......
src/components/customerManage/customerManage.vue
View file @ 0721495e
...@@ -114,13 +114,13 @@ ...@@ -114,13 +114,13 @@
<div class="rightmenu"> <div class="rightmenu">
<!-- <el-button class="crm-btn query-btn" @click="getList">查询</el-button> --> <!-- <el-button class="crm-btn query-btn" @click="getList">查询</el-button> -->
<el-button icon="el-icon-plus" class="crm-btn org-btn" @click="CustomerId = 0, dialogTableVisibleName = '新建客户', dialogTableVisible=true">新建客户</el-button> <el-button icon="el-icon-plus" class="crm-btn org-btn" @click="CustomerId = 0, dialogTableVisibleName = '新建客户', dialogTableVisible=true">新建客户</el-button>
<el-dropdown> <el-dropdown @command="handleCommand">
<el-button class="crm-btn crm-btn-more easy-btn margin-right0"> <el-button class="crm-btn crm-btn-more easy-btn margin-right0">
<i class="iconfont icongengduo"></i> <i class="iconfont icongengduo"></i>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item><i class="iconfont icondaoru"></i> 导入</el-dropdown-item> <el-dropdown-item command="1"><i class="iconfont icondaoru"></i> 导入</el-dropdown-item>
<el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> <!-- <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> -->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -324,14 +324,14 @@ ...@@ -324,14 +324,14 @@
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="NowSellName" prop="PersonChargeStr"
label="负责人" label="负责人"
width="120" width="120"
v-if="queryType[15].show" v-if="queryType[15].show"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="Visit" prop="LastFollowUpTime"
label="近期约访" label="近期约访"
sortable sortable
v-if="queryType[16].show" v-if="queryType[16].show"
...@@ -631,7 +631,7 @@ export default { ...@@ -631,7 +631,7 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 30, pageSize: 30,
ContactNumber: '', ContactNumber: '',
WhereType: 1, WhereType: -1,
OrderBy: '', OrderBy: '',
Data: {}, Data: {},
ID: 1, ID: 1,
...@@ -731,6 +731,9 @@ export default { ...@@ -731,6 +731,9 @@ export default {
this.MsgBus.$off('editScene'); this.MsgBus.$off('editScene');
}, },
methods: { methods: {
handleCommand(command){
this.$message.warning('功能正在开发中~');
},
changeWhere(item){ changeWhere(item){
this.msg.ID = item.ID this.msg.ID = item.ID
this.sceneID = item.ID this.sceneID = item.ID
......
src/components/guestManagement/Details.vue
View file @ 0721495e
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
客户名称： 客户名称：
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
{{detailsData.GusetName}} {{detailsData.SurName + detailsData.Name}}
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
...@@ -86,15 +86,113 @@ ...@@ -86,15 +86,113 @@
<el-col :span="12"> <el-col :span="12">
<el-row> <el-row>
<el-col :span="6" class="Details_box_lable"> <el-col :span="6" class="Details_box_lable">
客户来源： 身份证号：
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
{{detailsData.CustomerSourceTypeStr}} {{detailsData.IdCard}}
</el-col>
</el-row>
</el-col>
</el-row>
<el-row :gutter="40" class="Details_box_row">
<el-col :span="12">
<el-row>
<el-col :span="6" class="Details_box_lable">
性别：
</el-col>
<el-col :span="14">
{{detailsData.Sex}}
</el-col>
</el-row>
</el-col>
<el-col :span="12">
<el-row>
<el-col :span="6" class="Details_box_lable">
手机号：
</el-col>
<el-col :span="14">
{{detailsData.MobilePhone}}
</el-col>
</el-row>
</el-col>
</el-row>
<el-row :gutter="40" class="Details_box_row">
<el-col :span="12">
<el-row>
<el-col :span="6" class="Details_box_lable">
护照号：
</el-col>
<el-col :span="14">
{{detailsData.PassportNo}}
</el-col>
</el-row>
</el-col>
<el-col :span="12">
<el-row>
<el-col :span="6" class="Details_box_lable">
护照签发日期：
</el-col>
<el-col :span="14">
{{detailsData.PassportIssued}}
</el-col>
</el-row>
</el-col>
</el-row>
<el-row :gutter="40" class="Details_box_row">
<el-col :span="12">
<el-row>
<el-col :span="6" class="Details_box_lable">
职务：
</el-col>
<el-col :span="14">
{{detailsData.PassportExpiry}}
</el-col>
</el-row>
</el-col>
<el-col :span="12">
<el-row>
<el-col :span="6" class="Details_box_lable">
护照过期日期：
</el-col>
<el-col :span="14">
{{detailsData.PassportExpiry}}
</el-col>
</el-row>
</el-col>
</el-row>
<el-row :gutter="40" class="Details_box_row">
<el-col :span="12">
<el-row>
<el-col :span="6" class="Details_box_lable">
单位类型：
</el-col>
<el-col :span="14">
{{detailsData.UnitTypeStr}}
</el-col>
</el-row>
</el-col>
<el-col :span="12">
<el-row>
<el-col :span="6" class="Details_box_lable">
出游类型：
</el-col>
<el-col :span="14">
{{detailsData.TravelTypeStr}}
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="40" class="Details_box_row"> <el-row :gutter="40" class="Details_box_row">
<el-col :span="12">
<el-row>
<el-col :span="6" class="Details_box_lable">
职位类型：
</el-col>
<el-col :span="14">
{{detailsData. DutyTypeStr}}
</el-col>
</el-row>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-row> <el-row>
<el-col :span="6" class="Details_box_lable"> <el-col :span="6" class="Details_box_lable">
......
src/components/guestManagement/customerInfoBox.vue
View file @ 0721495e
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<div class="drawer-header"> <div class="drawer-header">
<div class="left"> <div class="left">
<img src="../../assets/img/cust/kehu2.png" alt=""> <img src="../../assets/img/cust/kehu2.png" alt="">
<p>{{detailsData.GusetName}}</p> <p>{{detailsData.SurName + detailsData.Name}}</p>
</div> </div>
<div class="right"> <div class="right">
<el-button class="crm-btn query-btn" @click="editCust" >编辑</el-button> <el-button class="crm-btn query-btn" @click="editCust" >编辑</el-button>
......
src/components/guestManagement/guestManagement.vue
View file @ 0721495e
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
<div class="rightmenu"> <div class="rightmenu">
<!-- <el-button class="crm-btn query-btn" @click="getList">查询</el-button> --> <!-- <el-button class="crm-btn query-btn" @click="getList">查询</el-button> -->
<el-button icon="el-icon-plus" class="crm-btn org-btn" @click="CustomerId = 0, dialogTableVisibleName = '新建直客', dialogTableVisible=true">新建直客</el-button> <el-button icon="el-icon-plus" class="crm-btn org-btn" @click="CustomerId = 0, dialogTableVisibleName = '新建直客', dialogTableVisible=true">新建直客</el-button>
<el-dropdown> <el-dropdown @command="handleCommand">
<el-button class="crm-btn crm-btn-more easy-btn margin-right0"> <el-button class="crm-btn crm-btn-more easy-btn margin-right0">
<i class="iconfont icongengduo"></i> <i class="iconfont icongengduo"></i>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item><i class="iconfont icondaoru"></i> 导入</el-dropdown-item> <el-dropdown-item command="1"><i class="iconfont icondaoru"></i> 导入</el-dropdown-item>
<el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> <!-- <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> -->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -188,6 +188,9 @@ ...@@ -188,6 +188,9 @@
sortable sortable
v-if="queryType[29].show" v-if="queryType[29].show"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope">
<p v-for="(item, index) in scope.row.EconomicCapability" :key="index">{{item.Value}}</p>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="IsRecommendStr" prop="IsRecommendStr"
...@@ -295,25 +298,11 @@ ...@@ -295,25 +298,11 @@
v-if="queryType[22].show" v-if="queryType[22].show"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column
prop="Birthday"
label="余额"
sortable
v-if="queryType[13].show"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="Birthday"
label="余额"
sortable
v-if="queryType[13].show"
show-overflow-tooltip>
</el-table-column>
<el-table-column <el-table-column
prop="CustomerLevelStr" prop="CustomerLevelStr"
label="客户等级" label="客户等级"
sortable sortable
v-if="queryType[7].show" v-if="false"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -635,7 +624,7 @@ export default { ...@@ -635,7 +624,7 @@ export default {
label: '订单交易数', label: '订单交易数',
show: true, show: true,
},{ },{
label: '交易金额', label: '订单金额',
show: true, show: true,
},{ },{
label: '出境记录', label: '出境记录',
...@@ -742,6 +731,9 @@ export default { ...@@ -742,6 +731,9 @@ export default {
this.MsgBus.$off('editScene'); this.MsgBus.$off('editScene');
}, },
methods: { methods: {
handleCommand(command){
this.$message.warning('功能正在开发中~');
},
changeWhere(item){ changeWhere(item){
this.msg.ID = item.ID this.msg.ID = item.ID
this.sceneID = item.ID this.sceneID = item.ID
...@@ -895,6 +887,9 @@ export default { ...@@ -895,6 +887,9 @@ export default {
this.apipost('/api/Customer/GetGuesstCustomerPageList', this.msg, res=>{ this.apipost('/api/Customer/GetGuesstCustomerPageList', this.msg, res=>{
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData; this.tableData = res.data.data.pageData;
this.tableData.map(x=>{
x.EconomicCapability = JSON.parse(x.EconomicCapability)
})
this.total = res.data.data.count; this.total = res.data.data.count;
this.loading = false; this.loading = false;
} }
......
src/components/watersManagement/Activity.vue
View file @ 0721495e
...@@ -365,10 +365,10 @@ ...@@ -365,10 +365,10 @@
<span>附件</span> <span>附件</span>
</div> </div>
</el-upload> </el-upload>
<div class="ctrl-btn"> <!-- <div class="ctrl-btn">
<i class="iconfont iconguanlianbg"></i> <i class="iconfont iconguanlianbg"></i>
<span>关联商机</span> <span>关联商机</span>
</div> </div> -->
<!-- <div> <!-- <div>
<i class="iconfont iconkehu"></i> <i class="iconfont iconkehu"></i>
<span>关联联系人</span> <span>关联联系人</span>
......
src/components/watersManagement/watersManagement.vue
View file @ 0721495e
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
<div class="rightmenu"> <div class="rightmenu">
<!-- <el-button class="crm-btn query-btn" @click="getList">查询</el-button> --> <!-- <el-button class="crm-btn query-btn" @click="getList">查询</el-button> -->
<!-- <el-button icon="el-icon-plus" class="crm-btn org-btn" @click="CustomerId = 0, dialogTableVisibleName = '新建客户', dialogTableVisible=true">新建</el-button> --> <!-- <el-button icon="el-icon-plus" class="crm-btn org-btn" @click="CustomerId = 0, dialogTableVisibleName = '新建客户', dialogTableVisible=true">新建</el-button> -->
<el-dropdown> <el-dropdown @command="handleCommand">
<el-button class="crm-btn crm-btn-more easy-btn margin-right0"> <el-button class="crm-btn crm-btn-more easy-btn margin-right0">
<i class="iconfont icongengduo"></i> <i class="iconfont icongengduo"></i>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item><i class="iconfont icondaoru"></i> 导入</el-dropdown-item> <el-dropdown-item command="1"><i class="iconfont icondaoru"></i> 导入</el-dropdown-item>
<el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> <!-- <el-dropdown-item><i class="iconfont icondaochu"></i> 导出</el-dropdown-item> -->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -526,6 +526,9 @@ export default { ...@@ -526,6 +526,9 @@ export default {
this.MsgBus.$off('sceneSave'); this.MsgBus.$off('sceneSave');
}, },
methods: { methods: {
handleCommand(command){
this.$message.warning('功能正在开发中~');
},
changeWhere(item){ changeWhere(item){
this.msg.ID = item.ID this.msg.ID = item.ID
this.sceneID = item.ID this.sceneID = item.ID
......
src/main.js
View file @ 0721495e
...@@ -21,6 +21,8 @@ import 'xe-utils' ...@@ -21,6 +21,8 @@ import 'xe-utils'
import vueQuillEditor from 'vue-quill-editor' import vueQuillEditor from 'vue-quill-editor'
import 'quill/dist/quill.core.css' import 'quill/dist/quill.core.css'
import 'quill/dist/quill.snow.css' import 'quill/dist/quill.snow.css'
import pinyin from 'pinyin'
Vue.prototype.pinyin = pinyin
// import VXETable from 'vxe-table' // import VXETable from 'vxe-table'
// import 'vxe-table/lib/index.css' // import 'vxe-table/lib/index.css'
// import tinymce from 'tinymce/tinymce' // import tinymce from 'tinymce/tinymce'
......
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