|
|
@@ -3,9 +3,9 @@
|
|
|
namespace App\Http\Controllers;
|
|
|
|
|
|
use App\Http\Requests\Printer\TerminalPrinterRequest;
|
|
|
+use App\Logistic;
|
|
|
use App\Terminal;
|
|
|
use App\TerminalPrinter;
|
|
|
-use Illuminate\Support\Facades\Gate;
|
|
|
|
|
|
class TerminalPrinterController extends Controller
|
|
|
{
|
|
|
@@ -14,12 +14,13 @@ class TerminalPrinterController extends Controller
|
|
|
{
|
|
|
// if (!Gate::allows('基础设置-快递打印-打印机-添加')) return redirect('/');
|
|
|
|
|
|
- $terminalPrinters = TerminalPrinter::query()->with('terminal','logistic')->orderByDesc('terminal_id')->orderByDesc('id')->paginate($request['paginate'] ?? 50);
|
|
|
-
|
|
|
+ $terminalPrinters = TerminalPrinter::query()->with('terminal','logistics')->orderByDesc('terminal_id')->orderByDesc('id')->paginate($request['paginate'] ?? 50);
|
|
|
$terminals = Terminal::query()->get();
|
|
|
|
|
|
+ $logistics = Logistic::query()->get();
|
|
|
+
|
|
|
return view('maintenance/expressPrinting/setting/printer/index',
|
|
|
- compact('terminalPrinters','terminals')
|
|
|
+ compact('terminalPrinters','terminals','logistics')
|
|
|
);
|
|
|
}
|
|
|
|
|
|
@@ -29,7 +30,8 @@ class TerminalPrinterController extends Controller
|
|
|
// return ['success' => false, 'message' => '没有对应权限'];
|
|
|
|
|
|
$terminal_printer = TerminalPrinter::query()->create($request->all());
|
|
|
- $terminal_printer->loadMissing('terminal');
|
|
|
+ $terminal_printer->logistics()->attach($request['logistic_ids']);
|
|
|
+ $terminal_printer->loadMissing('terminal','logistics');
|
|
|
return ['success' => true, 'data' => $terminal_printer];
|
|
|
}
|
|
|
|
|
|
@@ -40,7 +42,7 @@ class TerminalPrinterController extends Controller
|
|
|
|
|
|
$terminal_printer = TerminalPrinter::query()->find($id);
|
|
|
if (!$terminal_printer) return ['success' => false , 'message' => '对应的打印机不存在'];
|
|
|
-
|
|
|
+ $terminal_printer->logistics()->detach();
|
|
|
$terminal_printer->delete();
|
|
|
return ['success' => true];
|
|
|
}
|
|
|
@@ -49,12 +51,11 @@ class TerminalPrinterController extends Controller
|
|
|
{
|
|
|
// if (!Gate::allows('基础设置-快递打印-打印机-编辑'))
|
|
|
// return ['success' => false, 'message' => '没有对应权限'];
|
|
|
-
|
|
|
$terminal_printer = TerminalPrinter::query()->find($request['id']);
|
|
|
if (!$terminal_printer) return ['success' => false, 'message' => '对应的打印机不存在'];
|
|
|
-
|
|
|
+ $terminal_printer->logistics()->sync($request['logistic_ids']);
|
|
|
$terminal_printer->update($request->all());
|
|
|
- $terminal_printer->load(['terminal','logistic']);
|
|
|
+ $terminal_printer->load(['terminal','logistics']);
|
|
|
return ['success' => true, 'data' => $terminal_printer];
|
|
|
}
|
|
|
|