Skip to content

S
SuperMan
Commit 12cc013a authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 17ccaf48 3fb99c08
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 17 deletions
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 12cc013a
...@@ -417,7 +417,7 @@ export default { ...@@ -417,7 +417,7 @@ export default {
TypeId:this.accType, TypeId:this.accType,
BranchId:-1, BranchId:-1,
Alias:'', Alias:'',
RB_Branch_Id:this.RB_Branch_Id, // RB_Branch_Id:this.RB_Branch_Id,
} }
this.apipost('BankAccount_post_GetPlatformList',msg, res => { this.apipost('BankAccount_post_GetPlatformList',msg, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 12cc013a
...@@ -453,7 +453,7 @@ export default { ...@@ -453,7 +453,7 @@ export default {
BranchId:-1, BranchId:-1,
Alias:'', Alias:'',
} }
this.apipost('BankAccount_post_GetCashAccountList',msg, res => { this.apipost('BankAccount_post_GetCashPoolList',msg, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
this.accountList = data; this.accountList = data;
...@@ -651,7 +651,7 @@ export default { ...@@ -651,7 +651,7 @@ export default {
BranchId:-1, BranchId:-1,
Alias:'' Alias:''
}; };
this.apipost('BankAccount_post_GetCashAccountList',msg, res => { this.apipost('BankAccount_post_GetCashPoolList',msg, 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=>{
...@@ -674,7 +674,7 @@ export default { ...@@ -674,7 +674,7 @@ export default {
}, err => {}) }, err => {})
}, },
BankAccount_post_GetCashPoolList(query){ // 获取资金池账 BankAccount_post_GetCashPoolList(query){ // 获取资金池账
this.apipost('BankAccount_post_GetCashPoolList',{TypeId:2,BranchId:-1,Alias:''}, res => { this.apipost('BankAccount_post_GetCashPoolList',{TypeId:4,BranchId:-1,Alias:''}, 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=>{
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 12cc013a
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FiniceReciveList"> <template v-for="item in DataList.FiniceReciveList">
<tr v-for="(cost, costIndex) in item.CostTypeList" :key="costIndex+Math.ceil(Math.random()*999)" v-if="cost==='团费'"> <tr v-if="isExists(item.CostTypeList,'团费')">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td> <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td> <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td> <td>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FiniceReciveList"> <template v-for="item in DataList.FiniceReciveList">
<tr v-for="(cost,costIndex) in item.CostTypeList" :key="costIndex+Math.ceil(Math.random()*999)" v-if="cost==='地接费（结算）'"> <tr v-if="isExists(item.CostTypeList,'地接费（结算）')">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td> <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td> <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td> <td>
...@@ -297,7 +297,7 @@ ...@@ -297,7 +297,7 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FiniceReciveList"> <template v-for="item in DataList.FiniceReciveList">
<tr v-for="(cost,costIndex) in item.CostTypeList" :key="costIndex+Math.ceil(Math.random()*999)" v-if="cost==='自费'"> <tr v-if="isExists(item.CostTypeList,'自费')">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td> <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td> <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td> <td>
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FiniceReciveList"> <template v-for="item in DataList.FiniceReciveList">
<tr v-for="(cost,costIndex) in item.CostTypeList" :key="costIndex+Math.ceil(Math.random()*999)" v-if="cost==='小费'"> <tr v-if="isExists(item.CostTypeList,'小费')">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td> <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td> <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td> <td>
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FiniceReciveList"> <template v-for="item in DataList.FiniceReciveList">
<tr v-for="(cost,costIndex) in item.CostTypeList" :key="costIndex+Math.ceil(Math.random()*999)" v-if="cost!=='团费' && cost!=='地接费（结算）' && cost!=='小费收入'&& cost!=='自费收入'&& cost!=='佣金收入' && item.OrderSource!==7"> <tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入')&& NotExists(item.CostTypeList,'自费收入')&& NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
<td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td> <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span></td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td> <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td> <td>
...@@ -479,7 +479,7 @@ ...@@ -479,7 +479,7 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FinicePayList"> <template v-for="item in DataList.FinicePayList">
<tr v-for="(cost,costIndex) in item.CostTypeList" :key="costIndex+Math.ceil(Math.random()*999)" v-if="cost==='邀请函费用' || cost==='名单表'"> <tr v-if="isExists(item.CostTypeList,'邀请函费用') || isExists(item.CostTypeList,'名单表')">
<td> <td>
<el-checkbox v-model="item.checked"></el-checkbox> <el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span> <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
...@@ -526,7 +526,7 @@ ...@@ -526,7 +526,7 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FinicePayList"> <template v-for="item in DataList.FinicePayList">
<tr v-for="(cost,costIndex) in item.CostTypeList" :key="costIndex+Math.ceil(Math.random()*999)" v-if="cost==='车资'"> <tr v-if="isExists(item.CostTypeList,'车资')">
<td> <td>
<el-checkbox v-model="item.checked"></el-checkbox> <el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span> <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
...@@ -620,7 +620,7 @@ ...@@ -620,7 +620,7 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FinicePayList"> <template v-for="item in DataList.FinicePayList">
<tr v-for="(cost,costIndex) in item.CostTypeList" :key="costIndex+Math.ceil(Math.random()*999)" v-if="cost==='国内联运'"> <tr v-if="isExists(item.CostTypeList,'国内联运')">
<td> <td>
<el-checkbox v-model="item.checked"></el-checkbox> <el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span> <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
...@@ -667,7 +667,7 @@ ...@@ -667,7 +667,7 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FinicePayList"> <template v-for="item in DataList.FinicePayList">
<tr v-for="(cost,costIndex) in item.CostTypeList" :key="costIndex+Math.ceil(Math.random()*999)" v-if="cost==='签证费'"> <tr v-if="isExists(item.CostTypeList,'签证费')">
<td> <td>
<el-checkbox v-model="item.checked"></el-checkbox> <el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span> <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
...@@ -714,7 +714,7 @@ ...@@ -714,7 +714,7 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FinicePayList"> <template v-for="item in DataList.FinicePayList">
<tr v-for="(cost,costIndex) in item.CostTypeList" :key="costIndex+Math.ceil(Math.random()*999)" v-if="cost==='提成'"> <tr v-if="isExists(item.CostTypeList,'提成')">
<td> <td>
<el-checkbox v-model="item.checked"></el-checkbox> <el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span> <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
...@@ -761,7 +761,7 @@ ...@@ -761,7 +761,7 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FinicePayList"> <template v-for="item in DataList.FinicePayList">
<tr v-for="(cost,costIndex) in item.CostTypeList" :key="costIndex+Math.ceil(Math.random()*999)" v-if="cost==='地接费（领取）'"> <tr v-if="isExists(item.CostTypeList,'地接费（领取）')">
<td> <td>
<el-checkbox v-model="item.checked"></el-checkbox> <el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span> <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
...@@ -841,6 +841,108 @@ ...@@ -841,6 +841,108 @@
</template> </template>
</table> </table>
</div> </div>
<div class="Team_collection">
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">非成本</div>
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
</div>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">领队佣金：</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">费用类型</th>
<th width="500">交易明细</th>
<th width="300">金额</th>
<th width="200">交易日期</th>
<th width="250">制单人员</th>
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'领队佣金')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
<td>
<div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率 {{childItem.Rate}}</span>
</div>
</td>
<td style="font-size:14px;">
应付：{{item.Money}}<br />
实付：{{item.Money}}
</td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.EmName}}</div>
<div class="Team_btmDiv">{{item.CreateDate}}</div>
</td>
<td>{{item.StatusStr}}</td>
<td>
<div v-for="AuditItem in item.AuditList">
{{AuditItem.EmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
</td>
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">导游佣金：</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">费用类型</th>
<th width="500">交易明细</th>
<th width="300">金额</th>
<th width="200">交易日期</th>
<th width="250">制单人员</th>
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'导游佣金')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
<td>
<div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率 {{childItem.Rate}}</span>
</div>
</td>
<td style="font-size:14px;">
应付：{{item.Money}}<br />
实付：{{item.Money}}
</td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.EmName}}</div>
<div class="Team_btmDiv">{{item.CreateDate}}</div>
</td>
<td>{{item.StatusStr}}</td>
<td>
<div v-for="AuditItem in item.AuditList">
{{AuditItem.EmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
</td>
</tr>
</template>
</table>
</div>
</div> </div>
<div class="Team_BtnList"> <div class="Team_BtnList">
<input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn" /> <input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn" />
......
src/components/confirmationOrderDownLoad.vue
View file @ 12cc013a
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" />
<a class="travelControlTripBtn" v-if="priceList!=null&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none; <a class="travelControlTripBtn" v-if="priceList!=null&& priceList[0]!=null && priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;" :href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a> width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;" :href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>
<!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') --> <!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息--> <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
...@@ -659,7 +659,7 @@ ...@@ -659,7 +659,7 @@
let msg = JSON.parse(data) let msg = JSON.parse(data)
if (msg.ResultCode) { // 已经存在文件 直接调用下载 if (msg.ResultCode) { // 已经存在文件 直接调用下载
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc) _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
} else { // 不存在图片保存图片后下载 } else if (document.querySelector("#gernalCanvas")){ // 不存在图片保存图片后下载
if (document.querySelector("#gernalCanvas").querySelectorAll('img').length === 0) { if (document.querySelector("#gernalCanvas").querySelectorAll('img').length === 0) {
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc) _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
return return
...@@ -718,6 +718,8 @@ ...@@ -718,6 +718,8 @@
}); });
}); });
} }
} else {
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
} }
}, },
error: function () { error: function () {
......
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