shish hace 2 años
padre
commit
ad1e040f7c
Se han modificado 2 ficheros con 16 adiciones y 5 borrados
  1. 13 5
      app-ghs/controllers/GhsController.php
  2. 3 0
      biz-ghs/ghs/classes/GhsClass.php

+ 13 - 5
app-ghs/controllers/GhsController.php

@@ -166,11 +166,19 @@ class GhsController extends BaseController
         if (is_numeric($location)) {
             $where['location'] = $location;
         }
-        $list = GhsClass::getGhsList($where);
-        //累计总欠款
-        $totalDebtAmount = PurchaseOrderClass::sum(['mainId' => $this->mainId, 'status' => 4, 'debt' => PurchaseOrderClass::DEBT_YES], 'actPrice');
-        $list['totalDebtAmount'] = $totalDebtAmount;
-        util::success($list);
+        $respond = GhsClass::getGhsList($where);
+        $staff = $this->shopAdmin;
+        //待结款合计,有财务权限才能查看
+        if (isset($staff->finance) == false || $staff->finance == 0) {
+            $totalDebtAmount = 0;
+            $totalExpendAmount = 0;
+        } else {
+            $totalDebtAmount = PurchaseOrderClass::sum(['mainId' => $this->mainId, 'status' => 4, 'debt' => PurchaseOrderClass::DEBT_YES], 'actPrice');
+            $totalExpendAmount = PurchaseOrderClass::sum(['mainId' => $this->mainId, 'status' => 4, 'debt' => PurchaseOrderClass::DEBT_YES], 'expendAmount');
+        }
+        $respond['totalDebtAmount'] = $totalDebtAmount;
+        $respond['totalExpendAmount'] = $totalExpendAmount;
+        util::success($respond);
     }
 
     //下载供货商 ssh 20240506

+ 3 - 0
biz-ghs/ghs/classes/GhsClass.php

@@ -3,6 +3,7 @@
 namespace bizGhs\ghs\classes;
 
 use bizGhs\base\classes\BaseClass;
+use bizGhs\ghs\models\Ghs;
 use bizGhs\order\classes\PurchaseOrderClass;
 use bizGhs\shop\classes\ShopClass;
 use common\components\imgUtil;
@@ -18,6 +19,8 @@ class GhsClass extends BaseClass
     {
         $data = self::getList('*', $where, 'inTurn DESC,addTime DESC');
         $data['list'] = self::groupBaseInfo($data['list']);
+        $num = Ghs::find()->where($where)->count();
+        $data['num'] = $num;
         return $data;
     }