修改提示信息

app/Service/ConstructionService.php

@@ -799,7 +799,8 @@ class ConstructionService extends Service
 
         $order_no = [];
         foreach ($data as $value){
-            if($value['state'] != Construction::STATE_ONE) continue;
+            if(! in_array($value['state'], [Construction::State_minus_one,Construction::STATE_ONE])) continue;
+
             $order_no[] = $value['order_number'];
         }
 
@@ -808,8 +809,12 @@ class ConstructionService extends Service
 
     public function makeState($value, $state_array){
         if(! empty($state_array[$value['order_number']])){
-            $emp_tmp = $state_array[$value['order_number']];
-            $state = "待" . $emp_tmp . "审核";
+            $return = $state_array[$value['order_number']];
+            if($value['state'] == Construction::State_minus_one){
+                $state = "驳回:" . $return;
+            }else{
+                $state = "待" . $return . "审核";
+            }
         }elseif($value['state'] == Construction::STATE_ZERO){
             $state = "待" . $value['crt_name'] . "提交";
         }else{

app/Service/OaService.php

@@ -1123,13 +1123,14 @@ class OaService extends Service
 
         $oa_order_id = array_values($map);
         $list = OaOrderSub::whereIn('oa_order_id', $oa_order_id)
-            ->where('state',0)
+            ->whereIn('state',[0,2])
             ->select('id','state','oa_order_id')
-            ->orderBy('id', 'asc')
+            ->orderBy('id', 'desc')
             ->get()->toArray();
         $subEmployeeList = OaOrderSubEmployee::whereIn('oa_order_id', $oa_order_id)
             ->select('*')
             ->get()->toArray();
+        //oa_order_sub 每条数据对应的人
         $emp_id_key_list = [];
         $employee_key_list = Employee::whereIn('id',array_unique(array_column($subEmployeeList,'employee_id')))
             ->pluck('emp_name', 'id')
@@ -1144,16 +1145,17 @@ class OaService extends Service
         $return = [];
         foreach ($list as $v) {
             $order_no_tmp = $map2[$v['oa_order_id']] ?? "";
-            if($v['state'] == 0 && ! isset($return[$order_no_tmp])){
+            //不存在单号或者已存在单号返回数据
+            if(empty($order_no_tmp) || isset($return[$order_no_tmp])) continue;
+            //返回数据
+            if($v['state'] == 0){
+                //待审核（人的信息）
                 $emp_tmp = $emp_id_key_list[$v['id']] ?? [];
                 $emp_tmp_str = implode('|',array_column($emp_tmp,'emp_name'));
                 $return[$order_no_tmp] = $emp_tmp_str;
-                //                $return[$order_no_tmp][] = [
-//                    'oa_order_id' => $v['oa_order_id'],
-//                    'sort' => $v['sort'],
-//                    'team' => $emp_id_key_list[$v['id']],
-//                    'state' => $v['state'],
-//                ];
+            }else{
+                //驳回（原因）
+                $return[$order_no_tmp] = $v['state'] ?? "(未填写原因)";
             }
         }
 

app/Service/PaymentReceiptService.php

@@ -713,7 +713,7 @@ class PaymentReceiptService extends Service
 
         $order_no = [];
         foreach ($data as $value){
-            if($value['state'] != PaymentReceipt::STATE_ONE) continue;
+            if(! in_array($value['state'], [PaymentReceipt::State_minus_one,PaymentReceipt::STATE_ONE])) continue;
             $order_no[] = $value['order_number'];
         }
 
@@ -722,8 +722,12 @@ class PaymentReceiptService extends Service
 
     public function makeState($value, $state_array){
         if(! empty($state_array[$value['order_number']])){
-            $emp_tmp = $state_array[$value['order_number']];
-            $state = "待" . $emp_tmp . "审核";
+            $return = $state_array[$value['order_number']];
+            if($value['state'] == PaymentReceipt::State_minus_one){
+                $state = "驳回:" . $return;
+            }else{
+                $state = "待" . $return . "审核";
+            }
         }elseif($value['state'] == PaymentReceipt::STATE_ZERO){
             $state = "待" . $value['crt_name'] . "提交";
         }else{

app/Service/PurchaseOrderService.php

@@ -467,7 +467,6 @@ class PurchaseOrderService extends Service
             $data['data'][$key]['state_title'] = $this->makeState($data['data'][$key], $state_array);
             $data['data'][$key]['purchase_name'] = $emp_map[$value['purchase_id']] ?? '';
             $data['data'][$key]['order_type_title'] = PurchaseOrder::$order_type[$value['order_type']] ?? '';
-            $data['data'][$key]['state_title'] = PurchaseOrder::$name[$value['state']] ?? '';
             $data['data'][$key]['sales_order_number'] = $sales[$value['sales_order_id']] ?? '';
             $data['data'][$key]['storehouse_title'] = $storehouse[$value['storehouse_id']] ?? '';
             $data['data'][$key]['supplier_title'] = $supplier_tmp['title'] ?? '';
@@ -519,7 +518,7 @@ class PurchaseOrderService extends Service
 
         $order_no = [];
         foreach ($data as $value){
-            if($value['state'] != PurchaseOrder::STATE_ONE) continue;
+            if(! in_array($value['state'], [PurchaseOrder::State_minus_one,PurchaseOrder::STATE_ONE])) continue;
             $order_no[] = $value['order_number'];
         }
 
@@ -528,8 +527,12 @@ class PurchaseOrderService extends Service
 
     public function makeState($value, $state_array){
         if(! empty($state_array[$value['order_number']])){
-            $emp_tmp = $state_array[$value['order_number']];
-            $state = "待" . $emp_tmp . "审核";
+            $return = $state_array[$value['order_number']];
+            if($value['state'] == PurchaseOrder::State_minus_one){
+                $state = "驳回:" . $return;
+            }else{
+                $state = "待" . $return . "审核";
+            }
         }elseif($value['state'] == PurchaseOrder::STATE_ZERO){
             $state = "待" . $value['crt_name'] . "提交";
         }else{

app/Service/ReturnExchangeOrderService.php

@@ -389,7 +389,8 @@ class ReturnExchangeOrderService extends Service
 
         $order_no = [];
         foreach ($data as $value){
-            if($value['state'] != ReturnExchangeOrder::State_one) continue;
+            if(! in_array($value['state'], [ReturnExchangeOrder::State_minus_one,ReturnExchangeOrder::State_one])) continue;
+
             $order_no[] = $value['order_number'];
         }
 
@@ -398,8 +399,12 @@ class ReturnExchangeOrderService extends Service
 
     public function makeState($value, $state_array){
         if(! empty($state_array[$value['order_number']])){
-            $emp_tmp = $state_array[$value['order_number']];
-            $state = "待" . $emp_tmp . "审核";
+            $return = $state_array[$value['order_number']];
+            if($value['state'] == ReturnExchangeOrder::State_minus_one){
+                $state = "驳回:" . $return;
+            }else{
+                $state = "待" . $return . "审核";
+            }
         }elseif($value['state'] == ReturnExchangeOrder::State_zero){
             $state = "待" . $value['crt_name'] . "提交";
         }else{

app/Service/SalesOrderService.php

@@ -1454,7 +1454,7 @@ class SalesOrderService extends Service
 
         $order_no = [];
         foreach ($data as $value){
-            if($value['state'] != SalesOrder::State_one) continue;
+            if(! in_array($value['state'], [SalesOrder::State_minus_one,SalesOrder::State_one])) continue;
             $order_no[] = $value['order_number'];
         }
 
@@ -1465,8 +1465,12 @@ class SalesOrderService extends Service
         if($value['sales_order_type'] == SalesOrder::Order_type_one){
             //安装件
             if(! empty($state_array[$value['order_number']])){
-                $emp_tmp = $state_array[$value['order_number']];
-                $state = "待" . $emp_tmp . "审核";
+                $return = $state_array[$value['order_number']];
+                if($value['state'] == PurchaseOrder::State_minus_one){
+                    $state = "驳回:" . $return;
+                }else{
+                    $state = "待" . $return . "审核";
+                }
             }elseif($value['state'] == SalesOrder::State_zero){
                 $state = "待" . $value['crt_name'] . "提交";
             }elseif($value['state'] == SalesOrder::State_three && $value['model_type'] != SalesOrder::Model_type_four){