From 2bbacb15a503196b413b0adee62c526ea1caf012 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 12 Jul 2021 18:03:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=8D=E7=AE=97=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/MarketPercentageController.class.php | 4 ++++ Application/Admin/View/MarketPercentage/index.html | 4 +++- .../Admin/View/MarketPercentage/marketstaffsettle.html | 4 +++- .../Admin/View/MarketPercentage/personmarketstaffsettle.html | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index 418007af1..46a88d1be 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -222,6 +222,9 @@ class MarketPercentageController extends ThinkController $this->checkListOrCountAuthRestMap($map, []); $this->assign("list_data", $data); + + $this->assign("is_can_recount",D("CmdTasks")->isCanAddTask("MarketPerformanceSet")); + $this->display(); } @@ -991,6 +994,7 @@ class MarketPercentageController extends ThinkController $this->assign("sum", $sum); $this->assign("list_data", $data); + $this->assign("is_can_recount",D("CmdTasks")->isCanAddTask("MarketPerformanceSet")); $this->display("marketstaffsettle"); } diff --git a/Application/Admin/View/MarketPercentage/index.html b/Application/Admin/View/MarketPercentage/index.html index 8dae70017..763a84f1e 100644 --- a/Application/Admin/View/MarketPercentage/index.html +++ b/Application/Admin/View/MarketPercentage/index.html @@ -43,7 +43,9 @@
- 重算 + + 重算 +
diff --git a/Application/Admin/View/MarketPercentage/marketstaffsettle.html b/Application/Admin/View/MarketPercentage/marketstaffsettle.html index 5662afabe..e6ae1cedd 100644 --- a/Application/Admin/View/MarketPercentage/marketstaffsettle.html +++ b/Application/Admin/View/MarketPercentage/marketstaffsettle.html @@ -113,7 +113,9 @@
- 重算 + + 重算 +
diff --git a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html index 5b7e6e8b8..541a4c1da 100644 --- a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html +++ b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html @@ -38,13 +38,13 @@
-
+