Skip to content

S
SuperMan
Commit 037fe736 authored by youjie's avatar youjie
Browse files
Options

单项签证配置

parent 7c2a50e6
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 46 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 037fe736
...@@ -1061,7 +1061,6 @@ ...@@ -1061,7 +1061,6 @@
</div> </div>
</template> </template>
</div> </div>
<div style="margin-top: 102px;" class="page_fdd" v-if="isShowAttachment&&GetDetail.IsUploadPic===1"> <div style="margin-top: 102px;" class="page_fdd" v-if="isShowAttachment&&GetDetail.IsUploadPic===1">
<div v-if="saveMsg.length>0"> <div v-if="saveMsg.length>0">
<div class="_addUpload_box _addUpload_box_btm clearfix"> <div class="_addUpload_box _addUpload_box_btm clearfix">
...@@ -1552,6 +1551,25 @@ ...@@ -1552,6 +1551,25 @@
</div> </div>
</template> </template>
</p> </p>
<!--
<div v-if="GetDetail.Type==1&&isShowAttachment" style="display: flex;margin-top: 10px;">
<div style="display: flex;align-items: center;">
<span style="font-size: 14px;">类型：</span>
<div>
<el-select filterable v-model="AuditOrRefundMsg.CourseId" placeholder="选择收款类型"
style="width: 100%;" @change="getCourseId">
<el-option v-for="item in PaymentMethodList" :key="item.Id" :label="item.Name"
:value="item.Id"></el-option>
</el-select>
</div>
</div>
<div style="display: flex;align-items: center;margin-left: 20px;flex-grow: 1;">
<span style="font-size: 14px;">卡号：</span>
<div style="display: flex;flex-grow: 1;">
<el-input type="text" v-model="AuditOrRefundMsg.PayReceiptNo"></el-input>
</div>
</div>
</div> -->
<textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea" <textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea"
v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea> v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea>
<!-- <textarea v-if="AuditOrRefundMsg.Status=='3'&&item.SpecialNode!=0" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea> --> <!-- <textarea v-if="AuditOrRefundMsg.Status=='3'&&item.SpecialNode!=0" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea> -->
...@@ -1975,6 +1993,11 @@ ...@@ -1975,6 +1993,11 @@
export default { export default {
data() { data() {
return { return {
PaymentMethodList:[
{Name:'银行卡',Id:1},
{Name:'支付宝',Id:2},
{Name:'微信',Id:3},
],
isOrderOP: false,//是否跳转op订单页面 isOrderOP: false,//是否跳转op订单页面
financeShow: true, financeShow: true,
picIsShow: false, picIsShow: false,
...@@ -2025,7 +2048,9 @@ ...@@ -2025,7 +2048,9 @@
}], }],
emList: [], emList: [],
IsRefundAutoGoBack: 0, IsRefundAutoGoBack: 0,
TradeDetailList: [] TradeDetailList: [],
CourseName: '',//收款类型 银行卡/支付宝/微信
PayReceiptNo: '',
}, },
AuditListData: { AuditListData: {
AuditList: [] AuditList: []
...@@ -2157,6 +2182,10 @@ ...@@ -2157,6 +2182,10 @@
RollCall RollCall
}, },
methods: { methods: {
getCourseId(){
let list = this.PaymentMethodList.map(x=>{ return x.Id==this.AuditOrRefundMsg.CourseId })
this.AuditOrRefundMsg.CourseName = list[0].Name
},
getTemplate(GetDetail) { getTemplate(GetDetail) {
let arr = GetDetail.CostMonthTemplate && GetDetail.CostMonthTemplate.split(',') let arr = GetDetail.CostMonthTemplate && GetDetail.CostMonthTemplate.split(',')
let status = false let status = false
......
src/components/FinancialModule/HandDispensingFee/list.vue
View file @ 037fe736
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<thead> <thead>
<tr> <tr>
<th>类型</th> <th>类型</th>
<th>费用科目</th> <th>费用类型</th>
<th>是否启用月结</th> <th>是否启用月结</th>
<th>总公司流程</th> <th>总公司流程</th>
<th>分公司流程</th> <th>分公司流程</th>
...@@ -254,9 +254,9 @@ ...@@ -254,9 +254,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="费用科目" prop="ExpenseAccount"> <el-form-item label="费用类型" prop="ExpenseAccount">
<el-select filterable v-model="addMsg.ExpenseAccount" placeholder="选择费用科目" style="width: 100%;" <el-select filterable v-model="addMsg.ExpenseAccount" placeholder="选择费用类型" style="width: 100%;"
> >
<el-option v-for="(item,index) in CostTypeList" :key="index" :label="item.Name" :value='item.ID'></el-option> <el-option v-for="(item,index) in CostTypeList" :key="index" :label="item.Name" :value='item.ID'></el-option>
</el-select> </el-select>
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="总司流程" prop="CompanyCourse"> <el-form-item label="总司流程" prop="CompanyCourse">
<el-select filterable v-model="addMsg.CompanyCourse" placeholder="选择总公司流程" style="width: 100%;"> <el-select filterable v-model="addMsg.CompanyCourse" placeholder="选择总公司流程" style="width: 100%;">
<el-option v-for="item in StencilFlowList" :key="item.Id" :label="item.Name" <el-option v-for="item in TemplateGetList" :key="item.Id" :label="item.Name"
:value="item.Id"></el-option> :value="item.Id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="分司流程" prop="BranchCourse"> <el-form-item label="分司流程" prop="BranchCourse">
<el-select filterable v-model="addMsg.BranchCourse" placeholder="选择分公司流程" style="width: 100%;"> <el-select filterable v-model="addMsg.BranchCourse" placeholder="选择分公司流程" style="width: 100%;">
<el-option v-for="item in StencilFlowList" :key="item.Id" :label="item.Name" <el-option v-for="item in TemplateGetList" :key="item.Id" :label="item.Name"
:value="item.Id"></el-option> :value="item.Id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="月总流程" prop="MonthlyCourse"> <el-form-item label="月总流程" prop="MonthlyCourse">
<el-select filterable v-model="addMsg.MonthlyCourse" placeholder="选择月结总公司流程" style="width: 100%;"> <el-select filterable v-model="addMsg.MonthlyCourse" placeholder="选择月结总公司流程" style="width: 100%;">
<el-option v-for="item in StencilFlowList" :key="item.Id" :label="item.Name" <el-option v-for="item in TemplateGetList" :key="item.Id" :label="item.Name"
:value="item.Id"></el-option> :value="item.Id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="月分流程" prop="BranchMonthlyCourse"> <el-form-item label="月分流程" prop="BranchMonthlyCourse">
<el-select filterable v-model="addMsg.BranchMonthlyCourse" placeholder="选择月结分公司流程" style="width: 100%;"> <el-select filterable v-model="addMsg.BranchMonthlyCourse" placeholder="选择月结分公司流程" style="width: 100%;">
<el-option v-for="item in StencilFlowList" :label='item.Name' :value='item.Id' :key='item.Id'> <el-option v-for="item in TemplateGetList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
}], }],
ExpenseAccount: [{ ExpenseAccount: [{
required: true, required: true,
message: '请选择费用科目', message: '请选择费用类型',
trigger: 'change' trigger: 'change'
}], }],
CompanyCourse: [{ CompanyCourse: [{
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
}, },
// 获取所有费用类型 // 获取所有费用类型
getTemplateCostTypeList(){ getTemplateCostTypeList(){
// 单项签证制单费用科目 // 单项签证制单费用类型
this.apipost('Financial_post_GetTemplateCostTypeList',{},res=>{ this.apipost('Financial_post_GetTemplateCostTypeList',{},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.CostTypeList=res.data.data; this.CostTypeList=res.data.data;
...@@ -535,17 +535,17 @@ ...@@ -535,17 +535,17 @@
err => {} err => {}
); );
// 单项签证制单流程 // 单项签证制单流程
this.apipost( // this.apipost(
"FinancialFlowTemplate_post_GetList",//Financial_post_GetList // "FinancialFlowTemplate_post_GetList",//Financial_post_GetList
{Status:1,Type:2,TemplateSorce:1}, // {Status:1,Type:2,TemplateSorce:1},
res => { // res => {
if (res.data.resultCode == 1) { // if (res.data.resultCode == 1) {
this.StencilFlowList = res.data.data; // this.StencilFlowList = res.data.data;
} else { // } else {
} // }
}, // },
err => {} // err => {}
); // );
}, },
//获取历史详情 //获取历史详情
getDetails(index,type) { getDetails(index,type) {
......
src/components/SalesModule/VisaFinancialDocuments.vue
View file @ 037fe736
...@@ -311,25 +311,29 @@ ...@@ -311,25 +311,29 @@
</tr> </tr>
</table> </table>
</div> </div>
<p class="sfd_tit clearfix">收款单
<input v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" type="button" value="增加签证财务单据" class="normalBtn" @click="OpenOrder(1)"> <p class="sfd_tit clearfix">付款单
<input v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" type="button" value="增加保险财务单据" class="normalBtn" @click="OpenOrder2(1)"> <!-- <input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="预付款冲抵" class="normalBtn" @click="OpenOrder2(2,'Offset')"> -->
<input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加签证财务单据" class="normalBtn" @click="OpenOrder(2,'ServiceCharge',1)">
<input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加保险财务单据" class="normalBtn" @click="OpenOrder2(2,'ServiceCharge',2)">
<input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加服务费财务单据" class="normalBtn" @click="OpenOrder2(2,'ServiceCharge',3)">
<input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加其他财务单据" class="normalBtn" @click="OpenOrder2(2,'other')">
</p> </p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable"> <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr> <tr>
<th width="100">单号</th> <th width="100">单号</th>
<th width="200">费用类型</th> <th width="200">费用类型</th>
<th width="350">交易方式</th> <th width="350">交易方式</th>
<th width="100">同行转款</th> <th width="100">同行转款</th>
<th width="100">应收</th> <th width="100">应付</th>
<th width="100">实收</th> <th width="100">实付</th>
<th width="100">平台税金</th> <th width="100">平台税金</th>
<th width="150">交易日期</th> <th width="150">交易日期</th>
<!-- <th width="150">旅客名单</th> --> <!-- <th width="150">旅客名单</th> -->
<th width="100">制单人员</th> <th width="100">制单人员</th>
<th width="120">当前状态</th> <th width="120">当前状态</th>
</tr> </tr>
<tr v-for="(item, index) in dataList"> <tr v-for="(item, index) in dataListP">
<td width="100" @click="goUrl('财务单据','FinancialDocumentsDetail',item.FrID)"><span>{{item.FrID}}</span></td> <td width="100" @click="goUrl('财务单据','FinancialDocumentsDetail',item.FrID)"><span>{{item.FrID}}</span></td>
<td width=""> <td width="">
<template v-for="(s,si) in item.CostTypeList"> <template v-for="(s,si) in item.CostTypeList">
...@@ -362,13 +366,11 @@ ...@@ -362,13 +366,11 @@
<p style="line-height:20px"><span>{{moneyFormat(item.Fee)}}</span></p> <p style="line-height:20px"><span>{{moneyFormat(item.Fee)}}</span></p>
</td> </td>
<td width="">{{item.TradeDate}}</td> <td width="">{{item.TradeDate}}</td>
<!-- 旅客名单 -->
<!-- <td width="">旅客名单</td> -->
<!-- <td> <!-- <td>
<span v-if="item.GuestInfoList.length>0" > <span v-if="item.GuestInfoList.length>0" >
<el-popover class="item" effect="dark" placement="top-start" width="350" trigger="click"> <el-popover class="item" effect="dark" placement="top-start" width="350" trigger="click">
<span style="display:inline-block;cursor:pointer;margin:6px;word-break:break-all;" v-for="item2 in item.GuestInfoList" :key="item2.GuestId">{{item2.GuestName}} </span> <span style="display:inline-block;cursor:pointer;margin:6px;word-break:break-all;" v-for="item2 in item.GuestInfoList" :key="item2.GuestId">{{item2.GuestName}} </span>
<span slot="reference" style="cursor:pointer" v-if="key==0" v-for="(item2,key) in item.GuestInfoList" :key="key+5000">{{item2.GuestName}} <span slot="reference" style="cursor:pointer" v-if="key==0" v-for="(item2,key) in item.GuestInfoList" :key="key+200">{{item2.GuestName}}
<span v-if="item.GuestInfoList.length>1">...</span> <span v-if="item.GuestInfoList.length>1">...</span>
</span> </span>
</el-popover> </el-popover>
...@@ -405,7 +407,7 @@ ...@@ -405,7 +407,7 @@
</el-popover> </el-popover>
</td> </td>
</tr> </tr>
<tr v-if="dataList.length===0"> <tr v-if="dataListP.length===0">
<td colspan="11" class="noDataNotice"> <td colspan="11" class="noDataNotice">
<div> <div>
<p class="iconfont icon-kong"></p> <p class="iconfont icon-kong"></p>
...@@ -414,28 +416,25 @@ ...@@ -414,28 +416,25 @@
</td> </td>
</tr> </tr>
</table> </table>
<p class="sfd_tit clearfix">付款单 <p class="sfd_tit clearfix">收款单
<!-- <input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="预付款冲抵" class="normalBtn" @click="OpenOrder2(2,'Offset')"> --> <input v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" type="button" value="增加签证财务单据" class="normalBtn" @click="OpenOrder(1)">
<input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加签证财务单据" class="normalBtn" @click="OpenOrder(2,'ServiceCharge',1)"> <input v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" type="button" value="增加保险财务单据" class="normalBtn" @click="OpenOrder2(1)">
<input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加保险财务单据" class="normalBtn" @click="OpenOrder2(2,'ServiceCharge',2)">
<input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加服务费财务单据" class="normalBtn" @click="OpenOrder2(2,'ServiceCharge',3)">
<input type="button" v-if="qjGroupId==userInfo.RB_Group_id || F_Finance_Create" value="增加其他财务单据" class="normalBtn" @click="OpenOrder2(2)">
</p> </p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable"> <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr> <tr>
<th width="100">单号</th> <th width="100">单号</th>
<th width="200">费用类型</th> <th width="200">费用类型</th>
<th width="350">交易方式</th> <th width="350">交易方式</th>
<th width="100">同行转款</th> <th width="100">同行转款</th>
<th width="100">应付</th> <th width="100">应收</th>
<th width="100">实付</th> <th width="100">实收</th>
<th width="100">平台税金</th> <th width="100">平台税金</th>
<th width="150">交易日期</th> <th width="150">交易日期</th>
<!-- <th width="150">旅客名单</th> --> <!-- <th width="150">旅客名单</th> -->
<th width="100">制单人员</th> <th width="100">制单人员</th>
<th width="120">当前状态</th> <th width="120">当前状态</th>
</tr> </tr>
<tr v-for="(item, index) in dataListP"> <tr v-for="(item, index) in dataList">
<td width="100" @click="goUrl('财务单据','FinancialDocumentsDetail',item.FrID)"><span>{{item.FrID}}</span></td> <td width="100" @click="goUrl('财务单据','FinancialDocumentsDetail',item.FrID)"><span>{{item.FrID}}</span></td>
<td width=""> <td width="">
<template v-for="(s,si) in item.CostTypeList"> <template v-for="(s,si) in item.CostTypeList">
...@@ -468,11 +467,13 @@ ...@@ -468,11 +467,13 @@
<p style="line-height:20px"><span>{{moneyFormat(item.Fee)}}</span></p> <p style="line-height:20px"><span>{{moneyFormat(item.Fee)}}</span></p>
</td> </td>
<td width="">{{item.TradeDate}}</td> <td width="">{{item.TradeDate}}</td>
<!-- 旅客名单 -->
<!-- <td width="">旅客名单</td> -->
<!-- <td> <!-- <td>
<span v-if="item.GuestInfoList.length>0" > <span v-if="item.GuestInfoList.length>0" >
<el-popover class="item" effect="dark" placement="top-start" width="350" trigger="click"> <el-popover class="item" effect="dark" placement="top-start" width="350" trigger="click">
<span style="display:inline-block;cursor:pointer;margin:6px;word-break:break-all;" v-for="item2 in item.GuestInfoList" :key="item2.GuestId">{{item2.GuestName}} </span> <span style="display:inline-block;cursor:pointer;margin:6px;word-break:break-all;" v-for="item2 in item.GuestInfoList" :key="item2.GuestId">{{item2.GuestName}} </span>
<span slot="reference" style="cursor:pointer" v-if="key==0" v-for="(item2,key) in item.GuestInfoList" :key="key+200">{{item2.GuestName}} <span slot="reference" style="cursor:pointer" v-if="key==0" v-for="(item2,key) in item.GuestInfoList" :key="key+5000">{{item2.GuestName}}
<span v-if="item.GuestInfoList.length>1">...</span> <span v-if="item.GuestInfoList.length>1">...</span>
</span> </span>
</el-popover> </el-popover>
...@@ -509,7 +510,7 @@ ...@@ -509,7 +510,7 @@
</el-popover> </el-popover>
</td> </td>
</tr> </tr>
<tr v-if="dataListP.length===0"> <tr v-if="dataList.length===0">
<td colspan="11" class="noDataNotice"> <td colspan="11" class="noDataNotice">
<div> <div>
<p class="iconfont icon-kong"></p> <p class="iconfont icon-kong"></p>
...@@ -732,6 +733,8 @@ export default { ...@@ -732,6 +733,8 @@ export default {
this.Offset = Offset this.Offset = Offset
}else if(Offset=='ServiceCharge'){ }else if(Offset=='ServiceCharge'){
this.Offset = Offset this.Offset = Offset
}else if(Offset=='other'){
this.Offset = Offset
} else{ } else{
this.Offset = null this.Offset = null
} }
...@@ -740,12 +743,31 @@ export default { ...@@ -740,12 +743,31 @@ export default {
this.checkList=[]; this.checkList=[];
this.checkListAll=[]; this.checkListAll=[];
this.type=num; this.type=num;
this.dialogVisible=true;
if(num==1){ if(num==1){
this.OrderTitle='收款单'; this.OrderTitle='收款单';
}else{ }else{
this.OrderTitle='付款单'; this.OrderTitle='付款单';
} }
if(this.Offset=='other'){
let orderObj = {
OrderID: 0,
OrderSource: 10,
Obj: {},
SourceID: 0,
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type": this.type,
"companyID": this.OutBranchId,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
});
return
}
this.dialogVisible=true;
// dmc_get_GetNeedSafeGuestGuestList 排除领队的接口 // dmc_get_GetNeedSafeGuestGuestList 排除领队的接口
this.apipost('dmc_get_GetPriceNoFinanceGuestList',{tcid:this.tcid}, res=>{ this.apipost('dmc_get_GetPriceNoFinanceGuestList',{tcid:this.tcid}, res=>{
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 037fe736
...@@ -730,6 +730,7 @@ ...@@ -730,6 +730,7 @@
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">成本</div> <div class="TB_comtitle TB-Title">成本</div>
<template v-if="IsHaveAuth"> <template v-if="IsHaveAuth">
<input type="button" value="签证费" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="goUrlVisa" />
<input type="button" value="团队折让" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" /> <input type="button" value="团队折让" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" />
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail(3)" /> <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail(3)" />
</template> </template>
...@@ -2396,6 +2397,18 @@ ...@@ -2396,6 +2397,18 @@
} }
}); });
}, },
goUrlVisa(){
this.$router.push({
name: 'VisaFinancialDocuments',
query: {
TCID: this.TCID,
OutBranchId: this.OutBranchId,
TCNUM: this.DataList.TeamBalance.TCNUM,
blank: 'y',
tab: '签证财务单据'
}
});
},
//支出跳转 //支出跳转
AddOutDetail(visaType) { AddOutDetail(visaType) {
var TCArr = [this.TCID]; var TCArr = [this.TCID];
......
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