Skip to content

S
SuperMan
Commit 44b2b942 authored by youjie's avatar youjie
Browse files
Options

no message

parent 796c400c
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 93 deletions
src/components/FinancialModule/ServiceCommission/ServiceCommission.vue
View file @ 44b2b942
...@@ -20,10 +20,12 @@ ...@@ -20,10 +20,12 @@
color: red; color: red;
} }
.tdOne{ .tdOne{
height: 20px;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
padding: 0 0 5px 0; padding: 0 0 5px 0;
} }
.tdTwo{ .tdTwo{
height: 20px;
padding: 5px 0 0 0; padding: 5px 0 0 0;
} }
.singeRowTableB{ .singeRowTableB{
...@@ -63,93 +65,49 @@ ...@@ -63,93 +65,49 @@
<tr> <tr>
<th>期数</th> <th>期数</th>
<th>名称</th> <th>名称</th>
<th> <th>类型</th>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <th>总提成</th>
<tr><th style="width: 25%;">类型</th> <th>所属公司提成</th>
<th style="width: 25%;">总提成</th> <th>财务单据</th>
<th style="width: 25%;">所属公司提成</th>
<th style="width: 25%;">财务单据</th></tr>
</table>
</th>
<th>操作信息</th> <th>操作信息</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
<tr v-for="item in dataList" style="line-height: 15px;"> <tr v-for="item in dataList" style="line-height: 15px;">
<td>{{item.Periods}}</td> <td :rowspan="1">{{item.Periods}}</td>
<td>{{item.Name}}</td> <td :rowspan="1">{{item.Name}}</td>
<td> <td>
<table class="singeRowTableB" border="0" cellspacing="0" cellpadding="0"> <div class="tdOne">销售</div>
<tr> <div class="tdTwo">OP</div>
<td style="width: 25%;">
<table class="singeRowTableB" border="0" cellspacing="0" cellpadding="0">
<tr style="border-bottom: 1px solid #eeeeee;">
<td >
销售
</td>
</tr>
<tr>
<td >
OP
</td>
</tr>
</table>
</td>
<td style="width: 25%;">
<table class="singeRowTableB" border="0" cellspacing="0" cellpadding="0">
<tr style="border-bottom: 1px solid #eeeeee;">
<td >
{{item.SellSumPrice?item.SellSumPrice:'-'}}
</td>
</tr>
<tr>
<td >
{{item.OPSumPrice?item.OPSumPrice:'-'}}
</td>
</tr>
</table>
</td> </td>
<td style="width: 25%;"> <td>
<table class="singeRowTableB" border="0" cellspacing="0" cellpadding="0"> <div class="tdOne">{{item.SellSumPrice}}</div>
<tr style="border-bottom: 1px solid #eeeeee;"> <div class="tdTwo">{{item.OPSumPrice}}</div>
<td >
{{item.BranchCommission?item.BranchCommission:'-'}}
</td>
</tr>
<tr>
<td >
{{item.BranchOPCommission?item.BranchOPCommission:'-'}}
</td> </td>
</tr> <td>
</table> <div class="tdOne">{{item.BranchCommission?item.BranchCommission:'-'}}</div>
<div class="tdTwo">{{item.BranchOPCommission?item.BranchOPCommission:'-'}}</div>
</td> </td>
<td style="width: 25%;"> <td>
<table class="singeRowTableB" border="0" cellspacing="0" cellpadding="0"> <div class="tdOne">
<tr style="border-bottom: 1px solid #eeeeee;">
<td >
<span v-for="(x,y) in item.SellFinanceIdList" > <span v-for="(x,y) in item.SellFinanceIdList" >
<span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'> <span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'>
{{x}} {{x}}
</span> </span>
{{item.SellFinanceIdList.length == y+1 ?'':'、'}} {{item.SellFinanceIdList.length == y+1 ?'':'、'}}
</span> </span>
</td> </div>
</tr> <div class="tdTwo">
<tr>
<td>
<span v-for="(x,y) in item.OPFinanceIdList" > <span v-for="(x,y) in item.OPFinanceIdList" >
<span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'> <span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'>
{{x}} {{x}}
</span> </span>
{{item.OPFinanceIdList.length == y+1 ?'':'、'}} {{item.OPFinanceIdList.length == y+1 ?'':'、'}}
</span> </span>
</div>
</td> </td>
</tr> <td :rowspan="1">
</table>
</td>
</tr>
</table>
</td>
<td>
<div>{{item.CreateByStr}}</div> <div>{{item.CreateByStr}}</div>
<div>{{item.CreateStr}}</div> <div>{{item.CreateStr}}</div>
</td> </td>
......
src/components/FinancialModule/ServiceCommission/ServiceCommissiondetails.vue
View file @ 44b2b942
...@@ -110,7 +110,6 @@ ...@@ -110,7 +110,6 @@
<th>人数</th> <th>人数</th>
<th>提成</th> <th>提成</th>
<th>提成比例</th> <th>提成比例</th>
<th>团利润</th>
<th>期数</th> <th>期数</th>
<th width='400'>备注</th> <th width='400'>备注</th>
...@@ -133,8 +132,7 @@ ...@@ -133,8 +132,7 @@
<td>{{item.TCProfit}}</td> <td>{{item.TCProfit}}</td>
<td>{{item.OrderCount}}</td> <td>{{item.OrderCount}}</td>
<td>{{item.CommissionMoney}}</td> <td>{{item.CommissionMoney}}</td>
<td>{{item.CommissionRate}}</td> <td>{{item.CommissionRate}}%</td>
<td>{{item.TCProfit}}</td>
<td>{{item.Periods}}</td> <td>{{item.Periods}}</td>
<td>{{item.Description}}</td> <td>{{item.Description}}</td>
......
src/components/FinancialModule/domesticCommissionRule.vue
View file @ 44b2b942
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<td > <td >
<span v-if="childItem.SourceType==1">正常</span> <span v-if="childItem.SourceType==1">正常</span>
<span v-if="childItem.SourceType==2">飞猪</span> <span v-if="childItem.SourceType==2">飞猪</span>
<span v-if="childItem.SourceType==3">小红书</span>
</td> </td>
<td>{{childItem.Name}}</td> <td>{{childItem.Name}}</td>
<td> <td>
...@@ -129,6 +129,7 @@ ...@@ -129,6 +129,7 @@
<el-form-item label="来源"> <el-form-item label="来源">
<el-radio v-model="x.SourceType" label="1" @change='getSType(y)'>正常</el-radio> <el-radio v-model="x.SourceType" label="1" @change='getSType(y)'>正常</el-radio>
<el-radio v-model="x.SourceType" label="2" :disabled="x.STdisabled" style="margin-right: 20px;" @change='getSType(y)'>飞猪</el-radio> <el-radio v-model="x.SourceType" label="2" :disabled="x.STdisabled" style="margin-right: 20px;" @change='getSType(y)'>飞猪</el-radio>
<el-radio v-model="x.SourceType" label="3" :disabled="x.STdisabledXHS" style="margin-right: 20px;" @change='getSType(y)'>小红书</el-radio>
</el-form-item> </el-form-item>
<el-button style="margin-left: 15px;padding: 6px;" type="danger" size="mini" class="el-icon-delete" circle <el-button style="margin-left: 15px;padding: 6px;" type="danger" size="mini" class="el-icon-delete" circle
v-if="addMsg.TempTypeList.length>1" @click="addMsg.TempTypeList.splice(y,1),selectdis()"> v-if="addMsg.TempTypeList.length>1" @click="addMsg.TempTypeList.splice(y,1),selectdis()">
...@@ -240,7 +241,8 @@ ...@@ -240,7 +241,8 @@
Money: '0', Money: '0',
ProfitRate: '0', ProfitRate: '0',
SourceType:'1', SourceType:'1',
STdisabled:false STdisabled:false,
STdisabledXHS:false
}] }]
} }
export default { export default {
...@@ -448,8 +450,8 @@ ...@@ -448,8 +450,8 @@
Money: '0', Money: '0',
ProfitRate: '0', ProfitRate: '0',
SourceType:'1', SourceType:'1',
STdisabled:false STdisabled:false,
STdisabledXHS:false,
}] }]
} }
this.selectdis() this.selectdis()
...@@ -457,13 +459,16 @@ ...@@ -457,13 +459,16 @@
}, },
addTempTypeList() { //新增类型 addTempTypeList() { //新增类型
let isdisabled = false let isdisabled = false
let isdisabledXHS = false
for(let i = 0;i<this.addMsg.TempTypeList.length;i++){ for(let i = 0;i<this.addMsg.TempTypeList.length;i++){
let x = this.addMsg.TempTypeList[i] let x = this.addMsg.TempTypeList[i]
if(x.SourceType==2 && this.addMsg.Type!=3){ if(this.addMsg.Type!=3){
if(x.SourceType==2||x.SourceType==3){
isdisabled=true isdisabled=true
break break
} }
} }
}
let obj = { let obj = {
Id: '', Id: '',
Name: '', Name: '',
...@@ -471,12 +476,14 @@ ...@@ -471,12 +476,14 @@
Money: "0", Money: "0",
ProfitRate: "0", ProfitRate: "0",
SourceType:'1', SourceType:'1',
STdisabled:isdisabled STdisabled:isdisabled,
STdisabledXHS:isdisabled,
} }
this.addMsg.TempTypeList.push(obj) this.addMsg.TempTypeList.push(obj)
}, },
RulesOk(formName) { RulesOk(formName) {
console.log(this.addMsg,'====')
// return
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
let LineshortIds = JSON.parse(JSON.stringify(this.addMsg.LineshortIds)) let LineshortIds = JSON.parse(JSON.stringify(this.addMsg.LineshortIds))
...@@ -500,11 +507,15 @@ ...@@ -500,11 +507,15 @@
}, },
isshowfeizhu(){ isshowfeizhu(){
let isfeizhu = false let isfeizhu = false
let isxiaohongshu = false
for(let i = 0;i<this.addMsg.TempTypeList.length;i++){ for(let i = 0;i<this.addMsg.TempTypeList.length;i++){
let x = this.addMsg.TempTypeList[i] let x = this.addMsg.TempTypeList[i]
if(x.SourceType==2){ if(x.SourceType==2){
isfeizhu=true isfeizhu=true
} }
if(x.SourceType==3){
isxiaohongshu=true
}
} }
this.addMsg.TempTypeList.forEach(x=>{ this.addMsg.TempTypeList.forEach(x=>{
if(isfeizhu==true){ if(isfeizhu==true){
...@@ -518,9 +529,23 @@ ...@@ -518,9 +529,23 @@
}else{ }else{
x.STdisabled = true x.STdisabled = true
} }
}else{ }else if(!isfeizhu){
x.STdisabled = false x.STdisabled = false
} }
if(isxiaohongshu==true){
if(x.SourceType==3){
x.STdisabledXHS = false;
if(this.addMsg.Type!=3){
x.Id=0;
x.Name='小红书'
}
}else{
x.STdisabledXHS = true
}
}else if(!isxiaohongshu){
x.STdisabledXHS = false
}
}) })
}, },
getSType(index){//选了飞猪之后 后面的不能选飞猪了 getSType(index){//选了飞猪之后 后面的不能选飞猪了
......
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