Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/OpCommission/OPCommissionDetail.vue

@@ -187,7 +187,6 @@
 
               <li style="position: fixed;right: 0;top: 51px;">
                   <input type="button" class="normalBtn" value="导出" @click="exportExcel">
-                  <input type="button" class="hollowFixedBtn" value="团队奖励明细" @click="objNew.EmployeeId=0,objNew.PeriodsId=0,isRewardDetail=true">
               </li>
 
           </ul>

src/components/FinancialModule/OpCommission/RewardDetail.vue

 <template>
   <el-dialog title="团数奖励明细" width="1100px" :visible.sync="isShow" center
   @close="$emit('close')">
+  <div style="text-align: right;margin-bottom: 10px;">
+    <input type="button" class="hollowFixedBtn" value="查看全部明细"
+    @click="getList(1)">
+  </div>
     <div v-loading="loading">
       <div v-for="(item,index) in dataList" :key="index" class="dataList-box">
         <div class="dataList-heade">
@@ -147,7 +151,11 @@ export default {
       this.getList();
     },
     //获取数据
-    getList() {
+    getList(type) {
+      if(type){
+        this.msg.EmpId=0,
+        this.msg.PeriodsId=0
+      }
       this.loading = true;
       this.apipost(
           "opcommission_GetEmpAwardPageList",