Browse Source

首店发起采购

shish 5 years ago
parent
commit
bec0fd736c

+ 1 - 9
app-ghs/controllers/PurchaseOrderController.php

@@ -23,15 +23,7 @@ class PurchaseOrderController extends BaseController
         $shop = $this->shop;
         $default = $shop->default ?? 0;
         if ($default != 1) {
-            util::fail('首店才能采购');
-        }
-
-        $shopAdmin = $this->shopAdmin;
-        $roleId = $shopAdmin['roleId'] ?? 0;
-        $role = AdminRoleClass::getById($roleId);
-        $roleName = $role['roleName'] ?? '';
-        if ($roleName == '员工') {
-            util::fail('您没有权限操作哦');
+            util::fail('请在首店发起采购');
         }
 
         $ghsItemInfo = $post['itemInfo'] ?? '';

+ 2 - 2
biz-ghs/order/classes/OrderClass.php

@@ -527,7 +527,7 @@ class OrderClass extends BaseClass
                     $bigTotalPrice = bcmul($bigUnitPrice, $bigNum, 2);
                     $printProduct[] = [
                         'name' => $itemVal['name'] ?? '',
-                        'num' => $bigNum . '扎/' . $bigUnitPrice,
+                        'num' => $bigNum . '扎*' . $bigUnitPrice,
                         'price' => $bigTotalPrice
                     ];
                 }
@@ -535,7 +535,7 @@ class OrderClass extends BaseClass
                     $smallTotalPrice = bcmul($smallUnitPrice, $smallNum, 2);
                     $printProduct[] = [
                         'name' => $itemVal['name'] ?? '',
-                        'num' => $smallNum . '支/' . $smallUnitPrice,
+                        'num' => $smallNum . '支*' . $smallUnitPrice,
                         'price' => $smallTotalPrice
                     ];
                 }