Skip to content

S
SuperMan
Commit 27991256 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents d48424e6 ceb26bd8
Hide whitespace changes
Inline Side-by-side
Showing with 869 additions and 771 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 27991256
...@@ -420,32 +420,11 @@ ...@@ -420,32 +420,11 @@
<p class="illustrate-left">附加说明：<span class="fr" v-if="GetDetail.ComplainID > 0" <p class="illustrate-left">附加说明：<span class="fr" v-if="GetDetail.ComplainID > 0"
@click="goUrl('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号：</span> @click="goUrl('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号：</span>
<span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span> <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span>
<!--
GetDetail.OtherType!=64
<span v-if="GetDetail.OtherType==48"
@click="GoOPurl('OPsalesCommissiondetails',GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;
text-decoration: underline;">
国内提成详情</span>
<span
v-if="GetDetail.OtherType==43"
@click="GoOPurl('domesticCommissiondetails',GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">国内提成详情</span>
<span v-if="GetDetail.OtherType==73"
@click="GoOPurl('OpComPersonDetails',GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
出境提成详情</span>
<span
v-if="GetDetail.OtherType==72"
@click="GoOPurl('TradeTicketDetails',GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">出境提成详情</span>
<span v-if="GetDetail.OtherType==70"
@click="GoOPurl(GetDetail.ReFinanceId2 == 1?'domesticCommissiondetailsTW':'domesticCommissionUserTW',GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
台湾提成详情</span>
-->
<!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 --> <!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 -->
<span v-if="(GetDetail.OtherType&&GetDetail.OtherType!=55 && GetDetail.OtherType!=56 && GetDetail.OtherType!=57 <span v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48 || GetDetail.OtherType==63
&& GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66 || GetDetail.OtherType==64 || GetDetail.OtherType==69 || GetDetail.OtherType==70
&& GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=74&& GetDetail.OtherType!=75)|| || GetDetail.OtherType==72 || GetDetail.OtherType==76 || GetDetail.OtherType==73 || GetDetail.OtherType==77))
((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64)" || ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64)"
@click="GoRoyaltyUrl(GetDetail)" @click="GoRoyaltyUrl(GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;"> style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
提成详情 提成详情
...@@ -674,6 +653,8 @@ ...@@ -674,6 +653,8 @@
<div class="_tit _tit2 w890px"> <div class="_tit _tit2 w890px">
<!-- 预付款冲抵 电商商品 --> <!-- 预付款冲抵 电商商品 -->
<czBillModule :FrID='ID' /> <czBillModule :FrID='ID' />
<!-- 预收款抵用 -->
<UserCredit v-if="(GetDetail.OtherType==74&&GetDetail.ReFinanceId)||GetDetail.DepositCustomerId" :GetDetail="GetDetail"></UserCredit>
<!-- 关联单号 --> <!-- 关联单号 -->
<CostmonthDetails v-if="GetDetail.OtherType==75||(GetDetail.CostMonthTemplate&&getTemplate(GetDetail))" :GetDetail="GetDetail"> <CostmonthDetails v-if="GetDetail.OtherType==75||(GetDetail.CostMonthTemplate&&getTemplate(GetDetail))" :GetDetail="GetDetail">
</CostmonthDetails> </CostmonthDetails>
...@@ -1556,6 +1537,7 @@ import huijiBill from "./FinancialSubmodule/huijiBill.vue"; ...@@ -1556,6 +1537,7 @@ import huijiBill from "./FinancialSubmodule/huijiBill.vue";
import czBillModule from "./FinancialSubmodule/czBillModule.vue"; import czBillModule from "./FinancialSubmodule/czBillModule.vue";
// import MsgBus from '../../assets/utils/msgBus.js'; // import MsgBus from '../../assets/utils/msgBus.js';
import CostmonthDetails from './components/CostmonthDetails'; import CostmonthDetails from './components/CostmonthDetails';
import UserCredit from './components/UserCredit';
export default { export default {
data(){ data(){
return{ return{
...@@ -1737,7 +1719,8 @@ export default { ...@@ -1737,7 +1719,8 @@ export default {
'myJiPiaoBill': myJiPiaoBill, 'myJiPiaoBill': myJiPiaoBill,
'huijiBill': huijiBill, 'huijiBill': huijiBill,
'czBillModule':czBillModule, 'czBillModule':czBillModule,
CostmonthDetails CostmonthDetails,
UserCredit
}, },
methods:{ methods:{
getTemplate(GetDetail){ getTemplate(GetDetail){
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 27991256
...@@ -863,10 +863,14 @@ ...@@ -863,10 +863,14 @@
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">出境提成详情</span> style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">出境提成详情</span>
--> -->
<!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 --> <!-- 排除机票单号、票务提成、单项订单、手配费、成本月结 -->
<span v-if="(GetDetail.OtherType&&GetDetail.OtherType!=55 && GetDetail.OtherType!=56 && GetDetail.OtherType!=57 <!-- (GetDetail.OtherType&&GetDetail.OtherType!=55 && GetDetail.OtherType!=56 && GetDetail.OtherType!=57
&& GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66 && GetDetail.OtherType!=61 && GetDetail.OtherType!=62 && GetDetail.OtherType!=66
&& GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=74&& GetDetail.OtherType!=75)|| && GetDetail.OtherType!=67 && GetDetail.OtherType!=68&& GetDetail.OtherType!=71&& GetDetail.OtherType!=74&& GetDetail.OtherType!=75)||
((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64)" ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64) -->
<span v-if="(GetDetail.OtherType&&(GetDetail.OtherType==43 || GetDetail.OtherType==48 || GetDetail.OtherType==63
|| GetDetail.OtherType==64 || GetDetail.OtherType==69 || GetDetail.OtherType==70
|| GetDetail.OtherType==72 || GetDetail.OtherType==76 || GetDetail.OtherType==73 || GetDetail.OtherType==77))
|| ((GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64)"
@click="GoRoyaltyUrl(GetDetail)" @click="GoRoyaltyUrl(GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;"> style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
提成详情 提成详情
...@@ -907,8 +911,6 @@ ...@@ -907,8 +911,6 @@
@click="ImpressionSingleDetails('SingleticketOrderListOP')">{{'单项门票订单:'+GetDetail.ReFinanceId}}</div> @click="ImpressionSingleDetails('SingleticketOrderListOP')">{{'单项门票订单:'+GetDetail.ReFinanceId}}</div>
<div v-if="GetDetail.OtherType==67||GetDetail.OtherType==68" class="illustrate-right fygsbumen-box-right" <div v-if="GetDetail.OtherType==67||GetDetail.OtherType==68" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails('CharterOrderListOP')">{{'单项车订单:'+GetDetail.ReFinanceId}}</div> @click="ImpressionSingleDetails('CharterOrderListOP')">{{'单项车订单:'+GetDetail.ReFinanceId}}</div>
<!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right" <!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{'单项销售提成详情'}}</div> @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{'单项销售提成详情'}}</div>
<div v-if="GetDetail.OtherType==64" class="illustrate-right fygsbumen-box-right" <div v-if="GetDetail.OtherType==64" class="illustrate-right fygsbumen-box-right"
...@@ -1117,6 +1119,8 @@ ...@@ -1117,6 +1119,8 @@
<div class="_tit _tit2 w890px"> <div class="_tit _tit2 w890px">
<!-- 预付款冲抵 电商商品--> <!-- 预付款冲抵 电商商品-->
<czBillModule :FrID='ID' /> <czBillModule :FrID='ID' />
<!-- 预收款抵用 -->
<UserCredit v-if="(GetDetail.OtherType==74&&GetDetail.ReFinanceId)||GetDetail.DepositCustomerId" :GetDetail="GetDetail"></UserCredit>
<!-- 关联单号 --> <!-- 关联单号 -->
<CostmonthDetails v-if="GetDetail.OtherType==75||(GetDetail.CostMonthTemplate&&getTemplate(GetDetail))" :GetDetail="GetDetail"> <CostmonthDetails v-if="GetDetail.OtherType==75||(GetDetail.CostMonthTemplate&&getTemplate(GetDetail))" :GetDetail="GetDetail">
</CostmonthDetails> </CostmonthDetails>
...@@ -1463,6 +1467,7 @@ ...@@ -1463,6 +1467,7 @@
import dmcTravelBill from './FinancialSubmodule/DmcTravelBillModule'; //线路 import dmcTravelBill from './FinancialSubmodule/DmcTravelBillModule'; //线路
import CostmonthDetails from './components/CostmonthDetails'; import CostmonthDetails from './components/CostmonthDetails';
import UserCredit from './components/UserCredit';
export default { export default {
data() { data() {
return { return {
...@@ -1564,7 +1569,8 @@ ...@@ -1564,7 +1569,8 @@
"czBillModule": czBillModule, "czBillModule": czBillModule,
"dmcTravelBill": dmcTravelBill, "dmcTravelBill": dmcTravelBill,
CostmonthDetails CostmonthDetails,
UserCredit
}, },
created() { created() {
// // crm自动登陆传过来的参数 // // crm自动登陆传过来的参数
...@@ -2431,6 +2437,10 @@ ...@@ -2431,6 +2437,10 @@
} }
this.chongJudge(data) this.chongJudge(data)
this.GetDetail = data; this.GetDetail = data;
if (this.GetDetail.DetailList) { if (this.GetDetail.DetailList) {
this.GetDetail.DetailList.forEach(item => { this.GetDetail.DetailList.forEach(item => {
if (item.CostTypeName == "领队导游资金池领款") { if (item.CostTypeName == "领队导游资金池领款") {
......
src/components/FinancialModule/MonthlyCostStatement/index.vue
View file @ 27991256
...@@ -159,8 +159,8 @@ ...@@ -159,8 +159,8 @@
</el-form> </el-form>
<ul class="clearfix"> <ul class="clearfix">
<li class="hight_query"> <li class="hight_query">
<span> <span style="font-size: 13px;color: red;cursor: pointer;">
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em> <em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo" style="font-size: 12px;"></i></em>
</span> </span>
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">导出</button> <button class="normalBtn" @click="method5()">导出</button>
...@@ -1024,11 +1024,13 @@ export default { ...@@ -1024,11 +1024,13 @@ export default {
let ids let ids
ids = this.multipleSelection.map(x=>{ return x.FrID}) ids = this.multipleSelection.map(x=>{ return x.FrID})
let orderObj = { let orderObj = {
CostType: 1547,
OtherType: 75, OtherType: 75,
Money: this.getMoney(), Money: this.getMoney(),
isVerifyMoney: true, isVerifyMoney: true,
ReFinanceIds: ids.join(','),//单号 ReFinanceIds: ids.join(','),//单号
ReFinanceId2: 3,//成本 ReFinanceId2: 3,//成本
} }
this.$confirm(`已选单号：${ids.join(',')}，总金额：${orderObj.Money},是否继续生成财务单据`, "提示", { this.$confirm(`已选单号：${ids.join(',')}，总金额：${orderObj.Money},是否继续生成财务单据`, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
...@@ -1040,6 +1042,7 @@ export default { ...@@ -1040,6 +1042,7 @@ export default {
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query: { query: {
'Type': 2, 'Type': 2,
'searchTitle': '月结付款',
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj), 'orderObj': JSON.stringify(orderObj),
} }
......
src/components/FinancialModule/PrestorageManagement/components/detailList.vue
View file @ 27991256
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<template > <template >
<el-dialog title="使用明细" :visible.sync="showDetail" center @close="cancelBtn"> <el-dialog title="使用明细" :visible.sync="showDetail" center @close="cancelBtn">
<div style="display: flex;justify-content: end;"> <button class="normalBtn" @click="prestore()">预存</button> </div>
<div class="page_fnDm page_RecPayQuery"> <div class="page_fnDm page_RecPayQuery">
<div class="_fnDm_content" v-loading='loading'> <div class="_fnDm_content" v-loading='loading'>
<el-table <el-table
...@@ -20,7 +21,13 @@ ...@@ -20,7 +21,13 @@
{{ scope.row.Type==1?'已存入':scope.row.Type==2?'待存入':scope.row.Type==3?'退回':scope.row.Type==4?'使用':'' }} {{ scope.row.Type==1?'已存入':scope.row.Type==2?'待存入':scope.row.Type==3?'退回':scope.row.Type==4?'使用':'' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Money" label="进出金额"></el-table-column> <el-table-column prop="" label="进出金额">
<template slot-scope="scope">
<span :style="{'color': scope.row.Type==3||scope.row.Type==4?'#E95252':''}">
{{ scope.row.Type==1||scope.row.Type==2?'+':'-'}}{{ scope.row.Money}}
</span>
</template>
</el-table-column>
<el-table-column prop="" label="关联单号"> <el-table-column prop="" label="关联单号">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;" @click="openDetails(scope.row.FrID)">{{ scope.row.FrID }}</span> <span style="cursor: pointer;color: #00C6FF;" @click="openDetails(scope.row.FrID)">{{ scope.row.FrID }}</span>
...@@ -29,9 +36,9 @@ ...@@ -29,9 +36,9 @@
<el-table-column prop="" label="单号状态"> <el-table-column prop="" label="单号状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="font-size: 12px;"> <span style="font-size: 12px;">
<i v-if="scope.row.Status===2" class="iconfont icon-yiqueren" style="color: #4BCA81;font-size: 12px;">{{scope.row.StatusName}}</i> <i v-if="scope.row.Status===1" class="iconfont icon-yiqueren" style="color: #4BCA81;font-size: 12px;">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===4" class="iconfont icon-yiquxiao" style="color: #4BCA81">{{scope.row.StatusName}}</i> <i v-if="scope.row.Status===4" class="iconfont icon-yiquxiao" style="color: #4BCA81">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===1" class="iconfont icon-daiqueren" style="color: #959595;font-size: 12px;">{{scope.row.StatusName}}</i> <i v-if="scope.row.Status===2" class="iconfont icon-daiqueren" style="color: #959595;font-size: 12px;">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===3" class="iconfont icon-shenhebohui" style="color: #E95252">{{scope.row.StatusName}}</i> <i v-if="scope.row.Status===3" class="iconfont icon-shenhebohui" style="color: #E95252">{{scope.row.StatusName}}</i>
<i v-if="scope.row.Status===0" class="iconfont icon-zancun" style="color: #FF9C01">{{scope.row.StatusName}}</i> <i v-if="scope.row.Status===0" class="iconfont icon-zancun" style="color: #FF9C01">{{scope.row.StatusName}}</i>
</span> </span>
...@@ -82,6 +89,23 @@ export default { ...@@ -82,6 +89,23 @@ export default {
var that = this; var that = this;
}, },
methods:{ methods:{
prestore(){
this.cancelBtn()
let orderObj = {
CostType: 1546,
OtherType: 74,
ReFinanceId: this.msg.DepositCustomerId,//单号
isPrestore: true,//是预存制单
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query: {
'Type': 1,
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
}
});
},
// 单据详情 // 单据详情
openDetails(FrID) { openDetails(FrID) {
this.cancelBtn() this.cancelBtn()
......
src/components/FinancialModule/PrestorageManagement/prestoreList.vue
View file @ 27991256
<style scoped> <style scoped>
/deep/.el-table th.el-table__cell{
background-color: #E6E6E6;
}
</style> </style>
<template > <template >
...@@ -12,12 +14,12 @@ ...@@ -12,12 +14,12 @@
<el-input placeholder="" class="" v-model="msg.RemitterName" @keyup.native="checkInteger(msg,'FrID')" maxlength="8"></el-input> <el-input placeholder="" class="" v-model="msg.RemitterName" @keyup.native="checkInteger(msg,'FrID')" maxlength="8"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="ID："> <el-form-item label="ID：">
<el-input placeholder="" class="" v-model="msg.ClientIdStr" @keyup.native="checkInteger(msg,'FrID')" maxlength="8" <el-input placeholder="" class="" v-model="msg.ClientIdStr" @keyup.native="checkInteger(msg,'FrID')" maxlength="8"
placeholder="多个ID英文逗号,分隔"></el-input> placeholder="多个ID英文逗号,分隔"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="使用日期："> <el-form-item label="使用日期：">
<el-date-picker class="h34" <el-date-picker class="h34"
...@@ -53,21 +55,24 @@ ...@@ -53,21 +55,24 @@
{{ scope.row.Contact+'/'+scope.row.ContactNumber }} {{ scope.row.Contact+'/'+scope.row.ContactNumber }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Income" label="已存入"></el-table-column> <el-table-column prop="" label="已存入">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;" @click="seeDeta(scope.row)">{{ scope.row.Income }}</span>
</template>
</el-table-column>
<el-table-column prop="" label="待存入"> <el-table-column prop="" label="待存入">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.WaitIncome?scope.row.WaitIncome:'-' }} <span style="cursor: pointer;color: #00C6FF;" @click="seeDeta(scope.row)">{{ scope.row.WaitIncome }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Refund" label="退款"> <el-table-column prop="Refund" label="退款">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.Refund?scope.row.Refund:'-' }} <span style="cursor: pointer;color: #00C6FF;" @click="seeDeta(scope.row)">{{ scope.row.Refund }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="UseMoney" label="已使用"> <el-table-column prop="UseMoney" label="已使用">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.UseMoney" style="cursor: pointer;color: #00C6FF;" @click="seeDeta(scope.row)">{{ scope.row.UseMoney }}</span> <span style="cursor: pointer;color: #00C6FF;" @click="seeDeta(scope.row)">{{ scope.row.UseMoney }}</span>
<template v-else>-</template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="期末余额"> <el-table-column prop="" label="期末余额">
...@@ -121,7 +126,12 @@ export default { ...@@ -121,7 +126,12 @@ export default {
mounted(){ mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.getPageList(); this.getPageList();
this.msg.ClientIdStr = this.$route.query.ClientIdStr?this.$route.query.ClientIdStr:""
if(this.$route.query.startDate&&this.$route.query.endDate){
this.productionDate = this.$route.query.startDate?[this.$route.query.startDate,this.$route.query.endDate]:[]
this.msg.QStartDate = this.productionDate?this.productionDate[0]:''
this.msg.QEndDate = this.productionDate?this.productionDate[1]:''
}
var that = this; var that = this;
}, },
methods:{ methods:{
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 27991256
<style scoped> <style scoped>
.page_fnDm{background-color: white} /deep/.el-table th.el-table__cell{
.query-box{overflow: inherit} background-color: #E6E6E6;
._nav{margin: 20px 0 0 0 ;background-color: #f5f5f5;} }
._nav li{float: left;font-size: 14px;color: #666666;padding: 15px 20px;cursor: pointer;position: relative;background-color: #f1f1f1;margin-right: 5px}
._nav li._active{background-color:#FFFFFF;color: #333333 }
._nav li._active::after{content: "";width: 20px;height: 3px;background-color: #E95252;display: inline-block;position: absolute;bottom: 0;left: 38%;}
.el-range-editor.el-input__inner{border-radius: 0}
.query-box{border: none}
.hight_query{position: relative;}
.hight_query span{height: 34px;line-height: 34px;color: #E95252}
.hight_query span .icon-gengduo{font-size: 12px}
.hight_query span em{text-decoration: underline;cursor: pointer;}
.hight_query_box{position: absolute;background-color: white;z-index: 2000;right: 200px;width: 800px;}
._hqb_shadow{box-shadow:3px 2px 10px rgb(204, 203, 203);border: 1px solid #ececec;}
.query-box ul {overflow: initial;}
.hqb_t{padding: 10px 20px;font-size: 16px;background-color: #E95252;border: 1px solid #E95252;color: #fff;text-align: center;margin-bottom: 15px}
.query-box li:last-child{float: left}
.query-box>ul>li:last-child{float: right;}
.query-box .hight_query ul .el-input{width: inherit }
.hight_query_box ul li{margin-top: 0;float: left;margin-right: 15px}
.hight_query_box ul li label{font-size: 14px}
.hight_query_box .el-form{padding: 0 20px}
.hight_query_box ul li._hqb_btn{float: right;margin-right: 25px;padding-top: 5px;position: inherit}
.Receipt_box{padding: 15px;color: #c94052;width: 614px;background-color: rgba(242, 242, 242, 1);border: 1px solid rgba(228, 228, 228, 1)}
.Receipt_box.color_blur{color: #106BAF;}
.Receipt_box.color_blur .rb_stit span{display: inline-block;border-bottom: 2px solid #106BAF;padding: 0 20px}
.rb_tit{font-size: 18px;text-align: center}
.rb_stit{font-size: 14px;text-align: center}
.rb_stit span{display: inline-block;border-bottom: 2px solid #C94052;padding: 0 20px}
.rb_top_row{display: flex;justify-content: space-between;font-size: 12px;}
.rb_top_row span._r_name{color: #333333}
.rb_top_row span._r_bold{font-weight: bold}
.rb_top_row ._r_time span{color: #333333}
._r_mb5{margin-bottom: 5px;}
.Receipt_table{width: 100%;font-size: 14px;text-align: center}
.Receipt_table .th{font-weight: 200 !important}
._r_mt10{margin-top: 10px;}
._bg__{display: inline-block;padding: 2px 8px;color: white;border-radius: 4px}
._bg_red{background-color: #E95252;}
._bg_green{background-color: #2BB87C}
.text_d{text-decoration: underline;cursor: pointer;}
.PingFangSC{font-weight: bold}
.Bill_par{position: relative;}
tr th,tr td{text-align: left;padding-left: 20px;}
tr._item_list{border-bottom: 1px solid #E5E5E5;height: 78px;}
tr._item_list td{border-bottom: 1px solid #e5e5e5; padding: 10px;}
/* tr._t_head th{border-top: 1px solid #e5e5e5;} */
tr._item_list td:first-child{border-left: 1px solid #e5e5e5;}
tr._item_list td:last-child{border-right: 1px solid #e5e5e5;}
._head_img{width: 28px;height: 28px;border-radius: 50%;vertical-align:middle;}
._btn_group{font-size: 14px;}
.icon-daiqueren{color: #4BCA81}
.icon-yiqueren{color: #4BCA81}
.icon-yiquxiao{color: #959595}
.icon-shenhebohui{color: #E95252}
.icon-icon-zancun{color: #FF9C01}
.zhuiClass{
}
.singeRowTable tr:hover{background-color: white}
._TradeWayList{padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width: 230px}
._bold{font-weight: bold}
._bank_name,._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;}
._bank_name{margin-left: 10px;}
._bank_type{background-color: #2AAEF2}
._bank_type2{background-color: #FF9C01}
._font_init{color: #333333;font-size: 12px;vertical-align:top;}
.InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
.changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
.changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
.changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
._icon_btn i{width: 30px;height: 30px;display: inline-block;color: white !important;border-radius: 50%;text-align: center;line-height: 30px;margin-right: 10px;cursor: pointer;outline: none;}
._icon_btn i.edit{background-color: #00C6FF;font-size: 16px;}
._icon_btn i.edit:hover{background-color: #59daff}
._icon_btn i.edit:active{background-color: #00b8ec}
._icon_btn i.icon-sousuo{background-color: #47BF8C;}
._icon_btn i.icon-sousuo:hover{background-color: #66bb97}
._icon_btn i.icon-sousuo:active{background-color: #35ab79}
._icon_btn i.icon-ico_commodity_defaul{background-color: #F16C3C;}
._icon_btn i.icon-ico_commodity_defaul:hover{background-color: #e87c54}
._icon_btn i.icon-ico_commodity_defaul:active{background-color: #f76630}
._icon_btn i.icon-quxiao1{background-color: #E95252;}
._icon_btn i.icon-quxiao1:hover{background-color: #ea6d6d}
._icon_btn i.icon-quxiao1:active{background-color:#e42d2d}
._icon_btn i.icon-zhuanjiao1{background-color: #E6A014;font-size: 16px;}
._icon_btn i.icon-zhuanjiao1:hover{background-color: rgb(235, 184, 84)}
._icon_btn i.icon-zhuanjiao1:active{background-color: rgb(223, 150, 6)}
._tag_span{background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #409eff;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;}
._tag_span._tag_warr{background-color: rgba(103,194,58,.1);border-color: rgba(103,194,58,.2);color: #67c23a;}
._fex_cen{display: flex;align-items: center}
._pad5{padding: 5px 10px;}
._color_gar{color: gray}
._TCIDAndTCNUMList{
display: flex;
}
/deep/.page_RecPayQuery .horizontal-border>span{
/* display: flex; */
}
/deep/.page_RecPayQuery .horizontal-border>span>span{
/* display: flex;
flex-wrap: wrap !important; */
}
</style> </style>
<template > <template >
...@@ -319,8 +219,8 @@ ...@@ -319,8 +219,8 @@
</el-form> </el-form>
<ul class="clearfix"> <ul class="clearfix">
<li class="hight_query"> <li class="hight_query">
<span> <span style="font-size: 13px;color: red;cursor: pointer;">
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em> <em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo" style="font-size: 12px;"></i></em>
</span> </span>
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">导出</button> <button class="normalBtn" @click="method5()">导出</button>
......
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ 27991256
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<button class="normalBtn page_EasyReport_search" style="left: 900px;" @click="getData(2)">查询</button> <button class="normalBtn page_EasyReport_search" style="left: 900px;" @click="getData(2)">查询</button>
</el-col> </el-col>
</el-row> </el-row>
...@@ -128,12 +128,12 @@ Vue.component("YiYueJump", { ...@@ -128,12 +128,12 @@ Vue.component("YiYueJump", {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
blank: "y" blank: "y"
} }
}); });
} }
...@@ -162,12 +162,12 @@ Vue.component("ErYueJump", { ...@@ -162,12 +162,12 @@ Vue.component("ErYueJump", {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
blank: "y" blank: "y"
} }
}); });
} }
...@@ -195,12 +195,12 @@ Vue.component("SanYueJump", { ...@@ -195,12 +195,12 @@ Vue.component("SanYueJump", {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
blank: "y" blank: "y"
} }
}); });
} }
...@@ -228,12 +228,12 @@ Vue.component("SiYueJump", { ...@@ -228,12 +228,12 @@ Vue.component("SiYueJump", {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
blank: "y" blank: "y"
} }
}); });
} }
...@@ -261,12 +261,12 @@ Vue.component("WuYueJump", { ...@@ -261,12 +261,12 @@ Vue.component("WuYueJump", {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
blank: "y" blank: "y"
} }
}); });
} }
...@@ -294,12 +294,12 @@ Vue.component("LiuYueJump", { ...@@ -294,12 +294,12 @@ Vue.component("LiuYueJump", {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
blank: "y" blank: "y"
} }
}); });
} }
...@@ -327,12 +327,12 @@ Vue.component("QiYueJump", { ...@@ -327,12 +327,12 @@ Vue.component("QiYueJump", {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
blank: "y" blank: "y"
} }
}); });
} }
...@@ -360,12 +360,12 @@ Vue.component("BaYueJump", { ...@@ -360,12 +360,12 @@ Vue.component("BaYueJump", {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
blank: "y" blank: "y"
} }
}); });
} }
...@@ -393,12 +393,12 @@ Vue.component("JiuYueJump", { ...@@ -393,12 +393,12 @@ Vue.component("JiuYueJump", {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
blank: "y" blank: "y"
} }
}); });
} }
...@@ -426,12 +426,12 @@ Vue.component("ShiYueJump", { ...@@ -426,12 +426,12 @@ Vue.component("ShiYueJump", {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
blank: "y" blank: "y"
} }
}); });
} }
...@@ -459,12 +459,12 @@ Vue.component("ShiYiYueJump", { ...@@ -459,12 +459,12 @@ Vue.component("ShiYiYueJump", {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
blank: "y" blank: "y"
} }
}); });
} }
...@@ -492,12 +492,12 @@ Vue.component("ShiErYueJump", { ...@@ -492,12 +492,12 @@ Vue.component("ShiErYueJump", {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
blank: "y" blank: "y"
} }
}); });
} }
...@@ -848,7 +848,7 @@ export default { ...@@ -848,7 +848,7 @@ export default {
}, },
mounted(){ mounted(){
this.financeinfo_post_GetList() this.financeinfo_post_GetList()
this.getCompanyList() this.getCompanyList()
}, },
methods:{ methods:{
...@@ -878,18 +878,18 @@ export default { ...@@ -878,18 +878,18 @@ export default {
}, },
goUrl (path,startDate,endDate,BranchId,tab) { goUrl (path,startDate,endDate,BranchId,tab) {
this.$router.push({ name: path,query:{"startDate":startDate,"endDate":endDate,BranchId:BranchId,blank:'y',tab:tab} }) this.$router.push({ name: path,query:{"startDate":startDate,"endDate":endDate,BranchId:BranchId,blank:'y',tab:tab} })
}, },
GoUrlFan(path,month,year,BranchId, ids,StandardCurrencyId) { GoUrlFan(path,month,year,BranchId, ids,StandardCurrencyId) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids, CostIds:ids,
StandardCurrencyId:StandardCurrencyId, StandardCurrencyId:StandardCurrencyId,
blank: "y" blank: "y"
} }
}); });
}, },
...@@ -903,14 +903,15 @@ export default { ...@@ -903,14 +903,15 @@ export default {
let BranchId=that.msg.BranchId; let BranchId=that.msg.BranchId;
let StandardCurrencyId=that.msg.StandardCurrencyId; let StandardCurrencyId=that.msg.StandardCurrencyId;
let month=column.month; let month=column.month;
if(column.field=="ErYue"){ if(column.field=="ErYue"){
endDate=that.getFirstAndLastMonthDay(that.year,"02"); endDate=that.getFirstAndLastMonthDay(that.year,"02");
}else{ }else{
endDate=that.year+"-"+column.end endDate=that.year+"-"+column.end
} }
if(rowIndex<15){ if(rowIndex<15){
console.log(rowData.ZhaiYao,'----11111111111')
if(BranchId == 1245){ if(BranchId == 1245){
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} }) that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
}else if(rowData.ZhaiYao=="联运收入"){ }else if(rowData.ZhaiYao=="联运收入"){
...@@ -929,7 +930,7 @@ export default { ...@@ -929,7 +930,7 @@ export default {
}else{ }else{
if(rowData.ZhaiYao=="员工提成"){ if(rowData.ZhaiYao=="员工提成"){
if(Number(this.year)==2019){ if(Number(this.year)==2019){
if(column.title=="十月" || column.title=="十一月" || column.title=="十二月"){ if(column.title=="十月" || column.title=="十一月" || column.title=="十二月"){
let CostIds=""; let CostIds="";
CostIds=rowData.CostIds.replace('112,', ''); CostIds=rowData.CostIds.replace('112,', '');
...@@ -955,7 +956,7 @@ export default { ...@@ -955,7 +956,7 @@ export default {
StandardCurrencyId,) StandardCurrencyId,)
} }
} }
else if(rowData.ZhaiYao=="歐洲與南亞損失分攤"){ else if(rowData.ZhaiYao=="歐洲與南亞損失分攤"){
that.goUrl("AirTicketLoss",startDate,endDate,BranchId,"机票分摊") that.goUrl("AirTicketLoss",startDate,endDate,BranchId,"机票分摊")
...@@ -964,49 +965,74 @@ export default { ...@@ -964,49 +965,74 @@ export default {
if(that.msg.BranchId==1218){ if(that.msg.BranchId==1218){
this.$router.push({ this.$router.push({
path: "/JumpReport", path: "/JumpReport",
query: { query: {
year:rowData.Year, year:rowData.Year,
month:month, month:month,
BranchId:rowData.BranchId, BranchId:rowData.BranchId,
CostIds:rowData.CostIds, CostIds:rowData.CostIds,
StandardCurrencyId:StandardCurrencyId, StandardCurrencyId:StandardCurrencyId,
"IsJapanNonbusinessIncome":1, "IsJapanNonbusinessIncome":1,
blank: "y" blank: "y"
} }
}); });
}else{ }else{
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds,StandardCurrencyId) that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds,StandardCurrencyId)
} }
}else if(rowData.ZhaiYao=="电商收入" ||rowData.ZhaiYao=="电商支出"||rowData.ZhaiYao=="电商手续费"){ }else if(rowData.ZhaiYao=="电商收入" ||rowData.ZhaiYao=="电商支出"||rowData.ZhaiYao=="电商手续费"){
//网络印象 //网络印象
if(that.msg.BranchId==1224 || that.msg.BranchId==-1 ){ if(that.msg.BranchId==1224 || that.msg.BranchId==-1 ){
this.$router.push({ this.$router.push({
path: "/fxOrderProfitLossList", path: "/fxOrderProfitLossList",
query: { query: {
year:rowData.Year, year:rowData.Year,
month:month, month:month,
BranchId:rowData.BranchId, BranchId:rowData.BranchId,
CostIds:rowData.CostIds, CostIds:rowData.CostIds,
"IsJapanNonbusinessIncome":1, "IsJapanNonbusinessIncome":1,
blank: "y" blank: "y"
} }
}); });
} }
}else if(rowData.ZhaiYao=="预收款(团费)"||rowData.ZhaiYao=="预收款(抵用)"){
if(column.title=="一月" || column.title=="二月" || column.title=="三月"||
column.title=="四月" || column.title=="五月" || column.title=="六月" ||
column.title=="第一季度" || column.title=="第二季度" || column.title=="上半年报"){
let QStartDate
let QEndDate
let month2
var MonthDayNum
if(column.title=="第一季度"){
QStartDate = `${rowData.Year}-01-01`
month2 = `03`
} else if(column.title=="第二季度"){
QStartDate = `${rowData.Year}-04-01`
month2 = `06`
} else if(column.title=="上半年报"){
QStartDate = `${rowData.Year}-01-01`
month2 = `06`
}else{
QStartDate = `${rowData.Year}-${month>10?month:'0'+month}-01`
month2 = `${month>10?month:'0'+month}`
}
MonthDayNum = new Date(rowData.Year, month2, 0).getDate(); //计算当月的天数
QEndDate = `${rowData.Year}-${month2}-${MonthDayNum}`
that.goUrl("prestoreList",QStartDate,QEndDate,"客户预存查询")
}
} }
else{ else{
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds,StandardCurrencyId) that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds,StandardCurrencyId)
} }
} }
}, },
getFirstAndLastMonthDay( year, month){ getFirstAndLastMonthDay( year, month){
var firstdate = year + '-' + month + '-01'; var firstdate = year + '-' + month + '-01';
var day = new Date(year,month,0); var day = new Date(year,month,0);
var lastdate = year + '-' + month + '-' + day.getDate();//获取当月最后一天日期 var lastdate = year + '-' + month + '-' + day.getDate();//获取当月最后一天日期
return lastdate; return lastdate;
}, },
togbu: function () { togbu: function () {
...@@ -1096,7 +1122,7 @@ export default { ...@@ -1096,7 +1122,7 @@ export default {
if(rowData.ZongJi < 0 && columnName=="ZongJi"){ if(rowData.ZongJi < 0 && columnName=="ZongJi"){
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red"
} }
if(rowData.ZhaiYao=='以下项均不计入计算'){ if(rowData.ZhaiYao=='以下项均不计入计算'){
if(rowData.YiYue==0){ if(rowData.YiYue==0){
rowData.YiYue=''; rowData.YiYue='';
...@@ -1183,10 +1209,10 @@ export default { ...@@ -1183,10 +1209,10 @@ export default {
} }
if (rowData.ZhaiYao === '所得税费用') { if (rowData.ZhaiYao === '所得税费用') {
return "column-cell-class-name-test-greed-s"; return "column-cell-class-name-test-greed-s";
} }
if(rowData.ZhaiYao=='以下项均不计入计算'){ if(rowData.ZhaiYao=='以下项均不计入计算'){
return "column-cell-class-name-test-lan-s" return "column-cell-class-name-test-lan-s"
} }
}, },
exportExcel: function () { exportExcel: function () {
let msg = { let msg = {
...@@ -1238,7 +1264,7 @@ export default { ...@@ -1238,7 +1264,7 @@ export default {
data.sharelist.forEach((x, i) => { data.sharelist.forEach((x, i) => {
this.monthList[i].value = x.Money this.monthList[i].value = x.Money
}) })
let tichengList=[]; let tichengList=[];
this.DataList=[]; this.DataList=[];
data.list.forEach(item=>{ data.list.forEach(item=>{
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 27991256
...@@ -578,7 +578,7 @@ ...@@ -578,7 +578,7 @@
</div> </div>
<div class="_explain"> <div class="_explain">
<p>{{$t('fnc.fjshuoming')}}</p> <p>{{$t('fnc.fjshuoming')}}</p>
<div> <div style="display: flex;justify-content: start;">
<p>{{$t('fnc.fygsbumen')}}：<span> <p>{{$t('fnc.fygsbumen')}}：<span>
<el-select filterable v-model='msg.RB_Depart_Id' class="w135 _border_b_1"> <el-select filterable v-model='msg.RB_Depart_Id' class="w135 _border_b_1">
<el-option v-for='item in departmentList' :label='item.DepartmentName' :value='item.DepartmentID' <el-option v-for='item in departmentList' :label='item.DepartmentName' :value='item.DepartmentID'
...@@ -586,26 +586,42 @@ ...@@ -586,26 +586,42 @@
</el-option> </el-option>
</el-select> </el-select>
</span></p> </span></p>
</div> <template v-if="(orderObj&&!orderObj.isPrestore)||msg.SigningCustomerId||msg.DepositCustomerId">
<div> <template v-if="!msg.DepositCustomerId">
<p>签约客户：<span> <p v-if="CustomerIdList&&CustomerIdList.length" style="margin-left: 15px;">签约客户：<span>
<el-select clearable filterable v-model='msg.SigningCustomerId' class="w135 _border_b_1" <el-select clearable filterable v-model='msg.SigningCustomerId' class="w135 _border_b_1"
@change="getSigningCustomerId"> :disabled="isDepositCustomer"
<el-option v-for='item in CustomerIdList' :label='item.customerName' :value='item.customerId' @change="getSigningCustomerId(1)">
:key='item.customerId'> <el-option v-for='item in CustomerIdList' :label='item.customerName' :value='item.customerId'
</el-option> :key='item.customerId'>
</el-select> </el-option>
</span> </el-select>
</p> </span>
</p>
</template>
<template v-if="!msg.SigningCustomerId">
<p v-if="StoredCustomerList&&StoredCustomerList.length" style="margin-left: 15px;">预收抵用：<span>
<el-select clearable filterable v-model='msg.DepositCustomerId' class="w135 _border_b_1"
:disabled="isDepositCustomer"
@change="getSigningCustomerId(2)">
<el-option v-for='item in StoredCustomerList' :label='item.customerName' :value='item.customerId'
:key='item.customerId'>
</el-option>
</el-select>
</span>
</p>
</template>
</template>
</div> </div>
<table v-if="ContractCustomer" class="Receipt_table" border="1" bordercolor="#c94052" <table v-if="ContractCustomer" class="Receipt_table" border="1" bordercolor="#c94052"
style="border-collapse:collapse;margin-top: 10px;"> style="border-collapse:collapse;margin-top: 10px;">
<tr> <tr>
<th>客户名称 </th> <th>签约客户</th>
<th>联系人</th> <th>联系人</th>
<th>手机号</th> <th>手机号</th>
<th>签约到期时间</th> <th>签约到期时间</th>
<th>签约金额 </th> <th>签约金额</th>
<th>待结算金额</th> <th>待结算金额</th>
</tr> </tr>
<tr class="_color_b"> <tr class="_color_b">
...@@ -617,6 +633,21 @@ ...@@ -617,6 +633,21 @@
<td height="26px">{{ContractCustomer.signingUnsettledPrice?ContractCustomer.signingUnsettledPrice:'-'}}</td> <td height="26px">{{ContractCustomer.signingUnsettledPrice?ContractCustomer.signingUnsettledPrice:'-'}}</td>
</tr> </tr>
</table> </table>
<table v-if="DepositCustomer" class="Receipt_table" border="1" bordercolor="#c94052"
style="border-collapse:collapse;margin-top: 10px;">
<tr>
<th>预存客户</th>
<th>联系人</th>
<th>手机号</th>
<th>余额 </th>
</tr>
<tr class="_color_b">
<td height="26px">{{DepositCustomer.customerName?DepositCustomer.customerName:'-'}}</td>
<td height="26px">{{DepositCustomer.contact?DepositCustomer.contact:'-'}}</td>
<td height="26px">{{DepositCustomer.contactNumber?DepositCustomer.contactNumber:'-'}}</td>
<td height="26px">{{DepositCustomer.depositMoney?DepositCustomer.depositMoney:'-'}}</td>
</tr>
</table>
</div> </div>
<div class="_remark"> <div class="_remark">
<p>{{$t('system.label_info')}}</p> <p>{{$t('system.label_info')}}</p>
...@@ -661,9 +692,12 @@ ...@@ -661,9 +692,12 @@
<div class="chosenNextBox"> <div class="chosenNextBox">
<div <div
v-if='resultCode==11019 || ((EmployeeId===755 || EmployeeId===400) && (msg.RB_Branch_Id&& msg.RB_Branch_Id!=0))'> v-if='resultCode==11019 || ((EmployeeId===755 || EmployeeId===400) && (msg.RB_Branch_Id&& msg.RB_Branch_Id!=0))'>
<label>{{$t('fnc.xiayibu')}}：<span class="red">{{msg.AuditDescription}}</span></label> <label>
<!-- {{$t('fnc.xiayibu')}} -->
下一步审核人：<span class="red">{{msg.AuditDescription}}</span></label>
<!-- $t('rule.qxzxybshren') -->
<el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote <el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote
reserve-keyword :placeholder="$t('rule.qxzxybshren')" :remote-method="remoteMethod" reserve-keyword placeholder="请输入下一步审核人，并选中下" :remote-method="remoteMethod"
:loading="loadingPeople"> :loading="loadingPeople">
<el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId"> <el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
<span style="float: left; font-size: 12px">{{ item.name }}</span> <span style="float: left; font-size: 12px">{{ item.name }}</span>
...@@ -702,6 +736,7 @@ ...@@ -702,6 +736,7 @@
export default { export default {
data() { data() {
return { return {
DepositCustomer: null,
ContractCustomer: null, ContractCustomer: null,
Description: '', Description: '',
msg: { msg: {
...@@ -740,7 +775,7 @@ ...@@ -740,7 +775,7 @@
SourceID: 0, SourceID: 0,
TCIDAndTCNUMList: [], TCIDAndTCNUMList: [],
CallType: 0, CallType: 0,
Type: 0 Type: 0,
}, },
AccountNumber: '', AccountNumber: '',
queryAccMsg: { queryAccMsg: {
...@@ -842,7 +877,9 @@ ...@@ -842,7 +877,9 @@
tradeObj:{}, tradeObj:{},
StandardCurrencyId: 0, StandardCurrencyId: 0,
StandardCurrencyName: '', StandardCurrencyName: '',
TCID: 0 TCID: 0,
StoredCustomerList: [],
isDepositCustomer: false
} }
}, },
methods: { methods: {
...@@ -1334,6 +1371,14 @@ ...@@ -1334,6 +1371,14 @@
e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
}, },
AddFinancial(z) { //保存 AddFinancial(z) { //保存
if((this.orderObj&&!this.orderObj.isPrestore)||this.msg.DepositCustomerId){
let To = Number(this.allPrice+this.msg.Fee)
let totalAmount = this.DepositCustomer.depositMoney
if(To > totalAmount){
this.Error(`本位币总金额需小于等于${this.DepositCustomer.depositMoney}！`)
return
}
}
if (this.Handmsg != null) { if (this.Handmsg != null) {
this.msg.ReFinanceId = this.Handmsg.ReFinanceId; this.msg.ReFinanceId = this.Handmsg.ReFinanceId;
if (this.Handmsg.TCNUM) { if (this.Handmsg.TCNUM) {
...@@ -1385,7 +1430,7 @@ ...@@ -1385,7 +1430,7 @@
if(this.orderObj&&this.orderObj.Money){ if(this.orderObj&&this.orderObj.Money){
let yballPrice = 0 let yballPrice = 0
this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{ this.msg&&this.msg.detailList&&this.msg.detailList.forEach((item,i)=>{
yballPrice += Number(yballPrice)+Number(item.UnitPrice) yballPrice += Number(item.UnitPrice)
}) })
this.yballPriceTo = yballPrice this.yballPriceTo = yballPrice
if(this.orderObj.Money!=this.yballPriceTo){ if(this.orderObj.Money!=this.yballPriceTo){
...@@ -1694,6 +1739,13 @@ ...@@ -1694,6 +1739,13 @@
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.GetCostTypeList = res.data.data; this.GetCostTypeList = res.data.data;
// let ids = res.data.data.forEach(x=> {
// if(x.ID==1546){
// console.log(x,'==========')
// return x.ID
// }
// })
if (type) { if (type) {
this.msg.detailList.forEach(x => { this.msg.detailList.forEach(x => {
this.GetCostTypeList.forEach(y => { this.GetCostTypeList.forEach(y => {
...@@ -1703,6 +1755,9 @@ ...@@ -1703,6 +1755,9 @@
}) })
}) })
} }
if (this.orderObj && this.orderObj.CostType) {
this.getCostTypeName(this.detailList.CostTypeId)
}
} }
}, err => {}) }, err => {})
}, },
...@@ -1718,6 +1773,8 @@ ...@@ -1718,6 +1773,8 @@
let data = res.data.data; let data = res.data.data;
this.msg = JSON.parse(JSON.stringify(data)); this.msg = JSON.parse(JSON.stringify(data));
this.msg.SigningCustomerId = data.SigningCustomerId?Number(data.SigningCustomerId):'' this.msg.SigningCustomerId = data.SigningCustomerId?Number(data.SigningCustomerId):''
this.msg.DepositCustomerId = data.DepositCustomerId?Number(data.DepositCustomerId):''
if(this.msg.DepositCustomerId) this.isDepositCustomer = true
let obj = { let obj = {
AccountId: '', AccountId: '',
CurrencyId: '', CurrencyId: '',
...@@ -1788,6 +1845,10 @@ ...@@ -1788,6 +1845,10 @@
if (this.orderObj) { if (this.orderObj) {
this.msg.OrderID = this.orderObj.OrderID ? this.orderObj.OrderID : 0; this.msg.OrderID = this.orderObj.OrderID ? this.orderObj.OrderID : 0;
this.OrderSource = this.msg.OrderSource = this.orderObj.OrderSource ? this.orderObj.OrderSource : 0; this.OrderSource = this.msg.OrderSource = this.orderObj.OrderSource ? this.orderObj.OrderSource : 0;
this.msg.CostTypeId = this.orderObj.CostType ? this.orderObj.CostType : '';
this.detailList.CostTypeId = this.orderObj.CostType ? this.orderObj.CostType : '';
this.detailList.UnitPrice = this.orderObj.Money ? this.orderObj.Money : 0;
this.detailList.Number = this.orderObj.CostType ? 1 : 0
this.msg.TCID = this.orderObj.TCID ? this.orderObj.TCID : 0; this.msg.TCID = this.orderObj.TCID ? this.orderObj.TCID : 0;
this.msg.TCIDList = this.orderObj.TCIDList ? this.orderObj.TCIDList : []; this.msg.TCIDList = this.orderObj.TCIDList ? this.orderObj.TCIDList : [];
this.msg.Obj = this.orderObj.Obj ? this.orderObj.Obj : ''; this.msg.Obj = this.orderObj.Obj ? this.orderObj.Obj : '';
...@@ -1876,16 +1937,31 @@ ...@@ -1876,16 +1937,31 @@
} }
}, err => {}) }, err => {})
}, },
getSigningCustomerId(){ getSigningCustomerId(type){
if(!this.msg.SigningCustomerId){ // 1 签约客户 2 预存客户抵用
if(type==1){
if(!this.msg.SigningCustomerId){
this.ContractCustomer = null
}
this.CustomerIdList.forEach(item=>{
if(item.customerId==this.msg.SigningCustomerId){
this.ContractCustomer = item
}
})
this.msg.DepositCustomerId = ''
this.DepositCustomer = null
}else if(type==2){
if(!this.msg.DepositCustomerId){
this.DepositCustomer = null
}
this.StoredCustomerList.forEach(item=>{
if(item.customerId==this.msg.DepositCustomerId){
this.DepositCustomer = item
}
})
this.msg.SigningCustomerId = ''
this.ContractCustomer = null this.ContractCustomer = null
} }
this.CustomerIdList.forEach(item=>{
if(item.customerId==this.msg.SigningCustomerId){
this.ContractCustomer = item
}
})
}, },
getCustomerIdList() { getCustomerIdList() {
this.apipost( this.apipost(
...@@ -1893,9 +1969,11 @@ ...@@ -1893,9 +1969,11 @@
{pageIndex: 1,pageSize: 1000,CustomerStatus: 0}, {pageIndex: 1,pageSize: 1000,CustomerStatus: 0},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.CustomerIdList = res.data.data; this.CustomerIdList = res.data.data.signingList;
if(this.msg.SigningCustomerId){ this.StoredCustomerList = res.data.data.depositList
this.getSigningCustomerId() if(this.msg.SigningCustomerId||this.msg.DepositCustomerId){
let type = this.msg.SigningCustomerId?1:2
this.getSigningCustomerId(type)
} }
} else { } else {
this.loading = false; this.loading = false;
......
src/components/FinancialModule/components/UserCredit.vue 0 → 100644
View file @ 27991256
<style>
@import url('../../../assets/css/domestic/TicketingModule.css');
.sanjiao-box{
position: relative;
}
.sanjiao-box .Receipt_table td{
padding: 0 10px;
}
.hover_text span{
cursor: pointer;
text-decoration: underline;
}
.czBillModule td{
text-align: center!important;
padding:6px 0!important;
}
._tit2{
border: none !important;
}
</style>
<template>
<div class="m_TicketingModule" v-if="DataList&&DataList.length>0">
<div>
<div class="_tit">
<span class="_text">预存客户</span>
<!-- <div>
<span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</div> -->
<div>
<span class="_btn" @click="goPrestorageManagement">查看更多</span>
</div>
</div>
<div v-show="tableShow" class="sanjiao-box _padding_20_15">
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr>
<th>客户</th>
<th>联系人/电话</th>
<th>已存入</th>
<th>待存入</th>
<th>退款</th>
<th>已使用</th>
<th>期末余额</th>
</tr>
<tr class="_color_b" v-for="(item,index) in DataList" :key="index">
<td>{{item.CustomerName}}</td>
<td>{{ item.Contact+'/'+item.ContactNumber }}</td>
<td>{{item.Income}}</td>
<td>{{item.WaitIncome}}</td>
<td>{{item.Refund}}</td>
<td>{{item.UseMoney}}</td>
<td>{{item.DepositMoney}}({{item.DepositCurrencyName}})</td>
</tr>
</table>
</div>
</div>
</div>
</template>
<script>
export default {
props:["GetDetail"],
data(){
return{
loading: true,
cdtotal: 0,
ybtotal: 0,
tableShow: true,
DataList: [],
msg:{
pageIndex: 1,
pageSize: 10,
RemitterName: '',
ClientIdStr: '',
QStartDate: '',
QEndDate: '',
}
}
},
watch:{
GetDetail:{
handler: function(val, oldVal) {
if(this.GetDetail&&this.GetDetail.OtherType==74&&this.GetDetail.ReFinanceId){
this.msg.ClientIdStr = this.GetDetail.ReFinanceId
}else if(this.GetDetail&&this.GetDetail.DepositCustomerId){
this.msg.ClientIdStr = this.GetDetail.DepositCustomerId
}
this.GetFinanceDepositPageList();
},
deep: true,
immediate: true,
}
},created(){
},mounted(){
},
methods:{
goPrestorageManagement(){
this.$router.push(
{ name: 'prestoreList',
query:{
// ClientIdStr:this.msg.ClientIdStr,
blank:'y',tab:'客户预存管理'
}
}
)
},
goDetail(id){
this.$router.push(
{ name: 'FinancialDocumentsDetail',
query:{"id":id,blank:'y',tab:'单据详情'}
}
)
},
// 客户存储余额列表
GetFinanceDepositPageList(){
this.apipost('Financial_post_GetFinanceDepositPageList',
this.msg,res=>{
this.loading = false
if(res.data.resultCode == 1) {
console.log(res.data.data.pageData)
this.DataList = res.data.data.pageData;
}
})
},
}
}
</script>
src/components/FinancialModule/domesticCommissiondetails.vue
View file @ 27991256
...@@ -197,20 +197,11 @@ ...@@ -197,20 +197,11 @@
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode; let ActionMenuCode = userInfo.ActionMenuCode;
this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:'' this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:''
if (this.$route.query) { //不大于0的话用默认值 this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
if (this.$route.query.PeriodId && this.$route.query.PeriodId > 0) { this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):-1
this.msg.PeriodId = Number(this.$route.query.PeriodId) this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id?Number(this.$route.query.RB_Branch_Id):-1
} this.msg.OutBranchId = this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):-1
if (this.$route.query.UserId && this.$route.query.UserId > 0) { this.msg.RB_Department_Id = this.$route.query.RB_Department_Id?Number(this.$route.query.RB_Department_Id):-1
this.msg.UserId = Number(this.$route.query.UserId)
}
if (this.$route.query.RB_Branch_Id) {
this.msg.RB_Branch_Id = Number(this.$route.query.RB_Branch_Id)
}
if (this.$route.query.RB_Department_Id && this.$route.query.RB_Department_Id > 0) {
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id)
}
}
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限 if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限
this.disabled = false; this.disabled = false;
} else { } else {
......
src/components/SalesModule/Common/signedClientList.vue
View file @ 27991256
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
style="cursor: pointer;text-decoration: underline;">{{item.signingPrice}}</span></td> style="cursor: pointer;text-decoration: underline;">{{item.signingPrice}}</span></td>
<td><span @click="goUrlCCC(item.customerId,1)" <td><span @click="goUrlCCC(item.customerId,1)"
style="cursor: pointer;text-decoration: underline;">{{item.signingUnsettledPrice}}</span></td> style="cursor: pointer;text-decoration: underline;">{{item.signingUnsettledPrice}}</span></td>
<td>{{ item.signingEndTime }}</td> <td>{{item.signingEndTime}}</td>
</tr> </tr>
<tr v-if="list.length == 0"> <tr v-if="list.length == 0">
<td colspan="12" style="text-align: center">暂无数据</td> <td colspan="12" style="text-align: center">暂无数据</td>
...@@ -525,6 +525,7 @@ ...@@ -525,6 +525,7 @@
<script> <script>
export default { export default {
props: ["loading", "list", "pagesTitle", "isVisa"], props: ["loading", "list", "pagesTitle", "isVisa"],
components: {},
data() { data() {
return { return {
editNum: false, editNum: false,
...@@ -560,7 +561,6 @@ export default { ...@@ -560,7 +561,6 @@ export default {
teamInfo: {}, //团队信息 teamInfo: {}, //团队信息
}; };
}, },
components: {},
filters: { filters: {
priceFormat(value) { priceFormat(value) {
if (value == null) { if (value == null) {
......
src/components/SalesModule/MyCustomer.vue
View file @ 27991256
...@@ -447,6 +447,7 @@ ...@@ -447,6 +447,7 @@
<th>询价与需求</th> <th>询价与需求</th>
<th>所属联盟</th> <th>所属联盟</th>
<th>优惠券</th> <th>优惠券</th>
<th>预存余额</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
<tr v-for="(item,i) in dataList" :key="i"> <tr v-for="(item,i) in dataList" :key="i">
...@@ -498,6 +499,9 @@ ...@@ -498,6 +499,9 @@
<td><span style="cursor: pointer;text-decoration: underline;" <td><span style="cursor: pointer;text-decoration: underline;"
@click.stop="goUrC('CouponsList',item.customerAccountId)">{{item.couponNum}}</span></td> @click.stop="goUrC('CouponsList',item.customerAccountId)">{{item.couponNum}}</span></td>
<td> <td>
<span style="cursor: pointer;color: #2CA4F0" @click="seeDeta(item)">{{ item.depositMoney?item.depositMoney:0 }}</span>
</td>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top-start"> <el-tooltip class="item" effect="dark" content="编辑" placement="top-start">
<el-button @click.stop="EditMsg(item)" style="padding:4px" type="primary" icon="iconfont icon-bianji" <el-button @click.stop="EditMsg(item)" style="padding:4px" type="primary" icon="iconfont icon-bianji"
circle></el-button> circle></el-button>
...@@ -866,17 +870,21 @@ ...@@ -866,17 +870,21 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<detailList v-if="showdetail" :ClientId="detailObj&&detailObj.customerId" @cancel="showdetail=false"></detailList>
</div> </div>
</template> </template>
<script> <script>
import detailList from "../FinancialModule/PrestorageManagement/components/detailList.vue";
import signedClientList from './Common/signedClientList' import signedClientList from './Common/signedClientList'
export default { export default {
components:{ components:{
signedClientList signedClientList,
detailList
}, },
data() { data() {
return { return {
detailObj: null,
showdetail: false,
isVisa: false, // 是否是签证下面的菜单 isVisa: false, // 是否是签证下面的菜单
pagesTitle: '跟团游产品', pagesTitle: '跟团游产品',
saveMsg: [], saveMsg: [],
...@@ -1052,6 +1060,10 @@ ...@@ -1052,6 +1060,10 @@
} }
}, },
methods: { methods: {
seeDeta(row){
this.detailObj = row
this.showdetail = true
},
reSearchPage(){ reSearchPage(){
this.msg.pageIndex = 1 this.msg.pageIndex = 1
this.currentPage = 1 this.currentPage = 1
......
src/components/administrative/CommissionDetail.vue
View file @ 27991256
<template> <template>
<div class="commissionDetails commissionDetails-box"> <div class="commissionDetails commissionDetails-box">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<input type="button" class="normalBtn" value="导出" @click="exportExcel"> <input type="button" class="normalBtn" value="导出" @click="exportExcel">
</li> </li>
</ul> </ul>
</div> </div>
<template v-if="isReady"> <div v-if="isReady" v-loading='loading'>
<v-table is-horizontal-resize column-width-drag <el-table
style="width:100%" :columns="columns" :table-data="dataList" ref="multipleTable"
:filter-method="filterMethod" :total="total" :pageSize="msg.pageSize" :data="dataList"
:pageIndex="msg.pageIndex" :handleCurrentChange="handleCurrentChange" tooltip-effect="dark"
:multiple-sort="multipleSort" :is-loading="loading" sort-always style="width: 100%"
@sort-change="sortChange" @on-custom-comp="customCompFunc"></v-table> >
</template> <el-table-column prop="bName" label="公司"></el-table-column>
<div style="height:20px;"> </div> <el-table-column prop="departmentName" label="部门"></el-table-column>
</div> <el-table-column
</template> label="姓名">
<template slot-scope="scope">
<div v-if="scope.row.leaveStr && scope.row.leaveStr != ''">{{scope.row.createByStr}}<span style="color:red;display:inline-block">({{scope.row.leaveStr}})</span></div>
<div v-else>{{scope.row.createByStr}}</div>
</template>
</el-table-column>
<el-table-column
label="提成金额">
<template slot-scope="scope">
<span>{{scope.row.commissionMoney.toFixed(2)}}</span>
</template>
</el-table-column>
<el-table-column
label="额外奖励">
<template slot-scope="scope">
<span>{{scope.row.otherMoney.toFixed(2)}}</span>
</template>
</el-table-column>
<el-table-column
label="额外扣除">
<template slot-scope="scope">
<span>{{scope.row.backMoney.toFixed(2)}}</span>
</template>
</el-table-column>
<el-table-column
label="应发提成">
<template slot-scope="scope">
<span style='color:red'>{{(scope.row.otherMoney+scope.row.commissionMoney-scope.row.backMoney).toFixed(2)}}</span>
</template>
</el-table-column>
<el-table-column
label="收客人数">
<template slot-scope="scope">
<span style='color:blue'>{{scope.row.peopleCount}}人</span>
</template>
</el-table-column>
<el-table-column
label="单签证人数">
<template slot-scope="scope">
<span style='color:orange'>{{scope.row.visaPeopleCount}}人</span>
</template>
</el-table-column>
<el-table-column
label="期数">
<template slot-scope="scope">
<div v-if="scope.row.periods != stringPerons" style='height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -5px;;padding-left: 10px;'>{{scope.row.periods}}</div>
<template v-else>{{scope.row.periods}}</template>
</template>
</el-table-column>
<el-table-column
label="销售留言">
<template slot-scope="scope">
<div v-if="scope.row.remark" class="outDiv">
<div class="toolDiv">
<div class="triangle_border_up">
</div>{{scope.row.remark}}</div>{{scope.row.remark}}</div>
<template v-else>''</template>
</template>
</el-table-column>
<el-table-column
label="操作">
<template slot-scope="scope">
<el-button type="primary" size='mini' icon="el-icon-view" circle @click="getInfo(scope.row)"></el-button>
</template>
</el-table-column>
</el-table>
<!-- <div style="padding-bottom:15px">
<el-pagination background
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination>
</div> -->
<!--
<v-table is-horizontal-resize column-width-drag
style="width:100%" :columns="columns" :table-data="dataList"
:filter-method="filterMethod" :total="total" :pageSize="msg.pageSize"
:pageIndex="msg.pageIndex" :handleCurrentChange="handleCurrentChange"
:multiple-sort="multipleSort" :is-loading="loading" sort-always
@sort-change="sortChange" @on-custom-comp="customCompFunc"></v-table>
-->
</div>
<div style="height:20px;"> </div>
</div>
</template>
<script> <script>
import Vue from 'vue' import Vue from 'vue'
import XLSX from 'xlsx' import XLSX from 'xlsx'
var FileSaver = require('file-saver') var FileSaver = require('file-saver')
export default { export default {
data() { data() {
return { return {
activeName: "first", activeName: "first",
commonName: "姓名", commonName: "姓名",
loading: false, loading: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
ParentId: 0, ParentId: 0,
OrderStr: "RB_Branch_Id asc", OrderStr: "RB_Branch_Id asc",
BName: -1, BName: -1,
RB_Branch_Id: -1, RB_Branch_Id: -1,
Periods: '' Periods: ''
}, },
total: 0, total: 0,
currentPage: 1, currentPage: 1,
columns: [], columns: [],
remoteLoading: false, remoteLoading: false,
total: 0, total: 0,
dataList: [], dataList: [],
isReady: false, isReady: false,
multipleSort: false, multipleSort: false,
loading: true, loading: true,
CompanyList: [], CompanyList: [],
dataListTwo: [], dataListTwo: [],
stringPerons: '', stringPerons: '',
userInfo: {}, userInfo: {},
companyID: '', companyID: '',
disabledCPSelect: false disabledCPSelect: false
}; };
}, },
methods: { methods: {
exportExcel() { exportExcel() {
const defaultCellStyle = { const defaultCellStyle = {
'!cols': [{ '!cols': [{
wpx: 60 wpx: 60
}, { }, {
wpx: 200 wpx: 200
}, { }, {
wpx: 60 wpx: 60
}, { }, {
wpx: 150 wpx: 150
}, { }, {
wpx: 60 wpx: 60
}] }]
}; };
const wopts = { const wopts = {
bookType: 'xlsx', bookType: 'xlsx',
bookSST: false, bookSST: false,
type: 'binary', type: 'binary',
defaultCellStyle: defaultCellStyle, defaultCellStyle: defaultCellStyle,
showGridLines: true showGridLines: true
}; };
const wb = { const wb = {
SheetNames: ['提成统计'], SheetNames: ['提成统计'],
Sheets: {}, Sheets: {},
Props: {} Props: {}
}; };
let data = [] let data = []
this.dataList.forEach(x => { this.dataList.forEach(x => {
let obj = { let obj = {
'公司': x.bName, '公司': x.bName,
'部门': x.departmentName, '部门': x.departmentName,
'员工': x.createByStr, '员工': x.createByStr,
'提成金额': x.commissionMoney.toFixed(2), '提成金额': x.commissionMoney.toFixed(2),
'额外奖励': x.otherMoney.toFixed(2), '额外奖励': x.otherMoney.toFixed(2),
'额外扣除': x.backMoney.toFixed(2), '额外扣除': x.backMoney.toFixed(2),
'应发提成': x.sumMoney.toFixed(2), '应发提成': x.sumMoney.toFixed(2),
'收客数': x.peopleCount, '收客数': x.peopleCount,
'单签证人数': x.visaPeopleCount, '单签证人数': x.visaPeopleCount,
'所属期数': x.periods '所属期数': x.periods
} }
data.push(obj) data.push(obj)
}) })
wb.Sheets['提成统计'] = XLSX.utils.json_to_sheet(data) wb.Sheets['提成统计'] = XLSX.utils.json_to_sheet(data)
//创建二进制对象写入转换好的字节流 //创建二进制对象写入转换好的字节流
let tmpDown = new Blob([this.s2ab(XLSX.write(wb, wopts))], { let tmpDown = new Blob([this.s2ab(XLSX.write(wb, wopts))], {
type: "application/octet-stream" type: "application/octet-stream"
}) })
FileSaver.saveAs(tmpDown, "提成统计.xls"); FileSaver.saveAs(tmpDown, "提成统计.xls");
}, },
s2ab(s) { s2ab(s) {
if (typeof ArrayBuffer !== 'undefined') { if (typeof ArrayBuffer !== 'undefined') {
var buf = new ArrayBuffer(s.length); var buf = new ArrayBuffer(s.length);
var view = new Uint8Array(buf); var view = new Uint8Array(buf);
for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
return buf; return buf;
} else { } else {
var buf = new Array(s.length); var buf = new Array(s.length);
for (var i = 0; i != s.length; ++i) buf[i] = s.charCodeAt(i) & 0xFF; for (var i = 0; i != s.length; ++i) buf[i] = s.charCodeAt(i) & 0xFF;
return buf; return buf;
} }
}, },
filterMethod(filters) { filterMethod(filters) {
let data = JSON.parse(JSON.stringify(this.dataListTwo)) let data = JSON.parse(JSON.stringify(this.dataListTwo))
let dataListTwo = JSON.parse(JSON.stringify(this.dataListTwo)) let dataListTwo = JSON.parse(JSON.stringify(this.dataListTwo))
if (filters.bName != '' && filters.bName != '__all__') { if (filters.bName != '' && filters.bName != '__all__') {
data = data.filter(item => item.bName.indexOf(filters.bName) != -1); data = data.filter(item => item.bName.indexOf(filters.bName) != -1);
} }
if (filters.departmentName != '') { if (filters.departmentName != '') {
data = data.filter(item => item.departmentName.indexOf(filters.departmentName) != -1); data = data.filter(item => item.departmentName.indexOf(filters.departmentName) != -1);
} }
if (filters.createByStr != '') { if (filters.createByStr != '') {
data = data.filter(item => item.createByStr.indexOf(filters.createByStr) != -1); data = data.filter(item => item.createByStr.indexOf(filters.createByStr) != -1);
} }
if ((filters.bName === '' || filters.bName === '__all__') && filters.departmentName === '' && filters.createByStr === '') { if ((filters.bName === '' || filters.bName === '__all__') && filters.departmentName === '' && filters.createByStr === '') {
data = dataListTwo data = dataListTwo
} }
this.dataList = data this.dataList = data
}, },
customCompFunc(params) { customCompFunc(params) {
if (params.type === "see") { if (params.type === "see") {
this.getInfo(params.data) this.getInfo(params.data)
} }
}, },
getCompanyList() { getCompanyList() {
//获取公司列表 //获取公司列表
this.apipost( this.apipost(
"admin_get_BranchGetList", "admin_get_BranchGetList",
this.getCompanyMsg, this.getCompanyMsg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x => { data.forEach(x => {
x.disabled = false; x.disabled = false;
}); });
if (this.userInfo.RB_Branch_id != 0) { if (this.userInfo.RB_Branch_id != 0) {
this.CompanyList = data.filter(x => { this.CompanyList = data.filter(x => {
if (x.BName == this.userInfo.BranchName) { if (x.BName == this.userInfo.BranchName) {
return x return x
} else } else
return false return false
}) })
} else { } else {
this.CompanyList = data; this.CompanyList = data;
} }
this.initColums(); this.initColums();
} else {} } else {}
}, },
err => {} err => {}
); );
}, },
initColums() { initColums() {
this.isReady = false; this.isReady = false;
let that = this; let that = this;
let companyList = []; let companyList = [];
this.CompanyList.forEach(x => { this.CompanyList.forEach(x => {
let item = {}; let item = {};
item.label = x.BName; item.label = x.BName;
item.value = x.BName; item.value = x.BName;
companyList.push(item); companyList.push(item);
}); });
let company = {} console.log(companyList,'-------')
if (this.disabledCPSelect) { let company = {}
company = { if (this.disabledCPSelect) {
field: "bName", company = {
title: "公司", field: "bName",
width: 40, title: "公司",
titleAlign: "left", width: 40,
columnAlign: "left", titleAlign: "left",
isResize: true, columnAlign: "left",
}; isResize: true,
} else { };
company = { } else {
field: "bName", company = {
title: "公司", field: "bName",
width: 40, title: "公司",
titleAlign: "left", width: 40,
columnAlign: "left", titleAlign: "left",
isResize: true, columnAlign: "left",
result: "", isResize: true,
filterMultiple: false, result: "",
filters: companyList, filterMultiple: false,
type: "select" filters: companyList,
}; type: "select"
} };
let department = { }
field: "departmentName", this.isReady = true;
title: "部门", },
width: 80, sortChange(param) {
titleAlign: "left", if (param.sumMoney == '') {
columnAlign: "left", if (param.BName != '') {
isResize: true, this.msg.OrderStr = 'RB_Branch_Id ' + param.bName
result: "", }
filterMultiple: false, if (param.commissionMoney != '') {
filters: companyList, this.msg.OrderStr = 'CommissionMoney ' + param.commissionMoney
type: "text" }
}; if (param.peopleCount != '') {
let userName = { this.msg.OrderStr = 'PeopleCount ' + param.peopleCount
field: "createByStr", }
title: "姓名", if (param.backMoney != '') {
titleAlign: "left", this.msg.OrderStr = 'BackMoney ' + param.backMoney
columnAlign: "left", }
isResize: true, if (param.otherMoney != '') {
width: 80, this.msg.OrderStr = 'OtherMoney ' + param.otherMoney
formatter: function (rowData, rowIndex, pagingIndex, field) { }
if (rowData.leaveStr && rowData.leaveStr != '') this.getList();
return `<div>${rowData.createByStr}<span style="color:red;display:inline-block">(${rowData.leaveStr})</span></div>` } else {
else let d = JSON.parse(JSON.stringify(this.dataList))
return `<div>${rowData.createByStr}</div>` this.dataList = this.orderBy(d, ["sumMoney"], param.sumMoney).results;
} }
}; },
let commissionMoney = { handleCurrentChange(val) {
field: "commissionMoney", this.msg.pageIndex = val;
title: "提成金额", this.getList();
titleAlign: "left", },
columnAlign: "left", getList() {
isResize: true, this.loading = true;
width: 80, if (this.userInfo.RB_Branch_id != 0) {
orderBy: "", this.msg.RB_Branch_Id = this.userInfo.RB_Branch_id
formatter: function (rowData, rowIndex, pagingIndex, field) { }
return `<span>${rowData.commissionMoney.toFixed(2)}</span>`
}
};
let otherMoney = {
field: "otherMoney",
title: "额外奖励",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
formatter: function (rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.otherMoney.toFixed(2)}</span>`
}
};
let backMoney = {
field: "backMoney",
title: "额外扣除",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
formatter: function (rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.backMoney.toFixed(2)}</span>`
}
};
let sumMoney = {
title: "应发提成",
field: "sumMoney",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
formatter: function (rowData, rowIndex, pagingIndex, field) {
return `<span style='color:red'>${(rowData.otherMoney+rowData.commissionMoney-rowData.backMoney).toFixed(2)}</span>`
}
};
let peopleCount = {
field: "peopleCount",
title: "收客人数",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
orderBy: "",
formatter: function (rowData, rowIndex, pagingIndex, field) {
return `<span style='color:blue'>${rowData.peopleCount}人</span>`
}
};
let visaPeopleCount = {
field: "visaPeopleCount",
title: "单签证人数",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
formatter: function (rowData, rowIndex, pagingIndex, field) {
if (rowData.visaPeopleCount > 0)
return `<span style='color:orange'>${rowData.visaPeopleCount}人</span>`
else
return ''
}
};
let periods = {
field: "periods",
title: "期数",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
formatter: function (rowData, rowIndex, pagingIndex, field) {
if (rowData.periods != that.stringPerons)
return `<div style='height:40px;line-height:40px;color:#f1f1f1;background: red;margin: 0 -5px;;padding-left: 10px;'>${rowData.periods}</div>`
else
return rowData.periods
}
};
let remark = {
field: "remark",
title: "销售留言",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 200,
formatter: function (rowData, rowIndex, pagingIndex, field) {
if (rowData.remark)
return `<div class="outDiv">
<div class="toolDiv">
<div class="triangle_border_up">
</div>${rowData.remark}</div>${rowData.remark}</div>`
else
return ''
} this.apipost(
}; "sellcommission_GetDetailsList",
let opera = { this.msg,
title: "操作", res => {
titleAlign: "left", this.loading = false;
columnAlign: "left", if (res.data.resultCode == 1) {
width: 80, this.dataList = res.data.data.pageData;
isResize: false, this.total = res.data.data.count;
componentName: "commission-table-operation" this.dataList.forEach(x => {
}; x.sumMoney = x.commissionMoney + x.otherMoney - x.backMoney
this.columns = []; })
this.columns.push(company); this.dataListTwo = JSON.parse(JSON.stringify(this.dataList))
this.columns.push(department); } else {
this.columns.push(userName); this.Error(res.data.message);
this.columns.push(commissionMoney); }
this.columns.push(otherMoney); },
this.columns.push(backMoney); null
this.columns.push(sumMoney); );
this.columns.push(peopleCount); },
this.columns.push(visaPeopleCount); //切换排序
this.columns.push(periods); handleClick(tab, event) {
this.columns.push(remark); if (this.activeName == "first") {
this.columns.push(opera); // this.commonName='姓名'
this.isReady = true; this.msg.OrderStr = "UserId";
}, } else {
sortChange(param) { // this.commonName='公司名'
if (param.sumMoney == '') { this.msg.OrderStr = "RB_Branch_Id";
if (param.BName != '') { }
this.msg.OrderStr = 'RB_Branch_Id ' + param.bName this.getList();
} },
if (param.commissionMoney != '') { //跳转
this.msg.OrderStr = 'CommissionMoney ' + param.commissionMoney getInfo(item) {
} var dateStr = item.periods;
if (param.peopleCount != '') { var year = dateStr.substring(0, 4);
this.msg.OrderStr = 'PeopleCount ' + param.peopleCount var month = dateStr.substring(4, 6);
}
if (param.backMoney != '') {
this.msg.OrderStr = 'BackMoney ' + param.backMoney
}
if (param.otherMoney != '') {
this.msg.OrderStr = 'OtherMoney ' + param.otherMoney
}
this.getList();
} else {
let d = JSON.parse(JSON.stringify(this.dataList))
this.dataList = this.orderBy(d, ["sumMoney"], param.sumMoney).results;
}
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList() {
this.loading = true;
if (this.userInfo.RB_Branch_id != 0) {
this.msg.RB_Branch_Id = this.userInfo.RB_Branch_id
}
this.apipost( var nextMonthFirstDay = new Date(year, month, 1);
"sellcommission_GetDetailsList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
this.dataList.forEach(x => {
x.sumMoney = x.commissionMoney + x.otherMoney - x.backMoney
})
this.dataListTwo = JSON.parse(JSON.stringify(this.dataList))
} else {
this.Error(res.data.message);
}
},
null
);
},
//切换排序
handleClick(tab, event) {
if (this.activeName == "first") {
// this.commonName='姓名'
this.msg.OrderStr = "UserId";
} else {
// this.commonName='公司名'
this.msg.OrderStr = "RB_Branch_Id";
}
this.getList();
},
//跳转
getInfo(item) {
var dateStr = item.periods;
var year = dateStr.substring(0, 4);
var month = dateStr.substring(4, 6);
var nextMonthFirstDay = new Date(year, month, 1); var oneDay = 1000 * 60 * 60 * 24;
var entDay = new Date(nextMonthFirstDay - oneDay).Format("yyyy-MM-dd");
var startDay = year + "-" + month + "-" + "01";
var userId = item.userId;
var oneDay = 1000 * 60 * 60 * 24; this.$router.push({
var entDay = new Date(nextMonthFirstDay - oneDay).Format("yyyy-MM-dd"); path: "enrollTotal",
var startDay = year + "-" + month + "-" + "01"; query: {
var userId = item.userId; EmployeeId: userId,
starTime: startDay,
endTime: entDay,
blank: 'y'
}
});
}
},
mounted() {
this.msg.pageSize = 10000; //不分页
this.msg.ParentId = this.$route.query.ParentId;
if (this.$route.query.companyID) {
this.companyID = this.$route.query.companyID;
this.msg.RB_Branch_Id = this.$route.query.companyID;
this.msg.Periods = this.$route.query.periods;
this.disabledCPSelect = true
}
let dt = new Date()
this.stringPerons = (dt.getMonth() == 0 ? (dt.getFullYear() - 1) : dt.getFullYear()) + '' + (dt.getMonth().toString().length < 2 ? '0' : '') + (dt.getMonth() == 0 ? 12 : dt.getMonth());
this.userInfo = this.getLocalStorage();
this.getList();
this.getCompanyList();
},
created() {
Vue.component('commission-table-operation', {
template: `<div style='border-bottom: 1px solid #e5e5e5;border-left: 1px solid #e5e5e5;width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;box-sizing:border-box'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
see() {
let params = {
type: 'see',
data: this.rowData
};
this.$emit('on-custom-comp', params);
}
}
})
}
this.$router.push({ };
path: "enrollTotal", </script>
query: {
EmployeeId: userId,
starTime: startDay,
endTime: entDay,
blank: 'y'
}
});
}
},
mounted() {
this.msg.pageSize = 10000; //不分页
this.msg.ParentId = this.$route.query.ParentId;
if (this.$route.query.companyID) {
this.companyID = this.$route.query.companyID;
this.msg.RB_Branch_Id = this.$route.query.companyID;
this.msg.Periods = this.$route.query.periods;
this.disabledCPSelect = true
}
let dt = new Date()
this.stringPerons = (dt.getMonth() == 0 ? (dt.getFullYear() - 1) : dt.getFullYear()) + '' + (dt.getMonth().toString().length < 2 ? '0' : '') + (dt.getMonth() == 0 ? 12 : dt.getMonth());
this.userInfo = this.getLocalStorage();
this.getList();
this.getCompanyList();
},
created() {
Vue.component('commission-table-operation', {
template: `<div style='border-bottom: 1px solid #e5e5e5;border-left: 1px solid #e5e5e5;width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;box-sizing:border-box'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`,
props: {
rowData: {
type: Object
},
field: {
type: String
},
index: {
type: Number
}
},
methods: {
see() {
let params = {
type: 'see',
data: this.rowData
};
this.$emit('on-custom-comp', params);
}
}
})
}
}; <style>
</script> .commissionDetails .triangle_border_up {
width: 0;
height: 0;
border-width: 0 5px 5px;
border-style: solid;
border-color: transparent transparent #303133;
/*透明 透明 灰*/
position: absolute;
top: -5px;
}
<style> .commissionDetails .v-table-body-cell:hover .outDiv .toolDiv {
.commissionDetails .triangle_border_up { display: block;
width: 0; }
height: 0;
border-width: 0 5px 5px;
border-style: solid;
border-color: transparent transparent #303133;
/*透明 透明 灰*/
position: absolute;
top: -5px;
}
.commissionDetails .v-table-body-cell:hover .outDiv .toolDiv { .commissionDetails .v-table-body-cell {
display: block; overflow: initial;
} cursor: pointer;
}
.commissionDetails .v-table-body-cell { .commissionDetails .toolDiv {
overflow: initial; position: absolute;
cursor: pointer; top: 25px;
} background: #303133;
color: #fff;
z-index: 20000;
padding: 4px 15px;
max-width: 220px;
white-space: normal;
border-radius: 4px;
word-wrap: break-word;
display: none;
.commissionDetails .toolDiv { }
position: absolute;
top: 25px;
background: #303133;
color: #fff;
z-index: 20000;
padding: 4px 15px;
max-width: 220px;
white-space: normal;
border-radius: 4px;
word-wrap: break-word;
display: none;
} .commissionDetails .outDiv {
position: relative;
.commissionDetails .outDiv { }
position: relative;
} .commissionDetails-box .el-button.is-circle {
padding: 5px !important;
}
.commissionDetails-box .el-button.is-circle { .commissionDetails-box .v-table-body-cell span {
padding: 5px !important; display: block;
} width: 100%;
}
.commissionDetails-box .v-table-body-cell span { </style>
display: block;
width: 100%;
}
</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