Skip to content

S
SuperMan
Commit 7376c3b6 authored by youjie's avatar youjie
Browse files
Options

no message

parent 3a4016ee
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 19 deletions
src/components/FinancialModule/domesticCommissiondetails.vue
View file @ 7376c3b6
...@@ -196,6 +196,7 @@ ...@@ -196,6 +196,7 @@
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode; let ActionMenuCode = userInfo.ActionMenuCode;
this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:''
if (this.$route.query) { //不大于0的话用默认值 if (this.$route.query) { //不大于0的话用默认值
if (this.$route.query.PeriodId && this.$route.query.PeriodId > 0) { if (this.$route.query.PeriodId && this.$route.query.PeriodId > 0) {
this.msg.PeriodId = Number(this.$route.query.PeriodId) this.msg.PeriodId = Number(this.$route.query.PeriodId)
......
src/components/FinancialModule/domesticCommissiondetailsTW2.vue
View file @ 7376c3b6
...@@ -205,6 +205,7 @@ ...@@ -205,6 +205,7 @@
} }
}, },
mounted() { mounted() {
this.msg.TCNUM = this.$route.query.TCNUM?this.$route.query.TCNUM:''
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode; let ActionMenuCode = userInfo.ActionMenuCode;
if (this.$route.query) { //不大于0的话用默认值 if (this.$route.query) { //不大于0的话用默认值
......
src/components/FinancialModule/groupApproval.vue
View file @ 7376c3b6
...@@ -2,12 +2,25 @@ ...@@ -2,12 +2,25 @@
<div class="groupApproval"> <div class="groupApproval">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li>
<em>出团公司</em>
<el-select filterable v-model='msg.OutBranchId'
@change='getControlList()'>
<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-select>
</li>
<li> <li>
<span> <span>
<em>团类型</em> <em>团类型</em>
<el-select class="w200" v-model="msg.PriceTeamType" filterable :placeholder="$t('pub.pleaseImport')" <el-select class="w200" v-model="msg.PriceTeamType" filterable :placeholder="$t('pub.pleaseImport')"
@change="getControlList()"> @change="getControlList()">
<el-option label="不限" value="0"> <el-option label="不限" value="-1">
</el-option> </el-option>
<el-option v-for="item in TeamListArr" :label="item.Name" :value="item.Id" <el-option v-for="item in TeamListArr" :label="item.Name" :value="item.Id"
:key="item.Id"></el-option> :key="item.Id"></el-option>
...@@ -68,13 +81,13 @@ ...@@ -68,13 +81,13 @@
width="170"> width="170">
<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="LtName" prop="LtName"
label="系列" label="系列"
width="80" width="80"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -94,7 +107,8 @@ ...@@ -94,7 +107,8 @@
prop="PriceTeamTypeName" prop="PriceTeamTypeName"
label="团队类型"> label="团队类型">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.TeamTypeName">{{scope.row.TeamTypeName}}/</template>{{scope.row.PriceTeamTypeName}} <template v-if="scope.row.TeamTypeName">{{scope.row.TeamTypeName}}/</template>
{{scope.row.PriceTeamTypeName}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -122,15 +136,20 @@ ...@@ -122,15 +136,20 @@
prop="SaleCommission" prop="SaleCommission"
label="预计销售提成" width="130px"> label="预计销售提成" width="130px">
<template slot-scope="scope"> <template slot-scope="scope">
<span
:style="{'cursor':scope.row.SaleCommissionType>0?'pointer':'',
'color': scope.row.SaleCommissionType>0?'#33B3FF':''}"
@click="scope.row.SaleCommissionType>0?goAnticipate(scope.row,scope.row.SaleCommissionType):''">
{{scope.row.SaleCommission}} {{scope.row.SaleCommission}}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="Config_OfferId" prop="Config_OfferId"
label="报价详情"> label="报价详情">
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.ConfigID>0&&scope.row.Config_OfferId>0" <p v-if="scope.row.ConfigID>0&&scope.row.Config_OfferId>0"
style="cursor: pointer;text-decoration: underline;color: #33B3FF;font-size: 12px;" style="cursor: pointer;text-decoration: underline;color: #33B3FF;font-size: 12px;"
@click="showDialog(scope.row.ConfigID, scope.row.Config_OfferId)">报价详情</p> @click="showDialog(scope.row.ConfigID, scope.row.Config_OfferId)">报价详情</p>
</template> </template>
</el-table-column> </el-table-column>
...@@ -173,11 +192,11 @@ ...@@ -173,11 +192,11 @@
</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" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="msg.pageIndex" :current-page.sync="msg.pageIndex"
layout="sizes,total,prev, pager, next, jumper" layout="sizes,total,prev, pager, next, jumper"
:page-sizes="[5, 10, 20, 30,50,100]" :page-sizes="[5, 10, 20, 30,50,100]"
:page-size="msg.pageSize" :total="total"> :page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
...@@ -226,6 +245,7 @@ ...@@ -226,6 +245,7 @@
export default { export default {
data() { data() {
return { return {
companyList:[],
cancelRemark: '', cancelRemark: '',
dataRow: null, dataRow: null,
cancelOrderDialog: false, cancelOrderDialog: false,
...@@ -238,8 +258,9 @@ ...@@ -238,8 +258,9 @@
PriceTeamType: "0", PriceTeamType: "0",
TCNUM: '',//团号 TCNUM: '',//团号
TCID: '', TCID: '',
OutBranchId: -1,
OutGroupAuditState: 1, OutGroupAuditState: 1,
OutGroupAuditEmpId: 0,//当前登录用户id ， 如果有查询所有的权限 则=0 OutGroupAuditEmpId: 0,//当前登录用户id ， 如果有查询所有的权限 则=0
}, },
TeamListArr:[], TeamListArr:[],
total:0, total:0,
...@@ -251,14 +272,19 @@ ...@@ -251,14 +272,19 @@
ConfigId: '', ConfigId: '',
OfferId: '' OfferId: ''
}, },
getCompanyMsg:{
RB_Group_Id:'0',
Status:'0',
},
} }
}, },
components: { components: {
priceDialog priceDialog
}, },
created() { created() {
this.getTeamList() this.getTeamList()
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
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){//如果有权限 可以查看所有 如果没有只能看自己审核的
...@@ -269,12 +295,42 @@ ...@@ -269,12 +295,42 @@
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()
}, },
mounted() { mounted() {
this.getList() this.getList()
}, },
methods: { methods: {
// 销售预期提成
goAnticipate(row,type){
let userInfo = this.getLocalStorage();
let name
if(type==1){//国内
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 = {
show: true, show: true,
...@@ -346,7 +402,7 @@ ...@@ -346,7 +402,7 @@
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
err => { err => {
} }
); );
...@@ -394,7 +450,7 @@ ...@@ -394,7 +450,7 @@
}); });
}, },
groupAudit(type,TCID,name,length){ groupAudit(type,TCID,name,length){
this.apipost("travel_post_SetOutGroupAuditInfo", { this.apipost("travel_post_SetOutGroupAuditInfo", {
TCID:TCID, TCID:TCID,
OutGroupAuditState:type, OutGroupAuditState:type,
...@@ -403,18 +459,18 @@ ...@@ -403,18 +459,18 @@
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()
} }
} }
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
err => { } err => { }
); );
...@@ -524,4 +580,4 @@ ...@@ -524,4 +580,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>
\ No newline at end of file
src/components/SalesModule/MyCustomer.vue
View file @ 7376c3b6
...@@ -395,7 +395,7 @@ ...@@ -395,7 +395,7 @@
</style> </style>
<template> <template>
<div class="page_MyCustomer MyCustomerDiv"> <div class="page_MyCustomer MyCustomerDiv">
<div class="page_MyCustomerSearch"> <div class="page_MyCustomerSearch" v-if="type!=5">
<li> <li>
<span> <span>
<em>{{$t('salesModule.keyWords')}}：</em> <em>{{$t('salesModule.keyWords')}}：</em>
......
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