Skip to content

S
SuperMan
Commit fc24eb4b authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 11d27849 806b9c78
Hide whitespace changes
Inline Side-by-side
Showing with 239 additions and 20 deletions
src/components/FinancialModule/domesticCommissionTW2.vue
View file @ fc24eb4b
......@@ -27,7 +27,7 @@
<li>
<em>出团公司</em>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)"
:disabled="msg.OutBranchId==0?false:true">
:disabled="S_CheckBranchOrder">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
......@@ -230,6 +230,7 @@
BranchList:[],
cMaker:false,//是否可以制单
isRateAuthoTW: false,//是否可以修改汇率
S_CheckBranchOrder: false,//查看公司下订单
}
},
mounted() {
......@@ -245,6 +246,9 @@
if (ActionMenuCode.indexOf('isRateAuthoTW') != -1){
this.isRateAuthoTW = true
}
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 ){
this.S_CheckBranchOrder = true
}
this.getList();
this.getCompanyList()
......
src/components/FinancialModule/domesticCommissionUserTW2.vue
View file @ fc24eb4b
......@@ -37,7 +37,8 @@
</li>
<li>
<em>出团公司</em>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)"
:disabled="S_CheckBranchOrder">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
......@@ -143,6 +144,7 @@
BranchList: [],
searchList: [],
departMentList:[],
S_CheckBranchOrder: false,
}
},
mounted() {
......@@ -154,6 +156,10 @@
this.disabled = true;
this.msg.UserId = Number(userInfo.EmployeeId)
}
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 ){
this.S_CheckBranchOrder = true
this.msg.OutBranchId = userInfo.RB_Branch_id
}
if (this.$route.query && this.$route.query.PeriodId) {
this.msg.PeriodId = this.$route.query.PeriodId
}
......
src/components/FinancialModule/domesticCommissiondetailsTW2.vue
View file @ fc24eb4b
......@@ -40,7 +40,8 @@
</li>
<li>
<em>出团公司</em>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)">
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)"
:disabled="S_CheckBranchOrder">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index"
:label="item.BName" :value="item.Id">
......@@ -192,8 +193,8 @@
TotalMoney: 0,
TotalProfit: 0,
TotalNum: 0,
disabled: true
disabled: true,
S_CheckBranchOrder: false,
}
},
mounted() {
......@@ -222,6 +223,10 @@
this.disabled = true;
this.msg.UserId = Number(userInfo.EmployeeId)
}
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 ){
this.S_CheckBranchOrder = true
this.msg.OutBranchId = userInfo.RB_Branch_id
}
this.getList();
this.getqishilist()
this.getCompanyList() //获取公司
......
src/components/TravelManager/TravelTeam/priceGroup.vue
View file @ fc24eb4b
......@@ -645,6 +645,9 @@
<el-dropdown-item @click.native="gotoOrder(item)">
报名清单
</el-dropdown-item>
<el-dropdown-item @click.native="gotoPay(item)">
包机结算
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -726,6 +729,13 @@
tcmun: item.TCNUM
});
},
//跳转到报名清单
gotoPay(item) {
this.OpenNewPage('/TravelPay', {
id: item.TCID,
tcmun: item.TCNUM
});
},
// 结束日期不能大于开始日期
dataDui() {
if (this.msg.StartTime > this.msg.EndTime && this.msg.EndTime !== "") {
......
src/components/TravelManager/TravelTeam/travelPayList.vue 0 → 100644
View file @ fc24eb4b
<style scoped>
@import "../../../assets/css/newTravelManager.css";
.w_20 {
width: 20%;
}
.w_10 {
width: 10%;
}
.mb {
margin-bottom: 10px;
}
.title {
font-weight: 600;
}
.p20 {
padding: 20px;
}
</style>
<template>
<div class="TC_Content">
<div class="TC-MyList">
<div class="TravelTclList" v-loading="queryMsg.loading">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
</el-pagination>
<ul>
<li v-for="(item,index) in queryDataObj.dataList" :key="item.GTeamId"
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent">
<div class="el-col w_20">
<div class="p20">
<div class="mb title"><i class="iconfont icon-biaoti1"></i><span>包机信息</span></div>
<div>合作伙伴:<span>{{item.ContactName}}</span></div>
<div>已入名单人数：<span>{{item.EntGuestNum}}</span></div>
<div>已入名单人数：<span>{{item.IsHaveFinance}}</span></div>
<div>报名总人数:<span>{{item.GuestNum}}</span></div>
<div>应收总金额：<span>{{item.PreferPrice}}</span></div>
<div>退款金额：<span>{{item.Refund}}</span></div>
<div>平台税金:<span>{{item.PlatformTax}}</span></div>
<div>实收：<span>{{item.Income}}</span></div>
<div>在途金额：<span>{{item.ZaiTuMoney}}</span></div>
<div>折扣金额:<span>{{item.DiscountMoney}}</span></div>
<div>大红包抵扣金额：<span>{{item.RedEnvelopeMoney}}</span></div>
<div>代收总金额：<span>{{item.DueInMoney}}</span></div>
<div>利润（先给这个字段，规则还没有）：<span>{{item.CommissionRate}}</span></div>
</div>
</div>
<div class="el-col w_20">
<div class="p20">
<div class="mb title"><i class="iconfont icon-hangban1"></i><span>航班信息</span></div>
</div>
</div>
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-jiage"></i><span>机位信息</span></div>
</div>
</div>
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-jiage"></i><span>价格信息</span></div>
</div>
</div>
<div class="el-col w_20">
<div class="p20">
<div class="mb title"><i class="iconfont icon-tuandui"></i><span>合作伙伴</span></div>
</div>
</div>
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-yuangong"></i><span>发起信息</span></div>
</div>
</div>
<div class="el-col w_10">
<div class="p20">
</div>
</div>
</div>
</li>
</ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
</el-pagination>
</div>
</div>
<el-dialog class="app-attachment-dialog" width="900" :title="dialogTitle" :visible.sync="isShowEditTeamDialog"
:close-on-click-modal="false">
<editTeamInfo v-if="isShowEditTeamDialog" :Q_GTeamId="GTeamId" @success="refreshPage"></editTeamInfo>
</el-dialog>
</div>
</template>
<script>
import editTeamInfo from "../TravelTeam/editTeamInfo"; //新增修改包机团
export default {
provide() {
return {
reload: this.reload
}
},
components: {
editTeamInfo
},
data() {
return {
isShowEditTeamDialog: false, //是否显示新增修改包机团弹窗
dialogTitle: "添加包机信息", //弹窗名称
GTeamId: 0, //包机团队Id
//查询参数
queryMsg: {
pageIndex: 1,
pageSize: 10,
total: 0,
TCID: '',
//是否有数据
noData: false,
currentPage: 1,
loading: false, //加载层
},
queryDataObj: {
dataList: [], //数据列表
},
};
},
//监听器
watch: {
// 方法1
'$route'(to, from) { //监听路由是否变化
location.reload()
},
},
methods: {
//刷新页面
refreshPage() {
this.isShowEditTeamDialog = false;
this.getTravelTeamList();
},
//翻页
handleCurrentChange(val) {
this.queryMsg.pageIndex = val;
this.getTravelTeamList();
},
//重新查询
resetQuery() {
this.queryMsg.pageIndex = 1;
this.getTravelTeamList();
},
//获取包机列表
getTravelTeamList() {
this.queryMsg.loading = true;
this.apipost(
"sellorder_post_GetTravelTeamOrderList",
this.queryMsg,
res => {
this.queryMsg.loading = false;
if (res.data.resultCode == 1) {
this.queryDataObj.dataList = res.data.data;
this.queryMsg.total = res.data.data.count;
}
}
);
},
},
mounted() {
console.log('mounted', this.$route)
this.queryMsg.TCID = this.$route.query.id
this.getTravelTeamList();
},
created() {
}
};
</script>
src/components/myOrdersAllType/components/OrderList.vue
View file @ fc24eb4b
......@@ -5,7 +5,8 @@
ref="multipleTable"
:data="OrderList"
style="width: 100%"
:default-sort = "{prop: 'date', order: 'descending'}">
:default-sort = "{prop: 'Money', order: 'null'}"
:sort-by="['Money','Income','PlatformTax','Refund','CostMoney','DueInMoney']">
<el-table-column
width="200"
prop="CreateTimeStr"
......@@ -98,6 +99,7 @@
</el-table-column>
<el-table-column
sortable
prop="DueInMoney"
label="待收"
show-overflow-tooltip>
<template slot-scope="scope">
......@@ -310,6 +312,7 @@
this.GetAdminCarOrderPageList(row,url,href,data)
}
else if (row.OrderType == 7) {//jalan酒店
this.$message.info('jalan酒店暂不支持查看')
// if(this.pagesTitle=='销售'){
// name = 'CharterOrderList'
// }else{
......
src/components/myOrdersAllType/components/allList.vue
View file @ fc24eb4b
......@@ -66,19 +66,19 @@
<div class="HotelWorkList" @click="showWarningSearch=false">
<div class="query-box HotelWorkInput" style="border-bottom: none;">
<ul>
<li>
<!-- <li>
<span><em>客人姓名</em>
<el-input clearable v-model="msg.CustomerName" placeholder="客人姓名" class="w200"/>
</span>
</li>
</li> -->
<li>
<span><em>商品名称</em>
<el-input clearable type="" v-model="msg.ProductName" placeholder="请商品名称" class="w200"/>
<el-input clearable type="" v-model="msg.ProductName" placeholder="请输入商品名称" class="w200"/>
</span>
</li>
<li>
<span><em>{{$t('OrderList.search.orderNum')}}</em>
<el-input clearable type="" v-model="msg.OrderId" :placeholder="$t('OrderList.search.orderNum')" class="w200"/>
<span><em>订单Id</em>
<el-input clearable type="" v-model="msg.OrderId" placeholder="请输入订单Id" class="w200"/>
</span>
</li>
<li>
......@@ -91,10 +91,10 @@
<el-input clearable v-model="msg.Mobile" placeholder="电话" class="w200"/>
</span>
</li> -->
<li v-if="!Title">
<li v-if="Title!='销售'">
<span>
<em>业务员</em>
<el-select filterable v-model='msg.EnterId' class="w200">
<el-select filterable v-model='msg.EnterId' class="w200" clearable>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
......@@ -104,10 +104,10 @@
</el-select>
</span>
</li>
<li>
<li v-if="Title!='销售'">
<span>
<em>引流人</em>
<el-select filterable v-model='msg.LureEmpId' class="w200">
<el-select filterable v-model='msg.LureEmpId' class="w200" clearable>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
......@@ -131,7 +131,7 @@
<span>
<em>订单状态</em>
<el-select v-model='msg.OrderState' class="w200">
<el-option :value="0" label="不限"></el-option>
<!-- <el-option :value="0" label="不限"></el-option> -->
<el-option v-for='item in OrderStatusList'
:label='item.Name'
:value='item.Id'
......@@ -319,7 +319,7 @@
OrderId: "", //订单id
GuestId: 0, //客人id
EnterId: 0, //业务员id
OrderState: 1, //订单状态
OrderState: '1', //订单状态
Q_IsCollect: "0", //收款状态
StartTime: "",//报名开始日期
EndTime: "",//报名结束日期
......@@ -361,7 +361,11 @@
PostId:0,
IsLeave:0,
},
OrderStatusList: [],
OrderStatusList: [
{ Name: "不限", Id: "0" },
{ Name: "正常", Id: "1" },
{ Name: "取消", Id: "2" },
],
QIsCollectList: [
{ Name: "不限", Id: "0" },
{ Name: "已收齐", Id: "1" },
......@@ -575,7 +579,7 @@
this.msg.StartTime = this.getBeforeDate(31, new Date())
this.msg.EndTime = this.getBeforeDate(0, new Date())
this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
this.GetOrderStatusEnumList()
// this.GetOrderStatusEnumList()
this.GetTicketStatusEnumList()
this.GetOrderTypeEnumList()
this.getLineList()
......
src/router/config.js
View file @ fc24eb4b
......@@ -2317,7 +2317,7 @@ export default {
name: 'priceGroup',
component: resolve => require(['@/components/TravelManager/TravelTeam/priceGroup'], resolve),
meta: {
title: '包机列表'
title: '包机产品'
},
}, {
path: '/TravelTeam', //包机列表
......@@ -2326,6 +2326,13 @@ export default {
meta: {
title: '包机列表'
},
}, {
path: '/TravelPay', // 包机结算
name: 'TravelPay',
component: resolve => require(['@/components/TravelManager/TravelTeam/travelPayList'], resolve),
meta: {
title: '包机结算'
},
}, {
path: '/TravelSupplier', //供应商列表
name: 'TravelSupplier',
......
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