Skip to content

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

预付款抵用功能实现

parent 34546fce
Expand all Hide 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 @@
<p class="illustrate-left">附加说明：<span class="fr" v-if="GetDetail.ComplainID > 0"
@click="goUrl('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号：</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
&& 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.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)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
提成详情
......@@ -674,6 +653,8 @@
<div class="_tit _tit2 w890px">
<!-- 预付款冲抵 电商商品 -->
<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>
......@@ -1556,6 +1537,7 @@ import huijiBill from "./FinancialSubmodule/huijiBill.vue";
import czBillModule from "./FinancialSubmodule/czBillModule.vue";
// import MsgBus from '../../assets/utils/msgBus.js';
import CostmonthDetails from './components/CostmonthDetails';
import UserCredit from './components/UserCredit';
export default {
data(){
return{
......@@ -1737,7 +1719,8 @@ export default {
'myJiPiaoBill': myJiPiaoBill,
'huijiBill': huijiBill,
'czBillModule':czBillModule,
CostmonthDetails
CostmonthDetails,
UserCredit
},
methods:{
getTemplate(GetDetail){
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ d7a28bfe
......@@ -863,10 +863,14 @@
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!=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)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">
提成详情
......@@ -907,8 +911,6 @@
@click="ImpressionSingleDetails('SingleticketOrderListOP')">{{'单项门票订单:'+GetDetail.ReFinanceId}}</div>
<div v-if="GetDetail.OtherType==67||GetDetail.OtherType==68" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleDetails('CharterOrderListOP')">{{'单项车订单:'+GetDetail.ReFinanceId}}</div>
<!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
@click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{'单项销售提成详情'}}</div>
<div v-if="GetDetail.OtherType==64" class="illustrate-right fygsbumen-box-right"
......@@ -1117,6 +1119,8 @@
<div class="_tit _tit2 w890px">
<!-- 预付款冲抵 电商商品-->
<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>
......@@ -1463,6 +1467,7 @@
import dmcTravelBill from './FinancialSubmodule/DmcTravelBillModule'; //线路
import CostmonthDetails from './components/CostmonthDetails';
import UserCredit from './components/UserCredit';
export default {
data() {
return {
......@@ -1564,7 +1569,8 @@
"czBillModule": czBillModule,
"dmcTravelBill": dmcTravelBill,
CostmonthDetails
CostmonthDetails,
UserCredit
},
created() {
// // crm自动登陆传过来的参数
......@@ -2431,6 +2437,10 @@
}
this.chongJudge(data)
this.GetDetail = data;
if (this.GetDetail.DetailList) {
this.GetDetail.DetailList.forEach(item => {
if (item.CostTypeName == "领队导游资金池领款") {
......
src/components/FinancialModule/MonthlyCostStatement/index.vue
View file @ d7a28bfe
......@@ -159,8 +159,8 @@
</el-form>
<ul class="clearfix">
<li class="hight_query">
<span>
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
<span style="font-size: 13px;color: red;cursor: pointer;">
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo" style="font-size: 12px;"></i></em>
</span>
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">导出</button>
......@@ -1024,11 +1024,13 @@ export default {
let ids
ids = this.multipleSelection.map(x=>{ return x.FrID})
let orderObj = {
CostType: 1547,
OtherType: 75,
Money: this.getMoney(),
isVerifyMoney: true,
ReFinanceIds: ids.join(','),//单号
ReFinanceId2: 3,//成本
}
this.$confirm(`已选单号：${ids.join(',')}，总金额：${orderObj.Money},是否继续生成财务单据`, "提示", {
confirmButtonText: "确定",
......@@ -1040,6 +1042,7 @@ export default {
name: 'ChoiceAddFinancialDocuments',
query: {
'Type': 2,
'searchTitle': '月结付款',
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
}
......
src/components/FinancialModule/PrestorageManagement/components/detailList.vue
View file @ d7a28bfe
......@@ -4,6 +4,7 @@
<template >
<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="_fnDm_content" v-loading='loading'>
<el-table
......@@ -20,7 +21,13 @@
{{ scope.row.Type==1?'已存入':scope.row.Type==2?'待存入':scope.row.Type==3?'退回':scope.row.Type==4?'使用':'' }}
</template>
</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="关联单号">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;" @click="openDetails(scope.row.FrID)">{{ scope.row.FrID }}</span>
......@@ -29,9 +36,9 @@
<el-table-column prop="" label="单号状态">
<template slot-scope="scope">
<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===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===0" class="iconfont icon-zancun" style="color: #FF9C01">{{scope.row.StatusName}}</i>
</span>
......@@ -82,6 +89,23 @@ export default {
var that = this;
},
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) {
this.cancelBtn()
......
src/components/FinancialModule/PrestorageManagement/prestoreList.vue
View file @ d7a28bfe
<style scoped>
/deep/.el-table th.el-table__cell{
background-color: #E6E6E6;
}
</style>
<template >
......@@ -12,12 +14,12 @@
<el-input placeholder="" class="" v-model="msg.RemitterName" @keyup.native="checkInteger(msg,'FrID')" maxlength="8"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<!-- <el-col :span="6">
<el-form-item label="ID：">
<el-input placeholder="" class="" v-model="msg.ClientIdStr" @keyup.native="checkInteger(msg,'FrID')" maxlength="8"
placeholder="多个ID英文逗号,分隔"></el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="6">
<el-form-item label="使用日期：">
<el-date-picker class="h34"
......@@ -53,21 +55,24 @@
{{ scope.row.Contact+'/'+scope.row.ContactNumber }}
</template>
</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="待存入">
<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>
</el-table-column>
<el-table-column prop="Refund" label="退款">
<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>
</el-table-column>
<el-table-column prop="UseMoney" label="已使用">
<template slot-scope="scope">
<span v-if="scope.row.UseMoney" style="cursor: pointer;color: #00C6FF;" @click="seeDeta(scope.row)">{{ scope.row.UseMoney }}</span>
<template v-else>-</template>
<span style="cursor: pointer;color: #00C6FF;" @click="seeDeta(scope.row)">{{ scope.row.UseMoney }}</span>
</template>
</el-table-column>
<el-table-column prop="" label="期末余额">
......@@ -121,7 +126,12 @@ export default {
mounted(){
let userInfo=this.getLocalStorage();
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;
},
methods:{
......
src/components/SalesModule/Common/signedClientList.vue
View file @ d7a28bfe
......@@ -514,7 +514,7 @@
style="cursor: pointer;text-decoration: underline;">{{item.signingPrice}}</span></td>
<td><span @click="goUrlCCC(item.customerId,1)"
style="cursor: pointer;text-decoration: underline;">{{item.signingUnsettledPrice}}</span></td>
<td>{{ item.signingEndTime }}</td>
<td>{{item.signingEndTime}}</td>
</tr>
<tr v-if="list.length == 0">
<td colspan="12" style="text-align: center">暂无数据</td>
......@@ -525,6 +525,7 @@
<script>
export default {
props: ["loading", "list", "pagesTitle", "isVisa"],
components: {},
data() {
return {
editNum: false,
......@@ -560,7 +561,6 @@ export default {
teamInfo: {}, //团队信息
};
},
components: {},
filters: {
priceFormat(value) {
if (value == null) {
......
src/components/SalesModule/MyCustomer.vue
View file @ d7a28bfe
......@@ -447,6 +447,7 @@
<th>询价与需求</th>
<th>所属联盟</th>
<th>优惠券</th>
<th>预存余额</th>
<th>操作</th>
</tr>
<tr v-for="(item,i) in dataList" :key="i">
......@@ -498,6 +499,9 @@
<td><span style="cursor: pointer;text-decoration: underline;"
@click.stop="goUrC('CouponsList',item.customerAccountId)">{{item.couponNum}}</span></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-button @click.stop="EditMsg(item)" style="padding:4px" type="primary" icon="iconfont icon-bianji"
circle></el-button>
......@@ -866,17 +870,21 @@
</el-row>
</el-form>
</div>
<detailList v-if="showdetail" :ClientId="detailObj&&detailObj.customerId" @cancel="showdetail=false"></detailList>
</div>
</template>
<script>
import detailList from "../FinancialModule/PrestorageManagement/components/detailList.vue";
import signedClientList from './Common/signedClientList'
export default {
components:{
signedClientList
signedClientList,
detailList
},
data() {
return {
detailObj: null,
showdetail: false,
isVisa: false, // 是否是签证下面的菜单
pagesTitle: '跟团游产品',
saveMsg: [],
......@@ -1052,6 +1060,10 @@
}
},
methods: {
seeDeta(row){
this.detailObj = row
this.showdetail = true
},
reSearchPage(){
this.msg.pageIndex = 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