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

修复html打印模板bug

This commit is contained in:
乐风 2021-04-01 11:52:47 +08:00
parent 27effe8a47
commit 747ceb3bf0
16 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Gdoo/Approach/Controllers/ApproachController.php
View File

@ -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'));
}

2
app/Gdoo/Approach/Controllers/ReviewController.php
View File

@ -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'));
}

1
app/Gdoo/Order/Controllers/OrderController.php
View File

@ -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;
}

2
app/Gdoo/Order/Controllers/SampleApplyController.php
View File

@ -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'));
}

2
app/Gdoo/Order/views/order/print/121.blade.php
View File

@ -144,7 +144,7 @@
<tr>
<td width="10%">特别说明</td>
<td width="90%">
收货时请按我司《随货单》点货验收。货物如有缺失或者破损，请与承运方协调，采取现场赔付，如协调无法达成一致意见，请第一时间告知我司并向承运方索取有效货物异常证明（贵司收货人与承运方双方签字认可的货物运单）回单至我司028-38296888并确认收到。
收货时请按我司《随货单》点货验收。货物如有缺失或者破损，请与承运方协调，采取现场赔付，如协调无法达成一致意见，请第一时间告知我司并向承运方索取有效货物异常证明（贵司收货人与承运方双方签字认可的货物运单）回单至我司并确认收到。
</td>
</tr>
<tr>

2
app/Gdoo/Promotion/Controllers/PromotionController.php
View File

@ -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([

2
app/Gdoo/Promotion/Controllers/ReviewController.php
View File

@ -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'));
}

2
app/Gdoo/Stock/Controllers/AllocationController.php
View File

@ -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')

2
app/Gdoo/Stock/Controllers/CancelController.php
View File

@ -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')

2
app/Gdoo/Stock/Controllers/DirectController.php
View File

@ -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')

2
app/Gdoo/Stock/Controllers/Record01Controller.php
View File

@ -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'));
}

2
app/Gdoo/Stock/Controllers/Record08Controller.php
View File

@ -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'));
}

2
app/Gdoo/Stock/Controllers/Record09Controller.php
View File

@ -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')

6
app/Gdoo/Stock/Controllers/Record10Controller.php
View File

@ -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);
}

4
app/Gdoo/Stock/Controllers/Record11Controller.php
View File

@ -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);
}

8
resources/views/layouts/print_pdf.blade.php
View File

@ -7,6 +7,7 @@
<link href="{{mix('/assets/dist/gdoo.min.css')}}" rel="stylesheet" type="text/css">
<style type="text/css">
.table {
border-collapse: collapse;
border: 1px solid #000;
color: #000;
width: 100%;
@ -51,7 +52,8 @@
.table.table-grid>tfoot>tr>th,
.table.table-grid>thead>tr>td,
.table.table-grid>thead>tr>th {
display:table-cell; vertical-align:middle;
display:table-cell;
vertical-align:middle;
}
.table>thead>tr>th {
@ -97,11 +99,13 @@
label {
font:11pt 'SimSun', 'STXihei', sans-serif;
}
.i-checks-sm > i {
display: inline-block;
width: 14px;
height: 14px;
margin-right: 6px;
margin-left: -18px;
margin-bottom: -3px;
}
}