theo před 3 roky
rodič
revize
172cdbd3f7

+ 1 - 1
backendEle/src/views/user/index.vue

@@ -488,7 +488,7 @@
                 })
                 return
             }
-            let isChartTip = isAtlas === true ? 'Display Chart' : 'Hidden Chart'//'显示图谱' : '隐藏图谱'
+            let isAtlasTip = isAtlas === true ? 'Display Chart' : 'Hidden Chart'//'显示图谱' : '隐藏图谱'
             this.$confirm(`Are you sure you want to【${isAtlasTip}】?`, 'Hint', {//`确定要对所选会员【${isAtlasTip}】吗?`, '提示'
                 confirmButtonText: 'confirm', // 确定
                 cancelButtonText: 'cancel', // 取消

+ 2 - 2
console/controllers/CalcController.php

@@ -163,7 +163,7 @@ class CalcController extends BaseController
             self::recordCalcAndProcessStatus($periodNum, '基础数据已全部推送');
             return true;
         } else {
-            self::recordCalcAndProcessStatus($periodNum, '基础数据推送失败,原因:' . $res['msg'] ?? '');
+            self::recordCalcAndProcessStatus($periodNum, '基础数据推送失败,原因:' . substr($res['msg'],0,100));
             return false;
         }
     }
@@ -183,7 +183,7 @@ class CalcController extends BaseController
             self::recordCalcAndProcessStatus($periodNum, '期业绩数据已全部拉取');
             return true;
         } else {
-            self::recordCalcAndProcessStatus($periodNum, '期业绩数据拉取失败,原因:' . $res['msg'] ?? '');
+            self::recordCalcAndProcessStatus($periodNum, '期业绩数据拉取失败,原因:' . substr($res['msg'],0,100));
             return false;
         }
     }

+ 4 - 0
sql/upgrade/2521-2522PGS.sql

@@ -0,0 +1,4 @@
+-- 期业绩增加是否活跃字段
+ALTER TABLE `AR_PERF_PERIOD` ADD COLUMN `IS_ACTIVE` tinyint NOT NULL DEFAULT '0' COMMENT '是否活跃: 0否 1是';
+-- 月业绩增加个人小组业绩字段
+ALTER TABLE `AR_PERF_MONTH` ADD COLUMN `DIRECTOR_BONUS_PGS` decimal(16,3) NOT NULL DEFAULT '0.000' COMMENT '管理奖-个人小组业绩';