hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

发布测试版 2.5.0

Browse Source
This commit is contained in:
hawind
2021-11-28 12:06:10 +08:00
parent 672cc966db
commit 8408038188
807 changed files with 94347 additions and 47563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Stock/Controllers/DeliveryController.php
+18 -6
View File
@@ -306,15 +306,27 @@ class DeliveryController extends WorkflowController
$this->layout = 'layouts.print_'.$print_type;
// 打印插件
$print_tpl = view()->exists(Request::controller().'.print.'.$template_id);
if ($print_tpl) {
if ($print_type == 'stiReport') {
$data = DeliveryService::getPrintData($id);
$data['template'] = $template;
$tpl = $this->display($data, 'print/'.$template_id);
$print_data = [
'master' => [$data['master']],
'stock_delivery_data' => $data['rows'],
];
return $this->display([
'template' => $template,
'print_data' => $print_data,
]);
} else {
$tpl = $this->create('print');
$print_tpl = view()->exists(Request::controller().'.print.'.$template_id);
if ($print_tpl) {
$data = DeliveryService::getPrintData($id);
$data['template'] = $template;
$tpl = $this->display($data, 'print/'.$template_id);
} else {
$tpl = $this->create('print');
}
return $print_type == 'pdf' ? print_prince($tpl) : $tpl;
}
return $print_type == 'pdf' ? print_prince($tpl) : $tpl;
}
// 物流信息