Commit 924ca6ae authored by Mac's avatar Mac

新加订单的额外奖励参数

parent 77e00540
...@@ -100,13 +100,15 @@ ...@@ -100,13 +100,15 @@
报价单:<span class="order_OfferId" @click="goQuotation(item.OfferId)" 报价单:<span class="order_OfferId" @click="goQuotation(item.OfferId)"
style="font-size:14px;">{{item.OfferId}}</span> style="font-size:14px;">{{item.OfferId}}</span>
</div> </div>
<div style="color:red" v-if="item.YFCommissionMoney>0">应发提成:{{item.YFCommissionMoney}}</div>
<template v-if="item.IsCommissionGive==1"> <template v-if="item.IsCommissionGive==1">
<div style="margin-top:30px;">提成:{{item.CommissionMoney}}</div> <div style="color:red;cursor: pointer;text-decoration: underline;" @click='gourltx(item.OrderId)'>提成:{{item.CommissionMoney}}</div>
<div style="color:red" v-if="item.ExtraCommissionMoney>0">额外奖励实发:{{item.ExtraCommissionMoney}}</div>
</template> </template>
<template> <template>
<div style="margin-top:30px;color:red;" v-if="item.ExtraRewardMoney>0">额外奖励:{{item.ExtraRewardMoney}} <div style="color:red;" v-if="item.ExtraRewardMoney>0">额外奖励:{{item.ExtraRewardMoney}}</div>
</div>
<div style="color:red" v-if="item.ExtraDeductMoney>0">额外扣除:{{item.ExtraDeductMoney}}</div> <div style="color:red" v-if="item.ExtraDeductMoney>0">额外扣除:{{item.ExtraDeductMoney}}</div>
<div style="color:red" v-if="item.CommissionBack>0">补交提成:{{item.CommissionBack}}</div>
</template> </template>
</td> </td>
<td style="border:none">{{item.GuestNum}}人</td> <td style="border:none">{{item.GuestNum}}人</td>
...@@ -1287,6 +1289,14 @@ ...@@ -1287,6 +1289,14 @@
path: '/sale/contractManage', path: '/sale/contractManage',
query: {} query: {}
}); });
},
gourltx(OrderId){
this.$router.push({
path: '/financial/cycleOrderList',
query: {
OrderId:OrderId
}
});
} }
} }
} }
......
...@@ -113,6 +113,7 @@ ...@@ -113,6 +113,7 @@
UserId: 0, UserId: 0,
ClassId:0, ClassId:0,
OrderId:'', OrderId:'',
School_Id:'-1',
}, },
pageCount: 0, pageCount: 0,
persistent: false, persistent: false,
...@@ -145,6 +146,9 @@ ...@@ -145,6 +146,9 @@
if(this.$route.query && this.$route.query.id){ if(this.$route.query && this.$route.query.id){
this.msg.PeriodId = this.$route.query.id this.msg.PeriodId = this.$route.query.id
} }
if(this.$route.query && this.$route.query.School_Id){
this.msg.School_Id = this.$route.query.School_Id
}
this.getList() this.getList()
this.setClass() this.setClass()
}, },
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-btn :loading="loading1" color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px"/> <q-btn :loading="loading1" color="primary" size="11px" label="返回" @click="goreturn" style="margin-left:10px"/>
</div> </div>
</div> </div>
</div> </div>
...@@ -147,9 +146,21 @@ ...@@ -147,9 +146,21 @@
SchoolNamelist:[], SchoolNamelist:[],
DeptNamelist:[], DeptNamelist:[],
UserNamelist:[], UserNamelist:[],
see_tcdetailed:false,
}
},
created() {
let userinfo = this.getLocalStorage();
userinfo.ActionMenuList.map(x=>{//判断权限
if(x.FunctionCode == "see_tcdetailed"){//判断是否可以查看其他明细
this.see_tcdetailed = true;
}
})
if(this.see_tcdetailed == false){
this.msg.UserId = userinfo.Id
} }
}, },
created() {},
mounted() { mounted() {
if(this.$route.query && this.$route.query.OrderId){ if(this.$route.query && this.$route.query.OrderId){
this.msg.OrderId = this.$route.query.OrderId this.msg.OrderId = this.$route.query.OrderId
......
...@@ -2156,7 +2156,7 @@ ...@@ -2156,7 +2156,7 @@
}else if(OtherType==33){ }else if(OtherType==33){
tempStr = '/financial/financalDocument/InAndOutDdetails?id='+ID; tempStr = '/financial/financalDocument/InAndOutDdetails?id='+ID;
}else if(OtherType==39){ }else if(OtherType==39){
tempStr = '/financial/CommissionDetail?id='+ID; tempStr = '/financial/CommissionDetail?id='+ID+'&School_Id='+this.GetDetail.RB_Branch_Id;
} }
this.$router.push({ this.$router.push({
......
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