|
|
@@ -452,13 +452,12 @@ class RejectedController extends Controller
|
|
|
"item_amount"=>"商品数量","quality_label_name"=>"商品质量","item_remark"=>"备注","operator_name"=>"录入人","remark"=>"退单备注"
|
|
|
])->direct();
|
|
|
}
|
|
|
- public function import(Request $request)
|
|
|
+ public function import()
|
|
|
{
|
|
|
return view('rejected.import');
|
|
|
}
|
|
|
public function importExcel(Request $request)
|
|
|
{
|
|
|
- $isOverride = $request->input('isOverride');
|
|
|
try{
|
|
|
ini_set('max_execution_time',2500);
|
|
|
ini_set('memory_limit','1526M');
|
|
|
@@ -493,7 +492,7 @@ class RejectedController extends Controller
|
|
|
if(!is_array($owner_id))$owner_id = [$owner_id];
|
|
|
if(count($owner_id) != 0) $owner_ids = array_intersect($owner_ids,$owner_id);
|
|
|
$owner_ids = implode(',',$owner_ids);
|
|
|
- $searchParams = [
|
|
|
+ return [
|
|
|
'owner_id' => $owner_ids,
|
|
|
'data'=> $request->input('data'),
|
|
|
'created_at_start' => $request->input('created_at_start'),
|
|
|
@@ -501,7 +500,6 @@ class RejectedController extends Controller
|
|
|
'uncheck_amount' => $request->input('uncheck_amount'),
|
|
|
'not_in_storage' => $request->input('not_in_storage'),
|
|
|
];
|
|
|
- return $searchParams;
|
|
|
}
|
|
|
|
|
|
//统计页导出
|