From 747ceb3bf06f8c3f1b466f22052e2b9b82d999aa Mon Sep 17 00:00:00 2001 From: hawind Date: Thu, 1 Apr 2021 11:52:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dhtml=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Gdoo/Approach/Controllers/ApproachController.php | 2 +- app/Gdoo/Approach/Controllers/ReviewController.php | 2 +- app/Gdoo/Order/Controllers/OrderController.php | 1 + app/Gdoo/Order/Controllers/SampleApplyController.php | 2 +- app/Gdoo/Order/views/order/print/121.blade.php | 2 +- app/Gdoo/Promotion/Controllers/PromotionController.php | 2 +- app/Gdoo/Promotion/Controllers/ReviewController.php | 2 +- app/Gdoo/Stock/Controllers/AllocationController.php | 2 +- app/Gdoo/Stock/Controllers/CancelController.php | 2 +- app/Gdoo/Stock/Controllers/DirectController.php | 2 +- app/Gdoo/Stock/Controllers/Record01Controller.php | 2 +- app/Gdoo/Stock/Controllers/Record08Controller.php | 2 +- app/Gdoo/Stock/Controllers/Record09Controller.php | 2 +- app/Gdoo/Stock/Controllers/Record10Controller.php | 6 +++--- app/Gdoo/Stock/Controllers/Record11Controller.php | 4 ++-- resources/views/layouts/print_pdf.blade.php | 10 +++++++--- 16 files changed, 25 insertions(+), 20 deletions(-) diff --git a/app/Gdoo/Approach/Controllers/ApproachController.php b/app/Gdoo/Approach/Controllers/ApproachController.php index 3f910a5f..accbacfd 100644 --- a/app/Gdoo/Approach/Controllers/ApproachController.php +++ b/app/Gdoo/Approach/Controllers/ApproachController.php @@ -128,7 +128,7 @@ class ApproachController extends WorkflowController public function print() { - $this->layout = 'layouts.print2'; + $this->layout = 'layouts.print_html'; print_prince($this->create('print')); } diff --git a/app/Gdoo/Approach/Controllers/ReviewController.php b/app/Gdoo/Approach/Controllers/ReviewController.php index 49f3a2b9..d0b82a94 100644 --- a/app/Gdoo/Approach/Controllers/ReviewController.php +++ b/app/Gdoo/Approach/Controllers/ReviewController.php @@ -119,7 +119,7 @@ class ReviewController extends WorkflowController public function print() { - $this->layout = 'layouts.print2'; + $this->layout = 'layouts.print_html'; print_prince($this->create('print')); } diff --git a/app/Gdoo/Order/Controllers/OrderController.php b/app/Gdoo/Order/Controllers/OrderController.php index 67990d22..7717d33f 100644 --- a/app/Gdoo/Order/Controllers/OrderController.php +++ b/app/Gdoo/Order/Controllers/OrderController.php @@ -748,6 +748,7 @@ class OrderController extends WorkflowController $data['form'] = $form; $data['template'] = $template; $tpl = $this->display($data, 'print/'.$template_id); + //return $tpl; return $print_type == 'pdf' ? print_prince($tpl) : $tpl; } diff --git a/app/Gdoo/Order/Controllers/SampleApplyController.php b/app/Gdoo/Order/Controllers/SampleApplyController.php index d85f08e1..65947180 100644 --- a/app/Gdoo/Order/Controllers/SampleApplyController.php +++ b/app/Gdoo/Order/Controllers/SampleApplyController.php @@ -203,7 +203,7 @@ class SampleApplyController extends WorkflowController public function print() { - $this->layout = 'layouts.print2'; + $this->layout = 'layouts.print_html'; print_prince($this->create('print')); } diff --git a/app/Gdoo/Order/views/order/print/121.blade.php b/app/Gdoo/Order/views/order/print/121.blade.php index ebe9edb3..4bf4f918 100644 --- a/app/Gdoo/Order/views/order/print/121.blade.php +++ b/app/Gdoo/Order/views/order/print/121.blade.php @@ -144,7 +144,7 @@ 特别说明 - 收货时请按我司《随货单》点货验收。货物如有缺失或者破损，请与承运方协调，采取现场赔付，如协调无法达成一致意见，请第一时间告知我司并向承运方索取有效货物异常证明（贵司收货人与承运方双方签字认可的货物运单）回单至我司028-38296888并确认收到。 + 收货时请按我司《随货单》点货验收。货物如有缺失或者破损，请与承运方协调，采取现场赔付，如协调无法达成一致意见，请第一时间告知我司并向承运方索取有效货物异常证明（贵司收货人与承运方双方签字认可的货物运单）回单至我司并确认收到。 diff --git a/app/Gdoo/Promotion/Controllers/PromotionController.php b/app/Gdoo/Promotion/Controllers/PromotionController.php index a2e012ac..f08dbd45 100644 --- a/app/Gdoo/Promotion/Controllers/PromotionController.php +++ b/app/Gdoo/Promotion/Controllers/PromotionController.php @@ -159,7 +159,7 @@ class PromotionController extends WorkflowController $header['code'] = 'promotion'; $header['id'] = $id; $header['template_id'] = $template_id; - $this->layout = 'layouts.print2'; + $this->layout = 'layouts.print_html'; $form = Form::make($header); $form['template']['name'] = '促销申请'; print_prince($this->display([ diff --git a/app/Gdoo/Promotion/Controllers/ReviewController.php b/app/Gdoo/Promotion/Controllers/ReviewController.php index 417dc7e4..820ea966 100644 --- a/app/Gdoo/Promotion/Controllers/ReviewController.php +++ b/app/Gdoo/Promotion/Controllers/ReviewController.php @@ -120,7 +120,7 @@ class ReviewController extends WorkflowController public function print() { - $this->layout = 'layouts.print2'; + $this->layout = 'layouts.print_html'; print_prince($this->create('print')); } diff --git a/app/Gdoo/Stock/Controllers/AllocationController.php b/app/Gdoo/Stock/Controllers/AllocationController.php index 7649cced..1e2faf7c 100644 --- a/app/Gdoo/Stock/Controllers/AllocationController.php +++ b/app/Gdoo/Stock/Controllers/AllocationController.php @@ -103,7 +103,7 @@ class AllocationController extends WorkflowController $id = Request::get('id'); $template_id = Request::get('template_id'); - $this->layout = 'layouts.print3'; + $this->layout = 'layouts.print_html'; $master = DB::table('stock_allocation as m') ->where('m.id', $id) ->leftJoin('warehouse as wo', 'wo.id', '=', 'm.out_warehouse_id') diff --git a/app/Gdoo/Stock/Controllers/CancelController.php b/app/Gdoo/Stock/Controllers/CancelController.php index 3276731b..feb9eca9 100644 --- a/app/Gdoo/Stock/Controllers/CancelController.php +++ b/app/Gdoo/Stock/Controllers/CancelController.php @@ -105,7 +105,7 @@ class CancelController extends WorkflowController $id = Request::get('id'); $template_id = Request::get('template_id'); - $this->layout = 'layouts.print3'; + $this->layout = 'layouts.print_html'; $master = DB::table('stock_cancel as sd') ->leftJoin('customer as c', 'c.id', '=', 'sd.customer_id') ->leftJoin('customer_tax as ct', 'ct.id', '=', 'sd.tax_id') diff --git a/app/Gdoo/Stock/Controllers/DirectController.php b/app/Gdoo/Stock/Controllers/DirectController.php index ee6775a9..0d6f1c3b 100644 --- a/app/Gdoo/Stock/Controllers/DirectController.php +++ b/app/Gdoo/Stock/Controllers/DirectController.php @@ -100,7 +100,7 @@ class DirectController extends WorkflowController $id = Request::get('id'); $template_id = Request::get('template_id'); - $this->layout = 'layouts.print3'; + $this->layout = 'layouts.print_html'; $master = DB::table('stock_direct as sd') ->leftJoin('customer as c', 'c.id', '=', 'sd.customer_id') diff --git a/app/Gdoo/Stock/Controllers/Record01Controller.php b/app/Gdoo/Stock/Controllers/Record01Controller.php index 707607df..8c93d135 100644 --- a/app/Gdoo/Stock/Controllers/Record01Controller.php +++ b/app/Gdoo/Stock/Controllers/Record01Controller.php @@ -93,7 +93,7 @@ class Record01Controller extends AuditController public function print() { - $this->layout = 'layouts.print2'; + $this->layout = 'layouts.print_html'; print_prince($this->create('print')); } diff --git a/app/Gdoo/Stock/Controllers/Record08Controller.php b/app/Gdoo/Stock/Controllers/Record08Controller.php index 3ce61131..87c22e24 100644 --- a/app/Gdoo/Stock/Controllers/Record08Controller.php +++ b/app/Gdoo/Stock/Controllers/Record08Controller.php @@ -93,7 +93,7 @@ class Record08Controller extends AuditController public function print() { - $this->layout = 'layouts.print2'; + $this->layout = 'layouts.print_html'; print_prince($this->create('print')); } diff --git a/app/Gdoo/Stock/Controllers/Record09Controller.php b/app/Gdoo/Stock/Controllers/Record09Controller.php index bcb702ff..8f74d4d4 100644 --- a/app/Gdoo/Stock/Controllers/Record09Controller.php +++ b/app/Gdoo/Stock/Controllers/Record09Controller.php @@ -101,7 +101,7 @@ class Record09Controller extends WorkflowController $id = Request::get('id'); $template_id = Request::get('template_id'); - $this->layout = 'layouts.print3'; + $this->layout = 'layouts.print_html'; $master = DB::table('stock_record09 as m')->where('m.id', $id) ->leftJoin('stock_type as st', 'st.id', '=', 'm.type_id') ->leftJoin('department', 'department.id', '=', 'm.department_id') diff --git a/app/Gdoo/Stock/Controllers/Record10Controller.php b/app/Gdoo/Stock/Controllers/Record10Controller.php index fd296cfd..b3a5b620 100644 --- a/app/Gdoo/Stock/Controllers/Record10Controller.php +++ b/app/Gdoo/Stock/Controllers/Record10Controller.php @@ -99,7 +99,7 @@ class Record10Controller extends WorkflowController public function print2() { - $this->layout = 'layouts.print2'; + $this->layout = 'layouts.print_html'; $view = $this->create('print'); $viewData = $view->getData(); print_prince($this->create('print')); @@ -111,7 +111,7 @@ class Record10Controller extends WorkflowController $template_id = Request::get('template_id'); if ($template_id == 117) { - $this->layout = 'layouts.print3'; + $this->layout = 'layouts.print_html'; $master = DB::table('stock_record10 as m')->where('m.id', $id) ->leftJoin('stock_type as st', 'st.id', '=', 'm.type_id') @@ -148,7 +148,7 @@ class Record10Controller extends WorkflowController return $tpl; } else { - $this->layout = 'layouts.print2'; + $this->layout = 'layouts.print_html'; $tpl = $this->create('print'); print_prince($tpl); } diff --git a/app/Gdoo/Stock/Controllers/Record11Controller.php b/app/Gdoo/Stock/Controllers/Record11Controller.php index b5cb995e..b8329ec8 100644 --- a/app/Gdoo/Stock/Controllers/Record11Controller.php +++ b/app/Gdoo/Stock/Controllers/Record11Controller.php @@ -96,7 +96,7 @@ class Record11Controller extends AuditController $template_id = Request::get('template_id'); if ($template_id == 115) { - $this->layout = 'layouts.print3'; + $this->layout = 'layouts.print_html'; $master = DB::table('stock_record11 as m')->where('m.id', $id) ->leftJoin('stock_type as st', 'st.id', '=', 'm.type_id') @@ -134,7 +134,7 @@ class Record11Controller extends AuditController return $tpl; } else { - $this->layout = 'layouts.print2'; + $this->layout = 'layouts.print_html'; $tpl = $this->create('print'); print_prince($tpl); } diff --git a/resources/views/layouts/print_pdf.blade.php b/resources/views/layouts/print_pdf.blade.php index 4c90df1a..e921afde 100644 --- a/resources/views/layouts/print_pdf.blade.php +++ b/resources/views/layouts/print_pdf.blade.php @@ -7,6 +7,7 @@