客户详情

app-ghs/controllers/OrderController.php

@@ -236,7 +236,7 @@ class OrderController extends BaseController
     {
         $get = Yii::$app->request->get();
         $id = $get['id'] ?? 0;
-        $info = OrderClass::getOrderInfo($id, true, true, true, true, false);
+        $info = OrderClass::getOrderInfo($id, true, true, true, false);
         OrderClass::valid($info, $this->shopId);
         util::success($info);
     }

app-hd/controllers/PurchaseController.php

@@ -87,7 +87,7 @@ class PurchaseController extends BaseController
 	{
 		$get = Yii::$app->request->get();
 		$id = $get['id'] ?? 0;
-		$info = PurchaseClass::getInfo($id, true, true, true);
+		$info = PurchaseClass::getInfo($id, true, true);
 		PurchaseClass::valid($info, $this->shopId);
 		util::success($info);
 	}
@@ -106,7 +106,6 @@ class PurchaseController extends BaseController
 	//待结款明细 shish 2021.1.26
 	public function actionDebtList()
 	{
-		$get = Yii::$app->request->get();
 		$where = [
 			'merchantId' => $this->sjId,
 			'debt' => PurchaseClass::DEBT_YES

biz-ghs/order/classes/OrderClass.php

@@ -234,7 +234,7 @@ class OrderClass extends BaseClass
 
     //整合订单员工和供货商等信息 shish 2021.1.19
     //$isList 是否列表页
-    public static function groupOrder($list, $showButton = false, $showProgress = false, $showItem = false, $showExpress = false, $isList = false)
+    public static function groupOrder($list, $showButton = false, $showItem = false, $showExpress = false, $isList = false)
     {
         if (empty($list)) {
             return $list;
@@ -249,8 +249,7 @@ class OrderClass extends BaseClass
             $list[$key]['customAddress'] = $val['receiveFullAddress'] ?? '';
             //显示列表页的操作按钮
             $list[$key]['buttonList'] = self::getShowButton($showButton, $isList, $val);
-            //显示进度条
-            $list[$key]['progress'] = self::getShowProgress($showProgress, $val);
+
             //显示产品
             $showItem = self::getShowItem($showItem, $val);
             $list[$key]['product'] = $showItem['list'];
@@ -283,13 +282,13 @@ class OrderClass extends BaseClass
     }
 
     //获取订单详情 shish 2021.1.21
-    public static function getOrderInfo($id, $showButton = false, $showProgress = false, $showItem = false, $showExpress = false, $isList = false)
+    public static function getOrderInfo($id, $showButton = false, $showItem = false, $showExpress = false, $isList = false)
     {
         $info = self::getById($id);
         if (empty($info)) {
             util::fail('没有找到订单');
         }
-        $respond = self::groupOrder([$info], $showButton, $showProgress, $showItem, $showExpress, $isList);
+        $respond = self::groupOrder([$info], $showButton, $showItem, $showExpress, $isList);
         return current($respond);
     }
 

biz-hd/purchase/classes/PurchaseClass.php

@@ -65,16 +65,16 @@ class PurchaseClass extends BaseClass
     }
 
     //获取采购单信息 shish 2021.1.24
-    public static function getInfo($id, $showButton = false, $showProgress = false, $showProduct = false)
+    public static function getInfo($id, $showButton = false, $showProduct = false)
     {
         $info = self::getById($id);
-        $respond = self::groupPurchase([$info], $showButton, $showProgress, $showProduct);
+        $respond = self::groupPurchase([$info], $showButton, $showProduct);
         return current($respond);
 
     }
 
     //组合数据 shish 2021.1.25
-    public static function groupPurchase($list, $showButton = false, $showProgress = false, $showProduct = false)
+    public static function groupPurchase($list, $showButton = false, $showProduct = false)
     {
 
         $supplierIds = array_unique(array_filter(array_column($list, 'supplierId')));
@@ -100,13 +100,7 @@ class PurchaseClass extends BaseClass
                     ['type' => 'debtPay', 'show' => 1, 'disable' => 0],
                 ];
             }
-            if ($showProgress) {
-                $list[$key]['progress'] = [
-                    ['name' => '创建', 'complete' => 1],
-                    ['name' => '待确认', 'complete' => 0],
-                    ['name' => '入库', 'complete' => 0],
-                ];
-            }
+
             if ($showProduct) {
                 $list[$key]['product'] = [
                     [