2

app/Service/InvoiceOrderService.php

@@ -220,7 +220,7 @@ class InvoiceOrderService extends Service
     public function getList($data,$user){
         $model = InvoiceOrder::Clear($user,$data);
         $model = $model->where('del_time',0)
-            ->select('id','order_number','sales_order_id','depart_id','send','send_time','take','take_address','take_phone','logistics_company','logistics_number','crt_id','mark','state','crt_time','storehouse_id')
+            ->select('id','order_number','sales_order_id','depart_id','send','send_time','take','take_address','take_phone','logistics_company','logistics_number','crt_id','mark','state','crt_time','storehouse_id','top_depart_id')
             ->orderby('id', 'desc');
         if(! empty($data['order_number'])) $model->where('order_number', 'LIKE', '%'.$data['order_number'].'%');
         if(isset($data['state'])) $model->where('state',$data['state']);
@@ -309,7 +309,7 @@ class InvoiceOrderService extends Service
         if($this->isEmpty($data,'send')) return [false,'发货人不能为空！'];
         if($this->isEmpty($data,'product')) return [false,'产品不能为空！'];
 //        if(empty($data['logistics_number'])) return [false,'物流单号不能为空'];
-        if(empty($data['storehouse_id'])) return [false,'请选择仓库'];
+        if(empty($data['storehouse_id'])) return [false,'请选择发货仓库'];
         if(! empty($data['send_time'])) $data['send_time'] = $this->changeDateToDateMin($data['send_time']);
         if(! empty($data['sales_order_id'])) {
             $sales = SalesOrder::where('del_time',0)

config/header/36.php

@@ -16,7 +16,7 @@ return [
     ],
     [
         'key' => 'storehouse_title',
-        'value' => '仓库',
+        'value' => '发货仓库',
     ],
     [
         'key' => 'take',