Skip to content

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

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

parents c416ff47 f0917a23
Show whitespace changes
Inline Side-by-side
Showing with 535 additions and 417 deletions
src/components/dmc/manager/GroupOutCorporationAudit.vue
View file @ 20ce5fdc
...@@ -4,27 +4,34 @@ ...@@ -4,27 +4,34 @@
<ul> <ul>
<li> <li>
<em>出团公司</em> <em>出团公司</em>
<el-select filterable v-model='msg.OutBranchId' size="small" @change='getControlList()' clearable> <el-select filterable v-model='msg.OutBranchId' size="small"
@change='getControlList()'>
<el-option label="不限" :value="-1" :key="-1"></el-option> <el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option> <el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<span> <span>
<em>团队类型</em> <em>团类型</em>
<el-select class="w200" v-model="msg.TeamType" filterable :placeholder="$t('pub.pleaseImport')" size="small" <el-select class="w200" v-model="msg.TeamType" filterable :placeholder="$t('pub.pleaseImport')" size="small"
@change="getControlList()" clearable> @change="getControlList()">
<el-option v-for="item in groupType" :label="item.Name" :value="item.Id" :key="item.Id"></el-option> <el-option v-for="item in groupType" :label="item.Name" :value="item.Id"
:key="item.Id"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>审核状态</em> <em>审核状态</em>
<el-select class="w200" v-model="msg.BranchAuditState" filterable :placeholder="$t('pub.pleaseImport')" <el-select class="w200" v-model="msg.BranchAuditState" filterable :placeholder="$t('pub.pleaseImport')" size="small"
size="small" @change="getControlList()" clearable> @change="getControlList()">
<el-option v-for="item in BranchAuditStateType" :label="item.Name" :value="item.Id" :key="item.Id"> <el-option v-for="item in BranchAuditStateType" :label="item.Name" :value="item.Id"
</el-option> :key="item.Id"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -32,8 +39,7 @@ ...@@ -32,8 +39,7 @@
<span> <span>
<em>团号</em> <em>团号</em>
<el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200" size="small" <el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200" size="small"
@keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')" clearable @keyup.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
@clear="getControlList"></el-input>
</span> </span>
</li> </li>
<li v-if="false"> <li v-if="false">
...@@ -46,93 +52,173 @@ ...@@ -46,93 +52,173 @@
</li> </li>
<li> <li>
<span> <span>
<em>时间</em> <em>申请日期</em>
<el-date-picker style="width: 300px;" v-model="StartTime" format='yyyy-MM-dd' value-format="yyyy-MM-dd" <el-date-picker
size="small" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 300px;"
@change="getStartTime" clearable> v-model="StartTime"
format='yyyy-MM-dd'
value-format="yyyy-MM-dd"
size="small"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="getStartTime">
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
<li> <li>
<button class="hollowFixedBtn" type="button" @click="getControlList">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" type="button"
@click="getControlList">{{$t('pub.searchBtn')}}</button>
</li> </li>
</ul> </ul>
</div> </div>
<el-table v-loading="loading" ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%" <ul class="_nav clearfix" v-if="false">
@selection-change="handleSelectionChange"> <li :class="active==1?'_active':''" @click="active=1, msg.OutGroupAuditState=1, getControlList()">待审批</li>
<el-table-column label="团队编号" width="200"> <li :class="active==2?'_active':''" @click="active=2, msg.OutGroupAuditState=2, getControlList()">已审批</li>
<div style="float: right;" v-if="multipleSelection.length>0">
<button class="hollowFixedBtn" @click="setAudit()">批量审核</button>
</div>
<li style="float: right;color: red;font-size: 14px;">
<!-- 注：落地团，小包团，国内线 均按订单利润的20%计算最大预计销售提成，实际发放提成不会超过最大预期销售提成 -->
</li>
</ul>
<ul style="overflow: initial!important">
<li style="margin-bottom:10px;width: 100%;">
</li>
</ul>
<el-table
v-loading="loading"
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column
type="selection"
width="55" :selectable="selectable"> -->
</el-table-column>
<el-table-column
label="团队编号"
width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.OutBranchName}}</p> <p>{{scope.row.OutBranchName}}</p>
<span style="cursor: pointer;text-decoration: underline;" <span style="cursor: pointer;text-decoration: underline;"
@click="goTravel(scope.row.TCID)">{{scope.row.TCNUM}}({{scope.row.TCID}})</span> @click="goTravel(scope.row.TCID)">{{scope.row.TCNUM}}({{scope.row.TCID}})</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="StartDate" label="出发日期" width="120" show-overflow-tooltip></el-table-column> <el-table-column
<el-table-column prop="LtName" label="系列" width="200" show-overflow-tooltip> prop="LtName"
label="系列"
width="200"
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.LineName}}</br> {{scope.row.LineName}}</br>
{{scope.row.LtName}} {{scope.row.LtName}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Title" label="团名" width="200" show-overflow-tooltip></el-table-column> <el-table-column
<el-table-column prop="" label="申请人/申请日期" width="200"> prop="Title"
label="团名"
width="200"
show-overflow-tooltip></el-table-column>
<el-table-column
prop=""
label="申请人/申请日期" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<p> {{scope.row.BranchApplyName}}</p> <p> {{scope.row.BranchApplyName}}</p>
<p> {{scope.row.BranchApplyTime}}</p> <p> {{scope.row.BranchApplyTime}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="OPName" label="申请原因" show-overflow-tooltip> <el-table-column
prop="OPName"
label="申请原因" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.BranchApplyResion}} {{scope.row.BranchApplyResion}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="PriceTeamTypeName" label="团队类型" width="130"> <el-table-column
prop="PriceTeamTypeName"
label="团队类型" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.TeamTypeName">{{scope.row.TeamTypeName}}</template> <template v-if="scope.row.TeamTypeName">{{scope.row.TeamTypeName}}</template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="OldBranchName" label="原出团公司" width="130"></el-table-column> <el-table-column
<el-table-column prop="NewBranchName" label="新出团公司" width="130"></el-table-column> prop="OldBranchName"
<el-table-column prop="" label="审核状态" width="100"> label="原出团公司" width="130"></el-table-column>
<el-table-column
prop="NewBranchName"
label="新出团公司" width="130"></el-table-column>
<el-table-column
prop=""
label="审核状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.BranchAuditState==1"> <span :style="{'color':scope.row.BranchAuditState==1?'red':scope.row.BranchAuditState==2?'#33B3FF':''}">
<span style="=color:blue;">{{scope.row.BranchAuditStateStr}}</span> {{scope.row.BranchAuditStateStr}}
</template> </span>
<template v-else-if="scope.row.BranchAuditState==2">
<span style="color:green;">{{scope.row.BranchAuditStateStr}}</span>
</template>
<template v-else-if="scope.row.BranchAuditState==3">
<span style="color:red;">{{scope.row.BranchAuditStateStr}}</span>
</template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="操作" width="150"> <el-table-column
prop=""
label="操作"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="_icon_btn"> <div class="_icon_btn">
<el-tooltip class="item" effect="dark" content="审核" placement="top" v-if="scope.row.BranchAuditState==1"> <el-tooltip class="item" effect="dark" content="审核" placement="top"
v-if="scope.row.BranchAuditState==1">
<i v-loading="loading" class="iconfont icon-ico_commodity_defaul" @click="shenhei(scope.row)"></i> <i v-loading="loading" class="iconfont icon-ico_commodity_defaul" @click="shenhei(scope.row)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="驳回" placement="top" v-if="scope.row.BranchAuditState==1"> <el-tooltip class="item" effect="dark" content="驳回" placement="top" v-if="scope.row.BranchAuditState==1">
<i class="iconfont icon-shenhebohui" @click="bohui(scope.row)"></i> <i class="iconfont icon-shenhebohui" @click="bohui(scope.row)"></i>
</el-tooltip> </el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="收支明细" placement="top">
<i class="iconfont icon-mingxi" @click="goTeamBalance(scope.row.TCID)"></i>
</el-tooltip> -->
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="width: 100%;"> <div style="width: 100%;">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" <el-pagination background
:current-page.sync="msg.pageIndex" layout="sizes,total,prev, pager, next, jumper" @size-change="handleSizeChange"
:page-sizes="[5, 10, 20, 30,50,100]" :page-size="msg.pageSize" :total="total"> @current-change="handleCurrentChange"
:current-page.sync="msg.pageIndex"
layout="sizes,total,prev, pager, next, jumper"
:page-sizes="[5, 10, 20, 30,50,100]"
:page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
</div> </div>
<el-dialog custom-class="w600" title="驳回缘由" :visible.sync="cancelOrderDialog">
<el-dialog
custom-class="w600"
title="驳回缘由"
:visible.sync="cancelOrderDialog"
>
<div style="padding-bottom:20px"> <div style="padding-bottom:20px">
<el-input type="textarea" autofocus rows="5" placeholder="请填写驳回该团的缘由" clear="w300" v-model="cancelRemark"> <el-input
</el-input> type="textarea"
autofocus
rows="5"
placeholder="请填写驳回该团的缘由"
clear="w300"
v-model="cancelRemark"
></el-input>
<el-row :gutter="20" style="margin-top: 20px;"> <el-row :gutter="20" style="margin-top: 20px;">
<el-col :span="24" style="text-align: right;"> <el-col :span="24" style="text-align: right;">
<el-button class="normalBtn" value="" @click="cancelOrderHandler" :loading="loading">确定驳回</el-button> <el-button
<el-button class="hollowFixedBtn" @click="cancelOrderDialog = false,cancelRemark=''">关闭</el-button> class="normalBtn"
value=""
@click="cancelOrderHandler"
:loading="loading"
>确定驳回</el-button>
<el-button
class="hollowFixedBtn"
@click="cancelOrderDialog = false,cancelRemark=''"
>关闭</el-button>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -141,48 +227,27 @@ ...@@ -141,48 +227,27 @@
</template> </template>
<script> <script>
export default { export default {
components: { components: {
}, },
data() { data() {
return { return {
StartTime: [], StartTime:[],
groupType: [{ groupType:[
Name: '不限', {Name:'不限',Id:-1},
Id: -1 {Name:'小包团',Id:1},
}, {Name:'当地游',Id:2},
{ {Name:'常规团',Id:0}
Name: '小包团',
Id: 1
},
{
Name: '当地游',
Id: 2
},
{
Name: '常规团',
Id: 0
}
], ],
BranchAuditStateType: [{ BranchAuditStateType:[
Name: '不限', {Name:'不限',Id:-1},
Id: -1 {Name:'待审核',Id:1},
}, {Name:'通过',Id:2},
{ {Name:'驳回',Id:3}
Name: '待审核',
Id: 1
},
{
Name: '通过',
Id: 2
},
{
Name: '驳回',
Id: 3
}
], ],
companyList: [], companyList:[],
cancelRemark: '', cancelRemark: '',
dataRow: null, dataRow: null,
cancelOrderDialog: false, cancelOrderDialog: false,
...@@ -192,16 +257,16 @@ ...@@ -192,16 +257,16 @@
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
TCNUM: '', //团号 TCNUM: '',//团号
TeamType: -1, //团队类型 0-常规，1-小包团，2-当地游 TeamType: -1,//团队类型 0-常规，1-小包团，2-当地游
OutBranchId: -1, OutBranchId: -1,
QStartDate: '', QStartDate: '',
QEndDate: '', QEndDate: '',
BranchAuditState: 1, //默认待审核 BranchAuditState: -1
}, },
TeamListArr: [], TeamListArr:[],
total: 0, total:0,
EmployeeId: 0, EmployeeId:0,
multipleSelection: [], multipleSelection: [],
AuditLoading: false, AuditLoading: false,
dialog: { dialog: {
...@@ -209,24 +274,31 @@ ...@@ -209,24 +274,31 @@
ConfigId: '', ConfigId: '',
OfferId: '' OfferId: ''
}, },
getCompanyMsg: { getCompanyMsg:{
RB_Group_Id: '0', RB_Group_Id:'0',
Status: '0', Status:'0',
}, },
} }
}, },
created() { created() {
var myDate = new Date();
var MonthDayNum = new Date(myDate.getFullYear(), myDate.getMonth(), 0).getDate();
var StartTime = `${myDate.getFullYear()}-${myDate.getMonth() + 1}-01`
var EndTime = `${myDate.getFullYear()}-${myDate.getMonth() + 1}-${MonthDayNum}`
this.StartTime = [StartTime,EndTime]
this.msg.QStartDate = StartTime
this.msg.QEndDate = EndTime
this.getTeamList() this.getTeamList()
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userinfo.RB_Group_id; this.getCompanyMsg.RB_Group_Id=userinfo.RB_Group_id;
this.EmployeeId = userinfo.EmployeeId this.EmployeeId = userinfo.EmployeeId
let ActionMenuCode = userinfo.ActionMenuCode; let ActionMenuCode=userinfo.ActionMenuCode;
if (ActionMenuCode.indexOf('Finance_clumpSeeAll') != -1) { //如果有权限 可以查看所有 如果没有只能看自己审核的 if(ActionMenuCode.indexOf('Finance_clumpSeeAll')!=-1){//如果有权限 可以查看所有 如果没有只能看自己审核的
// this.msg.OutGroupAuditEmpId = 0 // this.msg.OutGroupAuditEmpId = 0
} else { }else{
// this.msg.OutGroupAuditEmpId = userinfo.EmployeeId // this.msg.OutGroupAuditEmpId = userinfo.EmployeeId
} }
if (this.$route.query && this.$route.query.TCID) { if(this.$route.query && this.$route.query.TCID){
this.msg.TCID = this.$route.query.TCID this.msg.TCID = this.$route.query.TCID
} }
this.getCompany() this.getCompany()
...@@ -236,21 +308,43 @@ ...@@ -236,21 +308,43 @@
}, },
methods: { methods: {
getStartTime() { getStartTime(){
if (this.StartTime.length == 2) { if(this.StartTime.length==2){
this.msg.QStartDate = this.StartTime[0] this.msg.QStartDate = this.StartTime[0]
this.msg.QEndDate = this.StartTime[1] this.msg.QEndDate = this.StartTime[1]
} else { }else{
this.msg.QStartDate = '' this.msg.QStartDate = ''
this.msg.QEndDate = '' this.msg.QEndDate = ''
} }
}, },
getCompany() { // 销售预期提成
this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => { goAnticipate(row,type){
if (res.data.resultCode == 1) { let userInfo = this.getLocalStorage();
this.companyList = res.data.data; let name
} else {} if(type==1){//国内
}, err => {}) name = 'domesticCommissiondetails'
}else if(type==2){//单项
name = 'ServiceCommissiondetails'
}else if(type==3){//台湾
name = 'domesticCommissiondetailsTW'
}else if(type==4){//同业
name = 'TradeTicketDetails'
}
this.$router.push({
name: name,
query: {
Type: 1,
TCNUM: row.TCNUM,
blank: 'y'
}
});
},
getCompany(){
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.companyList=res.data.data;
}else{}
},err=>{})
}, },
showDialog(ConfigId, OfferId) { showDialog(ConfigId, OfferId) {
this.dialog = { this.dialog = {
...@@ -262,8 +356,33 @@ ...@@ -262,8 +356,33 @@
this.$refs.dialog.getPostData() this.$refs.dialog.getPostData()
}) })
}, },
selectable(row, index) {
if(this.active==1){
return true
}else{
return false
}
},
setAudit(type){
let ids = this.multipleSelection.map(x=>{ return x.TCID})
if(ids.length==0){
return this.$message.error('请勾选需要批量审核的数据');
}
let that = this;
that.$confirm('是否通过该批量审核数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
for(let i=0;i<ids.length;i++){
setTimeout(()=>{
this.groupAudit(2,ids[i],'multiple',(i+1)==ids.length?ids.length:0)
},500)
}
}).catch(() => {
});
},
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
}, },
...@@ -271,11 +390,11 @@ ...@@ -271,11 +390,11 @@
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.getList() this.getList()
}, },
handleSizeChange(e) { handleSizeChange(e){
this.msg.pageSize = e; this.msg.pageSize = e;
this.getList() this.getList()
}, },
handleCurrentChange(e) { handleCurrentChange(e){
this.msg.pageIndex = e; this.msg.pageIndex = e;
this.getList() this.getList()
}, },
...@@ -291,7 +410,7 @@ ...@@ -291,7 +410,7 @@
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
} else { }else{
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
...@@ -307,13 +426,13 @@ ...@@ -307,13 +426,13 @@
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.groupAudit(2, item.TCID) this.groupAudit(2,item.TCID)
}).catch(() => { }).catch(() => {
}); });
}, },
cancelOrderHandler() { cancelOrderHandler(){
if (!this.cancelRemark) return this.Error('请输入驳回缘由') if(!this.cancelRemark) return this.Error('请输入驳回缘由')
let that = this; let that = this;
that.$confirm('是否驳回该团?', '提示', { that.$confirm('是否驳回该团?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -321,7 +440,7 @@ ...@@ -321,7 +440,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
//掉接口 //掉接口
this.groupAudit(3, this.dataRow.TCID) this.groupAudit(3,this.dataRow.TCID)
}).catch(() => { }).catch(() => {
}); });
...@@ -337,30 +456,30 @@ ...@@ -337,30 +456,30 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
//掉接口 //掉接口
this.groupAudit(3, item.TCID) this.groupAudit(3,item.TCID)
}).catch(() => { }).catch(() => {
}); });
}, },
groupAudit(type, TCID, name, length) { groupAudit(type,TCID,name,length){
let msg = { let msg = {
TCID: TCID, TCID:TCID,
BranchAuditState: type, BranchAuditState:type,
BranchAuditRemark: this.cancelRemark BranchAuditRemark:this.cancelRemark
} }
this.loading = true this.loading = true
this.apipost("travel_post_AuditPriceOutBranchTeamType", { this.apipost("travel_post_AuditPriceOutBranchTeamType", {
TCID: TCID, TCID:TCID,
BranchAuditState: type, BranchAuditState:type,
BranchAuditRemark: this.cancelRemark BranchAuditRemark:this.cancelRemark
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if (!name) { if(!name){
this.cancelOrderDialog = false this.cancelOrderDialog = false
this.Success(res.data.message); this.Success(res.data.message);
this.getList() this.getList()
} else { }else{
if (length) { if(length){
this.cancelOrderDialog = false this.cancelOrderDialog = false
this.Success(res.data.message); this.Success(res.data.message);
this.getList() this.getList()
...@@ -371,10 +490,10 @@ ...@@ -371,10 +490,10 @@
} }
this.loading = false this.loading = false
}, },
err => {} err => { }
); );
}, },
goTeamBalance(id, OutBranchId) { //团队收支明细 goTeamBalance(id, OutBranchId) {//团队收支明细
this.$router.push({ this.$router.push({
name: "TeamBalancePayment", name: "TeamBalancePayment",
query: { query: {
...@@ -393,10 +512,10 @@ ...@@ -393,10 +512,10 @@
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
err => {} err => { }
); );
}, },
goTravel(TCID) { //跳转到团队列表 goTravel(TCID){//跳转到团队列表
this.$router.push({ this.$router.push({
path: 'TravelControlList', path: 'TravelControlList',
query: { query: {
...@@ -479,5 +598,4 @@ ...@@ -479,5 +598,4 @@
._icon_btn i.icon-mingxi { ._icon_btn i.icon-mingxi {
background-color: rgb(71, 191, 140) background-color: rgb(71, 191, 140)
} }
</style> </style>
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