Skip to content

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

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

parents a48388ed 6ecc6391
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 82 deletions
src/components/Contract/ElectronicContract.vue
View file @ 1567e5cd
......@@ -798,8 +798,8 @@
<div class="EC_ComTitle" style="margin-bottom:40px;">投诉信息</div>
<p>出境社监督、投诉电话：<span>{{dataList.companyComplainCall}}</span></p>
<p>四川省成都市旅游质监执法机构：<span>{{dataList.regulatorName}}</span></p>
<p>投诉电话：<span>{{dataList.regulatorComplainCall}}</span></p>
<p>成都市旅游质监执法监督网：<span>{{dataList.regulatorWebsite}}</span></p>
<p>投诉电话：<span>{{dataList.regulatorComplainCall}}</span></p>
<p>地址：<span>{{dataList.regulatorAddress}}</span></p>
<p>邮编：<span>{{dataList.regulatorPostCode}}</span></p>
</div>
......
src/components/FinancialModule/HelpBranch/index.vue
View file @ 1567e5cd
......@@ -22,11 +22,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="团队编号：">
<el-input v-model="msg.TCNUM" class=""></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="结算状态：">
<el-select v-model='msg.IsSelectAduiting'>
......@@ -93,6 +89,31 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期：">
<el-date-picker class="h34"
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="交易日期：">
<el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<template v-if="heightQueryBox">
<el-col :span="4">
<el-form-item label="团队编号：">
<el-input v-model="msg.TCNUM" class=""></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="付款对象：">
<el-select
......@@ -101,8 +122,7 @@
remote
reserve-keyword
placeholder="请输入关键词"
:remote-method="GetClientAccountListByKeyWord"
>
:remote-method="GetClientAccountListByKeyWord">
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientAccountList'
:label='`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`'
......@@ -118,18 +138,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="制单日期：">
<el-date-picker class="h34"
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<template v-if="heightQueryBox">
<el-col :span="4">
<el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="">
......@@ -227,21 +235,34 @@
</li>
</ul>
</div>
<div style="display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="display: flex;flex-wrap: wrap;color:red;" v-if="allotDataList.length>0">
<span>调拨单总额：</span>
<div style="display: flex;flex-wrap: nowrap; padding: 10px;" v-if="financeDataList.length>0">
<div style="display: flex;flex-wrap: wrap;color:red;" >
<span>财务单据信息：</span>
<template >
<span size="mini" closable
style="margin-right: 5px;margin-bottom: 5px;"
v-for="(x,index) in allotDataList"
<p size="mini" closable
style="margin-right: 5px;margin-bottom: 5px;width:99%;"
v-for="(x,index) in financeDataList"
:key="x.FrID"
:type="x.Type==2?'danger':'success'">
{{x.Money}}（{{x.CurrencyName}}），已冲抵金额：{{x.UseMoney}}，剩余金额：{{x.SurplusMoney}}
</span>
:type="danger">
（{{x.CurrencyName}}） 总收入： {{x.totalMoneyI}} 总支出：{{x.totalMoneyO}} ，关联调拨单总金额：{{x.totalMoneyA}} 已冲抵金额：{{x.totalMoneyU}}，剩余金额：{{x.totalMoneyS}}
</p>
</template>
</div>
</div>
<div style="display: flex;flex-wrap: nowrap; padding: 10px;" v-if="allotDataList.length>0">
<div style="display: flex;flex-wrap: wrap;color:red;" >
<span>资金调拨信息：</span>
<template >
<p size="mini" closable
style="margin-right: 5px;margin-bottom: 5px;width:99%;"
v-for="(x,index) in allotDataList"
:key="x.FrID"
:type="success">
（{{x.CurrencyName}}） 总收款：{{x.totalMoneyA}} 总支出金额：{{x.totalMoneyU}}，剩余金额：{{x.totalMoneyS}}<br/>
</p>
</template>
</div></div>
<div style="display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="float:left;width:85%;display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="display: flex;flex-wrap: wrap; ">
......@@ -293,13 +314,15 @@
width="80">
<template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;"
@click="openDetails(scope.row.FrID,1)">{{ scope.row.FrID }}</span>
@click="openDetails(scope.row.FrID,1)" v-if="scope.row.Type!=4">{{ scope.row.FrID }}</span>
<span style="cursor: pointer;color: #00C6FF;"
@click="openDetails(scope.row.FrID,2)" v-else>{{ scope.row.FrID }}</span>
</template>
</el-table-column>
<el-table-column
prop="name"
label="单据类型"
width="80">
width="100">
<template slot-scope="scope">
<span v-if="scope.row.Type==2" style="display: inline-block;
padding: 2px 8px;
......@@ -316,6 +339,14 @@
line-height: 16px;
border-radius: 4px;">
收入
</span>
<span v-if="scope.row.Type==4" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
line-height: 16px;
border-radius: 4px;">
调拨资金
</span>
<span v-if="scope.row.Type==5" style="display: inline-block;
padding: 2px 8px;
......@@ -538,6 +569,7 @@ export default {
showDialog: false,
multipleSelection: [],
allotDataList:[],
financeDataList:[],
SelectAduitingList:[
{Name:'不限',Id:'0'},
{Name:'已结算',Id:'1'},
......@@ -652,6 +684,9 @@ export default {
this.msg.sTradeDate=this.$route.query.StartDate;
this.msg.eTradeDate=this.$route.query.StartDate;
if(this.$route.query.BankID==''){
// 费用类型：机票折让费
this.msg.CostTypeID=197;
......@@ -675,6 +710,13 @@ export default {
if(this.$route.query.NewFinanceId){
this.msg.NewFinanceId = this.$route.query.NewFinanceId;
}
let STime = this.getBeforeDate(31,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
let ETime = this.getBeforeDate(0,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
if(!this.msg.startDate){
this.productionDate = [STime,ETime]
this.msg.sDate = this.productionDate[0];
this.msg.eDate = this.productionDate[1];
}
//this.financeinfo_post_GetClientAccountList()
this.financeinfo_post_GetList();
this.financeinfo_post_GetCostTypeList();
......@@ -687,6 +729,7 @@ export default {
this.financeinfo_post_GetClientTypeList();
this.FinancialFlowTemplate_post_GetStatusList();
this.getPageList();
this.getAllotBrandList();
this.AccountType_post_GetList();
var that = this;
......@@ -759,11 +802,16 @@ export default {
}
},
selectable(row, index){
if (!this.DataList[index].ReFinanceIds) {
return true;
} else {
if(this.DataList[index].Type==4){
return false;
}
else{
if (!this.DataList[index].ReFinanceIds) {
return true;
} else {
return false;
}
}
},
handleSelectionChange(val) {
this.multipleSelection = val;
......@@ -810,29 +858,6 @@ export default {
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
this.loading= true;
this.allotDataList=[];
if(this.msg.NewFinanceId&&this.msg.NewFinanceId>0){
this.apipost(
"Financial_post_SelectAllotFinan",
{FrID:this.msg.NewFinanceId},
res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
let obj= {
FrID:data.FrID,
Money:data.Money,
CurrencyName:data.CurrencyName,
SurplusMoney:data.SurplusMoney,
NowMoney:0,
UseMoney:data.UseMoney
}
this.allotDataList.push(obj);
}
},
err => {}
);
}
this.apipost('Financial_post_GetHelpBranchALLPageList',this.msg,res=>{
if(res.data.resultCode == 1) {
let data = res.data.data.pageData;
......@@ -867,6 +892,46 @@ export default {
this.currentPage = parseInt(this.msg.pageIndex);
},err=>{})
},
getAllotBrandList(){ // 获取列表数据
if(!this.msg.ClientID)this.msg.ClientID="";
if(!this.msg.ClientType)this.msg.ClientType=0;
if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
if(this.msg.TemplateIds=='0')this.msg.TemplateIds='';
if(this.msg.RB_Branch_Id === '')this.msg.RB_Branch_Id=-1;
if(this.msg.HelpBranchId === '')this.msg.HelpBranchId=-1;
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.TCID)this.msg.TCID=0;
if(!this.msg.OrderID)this.msg.OrderID=0;
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
if(!this.msg.NewFinanceId)this.msg.NewFinanceId=0;
if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0;
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
this.loading= true;
this.allotDataList=[];
this.financeDataList=[];
// if(this.msg.HelpBranchId>=0&&this.msg.RB_Branch_Id>=0){
this.apipost(
"Financial_post_GetAllotBrandList",
this.msg,
res => {
if (res.data.resultCode == 1) {
let data = res.data;
this.allotDataList=data.data.resultAllot;
this.financeDataList=data.data.result;
}
},
err => {}
);
//}
},
method5: function() {
if(!this.msg.ClientID)this.msg.ClientID="";
if(!this.msg.ClientType)this.msg.ClientType=0;
......@@ -1099,7 +1164,17 @@ export default {
}
this.msg.sDate = this.productionDate[0];
this.msg.eDate = this.productionDate[1];
}if(t==4){ //发团日期
}
if (t == 3) { //交易日期
if (!this.transactionDate) {
this.msg.sTradeDate = '';
this.msg.eTradeDate = '';
return
}
this.msg.sTradeDate = this.transactionDate[0];
this.msg.eTradeDate = this.transactionDate[1];
}
if(t==4){ //发团日期
if(!this.missionDate){
this.dateStart = '';
this.dateEnd = '';
......@@ -1154,7 +1229,8 @@ export default {
this.msg.pageIndex=1;
this.currentPage = 1;
this.getPageList()
this.getPageList()
this.getAllotBrandList()
},
getMoney(){
let Money = 0
......
src/components/TravelContractConfirm.vue
View file @ 1567e5cd
......@@ -3170,12 +3170,14 @@
<label id="l4">投诉信息</label>
<p>出境社监督、投诉电话：<font>{{dataList.companyComplainCall}}</font>
</p>
<p>四川省成都市旅游质监执法机构：<font>{{dataList.regulatorName}}</font>
</p>
<template v-if="CtObj.SignType==0">
<p>四川省成都市旅游质监执法机构：<font>{{dataList.regulatorName}}</font>
</p>
<p>成都市旅游质监执法监督网：<font>{{dataList.regulatorWebsite}}</font>
</p>
</template>
<p>投诉电话：<font>{{dataList.regulatorComplainCall}}</font>
</p>
<p>成都市旅游质监执法监督网：<font>{{dataList.regulatorWebsite}}</font>
</p>
<p>地址：<font>{{dataList.regulatorAddress}}</font>
</p>
<p>邮编：<font>{{dataList.regulatorPostCode}}</font>
......@@ -4231,7 +4233,7 @@
number_chinese(str) {
var num = parseFloat(str);
var strUnit = '仟佰拾亿仟佰拾万仟佰拾元角分';
var strOutput="";
var strOutput = "";
if (this.CtObj.SignType == 1) {
strUnit = '仟佰拾亿仟佰拾万仟佰拾円角分';
}
......
src/components/TravelContractDetail.vue
View file @ 1567e5cd
......@@ -820,14 +820,17 @@
<td>签约地点：</td>
<td colspan="3">{{dataList.contractPlace}}</td>
</tr>
<tr>
<td>出境社监督、投诉电话：</td>
<td colspan="3">{{dataList.regulatorComplainCall}}</td>
</tr>
<tr>
<td>四川省 成都市旅游质监执法机构：</td>
<td colspan="3">{{dataList.regulatorName}}</td>
</tr>
<tr>
<td>出境社监督、投诉电话：</td>
<td colspan="3">{{dataList.regulatorComplainCall}}</td>
</tr>
<template v-if="dataList.signType==0">
<tr>
<td>四川省 成都市旅游质监执法机构：</td>
<td colspan="3">{{dataList.regulatorName}}</td>
</tr>
</template>
<tr>
<td>投诉电话：</td>
<td colspan="3">{{dataList.companyComplainCall}}</td>
......
src/components/TravelContractNew.vue
View file @ 1567e5cd
......@@ -582,7 +582,8 @@
<tr>
<td>
<el-form-item label="儿童(不满14岁的)">
<el-input type="text" class="w300" v-model="CtObj.childPrice"></el-input> <template v-if="CtObj.signType==0">
<el-input type="text" class="w300" v-model="CtObj.childPrice"></el-input> <template
v-if="CtObj.signType==0">
元
</template>
<template v-else>
......@@ -594,7 +595,8 @@
<tr>
<td>
<el-form-item label="导游服务费" prop="servicePrice">
<el-input type="text" class="w300" v-model="CtObj.servicePrice"></el-input> <template v-if="CtObj.signType==0">
<el-input type="text" class="w300" v-model="CtObj.servicePrice"></el-input> <template
v-if="CtObj.signType==0">
元
</template>
<template v-else>
......@@ -1099,12 +1101,12 @@
<th width="10%">具体时间</th>
<th width="15%">地点</th>
<th width="12%">项目名称和内容</th>
<th width="12%">费用（ <template v-if="CtObj.signType==0">
元
</template>
<template v-else>
円
</template>）</th>
<th width="12%">费用（ <template v-if="CtObj.signType==0">
元
</template>
<template v-else>
円
</template>）</th>
<th width="12%">项目时长（分钟）</th>
<th width="12%">其他说明</th>
<th width="12%">旅游者签名同意</th>
......@@ -1476,10 +1478,12 @@
this.CtObj.company = "四川和平国际旅行社有限公司";
this.CtObj.companyAddress = "成都市锦江区青和里南段55号1栋2310、2311、2312号 "
this.CtObj.businessCertificate = 'L-SC-CJ00015';
this.CtObj.regulatorName = '四川省成都市旅游质监执法机构';
} else {
this.CtObj.company = "（株）ピースインターナショナル";
this.CtObj.companyAddress = "";
this.CtObj.businessCertificate = '';
this.CtObj.regulatorName = '';
}
},
goContract() {
......@@ -1556,7 +1560,7 @@
this.CtObj.company = '四川和平国际旅行社有限公司';
this.CtObj.businessCertificate = 'L-SC-CJ00015';
this.CtObj.companyAddress = '成都市锦江区青和里南段55号1栋2310、2311、2312号 ';
this.CtObj.regulatorName = '四川省成都市旅游质监执法机构';
this.CtObj.regulatorComplainCall = '17708046437';
this.CtObj.companyComplainCall = '028-96927';
......
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