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

src/components/Home.vue

@@ -24,7 +24,7 @@
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期"
-                    @change="setDiyDateRange"
+                    @input="setDiyDateRange"
                     value-format="yyyy-MM-dd"
                     :picker-options="pickerOptions">
                   </el-date-picker>

src/components/dev/payroll.vue

@@ -145,15 +145,11 @@
                               :percentage="setItemProgress(item)"
                               :status="setItemStatus(item)"
                               :format="setItemTextW(item)"
-                              :color="
-                              commissionratioList.AvgLureNum>item.StartValue&&
-                                commissionratioList.AvfOrderNum>item.EndValue?colorlists[Math.floor(Math.random()*10)]:colors[Math.floor(Math.random()*10)]">
+                              :color="commissionratioList.WageMoney>=item.Rate?colorlists[Math.floor(Math.random()*10)]:colors[Math.floor(Math.random()*10)]">
                               </el-progress>
                               <div class="rate-box">
-                                <div class="sanjiao" :style="{'border-bottom-color':commissionratioList.AvgLureNum>item.StartValue&&
-                                commissionratioList.AvfOrderNum>item.EndValue?'#FF7262':'#CACACA'}"></div>
-                                <div class="rate full-width" :class="{'active-rate':commissionratioList.AvgLureNum>item.StartValue&&
-                                    commissionratioList.AvfOrderNum>item.EndValue}">
+                                <div class="sanjiao" :style="{'border-bottom-color':commissionratioList.WageMoney>=item.Rate?'#FF7262':'#CACACA'}"></div>
+                                <div class="rate full-width" :class="{'active-rate':commissionratioList.WageMoney>=item.Rate}">
                                   <i class="el-icon-check" style="font-size:8px"></i> {{item.Rate}}
                                 </div>
                               </div>