Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/components/dev/payroll.vue

@@ -34,7 +34,12 @@
                 </el-table-column>
                 <el-table-column label="引流数量">
                     <template slot-scope="scope">
-                    {{scope.row.LureNum}}
+                    {{scope.row.EmpType == 1 ? '-' : scope.row.LureNum}}
+                    </template>
+                </el-table-column>
+                <el-table-column label="成交单数">
+                    <template slot-scope="scope">
+                    {{scope.row.EmpType == 1 ? '-' : scope.row.OrderNum}}
                     </template>
                 </el-table-column>
                 <el-table-column label="工资规则">
@@ -42,9 +47,14 @@
                         <span :class="scope.row.WageType!=1?'cursor-p':''" @click="scope.row.WageType!=1?GenerateScale(scope.row):''">{{scope.row.WageType!=1?'上季度定档':'新员工比例'}}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="基本工资">
+                    <template slot-scope="scope">
+                    {{scope.row.WageMoney}}
+                    </template>
+                </el-table-column>
                 <el-table-column label="本次提成比例">
                     <template slot-scope="scope">
-                    {{scope.row.CommissionRate?scope.row.CommissionRate+'%':'-'}}
+                    {{scope.row.CommissionRate}}%
                     </template>
                 </el-table-column>
                 <el-table-column label="提成金额">
@@ -52,9 +62,9 @@
                     {{scope.row.Commission}}
                     </template>
                 </el-table-column>
-                <el-table-column label="基本工资">
+                <el-table-column label="本次年终比例">
                     <template slot-scope="scope">
-                    {{scope.row.WageMoney}}
+                    {{scope.row.BonusRate}}%
                     </template>
                 </el-table-column>
                 <el-table-column label="当月年终奖励">
@@ -436,11 +446,17 @@
         background: #FFE082 !important;
     }
     /deep/.el-table tr:first-child th:nth-child(8){
-        background: #E1BEE7 !important;
+        background: #FFE082 !important;
     }
     /deep/.el-table tr:first-child th:nth-child(9){
         background: #E1BEE7 !important;
     }
+    /deep/.el-table tr:first-child th:nth-child(10){
+        background: #E1BEE7 !important;
+    }
+    /deep/.el-table tr:first-child th:nth-child(11){
+        background: #E1BEE7 !important;
+    }
     /deep/.el-table tr td:nth-child(6){
         background: #FFE082;
     }
@@ -448,9 +464,15 @@
         background: #FFE082;
     }
     /deep/.el-table tr td:nth-child(8){
-        background: #E1BEE7;
+        background: #FFE082;
     }
     /deep/.el-table tr td:nth-child(9){
         background: #E1BEE7;
     }
+    /deep/.el-table tr td:nth-child(10){
+        background: #E1BEE7;
+    }
+    /deep/.el-table tr td:nth-child(11){
+        background: #E1BEE7;
+    }
 </style>
\ No newline at end of file