Skip to content

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

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

parents 2c009371 38441573
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 55 deletions
src/components/clueManagement/clueComponent.vue
View file @ c491eb9f
......@@ -4,7 +4,8 @@
.el-table__fixed-body-wrapper table {
padding-bottom: 8px !important;
}
.clueTitle{
.clueTitle {
padding: 20px 20px 0 20px;
}
</style>
......@@ -66,7 +67,7 @@
</div>
</div>
</div>
<el-select size="mini" popper-class="select-no" slot="reference" v-model="msg.ID"
placeholder="请选择">
<el-option v-for="item in SceneEmployeeList" :key="item.ID" :label="item.SceneName"
......@@ -159,7 +160,8 @@
<el-table-column prop="PersonChargeStr" label="负责人" sortable
v-if="queryType[8].show && msg.CustomerType === 1" show-overflow-tooltip width="90">
</el-table-column>
<el-table-column prop="CreateByStr" label="创建人" sortable v-if="queryType[9].show" show-overflow-tooltip width="90">
<el-table-column prop="CreateByStr" label="创建人" sortable v-if="queryType[9].show" show-overflow-tooltip
width="90">
</el-table-column>
<el-table-column prop="UpdateTime" label="上次更新时间" sortable v-if="queryType[10].show"
show-overflow-tooltip>
......@@ -203,7 +205,7 @@
<el-drawer :with-header="false" size='70%' :visible.sync="isShowCustomerInfo" direction="rtl"
:before-close="handleClose">
<customerInfoBox :CustomerId="CustomerId" @transferS="transfer" @deleteClue="deleteClue" @watersS="waters"
@editCustS="editCust" @getList="getList" :activeNameNum="activeNameNum" :receiptType="receiptType"/>
@editCustS="editCust" @getList="getList" :activeNameNum="activeNameNum" :receiptType="receiptType" />
</el-drawer>
<el-drawer :with-header="false" size='70%' :visible.sync="isShowGuestInfo" direction="rtl"
:before-close="handleClose">
......@@ -252,13 +254,13 @@
import guestInfoBox from "./guestInfoBox";
import importDialogBox from "./importDialogBox";
export default {
props:{
isDrawer:{
type:Boolean,
props: {
isDrawer: {
type: Boolean,
default: false,
},
queryTime:{
type:Object,
queryTime: {
type: Object,
default: null
}
},
......@@ -281,12 +283,12 @@
},
data() {
return {
receiptType:{
ReFinanceId:"",
ReFinanceId2:"",//单据类型
RelevanceFrId:"",//1机票 2签证 3地接 4套餐 5其他
receiptType: {
ReFinanceId: "",
ReFinanceId2: "", //单据类型
RelevanceFrId: "", //1机票 2签证 3地接 4套餐 5其他
},
activeNameNum:"1",
activeNameNum: "1",
ruleList: [],
guestDialogBoxShow: false,
isShowGuestInfo: false, //是否显示直客弹窗
......@@ -382,9 +384,9 @@
CustomerIds: [],
EmpId: '',
},
CustomerTypeText:"",// 线索名称搜索
CustomerTypeText: "", // 线索名称搜索
msg: {
KeyWord:'',
KeyWord: '',
CustomerName: '',
Contact: '',
pageIndex: 1,
......@@ -451,9 +453,9 @@
done();
},
// 查看详情
seeDetails(row){
seeDetails(row) {
this.drawer = true
this.queryTime = this.msg.YearStr+'-'+row.DateStr
this.queryTime = this.msg.YearStr + '-' + row.DateStr
},
changeWhere(item) {
this.msg.ID = item.ID
......@@ -521,7 +523,7 @@
if (type === 1) {
tips = '是否把线索“' + this.CustomerName + '”删除？'
this.multipleSelection.push(this.CustomerId)
}
}
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -532,7 +534,8 @@
str = str + x + ','
})
this.apipost('/api/Customer/DelCustomerClue', {
CustomerIds: str.substring(0, str.length - 1)
CustomerIds: str.substring(0, str.length - 1),
CustomerType: this.msg.CustomerType
}, res => {
if (res.data.resultCode == 1) {
if (type === 1) {} {
......@@ -684,7 +687,11 @@
},
openDetails(scope) {
this.CustomerId = scope.row.CustomerId
this.CustomerName = scope.row.CustomerName
if (this.msg.CustomerType == 0) {
this.CustomerName = scope.row.CustomerName;
} else if (this.msg.CustomerType == 1) {
this.CustomerName = scope.row.ClueName;
}
if (this.msg.CustomerType === 0) {
this.isShowCustomerInfo = true
} else {
......@@ -711,26 +718,24 @@
done();
},
getList: function (isclose) {
if(isclose&&isclose==1)
{
this.isShowGuestInfo=false;
if (isclose && isclose == 1) {
this.isShowGuestInfo = false;
}
if(this.msg.CustomerType!=1){
if (this.msg.CustomerType != 1) {
this.msg.CustomerName = this.CustomerTypeText
this.msg.KeyWord=""
}else{
this.msg.KeyWord = ""
} else {
this.msg.KeyWord = this.CustomerTypeText
this.msg.CustomerName=""
this.msg.CustomerName = ""
}
this.tableData = []
this.loading = true
let url
if(!this.isDrawer){
if (!this.isDrawer) {
url = '/api/Customer/GetCustomerCluePage'
}else{
this.msg.StartTime = this.queryTime&&this.queryTime.StartTime
this.msg.EndTime = this.queryTime&&this.queryTime.EndTime
} else {
this.msg.StartTime = this.queryTime && this.queryTime.StartTime
this.msg.EndTime = this.queryTime && this.queryTime.EndTime
url = '/api/Customer/GetCustomerClueAllPage'
}
this.apipost(url, this.msg, res => {
......
src/components/clueManagement/customerInfoBox.vue
View file @ c491eb9f
......@@ -89,8 +89,7 @@
</el-button>
<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="g"><i class="iconfont icongonghaiguanli"></i>转化为客户</el-dropdown-item>
<el-dropdown-item command="d"><i class="iconfont icondelete"></i> 删除</el-dropdown-item>
<el-dropdown-item command="w"><i class="iconfont icondelete"></i> 无效线索</el-dropdown-item>
</el-dropdown-menu>
......
src/components/clueManagement/guestInfoBox.vue
View file @ c491eb9f
......@@ -99,7 +99,8 @@
<div class="top-info">
<el-row class="margin-bottom-25">
<el-col :span="12">
<span class="info-lable">客户级别：</span><span>{{detailsData.CustomerIdLevelStr?detailsData.CustomerIdLevelStr:"--"}}</span>
<span
class="info-lable">客户级别：</span><span>{{detailsData.CustomerIdLevelStr?detailsData.CustomerIdLevelStr:"--"}}</span>
</el-col>
<el-col :span="12">
<span
......@@ -188,7 +189,7 @@
methods: {
//刷新父页面
refreshParentPage() {
this.$emit('getList',1);
this.$emit('getList', 1);
},
init() {
this.apipost('/api/Customer/GetAllGuesstCustomerModel', {
......@@ -233,6 +234,8 @@
this.$emit('transferS', 3);
} else if (command === 'g') {
} else if (command === 'd') {
this.$emit('deleteClue', 1)
}
//无效线索弹窗
else if (command === 'w') {
......@@ -242,7 +245,7 @@
handleClick(tab, event) {},
//编辑直客信息
editGuestInfo() {
this.$emit('editCustS', 2)
this.$emit('editCustS', 2)
},
handleClose(done) {
done();
......
src/components/customerManage/ManageConfiguration.vue
View file @ c491eb9f
......@@ -120,8 +120,7 @@
})
},
beforeDestroy() {
this.MsgBus.$off('sceneSave');
this.MsgBus.$off('editScene');
},
methods: {
saveNow() {
......
src/components/customerManage/orderList.vue
View file @ c491eb9f
......@@ -137,7 +137,8 @@
(item.OrderStatus=='2'?'two':
(item.OrderStatus=='3'?'three':
(item.OrderStatus=='4'?'four':
(item.OrderStatus=='5'?'five':(item.OrderStatus=='6'?'six':'')))))">
(item.OrderStatus=='5'?'five':
(item.OrderStatus=='6'?'six':'')))))">
<span>{{item.OrderStatusName}}</span>
</div>
</td>
......@@ -1807,7 +1808,7 @@ li {
background-color: rgba(255,111,0,.2);
}
.Order-list-Status.five{
color: rgb(197,225,165);
color: rgb(33,186,69);
background-color: rgba(97,225,165,.2);
}
.Order-list-Status.six{
......
src/components/guestManagement/Agreement.vue
View file @ c491eb9f
......@@ -172,8 +172,12 @@
background-color: rgba(255,111,0,.2);
}
.OrderType-text.five{
color: rgb(197,225,165);
background-color: rgba(97,225,165,.2);
color: rgb(33,186,69);
background-color: rgba(33,186,69,.2);
}
.Order-list-Status.six{
color: rgb(102,187,106);
background-color: rgba(102,187,106,.2);
}
</style>
<template>
......@@ -366,7 +370,8 @@
(scope.row.OrderStatus=='2'?'two':
(scope.row.OrderStatus=='3'?'three':
(scope.row.OrderStatus=='4'?'four':
(scope.row.OrderStatus=='5'?'five':''))))">
(scope.row.OrderStatus=='5'?'five':
(scope.row.OrderStatus=='6'?'six':'')))))">
<span>{{scope.row.OrderStatusName}}</span>
</div>
</template>
......
src/views/workstatistics/dayStatistics.vue
View file @ c491eb9f
......@@ -127,7 +127,6 @@
"/api/ClueStatic/GetClueDay",
this.msg,
(res) => {
console.log(res);
this.loading = false;
this.tableData = res.data.data;
},
......@@ -172,17 +171,14 @@
changeMonthHandler(val) {
this.msg.YearStr = val.getFullYear();
this.msg.MonthStr = val.getMonth() + 1;
console.log(this.msg);
this.init();
},
handleCommand(command) {
console.log(command);
if (command == "1") {
this.downloadHandler();
}
},
downloadHandler() {
console.log("点击了");
this.GetLocalFile(
"/api/ClueStatic/DownLoadClueDay",
this.msg,
......
src/views/workstatistics/monthStatistics.vue
View file @ c491eb9f
......@@ -236,7 +236,6 @@
return row[column.property] + "%";
},
handleCommand(command) {
console.log(command);
if (command == "1") {
if (this.activeName == "monthdata") {
this.downloadHandler(
......@@ -252,7 +251,6 @@
}
},
downloadHandler(url, name) {
console.log("点击了");
this.GetLocalFile(url, this.msg, `${name}.xls`, (res) => {
this.$message({
message: "导出成功",
......
src/views/workstatistics/yearStatistics.vue
View file @ c491eb9f
......@@ -138,13 +138,11 @@ export default {
return row[column.property] + "%";
},
handleCommand(command) {
console.log(command);
if (command == "1") {
this.downloadHandler();
}
},
downloadHandler() {
console.log("点击了");
this.GetLocalFile(
"/api/ClueStatic/DownLoadClueDay",
this.msg,
......@@ -158,7 +156,6 @@ export default {
);
},
handleCommand(command) {
console.log(command);
if (command == "1") {
if (this.activeName == "monthdata") {
this.downloadHandler(
......@@ -174,7 +171,6 @@ export default {
}
},
downloadHandler(url, name) {
console.log("点击了");
this.GetLocalFile(url, this.msg, `${name}.xls`, (res) => {
this.$message({
message: "导出成功",
......
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