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

src/components/work/todayData.vue

@@ -51,9 +51,11 @@
     flex-wrap: wrap;
     display: -webkit-flex;
   }
-  .Data_TotalTu{
-    display:flex;
+
+  .Data_TotalTu {
+    display: flex;
   }
+
   .Data_List {
     box-sizing: border-box;
     flex: 0 0 18.5%;
@@ -165,7 +167,6 @@
     margin: 0 24px 24px 0;
     font-size: 14px;
   }
-
 </style>
 <template>
   <div class="todayData">
@@ -806,7 +807,7 @@
         },
         series4: [],
         chartOptions4: {
-          labels: ['个人直客','同业介绍','学员转介绍','内部介绍'],
+          labels: ['个人直客', '同业介绍', '学员转介绍', '内部介绍'],
           chart: {
             type: "donut",
             width: 40,
@@ -829,7 +830,7 @@
           }
         },
         series5: [{
-          name:'',
+          name: '',
           data: []
         }],
         chartOptions5: {
@@ -853,15 +854,15 @@
           xaxis: {
             categories: [],
             labels: {
-              show:false //隐藏x轴数据
+              show: false //隐藏x轴数据
             }
           },
           tooltip: {
             y: {
-                formatter: undefined,
-                title: {
-                    formatter: (seriesName) => seriesName,
-                },
+              formatter: undefined,
+              title: {
+                formatter: (seriesName) => seriesName,
+              },
             },
           },
         },
@@ -877,14 +878,14 @@
             return time.getTime() > Date.now() - 8.64e6
           }
         },
-        pieData:[], //饼数据
-        btnHui:'',
-        btnVisit:'',
-        btnHetong:'primary',
-        btnHui2:'',
-        btnVisit2:'',
-        btnHetong2:'primary',
-        barData:[] //柱状图数据
+        pieData: [], //饼数据
+        btnHui: '',
+        btnVisit: '',
+        btnHetong: 'primary',
+        btnHui2: '',
+        btnVisit2: '',
+        btnHetong2: 'primary',
+        barData: [] //柱状图数据
       };
     },
     created() {
@@ -931,51 +932,51 @@
     },
     methods: {
       //点击饼切换
-      getPie(type){
-        if(type==1){
-          this.btnHui='primary'
-          this.btnVisit=''
-          this.btnHetong=''
-          this.series4=[]
-          if(this.pieData.ClueData&&this.pieData.ClueData.length>0){
-            this.pieData.ClueData.forEach(x=>{
+      getPie(type) {
+        if (type == 1) {
+          this.btnHui = 'primary'
+          this.btnVisit = ''
+          this.btnHetong = ''
+          this.series4 = []
+          if (this.pieData.ClueData && this.pieData.ClueData.length > 0) {
+            this.pieData.ClueData.forEach(x => {
               this.series4.push(x.ClueCount)
             })
           }
         }
-        if(type==2){
-          this.btnVisit='primary'
-          this.btnHui=''
-          this.btnHetong=''
-          this.series4=[]
-          if(this.pieData.VisitData&&this.pieData.VisitData.length>0){
-            this.pieData.VisitData.forEach(x=>{
+        if (type == 2) {
+          this.btnVisit = 'primary'
+          this.btnHui = ''
+          this.btnHetong = ''
+          this.series4 = []
+          if (this.pieData.VisitData && this.pieData.VisitData.length > 0) {
+            this.pieData.VisitData.forEach(x => {
               this.series4.push(x.VisitCount)
             })
           }
         }
-        if(type==3){
-          this.btnVisit=''
-          this.btnHui=''
-          this.btnHetong='primary'
-          this.series4=[]
-          if(this.pieData.OrderData&&this.pieData.OrderData.length>0){
-            this.pieData.OrderData.forEach(x=>{
+        if (type == 3) {
+          this.btnVisit = ''
+          this.btnHui = ''
+          this.btnHetong = 'primary'
+          this.series4 = []
+          if (this.pieData.OrderData && this.pieData.OrderData.length > 0) {
+            this.pieData.OrderData.forEach(x => {
               this.series4.push(x.OrderCount)
             })
           }
         }
       },
       //切换柱状图
-      getBar(type){
-        if(type==1){
-          this.btnHui2='primary'
-          this.btnVisit2=''
-          this.btnHetong2=''
-          this.series5[0].data=[]
-          this.chartOptions5.xaxis.categories=[]
-          if(this.barData.ClueData&&this.barData.ClueData.length>0){
-            this.barData.ClueData.forEach(x=>{
+      getBar(type) {
+        if (type == 1) {
+          this.btnHui2 = 'primary'
+          this.btnVisit2 = ''
+          this.btnHetong2 = ''
+          this.series5[0].data = []
+          this.chartOptions5.xaxis.categories = []
+          if (this.barData.ClueData && this.barData.ClueData.length > 0) {
+            this.barData.ClueData.forEach(x => {
               this.series5[0].data.push(x.ClueCount)
               this.chartOptions5.xaxis.categories.push(x.ChannelName)
             })
@@ -985,14 +986,14 @@
             this.$refs.zhu.updateSeries(this.series5)
           }, 100)
         }
-        if(type==2){
-          this.btnVisit2='primary'
-          this.btnHui2=''
-          this.btnHetong2=''
-          this.series5[0].data=[]
-          this.chartOptions5.xaxis.categories=[]
-          if(this.barData.VisitData&&this.barData.VisitData.length>0){
-            this.barData.VisitData.forEach(x=>{
+        if (type == 2) {
+          this.btnVisit2 = 'primary'
+          this.btnHui2 = ''
+          this.btnHetong2 = ''
+          this.series5[0].data = []
+          this.chartOptions5.xaxis.categories = []
+          if (this.barData.VisitData && this.barData.VisitData.length > 0) {
+            this.barData.VisitData.forEach(x => {
               this.series5[0].data.push(x.VisitCount)
               this.chartOptions5.xaxis.categories.push(x.ChannelName)
             })
@@ -1002,14 +1003,14 @@
             this.$refs.zhu.updateSeries(this.series5)
           }, 100)
         }
-        if(type==3){
-          this.btnVisit2=''
-          this.btnHui2=''
-          this.btnHetong2='primary'
-          this.series5[0].data=[]
-          this.chartOptions5.xaxis.categories=[]
-          if(this.barData.OrderData&&this.barData.OrderData.length>0){
-            this.barData.OrderData.forEach(x=>{
+        if (type == 3) {
+          this.btnVisit2 = ''
+          this.btnHui2 = ''
+          this.btnHetong2 = 'primary'
+          this.series5[0].data = []
+          this.chartOptions5.xaxis.categories = []
+          if (this.barData.OrderData && this.barData.OrderData.length > 0) {
+            this.barData.OrderData.forEach(x => {
               this.series5[0].data.push(x.OrderCount)
               this.chartOptions5.xaxis.categories.push(x.ChannelName)
             })
@@ -1031,11 +1032,14 @@
         var qMsg = {
           IsLeave: 1,
           Dept_Id: 0,
+          UserRole: 0,
         };
         if (this.comType == 1) {
           qMsg.Dept_Id = 4;
+          qMsg.UserRole = 1;
         } else {
           qMsg.Dept_Id = 13;
+          qMsg.UserRole = 2;
         }
         queryEmployee(qMsg).then(res => {
           this.employeeList = res.Data;
@@ -1102,13 +1106,13 @@
             this.series[2].data = [];
             this.series4 = [];
             this.series5[0].data = [];
-            this.chartOptions5.xaxis.categories=[];
-            this.btnHui=''
-            this.btnVisit=''
-            this.btnHetong='primary'
-            this.btnHui2=''
-            this.btnVisit2=''
-            this.btnHetong2='primary'
+            this.chartOptions5.xaxis.categories = [];
+            this.btnHui = ''
+            this.btnVisit = ''
+            this.btnHetong = 'primary'
+            this.btnHui2 = ''
+            this.btnVisit2 = ''
+            this.btnHetong2 = 'primary'
             tempData.forEach(x => {
               this.series[0].data.push(x.ClueCount);
               this.series[1].data.push(x.VisitCount);
@@ -1117,13 +1121,13 @@
             })
             this.pieData = res.Data.PieData;
             this.barData = res.Data.BarData;
-            if(this.pieData.OrderData&&this.pieData.OrderData.length>0){
-              this.pieData.OrderData.forEach(x=>{
+            if (this.pieData.OrderData && this.pieData.OrderData.length > 0) {
+              this.pieData.OrderData.forEach(x => {
                 this.series4.push(x.OrderCount)
               })
             }
-            if(this.barData.OrderData&&this.barData.OrderData.length>0){
-              this.barData.OrderData.forEach(x=>{
+            if (this.barData.OrderData && this.barData.OrderData.length > 0) {
+              this.barData.OrderData.forEach(x => {
                 this.series5[0].data.push(x.OrderCount)
                 this.chartOptions5.xaxis.categories.push(x.ChannelName);
               })
@@ -1142,5 +1146,4 @@
       },
     }
   }
-
-</script>
+</script>
\ No newline at end of file

src/pages/sale/makeupRate.vue

@@ -106,10 +106,10 @@
   .Sysuser_Date .el-range-editor .el-range-input {
     background: transparent !important;
   }
-  .makeOutDiv .el-table th{
+
+  .makeOutDiv .el-table th {
     background: #f5f6f7;
   }
-
 </style>
 <template>
   <div class="page-body">
@@ -280,7 +280,8 @@
       getEmployeeList() {
         var qMsg = {
           IsLeave: 1,
-          Dept_Id: 4
+          Dept_Id: 4,
+          UserRole: 1,
         };
         queryEmployee(qMsg).then(res => {
           this.EmployeeList = res.Data;