Skip to content

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

预付款抵用功能实现

parent 34546fce
Show whitespace changes
Inline Side-by-side
Showing with 277 additions and 130 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ d7a28bfe
...@@ -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 @ d7a28bfe
...@@ -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 @ d7a28bfe
...@@ -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 @ d7a28bfe
...@@ -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 @ d7a28bfe
<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/ReportForm/EasyReport.vue
View file @ d7a28bfe
...@@ -911,6 +911,7 @@ export default { ...@@ -911,6 +911,7 @@ export default {
} }
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=="联运收入"){
...@@ -995,6 +996,32 @@ export default { ...@@ -995,6 +996,32 @@ export default {
} }
}); });
} }
}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=="上半年报"){
// console.log(rowData.Year,month,'==========')
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}`
}
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)
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ d7a28bfe
...@@ -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"
@change="getSigningCustomerId(1)">
<el-option v-for='item in CustomerIdList' :label='item.customerName' :value='item.customerId' <el-option v-for='item in CustomerIdList' :label='item.customerName' :value='item.customerId'
:key='item.customerId'> :key='item.customerId'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
</p> </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,7 +1937,9 @@ ...@@ -1876,7 +1937,9 @@
} }
}, err => {}) }, err => {})
}, },
getSigningCustomerId(){ getSigningCustomerId(type){
// 1 签约客户 2 预存客户抵用
if(type==1){
if(!this.msg.SigningCustomerId){ if(!this.msg.SigningCustomerId){
this.ContractCustomer = null this.ContractCustomer = null
} }
...@@ -1885,7 +1948,20 @@ ...@@ -1885,7 +1948,20 @@
this.ContractCustomer = item 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
}
}, },
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/SalesModule/Common/signedClientList.vue
View file @ d7a28bfe
...@@ -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 @ d7a28bfe
...@@ -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
......
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