Merge branch 'forward' into dev

app-ghs/controllers/ConsoleController.php

@@ -39,8 +39,8 @@ class ConsoleController extends BaseController
         );
         $totalItemNum = floor($stat['totalItemNum'] ?? 0);
         $totalCost = round($stat['totalCost'] ?? 0, 2);
-        $totalBalance = CustomClass::sum(['ownMainId'=>$this->mainId],'balance');
-        $may = $totalBalance<0 ? abs($totalBalance) : 0;
+        $totalBalance = CustomClass::sum(['ownMainId' => $this->mainId], 'balance');
+        $may = $totalBalance < 0 ? abs($totalBalance) : 0;
         $overview = [
             ['name' => "库存数", "url" => '/admin/stat/stock', 'value' => $totalItemNum, 'type' => 1],
             ['name' => "库存值", "url" => '/admin/stat/stock', 'value' => $totalCost, 'type' => 1],
@@ -157,7 +157,7 @@ class ConsoleController extends BaseController
             $deadTime = strtotime($deadline);
             $remainingSeconds = $deadTime - $currentTime;
             $remainingDays = ceil($remainingSeconds / 86400);
-            
+
             // 到期前7天提醒
             if ($remainingSeconds <= 604800) {
                 if ($remainingSeconds <= 0) {
@@ -238,7 +238,8 @@ class ConsoleController extends BaseController
             ["name" => "报损", "img" => "ghs/home/kcyjs.png", "url" => "/admin/breakage/list"],
             ["name" => "拆散", "img" => "ghs/home/kcyjs.png", "url" => "/admin/part/list"],
             ["name" => "收款流水", "img" => "ghs/home/kcyjs.png", "url" => "/admin/order/scanPay"],
-            ["name" => "公告", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/ghsNotice/list"]
+            ["name" => "公告", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/ghsNotice/list"],
+            ["name" => "冲销单", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/custom/selectCustom?style=1&forward=1"],
         ];
         $menuV3 = [
             ["name" => "商城码", "img" => "ghs/home/shop3.png", "url" => "/admin/home/mall"],
@@ -260,7 +261,8 @@ class ConsoleController extends BaseController
             ["name" => "报损", "img" => "ghs/home/kcyjs.png", "url" => "/admin/breakage/list"],
             ["name" => "拆散", "img" => "ghs/home/kcyjs.png", "url" => "/admin/part/list"],
             ["name" => "收款流水", "img" => "ghs/home/kcyjs.png", "url" => "/admin/order/scanPay"],
-            ["name" => "公告", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/ghsNotice/list"]
+            ["name" => "公告", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/ghsNotice/list"],
+            ["name" => "冲销单", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/custom/selectCustom?style=1&forward=1"],
         ];
         $menuIconMap = [
             '商城码' => 'mall_code',
@@ -286,6 +288,7 @@ class ConsoleController extends BaseController
             '公告' => 'purchase_record',
             '商城' => 'mall_code',
             '花材(简)' => 'item',
+            '冲销单' => 'purchase_record',
         ];
         if ($version == 2) {
             $menu = $menuV2;
@@ -297,7 +300,7 @@ class ConsoleController extends BaseController
                 $menuItem['icon'] = $menuIconMap[$item['name']] ?? 'item';
                 $menu[] = $menuItem;
             }
-        }elseif($version == 4) {
+        } elseif ($version == 4) {
             $menu = [];
             foreach ($menuV3 as $item) {
                 $menuItem = $item;