cqp 10 сар өмнө
parent
commit
ff46a30712

+ 2 - 0
app/Model/RoleMenuButton.php

@@ -16,4 +16,6 @@ class RoleMenuButton extends Model
     const special_three = -3;
     const special_four = -4;
     const special_five = -5;
+    const special_six = -6;
+    const special_seven = -7;
 }

+ 6 - 7
app/Service/EmployeeService.php

@@ -18,7 +18,6 @@ use App\Model\Role;
 use App\Model\RoleMenu;
 use App\Model\RoleMenuButton;
 use App\Model\Storehouse;
-use App\Model\Supplier;
 use App\Model\SysMenu;
 use App\Model\SysMenuButton;
 use App\Model\Team;
@@ -478,7 +477,7 @@ class EmployeeService extends Service
         $model->title = $data['title'];
         $model->save();
 
-        return [true,'保存成功!'];
+        return [true,''];
     }
 
     /**
@@ -497,7 +496,7 @@ class EmployeeService extends Service
         $model->top_depart_id = $data['top_depart_id'] ?? 0;
         $model->save();
 
-        return [true,'保存成功!'];
+        return [true,''];
     }
 
     /**
@@ -525,7 +524,7 @@ class EmployeeService extends Service
             'del_time' => time()
         ]);
 
-        return [true,'删除成功'];
+        return [true, ''];
     }
 
     /**
@@ -542,7 +541,7 @@ class EmployeeService extends Service
 
         $list = $this->limit($model,'',$data);
 
-        return [200,$list];
+        return [true, $list];
     }
 
     /**
@@ -575,7 +574,7 @@ class EmployeeService extends Service
             if($bool) return [false,'角色名称已存在!'];
         }
 
-        return [true,''];
+        return [true, ''];
     }
 
     /**
@@ -620,7 +619,7 @@ class EmployeeService extends Service
             return [false,$exception->getMessage()];
         }
 
-        return [true,'保存成功!'];
+        return [true, ''];
     }
 
     /**

+ 28 - 0
app/Service/PurchaseOrderService.php

@@ -12,6 +12,7 @@ use App\Model\PurchaseOrder;
 use App\Model\PurchaseOrderFile;
 use App\Model\PurchaseOrderInfo;
 use App\Model\ReturnExchangeOrder;
+use App\Model\RoleMenuButton;
 use App\Model\SalesOrder;
 use App\Model\SeeRange;
 use App\Model\SportsBag;
@@ -245,6 +246,20 @@ class PurchaseOrderService extends Service
             ->first();
         if(empty($order)) return [false, '采购订单不存在或已被删除'];
         $order = $order->toArray();
+
+        //特殊功能按钮
+        $special_button = $user['special_button'] ?? [];
+
+        //其它费用隐藏
+        $price = "******";
+        if(in_array(RoleMenuButton::special_six,$special_button)) $price = $order['other_fee'];
+        $order['other_fee_show'] = $price;
+
+        //优惠金额隐藏
+        $price = "******";
+        if(in_array(RoleMenuButton::special_seven,$special_button)) $price = $order['discount_fee'];
+        $order['discount_fee_show'] = $price;
+
         $order['activity_product'] = $order['file'] = [];
         $order['purchase_type_title'] = BasicType::where('id',$order['purchase_type'])->value('title') ?? '';
         $order['storehouse_title'] = Storehouse::where('id',$order['storehouse_id'])->value('title');
@@ -548,6 +563,9 @@ class PurchaseOrderService extends Service
         //订单状态数据组织
         $state_array = $this->getStateMake($data['data']);
 
+        //特殊功能按钮
+        $special_button = $user['special_button'] ?? [];
+
         foreach ($data['data'] as $key => $value){
             $supplier_tmp = $supplier_map[$value['supplier']] ?? [];
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date("Y-m-d H:i:s",$value['crt_time']) : '';
@@ -601,6 +619,16 @@ class PurchaseOrderService extends Service
             //坏账金额
             $data['data'][$key]['fee4'] = $bad;
             //用于统计--------
+
+            //其它费用隐藏
+            $price = "******";
+            if(in_array(RoleMenuButton::special_six,$special_button)) $price = $value['other_fee'];
+            $data['data'][$key]['other_fee_show'] = $price;
+
+            //优惠金额隐藏
+            $price = "******";
+            if(in_array(RoleMenuButton::special_seven,$special_button)) $price = $value['discount_fee'];
+            $data['data'][$key]['discount_fee_show'] = $price;
         }
 
         return $data;

+ 14 - 0
config/specialButton.php

@@ -37,5 +37,19 @@ return [
         "func" => "special_sure_construction",
         "menu_id" => 34,
     ],
+    [
+        "id" => \App\Model\RoleMenuButton::special_six,
+        "title" => "其它费用",
+        "sort" => -6,
+        "func" => "special_purchase_other_fee",
+        "menu_id" => 45,
+    ],
+    [
+        "id" => \App\Model\RoleMenuButton::special_seven,
+        "title" => "优惠金额",
+        "sort" => -7,
+        "func" => "special_purchase_discount_fee",
+        "menu_id" => 45,
+    ],
 ];