Skip to content

S
SuperMan
Commit 2f02e513 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 20d3373e bdc892bd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 295 additions and 303 deletions
src/components/Contract/ElectronicContract.vue
View file @ 2f02e513
......@@ -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 @ 2f02e513
......@@ -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="">
......@@ -231,26 +239,27 @@
<div style="display: flex;flex-wrap: wrap;color:red;" >
<span>财务单据信息：</span>
<template >
<p size="mini" closable
style="margin-right: 5px;margin-bottom: 5px;"
<p size="mini" closable
style="margin-right: 5px;margin-bottom: 5px;width:99%;"
v-for="(x,index) in financeDataList"
:key="x.FrID"
:type="danger">
（{{x.CurrencyName}}） 总收入： {{x.totalMoneyI}} 总支出：{{x.totalMoneyO}} ，关联调拨单总金额：{{x.totalMoneyA}} 已冲抵金额：{{x.totalMoneyU}}，剩余金额：{{x.totalMoneyS}}
（{{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;" >
<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;"
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}}
（{{x.CurrencyName}}） 总收款：{{x.totalMoneyA}} 总支出金额：{{x.totalMoneyU}}，剩余金额：{{x.totalMoneyS}}<br/>
</p>
</template>
</div></div>
......@@ -675,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;
......@@ -698,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();
......@@ -1145,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 = '';
......
src/components/TravelContractConfirm.vue
View file @ 2f02e513
......@@ -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 @ 2f02e513
......@@ -824,10 +824,12 @@
<td>出境社监督、投诉电话：</td>
<td colspan="3">{{dataList.regulatorComplainCall}}</td>
</tr>
<tr>
<td>四川省 成都市旅游质监执法机构：</td>
<td colspan="3">{{dataList.regulatorName}}</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 @ 2f02e513
......@@ -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';
......
src/components/sale/ExpectedCommission.vue
View file @ 2f02e513
......@@ -567,6 +567,8 @@
CommissionInfor:{},
OrderList: [],
loading: true,
Year: "",
Year2: "",
YearTime:'',
LastMonthTime: '',
MonthTime: '',
......@@ -611,7 +613,9 @@
}
let nowdays = new Date()
this.Year = new Date().getFullYear()
this.Year2 = new Date().getFullYear()-1
this.LastMonthTime = new Date().getMonth()
this.LastMonthTime = this.LastMonthTime==0?12:this.LastMonthTime
this.MonthTime = new Date().getMonth() + 1
this.msg.Month = this.Year+'-'+(this.MonthTime>=10?this.MonthTime:'0'+this.MonthTime)
this.MonthList[0].Name = this.MonthList[0].Name+'('+this.LastMonthTime+'月)'
......@@ -640,7 +644,8 @@
if(item.Id==1){
this.msg.Month = this.Year+'-'+(this.MonthTime>=10?this.MonthTime:'0'+this.MonthTime)
}else{
this.msg.Month = this.Year+'-'+(this.LastMonthTime>=10?this.LastMonthTime:'0'+this.LastMonthTime)
if(this.LastMonthTime==12)this.msg.Month = this.Year2+'-'+(this.LastMonthTime>=10?this.LastMonthTime:'0'+this.LastMonthTime)
else this.msg.Month = this.Year+'-'+(this.LastMonthTime>=10?this.LastMonthTime:'0'+this.LastMonthTime)
}
this.getList()
// this.getData()
......
src/components/temp/operation.vue
View file @ 2f02e513
......@@ -645,6 +645,8 @@
],
CommissionInfor: {},
OrderList: [],
Year: "",
Year2: "",
YearTime: '',
LastMonthTime: '',
MonthTime: '',
......@@ -716,7 +718,8 @@
if (item.Id == 1) {
this.msg.Month = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime)
} else {
this.msg.Month = this.Year + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime)
if(this.LastMonthTime==12) this.msg.Month = this.Year2 + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime)
else this.msg.Month = this.Year + '-' + (this.LastMonthTime >= 10 ? this.LastMonthTime : '0' + this.LastMonthTime)
}
this.getList()
},
......@@ -889,7 +892,9 @@
}
let nowdays = new Date()
this.Year = new Date().getFullYear()
this.Year2 = new Date().getFullYear()-1
this.LastMonthTime = new Date().getMonth()
this.LastMonthTime = this.LastMonthTime==0?12:this.LastMonthTime
this.MonthTime = new Date().getMonth() + 1
this.msg.Month = this.Year + '-' + (this.MonthTime >= 10 ? this.MonthTime : '0' + this.MonthTime)
this.MonthList[0].Name = this.MonthList[0].Name + '(' + this.LastMonthTime + '月)'
......
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