Skip to content

S
SuperMan
Commit 5eba3129 authored by zhengke's avatar zhengke
Browse files
Options

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

parents 6393e0d7 584f5007
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 9 deletions
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 5eba3129
......@@ -128,8 +128,8 @@
let newList = [];
if (this.templateID) {
this.templateID.forEach(x=>{
this.payList.forEach(y=>{
if(x === y.Id) {
this.GetList.forEach(y=>{
if(x == y.Id) {
y.showYes = true
newList.push(JSON.parse(JSON.stringify(y)))
} else {
......@@ -145,7 +145,6 @@
this.apipost('Financial_post_GetList',{},res=>{
if(res.data.resultCode==1){
let data = res.data.data;
console.log("data",data);
if(data){
data.forEach(x => {
// 5-8 OrderSource 为5 并且当前登录人为吴珊，只显示49和50
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 5eba3129
......@@ -1271,6 +1271,7 @@ export default {
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.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
}
if(data.VorcherInos){
data.VorcherInos.forEach(x=>{
......@@ -1455,7 +1456,7 @@ export default {
})
var gj = guoji==''?'':'国际机票:'+guoji;
var gn = guonei==''?'':'国内航段:'+guonei;
var gjzd = guojizhongduan==''?'':'国际中断:'+guojizhongduan;
var gjzd = guojizhongduan==''?'':'国际中段:'+guojizhongduan;
var sj = shuijin==''?'':'税金:'+shuijin;
var sc = shengcang==''?'':'升舱:'+shengcang;
this.Description= gj+' '+gn+' '+gjzd+ ' '+ sj+' '+sc
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 5eba3129
......@@ -1394,6 +1394,7 @@ export default {
this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
}
if(data.VorcherInos){
data.VorcherInos.forEach(x=>{
......@@ -1495,7 +1496,6 @@ export default {
if(that.describeList){
that.describeList.forEach(item=>{
that.Description+=item.GuestName+" ";
})
}
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 5eba3129
......@@ -538,7 +538,7 @@
</td>
<td width="80" class="_zhidan">
<input type="button" v-if="item.TeamType == 1" value="日当费" class="normalBtn" @click="goZhiDan(item, 2)" />
<input type="button" value="制单" class="normalBtn" @click="goZhiDan(item)" />
<input v-if="item.hideZDBtn" type="button" value="制单" class="normalBtn" @click="goZhiDan(item)" />
</td>
</tr>
</table>
......@@ -842,6 +842,10 @@
if (str == 3)
return '晚餐'
},
CompareDate(d1, d2){
console.log(d1, d2)
return ((new Date(d1.replace(/-/g,"\/"))) <= (new Date(d2.replace(/-/g,"\/"))));
},
getNav() {
let _this = this
this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {
......@@ -853,6 +857,11 @@
nav.forEach(x => {
nav.LeaderGetPriceT = 0;
num += x.LeaderGetPrice
let dd = this.CompareDate(x.DMCRemark, new Date().Format("yyyy-MM-dd"))
x.hideZDBtn = false
if(dd) {
x.hideZDBtn = true
}
})
nav.forEach((x, i) => {
if (i === 0) {
......
src/components/SalesModule/investigationList.vue
View file @ 5eba3129
......@@ -21,6 +21,7 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>订单号</th>
<th>客人名称</th>
<th>销售名称</th>
<th>客户名称</th>
<th>分数</th>
......@@ -28,6 +29,7 @@
</tr>
<tr v-for="item in dataList">
<td>{{item.OrderID}}</td>
<td>{{item.GuestName}}</td>
<td>{{item.EnterName}}</td>
<td>{{item.CustomerName}}</td>
<td>{{item.ScoreNum}}</td>
......
src/components/leaderPay2.vue
View file @ 5eba3129
......@@ -490,6 +490,8 @@ input[type="number"] {
<th>实付金额</th>
<th>报账金额
<input
v-if="totalList.SelfPayingExpendTotalPrice>0 || totalList.SelfPayingIncomeTotalPrice>0 || (totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0 ||
totalScenicPrice>0 || totalTrafficPrice>0 || totalDinnerPrice>0 || totalHotelPrice>0"
type="button"
value="保存"
class="leader2Btn"
......@@ -741,6 +743,66 @@ input[type="number"] {
<td colspan="5">暂无数据</td>
</tr>
</table>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" >
<tr>
<th width="140">团号</th>
<th width="200">领款金额</th>
<th>出团汇率</th>
<th>用款计划汇率</th>
<th>汇兑损益金额</th>
<th>操作</th>
</tr>
<tr v-for="(item, index) in TotalNav">
<td>{{item.TCNUMS}}</td>
<td>{{item.LeaderGetPrice}}</td>
<td>
<p v-for="(f, fd) in item.FinanceIds">{{f.Fee}}</p>
</td>
<td>
<p v-for="(f, fd) in item.FinanceIds">{{f.Rate}}</p>
</td>
<td>
<p v-for="(f, fd) in item.FinanceIds">{{Math.round(f.OriginalMoney * (f.Rate - f.Fee) * 100) / 100}}</p>
</td>
<td width="80" class="_zhidan">
<input
type="button"
value="制单"
class="leader2Btn"
@click="huiDuiShouYi(item, item.FinanceIds)"
>
</td>
</tr>
<tr v-if="!TotalNav && !TotalNav.length">
<td colspan="5">暂无数据</td>
</tr>
</table>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" >
<tr>
<th colspan="4">意见调查表</th>
</tr>
<tr>
<th width="140">团号</th>
<th>总人数</th>
<th>已填写人数</th>
<th>明细</th>
</tr>
<tr v-for="(item, index) in TotalNav">
<td>{{item.TCNUMS}}</td>
<td>{{item.CommonReport.HouseStatistics.RealityNum}}</td>
<td>{{item.TotalGuestsurvey}}</td>
<td>
<input
type="button"
value="明细"
class="leader2Btn"
@click="goDIaoCha(item)">
</td>
</tr>
<tr v-if="!TotalNav && !TotalNav.length">
<td colspan="5">暂无数据</td>
</tr>
</table>
<template
v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==1"
>
......@@ -816,6 +878,46 @@ export default {
};
},
methods: {
// 意见调查列表
goDIaoCha: function (obj){
let fullPath = `/investigationList?TCID=${obj.TCIDS}&blank=y&tab=问券调查列表`;
let dom = document.querySelector("#blankLink");
dom.href = `http://${window.location.host}/#${fullPath}`;
dom.click();
},
// 汇兑收益金额制单
huiDuiShouYi: function (obj, list){
if (obj.ExchangeEarningPrice>0) {
this.$message.error('已有财务单据，无法制单')
return
}
let money = 0;
for(let i = 0; i < list.length; i++) {
money = money + Math.round(list[i].OriginalMoney * (list[i].Rate - list[i].Fee) * 100) / 100
}
console.log(money)
if (money <= 0) {
this.$message.error('金额小于0，无法制单')
return
} else {
let userinfo = this.getLocalStorage()
let TCIDARR = [obj.TCIDS];
let orderObj = {
OrderID: 0,
OrderSource: 8,
Obj: {},
SourceID: 0,
CostType: 30,
TCIDList: TCIDARR,
Money: money,
laRemark: "实际领款金额 * (实际领款汇率 - 出团汇率)",
};
let fullPath = `/ChoiceAddFinancialDocuments?Type=${0}&companyID=${userinfo.RB_Branch_id}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
let dom = document.querySelector("#blankLink");
dom.href = `http://${window.location.host}/#${fullPath}`;
dom.click();
}
},
// 保存报账金额
saveBZPrice: function (){
let HotelPrice = this.BaoZhangPrice.HotelPrice ? parseFloat(this.BaoZhangPrice.HotelPrice) : 0
......@@ -877,7 +979,8 @@ export default {
this.$message.error('金额有误')
return
}
if (obj.Type == 1) {
// type 1 零件地 自动生成 2 领队人头费 跳转
if (obj.Type == 2) {
let id = [72, 73];
let TCIDARR = [obj.TCIDs];
let orderObj = {
......@@ -890,7 +993,7 @@ export default {
Money: inputPrice,
TCNUMS: ''
};
let fullPath = `/ChoiceAddFinancialDocuments?Type=${2}&templateID=${JSON.stringify(id)}&companyID=${userinfo.RB_Branch_id}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
let fullPath = `/ChoiceAddFinancialDocuments?Type=${1}&templateID=${JSON.stringify(id)}&companyID=${userinfo.RB_Branch_id}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
let dom = document.querySelector("#blankLink");
dom.href = `http://${window.location.host}/#${fullPath}`;
dom.click();
......
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