1

app/Http/Controllers/Api/EmployeeController.php

@@ -144,7 +144,7 @@ class EmployeeController extends BaseController
     {
         $service = new EmployeeService();
         $user = $request->userData->toArray();
-        list($status,$data) = $service->departEdit($request->all());
+        list($status,$data) = $service->departEdit($request->all(),$user);
 
         if($status){
             return $this->json_return(200,'',$data);

app/Service/PurchaseOrderService.php

@@ -32,7 +32,6 @@ class PurchaseOrderService extends Service
             $material_model->order_number = $data['order_number'];
             $material_model->depart_id = $data['depart_id'] ?? 0;
             $material_model->top_depart_id = $data['top_depart_id'] ?? 0;
-            $material_model->rate = $data['rate'] ?? 0;
             $material_model->total = $data['total'] ?? 0;
             $material_model->other_fee = $data['other_fee'] ?? 0;
             $material_model->discount_fee = $data['discount_fee'] ?? 0;
@@ -94,7 +93,6 @@ class PurchaseOrderService extends Service
             $material_model->order_number = $data['order_number'];
             $material_model->depart_id = $data['depart_id'] ?? 0;
             $material_model->top_depart_id = $data['top_depart_id'] ?? 0;
-            $material_model->rate = $data['rate'] ?? 0;
             $material_model->total = $data['total'] ?? 0;
             $material_model->other_fee = $data['other_fee'] ?? 0;
             $material_model->discount_fee = $data['discount_fee'] ?? 0;
@@ -149,7 +147,7 @@ class PurchaseOrderService extends Service
 
         $order = PurchaseOrder::where('order_number',$data['order_number'])
             ->where('del_time',0)
-            ->select('id','order_number','depart_id','mark','state','crt_id','order_type','sales_order_id','supplier','purchase_id','rate','total','other_fee','discount_fee','purchase_total','crt_time','is_purchase_to_main')
+            ->select('id','order_number','depart_id','mark','state','crt_id','order_type','sales_order_id','supplier','purchase_id','total','other_fee','discount_fee','purchase_total','crt_time','is_purchase_to_main')
             ->first();
         if(empty($order)) return [false, '采购订单不存在或已被删除'];
         $order = $order->toArray();
@@ -212,7 +210,7 @@ class PurchaseOrderService extends Service
      */
     public function getList($data,$user){
         $model = new PurchaseOrder(['userData' => $user, 'search' => $data]);
-        $model = $model->where('del_time',0)->select('order_number','id','depart_id','top_depart_id','mark','crt_time','state','crt_id','order_type','sales_order_id','supplier','purchase_id','purchase_total','rate','discount_fee','other_fee','total','is_purchase_to_main','storehouse_id')
+        $model = $model->where('del_time',0)->select('order_number','id','depart_id','top_depart_id','mark','crt_time','state','crt_id','order_type','sales_order_id','supplier','purchase_id','purchase_total','discount_fee','other_fee','total','is_purchase_to_main','storehouse_id')
             ->orderby('id', 'desc');
         if(! empty($data['order_number'])) $model->where('order_number', 'LIKE', '%'.$data['order_number'].'%');
         if(! empty($data['depart_id'])) $model->where('depart_id', $data['depart_id']);
@@ -275,10 +273,6 @@ class PurchaseOrderService extends Service
         if(empty($data['order_type'])) return [false,'采购订单类型不能为空'];
         if($this->isEmpty($data,'product')) return [false,'产品不能为空'];
         if(! empty($data['storehouse_id'])) return [false,'请选择仓库'];
-        if(! empty($data['rate'])){
-            $res = $this->checkNumber($data['rate']);
-            if(! $res) return [false, '整单扣除率请输入不超过两位小数并且大于0的数值'];
-        }
         if(! empty($data['other_fee'])){
             $res = $this->checkNumber($data['other_fee']);
             if(! $res) return [false, '其它费用请输入不超过两位小数并且大于0的数值'];