->select('wor_id','wor_number','wor_order_number','wor_shop_id','wor_create_id','wor_type','wor_state','wor_service_state','wor_appoint_time','wocl_appoint_remark','wocl_car_vehicle_type','wocl_pick_up_car_time','wocl_check_car_state','wocl_name','wocl_phone','wocl_car_num','wocl_car_vehicle_type','wocl_car_vin','wocl_car_brand_series','wor_province','wor_city','wor_county','wor_address','wocl_carowner_phone','wocl_carowner_name','wor_explain as wor_remark','wocl_bus_name','shop_store_name','wor_address_type','wor_address_id','wor_service_adm_id','wocl_carbrse_type','wor_work_type','wor_order_id','wocl_client_id','wor_list_pic','ord_new_type')
->select('wor_id','wor_number','wor_order_number','wor_shop_id','wor_create_id','wor_type','wor_state','wor_service_state','wor_appoint_time','wocl_appoint_remark','wocl_car_vehicle_type','wocl_pick_up_car_time','wocl_check_car_state','wocl_name','wocl_phone','wocl_car_num','wocl_car_vehicle_type','wocl_car_vin','wocl_car_brand_series','wor_province','wor_city','wor_county','wor_address','wocl_carowner_phone','wocl_carowner_name','wor_explain as wor_remark','wocl_bus_name','shop_store_name','wor_address_type','wor_address_id','wor_service_adm_id','wocl_carbrse_type','wor_work_type','wor_order_id','wocl_client_id','wor_list_pic','ord_new_type','ord_id')
->orderBy('wor_appoint_time','desc')
->orderBy('wor_id','desc');
if($adm_leave==1||$all_work){
...
...
@@ -1571,6 +1562,19 @@ class WashWorkService extends Service
->select('ord_id','ord_create_id','ord_order_number','ord_goods_quantity','ord_actual_price','ord_payment_way','ord_type','ord_order_state','ord_state','ord_wor_state','ord_wor_quantity','ord_delete','ord_create_time','orcl_channel_unit','orcl_name','orcl_phone','orcl_car_num','orcl_province','orcl_city','orcl_county','orcl_address','ord_order_price','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_sales_adm_id','ord_is_split','ord_province','ord_city','ord_county','ord_address','orcl_car_brand_series','orcl_carowner_name','orcl_carowner_phone','ord_explain as ord_remark','orcl_business_name','shop_store_name','ord_shop_id','ord_address_type','ord_address_id','orcl_carbrse_type','ord_new_type','ord_source')
->select('ord_id','ord_create_id','ord_order_number','ord_goods_quantity','ord_actual_price','ord_payment_way','ord_type','ord_order_state','ord_state','ord_wor_state','ord_wor_quantity','ord_delete','ord_create_time','orcl_channel_unit','orcl_name','orcl_phone','orcl_car_num','orcl_province','orcl_city','orcl_county','orcl_address','ord_order_price','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_sales_adm_id','ord_is_split','ord_province','ord_city','ord_county','ord_address','orcl_car_brand_series','orcl_carowner_name','orcl_carowner_phone','ord_explain as ord_remark','orcl_business_name','shop_store_name','ord_shop_id','ord_address_type','ord_address_id','orcl_carbrse_type','ord_new_type','ord_source','orcl_buac_phone','orcl_buac_name','orcl_4sname')
->orderBy('ord_create_time','desc')
->paginate($show_count);
$list_items=$list_data->items();
...
...
@@ -1849,8 +1853,10 @@ class WashWorkService extends Service
@@ -2982,7 +2988,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')
->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')
@@ -3491,7 +3500,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')
->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')