Skip to content

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

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

parents 3a7e5e21 7f689b9d
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 28 deletions
src/App.vue
View file @ e67eb18d
......@@ -228,7 +228,8 @@
</script>
<style>
@import "//at.alicdn.com/t/c/font_2077629_fcjjwy7e29k.css";
/* viitto */
@import "//at.alicdn.com/t/c/font_635492_z2m4iopdl1a.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
/* @import "./assets/css/fileIcon.css"; */
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ e67eb18d
......@@ -388,7 +388,7 @@
<p class="rb_tit">{{BillName}}
(<el-select filterable v-model='msg.RB_Branch_Id' ref='CostTypeId'
@change="admin_get_DepartmentGetList(msg.RB_Branch_Id)" class="w120 _border_b_1"
:disabled="(orderObj&&orderObj.Rate)||(orderObj&&orderObj.isRB_Branch_Id)?true:false">
:disabled="(orderObj&&orderObj.Rate)||(orderObj&&orderObj.isRB_Branch_Id)||(crmOrderObj&&crmOrderObj.isRB_Branch_Id)?true:false">
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'
:disabled="item.disabled">
</el-option>
......@@ -748,7 +748,7 @@
</el-select>
</span>
</p>
<p v-if="StoredCustomerList&&StoredCustomerList.length" style="margin-left: 15px;">{{$t('objFill.yushoudiyong')}}：<span>
......@@ -767,7 +767,7 @@
<el-checkbox v-model="KingdeeClientIDCheck" @change="changeKingdeeClientID" :style="{'margin-top':KingdeeClientIDCheck?'0px':'6px'}">垫付对象</el-checkbox>
</el-tooltip>
<template v-if="KingdeeClientIDCheck">
<el-select
<el-select
v-model="msg.KingdeeClientID" class="w135 _border_b_1"
filterable
remote
......@@ -787,7 +787,7 @@
</span>
</div>
</el-option>
</el-select></template>
</span>
</p>
......@@ -811,7 +811,7 @@
</div>
<!-- <p v-if="GetDetail.OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,4)" class="_jump_page _font_bold">机票收支</p> -->
</template>
<template v-if="isHandFee">
<template v-if="isHandFee">
<el-tooltip :content="$t('objFill.peizhishoupeifei')" placement="top">
<el-switch v-model="is_HandFee" @change="getHandFee" >
</el-switch>
......@@ -926,7 +926,7 @@
<div>
<div v-if="IsUploadPic===1">
<p>{{$t('fnc.scfujian')}}<span class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</span></p>
<div class="_addUpload_box clearfix">
<template v-for="(file,fIndex) in saveMsg">
<div v-if="file.Type==3">
......@@ -961,7 +961,7 @@
<div v-if="$route.query.Type==2||msg.Type==2">
<p>{{$t('objFill.shangchuanfapiaofj')}}<span class="_addUpload_tips">{{$t('tips.wjdxbncgsz')}}</span><span class="_addUpload_tips" style="color:red;">{{$t('objFill.fapiaofujiants')}}</span></p>
<div class="_addUpload_box clearfix">
<template v-for="(file,fIndex) in saveMsgInvoice">
<div v-if="file.Type==3">
......@@ -2446,9 +2446,10 @@
if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
} else if (this.orderObj && (this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null &&
this.orderObj.RB_Branch_Id != undefined)) {
this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
} else if ((this.orderObj && (this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null &&
this.orderObj.RB_Branch_Id != undefined))||(this.crmOrderObj && (this.crmOrderObj.RB_Branch_Id != '' && this.crmOrderObj.RB_Branch_Id != null &&
this.crmOrderObj.RB_Branch_Id != undefined))) {
this.msg.RB_Branch_Id = this.orderObj&&this.orderObj.RB_Branch_Id>=0?this.orderObj.RB_Branch_Id:this.crmOrderObj.RB_Branch_Id
} else if (this.$route.query.companyID) {
this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
}
......@@ -2730,15 +2731,16 @@
if (x.Id == y) {
x.disabled = false;
if (num < 1 && !this.$route.query.edit) {
if (this.orderObj && this.orderObj.RB_Branch_Id) {
this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
} else {
if ((this.orderObj && this.orderObj.RB_Branch_Id)||(this.crmOrderObj && this.crmOrderObj.RB_Branch_Id)) {
this.msg.RB_Branch_Id = this.orderObj&&this.orderObj.RB_Branch_Id>=0?this.orderObj.RB_Branch_Id:this.crmOrderObj.RB_Branch_Id
}else {
this.msg.RB_Branch_Id = x.Id
}
}
if (Id === x.Id && !this.$route.query.edit) {
if (this.orderObj && this.orderObj.RB_Branch_Id) {
this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
if ((this.orderObj && this.orderObj.RB_Branch_Id)||(this.crmOrderObj && this.crmOrderObj.RB_Branch_Id)) {
this.msg.RB_Branch_Id = this.orderObj&&this.orderObj.RB_Branch_Id>=0?this.orderObj.RB_Branch_Id:this.crmOrderObj.RB_Branch_Id
} else {
this.msg.RB_Branch_Id = x.Id
}
......@@ -2871,6 +2873,7 @@
// crm自动登陆传过来的参数
if (this.$route.query.crmOrderObj) {
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj);
if(this.crmOrderObj.id>=0)this.msg.TemplateId = this.crmOrderObj.id;
} else if (this.$route.query.commissionObj) { //印象提成参数
this.commissionObj = JSON.parse(this.$route.query.commissionObj);
} else if (this.$route.query.tradeObj) { //同业参数
......@@ -2950,9 +2953,10 @@
this.msg.HelpBranchId=1218;
}
if (this.orderObj && this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null && this.orderObj
.RB_Branch_Id != undefined) {
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id;
if ((this.orderObj && this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null && this.orderObj
.RB_Branch_Id != undefined)||(this.crmOrderObj && this.crmOrderObj.RB_Branch_Id != '' && this.crmOrderObj.RB_Branch_Id != null && this.crmOrderObj
.RB_Branch_Id != undefined)) {
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = this.orderObj&&this.orderObj.RB_Branch_Id>=0?this.orderObj.RB_Branch_Id:this.crmOrderObj.RB_Branch_Id;
} else {
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
}
......@@ -2980,15 +2984,15 @@
this.czmsgState = true;
}
}
this.msg.TemplateId = this.$route.query.id;
if (this.$route.query.id == 90 || this.$route.query.id == 91) {
if(this.$route.query.id>=0)this.msg.TemplateId = this.$route.query.id;
if (this.msg.TemplateId == 90 || this.msg.TemplateId == 91) {
this.msg.IsPublic = 10;
}
this.Financial_post_GetCostTypeList(this.$route.query.id);
this.Financial_post_GetCostTypeList(this.msg.TemplateId);
this.BillName = userInfo.GroupName;
this.BillSonName = this.$route.query.Name;
this.FinancialFlowTemplate_post_GetProcessList(this.$route.query.id);
this.Financial_post_Get(0, parseInt(this.$route.query.id));
this.FinancialFlowTemplate_post_GetProcessList(this.msg.TemplateId);
this.Financial_post_Get(0, parseInt(this.msg.TemplateId));
}
if (this.$route.query.Conditon) {
this.returnCode = this.$route.query.Conditon;
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ e67eb18d
......@@ -456,7 +456,7 @@
style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">{{item.PriceTeamTypeName}}</label>
</div>
<div class="TCL-OutBranchName" title="销售公司">
{{item.UnionBranchName}}
{{item.UnionBranchName}} &nbsp; <span v-if="item.BZStatus" :style="{'background-color':item.BZStatus==1?'#ff99cc':item.BZStatus==2?'#bcd6ee':'#00c6ff','color':'#000000','margin-top':'3px'}">{{(item.BZStatus==1?'未报账':item.BZStatus==2?'已报账':'报账中')}}</span>
</div>
<div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
<div class="d12" style="float:none;margin:3px auto;">
......@@ -2086,6 +2086,7 @@
this.queryMsg.noData = !this.queryMsg.total > 0;
if (!this.isCommissionDetails) return
this.getDetailsOfRoyalty()
this.getTravelAccountStatus()
}
},
err => {}
......@@ -2116,6 +2117,31 @@
}
)
},
getTravelAccountStatus(){
let Ids = this.queryCommonData.dataList.map(x => {
return x.TCID
})
let msg = [...new Set(Ids)]
this.apipost(
"Financial_post_GetTravelAccountStatus", {
TCIDStr: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let RoyaltyList = []
RoyaltyList = res.data.data
this.queryCommonData.dataList.forEach(x => {
RoyaltyList.forEach(y => {
if (x.TCID == y.TCID) {
x.BZStatus = y.State
}
})
})
this.$forceUpdate()
}
}
)
},
//验证大小
checkTeamNum(queryMsg) {
var TeamMinNum = parseInt(queryMsg.TeamMinNum);
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ e67eb18d
......@@ -380,7 +380,9 @@
{{item.PriceTeamTypeName&&item.PriceTeamTypeName=='单地接'?item.PriceTeamTypeName:'单团'}}
</label>
</div>
<div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">{{item.UnionBranchName}}</div>
<div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">
{{item.UnionBranchName}} &nbsp; <span v-if="item.BZStatus" :style="{'background-color':item.BZStatus==1?'#ff99cc':item.BZStatus==2?'#bcd6ee':'#00c6ff','color':'#000000','margin-top':'3px'}">{{(item.BZStatus==1?'未报账':item.BZStatus==2?'已报账':'报账中')}}</span>
</div>
<div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
<div class="d12" style="float:none;margin:3px auto;">
<p>
......@@ -1539,6 +1541,7 @@
this.queryMsg.noData = !this.queryMsg.total > 0;
if (!this.isCommissionDetails) return
this.getDetailsOfRoyalty()
this.getTravelAccountStatus()
}
},
err => {}
......@@ -1569,6 +1572,31 @@
}
)
},
getTravelAccountStatus(){
let Ids = this.queryCommonData.dataList.map(x => {
return x.TCID
})
let msg = [...new Set(Ids)]
this.apipost(
"Financial_post_GetTravelAccountStatus", {
TCIDStr: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let RoyaltyList = []
RoyaltyList = res.data.data
this.queryCommonData.dataList.forEach(x => {
RoyaltyList.forEach(y => {
if (x.TCID == y.TCID) {
x.BZStatus = y.State
}
})
})
this.$forceUpdate()
}
}
)
},
//验证大小
checkTeamNum(queryMsg) {
var TeamMinNum = parseInt(queryMsg.TeamMinNum);
......
src/components/sale/sale.vue
View file @ e67eb18d
......@@ -81,7 +81,7 @@
<div style="width: 20px;height: auto; position: absolute;right: -30px;top: 15px; cursor: pointer;color: #232323;"
@click.stop="isView=!isView">
<el-icon class="iconfont"
:class="[isView?'icon-view':'icon-yincang']"
:class="[isView?'icon-chakan':'icon-yincang']"
></el-icon>
</div>
</p>
......
src/components/temp/operation.vue
View file @ e67eb18d
......@@ -286,7 +286,7 @@
<div style="width: 20px;height: auto; position: absolute;right: -30px;top: 15px; cursor: pointer;color: #232323;"
@click.stop="isView=!isView">
<el-icon class="iconfont"
:class="[isView?'icon-view':'icon-yincang']"
:class="[isView?'icon-chakan':'icon-yincang']"
></el-icon>
</div>
</p>
......
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