Skip to content

S
SuperMan
Commit 122dc586 authored by youjie's avatar youjie
Browse files
Options

no message

parent 180e8910
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 38 deletions
src/components/FinancialModule/domesticCommissionTW2.vue
View file @ 122dc586
......@@ -26,8 +26,9 @@
<ul class="opUl">
<li>
<em>出团公司</em>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)"
:disabled="S_CheckBranchOrder">
<!-- S_CheckBranchOrder -->
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)"
:disabled="false">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
......@@ -52,7 +53,7 @@
<el-date-picker v-model="Month" value-format="yyyy-MM" type="month" placeholder="选择月">
</el-date-picker>
</li>
<li v-show="btnShow">
<li v-show="btnShow&&isAuthority">
<el-button size="mini" type="danger" style="border-radius:14px" :loading="btnLoading"
@click="generateTable">生成提成</el-button>
</li>
......@@ -68,7 +69,7 @@
<th>总地接</th>
<th>所属地接奖金</th>
<th>总年终</th>
<th>财务单据</th>
<th width="280">汇率</th>
<th>操作信息</th>
......@@ -93,7 +94,7 @@
<td>
<p>{{item.SumYearBonus?item.SumYearBonus:'-'}}</p>
</td>
<td>
<span v-for="(x,y) in item.FinanceIdList" >
<span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'>
......@@ -113,11 +114,11 @@
{{x.Rate?x.Rate:'未设汇率'}}
</span>
<span style="color: #6E6E6E;">{{x.CurrencyName}}</span>
</div>
<div style="flex-shrink: 0;justify-content: end;align-items: flex-end;"
<div style="flex-shrink: 0;justify-content: end;align-items: flex-end;"
v-if="y==item.CurrencyRateList.length-1&&isRateAuthoTW&&item.FinanceIdList.length==0">
<i class="el-icon-edit"
<i class="el-icon-edit"
style="color: #409eff;cursor: pointer;" @click="editRate(item)"></i>
</div>
</div>
......@@ -231,6 +232,7 @@
cMaker:false,//是否可以制单
isRateAuthoTW: false,//是否可以修改汇率
S_CheckBranchOrder: false,//查看公司下订单
isAuthority: false
}
},
mounted() {
......@@ -249,8 +251,10 @@
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 ){
this.S_CheckBranchOrder = true
}
this.getList();
if(userInfo.BranchName=='成都印象'||userInfo.BranchName=='台湾印象'||userInfo.BranchName=='微途科技'){
this.isAuthority = true
this.getList();
}
this.getCompanyList()
this.GetCommissionPeroidsList()
this.getAllCurrency()
......@@ -272,7 +276,7 @@
editRate(item){
this.addMsg.PeriodsId = item.Id
this.addMsg.CurrencyRate = JSON.parse(JSON.stringify(item.CurrencyRateList))
this.showVisible = true
},
submit(formName) {
......@@ -388,7 +392,7 @@
);
},
YijianZD(item,type) {
let Money
let Money
if(this.msg.OutBranchId>-1){
if(item.BranchCommission>0){
Money=item.BranchCommission
......@@ -424,7 +428,7 @@
query.id = 28
query.Name = "总部销售提成单"
}
this.$router.push({
path: "/addFinancialDocuments",
query
......@@ -445,4 +449,4 @@
}
}
</script>
\ No newline at end of file
</script>
src/components/FinancialModule/domesticCommissionUserTW2.vue
View file @ 122dc586
......@@ -29,7 +29,10 @@
<li>
<em>人员</em>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
<!-- disabled -->
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)"
filterable
:disabled='false'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name"
:value="item.empId"></el-option>
......@@ -37,8 +40,9 @@
</li>
<li>
<em>出团公司</em>
<!-- S_CheckBranchOrder -->
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)"
:disabled="S_CheckBranchOrder">
:disabled="false">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
......@@ -46,7 +50,9 @@
</li>
<li>
<em>公司</em>
<el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
<!-- disabled -->
<el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)"
:disabled='false'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
......@@ -54,7 +60,9 @@
</li>
<li>
<em>部门</em>
<el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
<!-- disabled -->
<el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)"
:disabled='false'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in departMentList" :key="item.index" :label="item.DepartmentName"
:value="item.DepartmentID"></el-option>
......
src/components/FinancialModule/domesticCommissiondetailsTW2.vue
View file @ 122dc586
......@@ -33,35 +33,38 @@
<em>期数</em>
<el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="(item,index) in PeriodsList" :key="item.index"
<el-option v-for="(item,index) in PeriodsList" :key="item.index"
:label="item.Name" :value="item.Id">
</el-option>
</el-select>
</li>
<li>
<em>出团公司</em>
<!-- S_CheckBranchOrder -->
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)"
:disabled="S_CheckBranchOrder">
:disabled="false">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index"
<el-option v-for="(item,index) in BranchList" :key="item.index"
:label="item.BName" :value="item.Id">
</el-option>
</el-select>
</li>
<li>
<em>公司</em>
<el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)"
:disabled='disabled'>
<!-- disabled -->
<el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)"
:disabled='false'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id">
</el-option>
</el-select>
</li>
<li>
<em>部门</em>
<el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)"
:disabled='disabled'>
<!-- disabled -->
<el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)"
:disabled='false'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in departMentList" :key="item.index" :label="item.DepartmentName"
:value="item.DepartmentID"></el-option>
......@@ -69,8 +72,9 @@
</li>
<li>
<em>人员</em>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)"
filterable :disabled='disabled'>
<!-- disabled -->
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)"
filterable :disabled='false'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name" :value="item.empId">
</el-option>
......@@ -85,7 +89,7 @@
<li>
<em>团号</em>
<el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200"
@keyup.native.enter="handleCurrentChange(1)" @change="handleCurrentChange(1)"
@keyup.native.enter="handleCurrentChange(1)" @change="handleCurrentChange(1)"
:placeholder="$t('pub.pleaseImport')"></el-input>
</li>
......@@ -108,7 +112,7 @@
style="margin-top: 10px;">
<tr>
<th>出团公司</th>
<th>姓名</th>
<th>类型</th>
......@@ -121,18 +125,18 @@
<th>业绩核算比例</th>
<th>业绩利润</th>
<th>提成金额</th>
<th>提成比例</th>
<th>期数</th>
<th width='400'>备注</th>
<!-- <th>操作</th> -->
</tr>
<tr v-for="item in dataList">
<td>{{item.OutBranchName}}</td>
<td>{{item.UserName}}</td>
<td>销售</td>
......@@ -145,10 +149,10 @@
<td>{{item.ProfitRate?item.ProfitRate:'-'}}</td>
<td>{{item.ProfitRate2}}</td>
<td>{{item.CommissionMoney}}</td>
<td>{{item.CommissionRate?item.CommissionRate+'%':'-'}}</td>
<td>{{item.Periods}}</td>
<td>{{item.Description}}</td>
</tr>
......
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