Skip to content

S
SuperMan
Commit a8694d51 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

11

parent 474fa2a1
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 68 deletions
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ a8694d51
......@@ -502,26 +502,6 @@ tr._item_list td:last-child {
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="状态：">
<el-select v-model="msg.QueryCondition" filterable class="w150">
<el-option value="-1" label="不限"></el-option>
<el-option value="0" label="待收"></el-option>
<el-option value="1" label="退款"></el-option>
<el-option value="2" label="在途"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="出团状态：">
<el-select v-model="msg.OutTCStatus" filterable class="w150">
<el-option value="0" label="不限"></el-option>
<el-option value="1" label="已出团"></el-option>
<el-option value="2" label="未出团"></el-option>
<el-option value="3" label="未发团"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="数据类别：">
<el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150">
......@@ -544,47 +524,71 @@ tr._item_list td:last-child {
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="是否联运：">
<el-select v-model="msg.Is_Transport" filterable class="w150">
<el-option value="-1" label="不限"></el-option>
<el-option value="1" label="是"></el-option>
<el-option value="0" label="否"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="地接团号：">
<el-input v-model="msg.DMCNUM" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="领队类型：">
<el-select v-model="msg.LeaderType" filterable class="w150" @change="GetLeaderList()">
<el-option :value="0" label="请选择"></el-option>
<el-option :value="1" label="领队"></el-option>
<el-option :value="2" label="领兼导"></el-option>
<el-option :value="3" label="导游"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="领队/导游：">
<el-select v-model="msg.LeaderId" filterable class="w150">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in LeaderList" :label='item.Name' :value='item.ID' :key='item.ID'></el-option>
</el-select>
</el-form-item>
</el-col>
<template v-if="heightQueryBox">
<el-col :span="4">
<el-form-item label="状态：">
<el-select v-model="msg.QueryCondition" filterable class="w150">
<el-option value="-1" label="不限"></el-option>
<el-option value="0" label="待收"></el-option>
<el-option value="1" label="退款"></el-option>
<el-option value="2" label="在途"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="出团状态：">
<el-select v-model="msg.OutTCStatus" filterable class="w150">
<el-option value="0" label="不限"></el-option>
<el-option value="1" label="已出团"></el-option>
<el-option value="2" label="未出团"></el-option>
<el-option value="3" label="未发团"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="只看收据未制单：" label-width="125px">
<el-select v-model="msg.IsSelectReceipt" filterable class="w150">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-form-item label="是否联运：">
<el-select v-model="msg.Is_Transport" filterable class="w150">
<el-option value="-1" label="不限"></el-option>
<el-option value="1" label="是"></el-option>
<el-option value="0" label="否"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="地接团号：">
<el-input v-model="msg.DMCNUM" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="领队类型：">
<el-select v-model="msg.LeaderType" filterable class="w150" @change="GetLeaderList()">
<el-option :value="0" label="请选择"></el-option>
<el-option :value="1" label="领队"></el-option>
<el-option :value="2" label="领兼导"></el-option>
<el-option :value="3" label="导游"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="领队/导游：">
<el-select v-model="msg.LeaderId" filterable class="w150">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in LeaderList" :label='item.Name' :value='item.ID' :key='item.ID'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="只看收据未制单：" label-width="125px">
<el-select v-model="msg.IsSelectReceipt" filterable class="w150">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
</template>
<el-col :span="4" v-if="userId==1 || userId==5 || F_GeneralManager">
<el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button>
<el-button @click="msg.Is_Open=1,SetTravelClose()" type="danger" size="small" round :loading="btnloading">关闭团队收支</el-button>
</el-col>
......@@ -603,6 +607,9 @@ tr._item_list td:last-child {
<li class="hight_query">
<!-- <button class="normalBtn" @click="openKaiQiZzBox('一键开启')">一键开启</button>
<button class="hollowFixedBtn" @click="openKaiQiZzBox('一键关闭')">一键关闭</button>-->
<span>
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
</span>
<button class="normalBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click="method5()">导出</button>
<!-- <button class="normalBtn" @click="togbu">一键同步</button> -->
......@@ -927,6 +934,7 @@ Vue.component("TCIDJumpWang", {
export default {
data() {
return {
heightQueryBox:false,
btnloading:false,
showID: false,
active: 1,
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ a8694d51
......@@ -1410,6 +1410,12 @@
</tr>
</template>
</table>
</div>
<div class="Team_collection">
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">收据</div>
</div>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">财务收据：</div>
</div>
......@@ -1419,15 +1425,16 @@
<th>团号</th>
<th>账户类型</th>
<th>账户名称</th>
<th>财务单据</th>
<th>单据状态</th>
<th>是否审核</th>
<th>收据金额</th>
<th>汇率</th>
<th>原币</th>
<th>收据日期</th>
<th>操作人/时间</th>
<th>财务单据</th>
<th>单据状态</th>
<th>是否审核</th>
<th>备注</th>
<th>操作人/时间</th>
<th>操作</th>
</tr>
<template v-for="(item,i) in dataDocList" >
<tr :key="i">
......@@ -1440,18 +1447,24 @@
<span v-if="item.Type==4">资金池</span>
</td>
<td>{{item.AccountName}}</td>
<td>{{item.Money}}</td>
<td>{{item.Rate}}</td>
<td>{{item.WBMoney}}</td>
<td>{{item.Time}}</td>
<td>{{item.FinanceId}}</td>
<td>{{item.fStatusName}}</td>
<td>
<span v-if="item.Is_Cashier==1">是</span>
<span v-if="item.Is_Cashier==0">否</span>
</td>
<td>{{item.Money}}</td>
<td>{{item.Rate}}</td>
<td>{{item.WBMoney}}</td>
<td>{{item.Time}}</td>
<td>{{item.UpdateBy}}/{{item.UpdateDate}}</td>
<td>{{item.Remark}}</td>
<td>{{item.UpdateBy}}/{{item.UpdateDate}}</td>
<td>
<input v-if="item.FinanceId==0" type="button" value="制单" class="hollowFixedBtn"
@click="goZhidan(item)" />
</td>
</tr>
</template>
......@@ -1622,6 +1635,27 @@
};
},
methods: {
goZhidan(item){
let Handmsg={
OtherType:10,
ReFinanceId:item.Id,
TCNUM:'',
};
let arr=[];
var TCArr = [this.TCID];
let orderObj = {
OrderID: 0,
OrderSource: 8,
Obj: {},
TCIDList: TCArr
}
var msg=JSON.stringify(Handmsg);
let routeData = this.$router.resolve({
name: 'ChoiceAddFinancialDocuments',
query: {czmsg:msg,'orderObj': JSON.stringify(orderObj)}
})
window.open(routeData.href, '_blank')
},
getDocList(){
let obj={
pageIndex:1,
......
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