Skip to content

S
SuperMan
Commit 74134e13 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 6a5d9156 b4824e67
Hide whitespace changes
Inline Side-by-side
Showing with 372 additions and 117 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 74134e13
...@@ -327,6 +327,7 @@ ...@@ -327,6 +327,7 @@
<td :colspan="3"> <td :colspan="3">
{{o.TCNUM}}（{{o.TCID}}） {{o.TCNUM}}（{{o.TCID}}）
<span v-if="GetDetail.IsShowPlanUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见 {{o.GuestSurveyNum}}/{{o.GuestTotalNum}}份</span> <span v-if="GetDetail.IsShowPlanUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见 {{o.GuestSurveyNum}}/{{o.GuestTotalNum}}份</span>
<span v-if="GetDetail.IsShowPlanUrl==1&&GetDetail.ClientType==7" @click="goGuideAccount('GuideAccount',GetDetail.ClientID)" class="FD_yijian">领队导游往来</span>
</td> </td>
<td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td> <td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td> <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
...@@ -2358,7 +2359,6 @@ export default { ...@@ -2358,7 +2359,6 @@ export default {
this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{ this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data=res.data.data; let data=res.data.data;
console.log(1);
if(this.RB_Post_Id!=5&&this.userId!=1648){ if(this.RB_Post_Id!=5&&this.userId!=1648){
if(this.userId==1918){ if(this.userId==1918){
this.AccList = res.data.data; this.AccList = res.data.data;
...@@ -2468,9 +2468,23 @@ export default { ...@@ -2468,9 +2468,23 @@ export default {
name: path, name: path,
query: { query: {
TCID:TCID, TCID:TCID,
blank:'y'
} }
}); });
}, },
goGuideAccount(path,ClientID){
if(ClientID==0){
this.Error('临时导游，无往来');
return;
}
this.$router.push({
name: path,
query: {
ClientID:ClientID,
blank:'y'
}
});
},
},created(){ },created(){
if(this.$route.query.pageIndex){ if(this.$route.query.pageIndex){
this.pageIndex = this.$route.query.pageIndex; this.pageIndex = this.$route.query.pageIndex;
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 74134e13
...@@ -391,6 +391,7 @@ ...@@ -391,6 +391,7 @@
<td :colspan="3"> <td :colspan="3">
{{o.TCNUM}}（{{o.TCID}}） {{o.TCNUM}}（{{o.TCID}}）
<span v-if="GetDetail.IsShowPlanUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见 {{o.GuestSurveyNum}}/{{o.GuestTotalNum}}份</span> <span v-if="GetDetail.IsShowPlanUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见 {{o.GuestSurveyNum}}/{{o.GuestTotalNum}}份</span>
<span v-if="GetDetail.IsShowPlanUrl==1&&GetDetail.ClientType==7" @click="goGuideAccount('GuideAccount',GetDetail.ClientID)" class="FD_yijian">领队导游往来</span>
</td> </td>
<td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td> <td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td> <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
...@@ -973,6 +974,20 @@ export default { ...@@ -973,6 +974,20 @@ export default {
name: path, name: path,
query: { query: {
TCID:TCID, TCID:TCID,
blank:'y'
}
});
},
goGuideAccount(path,ClientID){
if(ClientID==0){
this.Error('临时导游，无往来');
return;
}
this.$router.push({
name: path,
query: {
ClientID:ClientID,
blank:'y'
} }
}); });
}, },
...@@ -1245,7 +1260,6 @@ export default { ...@@ -1245,7 +1260,6 @@ export default {
handleAvatarSuccess(res, file) { //上传 handleAvatarSuccess(res, file) { //上传
if(res.resultCode==1){ if(res.resultCode==1){
var img_path = res.data.FullFilePath var img_path = res.data.FullFilePath
console.log(res.data)
this.imageUrl = img_path this.imageUrl = img_path
let obj = { let obj = {
src:img_path src:img_path
...@@ -1319,7 +1333,6 @@ export default { ...@@ -1319,7 +1333,6 @@ export default {
this.FrID = this.GetDetail.FrID; this.FrID = this.GetDetail.FrID;
this.SourceID = this.GetDetail.SourceID; this.SourceID = this.GetDetail.SourceID;
this.Callback = this.GetDetail.Callback; this.Callback = this.GetDetail.Callback;
// 拼接团号显示团信息 // 拼接团号显示团信息
let str = ''; let str = '';
if(data.TCIDList.length>0){ if(data.TCIDList.length>0){
......
src/components/FinancialModule/FinancialSubmodule/GuanBillModule.vue
View file @ 74134e13
...@@ -44,18 +44,18 @@ ...@@ -44,18 +44,18 @@
<div class="_sanjiao_"></div> <div class="_sanjiao_"></div>
<table border="1" class="_border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'> <table border="1" class="_border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
<tr> <tr>
<th rowspan="2">{{$t('system.query_company')}}</th> <th rowspan="2" width="100">{{$t('system.query_company')}}</th>
<th rowspan="2">{{$t('fnc.danhao')}}</th> <th rowspan="2" width="70">{{$t('fnc.danhao')}}</th>
<th rowspan="2">{{$t('fnc.fyshuoming')}}</th> <th rowspan="2" width="120">{{$t('fnc.fyshuoming')}}</th>
<th rowspan="2">{{$t('hotel.hotel_Currency')}}</th> <th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
<th colspan="3">{{$t('fnc.jine')}}</th> <th colspan="3">{{$t('fnc.jine')}}</th>
<th rowspan="2">{{$t('hotel.hotel_remark')}}</th> <th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
<th rowspan="2">{{$t('fnc.zhidanren')}}</th> <th rowspan="2" width="70">{{$t('fnc.zhidanren')}}</th>
</tr> </tr>
<tr> <tr>
<th width="88">{{$t('fnc.yuanbi')}}</th> <th width="88">{{$t('fnc.yuanbi')}}</th>
<th width="50">{{$t('hotel.hotel_CurrentRate')}}</th> <th width="90">{{$t('hotel.hotel_CurrentRate')}}</th>
<th width="68">{{$t('fnc.bweibi')}}</th> <th width="75">{{$t('fnc.bweibi')}}</th>
</tr> </tr>
<template v-if="details&&details.length"> <template v-if="details&&details.length">
<tr v-for="(item) in details" class="_color_b"> <tr v-for="(item) in details" class="_color_b">
......
src/components/FinancialModule/OPCommissionDetail.vue
View file @ 74134e13
...@@ -41,9 +41,10 @@ export default { ...@@ -41,9 +41,10 @@ export default {
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
ParentId: 0, PeriodsId: 0,
OrderStr: "RB_Branch_Id asc", OrderStr: "RB_Branch_Id asc",
BName:-1 BName:-1,
}, },
total: 0, total: 0,
currentPage: 1, currentPage: 1,
...@@ -95,7 +96,6 @@ export default { ...@@ -95,7 +96,6 @@ export default {
} }
}, },
filterMethod(filters){ filterMethod(filters){
console.log("filter", filters);
let data = JSON.parse(JSON.stringify(this.dataListTwo)) let data = JSON.parse(JSON.stringify(this.dataListTwo))
let dataListTwo = JSON.parse(JSON.stringify(this.dataListTwo)) let dataListTwo = JSON.parse(JSON.stringify(this.dataListTwo))
if (filters.BName!='' && filters.BName!='__all__'){ if (filters.BName!='' && filters.BName!='__all__'){
...@@ -111,7 +111,6 @@ export default { ...@@ -111,7 +111,6 @@ export default {
data = dataListTwo data = dataListTwo
} }
this.dataList = data this.dataList = data
console.log(data)
}, },
customCompFunc(params) { customCompFunc(params) {
if (params.type === "see") { if (params.type === "see") {
...@@ -147,7 +146,6 @@ export default { ...@@ -147,7 +146,6 @@ export default {
item.value = x.BName; item.value = x.BName;
companyList.push(item); companyList.push(item);
}); });
console.log(companyList)
let company = { let company = {
field: "BName", field: "BName",
title: "公司", title: "公司",
...@@ -313,7 +311,6 @@ export default { ...@@ -313,7 +311,6 @@ export default {
this.isReady = true; this.isReady = true;
}, },
sortChange(param) { sortChange(param) {
// console.log("param",param)
// if(param.sumMoney==''){ // if(param.sumMoney==''){
if(param.BName!=''){ if(param.BName!=''){
this.msg.OrderStr='RB_Branch_Id '+param.BName this.msg.OrderStr='RB_Branch_Id '+param.BName
...@@ -348,7 +345,6 @@ export default { ...@@ -348,7 +345,6 @@ export default {
"sellcommission_GetOPCommissionDetailsList", "sellcommission_GetOPCommissionDetailsList",
this.msg, this.msg,
res => { res => {
// console.log("ressfasf",res);
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
...@@ -377,23 +373,22 @@ export default { ...@@ -377,23 +373,22 @@ export default {
}, },
//跳转 //跳转
getInfo(item) { getInfo(item) {
var dateStr = item.Periods; // var dateStr = item.Periods;
var year = dateStr.substring(0, 4); // var year = dateStr.substring(0, 4);
var month = dateStr.substring(4, 6); // var month = dateStr.substring(4, 6);
var nextMonthFirstDay = new Date(year, month, 1); // var nextMonthFirstDay = new Date(year, month, 1);
var oneDay = 1000 * 60 * 60 * 24; // var oneDay = 1000 * 60 * 60 * 24;
var entDay = new Date(nextMonthFirstDay - oneDay).Format("yyyy-MM-dd"); // var entDay = new Date(nextMonthFirstDay - oneDay).Format("yyyy-MM-dd");
var startDay = year + "-" + month + "-" + "01"; // var startDay = year + "-" + month + "-" + "01";
var userId = item.userId; // var userId = item.userId;
this.$router.push({ this.$router.push({
path: "enrollTotal", path: "OpComPersonDetails",
query: { query: {
EmployeeId: userId, EmployeeId: item.EmployeeId,
starTime: startDay, PeriodsId:this.msg.PeriodsId,
endTime: entDay,
blank:'y' blank:'y'
} }
}); });
...@@ -401,10 +396,10 @@ export default { ...@@ -401,10 +396,10 @@ export default {
}, },
mounted() { mounted() {
this.msg.pageSize = 10000; //不分页 this.msg.pageSize = 10000; //不分页
this.msg.ParentId = this.$route.query.ParentId; this.msg.PeriodsId = this.$route.query.PeriodsId?this.$route.query.PeriodsId:0;
let dt=new Date() let dt=new Date()
this.stringPerons=(dt.getMonth()==0?(dt.getFullYear()-1):dt.getFullYear())+''+(dt.getMonth().toString().length<2?'0':'')+(dt.getMonth()==0?12:dt.getMonth()); this.stringPerons=(dt.getMonth()==0?(dt.getFullYear()-1):dt.getFullYear())+''+(dt.getMonth().toString().length<2?'0':'')+(dt.getMonth()==0?12:dt.getMonth());
console.log(this.stringPerons)
this.getList(); this.getList();
this.getCompanyList(); this.getCompanyList();
}, },
......
src/components/FinancialModule/OPcommissionPeriods.vue
View file @ 74134e13
...@@ -4,17 +4,31 @@ ...@@ -4,17 +4,31 @@
position: relative; position: relative;
top:1px; top:1px;
} }
.opUl li{
display: inline-block;
margin:10px 15px 10px 0;
}
</style> </style>
<template> <template>
<div class="flexOne"> <div class="flexOne">
<!-- <div class="query-box"> <div>
<ul> <ul class="opUl">
<li>
<em>选择月份</em>
<el-date-picker
v-model="Month"
value-format="yyyy-MM"
type="month"
placeholder="选择月">
</el-date-picker>
</li>
<li> <li>
<input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/> <el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading" @click="generateTable">生成提成</el-button>
<!-- <input v-loading="btnLoading" type="button" class="normalBtn" @click="generateTable" value="生成提成"/> -->
</li> </li>
</ul> </ul>
</div> --> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>期数</th> <th>期数</th>
<th>提成总金额</th> <th>提成总金额</th>
...@@ -43,9 +57,11 @@ ...@@ -43,9 +57,11 @@
</template> </template>
<script> <script>
import moment from "moment"
export default { export default {
data() { data() {
return { return {
Month:moment().format("YYYY-MM"),
msg: { msg: {
PageIndex: 1, PageIndex: 1,
PageSize: 20 PageSize: 20
...@@ -55,6 +71,7 @@ ...@@ -55,6 +71,7 @@
dataList:[], dataList:[],
total:0, total:0,
currentPage: 1, currentPage: 1,
btnLoading:false,
} }
}, },
mounted() { mounted() {
...@@ -69,7 +86,7 @@ ...@@ -69,7 +86,7 @@
this.$router.push({ this.$router.push({
path: path, path: path,
query: { query: {
ParentId:id, PeriodsId:id,
blank: 'y', blank: 'y',
tab: '期数详情' tab: '期数详情'
} }
...@@ -85,7 +102,7 @@ ...@@ -85,7 +102,7 @@
this.loading = false; this.loading = false;
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
console.log(res); // console.log(res);
this.total = res.data.data.count; this.total = res.data.data.count;
}else{ }else{
this.Error(res.data.message); this.Error(res.data.message);
...@@ -96,12 +113,16 @@ ...@@ -96,12 +113,16 @@
}, },
//生成提成报表 //生成提成报表
generateTable(){ generateTable(){
let msg = { if(!this.Month||this.Month==""){
UserId: 0 this.Error("请选择月份！")
return;
} }
this.btnLoading=true;
this.apipost( this.apipost(
"sellcommission_SetGenerateCommission",msg, "sellcommission_SetOPCommission",{Month:this.Month},
res => { res => {
this.btnLoading=false;
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.getList(); this.getList();
this.Success('报表生成成功') this.Success('报表生成成功')
......
src/components/FinancialModule/OpComPersonDetails.vue 0 → 100644
View file @ 74134e13
<style scoped>
</style>
<template>
<div class="flexOne currentManage">
<div class="query-box">
<ul>
<li>
<span>
<em>员工</em>
<el-select filterable v-model='msg.EmployeeId' >
<el-option key="0" :value="0" label="不限"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :key="item.EmployeeId"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>团队ID</em>
<el-input v-model="msg.TCID" placeholder="请输入内容"></el-input>
</span>
</li>
<li>
<span>
<em>团号</em>
<el-input v-model="msg.TCNUM" placeholder="请输入内容"></el-input>
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="getList">{{$t('pub.searchBtn')}}</button>
</li>
</ul>
</div>
<div class="cm_content _scrollbar">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>公司</th>
<th>部门</th>
<th>姓名</th>
<th>团号</th>
<th>提成金额</th>
<th>收客人数</th>
<th>期数</th>
<th>操作</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index">
<td>{{item.BName}}</td>
<td>{{item.DepartmentName}}</td>
<td>{{item.CreateByStr}}</td>
<td>{{item.TCNUM}}</td>
<td>{{item.CommissionMoney}}</td>
<td>{{item.PeopleCount}}</td>
<td>{{item.Periods}}</td>
<td>
<el-tooltip class="item" effect="dark" content="查看" placement="top-start">
<el-button type="primary" size='mini' circle icon="el-icon-view" @click="goUrl(item)"></el-button>
</el-tooltip>
</td>
<!-- <td>
<el-button-group size='mini'>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" @click="editCurency(item.ID),text=$t('system.table_edit')"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" class="iconfont icon-img_delete_small" @click="financeinfoRemove(item.ID,item.Name)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.szbweibi')" placement="top-start">
<el-button type="warning" class="iconfont" v-if="item.IsStandardCurrency!=1" @click="setStandardTips(item.ID,item.Name)">{{$t('Airticket.Air_ben')}}</el-button>
</el-tooltip>
</el-button-group>
</td> -->
</tr>
</table>
<div class="noData" v-if="DataList.length==0">
{{$t('system.content_noData')}}
</div>
<div>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:total=total>
</el-pagination>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
msg:{
pageIndex:1,
pageSize:14,
EmployeeId:0,
PeriodsId:"",
TCID:"",
TCNUM:"",
},
DataList:[],
loading:false,
currentPage:1,
total:0,
EmployeeList:[],
}
},created(){
this.msg.PeriodsId=this.$route.query.PeriodsId?this.$route.query.PeriodsId:this.msg.PeriodsId;
this.msg.EmployeeId=this.$route.query.EmployeeId?Number(this.$route.query.EmployeeId):this.msg.EmployeeId;
},
mounted(){
this.getEmployeeList();
this.getList();
},
methods: {
goUrl(item){
this.$router.push({
path: "productQuery",
query: {
id: item.TCID,
blank:'y'
}
});
},
resetPageIndex(){ // 重置页码
this.msg.pageIndex=1;
this.currentPage = 1;
},
handleCurrentChange(val) { //翻页
this.msg.pageIndex = val;
this.getList();
},
getList(){
this.loading=true;
this.apipost('sellcommission_GetOPCommissionSingleDetailsList', this.msg, res => {
this.loading=false;
// console.log("res",res)
if(res.data.resultCode == 1) {
this.DataList = res.data.data.pageData;
this.total=res.data.data.count;
} else {
this.Error(res.data.message);
}
}, err => {})
},
getEmployeeList () {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '-1',
IsLeave: '0'
}
this.apipost(
'admin_get_EmployeeGetList', {},
res => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data
}
},
err => {
}
)
},
},
}
</script>
src/components/FinancialModule/accDetail/GuideAccount.vue
View file @ 74134e13
...@@ -60,6 +60,18 @@ ...@@ -60,6 +60,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="领队导游"> <el-form-item label="领队导游">
<el-select filterable v-model='msg.ClientID' > <el-select filterable v-model='msg.ClientID' >
...@@ -113,18 +125,7 @@ ...@@ -113,18 +125,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<!-- <el-col :span="4" :gutter="35">
<el-form-item label="所属公司">
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</el-col> -->
</el-row> </el-row>
</el-form> </el-form>
<ul> <ul>
...@@ -157,6 +158,12 @@ ...@@ -157,6 +158,12 @@
<td></td> <td></td>
<td>{{moneyFormat(dataJson.Balance)}}</td> <td>{{moneyFormat(dataJson.Balance)}}</td>
</tr> --> </tr> -->
<tr v-show="DataList.length>5">
<td :colspan="9">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td>{{ dataJson.Income }}</td>
<td>{{ dataJson.Refund }}</td>
<td>{{ dataJson.Balance}}</td>
</tr>
<tr v-for="(item,index) in DataList" :key="index"> <tr v-for="(item,index) in DataList" :key="index">
<!-- <td> <!-- <td>
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)"> <input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
...@@ -581,7 +588,6 @@ export default { ...@@ -581,7 +588,6 @@ export default {
this.dataJson=data; this.dataJson=data;
this.DataList = data.Rlist; this.DataList = data.Rlist;
// console.log("this.DataList",this.DataList)
if( this.msg.ClientID == 0 ){ if( this.msg.ClientID == 0 ){
...@@ -654,7 +660,6 @@ export default { ...@@ -654,7 +660,6 @@ export default {
this.accountList.forEach(x=>{ this.accountList.forEach(x=>{
if(x.ID===i){ if(x.ID===i){
this.payMsg.Account = x.allName; this.payMsg.Account = x.allName;
console.log(x);
this.payMsg.CurrenName =x.CurrencyName; this.payMsg.CurrenName =x.CurrencyName;
this.payMsg.Rate = x.CurrencyRate?x.CurrencyRate:x.CurrentRate; this.payMsg.Rate = x.CurrencyRate?x.CurrencyRate:x.CurrentRate;
this.payMsg.CurrencyId = x.CurrencyId; this.payMsg.CurrencyId = x.CurrencyId;
...@@ -666,7 +671,6 @@ export default { ...@@ -666,7 +671,6 @@ export default {
this.accountList.forEach(x=>{ this.accountList.forEach(x=>{
if(x.ID===i){ if(x.ID===i){
this.payMsgList[index].Account = x.allName; this.payMsgList[index].Account = x.allName;
console.log(x);
this.payMsgList[index].CurrenName =x.CurrencyName; this.payMsgList[index].CurrenName =x.CurrencyName;
this.payMsgList[index].Rate = x.CurrencyRate?x.CurrencyRate:x.CurrentRate; this.payMsgList[index].Rate = x.CurrencyRate?x.CurrencyRate:x.CurrentRate;
this.payMsgList[index].CurrencyId = x.CurrencyId; this.payMsgList[index].CurrencyId = x.CurrencyId;
...@@ -775,7 +779,6 @@ export default { ...@@ -775,7 +779,6 @@ export default {
this.allLoading = true this.allLoading = true
this.apipost('Financial_post_MergeFinance',this.addMsg,r=>{ this.apipost('Financial_post_MergeFinance',this.addMsg,r=>{
if(r.data.resultCode === 1) { if(r.data.resultCode === 1) {
console.log(r)
this.addChuNa = false this.addChuNa = false
this.getList() this.getList()
}else{ }else{
...@@ -906,6 +909,10 @@ export default { ...@@ -906,6 +909,10 @@ export default {
}, },
},mounted(){ },mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
let ClientID = this.$route.query.ClientID;
if(ClientID){
this.msg.ClientID = Number(ClientID);
}
this.getAccountTypeList(); this.getAccountTypeList();
this.AccountType_post_GetList(); this.AccountType_post_GetList();
this.BankAccount_post_GetAccountType(); this.BankAccount_post_GetAccountType();
......
src/components/Hotel/HotelSupplier.vue
View file @ 74134e13
...@@ -100,6 +100,13 @@ ...@@ -100,6 +100,13 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否有手配费">
<el-switch v-model="addMsg.IsHaveShouPeiFee" :active-value="inActive" :inactive-value="notInActive">
</el-switch>
</el-form-item>
<el-form-item v-if="addMsg.IsHaveShouPeiFee==1" label="手配费金额">
<el-input type="text" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'ShouPeiMoney')" v-model="addMsg.ShouPeiMoney"></el-input>
</el-form-item>
<el-form-item :label="$t('hotel.table_tel')" prop="Tel"> <el-form-item :label="$t('hotel.table_tel')" prop="Tel">
<el-input type="text" class="w300" maxlength="20" v-model="addMsg.Tel"></el-input> <el-input type="text" class="w300" maxlength="20" v-model="addMsg.Tel"></el-input>
</el-form-item> </el-form-item>
...@@ -172,6 +179,9 @@ export default { ...@@ -172,6 +179,9 @@ export default {
deleteID: "", deleteID: "",
typeList: "", typeList: "",
TypeOne: "", TypeOne: "",
inActive: 1, //有手配费
notInActive: 0, //无手配费
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 18, pageSize: 18,
...@@ -196,7 +206,11 @@ export default { ...@@ -196,7 +206,11 @@ export default {
Fax: "", Fax: "",
Remark: "", Remark: "",
Type: "1", Type: "1",
PayType:"" PayType:'',
//是否有手配费
IsHaveShouPeiFee:0,
//手配费金额
ShouPeiMoney:0
}, },
//付款方式 //付款方式
PayTypeList:[{ PayTypeList:[{
...@@ -278,6 +292,9 @@ export default { ...@@ -278,6 +292,9 @@ export default {
); );
}, },
saveInfo() { saveInfo() {
if(this.addMsg.ShouPeiMoney==''){
this.addMsg.ShouPeiMoney=0;
}
this.apipost( this.apipost(
"supplier_post_Set", "supplier_post_Set",
this.addMsg, this.addMsg,
...@@ -306,7 +323,9 @@ export default { ...@@ -306,7 +323,9 @@ export default {
Fax: "", Fax: "",
Remark: "", Remark: "",
Type: 1, Type: 1,
PayType:"" PayType:'',
IsHaveShouPeiFee:0,
ShouPeiMoney:0
}), }),
(this.provinceList = ""); (this.provinceList = "");
this.cityList = ""; this.cityList = "";
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 74134e13
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<li> <li>
<input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" /> <input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" /> <input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span> <span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能再修改!</span>
</li> </li>
</ul> </ul>
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br /> 税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br />
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<th width="100">房间类型</th> <th width="100">房间类型</th>
<th width="80">房间<br />预定数</th> <th width="80">房间<br />预定数</th>
<th width="80">预定人数</th> <th width="80">预定人数</th>
<th width="80">尚差<br />房间数</th> <!-- <th width="80">尚差<br />房间数</th> -->
<th width="80">单价/每人</th> <th width="80">单价/每人</th>
<th width="80">免减人数</th> <th width="80">免减人数</th>
<th width="80">金额小计</th> <th width="80">金额小计</th>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
供应商 供应商
</td> </td>
<td> <td>
<el-select class='w120 sel' v-model='subItem.SupplierId' filterable placeholder="请选择供应商"> <el-select class='w120 sel' v-model='subItem.SupplierId' @change="getSupplierShoupei(subItem)" filterable placeholder="请选择供应商">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(SupplierItem,Supplierindex) in SupplierList" :key="Supplierindex" <el-option v-for="(SupplierItem,Supplierindex) in SupplierList" :key="Supplierindex"
:label="SupplierItem.Name" :value="SupplierItem.ID"> :label="SupplierItem.Name" :value="SupplierItem.ID">
...@@ -156,13 +156,8 @@ ...@@ -156,13 +156,8 @@
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<p style="padding-top: 5px;"> <span v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">暂无手配费</span>
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a> <span v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">手配费:{{subItem.ShouPeiMoney}}</span>
</p>
<el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
<el-button size="small" type="danger" @click='getItem(index, subIndex)'>
{{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
</el-upload>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -194,12 +189,12 @@ ...@@ -194,12 +189,12 @@
</el-input> </el-input>
</td> </td>
<!-- 尚差房间数 --> <!-- 尚差房间数 -->
<td> <!-- <td>
<p class="pHouseStyle" <p class="pHouseStyle"
:class="{colorRed:childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount<0}"> :class="{colorRed:childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount<0}">
{{childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount}} {{childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount}}
</p> </p>
</td> </td> -->
<!-- 单价/每人 --> <!-- 单价/每人 -->
<td> <td>
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter' <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
...@@ -447,6 +442,10 @@ ...@@ -447,6 +442,10 @@
</template> </template>
</template> </template>
</table> </table>
<div class="noDataNotice" v-if="list.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t('active.ld_noData')}}</p>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -477,8 +476,6 @@ ...@@ -477,8 +476,6 @@
ClickItem: {}, ClickItem: {},
offsetwidth: 0, offsetwidth: 0,
parentEle: '', parentEle: '',
checkedIndex: '',
checkedsubIndex: '',
loading: false, loading: false,
boxHeight: 0, boxHeight: 0,
//合团的团期编号 //合团的团期编号
...@@ -594,25 +591,6 @@ ...@@ -594,25 +591,6 @@
var day = Math.abs(parseInt(days / (1000 * 60 * 60 * 24))); var day = Math.abs(parseInt(days / (1000 * 60 * 60 * 24)));
return day; return day;
}, },
getItem(index, subIndex) {
this.checkedIndex = index
this.checkedsubIndex = subIndex
},
uploadFileBtnS(file) { //手配书上传
let that = this
let newArr = []
newArr.push(file.file)
let path = '/Upload/Temporary/'
this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => {
this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl = this.domainManager()
.ViittoFileUrl + x.data.FilePath
this.$message.success(x.data.Message)
let newlist = JSON.parse(JSON.stringify(this.list))
this.list = newlist
this.$forceUpdate()
})
},
//添加酒店 //添加酒店
AddHotel(item, subIndex) { AddHotel(item, subIndex) {
var subItem = JSON.parse(JSON.stringify(item.HotelOrderList[subIndex])); var subItem = JSON.parse(JSON.stringify(item.HotelOrderList[subIndex]));
...@@ -740,14 +718,20 @@ ...@@ -740,14 +718,20 @@
} }
subItem.isShowPop = false; subItem.isShowPop = false;
subItem.ckedHotelName = ""; subItem.ckedHotelName = "";
//遍历手配
this.SupplierList.forEach(x=>{
if(x.ID==subItem.SupplierId){
subItem.IsHaveShouPeiFee = x.IsHaveShouPeiFee;
subItem.ShouPeiMoney = x.ShouPeiMoney;
}
})
}) })
}); });
this.list = list; this.list = list;
this.$forceUpdate(); this.$forceUpdate();
} }
} else { } else {
this.$message.error(res.data.message); this.Error(res.data.message);
} }
this.loading = false this.loading = false
}, err => {}) }, err => {})
...@@ -929,6 +913,15 @@ ...@@ -929,6 +913,15 @@
} }
}, err => {}); }, err => {});
}, },
//改变id获取手配价格
getSupplierShoupei(SubItem){
this.SupplierList.forEach(x=>{
if(x.ID==SubItem.SupplierId){
SubItem.IsHaveShouPeiFee=x.IsHaveShouPeiFee;
SubItem.ShouPeiMoney=x.ShouPeiMoney;
}
})
}
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 74134e13
...@@ -304,6 +304,10 @@ ...@@ -304,6 +304,10 @@
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6">
<span>{{subItem.SupplierName}} <span v-if="subItem.SupplierPayType !== 0" <span>{{subItem.SupplierName}} <span v-if="subItem.SupplierPayType !== 0"
:style="{'color': subItem.SupplierPayType == 2 ? '#E95252': '#111111'}">{{subItem.SupplierPayType == 2 ? '签单' : '现付'}}</span></span> :style="{'color': subItem.SupplierPayType == 2 ? '#E95252': '#111111'}">{{subItem.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
<div v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">暂无手配费</div>
<div v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">手配费:{{subItem.ShouPeiMoney}}</div>
</td> </td>
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.DMCState==1"> <template v-if="subItem.DMCState==1">
...@@ -895,9 +899,8 @@ ...@@ -895,9 +899,8 @@
x.CostProject = x.CostProject.toString(); x.CostProject = x.CostProject.toString();
}); });
} }
} else { } else {
this.$message.error(res.data.message); this.Error(res.data.message);
} }
}, err => {}) }, err => {})
}, },
......
src/components/TravelManager/TravelLeader/Leader.vue
View file @ 74134e13
...@@ -268,6 +268,23 @@ ...@@ -268,6 +268,23 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<div class="cn_name clearfix">
<el-form-item :label="$t('admin.admin_Surname')" prop="Surname" class="name_input">
<el-input v-model="addMsg.Surname" :placeholder="$t('admin.admin_xing')" v-on:input="setEngName(1,addMsg.Surname)"></el-input>
</el-form-item>
<el-form-item prop="Name" class="name_input">
<el-input v-model="addMsg.Name" :placeholder="$t('admin.admin_ming')" v-on:input="setEngName(2,addMsg.Name)"></el-input>
</el-form-item>
</div>
<div class="cn_name clearfix">
<el-form-item :label="$t('admin.admin_EnSurname')" prop="EnSurname" class="name_input">
<el-input v-model="addMsg.EnSurname" :placeholder="$t('admin.admin_xing')"></el-input>
</el-form-item>
<el-form-item prop="EnName" class="name_input">
<el-input v-model="addMsg.EnName" :placeholder="$t('admin.admin_ming')"></el-input>
</el-form-item>
</div>
<el-form-item :label="$t('admin.admin_language')" class='multiple_input LanguageList' v-if="addMsg.Type==3"> <el-form-item :label="$t('admin.admin_language')" class='multiple_input LanguageList' v-if="addMsg.Type==3">
<el-select v-model="LanguageIdS" multiple :placeholder="$t('admin.admin_phlanguage')" class="w210"> <el-select v-model="LanguageIdS" multiple :placeholder="$t('admin.admin_phlanguage')" class="w210">
<el-option v-for='item in LanguageList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in LanguageList' :key="item.ID" :label="item.Name" :value="item.ID">
...@@ -292,28 +309,12 @@ ...@@ -292,28 +309,12 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system.table_acc')" prop="EmployeeId"> <!-- <el-form-item :label="$t('system.table_acc')" prop="EmployeeId">
<el-select v-model="addMsg.EmployeeId" filterable :placeholder="$t('admin.admin_choAcc')" class="w210"> <el-select v-model="addMsg.EmployeeId" filterable :placeholder="$t('admin.admin_choAcc')" class="w210">
<el-option v-for='item in EmployeeList' :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId"> <el-option v-for='item in EmployeeList' :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<div class="cn_name clearfix">
<el-form-item :label="$t('admin.admin_Surname')" prop="Surname" class="name_input">
<el-input v-model="addMsg.Surname" :placeholder="$t('admin.admin_xing')" v-on:input="setEngName(1,addMsg.Surname)"></el-input>
</el-form-item>
<el-form-item prop="Name" class="name_input">
<el-input v-model="addMsg.Name" :placeholder="$t('admin.admin_ming')" v-on:input="setEngName(2,addMsg.Name)"></el-input>
</el-form-item>
</div>
<div class="cn_name clearfix">
<el-form-item :label="$t('admin.admin_EnSurname')" prop="EnSurname" class="name_input">
<el-input v-model="addMsg.EnSurname" :placeholder="$t('admin.admin_xing')"></el-input>
</el-form-item>
<el-form-item prop="EnName" class="name_input">
<el-input v-model="addMsg.EnName" :placeholder="$t('admin.admin_ming')"></el-input>
</el-form-item>
</div>
<el-form-item :label="$t('admin.admin_IDcard')" prop="IdCard" class="other_input"> <el-form-item :label="$t('admin.admin_IDcard')" prop="IdCard" class="other_input">
<el-input type="text" v-model="addMsg.IdCard" :placeholder="$t('admin.admin_phIDcard')" class="w210"></el-input> <el-input type="text" v-model="addMsg.IdCard" :placeholder="$t('admin.admin_phIDcard')" class="w210"></el-input>
</el-form-item> </el-form-item>
...@@ -337,6 +338,9 @@ ...@@ -337,6 +338,9 @@
<el-form-item :label="$t('pub.mbPhoneNum')" prop="MobilePhone" class="other_input"> <el-form-item :label="$t('pub.mbPhoneNum')" prop="MobilePhone" class="other_input">
<el-input type="text" v-model="addMsg.MobilePhone" :placeholder="$t('admin.admin_phPhone')" class="w210"></el-input> <el-input type="text" v-model="addMsg.MobilePhone" :placeholder="$t('admin.admin_phPhone')" class="w210"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="境外电话" class="other_input">
<el-input type="text" v-model="addMsg.SpareTel" :placeholder="$t('admin.admin_SpareTel')" class="w210"></el-input>
</el-form-item>
<el-form-item :label="$t('system.table_Passport')" prop="Passport" class="other_input"> <el-form-item :label="$t('system.table_Passport')" prop="Passport" class="other_input">
<el-input type="text" v-model="addMsg.Passport" :placeholder="$t('system.ph_Passport')" maxlength="9" class="w210"></el-input> <el-input type="text" v-model="addMsg.Passport" :placeholder="$t('system.ph_Passport')" maxlength="9" class="w210"></el-input>
</el-form-item> </el-form-item>
...@@ -412,6 +416,7 @@ export default { ...@@ -412,6 +416,7 @@ export default {
BirthPlace: "", BirthPlace: "",
Sex: "", Sex: "",
MobilePhone: "", MobilePhone: "",
SpareTel:'',
Passport: "", Passport: "",
IssuePlace: "", IssuePlace: "",
IssueDate: "", IssueDate: "",
......
src/components/index.vue
View file @ 74134e13
...@@ -899,7 +899,7 @@ ...@@ -899,7 +899,7 @@
</div> </div>
<div style="text-align:center"> <div style="text-align:center">
<p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p> <p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p>
<a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/10" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a> <a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/11" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
</div> </div>
</div> </div>
</div> </div>
...@@ -930,7 +930,7 @@ export default { ...@@ -930,7 +930,7 @@ export default {
data() { data() {
return { return {
tsState:false, tsState:false,
tsNumber:2, tsNumber:3,
saleRnkShow: false, saleRnkShow: false,
dialogTitleNot: '', dialogTitleNot: '',
outerVisibleNot: false, outerVisibleNot: false,
......
src/router/config.js
View file @ 74134e13
...@@ -3467,7 +3467,7 @@ export default { ...@@ -3467,7 +3467,7 @@ export default {
name: 'OPcommissionPeriods', name: 'OPcommissionPeriods',
component: resolve => require(['@/components/FinancialModule/OPcommissionPeriods'], resolve), component: resolve => require(['@/components/FinancialModule/OPcommissionPeriods'], resolve),
meta: { meta: {
title: 'op提成期数' title: 'op提成'
} }
}, },
{ {
...@@ -3475,7 +3475,15 @@ export default { ...@@ -3475,7 +3475,15 @@ export default {
name: 'OPCommissionDetail', name: 'OPCommissionDetail',
component: resolve => require(['@/components/FinancialModule/OPCommissionDetail'], resolve), component: resolve => require(['@/components/FinancialModule/OPCommissionDetail'], resolve),
meta: { meta: {
title: 'op提成期数详情' title: 'op提成详情'
}
},
{
path: '/OpComPersonDetails',
name: 'OpComPersonDetails',
component: resolve => require(['@/components/FinancialModule/OpComPersonDetails'], resolve),
meta: {
title: 'op提成明细'
} }
}, },
{ {
......
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