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

修复html打印模板bug

Browse Source
This commit is contained in:
hawind
2021-04-01 11:52:47 +08:00
parent 27effe8a47
commit 747ceb3bf0
16 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Stock/Controllers/AllocationController.php
+1 -1
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')
app/Gdoo/Stock/Controllers/CancelController.php
+1 -1
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')
app/Gdoo/Stock/Controllers/DirectController.php
+1 -1
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')
app/Gdoo/Stock/Controllers/Record01Controller.php
+1 -1
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'));
}
app/Gdoo/Stock/Controllers/Record08Controller.php
+1 -1
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'));
}
app/Gdoo/Stock/Controllers/Record09Controller.php
+1 -1
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')
app/Gdoo/Stock/Controllers/Record10Controller.php
+3 -3
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);
}
app/Gdoo/Stock/Controllers/Record11Controller.php
+2 -2
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);
}