Skip to content

S
SuperMan
Commit d9d80734 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents b39bf65d d413f172
Show whitespace changes
Inline Side-by-side
Showing with 1243 additions and 1277 deletions
src/components/FinancialModule/FinancialDocuments.vue
View file @ d9d80734
......@@ -1924,7 +1924,6 @@
Type: fileTypeNumber,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
console.log("this.importData[this.importDataIndex]",this.importData[this.importDataIndex]);
this.$message.success(this.$t('tips.scchenggong'))
}, 1);
},
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ d9d80734
......@@ -2706,7 +2706,6 @@
if(data.Type==2&&data.HelpBranchId>-1){
this.ClientBankAccountTop=1;
}
console.log("this.ClientBankAccountTop",this.ClientBankAccountTop);
this.clientBankAccountData={
AccountHolder:data.AccountHolder,
AccountNumber:data.AccountNumber,
......
src/components/FinancialModule/HelpBranch/components/bindListData.vue
View file @ d9d80734
......@@ -242,7 +242,6 @@
let OriginalMoneyClosed = 0
let HandlingChargeMoneyClosed = 0
this.frIds= this.dataList.map(row => row.FrID).join(',')
console.log(" this.frIds",this.frIds);
this.dataList.forEach(x=>{
if(x.Type==2){
......
src/components/FinancialModule/MonthlyCostStatement/components/selectListData.vue
View file @ d9d80734
......@@ -242,8 +242,8 @@
});
}else{
let orderObj = {
CostType: this.OriginalMoneyClosed!=0?1547:null,
CostType2: this.isHandlingChargeThe!=0?1547:null,
CostType: this.OriginalMoneyClosed!=0?1863:null,
CostType2: this.isHandlingChargeThe!=0?1863:null,
CostType3: this.isHandlingChargeThe!=0&&this.balanceMoney!=0?114:null,//114转账手续费
HandlingChargeMoney: this.isHandlingChargeThe!=0?this.HandlingChargeMoneyThe:null,//手续费
balanceMoney: this.isHandlingChargeThe!=0&&this.balanceMoney!=0?this.balanceMoney:null,//差额
......@@ -259,7 +259,7 @@
name: 'ChoiceAddFinancialDocuments',
query: {
'Type': 1,
'searchTitle': '月结',
'searchTitle': '月结到账',
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
}
......
src/components/FinancialModule/MonthlyCostStatement/index.vue
View file @ d9d80734
......@@ -43,18 +43,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="制单人员：">
<el-select filterable v-model='msg.UpdateBy' class="">
......@@ -91,7 +79,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<!-- <el-col :span="4">
<el-form-item :label="$t('fnc.dxleixing')">
<el-select filterable v-model='msg.ClientType'
@change="ClaerClientAccountList(),msg.ClientID=''" class="">
......@@ -100,7 +88,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="4">
<el-form-item :label="$t('fnc.fkduixiang')">
<el-select
......@@ -123,17 +111,6 @@
</span>
</div>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="排序：">
<el-select filterable v-model='msg.Sort' >
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="0" value="0" label="团期"></el-option>
<el-option key="1" value="1" label="汇款日期"></el-option>
<el-option key="2" value="2" label="单号"></el-option>
<el-option key="3" value="3" label="交易流水号"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -207,7 +184,7 @@
<el-option key="66" value="66" label="门票"></el-option>
<el-option key="67" value="67" label="车辆"></el-option>
<el-option key="62" value="62" label="签证"></el-option>
<el-option key="5" value="5" label="日本车行"></el-option>
<el-option key="80" value="80" label="日本车行"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -216,6 +193,29 @@
<el-input v-model="msg.ReFinanceId"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="排序：">
<el-select filterable v-model='msg.Sort' >
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="0" value="0" label="团期"></el-option>
<el-option key="1" value="1" label="汇款日期"></el-option>
<el-option key="2" value="2" label="单号"></el-option>
<el-option key="3" value="3" label="交易流水号"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="备注查询：">
<el-input v-model="msg.Remark"></el-input>
......
src/components/FinancialModule/RecPayQuery.vue
View file @ d9d80734
......@@ -1209,7 +1209,6 @@
this.HelpBranchMsg.HelpBranchId = item.HelpBranchId;
this.HelpBranchMsg.Type=item.Type;
this.HelpBranchMsg.RB_Branch_Id=item.RB_Branch_Id;
console.log("item",item);
if(item.Type==1){
this.dialogTitle="修改代收公司";
this.dialogTitle1="代收公司";
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ d9d80734
......@@ -1872,7 +1872,6 @@
let feeObj = this.msg.detailList.find(x=>{
return x.CostTypeId==114 && x.CurrencyId==3 && (x.UnitPrice==550 || x.UnitPrice==275 ||x.UnitPrice==183 ||x.UnitPrice==184 ||x.UnitPrice==137.5)
})
console.log(this.msg.detailList);
if(feeObj){
confirmMsg.push("从2024.1.1起制单，对于转账手续费将从原单剥离，系统自动生成独立手续费关联单据！");
}
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ d9d80734
......@@ -1561,6 +1561,7 @@
//从电商过来的参数处理
this.msg.OrderSource = this.orderObj.OrderSource ? this.orderObj.OrderSource : 0;
this.msg.OtherType = this.orderObj.OtherType ? this.orderObj.OtherType : 0;
this.msg.ReFinanceIds = this.orderObj.ReFinanceIds ? this.orderObj.ReFinanceIds : '';
this.msg.ReFinanceId = this.orderObj.ReFinanceId ? this.orderObj.ReFinanceId : 0;
this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2 ? this.orderObj.ReFinanceId2 : 0;
this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : [];
......@@ -1649,8 +1650,6 @@
},
Financial_post_Set(){
console.log(this.msg,'=====------msg')
// return
this.loading = true;
this.apipost('Financial_post_Set', this.msg, res => {
if (res.data.resultCode == 1) {
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ d9d80734
......@@ -701,6 +701,7 @@
<th width="100">备注</th>
<th width="110">成本单据</th>
</tr>
<template v-for='(item,index) in list.ScenicList'>
<template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
<tr v-for="(childItem,childIndex) in subItem.TicketPriceList">
......@@ -887,12 +888,13 @@
<tr>
<th width="140">团号</th>
<th>预付合计</th>
<th>提示</th>
<th>实际领款</th>
<th>财务单号</th>
<th>操作</th>
</tr>
<tr v-for='(item, index) in nav'>
<td>{{item.TCNUMS}}</td>
<td>{{item.TCNUMS}} </td>
<td :rowspan="nav.length * CurrencyListMoney.length" width="180" v-if="index===0">总金额：
<span v-for="(cur,index) in CurrencyListMoney" :key="index+5000">{{moneyFormat(cur.money)}}
<span v-if="cur.CurrencyId>0"> (
......@@ -903,7 +905,29 @@
{{currencyTypeObj[cur.CurrencyId]}}
</template>
) </span>
<br /></span>
</span>
</td>
<td :rowspan="nav.length * CurrencyListMoney.length" width="280" v-if="index===0"
style="text-align:left;padding-left:5px;">
<span>注意：</span><br />
<span>1、合团的请分别领款;</span> <br />
<span>2、如需日本PIC付款，请选择PIC相关付款流程，请注意日本转账手续费;</span><br />
<span v-for="(cur,index) in CurrencyListMoney" :key="index+6000">
<template
v-if="cur.LeaderGetPriceArr&&cur.LeaderGetPriceArr.length>0 && cur.LeaderGetPriceArr[0].ShowTotalPrice">
<span>3、合计领款不能超过:<font style="color:red;font-weight:bold">
{{moneyFormat(cur.LeaderGetPriceArr[0].ShowTotalPrice)}}
<span v-if="cur.CurrencyId>0">(
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{currencyTypeObj[cur.CurrencyId]}}
</template>
);</span>
</font></span>
</template>
</span>
</td>
<td style="padding: 5px 20px;">
<div style="margin:10px 0" v-for="cur in CurrencyListMoney">
......@@ -922,15 +946,10 @@
) </span>
</span>
</p>
<!-- <el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number"
v-model="leadr.LeaderGetPriceT" @input="changePrice"></el-input> -->
<el-input class="w300" type="number" v-model="leadr.LeaderGetPriceT" @input="changePrice"></el-input>
</template>
</div>
<span style="color:red;font-weight:bold;">
注意：<span>1、合团的请分别领款!</span> <span style="margin-left: 20px;">2、如需日本PIC付款，请选择PIC相关付款流程，请注意日本转账手续费</span>
</span>
</td>
<td>
<p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration"
......@@ -949,7 +968,7 @@
<div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
<el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
<input type="button" value="制单" class="normalBtn" @click="goZhiDan(item,0,leadr,cur)" />
<input type="button" value="制单" class="normalBtn" @click="goDiJieZhiDan(item,0,leadr,cur)" />
</el-tooltip>
</template>
</div>
......@@ -958,15 +977,13 @@
<div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
<input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn"
@click="goZhiDan(item, 2)" />
<template v-if="item.hideZDBtn && ContractUrlCount == 0">
@click="goDiJieZhiDan(item, 2)" />
<template v-if="item.hideZDBtn ">
<el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
<input type="button" value="制单" class="normalBtn" @click="goZhiDan(item,0,leadr,cur)" />
<input type="button" value="制单" class="normalBtn" @click="goDiJieZhiDan(item,0,leadr,cur)" />
</el-tooltip>
</template>
<template v-else-if="ContractUrlCount !== 0 && index2==0">
<span>未上传现付、刷卡的酒店手配书无法制单</span>
</template>
<template v-else-if="!item.hideZDBtn && index2==0">
<span>超过五天时间限制，无法制单</span>
</template>
......@@ -1141,7 +1158,11 @@
fileName += ".xls"
this.loading = true;
let userInfo = this.getLocalStorage();
this.GetLocalFile("dmcstatistics_post_NewDownLoadGroupLeaderUserMoneyPlan",{TCIDs: this.$route.query.id,uid:userInfo.EmployeeId,NewCombinationNum:this.NewCombinationNum}, fileName, res => {
this.GetLocalFile("dmcstatistics_post_NewDownLoadGroupLeaderUserMoneyPlan", {
TCIDs: this.$route.query.id,
uid: userInfo.EmployeeId,
NewCombinationNum: this.NewCombinationNum
}, fileName, res => {
this.loading = false;
});
},
......@@ -1490,11 +1511,6 @@
id = [98, 99];
} else {
id = [43, 48, 56, 53, 245, 246];
// if (obj.OutBranchId === 0) {
// id = [43, 48, 245, 246];
// } else {
// id = [56, 53, 245, 246];
// }
}
this.$router.push({
name: "ChoiceAddFinancialDocuments",
......@@ -1508,18 +1524,35 @@
}
});
},
goZhiDan: function (obj, num, leadr, cur) {
goDiJieZhiDan: function (obj, num, leadr, cur) {
let totailMoney = (Number(leadr.LeaderGetPriceT) + Number(cur.yiLing)).toFixed(2);
let leadrPlanPrice = 0;
if (leadr && leadr.PlanPrice) {
leadrPlanPrice = leadr.PlanPrice.toFixed(2);
}
if (!num) {
if (totailMoney > leadrPlanPrice)
// return this.$message.error("最大领款为预付合计金额的95%！");
if (!leadr.LeaderGetPriceT || leadr.LeaderGetPriceT <= 0)
if (totailMoney > leadrPlanPrice) {
if (!leadr.LeaderGetPriceT || leadr.LeaderGetPriceT <= 0) {
return this.$message.error("请输入金额！");
}
}
}
if (this.CurrencyListMoney && this.CurrencyListMoney.length > 0) {
var totalUseMoney = 0; //总领款金额
var totalUsePercentMoney = 0; //总计划领款金额
this.CurrencyListMoney.forEach(rootItem => {
if (rootItem.LeaderGetPriceArr && rootItem.LeaderGetPriceArr.length > 0) {
rootItem.LeaderGetPriceArr.forEach(sitem => {
totalUsePercentMoney = sitem.ShowTotalPrice;
totalUseMoney += Number(sitem.LeaderGetPriceT);
});
}
});
if (totalUseMoney > 0 && totalUsePercentMoney > 0 && totalUseMoney > totalUsePercentMoney) {
this.$message.error("总领款金额不能超过【" + totalUsePercentMoney + "】");
return;
}
}
if (this.list.hotelNoSureInfo !== "") {
this.$confirm(
`${this.list.hotelNoSureInfo},是否去制单？`,
......@@ -1761,6 +1794,7 @@
this.CurrencyListMoney.push(obj);
});
}
var isreceive = 0;//是否领取过用款（1-领取过，0-未领取)
this.CurrencyListMoney.forEach((cur, i) => {
cur.yiLing = 0;
cur.LeaderGetPriceArr = [];
......@@ -1769,6 +1803,7 @@
CurrencyId: cur.CurrencyId,
LeaderGetPrice: 0,
LeaderGetPriceT: 0,
ShowTotalPrice: 0,
TCNUMS: x.TCNUMS,
TCIDS: x.TCIDS
};
......@@ -1781,11 +1816,22 @@
});
cur.LeaderGetPriceArr.push(obj);
});
if (cur.yiLing > 0) {
isreceive = 1;
}
});
this.CurrencyListMoney.forEach((cur, i) => {
cur.LeaderGetPriceArr.forEach(lead => {
var tempMoney = (cur.money * this.comRate - cur.yiLing);
if (lead.LeaderGetPrice == 0) {
var tempShowPrice = cur.money * this.comRate;
//日本
if (this.myLineId == 14) {
tempShowPrice = Math.round(tempShowPrice / 10000) * 10000;
} else {
tempShowPrice = Math.round(tempShowPrice / 100) * 100;
}
//未领取，日本线 *0.95 在精确到万
if (isreceive == 0) {
if (this.myLineId == 14) {
lead.LeaderGetPriceT = Math.round(tempMoney / 10000) * 10000;
} else {
......@@ -1793,12 +1839,14 @@
lead.LeaderGetPriceT = Math.round(tempMoney / 10000) * 10000;
}
} else {
//领取过，直接用计划金额(精确到万)-已领取的金额
if (this.myLineId == 14) {
lead.LeaderGetPriceT = Math.round(tempMoney * 100) / 100;
lead.LeaderGetPriceT = tempShowPrice-cur.yiLing;
} else {
lead.LeaderGetPriceT = Math.round(tempMoney * 100) / 100;
lead.LeaderGetPriceT = tempShowPrice-cur.yiLing;
}
}
lead.ShowTotalPrice = tempShowPrice;
lead.PlanPrice = cur.money * this.comRate;
});
});
......
src/components/SalesModule/customerTransfer.vue
View file @ d9d80734
......@@ -7,21 +7,11 @@
<em>{{$t('visaT.sale')}}</em>
</span>
<!-- <el-select filterable v-model="msg.CreateBy"> -->
<el-select
v-model="msg.CreateBy" class="w150"
filterable
remote
reserve-keyword
placeholder="请输入关键词"
:remote-method="GetClientAccountListByKeyWord"
>
<el-select v-model="msg.CreateBy" class="w150" filterable remote reserve-keyword placeholder="请输入关键词"
:remote-method="GetClientAccountListByKeyWord">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option
v-for="item in employeeList"
:label="item.name"
:value="item.empId"
:key="item.empId"
> <div>
<el-option v-for="item in employeeList" :label="item.name" :value="item.empId" :key="item.empId">
<div>
<span>{{`${item.name}`}}</span>
<span style="margin-left: 15px;">
<el-tag size="mini" v-if="item.isLeave==1">离职</el-tag>
......@@ -44,10 +34,7 @@
</span>
<el-select filterable class='multiple_input' v-model='msg.Brand' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for='item in CustomerBrandList'
:label='item.name'
:value='item.id'
:key='item.id'>
<el-option v-for='item in CustomerBrandList' :label='item.name' :value='item.id' :key='item.id'>
</el-option>
</el-select>
</li>
......@@ -55,7 +42,8 @@
<span>
<em>关联状态</em>
</span>
<el-select filterable class='multiple_input' v-model='msg.OperationStatus ' :placeholder="$t('pub.pleaseSel')">
<el-select filterable class='multiple_input' v-model='msg.OperationStatus '
:placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
<el-option label="正常" :value="1"></el-option>
<el-option label="释放" :value="2"></el-option>
......@@ -78,7 +66,8 @@
<span>
<em>是否异常</em>
</span>
<el-select filterable class='multiple_input' v-model='msg.ExceptionCount ' :placeholder="$t('pub.pleaseSel')">
<el-select filterable class='multiple_input' v-model='msg.ExceptionCount '
:placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="2"></el-option>
......@@ -88,54 +77,29 @@
<span class="fl mt10">
<em>{{$t('admin.admin_Department')}}</em>
</span>
<treeselect
class="w200 fl"
:options="departmentList"
@select="getEmployeeList"
v-model="DepartmentId"
:placeholder="$t('pub.unlimitedSel')"
:normalizer="normalizer"
/>
<treeselect class="w200 fl" :options="departmentList" @select="getEmployeeList" v-model="DepartmentId"
:placeholder="$t('pub.unlimitedSel')" :normalizer="normalizer" />
</li>
<li style="float:right;padding-top:10px;color:#111111">{{$t('salesModule.JYETJ')}}：{{datainfo.sumMoney}}</li>
<li>
<input
type="button"
class="hollowFixedBtn"
:value="$t('ground.kehuditu')"
@click="getMap()"
>
<input
type="button"
class="hollowFixedBtn"
:value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()"
>
<el-popover width="280" v-model="layerShow" popper-class="pd20" trigger="click"
@show="employeeMsg.KeyWord=''" @hide="employeeMsg.KeyWord=''">
<input type="button" class="hollowFixedBtn" :value="$t('ground.kehuditu')" @click="getMap()">
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()">
<el-popover width="280" v-model="layerShow" popper-class="pd20" trigger="click" @show="employeeMsg.KeyWord=''"
@hide="employeeMsg.KeyWord=''">
<div>
<p class="fz12 fbold mt10 color333">{{$t('fnc.zhuanjiao')}}</p>
<p class="fz12 mt30 color666">
<span>{{$t('salesModule.Recipient')}}</span>&nbsp;
<el-select
v-model="RecipientMsg.NewEmployeeId" class="w180"
filterable
remote
reserve-keyword
placeholder="请输入关键词"
:remote-method="GetClientAccountListByKeyWord1"
>
<el-option
v-for="item in employeeList1"
:label="item.name"
:value="item.empId"
:key="item.empId"
><div>
<el-select v-model="RecipientMsg.NewEmployeeId" class="w180" filterable remote reserve-keyword
placeholder="请输入关键词" :remote-method="GetClientAccountListByKeyWord1">
<el-option v-for="item in employeeList1" :label="item.name" :value="item.empId" :key="item.empId">
<div>
<span>{{`${item.name}`}}</span>
<span style="margin-left: 15px;">
<el-tag size="mini" v-if="item.isLeave==1">离职</el-tag>
</span>
</div></el-option>
</div>
</el-option>
</el-select>
</p>
<p class="fz12 mt30 color666">
......@@ -146,26 +110,16 @@
<input type="button" @click="save()" class="normalBtn mt30" :value="$t('salesModule.MassTransfer')">
</p>
</div>
<input
slot="reference"
type="button"
class="normalBtn"
:value="$t('salesModule.MassTransfer')"
@click="RecipientMsg.NewEmployeeId='',RecipientMsg.Remarks=''"
>
<input slot="reference" type="button" class="normalBtn" :value="$t('salesModule.MassTransfer')"
@click="RecipientMsg.NewEmployeeId='',RecipientMsg.Remarks=''">
</el-popover>
</li>
</ul>
</div>
<div class="clearfix"></div>
<div class="_customerTransferTable" :class="addShow==true?'_edHeight':''">
<table
class="customerTransferTable customerTransferTable2 mt20"
border="0"
cellspacing="0"
cellpadding="0"
v-loading="loading"
>
<table class="customerTransferTable customerTransferTable2 mt20" border="0" cellspacing="0" cellpadding="0"
v-loading="loading">
<tr>
<th width="14%">{{$t('salesModule.storeName')}}
<!--<label><input type="checkbox" v-model="isCkedAll" @click='checkedAll()' style="vertical-align: middle;"/>门店名称</label>-->
......@@ -182,8 +136,9 @@
{{$t('fnc.jiaoyie')}}
</div>
<div class="width15 ">
<p class=" _bold el-icon-caret-top sort-icon-top" :class="{sortActive: msg.jySort === 'asc'}" ></p>
<p class=" _bold el-icon-caret-bottom sort-icon-bottom" :class="{sortActive: msg.jySort === 'desc'}" ></p>
<p class=" _bold el-icon-caret-top sort-icon-top" :class="{sortActive: msg.jySort === 'asc'}"></p>
<p class=" _bold el-icon-caret-bottom sort-icon-bottom" :class="{sortActive: msg.jySort === 'desc'}">
</p>
</div>
</div>
</th>
......@@ -194,7 +149,8 @@
</div>
<div class="width15 cursorpointer">
<p class=" _bold el-icon-caret-top sort-icon-top" :class="{sortActive: msg.rtsSort === 'asc'}"></p>
<p class=" _bold el-icon-caret-bottom sort-icon-bottom" :class="{sortActive: msg.rtsSort === 'desc'}"></p>
<p class=" _bold el-icon-caret-bottom sort-icon-bottom" :class="{sortActive: msg.rtsSort === 'desc'}">
</p>
</div>
</div>
</th>
......@@ -209,15 +165,10 @@
<tr v-for="(item,index) in list">
<td>
<label>
<input
:disabled="item.disabled"
type="checkbox"
:value="item.CustomerId"
v-model="customerList"
@change="ckeckedOne"
style="vertical-align: middle;"
>
{{item.CustomerName}}<i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i>
<input :disabled="item.disabled" type="checkbox" :value="item.CustomerId" v-model="customerList"
@change="ckeckedOne" style="vertical-align: middle;">
{{item.CustomerName}}<i class="iconfont icon-shimingrenzheng"
:class="{'_class_b': item.RealNameAuthentication===1}"></i>
</label>
<el-popover width="280" popper-class="pd20" trigger="click">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
......@@ -248,7 +199,8 @@
<td>{{item.TotalGuestNum}}</td>
<td>{{item.CL_Balance}}</td>
<td>
<span style="cursor: pointer;text-decoration: underline;" @click.stop="goUrC('CouponsList',item.CustomerAccountId)">
<span style="cursor: pointer;text-decoration: underline;"
@click.stop="goUrC('CouponsList',item.CustomerAccountId)">
{{item.CouponNum}}
</span>
</td>
......@@ -258,8 +210,8 @@
<td>
<el-button-group>
<el-tooltip effect="dark" :content="$t('fnc.zhuanjiao')" placement="top-start">
<el-popover width="280" popper-class="pd20" trigger="click"
@show="employeeMsg.KeyWord=''" @hide="employeeMsg.KeyWord=''">
<el-popover width="280" popper-class="pd20" trigger="click" @show="employeeMsg.KeyWord=''"
@hide="employeeMsg.KeyWord=''">
<div>
<p class="fz12 fbold mt10 color333">{{$t('fnc.zhuanjiao')}}</p>
<p class="fz12 mt30 color666">
......@@ -270,25 +222,17 @@
v-model="RecipientMsg.NewEmployeeId"
:placeholder="$t('pub.pleaseSel')"
> -->
<el-select
v-model="RecipientMsg.NewEmployeeId" class="w150"
filterable
remote
reserve-keyword
placeholder="请输入关键词"
:remote-method="GetClientAccountListByKeyWord1"
>
<el-option
v-for="item in employeeList1"
:label="item.name"
:value="item.empId"
:key="item.empId"
><div>
<el-select v-model="RecipientMsg.NewEmployeeId" class="w150" filterable remote reserve-keyword
placeholder="请输入关键词" :remote-method="GetClientAccountListByKeyWord1">
<el-option v-for="item in employeeList1" :label="item.name" :value="item.empId"
:key="item.empId">
<div>
<span>{{`${item.name}`}}</span>
<span style="margin-left: 15px;">
<el-tag size="mini" v-if="item.isLeave==1">离职</el-tag>
</span>
</div></el-option>
</div>
</el-option>
</el-select>
</p>
<p class="fz12 mt30 color666">
......@@ -299,143 +243,67 @@
<input type="button" class="normalBtn mt30" @click="save" :value="$t('fnc.zhuanjiao')">
</p>
</div>
<el-button slot="reference" @click="singeleCked(item)" type="success" class="iconfont icon-zhuanjiao1 fist-bottom"></el-button>
<el-button slot="reference" @click="singeleCked(item)" type="success"
class="iconfont icon-zhuanjiao1 fist-bottom"></el-button>
</el-popover>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
:content="$t('system.table_edit')"
placement="top-start"
>
<el-button
v-if="bossID===1 || bossID===5"
type="primary"
class
icon="el-icon-edit"
circle
@click="updateData(item)"
></el-button>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button v-if="bossID===1 || bossID===5" type="primary" class icon="el-icon-edit" circle
@click="updateData(item)"></el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
:content="$t('system.table_delete')"
placement="top-start"
>
<el-button
v-if="bossID===1 || bossID===5"
type="danger"
class
icon="el-icon-delete"
circle
@click="deletelist(item)"
></el-button>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button v-if="bossID===1 || bossID===5" type="danger" class icon="el-icon-delete" circle
@click="deletelist(item)"></el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
:content="$t('salesModule.BlackList')"
placement="top-start"
>
<el-button
v-if="item.CustomerStatus == 2"
type="warning"
class
icon="iconfont icon-jiaruheimingdan"
circle
@click="getBlacklist(item)"
>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.BlackList')" placement="top-start">
<el-button v-if="item.CustomerStatus == 2" type="warning" class icon="iconfont icon-jiaruheimingdan"
circle @click="getBlacklist(item)">
</el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
:content="$t('salesModule.RemoveBlackList')"
placement="top-start"
>
<el-button
v-if="item.CustomerStatus == 4"
type="info"
class
icon="iconfont icon-yichuheimingdan"
circle
@click="getBlacklist(item)"
>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.RemoveBlackList')" placement="top-start">
<el-button v-if="item.CustomerStatus == 4" type="info" class icon="iconfont icon-yichuheimingdan" circle
@click="getBlacklist(item)">
</el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
:content="$t('fnc.xiangqing')"
placement="top-start"
>
<el-button @click="getUrl(item)" style="padding: 5px;" type="success" icon="iconfont icon-nav-xiaoshou" ></el-button>
<el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top-start">
<el-button @click="getUrl(item)" style="padding: 5px;" type="success" icon="iconfont icon-nav-xiaoshou">
</el-button>
</el-tooltip>
</el-button-group>
</td>
</tr>
</table>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize"
:total="total"
></el-pagination>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
</div>
<div class="_mc_edit _scrollbar" :class="addShow==true?'edHeightOne':''">
<p class="_tit">
{{$t('salesModule.addCustomer')}}
<span class="fr">
<button class="hollowFixedBtn" type="button" @click="cancelEdit()">{{$t('pub.cancelBtn')}}</button>
<button
type="button"
class="normalBtn"
v-if="allowAdd"
@click="saveVisa()"
>{{$t('pub.saveBtn')}}</button>
<button type="button" class="normalBtn" v-if="allowAdd" @click="saveVisa()">{{$t('pub.saveBtn')}}</button>
</span>
</p>
<el-form
class="_info_box clearfix"
:model="addMsg"
:rules="rules"
ref="addMsg"
label-width="120px"
>
<el-form class="_info_box clearfix" :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
<el-row :gutter="20">
<el-col :span="6">
<el-form-item :label="$t('restaurant.res_ContactNumber')" prop="ContactNumber">
<el-input
:disabled="isOldPerson"
v-model="addMsg.ContactNumber"
@input="searchHistory(addMsg.ContactNumber)"
:placeholder="$t('pub.pleaseImport')"
></el-input>
<el-input :disabled="isOldPerson" v-model="addMsg.ContactNumber"
@input="searchHistory(addMsg.ContactNumber)" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.storeName')" prop="CustomerName">
<el-input
:disabled="isOldPerson"
v-model="addMsg.CustomerName"
:placeholder="$t('pub.pleaseImport')"
maxlength="20"
></el-input>
<el-input :disabled="isOldPerson" v-model="addMsg.CustomerName" :placeholder="$t('pub.pleaseImport')"
maxlength="20"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('hotel.suplier_contact')" prop="Contact">
<el-input
:disabled="isOldPerson"
v-model="addMsg.Contact"
:placeholder="$t('pub.pleaseImport')"
maxlength="20"
></el-input>
<el-input :disabled="isOldPerson" v-model="addMsg.Contact" :placeholder="$t('pub.pleaseImport')"
maxlength="20"></el-input>
</el-form-item>
</el-col>
<el-col :span="6"></el-col>
......@@ -444,28 +312,13 @@
<el-col :span="12">
<el-form-item :label="$t('pub.area')">
<el-select filterable v-model="addMsg.Province" @change="getCity">
<el-option
v-for="item in provinceList"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
<el-option v-for="item in provinceList" :label="item.Name" :value="item.ID" :key="item.ID"></el-option>
</el-select>
<el-select filterable v-model="addMsg.City" @change="getRegion">
<el-option
v-for="item in cityList"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
<el-option v-for="item in cityList" :label="item.Name" :value="item.ID" :key="item.ID"></el-option>
</el-select>
<el-select filterable v-model="addMsg.District">
<el-option
v-for="item in regionList"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
<el-option v-for="item in regionList" :label="item.Name" :value="item.ID" :key="item.ID"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -503,11 +356,7 @@
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.CustomerSource')" prop="CustomerSourceType">
<el-select
filterable
v-model="addMsg.CustomerSourceType"
:placeholder="$t('pub.pleaseSel')"
>
<el-select filterable v-model="addMsg.CustomerSourceType" :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in khly" :label="item.Name" :value="item.ID" :key="item.ID"></el-option>
</el-select>
</el-form-item>
......@@ -528,13 +377,8 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item :label="$t('salesModule.BusinessPhoto')">
<el-upload
class="avatar-uploader"
action
:http-request="uploadImg"
accept="image/jpeg, image/gif, image/png, image/bmp"
:show-file-list="false"
>
<el-upload class="avatar-uploader" action :http-request="uploadImg"
accept="image/jpeg, image/gif, image/png, image/bmp" :show-file-list="false">
<img v-if="BusinessCardPhotos" :src="BusinessCardPhotos" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
......@@ -542,13 +386,8 @@
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.doorPhoto')">
<el-upload
class="avatar-uploader"
action
:http-request="uploadImg1"
accept="image/jpeg, image/gif, image/png, image/bmp"
:show-file-list="false"
>
<el-upload class="avatar-uploader" action :http-request="uploadImg1"
accept="image/jpeg, image/gif, image/png, image/bmp" :show-file-list="false">
<img v-if="HousePhotos" :src="HousePhotos" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
......@@ -556,13 +395,8 @@
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.businessPhoto')">
<el-upload
class="avatar-uploader"
action
:http-request="uploadImg2"
accept="image/jpeg, image/gif, image/png, image/bmp"
:show-file-list="false"
>
<el-upload class="avatar-uploader" action :http-request="uploadImg2"
accept="image/jpeg, image/gif, image/png, image/bmp" :show-file-list="false">
<img v-if="Images" :src="Images" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
......@@ -576,10 +410,12 @@
</template>
<script>
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
components: { Treeselect },
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
components: {
Treeselect
},
data() {
return {
normalizer(node) {
......@@ -590,8 +426,8 @@ export default {
};
},
CustomerException: [],
datainfo:{},
CustomerBrandList:[],
datainfo: {},
CustomerBrandList: [],
DepartmentId: null,
isSelLayer: false,
layerShow: false,
......@@ -601,10 +437,10 @@ export default {
CustomerName: "",
CreateBy: "-1",
DepartmentId: "-1",
Brand:-1,
allDepartment:0,
CustomerStatus:'',
OperationStatus:'',
Brand: -1,
allDepartment: 0,
CustomerStatus: '',
OperationStatus: '',
jySort: 'desc',
rtsSort: '',
orderBy: 'TradeMoney desc',
......@@ -627,7 +463,7 @@ export default {
RB_Branch_id: "-1",
departmentId: "0",
IsLeave: "0",
KeyWord:'',
KeyWord: '',
},
isCkedAll: false,
addShow: false,
......@@ -664,8 +500,7 @@ export default {
City: "",
District: ""
},
defaultImg:
'this.src="' + require("../../assets/img/litheader.png") + '"',
defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"',
BusinessCardPhotos: "",
HousePhotos: "",
Images: "",
......@@ -687,60 +522,90 @@ export default {
},
bossID: "",
rules: {
Contact: [{ required: true, message: "请输入联系人", trigger: "blur" }],
CustomerName: [
{ required: true, message: "请输入客户名", trigger: "blur" }
],
ContactNumber: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
Contact: [{
required: true,
message: "请输入联系人",
trigger: "blur"
}],
CustomerName: [{
required: true,
message: "请输入客户名",
trigger: "blur"
}],
ContactNumber: [{
required: true,
message: "请输入联系电话",
trigger: "blur"
},
{
pattern: this.$commonUtils.Regex.el_ISphone,
message: "请输入正确的电话"
}
],
brandIds: [
{ required: true, message: "请选择所属品牌", trigger: "change" }
],
Duty: [{ required: true, message: "请选择职务", trigger: "change" }],
remark: [{ required: false, message: "请选择职务", trigger: "change" }],
Premises: [
{ required: true, message: "请选择经营场所", trigger: "change" }
],
CustomerSourceType: [
{ required: true, message: "请选择经客户来源", trigger: "change" }
],
CustomerName: [
{ required: true, message: "请输入客户名", trigger: "blur" }
],
Address: [{ required: true, message: "请输入地址", trigger: "blur" }]
brandIds: [{
required: true,
message: "请选择所属品牌",
trigger: "change"
}],
Duty: [{
required: true,
message: "请选择职务",
trigger: "change"
}],
remark: [{
required: false,
message: "请选择职务",
trigger: "change"
}],
Premises: [{
required: true,
message: "请选择经营场所",
trigger: "change"
}],
CustomerSourceType: [{
required: true,
message: "请选择经客户来源",
trigger: "change"
}],
CustomerName: [{
required: true,
message: "请输入客户名",
trigger: "blur"
}],
Address: [{
required: true,
message: "请输入地址",
trigger: "blur"
}]
},
employeeList1: [],
employeeList2: [],
HightUnitPrice:'2',
departState:false,
HightUnitPrice: '2',
departState: false,
};
},
methods: {
changeSort(type, name){
changeSort(type, name) {
if (type == 1) {
this.msg.jySort = this.msg.jySort === '' ? 'desc' : this.msg.jySort === 'desc' ? 'asc' : ''
this.msg.rtsSort = ''
this.msg.orderBy = this.msg.jySort == '' ? '' : name + ' '+ this.msg.jySort
this.msg.orderBy = this.msg.jySort == '' ? '' : name + ' ' + this.msg.jySort
} else {
this.msg.jySort = ''
this.msg.rtsSort = this.msg.rtsSort = this.msg.rtsSort === '' ? 'desc' : this.msg.rtsSort === 'desc' ? 'asc' : ''
this.msg.orderBy = this.msg.rtsSort == '' ? '' : name + ' '+ this.msg.rtsSort
this.msg.rtsSort = this.msg.rtsSort = this.msg.rtsSort === '' ? 'desc' : this.msg.rtsSort === 'desc' ? 'asc' :
''
this.msg.orderBy = this.msg.rtsSort == '' ? '' : name + ' ' + this.msg.rtsSort
}
this.getList();
},
getCustomerBrandList(){ // 获取品牌
this.apipost('app_get_customer_brand',{},res=>{
if(res.data.resultCode==1){
getCustomerBrandList() { // 获取品牌
this.apipost('app_get_customer_brand', {}, res => {
if (res.data.resultCode == 1) {
this.CustomerBrandList = res.data.data;
}else{
} else {
this.$message.error(res.data.message)
}
},err=>{})
}, err => {})
},
goUrC(path, customerId) {
this.$router.push({
......@@ -751,16 +616,29 @@ export default {
}
})
},
getUrl(item){
this.$router.push({ name:"CustomerAnalysis",query:{"customerId":item.CustomerIdS,blank: 'y'} })
getUrl(item) {
this.$router.push({
name: "CustomerAnalysis",
query: {
"customerId": item.CustomerIdS,
blank: 'y'
}
})
},
getMap(){
this.$router.push({ name:"customerMap",query:{departState: this.departState, blank: 'y'} })
getMap() {
this.$router.push({
name: "customerMap",
query: {
departState: this.departState,
blank: 'y'
}
})
},
updateData: function(obj) {
updateData: function (obj) {
this.apipost(
"app_customer_GetLeaderCustomerInfo",
{ customerId: obj.CustomerIdS },
"app_customer_GetLeaderCustomerInfo", {
customerId: obj.CustomerIdS
},
res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
......@@ -778,7 +656,7 @@ export default {
null
);
},
deletelist: function(obj) {
deletelist: function (obj) {
this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -786,8 +664,10 @@ export default {
})
.then(() => {
this.apipost(
"app_customer_LeaderRemove",
{ ID: obj.CustomerIdS, saleID: obj.EmployeeId },
"app_customer_LeaderRemove", {
ID: obj.CustomerIdS,
saleID: obj.EmployeeId
},
res => {
if (res.data.resultCode == 1) {
this.$message.success("删除成功！");
......@@ -801,8 +681,10 @@ export default {
this.$message.info("已取消删除！");
});
},
yichangde(obj){
this.apipost("app_get_GetCustomerException", {customerId: obj.CustomerIdS},res => {
yichangde(obj) {
this.apipost("app_get_GetCustomerException", {
customerId: obj.CustomerIdS
}, res => {
if (res.data.resultCode == 1) {
this.CustomerException = res.data.data
}
......@@ -912,13 +794,12 @@ export default {
newArr.push(file.file);
let path = "/Upload/Temporary/";
this.UploadSelfFileT(path, newArr, x => {
this.Images =this.domainManager().ViittoFileUrl + x.data.FilePath;
this.Images = this.domainManager().ViittoFileUrl + x.data.FilePath;
});
},
getJycs() {
this.apipost(
"app_today_visit_GetCustomerPremisesEnum",
{},
"app_today_visit_GetCustomerPremisesEnum", {},
res => {
if (res.data.resultCode == 1) {
this.jycs = res.data.data;
......@@ -929,8 +810,7 @@ export default {
},
getZw() {
this.apipost(
"app_today_visit_GetCustomerDutyEnum",
{},
"app_today_visit_GetCustomerDutyEnum", {},
res => {
if (res.data.resultCode == 1) {
this.zw = res.data.data;
......@@ -941,8 +821,7 @@ export default {
},
getKhly() {
this.apipost(
"app_customer_GetCustomerSourceEnum",
{},
"app_customer_GetCustomerSourceEnum", {},
res => {
if (res.data.resultCode == 1) {
this.khly = res.data.data;
......@@ -953,8 +832,10 @@ export default {
},
getProvince() {
this.apipost(
"app_customer_GetAreaChildList",
{ Id: 2, level: 1 },
"app_customer_GetAreaChildList", {
Id: 2,
level: 1
},
res => {
if (res.data.resultCode == 1) {
this.provinceList = res.data.data;
......@@ -965,8 +846,10 @@ export default {
},
getCity() {
this.apipost(
"app_customer_GetAreaChildList",
{ Id: this.addMsg.Province, level: 2 },
"app_customer_GetAreaChildList", {
Id: this.addMsg.Province,
level: 2
},
res => {
if (res.data.resultCode == 1) {
this.cityList = res.data.data;
......@@ -980,8 +863,10 @@ export default {
},
getRegion() {
this.apipost(
"app_customer_GetAreaChildList",
{ Id: this.addMsg.City, level: 3 },
"app_customer_GetAreaChildList", {
Id: this.addMsg.City,
level: 3
},
res => {
if (res.data.resultCode == 1) {
this.regionList = res.data.data;
......@@ -993,8 +878,10 @@ export default {
},
getCity1() {
this.apipost(
"app_customer_GetAreaChildList",
{ Id: this.addMsg.Province, level: 2 },
"app_customer_GetAreaChildList", {
Id: this.addMsg.Province,
level: 2
},
res => {
if (res.data.resultCode == 1) {
this.cityList = res.data.data;
......@@ -1005,8 +892,10 @@ export default {
},
getRegion1() {
this.apipost(
"app_customer_GetAreaChildList",
{ Id: this.addMsg.City, level: 3 },
"app_customer_GetAreaChildList", {
Id: this.addMsg.City,
level: 3
},
res => {
if (res.data.resultCode == 1) {
this.regionList = res.data.data;
......@@ -1018,8 +907,9 @@ export default {
searchHistory(val) {
if (val.length == 11) {
this.apipost(
"app_customer_GetCustomerByContactNumber",
{ ContactNumber: val },
"app_customer_GetCustomerByContactNumber", {
ContactNumber: val
},
res => {
if (res.data.resultCode == 1) {
if (res.data.data.customerInfo.customerId > 0) {
......@@ -1061,8 +951,7 @@ export default {
},
err => {}
);
} else {
}
} else {}
},
valueToWord(val) {
if (val == 0) return "未拜访";
......@@ -1141,8 +1030,8 @@ export default {
},
getList() {
this.loading = true;
if(this.departState){
this.msg.allDepartment=1
if (this.departState) {
this.msg.allDepartment = 1
}
this.apipost(
"app_customer_GetCustomerListForCareOf",
......@@ -1164,7 +1053,7 @@ export default {
item["disabled"] = false;
item.Address = item.Address.split(",").join("");
});
this.datainfo=res.data.data;
this.datainfo = res.data.data;
this.list = res.data.data.pages.pageData;
this.total = res.data.data.pages.count;
} else {
......@@ -1176,13 +1065,15 @@ export default {
);
},
getDepartment() {
let msg={};
if(this.departState){
msg={allDepartment:1};
this.msg.allDepartment=1
let msg = {};
if (this.departState) {
msg = {
allDepartment: 1
};
this.msg.allDepartment = 1
}
this.apipost(
"Advertising_get_GetNowDepartmentAndSubordinate",msg,
"Advertising_get_GetNowDepartmentAndSubordinate", msg,
res => {
if (res.data.resultCode == 1) {
this.departmentList = res.data.data;
......@@ -1204,8 +1095,8 @@ export default {
this.employeeMsg.RB_Group_id = this.getLocalStorage().RB_Group_id;
this.employeeMsg.RB_Branch_id = -1;
this.employeeList2 = [];
this.employeeMsg.IsLeave=-1;
if(this.employeeMsg.KeyWord==''){
this.employeeMsg.IsLeave = -1;
if (this.employeeMsg.KeyWord == '') {
return
}
this.apipost(
......@@ -1216,14 +1107,14 @@ export default {
if (!this.isSelLayer) {
this.employeeList = res.data.data;
this.employeeList.forEach(item => {
if(item.isLeave==0){
if (item.isLeave == 0) {
this.employeeList2.push(item);
}
});
} else {
this.employeeList1 = res.data.data;
this.employeeList1.forEach(item => {
if(item.isLeave==0){
if (item.isLeave == 0) {
this.employeeList2.push(item);
}
});
......@@ -1233,16 +1124,14 @@ export default {
err => {}
);
},
GetClientAccountListByKeyWord(query) {
console.log("query",query)
if (query !== '') {
this.employeeMsg.departmentId = 0;
this.employeeMsg.RB_Group_id = this.getLocalStorage().RB_Group_id;
this.employeeMsg.RB_Branch_id = -1;
this.employeeList2 = [];
this.employeeMsg.IsLeave=-1;
this.employeeMsg.KeyWord=query;
this.employeeMsg.IsLeave = -1;
this.employeeMsg.KeyWord = query;
this.apipost(
"app_get_company_employee",
this.employeeMsg,
......@@ -1256,13 +1145,12 @@ console.log("query",query)
}
},
GetClientAccountListByKeyWord1(query) {
console.log("query",query)
if (query !== '') {
this.employeeMsg.departmentId = 0;
this.employeeMsg.RB_Group_id = this.getLocalStorage().RB_Group_id;
this.employeeMsg.RB_Branch_id = -1;
this.employeeMsg.IsLeave=0;
this.employeeMsg.KeyWord=query;
this.employeeMsg.IsLeave = 0;
this.employeeMsg.KeyWord = query;
this.apipost(
"app_get_company_employee",
this.employeeMsg,
......@@ -1319,11 +1207,11 @@ console.log("query",query)
// 重置表单
this.$refs[formName].resetFields();
},
getBlacklist(item){
getBlacklist(item) {
let DisabledType
let CustomerId = item.CustomerId.split('|')[0]
if(item.CustomerStatus == 2){
DisabledType =1
if (item.CustomerStatus == 2) {
DisabledType = 1
this.$confirm("是否加入黑名单?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -1331,8 +1219,10 @@ console.log("query",query)
})
.then(() => {
this.apipost(
"app_customer_DisabledCustomer",
{CustomerId:CustomerId,DisabledType:DisabledType},
"app_customer_DisabledCustomer", {
CustomerId: CustomerId,
DisabledType: DisabledType
},
res => {
if (res.data.resultCode == 1) {
this.$message.success("加入黑名单成功！");
......@@ -1345,8 +1235,8 @@ console.log("query",query)
.catch(() => {
this.$message.info("已取消加入！");
});
}else if(item.CustomerStatus == 4){
DisabledType =2
} else if (item.CustomerStatus == 4) {
DisabledType = 2
this.$confirm("是否移除黑名单?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -1354,8 +1244,10 @@ console.log("query",query)
})
.then(() => {
this.apipost(
"app_customer_DisabledCustomer",
{CustomerId:CustomerId,DisabledType:DisabledType},
"app_customer_DisabledCustomer", {
CustomerId: CustomerId,
DisabledType: DisabledType
},
res => {
if (res.data.resultCode == 1) {
this.$message.success("移除黑名单成功！");
......@@ -1374,9 +1266,9 @@ console.log("query",query)
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode=userInfo.ActionMenuCode;
if(ActionMenuCode.indexOf('Select_AllCustomer')!=-1){
this.departState=true;
let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('Select_AllCustomer') != -1) {
this.departState = true;
}
this.bossID = userInfo.EmployeeId;
this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
......@@ -1390,11 +1282,12 @@ console.log("query",query)
this.getKhly();
this.getCustomerBrandList();
}
};
};
</script>
<style>
.customerTransferTable {
.customerTransferTable {
width: 100%;
font-size: 14px;
color: #333;
......@@ -1402,53 +1295,65 @@ console.log("query",query)
box-sizing: border-box;
border-bottom: none;
border-right: none;
}
.customerTransferTable ._class_b{
}
.customerTransferTable ._class_b {
color: #257BF1 !important
}
.customerTransferTable.customerTransferTable2 tr th {
}
.customerTransferTable.customerTransferTable2 tr th {
background: #dcdcdc;
height: 30px;
font-size: 12px;
text-align: left;
text-indent: 0 !important;
}
.customerTransferTable tr {
}
.customerTransferTable tr {
text-align: left;
}
.customerTransferTable tr:nth-child(2n) {
}
.customerTransferTable tr:nth-child(2n) {
background: #f2f2f2;
}
.customerTransferTable tr:nth-child(2n + 1) {
}
.customerTransferTable tr:nth-child(2n + 1) {
background: #ffffff;
}
.customerTransferTable tr:hover {
}
.customerTransferTable tr:hover {
background: #d0d2d9;
}
.customerTransferTable tr td {
}
.customerTransferTable tr td {
height: 40px;
padding-left: 25px;
border-bottom: 1px solid #dcdcdc;
font-size: 14px;
color: #333;
border-right: 1px solid #dcdcdc;
}
.pd20 {
}
.pd20 {
padding: 12px 20px !important;
}
.el-popper[x-placement^="bottom"] {
}
.el-popper[x-placement^="bottom"] {
margin-top: 0px !important;
}
.el-popper[x-placement^="top"] {
}
.el-popper[x-placement^="top"] {
margin-bottom: 0px !important;
}
.customerTransferTable .el-button {
}
.customerTransferTable .el-button {
position: relative;
top: -5px;
}
.customerTransferTable .el-button + .el-button {
}
.customerTransfer ._mc_edit {
}
.customerTransferTable .el-button+.el-button {}
.customerTransfer ._mc_edit {
overflow: auto;
display: none;
position: absolute;
......@@ -1460,73 +1365,88 @@ console.log("query",query)
padding: 10px;
width: 100%;
min-width: 1146px;
}
.customerTransfer ._mc_edit ._tit {
}
.customerTransfer ._mc_edit ._tit {
padding-left: 10px;
border-left: 3px solid #e95252;
font-size: 16px;
font-family: "PingFangSc-Fine";
color: #000000;
}
.customerTransfer ._mc_edit ._info_box ul._form li {
}
.customerTransfer ._mc_edit ._info_box ul._form li {
float: left;
}
.customerTransfer .edHeightOne {
}
.customerTransfer .edHeightOne {
display: block !important;
height: 450px;
}
.customerTransfer ._edHeight {
}
.customerTransfer ._edHeight {
height: 340px;
}
.customerTransfer ._remark textarea {
}
.customerTransfer ._remark textarea {
resize: none;
width: 646px;
height: 100px;
}
.customerTransfer .avatar-uploader .el-upload {
}
.customerTransfer .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.customerTransfer .avatar-uploader .el-upload:hover {
}
.customerTransfer .avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.customerTransfer .avatar-uploader-icon {
}
.customerTransfer .avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 148px;
height: 148px;
line-height: 148px;
text-align: center;
}
.customerTransfer .avatar {
}
.customerTransfer .avatar {
width: 148px;
height: 148px;
display: block;
}
.width15{
}
.width15 {
width: 15px;
}
.sort-th{
}
.sort-th {
display: flex;
align-items: center;
}
.sortActive{
}
.sortActive {
color: #E95252;
}
.sort-icon-top{
}
.sort-icon-top {
position: relative;
top: 4px;
/* left: -45px; */
}
.sort-icon-bottom{
}
.sort-icon-bottom {
position: relative;
bottom: 4px;
/* left: -20px; */
}
.customerTransfer .fist-bottom{
}
.customerTransfer .fist-bottom {
color: rgb(255, 255, 255);
font-size: 14px;
padding: 5px;
......@@ -1535,11 +1455,13 @@ console.log("query",query)
border-bottom-right-radius: 0;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
}
.customerTransfer .el-button-group{
}
.customerTransfer .el-button-group {
padding-top: 10px;
}
.yichangde{
}
.yichangde {
display: inline-block;
border-radius: 50%;
color: red;
......@@ -1548,6 +1470,7 @@ console.log("query",query)
width: 18px;
height: 18px;
text-align: center;
cursor:pointer;
}
cursor: pointer;
}
</style>
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ d9d80734
......@@ -380,7 +380,7 @@
{{item.PriceTeamTypeName&&item.PriceTeamTypeName=='单地接'?item.PriceTeamTypeName:'单团'}}
</label>
</div>
<div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">{{item.OutBranchName}}</div>
<div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">{{item.UnionBranchName}}</div>
<div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
<div class="d12" style="float:none;margin:3px auto;">
<p>
......
src/plug/index.js
View file @ d9d80734
......@@ -184,6 +184,7 @@ export default {
crmUrl: crmUrl,
crmRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://fcrmyx.oytour.com/#/" : "http://localhost:8081/#/",
PptUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://ppt.oytour.com" : "http://localhost:8080",
CarUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://ppt.oytour.com" : "http://localhost:8082",
};
return 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