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

# Conflicts:
#	src/pages/financial/CommissionDetail.vue
#	src/pages/financial/CompanyAccount.vue
#	src/pages/financial/salesCommission.vue
#	src/router/routes.js

src/pages/financial/CommissionDetail.vue

+<style>
+    .baseSet_Title {
+      width: 120px !important;
+      padding: 18px 0 0 16px;
+      text-align: right;
+    }
+   .CommissionDetail  .border-bottom {
+        /* border-bottom: 1px dashed #EEE; */
+        padding-bottom: 5px;
+        margin-bottom: 5px;
+    }
+    .CommissionDetail  .text-bottom{
+        height: 32px;line-height: 32px; margin-bottom: 10px;
+    }
+    .CommissionDetail ._icon_btn i.icon-sousuo {
+    background-color: #47BF8C;
+  }
+    .CommissionDetail ._icon_btn i {
+    width: 26px;
+    height: 26px;
+    display: inline-block;
+    color: white !important;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 26px;
+    margin-right: 10px;
+    cursor: pointer;
+    outline: none;
+  }
+ .CommissionDetail .el-table td,.el-table th{
+    padding: 5px 0;
+  }
+
+  
+  </style>
+  <template>
+    <div class="page-body CommissionDetail">
+        <div class="page-search row items-center">
+            <div class="col row wrap q-mr-lg q-col-gutter-md">
+              <div class="col-3">
+                <q-select filled stack-label use-input input-debounce="0" option-value="ClassId" clearable @input="getList"
+                  option-label="ClassName" v-model="msg.ClassId" :options="ClassList" label="班级" :dense="false"
+                  emit-value map-options @filter="filterFn">
+                  <template v-slot:no-option>
+                    <q-item>
+                      <q-item-section class="text-grey">
+                        未找到相关数据
+                      </q-item-section>
+                    </q-item>
+                  </template>
+                </q-select>
+              </div>
+              <div class="col-3">
+                <q-input filled v-model="msg.OrderId"  @keyup.enter.native="getList()" label="订单号" />
+              </div>
+            </div>
+          </div>
+      <template >
+        <el-table
+            ref="filterTable"
+            :data="tableData"
+            border
+            style="width: 100%">
+            <el-table-column prop="SchoolName" label="校区" ></el-table-column>
+            <el-table-column prop="DeptName" label="部门" ></el-table-column>
+            <el-table-column prop="UserName" label="用户" > </el-table-column>
+            <el-table-column prop="StudentCount" label="学生数量" sortable :sort-method="StudentCount"> </el-table-column>
+            <el-table-column prop="CurrentPeriodMoney" label="提成金额" sortable :sort-method="CurrentPeriodMoney"> </el-table-column>
+            <el-table-column prop="CurrentExtraMoney" label="奖励金额" sortable :sort-method="CurrentExtraMoney"> </el-table-column>
+            <el-table-column prop="CommissionMoney" label="最终提成" sortable :sort-method="CommissionMoney"> </el-table-column>
+            <el-table-column prop="Periods" label="周期"> </el-table-column>
+            <el-table-column  label="操作" >
+                <template slot-scope="scope">
+                  <div class="_icon_btn">
+                    <el-tooltip class="item" effect="dark" content="查看" placement="top">
+                      <i class="iconfont icon-sousuo" 
+                          @click="goUrl('userCommissionDetails',scope.row.UserId)"></i>
+                      </el-tooltip>
+                  </div>
+                  </template>
+            </el-table-column>
+        </el-table>
+      </template>
+      
+    </div>
+  </template>
+  <script>
+    import {
+      GetClassTypePageList,
+    } from '../../api/system/index';
+    import{
+      getSellCommissionUserList,
+    } from '../../api/finance/index'
+    import {
+      getClassDropDownList,
+    } from "../../api/school/index";
+    export default {
+      meta: {
+        title: "销售提成详情"
+      },
+      props: {},
+      components: {},
+      data() {
+        return {
+          loading: false,
+          //列表数据参数
+          msg: {
+            PeriodId: 0,
+            UserId: 0,
+            ClassId:0,
+            OrderId:'',
+          },
+          pageCount: 0,
+          persistent: false,
+          listData:{},
+          tableData:[],
+          company:[],
+          department:[],
+          ClassList:[],
+          allClassList:[],
+          see_tcdetailed:false
+        }
+      },
+      created() {
+        let userinfo = this.getLocalStorage();
+        userinfo.ActionMenuList.map(x=>{//判断权限
+          if(x.FunctionCode == "see_tcdetailed"){//判断是否可以查看其他明细
+            this.see_tcdetailed = true;
+          }
+        })
+        if(this.see_tcdetailed == false){
+          console.log(userinfo)
+          this.msg.UserId = userinfo.Id
+        }
+      },
+      mounted() {
+        console.log(this.$route.query)
+        if(this.$route.query && this.$route.query.id){
+          this.msg.PeriodId = this.$route.query.id
+        }
+        this.getList()
+        this.setClass()
+      },
+      methods: {
+     
+        getList(){
+          if(this.msg)
+            this.loading = true;
+            getSellCommissionUserList(this.msg).then(res => {
+            if (res.Code == 1) {
+              this.tableData = res.Data
+            }
+          })
+        },
+         //选择班级
+        setClass(item) {
+          this.isShowClass = true;
+          getClassDropDownList({
+            CourseId: 0,
+            IsAddDefault: 1, //添加默认选项
+          }).then(res => {
+            if (res.Code == 1) {
+              var jsonData = res.Data;
+              if (jsonData && jsonData.length > 0) {
+                this.ClassList = JSON.parse(JSON.stringify(jsonData));
+                this.allClassList = JSON.parse(JSON.stringify(jsonData));;
+              }
+            }
+          });
+        },
+        //筛选员工
+        filterFn(val, update) {
+          update(() => {
+            if (val === '') {
+              this.ClassList = JSON.parse(JSON.stringify(this.allClassList))
+            } else {
+              const needle = val.toLowerCase()
+              this.ClassList = this.allClassList.filter(v => v.ClassName.toLowerCase().indexOf(needle) > -1)
+            }
+          })
+        },
+      
+        goUrl(path, id ) {
+            this.$router.push({
+            path: '/financial/' + path,
+            query: {
+                userId: id,
+                preriodId:this.$route.query.id,
+                blank: 'y',
+            }
+            })
+        },
+        filterHandler(value, row, column) {
+            const property = column['property'];
+            return row[property] === value;
+        },
+        StudentCount(a,b,c){
+          console.log(a,b,c)
+          return a.StudentCount - b.StudentCount;
+        },
+        CurrentPeriodMoney(a,b){
+          return a.CurrentPeriodMoney - b.CurrentPeriodMoney;
+        },
+        CurrentExtraMoney(a,b){
+          return a.CurrentExtraMoney - b.CurrentExtraMoney;
+        },
+        CommissionMoney(a,b){
+          return a.CommissionMoney - b.CommissionMoney;
+        }
+        
+      },
+    }
+  
+  </script>
+  <style lang="sass">
+    @import url('~assets/css/table.sass')
+  
+  </style>
+  
\ No newline at end of file

src/router/routes.js

@@ -243,15 +243,25 @@ const routes = [{
       import("pages/financial/salesRules.vue")
   },
   {
-    path: "/financial/salesCommission", //销售提成列表
+    path: "/financial/salesCommission", //提成周期列表
     component: () =>
       import("pages/financial/salesCommission.vue")
   },
   {
-    path: "/financial/CommissionDetail", //销售提成详情
+    path: "/financial/CommissionDetail", //周期提成 用户统计列表
     component: () =>
       import("pages/financial/CommissionDetail.vue")
   },
+  {
+    path: "/financial/userCommissionDetails", //周期提成 用户提成明细
+    component: () =>
+      import("pages/financial/userCommissionDetails.vue")
+  },
+  {
+    path: "/financial/cycleOrderList", //周期提成  订单提成查询
+    component: () =>
+      import("pages/financial/cycleOrderList.vue")
+  },
 
 
   {