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
Expand all Hide 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>
<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();
this.getOrderDetail();
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>
<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,7 +812,11 @@
})
}
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 style="display: flex;flex-wrap: wrap; ">
<template v-if="multipleSelection.length>0">
<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}}
</el-tag>
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.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,10 +669,10 @@ 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;
this.multipleSelection=data;
this.loading=false;
}else{
this.loading= false;
......@@ -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
This diff is collapsed.
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){
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
});
}
// 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,
blank: "y",
}
this.OpenNewPage('/salesVolumeRank',query)
},
changeDepart(node, instanceId){
this.parameters.RB_Department_Id=node.DepartmentId;
......
src/components/rank/salesVolumeRank.vue
View file @ 7d500d61
This diff is collapsed.
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