Commit 2f9abf46 authored by youjie's avatar youjie

no message

parent 64bb82c4
...@@ -164,13 +164,9 @@ ...@@ -164,13 +164,9 @@
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) { if (this.$route.query && this.$route.query.PeriodId) {
this.msg.PeriodId = this.$route.query.PeriodId this.msg.PeriodId = this.$route.query.PeriodId
} }
if (this.$route.query && this.$route.query.Type) {
this.msg.Type = this.$route.query.Type
}
this.getqishilist() this.getqishilist()
this.getCompanyList()//获取公司 this.getCompanyList()//获取公司
this.getEmployee()//人员 this.getEmployee()//人员
...@@ -259,12 +255,12 @@ ...@@ -259,12 +255,12 @@
this.$router.push({ this.$router.push({
path: path, path: path,
query: { query: {
PeriodId: this.$route.query.PeriodId, PeriodId: this.msg.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',
Type: this.msg.Type, Type: this.msg.Type?this.msg.Type:1,
tab: '单项服务提现详情', tab: '单项服务提现详情',
} }
}); });
......
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
</td> --> </td> -->
</tr> </tr>
<tr v-if="dataList.length==0"> <tr v-if="dataList.length==0">
<td style="text-align:center" colspan="11">暂无数据</td> <td style="text-align:center" colspan="14">暂无数据</td>
</tr> </tr>
</table> </table>
<!-- 分页 --> <!-- 分页 -->
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
if (this.PeriodsList && this.PeriodsList.length > 0) { if (this.PeriodsList && this.PeriodsList.length > 0) {
// this.msg.Periods = Number(this.PeriodsList[0].Id) // this.msg.Periods = Number(this.PeriodsList[0].Id)
} }
this.getList()
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
...@@ -627,8 +627,7 @@ ...@@ -627,8 +627,7 @@
this.msg.StartTime = this.getBeforeDate(0, new Date()) this.msg.StartTime = this.getBeforeDate(0, new Date())
this.msg.EndTime = this.getBeforeDate(0, new Date()) this.msg.EndTime = this.getBeforeDate(0, new Date())
this.DatelistBM = [new Date(this.msg.StartTime),new Date()] this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
if(this.$route.query.Q_IsCollect){ if(this.$route.query.DepartSTime){
this.msg.Q_IsCollect=this.$route.query.Q_IsCollect
this.msg.DepartSTime=this.$route.query.DepartSTime this.msg.DepartSTime=this.$route.query.DepartSTime
this.msg.DepartETime=this.$route.query.DepartETime this.msg.DepartETime=this.$route.query.DepartETime
this.msg.CommissionType = this.$route.query.CommissionType this.msg.CommissionType = this.$route.query.CommissionType
......
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ProfitRate" <el-table-column prop="ProfitRate"
label="提成" width="150"> label="提成" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.Way==1"> <template v-if="scope.row.Way==1">
{{scope.row.Money+'/人'}} {{scope.row.Money+'/人'}}
......
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