Skip to content

S
SuperMan
Commit 4c88999a authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 7df0861c fb4a3597
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 38 deletions
src/App.vue
View file @ 4c88999a
......@@ -228,7 +228,7 @@
</script>
<style>
@import "//at.alicdn.com/t/c/font_635492_z2m4iopdl1a.css";
@import "//at.alicdn.com/t/c/font_2077629_fcjjwy7e29k.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
/* @import "./assets/css/fileIcon.css"; */
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 4c88999a
......@@ -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/dmc/manager/GroundSupplier/index.vue
View file @ 4c88999a
......@@ -558,7 +558,7 @@
this.currentPage = 1;
this.getPageList()
},
handleCurrentChanges(){
handleCurrentChanges(val){
this.msg.pageIndex = val;
this.getPageList()
},
......
src/components/sale/sale.vue
View file @ 4c88999a
<style lang="less" scoped>
@import "../../assets/css/main.less";
@import "../../assets/css/home/Saleshomepage_1920.css";
.HiddenNum{
position: relative;
top: 13px;
}
.saleChartCont {
width: 100%;
height: 95%;
......@@ -74,12 +77,19 @@
<div class="tc">
<p>
<span>￥</span>
<span>{{data.totalCommission}}</span>
<span :class="[isView?'':'HiddenNum']">{{isView?data.totalCommission:'***'}}</span>
<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']"
></el-icon>
</div>
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.periodsName}}期<el-tag
v-if="data.peopelBonus" size="mini" type="danger" effect="dark"
style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;">
奖+{{data.peopelBonus}}</el-tag>
style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;"
:class="[isView?'':'HiddenNum']">
奖+{{isView?data.peopelBonus:'***'}}</el-tag>
</p>
</div>
<div stye="font-size: 16px;color: #666666;display: block;display: inline-block;">
......@@ -96,7 +106,7 @@
<div class="tc">
<p>
<span>￥</span>
<span>{{data.gnSaleCommission}}</span>
<span :class="[isView?'':'HiddenNum']">{{isView?data.gnSaleCommission:'***'}}</span>
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.gnPeriodsName}}期</p>
</div>
......@@ -109,7 +119,7 @@
<div class="tc">
<p>
<span>￥</span>
<span>{{data.dxSaleCommission}}</span>
<span :class="[isView?'':'HiddenNum']">{{isView?data.dxSaleCommission:'***'}}</span>
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.dxPeriodsName}}期</p>
</div>
......@@ -117,7 +127,6 @@
<span>历史单项提成</span>
</div>
</div>
<el-tooltip class="item" effect="dark" content="预期提成" placement="top">
<img src="../../assets/img/xiaosouYQ.png" @click="goAnticipate(4)"
style="width: 20px;height: auto; position: absolute;right: -0;top: -13px;cursor: pointer;color: #33B3FF;"></img>
......@@ -590,6 +599,7 @@
export default {
data() {
return {
isView: false,
tichengDialog: false,
PMMsg: {
RB_Branch_Id: -1,
......
src/components/temp/operation.vue
View file @ 4c88999a
......@@ -2,7 +2,10 @@
@import "../../assets/css/main.less";
/* @import "../../assets/css/cssReset.css"; */
@import "../../assets/css/home/Saleshomepage_1920.css";
.HiddenNum{
position: relative;
top: 13px;
}
.saleChartCont {
width: 100%;
height: 95%;
......@@ -279,12 +282,19 @@
<div class="tc">
<p>
<span>￥</span>
<span>{{data.OPCommission}}</span>
<span :class="[isView?'':'HiddenNum']">{{isView?data.OPCommission:'***'}}</span>
<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']"
></el-icon>
</div>
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.PeriodsName}}期<el-tag
v-if="data.PeopelBonus" size="mini" type="danger" effect="dark"
style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;">
奖+{{data.PeopelBonus}}</el-tag>
style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;"
:class="[isView?'':'HiddenNum']">
奖+{{isView?data.PeopelBonus:'***'}}</el-tag>
</p>
</div>
<div stye="font-size: 16px;color: #666666;display: block;display: inline-block;">
......@@ -296,7 +306,7 @@
<div class="tc">
<p>
<span>￥</span>
<span>{{data.GNOPCommission}}</span>
<span :class="[isView?'':'HiddenNum']">{{isView?data.GNOPCommission:'***'}}</span>
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.GNPeriodsName}}期</p>
</div>
......@@ -309,7 +319,7 @@
<div class="tc">
<p>
<span>￥</span>
<span>{{data.DXOPCommission}}</span>
<span :class="[isView?'':'HiddenNum']">{{isView?data.DXOPCommission:'***'}}</span>
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.DXPeriodsName}}期</p>
</div>
......@@ -609,6 +619,7 @@
export default {
data() {
return {
isView: false,
userInfo: {},
isBranchCompany: false,
isVisa: false,
......
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