Commit 62df3b47 authored by youjie's avatar youjie

no message

parent e7cb4d8e
...@@ -386,12 +386,18 @@ ...@@ -386,12 +386,18 @@
if(x.Type==1){ if(x.Type==1){
this.collectList.push(x); this.collectList.push(x);
}else if (x.Type==2){ }else if (x.Type==2){
// noTypeCost 不是leaderReimbursement制单排除流程 // 不是团队收支界面制单排除流程 排除签证流程
if(this.$route.query.noTypeCost){ if(this.$route.query.noTypeCost||this.$route.query.isVisa){
if(x.Id!=94&&x.Id!=95&&x.Id!=96&&x.Id!=97&&x.Id!=51&&x.Id!=52&&x.Id!=54&& if(x.Id!=94&&x.Id!=95&&x.Id!=96&&x.Id!=97&&x.Id!=51&&x.Id!=52&&x.Id!=54&&
x.Id!=55&&x.Id!=49&&x.Id!=50&&x.Id!=57&&x.Id!=58&&x.Id!=88&&x.Id!=89){ x.Id!=55&&x.Id!=49&&x.Id!=50&&x.Id!=57&&x.Id!=58&&x.Id!=88&&x.Id!=89){
this.payList.push(x); if(this.$route.query.isVisa){//屏蔽签证
} if(x.Name.indexOf('签证')==-1){
this.payList.push(x);
}
}else{
this.payList.push(x);
}
}
}else{ }else{
this.payList.push(x); this.payList.push(x);
} }
......
...@@ -1608,6 +1608,12 @@ export default { ...@@ -1608,6 +1608,12 @@ export default {
} else { } else {
this.queryCommonData.IsParentCompany = userInfo.IsParentCompany; this.queryCommonData.IsParentCompany = userInfo.IsParentCompany;
} }
let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf("isSuperManagement") != -1) {
this.queryCommonData.IsParentCompany = 1;
}
if (this.$route.query.hasOwnProperty("cache")) { if (this.$route.query.hasOwnProperty("cache")) {
if (this.$store.state.pageCondition != null) { if (this.$store.state.pageCondition != null) {
this.queryMsg = this.$store.state.pageCondition; this.queryMsg = this.$store.state.pageCondition;
......
...@@ -731,7 +731,7 @@ ...@@ -731,7 +731,7 @@
<div class="TB_comtitle TB-Title">成本</div> <div class="TB_comtitle TB-Title">成本</div>
<template v-if="IsHaveAuth"> <template v-if="IsHaveAuth">
<input type="button" value="团队折让" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" /> <input type="button" value="团队折让" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" />
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" /> <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail(3)" />
</template> </template>
</div> </div>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
...@@ -2397,7 +2397,7 @@ ...@@ -2397,7 +2397,7 @@
}); });
}, },
//支出跳转 //支出跳转
AddOutDetail() { AddOutDetail(visaType) {
var TCArr = [this.TCID]; var TCArr = [this.TCID];
let orderObj = { let orderObj = {
OrderID: 0, OrderID: 0,
...@@ -2412,6 +2412,7 @@ ...@@ -2412,6 +2412,7 @@
Type: 2, Type: 2,
companyID: this.OutBranchId, companyID: this.OutBranchId,
noTypeCost: true, noTypeCost: true,
isVisa: visaType==3? true: false,//屏蔽签证相关流程
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj) 'orderObj': JSON.stringify(orderObj)
} }
......
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