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

去掉控制器方法的后缀名

Browse Source
This commit is contained in:
hawind
2021-03-18 07:04:25 +08:00
parent 7223845862
commit bd9c315d7e
129 changed files with 837 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Order/Controllers/LogisticsController.php
+8 -8
View File
@@ -17,7 +17,7 @@ class LogisticsController extends DefaultController
{
public $permission = ['dialog'];
public function indexAction()
public function index()
{
$header = Grid::header([
'code' => 'logistics',
@@ -66,7 +66,7 @@ class LogisticsController extends DefaultController
]);
}
public function createAction($action = 'edit')
public function create($action = 'edit')
{
$id = (int)Request::get('id');
$form = Form::make(['code' => 'logistics', 'id' => $id, 'action' => $action]);
@@ -75,17 +75,17 @@ class LogisticsController extends DefaultController
], 'create');
}
public function editAction()
public function edit()
{
return $this->createAction();
return $this->create();
}
public function showAction()
public function show()
{
return $this->createAction('show');
return $this->create('show');
}
public function deleteAction()
public function delete()
{
if (Request::method() == 'POST') {
$ids = Request::get('id');
@@ -93,7 +93,7 @@ class LogisticsController extends DefaultController
}
}
public function dialogAction()
public function dialog()
{
$search = search_form([
'advanced' => '',
app/Gdoo/Order/Controllers/OrderController.php
+24 -24
View File
@@ -45,7 +45,7 @@ class OrderController extends WorkflowController
'serviceCustomerMoney',
];
public function indexAction()
public function index()
{
// 客户权限
$region = regionCustomer('customer_id_customer');
@@ -277,7 +277,7 @@ class OrderController extends WorkflowController
/**
* 订单明细列表
*/
public function detailAction()
public function detail()
{
// 客户权限
$region = regionCustomer('customer_id_customer');
@@ -401,7 +401,7 @@ class OrderController extends WorkflowController
/**
* 发货计划
*/
public function deliveryAction()
public function delivery()
{
// 客户权限
$region = regionCustomer('customer_id_customer');
@@ -600,7 +600,7 @@ class OrderController extends WorkflowController
/**
* 获取发货计划明细
*/
public function deliveryPlanAction()
public function deliveryPlan()
{
$query = Request::all();
if (Request::method() == 'POST') {
@@ -615,7 +615,7 @@ class OrderController extends WorkflowController
/**
* 修改运费支付方式
*/
public function deliveryEditAction()
public function deliveryEdit()
{
$gets = Request::all();
if (Request::method() == 'POST') {
@@ -634,7 +634,7 @@ class OrderController extends WorkflowController
/**
* 修改物流信息
*/
public function logisticsPlanAction()
public function logisticsPlan()
{
$gets = Request::all();
if (Request::method() == 'POST') {
@@ -661,7 +661,7 @@ class OrderController extends WorkflowController
/**
* 修改发货计划日期
*/
public function deliveryPlanDateAction()
public function deliveryPlanDate()
{
$query = Request::all();
if (Request::method() == 'POST') {
@@ -672,7 +672,7 @@ class OrderController extends WorkflowController
}
}
public function createAction($action = 'edit')
public function create($action = 'edit')
{
$id = (int) Request::get('id');
$header['action'] = $action;
@@ -694,23 +694,23 @@ class OrderController extends WorkflowController
return $this->display(['form' => $form], $tpl);
}
public function editAction()
public function edit()
{
return $this->createAction();
return $this->create();
}
public function auditAction()
public function audit()
{
return $this->createAction('audit');
return $this->create('audit');
}
public function showAction()
public function show()
{
return $this->createAction('show');
return $this->create('show');
}
// 批量编辑
public function batchEditAction()
public function batchEdit()
{
$gets = Request::all();
if (Request::method() == 'POST') {
@@ -730,7 +730,7 @@ class OrderController extends WorkflowController
]);
}
public function printAction()
public function print()
{
$id = Request::get('id');
$template_id = Request::get('template_id');
@@ -764,11 +764,11 @@ class OrderController extends WorkflowController
]);
}
$tpl = $this->createAction('print');
$tpl = $this->create('print');
return $print_type == 'pdf' ? print_prince($tpl) : $tpl;
}
public function dialogAction()
public function dialog()
{
$header = Grid::header([
'code' => 'customer_order',
@@ -833,7 +833,7 @@ class OrderController extends WorkflowController
/**
* 参照到促销申请
*/
public function servicePromotionAction()
public function servicePromotion()
{
$search = search_form([], [
['text','customer.name','客户名称'],
@@ -921,7 +921,7 @@ class OrderController extends WorkflowController
}
// 发货参照订单
public function serviceDeliveryAction()
public function serviceDelivery()
{
$date = date("Y-m-d", strtotime("+1 day"));
$search = search_form(
@@ -978,7 +978,7 @@ class OrderController extends WorkflowController
}
// 未发货订单(参照)
public function serviceNotDeliveryAction()
public function serviceNotDelivery()
{
$search = search_form(
['advanced' => ''], [
@@ -1032,7 +1032,7 @@ class OrderController extends WorkflowController
}
// 订单退货(参照)
public function serviceCancelOrderAction()
public function serviceCancelOrder()
{
$search = search_form(
['advanced' => ''], [
@@ -1101,7 +1101,7 @@ class OrderController extends WorkflowController
]);
}
public function serviceCustomerMoneyAction()
public function serviceCustomerMoney()
{
$tax_id = Request::get('tax_id');
$tax = DB::table('customer_tax')->where('id', $tax_id)->first();
@@ -1130,7 +1130,7 @@ class OrderController extends WorkflowController
return $data;
}
public function deleteAction()
public function delete()
{
if (Request::method() == 'POST') {
$id = Request::get('id');
app/Gdoo/Order/Controllers/PlanController.php
+6 -6
View File
@@ -25,7 +25,7 @@ class PlanController extends DefaultController
/**
* 生产计划总表
*/
public function indexAction()
public function index()
{
// 开始天
$sdate = date('Y-m-d', strtotime("-1 day"));
@@ -94,7 +94,7 @@ class PlanController extends DefaultController
/**
* 外销销售进度表
*/
public function export_saleAction()
public function export_sale()
{
// 开始天
$sdate = date('Y-m-01');
@@ -217,7 +217,7 @@ class PlanController extends DefaultController
/**
* 生产计划
*/
public function produceAction()
public function produce()
{
// 开始天
$sdate = date('Y-m-d', strtotime("-1 day"));
@@ -322,7 +322,7 @@ class PlanController extends DefaultController
/**
* 获取发货计划明细
*/
public function producePlanAction()
public function producePlan()
{
$query = Request::all();
if (Request::method() == 'POST') {
@@ -362,7 +362,7 @@ class PlanController extends DefaultController
}
// 保存生产计划
public function produce_saveAction()
public function produce_save()
{
if (Request::method() == 'POST') {
$gets = Request::all();
@@ -391,7 +391,7 @@ class PlanController extends DefaultController
}
// 提交生产计划
public function produce_submitAction()
public function produce_submit()
{
if (Request::method() == 'POST') {
$gets = Request::all();
app/Gdoo/Order/Controllers/ReportController.php
+10 -10
View File
@@ -40,7 +40,7 @@ class ReportController extends DefaultController
}
// 销售曲线图分析
public function indexAction()
public function index()
{
// 本年时间
$now_year = date('Y');
@@ -216,7 +216,7 @@ class ReportController extends DefaultController
}
// 全国数据分类方法
public function categoryAction()
public function category()
{
$customer_type = Request::get('customer_type', 0);
@@ -480,7 +480,7 @@ class ReportController extends DefaultController
}
// 客户销售排序
public function rankingAction()
public function ranking()
{
// 客户名称
$customer_name = Request::get('customer_name');
@@ -673,7 +673,7 @@ class ReportController extends DefaultController
}
// 单品查询
public function singleAction()
public function single()
{
// 客户权限
$selects = regionCustomer('customer');
@@ -817,7 +817,7 @@ class ReportController extends DefaultController
}
// 城市数据分析
public function cityAction()
public function city()
{
// 当前年月日
$now_sdate = Request::get('date1', date("Y").'-01-01');
@@ -1061,7 +1061,7 @@ class ReportController extends DefaultController
}
// 单区域数据分析
public function citydataAction()
public function citydata()
{
// 获得销售员登录名
$year = Request::get('year');
@@ -1139,7 +1139,7 @@ class ReportController extends DefaultController
}
// 单品客户数据分析
public function clientAction()
public function client()
{
$now_year = Request::get('year', date('Y'));
// 获得前一年的年份
@@ -1320,7 +1320,7 @@ class ReportController extends DefaultController
}
// 客户数据分析
public function clientdataAction()
public function clientdata()
{
$year = Request::get('year');
$product_id = Request::get('product_id');
@@ -1404,7 +1404,7 @@ class ReportController extends DefaultController
* 新客户分析
* 计算本年度有订单去年无订单为新客户
*/
public function newclientAction()
public function newclient()
{
// 筛选专用函数
$selects = regionCustomer('customer');
@@ -1530,7 +1530,7 @@ class ReportController extends DefaultController
/**
* 连续3个月未进货的客户
*/
public function stockmonthAction()
public function stockmonth()
{
// 筛选专用函数
$selects = regionCustomer('customer');
app/Gdoo/Order/Controllers/SampleApplyController.php
+14 -14
View File
@@ -20,7 +20,7 @@ class SampleApplyController extends WorkflowController
{
public $permission = ['dialog', 'serviceDelivery'];
public function indexAction()
public function index()
{
$header = Grid::header([
'code' => 'sample_apply',
@@ -112,7 +112,7 @@ class SampleApplyController extends WorkflowController
]);
}
public function detailAction()
public function detail()
{
$header = Grid::header([
'code' => 'sample_apply',
@@ -172,7 +172,7 @@ class SampleApplyController extends WorkflowController
]);
}
public function createAction($action = 'edit')
public function create($action = 'edit')
{
$id = (int) Request::get('id');
$header['action'] = $action;
@@ -186,29 +186,29 @@ class SampleApplyController extends WorkflowController
], $tpl);
}
public function editAction()
public function edit()
{
return $this->createAction();
return $this->create();
}
public function auditAction()
public function audit()
{
return $this->createAction('audit');
return $this->create('audit');
}
public function showAction()
public function show()
{
return $this->createAction('show');
return $this->create('show');
}
public function printAction()
public function print()
{
$this->layout = 'layouts.print2';
print_prince($this->createAction('print'));
print_prince($this->create('print'));
}
// 关闭
public function closeAction()
public function close()
{
$gets = Request::all();
if (Request::method() == 'POST') {
@@ -225,7 +225,7 @@ class SampleApplyController extends WorkflowController
}
// 样品出库
public function serviceDeliveryAction()
public function serviceDelivery()
{
$header = Grid::header([
'code' => 'sample_apply',
@@ -272,7 +272,7 @@ class SampleApplyController extends WorkflowController
]);
}
public function deleteAction()
public function delete()
{
if (Request::method() == 'POST') {
$ids = Request::get('id');
app/Gdoo/Order/Controllers/TypeController.php
+6 -6
View File
@@ -15,7 +15,7 @@ class TypeController extends DefaultController
{
public $permission = ['dialog'];
public function indexAction()
public function index()
{
$header = Grid::header([
'code' => 'customer_order_type',
@@ -66,7 +66,7 @@ class TypeController extends DefaultController
]);
}
public function createAction()
public function create()
{
$id = (int)Request::get('id');
$form = Form::make(['code' => 'customer_order_type', 'id' => $id]);
@@ -75,12 +75,12 @@ class TypeController extends DefaultController
], 'create');
}
public function editAction()
public function edit()
{
return $this->createAction();
return $this->create();
}
public function dialogAction()
public function dialog()
{
$header = Grid::header([
'code' => 'customer_order_type',
@@ -118,7 +118,7 @@ class TypeController extends DefaultController
]);
}
public function deleteAction()
public function delete()
{
if (Request::method() == 'POST') {
$ids = Request::get('id');
app/Gdoo/Order/Controllers/WidgetController.php
+2 -2
View File
@@ -10,7 +10,7 @@ class WidgetController extends DefaultController
{
public $permission = ['index', 'goods'];
public function indexAction()
public function index()
{
if (Request::method() == 'POST') {
@@ -206,7 +206,7 @@ class WidgetController extends DefaultController
/**
* 明日预计到货列表
*/
public function goodsAction()
public function goods()
{
if (Request::method() == 'POST') {
app/Gdoo/Order/views/plan/export_sale.blade.php
+1 -1
View File
@@ -56,7 +56,7 @@
gdoo.grids[table] = {grid: grid};
var action = new gridAction(table, '外销生产进度表');
var action = new grid(table, '外销生产进度表');
var panel = $('#' + table + '-controller');
// 过滤数据
app/Gdoo/Order/views/plan/index.blade.php
+1 -1
View File
@@ -63,7 +63,7 @@
gdoo.grids[table] = {grid: grid};
var action = new gridAction(table, '生产计划总表');
var action = new grid(table, '生产计划总表');
var panel = $('#' + table + '-controller');
panel.on('click', '[data-toggle="' + table + '"]', function() {
app/Gdoo/Order/views/plan/produce.blade.php
+1 -1
View File
@@ -85,7 +85,7 @@
gdoo.grids[table] = {grid: grid};
var action = new gridAction(table, '生产计划');
var action = new grid(table, '生产计划');
var panel = $('#' + table + '-controller');
var producePlan = function() {