Commit 5517e65d authored by 黄奎's avatar 黄奎

页面修改

parent 229832c3
...@@ -4,34 +4,27 @@ ...@@ -4,34 +4,27 @@
<ul> <ul>
<li> <li>
<em>出团公司</em> <em>出团公司</em>
<el-select filterable v-model='msg.OutBranchId' size="small" <el-select filterable v-model='msg.OutBranchId' size="small" @change='getControlList()' clearable>
@change='getControlList()'>
<el-option label="不限" :value="-1" :key="-1"></el-option> <el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></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()"> @change="getControlList()" clearable>
<el-option v-for="item in groupType" :label="item.Name" :value="item.Id" <el-option v-for="item in groupType" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
: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')" size="small" <el-select class="w200" v-model="msg.BranchAuditState" filterable :placeholder="$t('pub.pleaseImport')"
@change="getControlList()"> size="small" @change="getControlList()" clearable>
<el-option v-for="item in BranchAuditStateType" :label="item.Name" :value="item.Id" <el-option v-for="item in BranchAuditStateType" :label="item.Name" :value="item.Id" :key="item.Id">
:key="item.Id"></el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -39,7 +32,8 @@ ...@@ -39,7 +32,8 @@
<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.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input> @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')" clearable
@clear="getControlList"></el-input>
</span> </span>
</li> </li>
<li v-if="false"> <li v-if="false">
...@@ -53,23 +47,14 @@ ...@@ -53,23 +47,14 @@
<li> <li>
<span> <span>
<em>时间</em> <em>时间</em>
<el-date-picker <el-date-picker style="width: 300px;" v-model="StartTime" format='yyyy-MM-dd' value-format="yyyy-MM-dd"
style="width: 300px;" size="small" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
v-model="StartTime" @change="getStartTime" clearable>
format='yyyy-MM-dd'
value-format="yyyy-MM-dd"
size="small"
type="datetimerange"
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" <button class="hollowFixedBtn" type="button" @click="getControlList">{{$t('pub.searchBtn')}}</button>
@click="getControlList">{{$t('pub.searchBtn')}}</button>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -89,134 +74,82 @@ ...@@ -89,134 +74,82 @@
</li> </li>
</ul> </ul>
<el-table <el-table v-loading="loading" ref="multipleTable" :data="dataList" tooltip-effect="dark" style="width: 100%"
v-loading="loading" @selection-change="handleSelectionChange">
ref="multipleTable" <el-table-column label="团队编号" width="200">
: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 <el-table-column prop="StartDate" label="出发日期" width="120" show-overflow-tooltip></el-table-column>
prop="LtName" <el-table-column prop="LtName" label="系列" width="200" show-overflow-tooltip>
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 <el-table-column prop="Title" label="团名" width="200" show-overflow-tooltip></el-table-column>
prop="Title" <el-table-column prop="" label="申请人/申请日期" width="200">
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 <el-table-column prop="OPName" label="申请原因" show-overflow-tooltip>
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 <el-table-column prop="PriceTeamTypeName" label="团队类型" width="130">
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 <el-table-column prop="OldBranchName" label="原出团公司" width="130"></el-table-column>
prop="OldBranchName" <el-table-column prop="NewBranchName" label="新出团公司" width="130"></el-table-column>
label="原出团公司" width="130"></el-table-column> <el-table-column prop="" label="审核状态" width="100">
<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">
{{scope.row.BranchAuditStateStr}} <template v-if="scope.row.BranchAuditState==1">
<span style="=color:blue;">{{scope.row.BranchAuditStateStr}}</span>
</template>
<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 <el-table-column prop="" label="操作" width="150">
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" <el-tooltip class="item" effect="dark" content="审核" placement="top" v-if="scope.row.BranchAuditState==1">
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 <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
@size-change="handleSizeChange" :current-page.sync="msg.pageIndex" layout="sizes,total,prev, pager, next, jumper"
@current-change="handleCurrentChange" :page-sizes="[5, 10, 20, 30,50,100]" :page-size="msg.pageSize" :total="total">
: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 <el-dialog custom-class="w600" title="驳回缘由" :visible.sync="cancelOrderDialog">
custom-class="w600"
title="驳回缘由"
:visible.sync="cancelOrderDialog"
>
<div style="padding-bottom:20px"> <div style="padding-bottom:20px">
<el-input <el-input type="textarea" autofocus rows="5" placeholder="请填写驳回该团的缘由" clear="w300" v-model="cancelRemark">
type="textarea" </el-input>
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 <el-button class="normalBtn" value="" @click="cancelOrderHandler" :loading="loading">确定驳回</el-button>
class="normalBtn" <el-button class="hollowFixedBtn" @click="cancelOrderDialog = false,cancelRemark=''">关闭</el-button>
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>
...@@ -225,27 +158,48 @@ ...@@ -225,27 +158,48 @@
</template> </template>
<script> <script>
export default { export default {
components: { components: {
}, },
data() { data() {
return { return {
StartTime:[], StartTime: [],
groupType:[ groupType: [{
{Name:'不限',Id:-1}, Name: '不限',
{Name:'小包团',Id:1}, Id: -1
{Name:'当地游',Id:2}, },
{Name:'常规团',Id:0} {
Name: '小包团',
Id: 1
},
{
Name: '当地游',
Id: 2
},
{
Name: '常规团',
Id: 0
}
], ],
BranchAuditStateType:[ BranchAuditStateType: [{
{Name:'不限',Id:-1}, Name: '不限',
{Name:'待审核',Id:1}, 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,
...@@ -255,16 +209,16 @@ ...@@ -255,16 +209,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: {
...@@ -272,24 +226,24 @@ ...@@ -272,24 +226,24 @@
ConfigId: '', ConfigId: '',
OfferId: '' OfferId: ''
}, },
getCompanyMsg:{ getCompanyMsg: {
RB_Group_Id:'0', RB_Group_Id: '0',
Status:'0', Status: '0',
}, },
} }
}, },
created() { created() {
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()
...@@ -299,26 +253,26 @@ ...@@ -299,26 +253,26 @@
}, },
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 = ''
} }
}, },
// 销售预期提成 // 销售预期提成
goAnticipate(row,type){ goAnticipate(row, type) {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let name let name
if(type==1){//国内 if (type == 1) { //国内
name = 'domesticCommissiondetails' name = 'domesticCommissiondetails'
}else if(type==2){//单项 } else if (type == 2) { //单项
name = 'ServiceCommissiondetails' name = 'ServiceCommissiondetails'
}else if(type==3){//台湾 } else if (type == 3) { //台湾
name = 'domesticCommissiondetailsTW' name = 'domesticCommissiondetailsTW'
}else if(type==4){//同业 } else if (type == 4) { //同业
name = 'TradeTicketDetails' name = 'TradeTicketDetails'
} }
this.$router.push({ this.$router.push({
...@@ -330,12 +284,12 @@ ...@@ -330,12 +284,12 @@
} }
}); });
}, },
getCompany(){ getCompany() {
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.companyList=res.data.data; this.companyList = res.data.data;
}else{} } else {}
},err=>{}) }, err => {})
}, },
showDialog(ConfigId, OfferId) { showDialog(ConfigId, OfferId) {
this.dialog = { this.dialog = {
...@@ -348,15 +302,17 @@ ...@@ -348,15 +302,17 @@
}) })
}, },
selectable(row, index) { selectable(row, index) {
if(this.active==1){ if (this.active == 1) {
return true return true
}else{ } else {
return false return false
} }
}, },
setAudit(type){ setAudit(type) {
let ids = this.multipleSelection.map(x=>{ return x.TCID}) let ids = this.multipleSelection.map(x => {
if(ids.length==0){ return x.TCID
})
if (ids.length == 0) {
return this.$message.error('请勾选需要批量审核的数据'); return this.$message.error('请勾选需要批量审核的数据');
} }
let that = this; let that = this;
...@@ -365,10 +321,10 @@ ...@@ -365,10 +321,10 @@
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
for(let i=0;i<ids.length;i++){ for (let i = 0; i < ids.length; i++) {
setTimeout(()=>{ setTimeout(() => {
this.groupAudit(2,ids[i],'multiple',(i+1)==ids.length?ids.length:0) this.groupAudit(2, ids[i], 'multiple', (i + 1) == ids.length ? ids.length : 0)
},500) }, 500)
} }
}).catch(() => { }).catch(() => {
...@@ -381,11 +337,11 @@ ...@@ -381,11 +337,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()
}, },
...@@ -401,7 +357,7 @@ ...@@ -401,7 +357,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);
} }
}, },
...@@ -417,13 +373,13 @@ ...@@ -417,13 +373,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: '确定',
...@@ -431,7 +387,7 @@ ...@@ -431,7 +387,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
//掉接口 //掉接口
this.groupAudit(3,this.dataRow.TCID) this.groupAudit(3, this.dataRow.TCID)
}).catch(() => { }).catch(() => {
}); });
...@@ -447,30 +403,30 @@ ...@@ -447,30 +403,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()
...@@ -481,10 +437,10 @@ ...@@ -481,10 +437,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: {
...@@ -503,10 +459,10 @@ ...@@ -503,10 +459,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: {
...@@ -589,4 +545,5 @@ ...@@ -589,4 +545,5 @@
._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