Skip to content

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

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

parents 14f17310 dbcb820f
Show whitespace changes
Inline Side-by-side
Showing with 1574 additions and 787 deletions
src/components/FinancialModule/PlatformAccount/index.vue
View file @ 7d500d61
......@@ -351,7 +351,13 @@
<el-dialog custom-class='w400' title="修改回团几天后可提现" :visible.sync="DaysShow" center>
<template>
<el-form label-width="100px">
<el-form-item label="回团后天数">
<el-form-item label="类型">
<el-select v-model="DaysMsg.WithdrawType" placeholder="请选择">
<el-option key="0" label="回团后" value="0"></el-option>
<el-option key="1" label="出团后" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="推后天数">
<el-input v-model="DaysMsg.WithdrawDays" class="w200"></el-input>
</el-form-item>
</el-form>
......@@ -446,7 +452,8 @@
ContractUrl: "",
SettlementDate: "",
SettlementInfo: "",
WithdrawDays:0
WithdrawDays:0,
WithdrawType:0,
},
getCompanyMsg: {
RB_Group_Id: "0",
......@@ -599,7 +606,8 @@
DaysShow: false,
DaysMsg:{
AccountId:0,
WithdrawDays:0
WithdrawDays:0,
WithdrawType:'0',
}
};
},
......@@ -685,6 +693,7 @@
else if(params.type === 'days'){
this.DaysMsg.AccountId = params.id;
this.DaysMsg.WithdrawDays = params.WithdrawDays;
this.DaysMsg.WithdrawType = params.WithdrawType.toString();
this.DaysShow = true;
}
......@@ -879,7 +888,7 @@
};
let withdrawDays = {
field: "WithdrawDays",
title: "提现天数",
title: "提现标识",
titleAlign: "left",
columnAlign: "left",
isResize: true,
......@@ -888,6 +897,8 @@
let accountStateStr="";
if(rowData.WithdrawDays==0){accountStateStr="-"}
else{accountStateStr=rowData.WithdrawDays}
if(rowData.WithdrawType==0){accountStateStr+=' [回团后]'}
else{accountStateStr+=' [出团后]'}
return accountStateStr;
},
};
......@@ -1170,7 +1181,8 @@
ContractUrl: "",
SettlementDate: "",
SettlementInfo: "",
WithdrawDays:0
WithdrawDays:0,
WithdrawType:0,
};
this.examineLoading=false,
this.ExamineMsg={
......@@ -1539,7 +1551,8 @@
let params = {
type: 'days',
id: this.rowData.ID,
WithdrawDays:this.rowData.WithdrawDays
WithdrawDays:this.rowData.WithdrawDays,
WithdrawType:this.rowData.WithdrawType
};
this.$emit('on-custom-comp', params);
},
......@@ -2076,3 +2089,4 @@
}
</style>
src/components/FinancialModule/invoicesManager.vue
View file @ 7d500d61
......@@ -233,15 +233,20 @@
</tr>
<template v-for="(item, index) in dataList" v-loading="loading">
<tr>
<td class="cursorpointer" @click="goUrlT('productQuery', item.TCNUM, '产品查询')"
<td v-if="item.Type==1">合并发票</td>
<td v-else class="cursorpointer" @click="goUrlT('productQuery', item.TCNUM, '产品查询')"
:rowspan="item.InvoiceApplyList.length">
{{item.TCNUM}}
<!-- ({{item.TCID}}) -->
</td>
<td class="cursorpointer" :rowspan="item.InvoiceApplyList.length" @click="goUrlO(item.OrderId)">
<td v-if="item.Type==1">-</td>
<td v-else class="cursorpointer" :rowspan="item.InvoiceApplyList.length" @click="goUrlO(item.OrderId)">
{{item.OrderId}}</td>
<td :rowspan="item.InvoiceApplyList.length">{{item.CreateByStr}}</td>
<td :rowspan="item.InvoiceApplyList.length">{{item.CustomerName}}:{{item.CustomerContact}}</td>
<td v-if="item.Type==1" :rowspan="item.InvoiceApplyList.length">{{item.CustomerName}}:
<span class="cursorpointer" v-for="(qitem,qindex) in item.InvoiceOrderList" @click="goUrlO(qitem)">{{qitem+(qindex<(item.InvoiceOrderList.length-1)?"，":"")}}</span>
</td>
<td v-else :rowspan="item.InvoiceApplyList.length">{{item.CustomerName}}:{{item.CustomerContact}}</td>
<td :rowspan="item.InvoiceApplyList.length">{{item.ApplyTotalPrice}}</td>
<td :rowspan="item.InvoiceApplyList.length">
<span>{{item.DpreadPrice - item.ApplyTotalPrice}}</span>
......@@ -260,7 +265,7 @@
<i class="iconfont icon-sousuo" @click="goIisDetail(item.InvoiceApplyList[0].ID)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.FinancialModule.zuihuifp')" placement="top">
<span v-if="item.ApplyTotalPrice!=0" class="_zhuihui"
<span v-if="item.ApplyTotalPrice!=0 && item.InvoiceApplyList[0].InvoiceApplyState != 1" class="_zhuihui"
@click="zhuihui(item.InvoiceApplyList[0].ID)">{{$t('objFill.chase')}}</span>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.FinancialModule.querenzh')" placement="top">
......@@ -289,7 +294,7 @@
<i class="iconfont icon-sousuo" @click="goIisDetail(item2.ID)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.FinancialModule.zuihuifp')" placement="top">
<span v-if="item.ApplyTotalPrice!=0" class="_zhuihui"
<span v-if="item.ApplyTotalPrice!=0 && item2.InvoiceApplyState!=1" class="_zhuihui"
@click="zhuihui(item2.ID)">{{$t('objFill.chase')}}</span>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.FinancialModule.querenzh')" placement="top">
......
src/components/FinancialModule/invoicesManagerAdd.vue
View file @ 7d500d61
......@@ -130,7 +130,7 @@
<el-input placeholder v-model="msg.ApplyMoney" @keyup.native="checkPrice(msg,'ApplyMoney')"></el-input>
</td>
<td>{{$t('ios.dzjine')}}</td>
<td>{{orderList.moneyStr}}</td>
<td>{{orderList.moneyStr}}{{(orderList.fee?'(手续费 '+orderList.fee+')':'')}}</td>
</tr>
<tr class="page_iisMgadd_bank">
<td>{{$t('ios.dzyinhang')}}</td>
......@@ -145,7 +145,30 @@
<td>{{orderList.TradeDateStr}}</td>
</tr>
<tr v-if="batchOrder">
<td>{{$t('hotel.order_Number')}} </td>
<td :colspan="3">
<table>
<tr>
<td>序号</td>
<td>财务单号</td>
<td>订单号</td>
<td>团号</td>
<td>申请金额</td>
<td>当前手续费</td>
</tr>
<tr v-for="(qitem,qindex) in batchOrder">
<td>{{qindex+1}}</td>
<td>{{qitem.FrID}}</td>
<td>{{qitem.OrderID}}</td>
<td><p><span v-for="(i,ix) in qitem.TCIDAndTCNUMList">{{i.TCNUM}}（{{i.TCID}}）</span></p></td>
<td>{{qitem.Money}}</td>
<td>{{qitem.Fee}}</td>
</tr>
</table>
</td>
</tr>
<tr v-else>
<td v-if="msg.TCID>0">{{$t('visa.v_tuanhao')}}</td>
<td v-if="msg.TCID>0">{{msg.TCID}}</td>
<td>{{$t('hotel.order_Number')}} </td>
......@@ -298,7 +321,8 @@
title: false
},
saveMsg: [],
crmOrderObj:null
crmOrderObj:null,
batchOrder: []
};
},
methods: {
......@@ -415,6 +439,39 @@
this.msg.IsDefaultInfo = 0;
}
this.msg.ApplyPics = this.saveMsg
if(this.batchOrder && this.batchOrder.length>0){
this.msg.InvoiceOrderList=[];
this.batchOrder.forEach(x=>{
this.msg.InvoiceOrderList.push({
Type:1,
OrderId: x.OrderID,
FinanceId: x.FrID,
Money: x.Money
});
});
this.apipost(
"InvoiceApply_get_SetInvoiceApply_V2",
this.msg,
res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
let path = ''
if(this.msg.InvoiceApplyType == 1){
path = 'platformFinancialSale'
}
setTimeout(() => {
this.$router.push({
name: path
});
}, 1000);
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
}else{
this.apipost(
"InvoiceApply_get_SetInvoiceApply_V2",
this.msg,
......@@ -453,6 +510,7 @@
},
err => {}
);
}
},
getAccountList: function () {
//获取账户类型对应下的账户列表
......@@ -543,6 +601,23 @@
this.loading = false
}, null)
},
getBatchOrderDetail(frIds){
this.apipost('Financial_post_GetSalePlatformList',{FrIDs:frIds},res=>{
if(res.data.resultCode == 1) {
this.batchOrder = res.data.data.list;
this.orderList={
moneyStr : res.data.data.TotalMoney,
TradeDateStr:'/',
AccountNumber:'-',
FrIDs:'-',
fee : res.data.data.TotalFee,
};
this.msg.ApplyMoney = res.data.data.InvoiceMoney;
}else{
this.$message.error(res.data.message);
}
},err=>{})
}
},
mounted() {
let userInfo = this.getLocalStorage();
......@@ -561,7 +636,12 @@
this.msg.InvoiceApplyType = crmOrderObj.InvoiceApplyType;
}
this.getAccountList();
if(this.$route.query.batch){
//查询批量订单
this.getBatchOrderDetail(this.$route.query.batch);
}else{
this.getOrderDetail();
}
this.getCustomerInvoiceList();
if (this.$route.query.edit) {
this.msg.ID = this.$route.query.id
......
src/components/FinancialModule/invoicesManagerDetail.vue
View file @ 7d500d61
......@@ -261,7 +261,8 @@
<table data-v-ca5157c2 border="1" class="page_iisMgdetail_table" style="border-collapse: collapse;">
<tr>
<td width="130">{{$t('ios.bumen')}}</td>
<td>{{detail.deptName}}</td>
<td v-if="detail.Type && detail.Type==1" width="220">{{detail.deptName}}</td>
<td v-else>{{detail.deptName}}</td>
<td width="130">{{$t('ios.sqren')}}</td>
<td>{{detail.CreateBy}}</td>
</tr>
......@@ -281,7 +282,7 @@
</template>
</td>
</tr>
<tr>
<tr v-if="!(detail.Type && detail.Type==1)">
<td>{{$t('fnc.yszonge')}}</td>
<td class="w600 font-weight cursorpointer">
<span @click="goUrlO(detail.OrderId)">{{detail.PreferPrice}}</span>
......@@ -315,7 +316,7 @@
{{orderList.TradeDateStr}}
</td>
</tr>
<tr>
<tr v-if="!(detail.Type && detail.Type==1)">
<template v-if="$route.query.InvoiceApplyType&&$route.query.InvoiceApplyType!=4">
<td>{{$t('ios.tuanhao')}}</td>
<td class="text-align-left font-weight cursorpointer" @click="goUrlT('productQuery', detail.TCNUM, '产品查询')">
......@@ -329,7 +330,30 @@
</td>
</tr>
<tr v-if="detail.Type && detail.Type==1">
<td>{{$t('ios.cwdanju')}}</td>
<td colspan="3">
<table>
<tr>
<td>序号</td>
<td>财务单号</td>
<td>订单号</td>
<td>团号</td>
<td>申请金额</td>
<td>当前手续费</td>
</tr>
<tr v-for="(qitem,qindex) in batchOrder">
<td>{{qindex+1}}</td>
<td>{{qitem.FrID}}</td>
<td><span class="cursorpointer" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', qitem.OrderID, qitem.TCIDAndTCNUMList[0].TCNUM, qitem.TCIDAndTCNUMList[0].TCID)">{{qitem.OrderID}}</span></td>
<td><p><span v-for="(i,ix) in qitem.TCIDAndTCNUMList">{{i.TCNUM}}（{{i.TCID}}）</span></p></td>
<td>{{qitem.Money}}</td>
<td>{{qitem.Fee}}</td>
</tr>
</table>
</td>
</tr>
<tr v-else>
<td>{{$t('ios.cwdanju')}}</td>
<td colspan="3" class="w600 text-align-left font-weight cursorpointer">
<template v-for="(item,index) in orderList.FrIDs">
......@@ -555,6 +579,7 @@
saveMsg: [],
F_GeneralManager: false,
IsDetail:0,
batchOrder: []
};
},
methods: {
......@@ -787,8 +812,12 @@
})
}
this.detail = detail
if(this.detail.Type && this.detail.Type==1){
this.getBatchOrderDetail(this.detail.FrIds);
}else{
this.getOrderDetail();
}
}
this.loading = false
}, null)
},
......@@ -837,6 +866,23 @@
}
})
},
getBatchOrderDetail(frIds){
this.apipost('Financial_post_GetSalePlatformList',{FrIDs:frIds},res=>{
if(res.data.resultCode == 1) {
this.batchOrder = res.data.data.list;
this.orderList={
moneyStr : res.data.data.TotalMoney,
TradeDateStr:'/',
AccountNumber:'-',
FrIDs:'-',
fee : res.data.data.TotalFee,
};
this.msg.ApplyMoney = res.data.data.InvoiceMoney;
}else{
this.$message.error(res.data.message);
}
},err=>{})
}
},
created(){
let userInfo = this.getLocalStorage();
......
src/components/FinancialModule/platformFinancial.vue
View file @ 7d500d61
......@@ -2,6 +2,9 @@
/deep/.el-table th.el-table__cell{
background-color: #E6E6E6;
}
/deep/.eltableBox .el-table .el-table__cell{
padding: 5px 0;
}
</style>
......@@ -62,20 +65,62 @@
</div>
<div style="display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="float:left;display: flex;flex-wrap: nowrap; padding: 10px;">
<div class="eltableBox" style="padding-top: 1px; padding-bottom: 10px;">
<!-- <div style="float:left;display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="display: flex;flex-wrap: wrap; ">
<template v-if="multipleSelection.length>0">
<el-tag size="small"
style="margin-right: 5px;margin-bottom: 5px;"
v-for="(x,index) in multipleSelection" :key="x.FrID" :type="x.Type==0?'danger':''">
{{x.Alias}}：{{x.TotalMoney}}
{{x.Alias}}：在途{{x.TotalMoney}}、可提现{{x.RemitMoney}}、已申请{{x.InvoiceMoney}}、待申请{{x.WaitMoney}}
</el-tag>
</template>
</div>
</div>
</div>-->
<el-table :data="multipleSelection" stripe max-height="320px" highlight-current-row>
<el-table-column prop="Alias" label="平台名称" >
<template slot-scope="scope">
<span v-if="scope.row.Alias=='平台在途总额'" style="color: #00C6FF;">{{ scope.row.Alias }}</span>
<span v-else>{{ scope.row.Alias }}</span>
</template>
</el-table-column>
<el-table-column prop="TotalMoney" label="在途总额" sortable>
<template slot-scope="scope">
<span v-if="scope.row.Alias=='平台在途总额'" style="color: #00C6FF;">{{ scope.row.TotalMoney }}</span>
<span v-else>{{ scope.row.TotalMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="RemitMoney" label="可提现" sortable>
<template slot-scope="scope">
<span v-if="scope.row.Alias=='平台在途总额'" style="color: #00C6FF;">{{ scope.row.RemitMoney }}</span>
<span v-else>{{ scope.row.RemitMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="InvoiceMoney" label="已申请" sortable>
<template slot-scope="scope">
<span v-if="scope.row.Alias=='平台在途总额'" style="color: #00C6FF;">{{ scope.row.InvoiceMoney }}</span>
<span v-else>{{ scope.row.InvoiceMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="WaitMoney" label="待申请" sortable>
<template slot-scope="scope">
<span v-if="scope.row.Alias=='平台在途总额'" style="color: #00C6FF;">{{ scope.row.WaitMoney }}</span>
<span v-else>{{ scope.row.WaitMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="Wait15Money" label="超15天未申请" sortable>
<template slot-scope="scope">
<span v-if="scope.row.Alias=='平台在途总额'" style="color: #00C6FF;">{{ scope.row.Wait15Money }}</span>
<span v-else>{{ scope.row.Wait15Money }}</span>
</template>
</el-table-column>
<el-table-column prop="Wait20Invoice" label="超20天未回款" sortable>
<template slot-scope="scope">
<span v-if="scope.row.Alias=='平台在途总额'" style="color: #00C6FF;">{{ scope.row.Wait20Invoice }}</span>
<span v-else>{{ scope.row.Wait20Invoice }}</span>
</template>
</el-table-column>
</el-table>
</div>
......@@ -156,6 +201,14 @@
</el-tooltip>
</template>
</el-table-column>
<el-table-column
label="发票编号"
width="80">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;"
>{{ (scope.row.InvoiceState>0?scope.row.InvoiceState:'-') }}</span>
</template>
</el-table-column>
<el-table-column
:label="$t('system.query_company')"
width="80">
......@@ -274,32 +327,7 @@
:label="$t('fnc.dqzhuangtai')"
show-overflow-tooltip width="100">
<template slot-scope="scope">
<i v-if="scope.row.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
<i v-if="scope.row.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i>
<i v-if="scope.row.Status==2" class="iconfont icon-yiqueren" style="color: #959595"></i>
<i v-if="scope.row.Status==3" class="iconfont icon-shenhebohui" style="color: #E95252"></i>
<i v-if="scope.row.Status==0" class="iconfont icon-zancun" style="color: #FF9C01"></i>
<el-popover
popper-class="detailsIT_Journal"
width="250"
trigger="click">
<div style="height: auto;max-height: 220px;background-color: #FFFFFF;">
<div class="changLog">
<p class="_log_t">{{$t('fnc.lcrizhi')}}</p>
<ul style="padding-left: 20px;max-height: 180px;overflow: auto;" v-if="GetFinancLogList" v-loading='LogLoading'>
<li style="border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;" v-for="(log,li) in GetFinancLogList">
<span style="background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;"></span>
<p> <span class="_color_blue">{{log.EmName}}</span> <span class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.StartValue}}</p>
</li>
</ul>
<ul v-else>
<li>{{$t('fnc.zwxgrizhi')}}</li>
</ul>
</div>
</div>
<span slot="reference" class="text_d _font_init" @click="Financial_post_GetFinancLogList(scope.row.FrID)">{{scope.row.StatusStr}}</span>
</el-popover>
<span slot="reference" class="text_d _font_init" :style="(scope.row.EfficaciousStatus==1?'color:red':'')">{{scope.row.StatusStr}}</span>
</template>
</el-table-column>
......@@ -641,7 +669,7 @@ export default {
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
this.loading= true;
this.apipost('Financial_post_GetPlatformStatisticsList',this.msg,res=>{
this.apipost('Financial_post_GetPlatformSumStatistics',this.msg,res=>{
if(res.data.resultCode == 1) {
let data = res.data.data;
this.multipleSelection=data;
......@@ -808,18 +836,6 @@ export default {
this.getPageList();
this.getStatisticsList();
},
getMoney(){
let Money = 0
this.multipleSelection.forEach(x=>{
x.DetailList.forEach(y=>{
if(y.CostTypeId!=114){
Money += (y.OriginalMoney*100)
}
})
})
return Money/100
}
}
}
</script>
src/components/FinancialModule/platformFinancialSale.vue 0 → 100644
View file @ 7d500d61
<style scoped>
/deep/.el-table th.el-table__cell{
background-color: #E6E6E6;
}
</style>
<template >
<div>
<div class="page_fnDm page_RecPayQuery" @keyup.enter="resetPageIndex()">
<div class="query-box" style="margin-bottom: 0px;">
<el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;">
<el-col :span="4">
<el-form-item :label="$t('fnc.ssuogongsi')">
<el-select filterable v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment()" class="">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('scen.sc_ftTime')">
<StartDateLimit :clearable="false" :dateTime="missionDate" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.sfkzhanghu')">
<el-select filterable v-model='msg.BankID'>
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in accountList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul class="clearfix">
<li class="hight_query">
<button class="hollowFixedBtn" @click="getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="goCreateInvoice()">申请发票</button>
</li>
</ul>
</div>
<div style="display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="float:left;display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="display: flex;flex-wrap: wrap; ">
<el-tag size="small" style="margin-right: 5px;margin-bottom: 5px;" type="danger">订单数量：{{total}}</el-tag>
<el-tag size="small" style="margin-right: 5px;margin-bottom: 5px;" type="danger">总在途金额：{{TotalMoney}}</el-tag>
<el-tag size="small" style="margin-right: 5px;margin-bottom: 5px;" type="danger">已申请发票：{{AppliedMoney}}</el-tag>
<el-tag size="small" style="margin-right: 5px;margin-bottom: 5px;" type="danger">待申请发票：{{WaitApply}}</el-tag>
</div>
</div>
</div>
<div style="display: flex;flex-wrap: nowrap;">
<div style="float:left;display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="display: flex;flex-wrap: wrap; ">
已勾选：
<template v-for="(qitem,qindex) in multipleSelection">
<el-tag size="small" style="margin-right: 5px;margin-bottom: 5px;" type="success">{{qitem.FrID}}/{{qitem.OrderID}}</el-tag>
</template>
&nbsp;&nbsp;&nbsp;合计：{{getMoney()}}，其中平台手续费 {{getFee()}}
</div>
</div>
</div>
<div class="_fnDm_content" v-loading='loading'>
<el-table
ref="multipleTable"
:data="DataList"
tooltip-effect="dark"
style="width: 100%"
row-key="FrID"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" :selectable="selectable">
</el-table-column>
<el-table-column
:label="$t('fnc.danhao')"
width="80">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;"
@click="openDetails(scope.row.FrID,1)" v-if="scope.row.Type!=4">{{ scope.row.FrID }}</span>
<span style="cursor: pointer;color: #00C6FF;"
@click="openDetails(scope.row.FrID,2)" v-else>{{ scope.row.FrID }}</span>
</template>
</el-table-column>
<el-table-column
prop="name"
:label="$t('fnc.djleixing')"
width="100">
<template slot-scope="scope">
<span v-if="scope.row.Type==2" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
line-height: 16px;
border-radius: 4px;">
{{$t('restaurant.res_outcome')}}
</span>
<span v-if="scope.row.Type==1" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
收入
</span>
<span v-if="scope.row.Type==4" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
line-height: 16px;
border-radius: 4px;">
{{$t('objFill.v101.FinancialModule.tioabozj')}}
</span>
<span v-if="scope.row.Type==5" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
{{$t('fnc.yingshou')}}
</span>
<span v-if="scope.row.Type==6" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
line-height: 16px;
border-radius: 4px;">
{{$t('fnc.yingfu')}}
</span>
<el-tooltip class="item" effect="dark" :content="$t('objFill.zuijiatuankuan')" placement="top">
<span v-if="scope.row.OtherType == 1" style="width: 20px;
height: 20px;
display: inline-block;
border-radius: 50%;
text-align: center;
line-height: 20px;
color: #E95252;
border: 1px solid #E95252;
font-size: 12px;" class="zhuiClass">{{$t('objFill.chase')}}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
label="发票编号"
width="80">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;"
>{{ (scope.row.InvoiceState>0?scope.row.InvoiceState:'-') }}</span>
</template>
</el-table-column>
<el-table-column
:label="$t('system.query_company')"
width="80">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;"
>{{ scope.row.BranchName }}</span>
</template>
</el-table-column>
<el-table-column
prop=""
:label="$t('hotel.hotel_corrlelatition')"
show-overflow-tooltip >
<template slot-scope="scope">
<template v-if="scope.row.TCIDAndTCNUMList.length>0">
<p class="_TCIDAndTCNUMList" style="display: flex;">
<span>{{$t('visa.v_tuanhao')}}：</span>
<template v-if="scope.row.TCIDAndTCNUMList&&scope.row.TCIDAndTCNUMList.length>0">
<p><span v-for="(i,ix) in scope.row.TCIDAndTCNUMList">{{i.TCNUM}}（{{i.TCID}}） <span v-if="ix!=scope.row.TCIDAndTCNUMList.length-1">,</br></span></span></p>
</template>
<template v-else>
<span>{{$t('fnc.no')}}</span>
</template>
</p>
<p v-if="scope.row.OrderID>0 && scope.row.OrderSource==8">{{$t('fnc.danhao')}}：</span class="">{{scope.row.OrderID}}</span></p>
</template>
<template v-else-if="scope.row.OrderSource==8 && scope.row.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">{{$t('tips.zwtqxinxi')}}</p>
</template>
<template v-else-if="scope.row.OrderSource==4 && scope.row.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList" style="text-decoration: underline;cursor: pointer;" @click="goTicketPage(rowData)">{{$t('fnc.jpbianhao')}}：{{scope.row.SourceID}}</p>
<p style="margin-top: 5px;">{{$t('advmanager.v_line')}}：<span>{{scope.row.LineName?scope.row.LineName:$t('tips.jpswxzxianlu')}}</span></p>
</template>
<template v-else-if="scope.row.OrderSource==9 && scope.row.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">{{$t('fnc.gnjpqishu')}}：{{scope.row.Term}}</p>
</template>
<template v-else-if="scope.row.OrderSource==10 && scope.row.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">{{$t('tips.qzcpbianhao')}}：{{scope.row.SourceID}}</p>
</template>
<template v-else-if="scope.row.OrderSource==0 || scope.row.OrderSource==null">
<p class="_TCIDAndTCNUMList">{{ scope.row.BranchName }}-{{scope.row.DepartName}} </p>
</template>
<template v-else>
<p class="_TCIDAndTCNUMList">{{$t('pub.noMsg')}}</p>
</template>
</template>
</el-table-column>
<el-table-column
prop=""
:label="$t('fnc.feiyongleixing')"
show-overflow-tooltip width="150">
<template slot-scope="scope">
<template v-for="(s,si) in scope.row.CostTypeList">
<span style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;">{{s}}</span></br>
</template>
</template>
</el-table-column>
<el-table-column
prop=""
:label="$t('objFill.originalamount')"
show-overflow-tooltip width="120">
<template slot-scope="scope">
{{scope.row.WBMoney?scope.row.WBMoney+'/'+scope.row.CurrencyName:''}}
</template>
</el-table-column>
<el-table-column
prop=""
:label="$t('fnc.bwbjine')"
show-overflow-tooltip width="120">
<template slot-scope="scope">
{{scope.row.Money}}
</template>
</el-table-column>
<el-table-column
prop=""
:label="$t('fnc.fkduixiang')"
show-overflow-tooltip >
<template slot-scope="scope">
<span style="color: gray">{{scope.row.Type==2?scope.row.ClientTypeName+'：':$t('fnc.huikuanren')+'：'}}</span><span>{{scope.row.RemitterName}}</span>
</template>
</el-table-column>
<el-table-column
prop=""
:label="$t('fnc.zdrenyuan')"
show-overflow-tooltip width="170">
<template slot-scope="scope">
<div>{{scope.row.EmName}}</div>
<div>{{scope.row.CreateDate}}</div>
</template>
</el-table-column>
<el-table-column
prop=""
:label="$t('fnc.dqzhuangtai')"
show-overflow-tooltip width="100">
<template slot-scope="scope">
<i v-if="scope.row.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
<i v-if="scope.row.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i>
<i v-if="scope.row.Status==2" class="iconfont icon-yiqueren" style="color: #959595"></i>
<i v-if="scope.row.Status==3" class="iconfont icon-shenhebohui" style="color: #E95252"></i>
<i v-if="scope.row.Status==0" class="iconfont icon-zancun" style="color: #FF9C01"></i>
<span slot="reference" class="text_d _font_init">{{scope.row.StatusStr}}</span>
</template>
</el-table-column>
</el-table>
</div>
<div style="margin-top:30px">
</div>
</div>
</div>
</template>
<script>
import Vue from 'vue'
import StartDateLimit from '../public/StartDateLimit.vue';
export default {
components:{
StartDateLimit
},
data(){
return{
showDialog: false,
multipleSelection: [],
financeDataList:[],
msg:{
pageIndex:1,
pageSize: 8,
FrID:'',
NewFinanceId:'',
sDate:'',
eDate:'',
Status:'-1',
TemplateIds:'0',
RB_Branch_Id:'',
HelpBranchId:-1,
RB_Depart_Id:'',
sTradeDate:'',
eTradeDate:'',
ClientType:'0',
RemitterName:'',
ClientID:'',
sMoney:'',
eMoney:'',
CurrencyId:'0',
CostTypeID:'',
Conditon:'',
TCNUM:'',
TradeWay:2,
Type:'-1',
AccountType:'',
QEndDate:'',
QStartDate:'',
UpdateBy:'',
IsFormRecPayQuery:'1',
KJCostTypeId:0,
IsSelectKJSetCostType:0,
Remark:'', //备注查询
Sort:'2',
EmployeeId:'',
IsSelectAduiting: '0',
},
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
Status:'0',
},
DataList:[],
accountList:[],
CompanyList:[],
missionDate:[],
loading:false,
total:0,
TotalMoney:0,
WaitApply:0,
AppliedMoney:0,
}
},
created(){
},
mounted(){
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id= userInfo.RB_Group_id; //集团ID
this.msg.EmployeeId= userInfo.EmployeeId;
this.msg.FrID = this.$route.query.FrID?this.$route.query.FrID:0;
if(this.$route.query.NewFinanceId){
this.msg.NewFinanceId = this.$route.query.NewFinanceId;
}
this.getCompanyList();
this.getAccountList(0,2);
this.getPageList();
},
methods:{
handleSelectionChange(val) {
this.multipleSelection = val;
},
selectable(row, index) {
if (row.InvoiceState>0) {
return false;
} else {
return true;
}
},
// 单据详情
openDetails(FrID,type) {
let query = {
id: FrID,
blank: "y",
};
if(type==1){
this.$router.push({
path: "/FinancialDocumentsDetail",
query
});
}else if(type==2){
this.$router.push({
path: "/CapitalAllocationDetail",
query
});
}
},
getPageList(){ // 获取列表数据
if(!this.msg.ClientID)this.msg.ClientID="";
if(!this.msg.ClientType)this.msg.ClientType=0;
if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
if(this.msg.TemplateIds=='0')this.msg.TemplateIds='';
if(this.msg.RB_Branch_Id === '')this.msg.RB_Branch_Id=-1;
if(this.msg.HelpBranchId === '')this.msg.HelpBranchId=-1;
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.TCID)this.msg.TCID=0;
if(!this.msg.OrderID)this.msg.OrderID=0;
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
if(!this.msg.NewFinanceId)this.msg.NewFinanceId=0;
if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0;
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
this.loading= true;
this.apipost('Financial_post_GetSalePlatformList',this.msg,res=>{
if(res.data.resultCode == 1) {
let data = res.data.data.list;
let arrList = function(arr){
arr.forEach(x=>{
x._checked = false
x._disabled = false
})
}
arrList(data)
let userInfo=this.getLocalStorage();
data.forEach(x=>{
if(x.InvoiceState>0){
x._disabled = true;
}
})
this.total = res.data.data.total;
this.TotalMoney = res.data.data.TotalMoney;
this.WaitApply = res.data.data.WaitApply;
this.AppliedMoney = res.data.data.AppliedMoney;
if(this.total==0){
this.DataList=[];
}else{
this.DataList = data;
}
this.loading=false;
}else{
this.loading= false;
this.$message.error(res.data.message);
}
},err=>{})
},
getAccountList(i,t){ //收款账户
let accountList = [];
if(t==1){ // 银行
this.apipost('bankaccount_post_GetList',{TypeId:2}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
let obj = {
ID:x.ID,
Name:x.Alias,
Nom:0,
}
accountList.push(obj)
})
this.accountList = accountList;
}
}, err => {})
}
if(t==2){ //平台账户
let msg = {
BackId:0,
TypeId:i,
BranchId:-1,
Alias:'',
IsSaleSelect:1
}
this.apipost('BankAccount_post_GetPlatformList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
let obj = {
ID:x.ID,
Name:x.Alias,
Nom:x.PlatformNo
}
accountList.push(obj)
})
this.accountList = accountList;
}
}, err => {})
}
if(t==3){ //现金账户
let msg = {
TypeId:i,
BranchId:-1,
Alias:''
}
this.apipost('BankAccount_post_GetCashAccountList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
let obj = {
ID:x.ID,
Name:x.Alias,
Nom:0
}
accountList.push(obj)
})
this.accountList = accountList
}
}, err => {})
}
if(t==4){ //资金池账户
let msg = {
TypeId:i,
BranchId:-1,
Alias:''
}
this.apipost('BankAccount_post_GetCashPoolList',msg, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
let obj = {
ID:x.ID,
Name:x.Alias,
Nom:0
}
accountList.push(obj)
})
this.accountList = accountList
}
}, err => {})
}
},
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
getMoney(){
let Money = 0
this.multipleSelection.forEach(x => {
Money += (x.Money * 100)
})
return (Money / 100).toFixed(2)
},
getFee(){
let Money = 0
this.multipleSelection.forEach(x => {
Money += (x.Fee * 100)
})
return (Money / 100).toFixed(2)
},
goCreateInvoice(){
if(!(this.multipleSelection && this.multipleSelection.length>0)){ this.$message.error('请勾选平台数据'); }
let batchOrder=this.multipleSelection.map(x=>x.FrID).join(',');
let query = {
batch: batchOrder,
blank: "y",
};
this.$router.push({
path: "/invoicesManagerAdd",
query
});
}
}
}
</script>
src/components/SalesModule/customerTransfer.vue
View file @ 7d500d61
<template>
<div class="customerTransfer flexOne">
<div class="query-box" style="border: none;">
<ul style="overflow: initial!important">
<ul>
<li>
<span>
<em>{{$t('visaT.sale')}}</em>
</span>
<el-select v-model="msg.CreateBy" class="h34 w150" filterable remote reserve-keyword
:placeholder="$t('pub.PleaseKeyWords')" :remote-method="GetClientAccountListByKeyWord">
<el-form label-width="100px" style="padding-top:8px;">
<el-row :gutter="24">
<template v-if="userInfo.RB_Branch_id==0||userInfo.RB_Branch_id==49||userInfo.EmployeeId==718">
<el-col :span="6">
<el-form-item :label="$t('system.table_company')">
<el-select filterable v-model="msg.RB_Branch_id"
@change="msg.RB_Department_Id=null,msg.CreateBy='',getDepartment" class>
<template v-if="userInfo.RB_Branch_id==0||userInfo.RB_Branch_id==49">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for="item in CompanyList" :label="item.BName" :value="item.Id" :key="item.Id">
</el-option>
</template>
<template v-else>
<el-option v-for="item in CompanyList" v-if="item.Id==36||item.Id==1214" :label="item.BName"
:value="item.Id" :key="item.Id">
</el-option>
</template>
</el-select>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<!--class="h34 w150"-->
<el-form-item :label="$t('admin.admin_Department')">
<treeselect class="w200 fl" style="height:34px !important;margin-top: 5px !important"
:options="departmentList" v-model="msg.RB_Department_Id" :label="$t('pub.unlimitedSel')"
:normalizer="normalizer" @select="changeDepart" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('visaT.sale')">
<el-select v-model="msg.CreateBy" filterable :placeholder="$t('pub.PleaseKeyWords')" clearable>
<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>
<span>{{`${item.name}`}}</span>
<span style="margin-left: 15px;">
<el-tag size="mini" v-if="item.isLeave==1">{{$t('pub.noJobSel')}}</el-tag>
</span>
</div>
</el-option>
</el-select>
</li>
<li>
<span>
<em>{{$t('salesModule.keyWords')}}</em>
</span>
<el-input class="h34" v-model="msg.CustomerName" :placeholder="$t('salesModule.InputPhone')"></el-input>
</li>
<li>
<span>
<em>{{$t('salesModule.Belongbrand')}}</em>
</span>
<el-select filterable class='h34 multiple_input' v-model='msg.Brand' :placeholder="$t('pub.pleaseSel')">
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.keyWords')">
<el-input v-model="msg.CustomerName" :placeholder="$t('salesModule.InputPhone')" style="width:215px;">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.Belongbrand')">
<el-select filterable class='h34 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>
</el-select>
</li>
<li>
<span>
<em>{{$t('objFill.v101.Rest.guanlianztai')}}</em>
</span>
<el-select filterable class='h34 multiple_input' v-model='msg.OperationStatus '
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('objFill.v101.Rest.guanlianztai')">
<el-select filterable class='h34 multiple_input' v-model='msg.OperationStatus'
:placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
<el-option :label="$t('pub.normalSel')" :value="1"></el-option>
<el-option :label="$t('objFill.v102.shifang')" :value="2"></el-option>
</el-select>
</li>
<li>
<span>
<em>{{$t('salesModule.CustomerStatus')}}</em>
</span>
<el-select filterable class='h34 multiple_input' v-model='msg.CustomerStatus' :placeholder="$t('pub.pleaseSel')">
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.CustomerStatus')">
<el-select filterable class='h34 multiple_input' v-model='msg.CustomerStatus'
:placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value=""></el-option>
<el-option :label="$t('fnc.a_wshenhe')" :value="1"></el-option>
<el-option :label="$t('fnc.a_yshenhe')" :value="2"></el-option>
<el-option :label="$t('salesModule.HasRefused')" :value="3"></el-option>
<el-option :label="$t('objFill.v101.activity.heimindan')" :value="4"></el-option>
</el-select>
</li>
<li>
<span>
<em>{{$t('objFill.v101.Rest.shifouyichan')}}</em>
</span>
<el-select filterable class='h34 multiple_input' v-model='msg.ExceptionCount' :placeholder="$t('pub.pleaseSel')">
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('objFill.v101.Rest.shifouyichan')">
<el-select filterable class='h34 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.yes')" :value="1"></el-option>
<el-option :label="$t('pub.no')" :value="2"></el-option>
</el-select>
</li>
<li >
<span >
<em class="fl" style="margin-top: 10px !important">{{$t('admin.admin_Department')}}</em>
<treeselect class="w200 fl" :options="departmentList" @select="getEmployeeList"
v-model="DepartmentId"
style="height: 25px;"
:placeholder="$t('pub.unlimitedSel')" :normalizer="normalizer" />
</span>
</li>
<li>
<span>
<em>
{{$t('objFill.v101.Rest.tehuizankehu')}}
</em>
</span>
<el-select filterable class='h34 multiple_input' v-model='msg.fanYong' :placeholder="$t('pub.pleaseSel')">
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('objFill.v101.Rest.tehuizankehu')">
<el-select filterable class='h34 multiple_input' v-model='msg.fanYong'
:placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option :label="$t('pub.yes')" :value="1"></el-option>
<el-option :label="$t('pub.no')" :value="2"></el-option>
</el-select>
</li>
<li>
<span>
<em>
{{$t('scen.sc_ftTime')}}
</em>
</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('scen.sc_ftTime')">
<el-date-picker class="h34 w250" v-model="missionDate" @change="timeAdd()" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</li>
<li>
<span>
<em>
{{ $t('objFill.v102.nurushijian') }}
</em>
</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('objFill.v102.nurushijian')">
<el-date-picker class="h34 w250" v-model="EnterTime" @change="timeAdd(2)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</li>
<li style="margin-left: 10px">
<span>
<em>{{$t('objFill.v102.appjihuozhuant')}}：</em>
<el-select class="h34 w120" :placeholder="$t('pub.pleaseSel')" filterable
v-model="msg.OpenIdStatus">
<el-option v-for="item in OpenStatusList" :label="item.Name" :value="item.Id"
:key="item.Id"></el-option>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('objFill.v102.appjihuozhuant')">
<el-select class="h34 w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="msg.OpenIdStatus">
<el-option v-for="item in OpenStatusList" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
</span>
</li>
<li style="margin-left: 40px">
<span>
<em>
激活时间
</em>
</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="激活时间">
<el-date-picker class="h34 w220" v-model="activationTime" @change="timeAdd(3)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('ground.kehuditu')" @click="getMap()">
......@@ -164,7 +168,9 @@
</li>
</ul>
</div>
<ul style="overflow: initial!important"><li style="float:right;padding-top:10px;color:#111111">{{$t('salesModule.JYETJ')}}：{{datainfo.sumMoney}}</li></ul>
<ul style="overflow: initial!important">
<li style="float:right;padding-top:10px;color:#111111">{{$t('salesModule.JYETJ')}}：{{datainfo.sumMoney}}</li>
</ul>
<div class="clearfix"></div>
<div class="_customerTransferTable" :class="addShow==true?'_edHeight':''">
<table class="customerTransferTable customerTransferTable2 mt20" border="0" cellspacing="0" cellpadding="0"
......@@ -180,7 +186,7 @@
<th width="7%">{{$t('salesModule.belongUnion')}}</th>
<th width="8%">{{$t('salesModule.SuoSales')}}</th>
<th width="8%">{{$t('salesModule.CustomerStatus')}}</th>
<th width="5%" class="cursorpointer" @click="changeSort(1, 'TradeMoney')">
<th width="7%" class="cursorpointer" @click="changeSort(1, 'TradeMoney')">
<div class="sort-th">
<div>
{{$t('fnc.jiaoyie')}}
......@@ -206,8 +212,8 @@
</th>
<th width="5%">{{$t('salesModule.HappinessPassbook')}}</th>
<th width="4%">{{$t('active.ad_yhq')}}</th>
<th width="8%">{{$t('pub.pubRemark')}}</th>
<th width="14%">{{$t('system.table_operation')}}</th>
<!-- <th width="8%">{{$t('pub.pubRemark')}}</th> -->
<th width="12%">{{$t('system.table_operation')}}</th>
</tr>
<tr>
<td colspan="13" align="center" v-show="list.length==0">{{$t('system.content_noData')}}</td>
......@@ -237,7 +243,8 @@
</el-popover>
</td>
<td>
<span :style="{'color':item.OpenIdStatus==1?'red':''}">{{item.OpenIdStatus==1?'已激活':item.OpenIdStatus==2?'未激活':'' }}</span>
<span
:style="{'color':item.OpenIdStatus==1?'red':''}">{{item.OpenIdStatus==1?'已激活':item.OpenIdStatus==2?'未激活':'' }}</span>
<p v-if="item.ActivationTime">时间：{{ item.ActivationTime }}</p>
</td>
<td>{{item.Contact}}</td>
......@@ -258,9 +265,7 @@
{{item.CouponNum}}
</span>
</td>
<td>{{item.Remark}}</td>
<!-- <td>{{item.Remark}}</td> -->
<td>
<el-button-group>
<el-tooltip effect="dark" :content="$t('fnc.zhuanjiao')" placement="top-start">
......@@ -270,12 +275,6 @@
<p class="fz12 fbold mt10 color333">{{$t('fnc.zhuanjiao')}}</p>
<p class="fz12 mt30 color666">
<span>{{$t('salesModule.Recipient')}}</span>&nbsp;
<!-- <el-select
filterable
class="w180"
v-model="RecipientMsg.NewEmployeeId"
:placeholder="$t('pub.pleaseSel')"
> -->
<el-select v-model="RecipientMsg.NewEmployeeId" class="w150" filterable remote reserve-keyword
:placeholder="$t('pub.PleaseKeyWords')" :remote-method="GetClientAccountListByKeyWord1">
<el-option v-for="item in employeeList1" :label="item.name" :value="item.empId"
......@@ -383,17 +382,6 @@
</el-col>
</el-row>
<el-row :gutter="20">
<!--<el-col :span="6">-->
<!--<el-form-item label="所属品牌：" prop="brandIds">-->
<!--<el-select filterable class='multiple_input' multiple v-model='addMsg.brandIds' :placeholder="$t('pub.pleaseSel')">-->
<!--<el-option v-for='item in CustomerBrandList'-->
<!--:label='item.name'-->
<!--:value='item.id'-->
<!--:key='item.id'>-->
<!--</el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
<!--</el-col>-->
<el-col :span="6">
<el-form-item :label="$t('visaT.post')" prop="Duty">
<el-select filterable v-model="addMsg.Duty" :placeholder="$t('pub.pleaseSel')">
......@@ -473,26 +461,29 @@
data() {
return {
normalizer(node) {
return {
id: node.DepartmentId,
var obj = {
id: node.DepartmentID,
label: node.DepartmentName,
children: node.ChildList
};
if (node.ChildList != null && node.ChildList.length > 0) {
obj.children = node.ChildList;
}
return obj;
},
CustomerException: [],
datainfo: {},
CustomerBrandList: [],
missionDate: [],
EnterTime: [],
DepartmentId: null,
isSelLayer: false,
layerShow: false,
msg: {
pageIndex: 1,
pageSize: 14,
RB_Branch_id: -1,
CustomerName: "",
CreateBy: "-1",
DepartmentId: "-1",
DepartmentId: null,
Brand: -1,
allDepartment: 0,
CustomerStatus: 2,
......@@ -646,17 +637,40 @@
employeeList2: [],
HightUnitPrice: '2',
departState: false,
OpenStatusList:[
{ Name: this.$t('objFill.v102.yijihuo'),Id: 1 },
{ Name: this.$t('objFill.v102.weijihuo'),Id: 2 },
OpenStatusList: [{
Name: this.$t('objFill.v102.yijihuo'),
Id: 1
},
{
Name: this.$t('objFill.v102.weijihuo'),
Id: 2
},
],
activationTime:[]
activationTime: [],
CompanyList: [], //公司列表
getCompanyMsg: {
// 公司
RB_Group_Id: "0",
Status: "0",
},
userInfo: {},
};
},
watch: {
'$route': {
handler (val, oldVal) {
console.log(this.$route.query,'-------')
handler(val, oldVal) {
// console.log(this.$route.query, '-------')
// this.getList();
},
deep: true,
immediate: true
},
},
created() {
this.userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = this.userInfo.RB_Group_id;
this.getCompanyList();
if (this.$route.query.EnterTime) {
this.EnterTime = this.$route.query.EnterTime
this.msg.StartCreate = this.EnterTime[0];
......@@ -668,18 +682,55 @@
this.msg.ActivateEndDate = this.activationTime[1];
}
if (this.$route.query.activation) {
this.msg.OpenIdStatus = this.$route.query.activation
this.msg.OpenIdStatus = Number(this.$route.query.activation);
}
if (this.$route.query.RB_Branch_Id) {
this.msg.RB_Branch_id = Number(this.$route.query.RB_Branch_Id);
} else {
if (this.userInfo.RB_Branch_id != 0 && this.userInfo.RB_Branch_id != 49) {
this.msg.RB_Branch_id = Number(this.userInfo.RB_Branch_id);
}
}
if (this.$route.query.RB_Department_Id && Number(this.$route.query.RB_Department_Id) > 0) {
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id);
this.getEmployee();
}
if (this.$route.query.EnterID && Number(this.$route.query.EnterID) > 0) {
this.msg.CreateBy = Number(this.$route.query.EnterID);
}
},
mounted() {
let ActionMenuCode = this.userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('Select_AllCustomer') != -1) {
this.departState = true;
}
this.bossID = this.userInfo.EmployeeId;
this.departmentMsg.RB_Group_Id = this.userInfo.RB_Group_id; //集团
this.getDepartment();
this.getList();
this.getCreateByInfoList();
this.getProvince();
this.getJycs();
this.getZw();
this.getKhly();
this.getCustomerBrandList();
},
deep: true,
immediate: true
methods: {
getCompanyList() {
//获取公司列表
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
(res) => {
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
}
},
(err) => {}
);
},
methods: {
timeAdd(t) { // 日期格式
if(t==2){
if (t == 2) {
if (!this.EnterTime) {
this.msg.StartCreate = '';
this.msg.EndCreate = '';
......@@ -687,7 +738,7 @@
}
this.msg.StartCreate = this.EnterTime[0];
this.msg.EndCreate = this.EnterTime[1];
}else if(t==3){
} else if (t == 3) {
if (!this.activationTime) {
this.msg.ActivateStartDate = '';
this.msg.ActivateEndDate = '';
......@@ -695,7 +746,7 @@
}
this.msg.ActivateStartDate = this.activationTime[0];
this.msg.ActivateEndDate = this.activationTime[1];
}else{
} else {
if (!this.missionDate) {
this.msg.STime = '';
this.msg.ETime = '';
......@@ -1185,15 +1236,16 @@
);
},
getDepartment() {
let msg = {};
if (this.departState) {
msg = {
allDepartment: 1
let deparMsg = {
RB_Group_Id: this.userInfo.RB_Group_id,
RB_Branch_Id: -1,
Status: 0,
ParentId: -1,
Tier: 0,
};
this.msg.allDepartment = 1
}
deparMsg.RB_Branch_Id = this.msg.RB_Branch_id;
this.apipost(
"Advertising_get_GetNowDepartmentAndSubordinate", msg,
"admin_get_DepartmentGetList", deparMsg,
res => {
if (res.data.resultCode == 1) {
this.departmentList = res.data.data;
......@@ -1204,21 +1256,18 @@
err => {}
);
},
getEmployeeList(node, id) {
this.isSelLayer = false;
this.msg.CreateBy = "-1";
this.msg.DepartmentId = this.employeeMsg.departmentId = node.DepartmentId;
changeDepart(node, id) {
console.log(node, "changeDepart")
this.msg.CreateBy = "";
this.msg.DepartmentId = node.DepartmentID;
this.employeeMsg.departmentId = node.DepartmentID;
this.getEmployee();
},
getEmployee() {
this.employeeMsg.departmentId = 0;
this.employeeMsg.RB_Group_id = this.getLocalStorage().RB_Group_id;
this.employeeMsg.RB_Branch_id = -1;
this.employeeMsg.RB_Group_id = this.userInfo.RB_Group_id;
this.employeeMsg.RB_Branch_id = this.msg.RB_Branch_id;
this.employeeList2 = [];
this.employeeMsg.IsLeave = -1;
if (this.employeeMsg.KeyWord == '') {
return
}
this.apipost(
"app_get_company_employee",
this.employeeMsg,
......@@ -1382,34 +1431,16 @@
});
}
}
},
mounted() {
let userInfo = this.getLocalStorage();
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; //集团
this.getDepartment();
// this.getEmployee();
this.getList();
this.getCreateByInfoList();
this.getProvince();
this.getJycs();
this.getZw();
this.getKhly();
this.getCustomerBrandList();
}
};
</script>
<style>
/deep/.customerTransfer .vue-treeselect__control{
/deep/.customerTransfer .vue-treeselect__control {
height: 24px;
}
}
.customerTransferTable {
width: 100%;
font-size: 14px;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 7d500d61
......@@ -2186,7 +2186,7 @@
this.Confirm(tipMsg, function () {
if (res.data.data && res.data.data > 0) {
let query = {
offerid: res.data.data,
BatchNum: res.data.data,
blank: "y",
tab: "报价单",
};
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 7d500d61
......@@ -1579,7 +1579,7 @@
this.Confirm(tipMsg, function () {
if (res.data.data && res.data.data > 0) {
let query = {
offerid: res.data.data,
BatchNum: res.data.data,
blank: 'y',
tab: '报价单'
}
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 7d500d61
......@@ -1310,7 +1310,7 @@
this.Confirm(tipMsg, function () {
if (res.data.data && res.data.data > 0) {
let query = {
offerid: res.data.data,
BatchNum: res.data.data,
blank: 'y',
tab: '报价单'
}
......
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ 7d500d61
......@@ -98,7 +98,7 @@
SaveData(Type) {
var nObj = {
ID: this.$route.query.offerid,
BatchNum:this.$route.query.BatchNum,
BatchNum: this.$route.query.BatchNum,
AuditContent: this.postData.CRemarks,
TravelState: Type,
OfferPayType: this.postData.OfferPayType,
......@@ -132,11 +132,16 @@
},
getPostData() {
let BatchNum = "";
let offerid = 0;
if (this.$route.query.BatchNum) {
BatchNum = this.$route.query.BatchNum;
}
if (this.$route.query.offerid) {
offerid = this.$route.query.offerid;
}
let msg = {
BatchNum: BatchNum
BatchNum: BatchNum,
offerId: offerid,
};
this.loading = true;
this.apipost(
......
src/components/rank/dataCount.vue
View file @ 7d500d61
......@@ -895,79 +895,81 @@ export default {
goUrl(type) {
let Time = [this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")),this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))]
let query
if(type<5){
if(type==1){
query = {
blank: "y",
}
}else if(type==2){
query = {
EnterTime: Time,
blank: "y",
}
}else if(type==3){
query = {
activation: 1,
blank: "y",
}
}else if(type==4){
query = {
activationTime: Time,
activation: 1,
blank: "y",
}
}
this.$router.push({
name: 'customerTransfer',
query
});
}
if(type>4&&type<9){
if(type==5){
// if(type<5){
// if(type==1){
// query = {
// blank: "y",
// }
// }else if(type==2){
// query = {
// EnterTime: Time,
// blank: "y",
// }
// }else if(type==3){
// query = {
// activation: 1,
// blank: "y",
// }
// }else if(type==4){
// query = {
// activationTime: Time,
// activation: 1,
// blank: "y",
// }
// }
// this.OpenNewPage('/customerTransfer',query)
// }
// if(type>4&&type<9){
// if(type==5){
// query = {
// CStartDate: this.parameters.dateRange[0],
// CEndDate: this.parameters.dateRange[1],
// BranchId: this.parameters.branchId,
// RB_Department_Id:this.parameters.RB_Department_Id,
// EmployeeId:this.parameters.empId,
// isNormal: 1,
// blank: "y",
// }
// }else if(type==6){
// query = {
// CStartDate: this.parameters.dateRange[0],
// CEndDate: this.parameters.dateRange[1],
// RB_Department_Id:this.parameters.RB_Department_Id,
// EmployeeId:this.parameters.empId,
// isNormal: 1,
// blank: "y",
// }
// }else if(type==7){
// query = {
// CStartDate: this.parameters.dateRange[0],
// CEndDate: this.parameters.dateRange[1],
// RB_Department_Id:this.parameters.RB_Department_Id,
// EmployeeId:this.parameters.empId,
// isNormal: 1,
// blank: "y",
// }
// }else if(type==8){
// query = {
// CStartDate: this.parameters.dateRange[0],
// CEndDate: this.parameters.dateRange[1],
// RB_Department_Id:this.parameters.RB_Department_Id,
// EmployeeId:this.parameters.empId,
// discount: 1,
// isNormal: 1,
// blank: "y",
// }
// }
// this.OpenNewPage('/salesVolumeRank',query)
// }
query = {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
BranchId: this.parameters.branchId,
RB_Department_Id:this.parameters.RB_Department_Id,
EmployeeId:this.parameters.empId,
isNormal: 1,
blank: "y",
}
}else if(type==6){
query = {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
RB_Department_Id:this.parameters.RB_Department_Id,
EmployeeId:this.parameters.empId,
isNormal: 1,
blank: "y",
}
}else if(type==7){
query = {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
RB_Department_Id:this.parameters.RB_Department_Id,
EmployeeId:this.parameters.empId,
isNormal: 1,
blank: "y",
}
}else if(type==8){
query = {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
RB_Department_Id:this.parameters.RB_Department_Id,
EmployeeId:this.parameters.empId,
discount: 1,
isNormal: 1,
blank: "y",
}
}
this.$router.push({
name: 'enrollTotal',
query
});
}
this.OpenNewPage('/salesVolumeRank',query)
},
changeDepart(node, instanceId){
this.parameters.RB_Department_Id=node.DepartmentId;
......
src/components/rank/salesVolumeRank.vue
View file @ 7d500d61
......@@ -3,102 +3,50 @@
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane :label="$t('sm.Personalrank')" name="first"></el-tab-pane>
<el-tab-pane :label="$t('sm.derprank')" name="second"></el-tab-pane>
<!--
v-if="authority.indexOf('Sales_Volume_Rank_Show') != -1" -->
<el-tab-pane
:label="$t('sm.companyrank')"
name="third"
v-if="S_CheckAllOrder"
></el-tab-pane>
<el-tab-pane :label="$t('sm.companyrank')" name="third"></el-tab-pane>
<el-tab-pane :label="$t('sm.salerank')" name="four"></el-tab-pane>
</el-tabs>
<div class="query-box">
<el-form class="_info_box clearfix" label-width="150px">
<el-row style="padding: 15px 0px 0 0">
<el-col :span="4" v-show="activeName != 'four'">
<el-col :span="4" v-show="activeName != 'four' &&(userInfo.RB_Branch_id==0||userInfo.RB_Branch_id==49)">
<el-form-item :label="$t('system.table_company')">
<el-select
filterable
v-model="msg.RB_Branch_Id"
@change="getDepartment"
class
>
<el-option
:value="-1"
:label="$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for="item in CompanyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
<el-select filterable v-model="msg.RB_Branch_Id" @change="getDepartment" class>
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for="item in CompanyList" :label="item.BName" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col
:span="4"
v-show="activeName != 'third' && activeName != 'four'"
>
<el-col :span="4" v-show="activeName != 'third' && activeName != 'four'">
<el-form-item :label="$t('admin.admin_Department')">
<el-select
filterable
v-model="msg.RB_Department_Id"
@change="getEmployee"
class
>
<el-option
:value="0"
:label="$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for="item in DepartmentList"
:label="item.DepartmentName"
:value="item.DepartmentID"
:key="item.DepartmentID"
></el-option>
<el-select filterable v-model="msg.RB_Department_Id" @change="getEmployee" class>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></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" v-show="activeName == 'first'">
<el-form-item :label="$t('salesModule.Personnel')">
<el-select filterable v-model="msg.EnterID" class>
<el-option
:value="0"
:label="$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
></el-option>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('sm.chutuandate')">
<el-date-picker
v-model="msg.tStartDates"
type="daterange"
range-separator="-"
:start-placeholder="$t('hotel.hotel_StartDate')"
:end-placeholder="$t('hotel.hotel_EndDate')"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
></el-date-picker>
<el-form-item :label="$t('fnc.bmriqi')">
<el-date-picker v-model="msg.qStartDates" type="daterange" range-separator="-"
:start-placeholder="$t('hotel.hotel_StartDate')" :end-placeholder="$t('hotel.hotel_EndDate')"
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('fnc.bmriqi')">
<el-date-picker
v-model="msg.qStartDates"
type="daterange"
range-separator="-"
:start-placeholder="$t('hotel.hotel_StartDate')"
:end-placeholder="$t('hotel.hotel_EndDate')"
value-format="yyyy-MM-dd"
></el-date-picker>
<el-form-item :label="$t('sm.chutuandate')">
<el-date-picker v-model="msg.tStartDates" type="daterange" range-separator="-"
:start-placeholder="$t('hotel.hotel_StartDate')" :end-placeholder="$t('hotel.hotel_EndDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
......@@ -111,82 +59,71 @@
</li>
</ul>
</div>
<el-table
v-if="isReady"
ref="singleTable"
:data="tableData"
style="width: 100%">
<el-table-column
type="index"
:label="$t('active.ad_xuhao')"
:width="getLanguage()=='en-US'?'120':'50'"
>
<el-table v-if="isReady" ref="singleTable" :data="tableData" style="width: 100%" v-loading="loading">
<el-table-column type="index" :label="$t('active.ad_xuhao')" :width="getLanguage()=='en-US'?'120':'50'">
</el-table-column>
<el-table-column
property="name"
:label="$t('system.query_airName')">
<el-table-column property="name" :label="$t('system.query_airName')">
</el-table-column>
<el-table-column
property="SumPreferPrice"
:label="$t('objFill.xiaosoue')"
width="" sortable>
<el-table-column property="SumPreferPrice" :label="$t('objFill.xiaosoue')" width="" sortable>
<template slot-scope="scope">
<div class="clickText" @click="goUrl('salesVolumeRankEntryForm',scope.row)">{{scope.row.SumPreferPrice}}</div>
</template>
</el-table-column>
<el-table-column
property="income"
:label="$t('fnc.skjine')"
width="" sortable>
<el-table-column property="income" :label="$t('fnc.skjine')" width="" sortable>
<template slot-scope="scope">
<div class="clickText" @click="goUrl('salesVolumeRankEntryForm',scope.row)">{{scope.row.income}}</div>
</template>
</el-table-column>
<el-table-column
property="notInCome"
:label="$t('fnc.wsjine')"
width="" sortable>
<el-table-column property="notInCome" :label="$t('fnc.wsjine')" width="" sortable>
<template slot-scope="scope">
<div class="clickText" @click="goUrl('salesVolumeRankEntryForm',scope.row)">{{scope.row.notInCome}}</div>
</template>
</el-table-column>
<el-table-column
property="peopleCount"
:label="$t('objFill.v101.SalesModule.zhengchangsks')"
width="" sortable>
<el-table-column property="peopleCount" :label="$t('objFill.v101.SalesModule.zhengchangsks')" width="" sortable>
</el-table-column>
<el-table-column property="CalcheCount" :label="$t('objFill.v101.SalesModule.quxiaosks')" width="" sortable>
</el-table-column>
<el-table-column property="totalGuestNum" :label="$t('objFill.v101.SalesModule.danxiansks')" width="">
</el-table-column>
<el-table-column property="avgPrice" :label="$t('objFill.v101.SalesModule.kedanjia')" width="" sortable>
</el-table-column>
<el-table-column property="XiaoBaoTuanCount" :label="$t('objFill.v101.SalesModule.xiaobaotts')" width="">
</el-table-column>
<el-table-column property="zanBi" :label="$t('objFill.v101.SalesModule.xiaosouezb')" width="">
</el-table-column>
<el-table-column
property="CalcheCount"
:label="$t('objFill.v101.SalesModule.quxiaosks')"
width="" sortable>
<el-table-column property="CustomerCount" label="客户总数" width="">
<template slot-scope="scope">
<div class="clickText" @click="gotoCustomer(scope.row,1)">{{scope.row.CustomerCount}}</div>
</template>
</el-table-column>
<el-table-column
property="totalGuestNum"
:label="$t('objFill.v101.SalesModule.danxiansks')"
width="">
<el-table-column property="TodayAddCustomer" label="今日新增" width="">
<template slot-scope="scope">
<div class="clickText" @click="gotoCustomer(scope.row,2)">{{scope.row.TodayAddCustomer}}</div>
</template>
</el-table-column>
<el-table-column
property="avgPrice"
:label="$t('objFill.v101.SalesModule.kedanjia')"
width="" sortable>
<el-table-column property="MiniAppCount" label="小程序激活数" width="">
<template slot-scope="scope">
<div class="clickText" @click="gotoCustomer(scope.row,3)">{{scope.row.MiniAppCount}}</div>
</template>
</el-table-column>
<el-table-column property="MiniAppAdd" label="今日激活数" width="">
<template slot-scope="scope">
<div class="clickText" @click="gotoCustomer(scope.row,4)">{{scope.row.MiniAppAdd}}</div>
</template>
</el-table-column>
<el-table-column
property="XiaoBaoTuanCount"
:label="$t('objFill.v101.SalesModule.xiaobaotts')"
width="">
<el-table-column property="OrderCount" label="团队订单数" width="">
</el-table-column>
<el-table-column
property="zanBi"
:label="$t('objFill.v101.SalesModule.xiaosouezb')"
width="">
<el-table-column property="CouponCount" label="优惠卷订单数" width="">
</el-table-column>
<el-table-column property="LXYCount" label="小程序订单数" width="">
</el-table-column>
</el-table>
</div>
</template>
<script>
import Vue from "vue";
import moment from 'moment'
export default {
import Vue from "vue";
import moment from 'moment'
export default {
data() {
return {
S_CheckAllOrder: false,
......@@ -209,8 +146,8 @@ export default {
RB_Branch_Id: -1,
RB_Department_Id: 0,
EnterID: 0,
tStartDates: [],
qStartDates: [],
tStartDates: [], //出发日期
qStartDates: [], //报名日期
GroupBy: "EnterID",
QueryType: 0,
},
......@@ -238,24 +175,105 @@ export default {
CompanyList: [],
DepartmentList: [],
EmployeeList: [],
userInfo: {},
};
},
created() {},
mounted() {
this.settStartDates()
this.GetAuth()
this.initColumns();
created() {
this.userInfo = this.getLocalStorage();
this.getCompanyList();
this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
this.getDepartmentMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id;
this.employeeMsg.employeeMsg = this.getLocalStorage().RB_Group_id;
if (this.$route.query.CStartDate && this.$route.query.CEndDate) {
this.msg.qStartDates.push(this.$route.query.CStartDate.replace(/\//g, '-'));
this.msg.qStartDates.push(this.$route.query.CEndDate.replace(/\//g, '-'));
} else {
this.settStartDates();
}
if (this.$route.query.BranchId) {
this.msg.RB_Branch_Id = Number(this.$route.query.BranchId);
this.getDepartmentMsg.RB_Branch_Id = Number(this.$route.query.BranchId);
this.employeeMsg.RB_Branch_Id = Number(this.$route.query.BranchId);
this.getDepartment();
this.activeName = "third";
}
if (this.msg.RB_Branch_Id == -1) {
if (this.userInfo.RB_Branch_id != 0 && this.userInfo.RB_Branch_id != 49) {
this.msg.RB_Branch_Id = Number(this.userInfo.RB_Branch_id);
this.getDepartmentMsg.RB_Branch_Id = Number(this.userInfo.RB_Branch_id);
this.employeeMsg.RB_Branch_Id = Number(this.userInfo.RB_Branch_id);
this.getDepartment();
this.activeName = "third";
}
}
if (this.$route.query.RB_Department_Id) {
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id);
this.employeeMsg.DepartmentId = Number(this.$route.query.RB_Department_Id);
this.getEmployee();
this.activeName = 'second';
}
if (this.$route.query.EmployeeId) {
this.msg.EnterID = Number(this.$route.query.EmployeeId);
this.activeName = 'first';
}
this.getSearchData();
},
mounted() {
this.GetAuth()
this.initColumns();
this.initData();
this.getCompanyList();
this.initAuthor();
//this.pageSize = this.calcPageSize(40); 此页不需要分页
},
methods: {
goUrl(name,rowData){
if(name=='salesVolumeRankEntryForm') this.customCompFunc(rowData)
goUrl(name, rowData) {
if (name == 'salesVolumeRankEntryForm') this.customCompFunc(rowData)
},
gotoCustomer(item, type) {
let Time = [this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")), this.getBeforeDate(0, new Date().Format(
"yyyy-MM-dd"))]
let query = {};
//客户总数
if (type == 1) {
query = {
blank: "y",
RB_Branch_Id: this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id,
EnterID: this.msg.EnterID,
}
}
//今日新增
else if (type == 2) {
query = {
EnterTime: Time,
RB_Branch_Id: this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id,
EnterID: this.msg.EnterID,
blank: "y",
}
}
//小程序激活数
else if (type == 3) {
query = {
activation: 1,
RB_Branch_Id: this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id,
EnterID: this.msg.EnterID,
blank: "y",
}
}
//今日激活数
else if (type == 4) {
query = {
activationTime: Time,
activation: 1,
RB_Branch_Id: this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id,
EnterID: this.msg.EnterID,
blank: "y",
}
}
this.OpenNewPage('/customerTransfer', query)
},
customCompFunc(rowData) {
this.$router.push({
......@@ -268,7 +286,8 @@ export default {
tStartDates: this.msg.tStartDates,
qStartDates: this.msg.qStartDates,
},
});},
});
},
GetAuth() {
var actionCode = this.$AuthCode.S_CheckAllOrder;
this.CheckUserAuth(actionCode, res => {
......@@ -283,40 +302,33 @@ export default {
initData() {
this.loading = true;
let param = {
RB_Branch_Id:
this.msg.RB_Branch_Id == -1 ? null : this.msg.RB_Branch_Id,
RB_Department_Id:
this.msg.RB_Department_Id == 0 ? null : this.msg.RB_Department_Id,
RB_Branch_Id: this.msg.RB_Branch_Id == -1 ? null : this.msg.RB_Branch_Id,
RB_Department_Id: this.msg.RB_Department_Id == 0 ? null : this.msg.RB_Department_Id,
EnterID: this.msg.EnterID == 0 ? null : this.msg.EnterID,
QStartDate:
this.msg.tStartDates && this.msg.tStartDates.length == 2
? this.msg.tStartDates[0]
: null,
QEndDate:
this.msg.tStartDates && this.msg.tStartDates.length == 2
? this.msg.tStartDates[1]
: null,
CStartDate:
this.msg.qStartDates && this.msg.qStartDates.length == 2
? this.msg.qStartDates[0]
: null,
CEndDate:
this.msg.qStartDates && this.msg.qStartDates.length == 2
? this.msg.qStartDates[1]
: null,
QStartDate: this.msg.tStartDates && this.msg.tStartDates.length == 2 ?
this.msg.tStartDates[0] : null,
QEndDate: this.msg.tStartDates && this.msg.tStartDates.length == 2 ?
this.msg.tStartDates[1] : null,
CStartDate: this.msg.qStartDates && this.msg.qStartDates.length == 2 ?
this.msg.qStartDates[0] : null,
CEndDate: this.msg.qStartDates && this.msg.qStartDates.length == 2 ?
this.msg.qStartDates[1] : null,
GroupBy: this.msg.GroupBy,
QueryType: this.msg.QueryType,
};
if (!param.QStartDate) {
param.QStartDate = "2019-01-01";
}
this.tableData = []
this.tableData = [];
this.apipost("sellorder_get_sellvolumerankNew", param, (r) => {
r.data.data.forEach((x) => {
var tempData = r.data.data;
if (tempData && tempData.length > 0) {
tempData.forEach((x) => {
x.incomeVal = parseFloat(x.income);
x.avgPrice = parseFloat(x.avgPrice);
});
this.tableData = r.data.data;
}
this.tableData = tempData;
this.loading = false;
});
},
......@@ -328,8 +340,7 @@ export default {
(res) => {
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
} else {
}
} else {}
},
(err) => {}
);
......@@ -379,38 +390,36 @@ export default {
);
},
settStartDates() {
if(this.$route.query.tStartDates){
if (this.$route.query.tStartDates) {
this.msg.tStartDates = this.$route.query.tStartDates
}else{
} else {
let date = moment().format('yyyy-MM-DD')
let start = moment().subtract(1, 'months').format('yyyy-MM-DD')
this.msg.tStartDates = [start, date]
//this.msg.tStartDates = [start, date]
this.msg.qStartDates = [start, date];
}
},
handleClick(tab, event) {
this.msg.EnterID = 0;
getSearchData() {
this.msg.QueryType = 0;
if (this.activeName == "first") this.msg.GroupBy = "EnterID";
else if (this.activeName == "second")
this.msg.GroupBy = "RB_Department_Id";
else if (this.activeName == "third") {
this.msg.GroupBy = "RB_Branch_Id";
this.msg.RB_Department_Id = 0;
//this.msg.RB_Department_Id = 0;
} else {
this.msg.RB_Department_Id = 0;
this.msg.RB_Branch_Id = -1;
//this.msg.RB_Department_Id = 0;
//this.msg.RB_Branch_Id = -1;
this.msg.GroupBy = "EnterID";
this.msg.QueryType = 4;
}
},
handleClick(tab, event) {
this.msg.EnterID = 0;
this.getSearchData();
this.initColumns();
this.initData();
},
handleCurrentChanges(val) {
// this.pageIndex = val;
// this.tableData = this.getTableData().filter(
// (item, index) => index == val - 1
// );
},
sortChange(param) {
//自己写实现
let d = JSON.parse(JSON.stringify(this.tableData));
......@@ -452,29 +461,36 @@ export default {
},
filterMethod(filters) {},
},
};
};
</script>
<style scoped>
.salesVolumeRank-box .query-box {
.salesVolumeRank-box .query-box {
padding: 0 !important;
border-bottom: 0px;
}
.salesVolumeRank-box .el-tabs__nav-wrap::after {
}
.salesVolumeRank-box .el-tabs__nav-wrap::after {
height: 1px;
}
.salesVolumeRank-box .el-date-editor.el-input,
.salesVolumeRank-box .el-date-editor.el-input__inner {
}
.salesVolumeRank-box .el-date-editor.el-input,
.salesVolumeRank-box .el-date-editor.el-input__inner {
width: 100% !important;
}
.salesVolumeRank-box .el-date-editor .el-range-input,
.el-date-editor .el-range-separator {
}
.salesVolumeRank-box .el-date-editor .el-range-input,
.el-date-editor .el-range-separator {
font-size: 12px;
}
/deep/.salesVolumeRank-box .el-table th.el-table__cell{
}
/deep/.salesVolumeRank-box .el-table th.el-table__cell {
background-color: #E6E6E6 !important;
}
.clickText{
}
.clickText {
color: #33B3FF;
cursor: pointer;
}
}
</style>
src/router/config.js
View file @ 7d500d61
......@@ -4330,6 +4330,14 @@ export default {
title: '平台在途查询'
},
},
{ //销售 财务单据 平台在途查询
path: '/platformFinancialSale',
name: 'platformFinancialSale',
component: resolve => require(['@/components/FinancialModule/platformFinancialSale'], resolve),
meta: {
title: '平台发票申请'
},
},
{ //财务 财务单据 报账合并结算
path: '/ConsolidationOfAccounts',
name: 'ConsolidationOfAccounts',
......
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