edit

app/Services/Business/WashOrderService.php

@@ -4256,7 +4256,7 @@ class WashOrderService extends Service
             ->leftJoin('shop as s', 's.shop_id', '=', 'ord.ord_shop_id')
             ->leftJoin('order_client as orcl', 'ord.ord_orcl_id', '=', 'orcl.orcl_id')
             ->where('ord_id', $request['ord_id'])
-            ->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_actual_price', 'ord_mem_price', 'ord_payment_way', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_type', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'ord_remark', 'ord_create_time', 'ord_order_price', 'ord_delete', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_check_car_state', 'orcl_car_vin', 'orcl_car_brand_series', 'orcl_signature_img', 'orcl_sales_adm_id', 'shop_province', 'shop_city', 'shop_county', 'shop_address', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'ord_explain', 'orcl_mem_source', 'ord_address_id', 'ord_address_type', 'orcl_business_name', 'orcl_business_id', 'shop_store_name', 'ord_service_type', 'ord_settlement_time', 'orcl_carbrse_type', 'ord_shop_id', 'ord_cancel_reason', 'ord_service_adm_id', 'ord_ware_id','ord_zero_price','ord_pay_state', 'ord_source', 'ord_other_system_number', 'orcl_cus_msg', 'ord_other_payway', 'ord_payment_money', 'ord_banlance','orcl_province','orcl_city','orcl_county','orcl_address', 'ord_points','ord_add_type', 'ord_new_type', 'ord_openbill', 'ord_openbill_number', 'ord_openbill_image', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname', 'orcl_buac_id', 'ord_service_standard')
+            ->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_actual_price', 'ord_mem_price', 'ord_payment_way', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_type', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'ord_remark', 'ord_create_time', 'ord_order_price', 'ord_delete', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_check_car_state', 'orcl_car_vin', 'orcl_car_brand_series', 'orcl_signature_img', 'orcl_sales_adm_id', 'shop_province', 'shop_city', 'shop_county', 'shop_address', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'ord_explain', 'orcl_mem_source', 'ord_address_id', 'ord_address_type', 'orcl_business_name', 'orcl_business_id', 'shop_store_name', 'ord_service_type', 'ord_settlement_time', 'orcl_carbrse_type', 'ord_shop_id', 'ord_cancel_reason', 'ord_service_adm_id', 'ord_ware_id','ord_zero_price','ord_pay_state', 'ord_source', 'ord_other_system_number', 'orcl_cus_msg', 'ord_other_payway', 'ord_payment_money', 'ord_banlance','orcl_province','orcl_city','orcl_county','orcl_address', 'ord_points','ord_add_type', 'ord_new_type', 'ord_openbill', 'ord_openbill_number', 'ord_openbill_image', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname', 'orcl_buac_id', 'ord_service_standard', 'ord_repair_id')
             ->first();
         if (empty($info)) {
             return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前订单不存在1', 'data'=>''];
@@ -4292,6 +4292,9 @@ class WashOrderService extends Service
             ->whereIn('adm_id', $adm_id)
             ->pluck('adm_phone', 'adm_id')
             ->toArray();
+        $info->ord_repair_name = DB::table('admin')
+            ->where('adm_id', $info->ord_repair_id)
+            ->value('adm_name');
         $info->create_name = '';
         if ($info->ord_create_id != '0' && isset($adm_name[$info->ord_create_id])) {
             $info->create_name = $adm_name[$info->ord_create_id]; //创建人

app/Services/Business/WashWorkService.php

@@ -2989,7 +2989,7 @@ class WashWorkService extends Service
             ->leftJoin('shop as s', 's.shop_id', '=', 'wo.wor_shop_id')
             ->where('wor_id', $request['wor_id'])
             ->where('wor_shop_id', $user_info->adm_shop_id)
-            ->select('wor_id', 'wor_number', 'wor_create_id', 'wor_goo_amount', 'wor_actual_price', 'wor_account_state', 'wor_type', 'wor_state', 'wor_delete', 'wocl_channel_unit', 'wocl_name', 'wocl_phone', 'wocl_car_num', 'wocl_province', 'wocl_city', 'wocl_county', 'wocl_address', 'wocl_client_id', 'wor_appoint_time', 'wocl_appoint_remark', 'wocl_car_vehicle_type', 'wocl_pick_up_car_time', 'wocl_check_car_state', 'wocl_service_quality', 'wocl_car_vin', 'shop_store_name', 'wor_service_state', 'wor_province', 'wor_city', 'wor_county', 'wor_address', 'orcl_sales_adm_id', 'wocl_car_brand_series', 'wocl_carowner_name', 'wocl_carowner_phone', 'wor_create_time', 'wor_new_goo_amount', 'wor_explain as wor_remark', 'wocl_bus_name', 'wor_address_type', 'wor_address_id', 'wor_shop_id', 'wor_service_adm_id', 'wocl_carbrse_type', 'wor_order_id', 'wor_work_type', 'wor_other_audit', 'ord_type', 'ord_address', 'orcl_cus_msg', 'ord_id', 'orcl_cus_msg','orcl_mileage', 'orcl_check_goods', 'orcl_check_goods', 'wor_order_number', 'wor_list_pic', 'ord_new_type','ord_state', 'orcl_4sname', 'orcl_business_name', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_name', 'orcl_phone', 'orcl_address', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_car_num', 'orcl_car_vin', 'ord_other_system_number', 'ord_service_standard')
+            ->select('wor_id', 'wor_number', 'wor_create_id', 'wor_goo_amount', 'wor_actual_price', 'wor_account_state', 'wor_type', 'wor_state', 'wor_delete', 'wocl_channel_unit', 'wocl_name', 'wocl_phone', 'wocl_car_num', 'wocl_province', 'wocl_city', 'wocl_county', 'wocl_address', 'wocl_client_id', 'wor_appoint_time', 'wocl_appoint_remark', 'wocl_car_vehicle_type', 'wocl_pick_up_car_time', 'wocl_check_car_state', 'wocl_service_quality', 'wocl_car_vin', 'shop_store_name', 'wor_service_state', 'wor_province', 'wor_city', 'wor_county', 'wor_address', 'orcl_sales_adm_id', 'wocl_car_brand_series', 'wocl_carowner_name', 'wocl_carowner_phone', 'wor_create_time', 'wor_new_goo_amount', 'wor_explain as wor_remark', 'wocl_bus_name', 'wor_address_type', 'wor_address_id', 'wor_shop_id', 'wor_service_adm_id', 'wocl_carbrse_type', 'wor_order_id', 'wor_work_type', 'wor_other_audit', 'ord_type', 'ord_address', 'orcl_cus_msg', 'ord_id', 'orcl_cus_msg','orcl_mileage', 'orcl_check_goods', 'orcl_check_goods', 'wor_order_number', 'wor_list_pic', 'ord_new_type','ord_state', 'orcl_4sname', 'orcl_business_name', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_name', 'orcl_phone', 'orcl_address', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_car_num', 'orcl_car_vin', 'ord_other_system_number', 'ord_service_standard', 'ord_repair_id')
             ->first();
         if (empty($info)) {
             return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前工单不存在', 'data'=>''];
@@ -3036,6 +3036,9 @@ class WashWorkService extends Service
             ->whereIn('adm_id', $adm_id)
             ->pluck('adm_phone', 'adm_id')
             ->toArray();
+        $info->ord_repair_name = DB::table('admin')
+            ->where('adm_id', $info->ord_repair_id)
+            ->value('adm_name');
         $info->orcl_buac_name = $info->orcl_buac_name??'--';
         $info->orcl_buac_phone = $info->orcl_buac_phone??'--';
         $info->create_name = '';
@@ -3507,7 +3510,7 @@ class WashWorkService extends Service
             ->leftJoin('order_client as orcl', 'ord.ord_orcl_id', '=', 'orcl.orcl_id')
             ->leftJoin('shop as c', 'ord.ord_shop_id', '=', 'c.shop_id')
             ->where('ord_id', $request['ord_id'])
-            ->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_type', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address', 'ord_create_time', 'ord_delete', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_car_vehicle_type', 'orcl_pick_up_car_time', 'orcl_pick_up_car_adm_id', 'orcl_check_car_state', 'orcl_car_vin', 'orcl_car_brand_series', 'orcl_signature_img', 'shop_store_name', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'orcl_sales_adm_id', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_explain as ord_remark', 'orcl_business_name', 'ord_address_type', 'ord_address_id', 'orcl_carbrse_type','ord_shop_id', 'ord_order_price', 'orcl_cus_msg', 'ord_new_type', 'ord_source', 'ord_add_type', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname', 'ord_other_system_number','ord_service_standard')
+            ->select('ord_id', 'ord_create_id', 'ord_order_number', 'ord_goods_quantity', 'ord_state', 'ord_wor_state', 'ord_wor_quantity', 'ord_type', 'orcl_channel_unit', 'orcl_name', 'orcl_phone', 'orcl_car_num', 'orcl_province', 'orcl_city', 'orcl_county', 'orcl_address', 'ord_create_time', 'ord_delete', 'orcl_client_id', 'orcl_appoint_time', 'orcl_appoint_remark', 'orcl_car_vehicle_type', 'orcl_pick_up_car_time', 'orcl_pick_up_car_adm_id', 'orcl_check_car_state', 'orcl_car_vin', 'orcl_car_brand_series', 'orcl_signature_img', 'shop_store_name', 'ord_province', 'ord_city', 'ord_county', 'ord_address', 'orcl_sales_adm_id', 'orcl_carowner_name', 'orcl_carowner_phone', 'ord_explain as ord_remark', 'orcl_business_name', 'ord_address_type', 'ord_address_id', 'orcl_carbrse_type','ord_shop_id', 'ord_order_price', 'orcl_cus_msg', 'ord_new_type', 'ord_source', 'ord_add_type', 'orcl_buac_name', 'orcl_buac_phone', 'orcl_4sname', 'ord_other_system_number','ord_service_standard', 'ord_repair_id')
             ->first();
         if (empty($info)) {
             return ['code'=>ErrorInc::DATA_EMPTY, 'msg'=>'当前订单不存在', 'data'=>''];
@@ -3544,7 +3547,9 @@ class WashWorkService extends Service
             ->select('adm_name', 'adm_phone', 'adm_id')
             ->get()->toArray();
         $find_adm = array_column($find_adm, null, 'adm_id');
-
+        $info->ord_repair_name = DB::table('admin')
+            ->where('adm_id', $info->ord_repair_id)
+            ->value('adm_name');
         $info->create_name = '';
         if (!empty($info->ord_create_id)) {
             $info->create_name = $find_adm[$info->ord_create_id]->adm_name; //创建人