Merge remote-tracking branch 'origin/master'

src/api/company/statistics.js

@@ -22,7 +22,20 @@ export function smsLogs(query) {
     params: query
   })
 }
-
+export function tuiMoney(query) {
+  return request({
+    url: '/company/statistics/tuiMoney',
+    method: 'get',
+    params: query
+  })
+}
+export function exportTuiMoney(query) {
+  return request({
+    url: '/company/statistics/exportTuiMoney',
+    method: 'get',
+    params: query
+  })
+}
 
 
  

src/views/company/statistics/tuiMoney.vue

@@ -0,0 +1,365 @@
+<template>
+        <div class="app-container">
+            <div class="app-content">
+                 <div class="title">
+                    佣金排行榜
+                </div>
+               <el-form class="search-form" :inline="true" >
+                <el-form-item >
+                  <el-select style="width: 220px" v-model="value" placeholder="请选择日期">
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="公司名" prop="companyId">
+                    <el-select filterable style="width: 220px" v-model="companyId" @change="companyChange" placeholder="请选择公司名" clearable size="small">
+                        <el-option
+                          v-for="item in companys"
+                          :key="item.companyId"
+                          :label="item.companyName"
+                          :value="item.companyId"
+                        />
+                  </el-select>
+                </el-form-item>
+                <el-form-item >
+                  <treeselect style="width: 220px" :clearable="false"  v-model="deptId"  :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+                </el-form-item>
+                <el-form-item>
+                  <el-select filterable v-model="userIds" placeholder="请选择员工" clearable size="small">
+                      <el-option
+                        v-for="item in users"
+                        :key="item.userId"
+                        :label="item.nickName"
+                        :value="item.userId">
+                      </el-option>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item>
+                    <el-button type="cyan" icon="el-icon-search"   @click="getVoiceLogs">搜索</el-button>
+                </el-form-item>
+              </el-form>
+               <div class="data-box">
+                  <div class="echart-box">
+                    <div id="echart-customer"></div>
+                  </div>
+                  <div class="table-box">
+                        <el-button class="export" size="small"  @click="handleExport"   v-hasPermi="['statistics:customer:index']">导出</el-button>
+                        <el-table
+                        :data="list"
+                        border
+                        :summary-method="getSummaries"
+                        show-summary
+                        max-height="500"
+                        style="width: 100%;">
+                        <el-table-column
+                          prop="nickName"
+                          label="员工姓名">
+                        </el-table-column>
+                        <el-table-column
+                          prop="tuiMoneyCount"
+                          label="佣金订单数">
+                        </el-table-column>
+                        <el-table-column
+                          prop="tuiMoney"
+                          label="佣金总金额">
+                        </el-table-column>
+                      </el-table>
+                  </div>
+              </div>
+            </div>
+
+          </div>
+</template>
+
+<script>
+import { tuiMoney,exportTuiMoney } from "@/api/company/statistics";
+import { getUserListByDeptId} from "@/api/company/companyUser";
+import echarts from 'echarts'
+import resize from '../../dashboard/mixins/resize'
+import { treeselect } from "@/api/company/companyDept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getCompanyList } from "@/api/company/company";
+export default {
+  name: 'Index',
+  mixins: [resize],
+  components: { Treeselect },
+  watch: {
+    // 监听deptId
+    'deptId': 'currDeptChange'
+  },
+  data() {
+    return {
+       companys:[],
+       deptOptions:[],
+       companyId:undefined,
+       deptId:undefined,
+       userIds:undefined,
+       users:[],
+       dateRange:[],
+       chart: null,
+       options: [{
+          value: '1',
+          label: '今天'
+        }, {
+          value: '2',
+          label: '昨天'
+        }, {
+          value: '3',
+          label: '本周'
+        }, {
+          value: '4',
+          label: '上周'
+        }, {
+          value: '5',
+          label: '本月'
+        }
+        , {
+          value: '6',
+          label: '上月'
+        }
+        , {
+          value: '7',
+          label: '本季度'
+        }
+        , {
+          value: '8',
+          label: '上季度'
+        }
+        , {
+          value: '9',
+          label: '本年'
+        }
+        , {
+          value: '10',
+          label: '上年'
+        }],
+        value: '5',
+        list:[],
+        dates:[],
+        billingTime:[],
+        tuiMoneyCount:[],
+        tuiMoney:[],
+        times:[]
+
+    }
+  },
+   created() {
+       getCompanyList().then(response => {
+        this.companys = response.data;
+        if(this.companys!=null&&this.companys.length>0){
+          this.companyId=this.companys[0].companyId;
+          this.getTreeselect();
+        }
+      });
+  },
+  methods: {
+    companyChange(val){
+      console.log(val);
+      this.companyId=val;
+      this.getTreeselect();
+    },
+    currDeptChange(val){
+      console.log(val)
+      this.deptId=val;
+       this.getUserListByDeptId();
+    },
+     /** 查询部门下拉树结构 */
+    getTreeselect() {
+      var that=this;
+      var param={companyId:this.companyId}
+      treeselect(param).then((response) => {
+        this.deptOptions = response.data;
+        console.log(this.deptOptions)
+        if(response.data!=null&&response.data.length>0){
+          this.deptId=response.data[0].id;
+          that.getVoiceLogs()
+        }
+      });
+    },
+    handleExport(){
+        var data;
+        if(this.userIds!=undefined){
+            data={type:this.value,userIds:this.userIds+"",deptId:this.deptId}
+        }
+        else{
+            data={type:this.value,deptId:this.deptId}
+        }
+        exportTuiMoney(data).then((response) => {
+            console.log(response)
+           this.download(response.msg);
+        });
+
+    },
+    getUserListByDeptId() {
+        this.userIds=undefined;
+        var data={deptId:this.deptId};
+        getUserListByDeptId(data).then(response => {
+          this.users = response.data;
+
+        });
+    },
+     getVoiceLogs(){
+          var data;
+          if(this.userIds!=undefined){
+              data={type:this.value,userIds:this.userIds+"",deptId:this.deptId}
+          }
+          else{
+              data={type:this.value,deptId:this.deptId}
+          }
+          tuiMoney(data).then((response) => {
+           this.list=response.list;
+           this.tuiMoney=response.tuiMoney;
+           this.tuiMoneyCount=response.tuiMoneyCount;
+
+           this.times=response.times;
+            setTimeout(() => {
+              this.initEchart();
+            }, 500);
+        });
+      },
+      initEchart(){
+        var option = {
+          tooltip: {
+              trigger: 'axis',
+              axisPointer: {            // 坐标轴指示器，坐标轴触发有效
+                  type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
+              }
+          },
+          legend: {
+              data: ['佣金订单数', '佣金总金额' ]
+          },
+          grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+          },
+          xAxis: [
+              {
+                  type: 'category',
+                  data: this.dates
+              }
+          ],
+          yAxis: [
+              {
+                  type: 'value',
+                  axisLabel:{
+                    formatter:'{value}'
+                  }
+              }
+          ],
+          series: [
+              {
+
+                  name: '佣金订单数',
+                  type: 'line',
+                  emphasis: {
+                      focus: 'series'
+                  },
+                  data: this.tuiMoneyCount
+              },
+              {
+
+                  name: '佣金总金额',
+                  type: 'line',
+                  emphasis: {
+                      focus: 'series'
+                  },
+                  data: this.tuiMoney
+              }
+
+          ]
+        };
+        this.chart=echarts.init(document.getElementById("echart-customer"));
+        this.chart.setOption(option,true);
+      },
+       getSummaries(param) {
+        const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '总计';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index] += ' ';
+          } else {
+            sums[index] = '';
+          }
+        });
+
+        return sums;
+      }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-container{
+    border: 1px solid #e6e6e6;
+    padding: 12px;
+
+    .app-content{
+      background-color: white;
+      .title{
+        padding: 20px 30px 0px 30px;
+        font-size: 18px;
+        font-weight: bold;
+        color: black;
+
+      }
+      .search-form{
+        margin: 20px 30px 0px 30px;
+      }
+      .data-box{
+        padding: 30px;
+        background-color:  rgb(255, 255, 255);
+        height: 100%;
+
+        .echart-box{
+          margin: 0 auto;
+          text-align: center;
+        }
+        .el-select{
+          margin: 5px 10px;
+        }
+        .table-box{
+          margin-top: 15px;
+          .export{
+            float: right;
+            margin: 10px 0px;
+          }
+        }
+      }
+    }
+}
+  #echart-customer{
+    width:100%;
+    height:320px
+  }
+.vue-treeselect{
+  width: 217px;
+  height: 36px;
+}
+
+</style>
+<style>
+.vue-treeselect__control{
+  display: block;
+}
+</style>

src/views/system/config/config.vue

@@ -18,13 +18,23 @@
               <el-tooltip class="item" effect="dark" content="待支付订单取消时间(分钟)" placement="top-end">
                 <el-input-number  v-model="form1.unPayTime" :min="1"    ></el-input-number>
               </el-tooltip>
-              
+
             </el-form-item>
             <el-form-item  label="公司推广佣金比例" prop="tuiMoneyRate">
               <el-tooltip class="item" effect="dark" content="公司推广佣金比例(%)" placement="top-end">
                 <el-input-number  v-model="form1.tuiMoneyRate" :min="1" :max="100"    ></el-input-number>
               </el-tooltip>
             </el-form-item>
+            <el-form-item  label="服务费" prop="serviceFee">
+              <el-tooltip class="item" effect="dark" content="服务费(元)" placement="top-end">
+                <el-input-number  v-model="form1.serviceFee" :min="0"   ></el-input-number>
+              </el-tooltip>
+            </el-form-item>
+            <el-form-item  label="成本售价比例" prop="salesPriceRate">
+              <el-tooltip class="item" effect="dark" content="成本售价比例(%)" placement="top-end">
+                <el-input-number  v-model="form1.salesPriceRate" :min="1" :max="300"    ></el-input-number>
+              </el-tooltip>
+            </el-form-item>
             <el-form-item  label="公司制单金额最低比例" prop="createMoneyRate">
               <el-tooltip class="item" effect="dark" content="公司制单金额最低比例(%)" placement="top-end">
                 <el-input-number  v-model="form1.createMoneyRate" :min="1" :max="100"    ></el-input-number>
@@ -55,7 +65,7 @@
             </div>
           </el-form>
       </el-tab-pane>
-      
+
       <el-tab-pane label="OSS配置" name="sys.oss.cloudStorage">
           <el-form ref="form2" :model="form2" :rules="rules2" label-width="140px">
             <el-form-item label="类型" prop="type">
@@ -178,7 +188,7 @@
             </div>
          </el-form>
       </el-tab-pane>
-      
+
       <el-tab-pane label="用户协议" name="store.agreement">
           <el-form ref="form5" :model="form5" :rules="rules5" label-width="100px">
             <el-form-item label="用户协议" prop="userAgreement">
@@ -192,8 +202,8 @@
             </div>
           </el-form>
       </el-tab-pane>
-      
-      
+
+
     </el-tabs>
      <el-dialog :title="sign.title" :visible.sync="sign.open" width="500px" append-to-body>
       <el-form ref="signform" :model="signform"   label-width="80px">
@@ -236,7 +246,7 @@ export default {
         open:false,
       },
       signform: {
-        
+
       },
       photoArr:[],
       activeName:"store.config",
@@ -245,41 +255,41 @@ export default {
       // 表单参数
       form1: {
         hotSearch:"",
- 
+
       },
       // 表单校验
       rules1: {
-         
+
       },
       form2: {
-        
+
       },
       // 表单校验
       rules2: {
-        
+
       },
       form3: {
-        
+
       },
       // 表单校验
       rules3: {
-        
+
       },
       form4: {
         sign:[],
-        
+
       },
       // 表单校验
       rules4: {
-        
+
       },
       form5: {
-        
-        
+
+
       },
       // 表单校验
       rules5: {
-        
+
       }
     };
   },
@@ -421,4 +431,4 @@ export default {
   align-items: flex-end;
   justify-content: flex-end;
 }
-</style>
+</style>