|
|
@@ -110,16 +110,16 @@ class InventoryCompareController extends Controller
|
|
|
return '<h1 class="text-danger">导入Excel失败<br><p style="color: red">' . Cache::pull('error') . '</p></h1>';
|
|
|
} else {
|
|
|
$exception = Cache::get('exception');
|
|
|
- if ($exception){
|
|
|
+// if ($exception){
|
|
|
$a = '';
|
|
|
for ($i = 0; $i < count($exception); $i++) {
|
|
|
$a .= implode(',', $exception[$i]) . '
';
|
|
|
};
|
|
|
$this->log(__METHOD__, __FUNCTION__, json_encode($request->toArray()), Auth::user()['id']);
|
|
|
- return '<h1 class="text-danger">导入Excel失败<br><textarea style="width: 50%;height: 50%">' . $a . '</textarea></h1>';
|
|
|
- }else {
|
|
|
- return '<h1 class="text-danger">导入Excel成功</h1>';
|
|
|
- }
|
|
|
+ return '<h1 class="text-danger">导入Excel成功<br><textarea style="width: 50%;height: 50%">' . $a . '</textarea></h1>';
|
|
|
+// }else {
|
|
|
+// return '<h1 class="text-danger">导入Excel成功</h1>';
|
|
|
+// }
|
|
|
|
|
|
}
|
|
|
} else {
|