Skip to content

S
SuperMan
Commit a1f968b1 authored by youjie's avatar youjie
Browse files
Options

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

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