Skip to content

S
SuperMan
Commit 0bdb2985 authored by zhengke's avatar zhengke
Browse files
Options

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

parents 88e22e27 82a6af68
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 32 deletions
src/components/FinancialModule/CapitalAllocation.vue
View file @ 0bdb2985
......@@ -15,7 +15,7 @@
.page_CapitalAllocation .page_CapitalAllocation_list {
width: 100%;
}
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.edit{
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.editedit{
width: 30px;
height: 30px;
display: inline-block;
......@@ -142,9 +142,9 @@
<tr>
<th>单号</th>
<th>金额</th>
<th>实付</th>
<!-- <th>实付</th> -->
<!-- <th>原币金额</th> -->
<th>交易日期</th>
<!-- <th>交易日期</th> -->
<th>创建时间</th>
<th>创建人</th>
<!-- <th>备注</th> -->
......@@ -152,11 +152,11 @@
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item, index) in dataList">
<td>{{item.FrID}}</td>
<td style="cursor:pointer" @click="goDetail('CapitalAllocationDetail', item.FrID)">{{item.FrID}}</td>
<td>{{item.Money}}</td>
<td>{{item.PayMoney}}</td>
<!-- <td>{{item.PayMoney}}</td> -->
<!-- <td>{{item.OriginalMoney}}</td> -->
<td>{{item.TradeDate}}</td>
<!-- <td>{{item.TradeDate}}</td> -->
<td>{{item.CreateDate}}</td>
<td>{{item.EmName}}</td>
<!-- <td>{{item.Description}}</td> -->
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 0bdb2985
......@@ -161,6 +161,8 @@
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="1" value="1" label="收入"></el-option>
<el-option key="2" value="2" label="支出"></el-option>
<el-option key="2" value="5" label="应收"></el-option>
<el-option key="2" value="6" label="应付"></el-option>
<el-option key="2" value="4" label="资金调拨"></el-option>
</el-select>
</span>
......@@ -589,6 +591,12 @@
<template v-else-if="item.OrderSource==10 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">签证编号：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==11 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">投诉编号：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==12 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">散卖机票编号：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==0">
<p class="_TCIDAndTCNUMList">{{ item.BranchName }}-{{item.DepartName}} </p>
</template>
......@@ -599,7 +607,7 @@
<td>
<template v-for="(s,si) in item.CostTypeList">
<span class="_tag_span">{{s}}</span><br/>
</template>
</template>
</td>
<td class="_number">
<template v-if="item.TradeWayList&&item.TradeWayList.length>0">
......@@ -619,7 +627,15 @@
<p>{{item.Type==1?'实收':'实付'}}：<span class="">{{moneyFormat(item.PayMoney)}}</span></p>
</td>
<td>
<span class="_color_gar">{{item.Type==2?item.ClientTypeName+'：':'汇款人：'}}</span><span>{{item.RemitterName}}</span>
<template v-if='item.Type===1'>
<span class="_color_gar">汇款人：</span><span>{{item.RemitterName}}</span>
</template>
<template v-if='item.Type===2'>
<span class="_color_gar">付款对象：</span><span>{{item.RemitterName}}</span>
</template>
<template v-if='item.Type===4'>
<span class="_color_gar">无</span>
</template>
</td>
<td valign="middle">
<img class="_head_img" :src="item.EmPhoto" alt="">
......@@ -658,7 +674,8 @@
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type==1?'addReceivablesDocuments':'addFinancialDocuments',item.Type,item.FrID,true,active,msg.pageIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<i class="iconfont icon-sousuo" @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
<i class="iconfont icon-sousuo" v-if='item.Type!==4' @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
<i class="iconfont icon-sousuo" v-if='item.Type===4' @click="goUrl('CapitalAllocationDetail',item.FrID,active,msg.pageIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="审核" placement="top">
<i v-if="msg.Conditon==3 && item.Is_Self!=1" class="iconfont icon-ico_commodity_defaul" @click="goUrl('BasicDocuments',item.FrID,active,msg.pageIndex)"></i>
......
src/components/Hotel/roomReservations.vue
View file @ 0bdb2985
......@@ -51,7 +51,7 @@
<tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w100">合团号：{{outItem.NewCombinationNum}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w100">{{outItem.NewCombinationNum}}</div>
</td>
<td>
<div class="w80">
......@@ -157,7 +157,7 @@
</td>
<td>
<div class="w80 link">
<p @click="goUrl('roomReservationsDetails',item,'订房详情')">详情</p>
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">详情</p>
</div>
</td>
</tr>
......@@ -251,7 +251,7 @@
}
})
},
goUrl(path, obj, title) {
goUrl(path, obj,outItem, title) {
this.$router.push({
name: path,
query: {
......@@ -259,7 +259,7 @@
'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': obj.NewCombinationNum,
'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y',
tab: title
}
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ 0bdb2985
......@@ -44,7 +44,7 @@
<tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w100">合团号：{{outItem.NewCombinationNum}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w100">{{outItem.NewCombinationNum}}</div>
</td>
<td>
<div class="w80">
......@@ -132,7 +132,7 @@
</td>
<td>
<div class="w80 link">
<p @click="goUrl('bookDinnerStatisticsDetails',item,'订餐详情')">详情</p>
<p @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'订餐详情')">详情</p>
</div>
</td>
</tr>
......@@ -159,7 +159,6 @@
data() {
return {
loading: false,
msg: {
pageIndex: 1,
pageSize: 10,
......@@ -235,7 +234,7 @@
}
})
},
goUrl(path, obj, title) {
goUrl(path, obj,outItem, title) {
this.$router.push({
name: path,
query: {
......@@ -243,7 +242,7 @@
'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': obj.NewCombinationNum,
'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y',
tab: title
}
......
src/components/SalesModule/groupInquiry.vue
View file @ 0bdb2985
......@@ -511,7 +511,7 @@
<el-input type="textarea" v-model="remarkMsg.OPInnerRemark"></el-input>
</el-form-item>
</el-col>
</el-form>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="queryCommonData.outerVisible = false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="setOPremark">{{$t('pub.sureBtn')}}</button>
......@@ -523,7 +523,7 @@
<span>修改送签日期</span>
<div>
<button class="hollowFixedBtn" type="button" @click="closeEdit">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="button" @click="editOk">{{$t('pub.saveBtn')}}</button>
<button class="normalBtn" type="button" @click="editOk">{{$t('pub.saveBtn')}}</button>
</div>
</div>
<div class="groupInquiry_edit_form">
......@@ -539,7 +539,7 @@
<span>修改出签日期</span>
<div>
<button class="hollowFixedBtn" type="button" @click="closeEdit2">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="button" @click="editOk2">{{$t('pub.saveBtn')}}</button>
<button class="normalBtn" type="button" @click="editOk2">{{$t('pub.saveBtn')}}</button>
</div>
</div>
<div class="groupInquiry_edit_form">
......@@ -555,7 +555,7 @@
<span>修改进馆日</span>
<div>
<button class="hollowFixedBtn" type="button" @click="closeAdmission">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="button" @click="admissionOk">{{$t('pub.saveBtn')}}</button>
<button class="normalBtn" type="button" @click="admissionOk">{{$t('pub.saveBtn')}}</button>
</div>
</div>
<el-form :model="msg_admission" :rules="rules" ref="admissionForm" :inline="true" class="groupInquiry_admission_form">
......@@ -580,7 +580,7 @@
</el-select>
</el-form-item>
<el-form-item prop="EuropeVisaName" class="groupInquiry_admission_formItem" v-show="msg_admission.EuropeVisaType==='2'&&msg_admission.EuropeSchengen==='5'">
<el-input class="groupInquiry_admission_input2" v-show="msg_admission.EuropeSchengen==='5'" v-model="msg_admission.EuropeVisaName" placeholder="输入国家名称"></el-input>
<el-input class="groupInquiry_admission_input2" v-show="msg_admission.EuropeSchengen==='5'" v-model="msg_admission.EuropeVisaName" placeholder="输入国家名称"></el-input>
</el-form-item>
</div>
</el-form>
......@@ -747,7 +747,8 @@ export default {
//航班配置
FlightState:0,
TCVisaStatus: '-1',
IsShowUnion:1
IsShowUnion:1,
QueryType:1,//查询类型 1:签证
},
remarkMsg: {
TCID: 0,
......@@ -828,8 +829,8 @@ export default {
})
},
downloadFile: function (item) {
let reg = /^http(s)?:\/\/(.*?)\//
this.downloadFileRename(item.FullUrl.replace(reg,''),item.Name);
let reg = /^http(s)?:\/\/(.*?)\//
this.downloadFileRename(item.FullUrl.replace(reg,''),item.Name);
},
// 送签日期不能大于送签结束日期
editInput: function (val) {
......@@ -865,7 +866,7 @@ export default {
} else {
this.$message.error("修改失败");
}
},
err => {}
)
......@@ -907,7 +908,7 @@ export default {
} else {
this.$message.error("修改失败");
}
},
err => {}
)
......
src/components/scenicSpot/admissionStatistics.vue
View file @ 0bdb2985
......@@ -44,7 +44,7 @@
<tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w100">合团号：{{outItem.NewCombinationNum}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w100">{{outItem.NewCombinationNum}}</div>
</td>
<td>
<div class="w80">
......@@ -117,7 +117,7 @@
<td>
<div class="link">
<div class="w80">
<p @click="goUrl('admissionStatisticsDetails',item,'门票详情')">详情</p>
<p @click="goUrl('admissionStatisticsDetails',item,outItem,'门票详情')">详情</p>
</div>
</div>
</td>
......@@ -212,7 +212,7 @@
}
})
},
goUrl(path, obj, title) {
goUrl(path, obj,outItem, title) {
this.$router.push({
name: path,
query: {
......@@ -220,7 +220,7 @@
'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': obj.NewCombinationNum,
'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y',
tab: title
}
......
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