Skip to content

S
SuperMan
Commit 6018a522 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 21ea7596 f9c3be49
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1099 additions and 20 deletions
src/components/FinancialModule/Djcommissions.vue 0 → 100644
View file @ 6018a522
This diff is collapsed.
src/components/FinancialModule/OPcommissionPeriods.vue
View file @ 6018a522
......@@ -22,7 +22,7 @@
placeholder="选择月">
</el-date-picker>
</li>
<li>
<li v-show="btnShow">
<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>
......@@ -72,9 +72,16 @@ import moment from "moment"
total:0,
currentPage: 1,
btnLoading:false,
btnShow:false,
}
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode=userInfo.ActionMenuCode;
if(ActionMenuCode.indexOf('P_OPCommissionSend')!=-1){
this.btnShow=true;
}
this.getList();
},
methods: {
......
src/components/FinancialModule/OpComPersonDetails.vue
View file @ 6018a522
......@@ -29,7 +29,7 @@
</li>
<li>
<button class="hollowFixedBtn" @click="getList">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click="method5()">导出</button>
</li>
</ul>
</div>
......@@ -120,6 +120,16 @@
this.getList();
},
methods: {
method5: function() {
let msg = JSON.parse(JSON.stringify(this.msg));
delete msg.pageIndex;
delete msg.pageSize;
this.GetLocalFile(
"sellcommission_post_GetOPCommissionSingleDetailsListToExcel",
msg,
"OP提成明细.xls"
);
},
goUrl(item){
this.$router.push({
path: "productQuery",
......
src/components/SalesModule/groupInquiry.vue
View file @ 6018a522
......@@ -526,6 +526,10 @@
</div>
</div>
<div class="TC_remarkContent">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle">地接备注团号：</div>
<div class="TCL_Content"> {{item.CombinationNum}}</div>
</div>
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle">OP对外备注：</div>
<div class="TCL_Content">{{item.OPRemark}}</div>
......
src/components/TravelContractDetail.vue
View file @ 6018a522
......@@ -621,9 +621,13 @@
</tr>
<tr>
<td>签约日期：</td>
<td>{{getDate(dataList.payDate)}}</td>
<td>
<span v-if="dataList.payDate">{{getDate(dataList.payDate)}}</span>
</td>
<td>签约日期：</td>
<td>{{getDate(dataList.payDate)}}</td>
<td>
<span v-if="dataList.payDate">{{getDate(dataList.payDate)}}</span>
</td>
</tr>
<tr>
<td>签约地点：</td>
......
src/components/TravelContractNew.vue
View file @ 6018a522
......@@ -987,7 +987,7 @@
<div>备注：1、在主要景点的游览时间不小于此数的时间，以小时填; 2、交通工具不含景区观光车、索道等; 3、“交通工具”栏中的“标准”按各类别的标准填写。</div>
<div>飞机：头等舱/商务舱/经济舱；&nbsp;&nbsp;&nbsp;汽车：空调大巴/空调卧铺/普通客车</div>
<div>火车：普通车/空调车/动车组（其中：软卧/硬卧/软座/硬座）；</div>
<div>轮船：普通客船/星级游船 &nbsp;&nbsp;&nbsp;人/间（其中：□带卫生间 □不带卫生间）</div>
<div>轮船：普通客船/星级游船 &nbsp;&nbsp;&nbsp;人/间</div>
</td>
</tr>
</tbody>
......@@ -1409,16 +1409,6 @@
this.CtObj.regulatorName = '四川省成都市旅游质监执法机构';
this.CtObj.regulatorComplainCall = '17708046437';
this.CtObj.companyComplainCall = '028-96927';
this.CtObj.clientName=this.guestList[0].surName+''+this.guestList[0].name;
let clientIdcardnum = this.guestList[0].idCard;
if(clientIdcardnum.length<18){
this.CtObj.clientIdcardnum=this.guestList[0].passportNo;
}else{
this.CtObj.clientIdcardnum=this.guestList[0].idCard;
}
this.CtObj.clientCall=this.guestList[0].mobilePhone;
this.CtObj.clientAddress=this.guestList[0].addressDetail;
} else {
this.Error(res.data.message);
}
......
src/components/administrative/ClausesOrder.vue 0 → 100644
View file @ 6018a522
<style>
.CM_look{
padding:4px!important;
position: relative;
top:1px;
}
</style>
<template>
<div class="flexOne">
<!-- <div class="query-box">
<ul>
<li>
<input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/>
</li>
</ul>
</div> -->
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>订单号</th>
<th>团号</th>
<th>旅客数</th>
<th>销售名称</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.OrderId}}</td>
<td>{{item.TCNUM}}</td>
<td>{{item.GuestNum}}</td>
<td>{{item.CreateByName}}</td>
<!-- <td>
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('CommissionDetail',item.id)" icon="iconfont icon-chakan" circle></el-button>
</el-tooltip>
</td> -->
</tr>
<tr>
<td v-show="dataList.length==0" colspan="4" align="center">暂无数据</td>
</tr>
</table>
<!-- 分页 -->
<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>
</template>
<script>
export default {
data() {
return {
msg: {
PageIndex: 1,
PageSize: 20,
StartDate:'',
},
loading:false,
//数据源
dataList:[],
total:0,
currentPage: 1,
}
},
mounted() {
this.msg.StartDate=this.$route.query.StartDate;
this.getList();
},
methods: {
handleCurrentChange(val) {
this.msg.PageIndex = val;
this.getList();
},
goUrl(path,id) {
this.$router.push({
path: path,
query: {
ParentId:id,
blank: 'y',
tab: '报价详情'
}
});
},
//获取数据
getList() {
this.loading = true;
this.apipost(
"OPCommission_GetCommissionOrderPageList",
this.msg,
res => {
this.loading = false;
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},
null
);
},
//生成提成报表
generateTable(){
let msg = {
UserId: 0
}
this.apipost(
"sellcommission_SetGenerateCommission",msg,
res => {
if(res.data.resultCode==1){
this.getList();
this.Success('报表生成成功')
}else{
this.Error(res.data.message);
}
},
null
);
}
}
}
</script>
src/components/administrative/CommissionManagement.vue
View file @ 6018a522
......@@ -22,7 +22,7 @@
<th>日期</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="item in dataList">
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.periods}}</td>
<td>{{item.sumPrice}}</td>
<td>{{item.createByStr}}</td>
......
src/components/administrative/DjCommissionDetail.vue 0 → 100644
View file @ 6018a522
This diff is collapsed.
src/components/administrative/DjCommissionsmangment.vue 0 → 100644
View file @ 6018a522
<style>
.CM_look{
padding:4px!important;
position: relative;
top:1px;
}
</style>
<template>
<div class="flexOne">
<!-- <div class="query-box">
<ul>
<li>
<input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/>
</li>
</ul>
</div> -->
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>期数</th>
<th>提成总金额</th>
<th>{{$t('admin.admin_czPerson')}}</th>
<th>日期</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.Periods}}</td>
<td>{{item.SumPrice}}</td>
<td>{{item.CreateByStr}}</td>
<td>{{item.CreateStr}}</td>
<td>
<!-- <el-tooltip class="item" effect="dark" content="取消" placement="top">
<el-button type="danger" icon="el-icon-delete" circle></el-button>
</el-tooltip> -->
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('DjCommissionDetail',item.ID)" icon="iconfont icon-chakan" circle></el-button>
</el-tooltip>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="5" align="center">暂无数据</td>
</tr>
</table>
<!-- 分页 -->
<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>
</template>
<script>
export default {
data() {
return {
msg: {
PageIndex: 1,
PageSize: 20
},
loading:false,
//数据源
dataList:[],
total:0,
currentPage: 1,
}
},
mounted() {
this.getList();
},
methods: {
handleCurrentChange(val) {
this.msg.PageIndex = val;
this.getList();
},
goUrl(path,id) {
this.$router.push({
path: path,
query: {
ID:id,
blank: 'y',
tab: '详情'
}
});
},
//获取数据
getList() {
this.loading = true;
this.apipost(
"OPCommission_GetPeriodsPageList",
this.msg,
res => {
this.loading = false;
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},
null
);
},
//生成提成报表
generateTable(){
let msg = {
UserId: 0
}
this.apipost(
"sellcommission_SetGenerateCommission",msg,
res => {
if(res.data.resultCode==1){
this.getList();
this.Success('报表生成成功')
}else{
this.Error(res.data.message);
}
},
null
);
}
}
}
</script>
src/components/administrative/ElectronicAudit.vue
View file @ 6018a522
......@@ -157,7 +157,7 @@ export default {
//跳转至详情
goToDetail(item){
this.$router.push({
name: 'ElectronicContract',
name: 'TravelContractDetail',
query: {
TCID: item.tcid,
orderID: item.orderId,
......
src/components/busManagement/BusInfo.vue
View file @ 6018a522
......@@ -285,7 +285,7 @@
<el-table-column label="付款方式" min-width="150">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<el-select class='sel' v-model='subItem.PayType' :placeholder="$t('pub.pleaseSel')"
<el-select class='sel' v-model='subItem.PayType' :disabled="isShowBtn==1?true:false" :placeholder="$t('pub.pleaseSel')"
@change="PayTypeChange(scope.row)">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
......@@ -382,7 +382,7 @@
<el-table-column label="成本价" min-width="140">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<el-input v-model="subItem.CostPrice" @keyup.native="checkPrice(subItem,'CostPrice')"
<el-input v-model="subItem.CostPrice" :disabled="isShowBtn==1?true:false" @keyup.native="checkPrice(subItem,'CostPrice')"
placeholder="请输入成本价" class="w135"></el-input>
</div>
</template>
......@@ -414,6 +414,9 @@
:disabled="disButton" value="保存草稿" />
<input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(1)"
:disabled="disButton" value="保存" />
<span v-if="isShowBtn==1" style="color:red;margin-left:10px;">
已制单，不能再修改价格和付款方式！
</span>
</div>
</el-form>
</div>
......
src/components/leaderPay2.vue
View file @ 6018a522
......@@ -406,7 +406,7 @@
{{subItem.ScenicName}}
</td>
<td>
{{peopleStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}
{{peopleStrToWord(childItem.PeopleType)}}:{{childItem.UsePeopleNum}}
</td>
<td>
<p>
......
src/router/config.js
View file @ 6018a522
......@@ -329,6 +329,14 @@ export default {
title: '提成管理'
},
},
{
path: '/DjCommissionsmangment', //提成管理
name: 'DjCommissionsmangment',
component: resolve => require(['@/components/administrative/DjCommissionsmangment'], resolve),
meta: {
title: '地接提成'
},
},
{
path: '/AirticketCommission', //票务提成
name: 'AirticketCommission',
......@@ -353,6 +361,22 @@ export default {
title: '提成详情'
},
},
{
path: '/ClausesOrder', //提成详情
name: 'ClausesOrder',
component: resolve => require(['@/components/administrative/ClausesOrder'], resolve),
meta: {
title: '期数订单'
},
},
{
path: '/DjCommissionDetail', //提成详情
name: 'DjCommissionDetail',
component: resolve => require(['@/components/administrative/DjCommissionDetail'], resolve),
meta: {
title: '提成详情'
},
},
{
path: '/ExaminationStatistics', //考核管理
name: 'ExaminationStatistics',
......@@ -3660,6 +3684,14 @@ export default {
title: 'op提成'
}
},
{
path: '/Djcommissions',
name: 'Djcommissions',
component: resolve => require(['@/components/FinancialModule/Djcommissions'], resolve),
meta: {
title: '地接提成规则'
}
},
{
path: '/OPCommissionDetail',
name: 'OPCommissionDetail',
......
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