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

继续重构模块列表前端样式

Browse Source
This commit is contained in:
hawind
2021-03-17 03:15:10 +08:00
parent 181fa17fdd
commit cd3a44340e
192 changed files with 3321 additions and 4596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Order/Controllers/LogisticsController.php
+7 -10
View File
@@ -23,7 +23,6 @@ class LogisticsController extends DefaultController
'code' => 'logistics',
'referer' => 1,
'search' => ['by' => ''],
'trash_btn' => 0,
]);
$cols = $header['cols'];
@@ -34,6 +33,13 @@ class LogisticsController extends DefaultController
'display' => $this->access['edit'],
]];
$header['buttons'] = [
['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['cols'] = $cols;
$header['tabs'] = Logistics::$tabs;
$search = $header['search_form'];
$query = $search['query'];
@@ -55,15 +61,6 @@ class LogisticsController extends DefaultController
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['cols'] = $cols;
$header['tabs'] = Logistics::$tabs;
$header['bys'] = Logistics::$bys;
$header['js'] = Grid::js($header);
return $this->display([
'header' => $header,
]);
app/Gdoo/Order/Controllers/OrderController.php
+34 -40
View File
@@ -199,6 +199,18 @@ class OrderController extends WorkflowController
'display' => $this->access['show'],
]];
$header['buttons'] = [
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['left_buttons'] = [
['name' => '批量编辑', 'color' => 'default', 'icon' => 'fa-pencil-square-o', 'action' => 'batchEdit', 'display' => $this->access['batchEdit']],
];
$header['cols'] = $cols;
$header['tabs'] = CustomerOrder::$tabs;
$header['bys'] = CustomerOrder::$bys;
if (Request::method() == 'POST') {
$model = DB::table($header['table'])->setBy($header);
foreach ($header['join'] as $join) {
@@ -257,20 +269,6 @@ class OrderController extends WorkflowController
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
//['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['left_buttons'] = [
['name' => '批量编辑', 'color' => 'default', 'icon' => 'fa-pencil-square-o', 'action' => 'batchEdit', 'display' => $this->access['batchEdit']],
];
$header['cols'] = $cols;
$header['tabs'] = CustomerOrder::$tabs;
$header['bys'] = CustomerOrder::$bys;
$header['js'] = Grid::js($header);
return $this->display([
'header' => $header,
]);
@@ -343,6 +341,14 @@ class OrderController extends WorkflowController
'display' => $this->access['show'],
]];
$header['buttons'] = [
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['cols'] = $cols;
$header['tabs'] = CustomerOrder::$tabs2;
$header['bys'] = CustomerOrder::$bys;
if (Request::method() == 'POST') {
$model = DB::table($header['table'])->setBy($header);
@@ -387,16 +393,6 @@ class OrderController extends WorkflowController
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
//['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['cols'] = $cols;
$header['tabs'] = CustomerOrder::$tabs2;
$header['bys'] = CustomerOrder::$bys;
$header['js'] = Grid::js($header);
return $this->display([
'header' => $header,
]);
@@ -526,6 +522,20 @@ class OrderController extends WorkflowController
'display' => $this->access['show'],
]];
$header['buttons'] = [
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['left_buttons'] = [
['name' => '修改预计发货日期', 'color' => 'default', 'icon' => 'fa-file-text-o', 'action' => 'deliveryPlan', 'display' => $this->access['deliveryPlan']],
['name' => '修改物流信息', 'color' => 'default', 'action' => 'logisticsPlan', 'display' => $this->access['logisticsPlan']],
['name' => '修改运费支付方式', 'color' => 'default', 'action' => 'deliveryEdit', 'display' => $this->access['deliveryEdit']],
];
$header['cols'] = $cols;
$header['tabs'] = CustomerOrder::$tabs3;
$header['bys'] = CustomerOrder::$bys;
if (Request::method() == 'POST') {
$model = DB::table($header['table'])->setBy($header);
foreach ($header['join'] as $join) {
@@ -582,22 +592,6 @@ class OrderController extends WorkflowController
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
//['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['left_buttons'] = [
['name' => '修改预计发货日期', 'color' => 'default', 'icon' => 'fa-file-text-o', 'action' => 'deliveryPlan', 'display' => $this->access['deliveryPlan']],
['name' => '修改物流信息', 'color' => 'default', 'action' => 'logisticsPlan', 'display' => $this->access['logisticsPlan']],
['name' => '修改运费支付方式', 'color' => 'default', 'action' => 'deliveryEdit', 'display' => $this->access['deliveryEdit']],
];
$header['cols'] = $cols;
$header['tabs'] = CustomerOrder::$tabs3;
$header['bys'] = CustomerOrder::$bys;
$header['js'] = Grid::js($header);
return $this->display([
'header' => $header,
]);
app/Gdoo/Order/Controllers/SampleApplyController.php
+24 -30
View File
@@ -30,8 +30,6 @@ class SampleApplyController extends WorkflowController
$cols = $header['cols'];
$cols = $header['cols'];
// 自定义列
$customFields = [
'quantity' => [
@@ -62,6 +60,18 @@ class SampleApplyController extends WorkflowController
'display' => $this->access['show'],
]];
$header['buttons'] = [
['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['right_buttons'] = [
['name' => '关闭', 'color' => 'default', 'icon' => 'fa-lock', 'action' => 'close', 'display' => $this->access['close']],
];
$header['cols'] = $cols;
$header['tabs'] = SampleApply::$tabs;
$header['bys'] = SampleApply::$bys;
$search = $header['search_form'];
$query = $search['query'];
@@ -97,20 +107,6 @@ class SampleApplyController extends WorkflowController
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['right_buttons'] = [
['name' => '关闭', 'color' => 'default', 'icon' => 'fa-lock', 'action' => 'close', 'display' => $this->access['close']],
];
$header['cols'] = $cols;
$header['tabs'] = SampleApply::$tabs;
$header['bys'] = SampleApply::$bys;
$header['js'] = Grid::js($header);
return $this->display([
'header' => $header,
]);
@@ -133,6 +129,18 @@ class SampleApplyController extends WorkflowController
'display' => $this->access['show'],
]];
$header['buttons'] = [
['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['right_buttons'] = [
['name' => '关闭', 'color' => 'default', 'icon' => 'fa-lock', 'action' => 'close', 'display' => $this->access['close']],
];
$header['cols'] = $cols;
$header['tabs'] = SampleApply::$tabs2;
$header['bys'] = SampleApply::$bys;
$search = $header['search_form'];
$query = $search['query'];
@@ -159,20 +167,6 @@ class SampleApplyController extends WorkflowController
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['right_buttons'] = [
['name' => '关闭', 'color' => 'default', 'icon' => 'fa-lock', 'action' => 'close', 'display' => $this->access['close']],
];
$header['cols'] = $cols;
$header['tabs'] = SampleApply::$tabs2;
$header['bys'] = SampleApply::$bys;
$header['js'] = Grid::js($header);
return $this->display([
'header' => $header,
]);
app/Gdoo/Order/Controllers/TypeController.php
+7 -9
View File
@@ -32,6 +32,13 @@ class TypeController extends DefaultController
'display' => $this->access['edit'],
]];
$header['buttons'] = [
['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['cols'] = $cols;
$header['tabs'] = CustomerOrderType::$tabs;
$search = $header['search_form'];
$query = $search['query'];
@@ -54,15 +61,6 @@ class TypeController extends DefaultController
return Grid::dataFilters($rows, $header);
}
$header['buttons'] = [
['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
$header['cols'] = $cols;
$header['tabs'] = CustomerOrderType::$tabs;
$header['bys'] = CustomerOrderType::$bys;
$header['js'] = Grid::js($header);
return $this->display([
'header' => $header,
]);