Commit 4ed77129 authored by youjie's avatar youjie

no message

parent 9d46386e
...@@ -164,9 +164,7 @@ ...@@ -164,9 +164,7 @@
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId) this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
} }
} }
if (this.$route.query && this.$route.query.PeriodId) { this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.msg.PeriodId = this.$route.query.PeriodId
}
this.getqishilist() this.getqishilist()
this.getCompanyList()//获取公司 this.getCompanyList()//获取公司
this.getEmployee()//人员 this.getEmployee()//人员
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="flexOne domesticCommissionUser"> <div class="flexOne domesticCommissionUser">
<div> <div>
<ul class="opUl"> <ul class="opUl">
<li> <li>
<em>人员</em> <em>人员</em>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'> <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</el-select> </el-select>
</li> </li>
</ul> </ul>
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<td>{{item.PeopleCount}}</td> <td>{{item.PeopleCount}}</td>
<td>{{item.CommissionMoney}}</td> <td>{{item.CommissionMoney}}</td>
<td>{{item.Periods}}</td> <td>{{item.Periods}}</td>
<td> <td>
...@@ -140,9 +140,7 @@ ...@@ -140,9 +140,7 @@
this.disabled = true; this.disabled = true;
this.msg.UserId = Number(userInfo.EmployeeId) this.msg.UserId = Number(userInfo.EmployeeId)
} }
if (this.$route.query && this.$route.query.PeriodId) { this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.msg.PeriodId = this.$route.query.PeriodId
}
this.getList(); this.getList();
// this.getqishilist() // this.getqishilist()
this.getCompanyList()//获取公司 this.getCompanyList()//获取公司
...@@ -233,7 +231,7 @@ ...@@ -233,7 +231,7 @@
PeriodId: this.$route.query.PeriodId, PeriodId: this.$route.query.PeriodId,
UserId:item.UserId, UserId:item.UserId,
RB_Branch_Id:item.RB_Branch_Id, RB_Branch_Id:item.RB_Branch_Id,
RB_Department_Id:item.RB_Department_Id, RB_Department_Id:item.RB_Department_Id,
blank: 'y', blank: 'y',
tab: '国内提现详情' tab: '国内提现详情'
} }
...@@ -260,4 +258,4 @@ ...@@ -260,4 +258,4 @@
} }
} }
</script> </script>
\ No newline at end of file
...@@ -160,9 +160,7 @@ ...@@ -160,9 +160,7 @@
this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId) this.msg.UserId = this.$route.query.UserId?Number(this.$route.query.UserId):Number(userInfo.EmployeeId)
} }
} }
if (this.$route.query && this.$route.query.PeriodId) { this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.msg.PeriodId = this.$route.query.PeriodId
}
this.getqishilist() this.getqishilist()
this.getCompanyList()//获取公司 this.getCompanyList()//获取公司
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="flexOne domesticCommissionUser"> <div class="flexOne domesticCommissionUser">
<div> <div>
<ul class="opUl"> <ul class="opUl">
<li> <li>
<em>人员</em> <em>人员</em>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'> <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</el-select> </el-select>
</li> </li>
</ul> </ul>
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<th>销售</th> <th>销售</th>
<th>团的数量</th> <th>团的数量</th>
<th>提成金额</th> <th>提成金额</th>
<th>期数</th> <th>期数</th>
...@@ -142,9 +142,7 @@ ...@@ -142,9 +142,7 @@
this.disabled = true; this.disabled = true;
this.msg.UserId = Number(userInfo.EmployeeId) this.msg.UserId = Number(userInfo.EmployeeId)
} }
if (this.$route.query && this.$route.query.PeriodId) { this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.msg.PeriodId = this.$route.query.PeriodId
}
this.getList(); this.getList();
// this.getqishilist() // this.getqishilist()
this.getCompanyList()//获取公司 this.getCompanyList()//获取公司
...@@ -235,7 +233,7 @@ ...@@ -235,7 +233,7 @@
PeriodId: this.$route.query.PeriodId, PeriodId: this.$route.query.PeriodId,
UserId:item.UserId, UserId:item.UserId,
RB_Branch_Id:item.RB_Branch_Id, RB_Branch_Id:item.RB_Branch_Id,
RB_Department_Id:item.RB_Department_Id, RB_Department_Id:item.RB_Department_Id,
blank: 'y', blank: 'y',
tab: '国内提现详情' tab: '国内提现详情'
} }
...@@ -262,4 +260,4 @@ ...@@ -262,4 +260,4 @@
} }
} }
</script> </script>
\ No newline at end of file
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="flexOne domesticCommissionUser"> <div class="flexOne domesticCommissionUser">
<div> <div>
<ul class="opUl"> <ul class="opUl">
<li> <li>
<em>人员</em> <em>人员</em>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'> <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</li> </li>
<li> <li>
<em>出团公司</em> <em>出团公司</em>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)" <el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)"
:disabled="S_CheckBranchOrder"> :disabled="S_CheckBranchOrder">
<el-option label="不限" :value="-1"></el-option> <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"
...@@ -60,13 +60,13 @@ ...@@ -60,13 +60,13 @@
:value="item.DepartmentID"></el-option> :value="item.DepartmentID"></el-option>
</el-select> </el-select>
</li> </li>
</ul> </ul>
</div> </div>
<div style="display: flex;align-items: center;height: 50px;justify-content: space-between;"> <div style="display: flex;align-items: center;height: 50px;justify-content: space-between;">
<div style="display: flex;align-items: center;"></div> <div style="display: flex;align-items: center;"></div>
<input type="button" class="normalBtn" value="导出" @click="exportExcel"> <input type="button" class="normalBtn" value="导出" @click="exportExcel">
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<th>销售</th> <th>销售</th>
<!-- <th>团的数量</th> --> <!-- <th>团的数量</th> -->
<th>提成金额</th> <th>提成金额</th>
<th>地接奖金</th> <th>地接奖金</th>
<th>年终奖金</th> <th>年终奖金</th>
...@@ -160,9 +160,7 @@ ...@@ -160,9 +160,7 @@
this.S_CheckBranchOrder = true this.S_CheckBranchOrder = true
this.msg.OutBranchId = userInfo.RB_Branch_id this.msg.OutBranchId = userInfo.RB_Branch_id
} }
if (this.$route.query && this.$route.query.PeriodId) { this.msg.PeriodId = this.$route.query.PeriodId?Number(this.$route.query.PeriodId):0
this.msg.PeriodId = this.$route.query.PeriodId
}
if (this.$route.query && this.$route.query.OutBranchId) { if (this.$route.query && this.$route.query.OutBranchId) {
this.msg.OutBranchId = this.$route.query.OutBranchId this.msg.OutBranchId = this.$route.query.OutBranchId
} }
...@@ -262,7 +260,7 @@ ...@@ -262,7 +260,7 @@
PeriodId: this.$route.query.PeriodId, PeriodId: this.$route.query.PeriodId,
UserId:item.UserId, UserId:item.UserId,
RB_Branch_Id:item.RB_Branch_Id, RB_Branch_Id:item.RB_Branch_Id,
RB_Department_Id:item.RB_Department_Id, RB_Department_Id:item.RB_Department_Id,
blank: 'y', blank: 'y',
tab: '国内提现详情' tab: '国内提现详情'
} }
...@@ -300,4 +298,4 @@ ...@@ -300,4 +298,4 @@
} }
} }
</script> </script>
\ No newline at end of file
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