Преглед изворни кода

预结算增加封期时间判断,隐藏原action按钮

theo пре 3 година
родитељ
комит
2bba34e481
2 измењених фајлова са 32 додато и 30 уклоњено
  1. 30 30
      backendEle/src/views/bonus/period.vue
  2. 2 0
      common/models/Period.php

+ 30 - 30
backendEle/src/views/bonus/period.vue

@@ -114,36 +114,36 @@
             </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-button type="primary" size="small" @click.stop="">
-                <!-- 操作该数据 -->Action<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="closeHandle(scope.row)"
-                                  v-if="scope.row.IS_CAN_CLOSE && permission.hasPermission(`bonus/close-period`)">Closure period<!-- 封期 -->
-                </el-dropdown-item>
-                <el-dropdown-item @click.native="perfHandle(scope.row)"
-                                  v-if="scope.row.IS_PERFING === '0' && scope.row.IS_CAN_PERF && permission.hasPermission(`bonus/perf-period`)">
-                  <!-- 生成业绩单 -->Generate performance sheet
-                </el-dropdown-item>
-                <el-dropdown-item @click.native="perfHandle(scope.row)"
-                                  v-if="scope.row.IS_PERFING === '1' && scope.row.IS_CAN_PERF && permission.hasPermission(`bonus/perf-period`)">
-                  <!-- 强制生成业绩单 -->Forced generation of performance sheet
-                </el-dropdown-item>
-                <el-dropdown-item @click.native="calcHandle(scope.row)"
-                                  v-if="scope.row.IS_CALCING === '0' && scope.row.IS_CAN_CALC && permission.hasPermission(`bonus/calc-period`)">
-                  <!-- 结算 -->settlement
-                </el-dropdown-item>
-                <el-dropdown-item @click.native="calcHandle(scope.row)"
-                                  v-if="scope.row.IS_CALCING === '1' && scope.row.IS_CAN_CALC && permission.hasPermission(`bonus/calc-period`)">
-                  <!-- 强制结算 -->Forced settlement
-                </el-dropdown-item>
-                <el-dropdown-item @click.native="sentHandle(scope.row)"
-                                  v-if="scope.row.IS_CAN_SENT && permission.hasPermission(`bonus/send-period`)">
-                  <!-- 挂网 -->spread a net
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
+<!--            <el-dropdown size="small" trigger="click" v-if="scope.row.BUTTON_IS_CAN">-->
+<!--              <el-button type="primary" size="small" @click.stop="">-->
+<!--                &lt;!&ndash; 操作该数据 &ndash;&gt;Action<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
+<!--              </el-button>-->
+<!--              <el-dropdown-menu slot="dropdown">-->
+<!--                <el-dropdown-item @click.native="closeHandle(scope.row)"-->
+<!--                                  v-if="scope.row.IS_CAN_CLOSE && permission.hasPermission(`bonus/close-period`)">Closure period&lt;!&ndash; 封期 &ndash;&gt;-->
+<!--                </el-dropdown-item>-->
+<!--                <el-dropdown-item @click.native="perfHandle(scope.row)"-->
+<!--                                  v-if="scope.row.IS_PERFING === '0' && scope.row.IS_CAN_PERF && permission.hasPermission(`bonus/perf-period`)">-->
+<!--                  &lt;!&ndash; 生成业绩单 &ndash;&gt;Generate performance sheet-->
+<!--                </el-dropdown-item>-->
+<!--                <el-dropdown-item @click.native="perfHandle(scope.row)"-->
+<!--                                  v-if="scope.row.IS_PERFING === '1' && scope.row.IS_CAN_PERF && permission.hasPermission(`bonus/perf-period`)">-->
+<!--                  &lt;!&ndash; 强制生成业绩单 &ndash;&gt;Forced generation of performance sheet-->
+<!--                </el-dropdown-item>-->
+<!--                <el-dropdown-item @click.native="calcHandle(scope.row)"-->
+<!--                                  v-if="scope.row.IS_CALCING === '0' && scope.row.IS_CAN_CALC && permission.hasPermission(`bonus/calc-period`)">-->
+<!--                  &lt;!&ndash; 结算 &ndash;&gt;settlement-->
+<!--                </el-dropdown-item>-->
+<!--                <el-dropdown-item @click.native="calcHandle(scope.row)"-->
+<!--                                  v-if="scope.row.IS_CALCING === '1' && scope.row.IS_CAN_CALC && permission.hasPermission(`bonus/calc-period`)">-->
+<!--                  &lt;!&ndash; 强制结算 &ndash;&gt;Forced settlement-->
+<!--                </el-dropdown-item>-->
+<!--                <el-dropdown-item @click.native="sentHandle(scope.row)"-->
+<!--                                  v-if="scope.row.IS_CAN_SENT && permission.hasPermission(`bonus/send-period`)">-->
+<!--                  &lt;!&ndash; 挂网 &ndash;&gt;spread a net-->
+<!--                </el-dropdown-item>-->
+<!--              </el-dropdown-menu>-->
+<!--            </el-dropdown>-->
           </template>
         </el-table-column>
       </el-table>

+ 2 - 0
common/models/Period.php

@@ -912,6 +912,8 @@ class Period extends \common\components\ActiveRecord
         //挂网则拒绝操作,返回true则拒绝操作
         if ($period['IS_SENT'] == self::SEND_FINISH) return true;
         if ($period['IS_PREPARING'] == self::IS_PREPARING) return true;
+        $nowTs = time();
+        if ($nowTs-6 > $period['END_TIME']) return true;
         return false;
     }