Skip to content

S
SuperMan
Commit 50f44b34 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent 3a6fa487
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 16 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 50f44b34
...@@ -354,16 +354,16 @@ ...@@ -354,16 +354,16 @@
</td> </td>
<td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td> <td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td> <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
<td @click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)"> <span class="_jump_page _font_bold">团队收支</span> </td> <td v-if="qjGroupId==userInfo.RB_Group_id || TeamShouZhi" @click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)"> <span class="_jump_page _font_bold">团队收支</span> </td>
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('SettlementOrder',GetDetail.SourceID,2)"> <span class="_jump_page _font_bold">国内票务</span> </td> <td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('SettlementOrder',GetDetail.SourceID,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
<td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,3)"> <span class="_jump_page _font_bold">签证收支</span> </td> <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td> <td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56 <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
|| GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52 || GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52
|| GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58 || GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99 || GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58 || GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99
|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td> || GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<!-- <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td> --> <!-- <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td> -->
<td v-if="GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td> <td v-if="GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td>
<td v-if="GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 57 || GetDetail.TemplateId === 58" @click="jumpCheZiPage('BusApportionManagement',o.TCID)"> <span class="_jump_page _font_bold">车资分摊</span> </td> <td v-if="GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 57 || GetDetail.TemplateId === 58" @click="jumpCheZiPage('BusApportionManagement',o.TCID)"> <span class="_jump_page _font_bold">车资分摊</span> </td>
</tr> </tr>
</table> </table>
...@@ -1348,6 +1348,10 @@ import huijiBill from "./FinancialSubmodule/huijiBill.vue"; ...@@ -1348,6 +1348,10 @@ import huijiBill from "./FinancialSubmodule/huijiBill.vue";
export default { export default {
data(){ data(){
return{ return{
TeamShouZhi:false,
F_Disbursement_Schedule:false,
userInfo:{},
qjGroupId:-1,
otherTable: true, otherTable: true,
imageOptions:{ imageOptions:{
navbar:false, navbar:false,
...@@ -1517,6 +1521,21 @@ export default { ...@@ -1517,6 +1521,21 @@ export default {
}, },
methods:{ methods:{
GetAuth() {
var actionCode = this.$AuthCode.TeamShouZhi;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.TeamShouZhi = true;
}
});
var actionCodeNew = this.$AuthCode.F_Disbursement_Schedule;
this.CheckUserAuth(actionCodeNew, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.F_Disbursement_Schedule = true;
}
});
},
goPrintPageNew(type,id,Merge,OrderSource){ goPrintPageNew(type,id,Merge,OrderSource){
if(type===1){ if(type===1){
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
...@@ -2688,6 +2707,9 @@ export default { ...@@ -2688,6 +2707,9 @@ export default {
} }
},mounted(){ },mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.userInfo=this.getLocalStorage();
this.GetAuth();
this.qjGroupId=this.QjGroupId();
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
this.RB_Post_Id = userInfo.RB_Post_Id; this.RB_Post_Id = userInfo.RB_Post_Id;
this.ID = this.$route.query.id; this.ID = this.$route.query.id;
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 50f44b34
...@@ -420,15 +420,15 @@ ...@@ -420,15 +420,15 @@
</td> </td>
<td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td> <td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td> <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
<td @click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)"> <span class="_jump_page _font_bold">团队收支</span> </td> <td v-if="qjGroupId==userInfo.RB_Group_id || TeamShouZhi" @click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)"> <span class="_jump_page _font_bold">团队收支</span> </td>
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">国内票务</span> </td> <td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
<td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td> <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
<td v-else-if="OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td> <td v-else-if="OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
<td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56 <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
|| GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52 || GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52
|| GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58 || GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99 || GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58 || GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99
|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td> || GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
<td v-if="GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td> <td v-if="GetDetail.IsShowPlanUrl === 1 && (qjGroupId==userInfo.RB_Group_id || F_Disbursement_Schedule)" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td>
<td v-if="GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 57 || GetDetail.TemplateId === 58" @click="jumpCheZiPage('BusApportionManagement',o.TCID)"> <span class="_jump_page _font_bold">车资分摊</span> </td> <td v-if="GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 57 || GetDetail.TemplateId === 58" @click="jumpCheZiPage('BusApportionManagement',o.TCID)"> <span class="_jump_page _font_bold">车资分摊</span> </td>
</tr> </tr>
</table> </table>
...@@ -868,6 +868,10 @@ import czBillModule from "./FinancialSubmodule/czBillModule.vue"; ...@@ -868,6 +868,10 @@ import czBillModule from "./FinancialSubmodule/czBillModule.vue";
export default { export default {
data(){ data(){
return{ return{
TeamShouZhi:false,
F_Disbursement_Schedule:false,
userInfo:{},
qjGroupId:-1,
OPState:false, OPState:false,
LeadState:false, LeadState:false,
//驳回弹窗 //驳回弹窗
...@@ -968,7 +972,23 @@ export default { ...@@ -968,7 +972,23 @@ export default {
if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){ if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
this.huijiShow=true; this.huijiShow=true;
} }
},methods:{ },
methods:{
GetAuth() {
var actionCode = this.$AuthCode.TeamShouZhi;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.TeamShouZhi = true;
}
});
var actionCodeNew = this.$AuthCode.F_Disbursement_Schedule;
this.CheckUserAuth(actionCodeNew, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.F_Disbursement_Schedule = true;
}
});
},
goHand(type,GetDetail){ goHand(type,GetDetail){
if(type==1){ if(type==1){
this.$router.push({ this.$router.push({
...@@ -1550,6 +1570,9 @@ export default { ...@@ -1550,6 +1570,9 @@ export default {
// document.onkeydown = this.KeyDown // document.onkeydown = this.KeyDown
// document.onkeyup = this.KeyUp // document.onkeyup = this.KeyUp
// document.oncontextmenu = function(){return false;} // document.oncontextmenu = function(){return false;}
this.GetAuth();
this.userInfo = this.getLocalStorage();
this.qjGroupId=this.QjGroupId();
this.Financial_post_GetDetail(this.ID) this.Financial_post_GetDetail(this.ID)
this.queryMsg.FinanceId = this.$route.query.id; this.queryMsg.FinanceId = this.$route.query.id;
if(this.$route.query.Conditon){ if(this.$route.query.Conditon){
......
src/components/FinancialModule/TransferReport.vue
View file @ 50f44b34
...@@ -169,11 +169,11 @@ ...@@ -169,11 +169,11 @@
methods: { methods: {
goUrl: function(obj) { goUrl: function(obj) {
let name = ''; let name = '';
if (obj.TypeId === 12) { // 平台 if (obj.TradeWay === 2) { // 平台
name = 'PlatformAccDetail' name = 'PlatformAccDetail'
} else if (obj.TypeId === 3 || obj.TypeId === 4 || obj.TypeId === 13) { // 银行 } else if (obj.TradeWay === 1) { // 银行
name = 'CompanyAccDetail' name = 'CompanyAccDetail'
} else { //资金池 } else if (obj.TradeWay === 3) { //资金池
name = 'PoolAccDetail' name = 'PoolAccDetail'
} }
this.$router.push({ this.$router.push({
......
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ 50f44b34
...@@ -911,7 +911,11 @@ export default { ...@@ -911,7 +911,11 @@ export default {
},err=>{}) },err=>{})
}, },
getCompanyList(){ //获取公司列表 getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ let userInfo=this.getLocalStorage();
let msg={
RB_Group_Id:userInfo.RB_Group_id
};
this.apipost('admin_get_BranchGetList',msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.CompanyList=res.data.data; this.CompanyList=res.data.data;
}else{} }else{}
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 50f44b34
...@@ -1043,7 +1043,11 @@ export default { ...@@ -1043,7 +1043,11 @@ export default {
},err=>{}) },err=>{})
}, },
getCompanyList(){ //获取公司列表 getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ let userInfo=this.getLocalStorage();
let msg={
RB_Group_Id:userInfo.RB_Group_id
};
this.apipost('admin_get_BranchGetList',msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.CompanyList=res.data.data; this.CompanyList=res.data.data;
}else{} }else{}
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 50f44b34
...@@ -912,7 +912,11 @@ export default { ...@@ -912,7 +912,11 @@ export default {
},err=>{}) },err=>{})
}, },
getCompanyList(){ //获取公司列表 getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ let userInfo=this.getLocalStorage();
let msg={
RB_Group_Id:userInfo.RB_Group_id
};
this.apipost('admin_get_BranchGetList',msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.CompanyList=res.data.data; this.CompanyList=res.data.data;
}else{} }else{}
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 50f44b34
...@@ -1007,7 +1007,12 @@ export default { ...@@ -1007,7 +1007,12 @@ export default {
},err=>{}) },err=>{})
}, },
getCompanyList(){ //获取公司列表 getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
let userInfo=this.getLocalStorage();
let msg={
RB_Group_Id:userInfo.RB_Group_id
};
this.apipost('admin_get_BranchGetList',msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.CompanyList=res.data.data; this.CompanyList=res.data.data;
}else{} }else{}
......
src/components/SalesModule/addPassenger.vue
View file @ 50f44b34
...@@ -1632,7 +1632,8 @@ ...@@ -1632,7 +1632,8 @@
//获取经济能力 //获取经济能力
this.apipost( this.apipost(
"dict_post_GetList", { "dict_post_GetList", {
Key: "SK_Visa_EconomicCapability" Key: "SK_Visa_EconomicCapability",
IsTimer:1
}, },
res => { res => {
this.EconomicCapabilityS = res.data.data; this.EconomicCapabilityS = res.data.data;
...@@ -1958,6 +1959,7 @@ ...@@ -1958,6 +1959,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.roomlist = res.data.data; this.roomlist = res.data.data;
console.log(" this.roomlist", this.roomlist)
if (this.roomlist.length < 1) { if (this.roomlist.length < 1) {
this.UpdateOrderHouseBtn = true this.UpdateOrderHouseBtn = true
} }
......
src/components/SalesModule/groupInquiry.vue
View file @ 50f44b34
...@@ -1106,7 +1106,17 @@ export default { ...@@ -1106,7 +1106,17 @@ export default {
}, },
//获取线路列表 //获取线路列表
getLineList() { getLineList() {
this.apipost("line_post_GetAllList", {IsVisaSelect: 1}, res => { let userInfo = this.getLocalStorage();
let num=1;
if(userInfo.RB_Group_id==2){
num=1
}else{
num=0;
}
let msg={
IsVisaSelect:num
};
this.apipost("line_post_GetAllList", msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data; this.queryCommonData.LineList = res.data.data;
} }
......
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