Merge branch 'feature/2175-team-perf' into dev

backendEle/src/views/bonus/period.vue

@@ -110,8 +110,8 @@
               </div>
             </el-dialog>
 
-            <el-dropdown size="small" trigger="click" v-if=false>
-<!--            <el-dropdown size="small" trigger="click" v-if="scope.row.BUTTON_IS_CAN">-->
+<!--            <el-dropdown size="small" trigger="click" v-if=false>-->
+            <el-dropdown size="small" trigger="click" v-if="scope.row.BUTTON_IS_CAN">
               <el-button type="primary" size="small" @click.stop="">
                 <!-- 操作该数据 -->Action<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>

common/models/PerfMonth.php

@@ -153,7 +153,7 @@ class PerfMonth extends \common\components\ActiveRecord
 
     // 校验业绩状态
     public static function checkStatus($pv) {
-        if ($pv >= 300) {
+        if ($pv >= 1500) {
             return true;
         }