diff --git a/README.md b/README.md index 6f18405b..0ee84622 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@

Build Status laravel framework -Gdoo快速开发框架 License

diff --git a/app/Gdoo/Approach/Controllers/ApproachController.php b/app/Gdoo/Approach/Controllers/ApproachController.php index 8e834369..3f910a5f 100644 --- a/app/Gdoo/Approach/Controllers/ApproachController.php +++ b/app/Gdoo/Approach/Controllers/ApproachController.php @@ -14,7 +14,7 @@ class ApproachController extends WorkflowController { public $permission = ['dialog', 'reference', 'useCount', 'serviceReview', 'serviceCostList', 'serviceCostDetail', 'product']; - public function indexAction() + public function index() { // 客户权限 $region = regionCustomer('customer_id_customer'); @@ -92,7 +92,7 @@ class ApproachController extends WorkflowController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); @@ -111,29 +111,29 @@ class ApproachController 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') { @@ -146,7 +146,7 @@ class ApproachController extends WorkflowController } // 产品明细 - public function productAction() + public function product() { $query = Request::all(); if (Request::method() == 'POST') { @@ -161,7 +161,7 @@ class ApproachController extends WorkflowController } // 核销单选择 - public function serviceReviewAction() + public function serviceReview() { $header = Grid::header([ 'code' => 'approach', @@ -245,7 +245,7 @@ class ApproachController extends WorkflowController } // 费用申请明细 - public function serviceCostDetailAction() + public function serviceCostDetail() { $query = Request::all(); $customer_id = (int)$query['customer_id']; @@ -330,7 +330,7 @@ class ApproachController extends WorkflowController } // 批量编辑 - public function batchEditAction() + public function batchEdit() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -350,7 +350,7 @@ class ApproachController extends WorkflowController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Approach/Controllers/MarketController.php b/app/Gdoo/Approach/Controllers/MarketController.php index 2b743a9f..9fb9ed50 100644 --- a/app/Gdoo/Approach/Controllers/MarketController.php +++ b/app/Gdoo/Approach/Controllers/MarketController.php @@ -14,7 +14,7 @@ class MarketController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { // 客户权限 $region = regionCustomer('customer_id_customer'); @@ -74,7 +74,7 @@ class MarketController extends DefaultController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); $header['action'] = $action; @@ -87,22 +87,22 @@ class MarketController extends DefaultController ], 'create'); } - 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 deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); @@ -111,7 +111,7 @@ class MarketController extends DefaultController } // 对话框 - public function dialogAction() + public function dialog() { $header = Grid::header([ 'code' => 'approach_market', diff --git a/app/Gdoo/Approach/Controllers/ReviewController.php b/app/Gdoo/Approach/Controllers/ReviewController.php index bd5c8898..49f3a2b9 100644 --- a/app/Gdoo/Approach/Controllers/ReviewController.php +++ b/app/Gdoo/Approach/Controllers/ReviewController.php @@ -15,7 +15,7 @@ class ReviewController extends WorkflowController { public $permission = ['dialog', 'reference', 'useCount', 'feeDetail']; - public function indexAction() + public function index() { // 客户权限 $region = regionCustomer('customer_id_customer'); @@ -78,7 +78,7 @@ class ReviewController extends WorkflowController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); @@ -102,29 +102,29 @@ class ReviewController 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 batchEditAction() + public function batchEdit() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -145,7 +145,7 @@ class ReviewController extends WorkflowController } // 兑现明细 - public function feeDetailAction() + public function feeDetail() { $query = Request::all(); if (Request::method() == 'POST') { @@ -155,7 +155,7 @@ class ReviewController extends WorkflowController return $this->render(['query' => $query]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Article/Controllers/ArticleController.php b/app/Gdoo/Article/Controllers/ArticleController.php index b545ddcc..60f75802 100644 --- a/app/Gdoo/Article/Controllers/ArticleController.php +++ b/app/Gdoo/Article/Controllers/ArticleController.php @@ -23,7 +23,7 @@ class ArticleController extends DefaultController { public $permission = []; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'article', @@ -101,7 +101,7 @@ class ArticleController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'article', 'id' => $id]); @@ -110,12 +110,12 @@ class ArticleController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function showAction() + public function show() { $id = (int)Request::get('id'); @@ -156,7 +156,7 @@ class ArticleController extends DefaultController /** * 阅读记录 */ - public function readerAction() + public function reader() { $id = Request::get('id', 0); @@ -190,7 +190,7 @@ class ArticleController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Article/Controllers/WidgetController.php b/app/Gdoo/Article/Controllers/WidgetController.php index fdcb6618..1745f2d2 100644 --- a/app/Gdoo/Article/Controllers/WidgetController.php +++ b/app/Gdoo/Article/Controllers/WidgetController.php @@ -14,7 +14,7 @@ class WidgetController extends DefaultController /** * 公告部件 */ - public function indexAction() + public function index() { if (Request::isJson()) { $model = DB::table('article') @@ -42,7 +42,7 @@ class WidgetController extends DefaultController /** * 公告信息 */ - public function infoAction() + public function info() { $config = InfoService::getInfo('article'); diff --git a/app/Gdoo/Calendar/Controllers/CalendarController.php b/app/Gdoo/Calendar/Controllers/CalendarController.php index 3ffd108e..51dcd967 100644 --- a/app/Gdoo/Calendar/Controllers/CalendarController.php +++ b/app/Gdoo/Calendar/Controllers/CalendarController.php @@ -17,7 +17,7 @@ class CalendarController extends DefaultController /** * 日历首页 */ - public function indexAction() + public function index() { $user_id = Request::get('user_id', Auth::id()); @@ -40,7 +40,7 @@ class CalendarController extends DefaultController /** * 日历列表 */ - public function calendarsAction() + public function calendars() { $user_id = Request::get('user_id', Auth::id()); $calendars = CalendarService::getCalendars($user_id); @@ -71,7 +71,7 @@ class CalendarController extends DefaultController ], true); } - public function activeAction() + public function active() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -96,7 +96,7 @@ class CalendarController extends DefaultController } } - public function addAction() + public function add() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -114,12 +114,12 @@ class CalendarController extends DefaultController } // 帮助信息 - public function helpAction() + public function help() { return $this->render(); } - public function deleteAction() + public function delete() { $id = Request::get('id'); if ($id > 0) { diff --git a/app/Gdoo/Calendar/Controllers/EventController.php b/app/Gdoo/Calendar/Controllers/EventController.php index 596d7dcf..45d99373 100644 --- a/app/Gdoo/Calendar/Controllers/EventController.php +++ b/app/Gdoo/Calendar/Controllers/EventController.php @@ -20,7 +20,7 @@ class EventController extends DefaultController public $permission = ['share', 'items']; // 事件列表 - public function indexAction() + public function index() { $gets = Request::all(); $calendars = CalendarService::getCalendars($gets['user_id']); @@ -61,7 +61,7 @@ class EventController extends DefaultController } // 客户端显示事件列表 - public function itemsAction() + public function items() { $gets = Request::all(); $start = strtotime($gets['start']); @@ -124,7 +124,7 @@ class EventController extends DefaultController } // 调整事件 - public function resizeAction() + public function resize() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -156,7 +156,7 @@ class EventController extends DefaultController } // 移动事件 - public function moveAction() + public function move() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -204,7 +204,7 @@ class EventController extends DefaultController } } - public function addAction() + public function add() { $gets = Request::all(); // 更新数据 @@ -298,7 +298,7 @@ class EventController extends DefaultController } // 编辑事件 - public function editAction() + public function edit() { $gets = Request::all(); @@ -609,7 +609,7 @@ class EventController extends DefaultController } } - public function viewAction() + public function view() { $id = (int)Request::get('id'); $event = CalendarService::getEvent($id); @@ -686,7 +686,7 @@ class EventController extends DefaultController )); } - public function deleteAction() + public function delete() { $id = Request::get('id'); if ($id > 0) { diff --git a/app/Gdoo/Calendar/Sabre/CalDAV/Plugin.php b/app/Gdoo/Calendar/Sabre/CalDAV/Plugin.php index 2dba561f..07e430e5 100644 --- a/app/Gdoo/Calendar/Sabre/CalDAV/Plugin.php +++ b/app/Gdoo/Calendar/Sabre/CalDAV/Plugin.php @@ -1320,7 +1320,7 @@ class Plugin extends DAV\ServerPlugin { * @param array $postVars * @return bool */ - public function browserPostAction($uri, $action, array $postVars) { + public function browserPost($uri, $action, array $postVars) { if ($action!=='mkcalendar') return; diff --git a/app/Gdoo/Calendar/Sabre/CardDAV/Plugin.php b/app/Gdoo/Calendar/Sabre/CardDAV/Plugin.php index 3e0550c0..9465b0f5 100644 --- a/app/Gdoo/Calendar/Sabre/CardDAV/Plugin.php +++ b/app/Gdoo/Calendar/Sabre/CardDAV/Plugin.php @@ -688,7 +688,7 @@ class Plugin extends DAV\ServerPlugin { * @param array $postVars * @return bool */ - public function browserPostAction($uri, $action, array $postVars) { + public function browserPost($uri, $action, array $postVars) { if ($action!=='mkaddressbook') return; diff --git a/app/Gdoo/Chat/Controllers/ChatController.php b/app/Gdoo/Chat/Controllers/ChatController.php index 8340b228..b8880bee 100644 --- a/app/Gdoo/Chat/Controllers/ChatController.php +++ b/app/Gdoo/Chat/Controllers/ChatController.php @@ -45,7 +45,7 @@ class ChatController extends Controller }); } - public function startAction() + public function start() { return $this->return_json([ 'title' => $this->setting['title'], @@ -53,19 +53,19 @@ class ChatController extends Controller ]); } - public function indexAction() + public function index() { return $this->render([ 'user' => $this->user, ]); } - public function getServerURLAction() + public function getServerURL() { return ChatService::getServerURL($this->user); } - public function uploadAction(Request $request) + public function upload(Request $request) { if ($request->method() == 'POST') { $user = $this->user; @@ -124,19 +124,19 @@ class ChatController extends Controller } } - public function getHistoryAction() + public function getHistory() { $auth_id = $this->user['id']; $json = ChatService::getHistory($auth_id); return $this->return_json($json); } - public function getMaxUploadAction() + public function getMaxUpload() { return $this->return_json(['maxUpload' => $this->setting['upload_max']]); } - public function getGroupUserAction(Request $request) + public function getGroupUser(Request $request) { $gets = $request->all(); $auth_id = $this->user['id']; @@ -144,7 +144,7 @@ class ChatController extends Controller return $this->return_json($json); } - public function clearRecordAction(Request $request) + public function clearRecord(Request $request) { $gets = $request->all(); $auth_id = $this->user['id']; @@ -152,14 +152,14 @@ class ChatController extends Controller return $this->return_json('删除成功'); } - public function inviteUserAction(Request $request) + public function inviteUser(Request $request) { $gets = $request->all(); ChatService::inviteUser($this->user, $gets['gid'], $gets['val']); return $this->return_json('邀请成功'); } - public function getReceiverAction(Request $request) + public function getReceiver(Request $request) { $gets = $request->all(); $auth_id = $this->user['id']; @@ -167,7 +167,7 @@ class ChatController extends Controller return $this->return_json(['receinfor' => $json]); } - public function exitGroupAction(Request $request) + public function exitGroup(Request $request) { $gets = $request->all(); $auth_id = $this->user['id']; @@ -175,7 +175,7 @@ class ChatController extends Controller return $this->return_json('退出会话成功'); } - public function createGroupAction(Request $request) + public function createGroup(Request $request) { $gets = $request->all(); $auth_id = $this->user['id']; @@ -190,7 +190,7 @@ class ChatController extends Controller return $this->return_json('创建会话成功'); } - public function clearHistoryAction(Request $request) + public function clearHistory(Request $request) { $gets = $request->all(); $auth_id = $this->user['id']; @@ -198,7 +198,7 @@ class ChatController extends Controller return $this->return_json('退出会话成功'); } - public function getDepartmentUserDataAction() + public function getDepartmentUserData() { $roles = DB::table('role')->get()->toNested(); $departments = DB::table('department') @@ -244,7 +244,7 @@ class ChatController extends Controller return $this->return_json($json); } - public function loginAction(Request $request) + public function login(Request $request) { if ($request->method() == 'POST') { $gets = $request->all(); @@ -262,7 +262,7 @@ class ChatController extends Controller return $this->render(); } - public function logoutAction() + public function logout() { Auth::logout(); Session::flush(); @@ -272,7 +272,7 @@ class ChatController extends Controller /** * 撤回消息功能 */ - public function recallMessageAction(Request $request) + public function recallMessage(Request $request) { $auth_id = $this->user['id']; $gets = $request->all(); @@ -280,7 +280,7 @@ class ChatController extends Controller return $this->return_json($json); } - public function sendMessageAction(Request $request) + public function sendMessage(Request $request) { $gets = $request->all(); $auth = $this->user; @@ -291,7 +291,7 @@ class ChatController extends Controller return $this->return_json($json); } - public function getRecordAction(Request $request) + public function getRecord(Request $request) { $auth = $this->user; $auth_id = (int)$auth['id']; @@ -498,7 +498,7 @@ class ChatController extends Controller return $this->return_json($json); } - public function initAction(Request $request) + public function init(Request $request) { $auth_id = $this->user['id']; $roles = DB::table('role')->get()->toNested(); diff --git a/app/Gdoo/Customer/Controllers/BusinessController.php b/app/Gdoo/Customer/Controllers/BusinessController.php index 3d120adf..ef1d7940 100644 --- a/app/Gdoo/Customer/Controllers/BusinessController.php +++ b/app/Gdoo/Customer/Controllers/BusinessController.php @@ -16,7 +16,7 @@ class BusinessController extends DefaultController public $permission = []; // 商机列表 - public function indexAction() + public function index() { } } diff --git a/app/Gdoo/Customer/Controllers/ComplaintController.php b/app/Gdoo/Customer/Controllers/ComplaintController.php index 69e736a0..8bebbecb 100644 --- a/app/Gdoo/Customer/Controllers/ComplaintController.php +++ b/app/Gdoo/Customer/Controllers/ComplaintController.php @@ -16,7 +16,7 @@ class ComplaintController extends WorkflowController { public $permission = ['dialog']; - public function indexAction() + public function index() { // 客户权限 $region = regionCustomer('customer_id_customer'); @@ -78,7 +78,7 @@ class ComplaintController extends WorkflowController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); $header['action'] = $action; @@ -100,22 +100,22 @@ class ComplaintController extends WorkflowController return $this->display(['form' => $form], $tpl); } - 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 printAction() + public function print() { - return $this->createAction('print'); + return $this->create('print'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); diff --git a/app/Gdoo/Customer/Controllers/ContactController.php b/app/Gdoo/Customer/Controllers/ContactController.php index 87c1a617..52578aa1 100644 --- a/app/Gdoo/Customer/Controllers/ContactController.php +++ b/app/Gdoo/Customer/Controllers/ContactController.php @@ -15,7 +15,7 @@ class ContactController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_contact', @@ -74,7 +74,7 @@ class ContactController extends DefaultController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); $form = Form::make(['code' => 'customer_contact','id' => $id, 'action' => $action]); @@ -83,17 +83,17 @@ class ContactController 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'); @@ -101,7 +101,7 @@ class ContactController extends DefaultController } } - public function dialogAction() + public function dialog() { $header = Grid::header([ 'code' => 'customer_contact', diff --git a/app/Gdoo/Customer/Controllers/CustomerApplyController.php b/app/Gdoo/Customer/Controllers/CustomerApplyController.php index 300b8742..2d36871a 100644 --- a/app/Gdoo/Customer/Controllers/CustomerApplyController.php +++ b/app/Gdoo/Customer/Controllers/CustomerApplyController.php @@ -15,7 +15,7 @@ class CustomerApplyController extends WorkflowController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_apply', @@ -85,7 +85,7 @@ class CustomerApplyController extends WorkflowController ]); } - public function createAction($action = 'create') + public function create($action = 'create') { $id = (int)Request::get('id'); @@ -103,22 +103,22 @@ class CustomerApplyController extends WorkflowController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction('edit'); + return $this->create('edit'); } - 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 deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Customer/Controllers/CustomerClassController.php b/app/Gdoo/Customer/Controllers/CustomerClassController.php index c2810d46..26cf19fd 100644 --- a/app/Gdoo/Customer/Controllers/CustomerClassController.php +++ b/app/Gdoo/Customer/Controllers/CustomerClassController.php @@ -15,7 +15,7 @@ class CustomerClassController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $display = $this->access; @@ -71,7 +71,7 @@ class CustomerClassController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'customer_class', 'id' => $id]); @@ -80,12 +80,12 @@ class CustomerClassController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function dialogAction() + public function dialog() { $search = search_form([], [ ['text','customer_class.name','名称'], @@ -108,7 +108,7 @@ class CustomerClassController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); diff --git a/app/Gdoo/Customer/Controllers/CustomerController.php b/app/Gdoo/Customer/Controllers/CustomerController.php index d944b09a..29905dcb 100644 --- a/app/Gdoo/Customer/Controllers/CustomerController.php +++ b/app/Gdoo/Customer/Controllers/CustomerController.php @@ -16,7 +16,7 @@ class CustomerController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer', @@ -101,7 +101,7 @@ class CustomerController extends DefaultController ]); } - public function createAction($action = 'create') + public function create($action = 'create') { $id = (int)Request::get('id'); @@ -125,12 +125,12 @@ class CustomerController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction('edit'); + return $this->create('edit'); } - public function batchEditAction() + public function batchEdit() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -150,7 +150,7 @@ class CustomerController extends DefaultController ]); } - public function priceEditAction() + public function priceEdit() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -188,13 +188,13 @@ class CustomerController extends DefaultController ]); } - public function showAction() + public function show() { - return $this->createAction('show'); + return $this->create('show'); } // 数据导入 - public function importAction() + public function import() { if (Request::method() == 'POST') { return Form::import(['table' => 'customer', 'keys' => ['code', 'username']]); @@ -203,7 +203,7 @@ class CustomerController extends DefaultController return $this->render(['tips' => $tips], 'layouts.import'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); @@ -211,7 +211,7 @@ class CustomerController extends DefaultController } } - public function dialogAction() + public function dialog() { $search = search_form( ['advanced' => ''], [ diff --git a/app/Gdoo/Customer/Controllers/DeliveryAddressController.php b/app/Gdoo/Customer/Controllers/DeliveryAddressController.php index 186af9a2..b2b0b8ec 100644 --- a/app/Gdoo/Customer/Controllers/DeliveryAddressController.php +++ b/app/Gdoo/Customer/Controllers/DeliveryAddressController.php @@ -15,7 +15,7 @@ class DeliveryAddressController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_delivery_address', @@ -73,7 +73,7 @@ class DeliveryAddressController extends DefaultController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); $form = Form::make(['code' => 'customer_delivery_address','id' => $id, 'action' => $action]); @@ -82,17 +82,17 @@ class DeliveryAddressController 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'); @@ -100,7 +100,7 @@ class DeliveryAddressController extends DefaultController } } - public function dialogAction() + public function dialog() { $header = Grid::header([ 'code' => 'customer_delivery_address', diff --git a/app/Gdoo/Customer/Controllers/PriceController.php b/app/Gdoo/Customer/Controllers/PriceController.php index 848e8157..02de4e9d 100644 --- a/app/Gdoo/Customer/Controllers/PriceController.php +++ b/app/Gdoo/Customer/Controllers/PriceController.php @@ -18,7 +18,7 @@ class PriceController extends DefaultController { public $permission = ['dialog', 'list', 'referCustomer']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_price', @@ -84,7 +84,7 @@ class PriceController extends DefaultController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); $form = Form::make(['code' => 'customer_price', 'id' => $id, 'action' => $action]); @@ -93,17 +93,17 @@ class PriceController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function showAction() + public function show() { - return $this->createAction('edit'); + return $this->create('edit'); } - public function listAction() + public function list() { $gets = Request::all(); if ($gets['customer_id']) { @@ -129,7 +129,7 @@ class PriceController extends DefaultController return $this->json($rows, true); } - public function referCustomerAction() + public function referCustomer() { $search = search_form( ['advanced' => ''], [ @@ -179,7 +179,7 @@ class PriceController extends DefaultController ]); } - public function importAction() + public function import() { if (Request::method() == 'POST') { return Form::import(['table' => 'customer_price', 'keys' => ['customer_id', 'product_id']]); @@ -188,7 +188,7 @@ class PriceController extends DefaultController return $this->render(['tips' => $tips], 'layouts.import'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Customer/Controllers/RegionController.php b/app/Gdoo/Customer/Controllers/RegionController.php index 1d9c5e94..0f0cdcb4 100644 --- a/app/Gdoo/Customer/Controllers/RegionController.php +++ b/app/Gdoo/Customer/Controllers/RegionController.php @@ -15,7 +15,7 @@ class RegionController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_region', @@ -79,7 +79,7 @@ class RegionController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); @@ -96,12 +96,12 @@ class RegionController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function dialogAction() + public function dialog() { $search = search_form([], [ ['text','customer_region.name','名称'], @@ -147,7 +147,7 @@ class RegionController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Customer/Controllers/RegionTaskController.php b/app/Gdoo/Customer/Controllers/RegionTaskController.php index ba559c85..69037ad5 100644 --- a/app/Gdoo/Customer/Controllers/RegionTaskController.php +++ b/app/Gdoo/Customer/Controllers/RegionTaskController.php @@ -15,7 +15,7 @@ class RegionTaskController extends AuditController { public $permission = []; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_region_task', @@ -84,7 +84,7 @@ class RegionTaskController extends AuditController ]); } - public function createAction($action = 'create') + public function create($action = 'create') { $id = (int)Request::get('id'); @@ -104,20 +104,20 @@ class RegionTaskController extends AuditController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction('edit'); + return $this->create('edit'); } - public function showAction() + public function show() { - return $this->createAction('show'); + return $this->create('show'); } /** * 区域进度 */ - public function progressAction() + public function progress() { $year = date('Y'); $search = search_form([], [[ @@ -293,7 +293,7 @@ class RegionTaskController extends AuditController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Customer/Controllers/ReportController.php b/app/Gdoo/Customer/Controllers/ReportController.php index 45e52a21..4265b5ec 100644 --- a/app/Gdoo/Customer/Controllers/ReportController.php +++ b/app/Gdoo/Customer/Controllers/ReportController.php @@ -18,7 +18,7 @@ class ReportController extends DefaultController public $permission = []; // 客户对账单 - public function accountStatementAction() + public function accountStatement() { $sdate = date('Y-01-01'); $edate = date('Y-m-d'); diff --git a/app/Gdoo/Customer/Controllers/TaskController.php b/app/Gdoo/Customer/Controllers/TaskController.php index d3215862..1733d2f2 100644 --- a/app/Gdoo/Customer/Controllers/TaskController.php +++ b/app/Gdoo/Customer/Controllers/TaskController.php @@ -15,7 +15,7 @@ class TaskController extends AuditController { public $permission = ['importExcel']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_task', @@ -75,7 +75,7 @@ class TaskController extends AuditController ]); } - public function createAction($action = 'create') + public function create($action = 'create') { $id = (int)Request::get('id'); $form = Form::make([ @@ -94,20 +94,20 @@ class TaskController extends AuditController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction('edit'); + return $this->create('edit'); } - public function showAction() + public function show() { - return $this->createAction('show'); + return $this->create('show'); } /** * 区域进度 */ - public function progressAction() + public function progress() { $year = date('Y'); $search = search_form([], [[ @@ -311,7 +311,7 @@ class TaskController extends AuditController ]); } - public function importExcelAction() + public function importExcel() { if (Request::method() == 'POST') { $file = Request::file('file'); @@ -358,7 +358,7 @@ class TaskController extends AuditController return view('importExcel'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Customer/Controllers/TaxController.php b/app/Gdoo/Customer/Controllers/TaxController.php index 30d3a998..3646deb2 100644 --- a/app/Gdoo/Customer/Controllers/TaxController.php +++ b/app/Gdoo/Customer/Controllers/TaxController.php @@ -15,7 +15,7 @@ class TaxController extends AuditController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_tax', @@ -81,7 +81,7 @@ class TaxController extends AuditController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); $form = Form::make(['code' => 'customer_tax', 'id' => $id, 'action' => $action]); @@ -90,17 +90,17 @@ class TaxController extends AuditController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction('edit'); + return $this->create('edit'); } - public function showAction() + public function show() { - return $this->createAction('show'); + return $this->create('show'); } - public function dialogAction() + public function dialog() { $search = search_form( ['advanced' => ''], [ @@ -143,7 +143,7 @@ class TaxController extends AuditController } // 批量编辑 - public function batchEditAction() + public function batchEdit() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -163,7 +163,7 @@ class TaxController extends AuditController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Customer/Controllers/TypeController.php b/app/Gdoo/Customer/Controllers/TypeController.php index e9c4ee4a..86b589c5 100644 --- a/app/Gdoo/Customer/Controllers/TypeController.php +++ b/app/Gdoo/Customer/Controllers/TypeController.php @@ -15,7 +15,7 @@ class TypeController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_type', @@ -67,7 +67,7 @@ class TypeController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'customer_type', 'id' => $id]); @@ -76,12 +76,12 @@ class TypeController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function dialogAction() + public function dialog() { $search = search_form([], [ ['text','customer_type.name','名称'], @@ -103,7 +103,7 @@ class TypeController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Customer/Controllers/WidgetController.php b/app/Gdoo/Customer/Controllers/WidgetController.php index fc29cda8..f4a21b74 100644 --- a/app/Gdoo/Customer/Controllers/WidgetController.php +++ b/app/Gdoo/Customer/Controllers/WidgetController.php @@ -10,7 +10,7 @@ class WidgetController extends DefaultController public $permission = ['birthday']; // 生日提醒 - public function birthdayAction() + public function birthday() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Customer/views/complaint/progress.blade.php b/app/Gdoo/Customer/views/complaint/progress.blade.php index b8ec4e7a..6b6af7a6 100644 --- a/app/Gdoo/Customer/views/complaint/progress.blade.php +++ b/app/Gdoo/Customer/views/complaint/progress.blade.php @@ -87,7 +87,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() { diff --git a/app/Gdoo/Customer/views/regionTask/progress.blade.php b/app/Gdoo/Customer/views/regionTask/progress.blade.php index 4b7556e1..a18512c8 100644 --- a/app/Gdoo/Customer/views/regionTask/progress.blade.php +++ b/app/Gdoo/Customer/views/regionTask/progress.blade.php @@ -73,7 +73,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() { diff --git a/app/Gdoo/Customer/views/task/progress.blade.php b/app/Gdoo/Customer/views/task/progress.blade.php index d1fc1c0e..8532519f 100644 --- a/app/Gdoo/Customer/views/task/progress.blade.php +++ b/app/Gdoo/Customer/views/task/progress.blade.php @@ -88,7 +88,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() { diff --git a/app/Gdoo/CustomerCost/Controllers/AdjustController.php b/app/Gdoo/CustomerCost/Controllers/AdjustController.php index 0e390729..8a58469c 100644 --- a/app/Gdoo/CustomerCost/Controllers/AdjustController.php +++ b/app/Gdoo/CustomerCost/Controllers/AdjustController.php @@ -17,7 +17,7 @@ class AdjustController extends AuditController { public $permission = []; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_cost_adjust', @@ -82,7 +82,7 @@ class AdjustController extends AuditController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); @@ -100,17 +100,17 @@ class AdjustController extends AuditController ], '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'); diff --git a/app/Gdoo/CustomerCost/Controllers/CategoryController.php b/app/Gdoo/CustomerCost/Controllers/CategoryController.php index f35d6c4d..6da097c5 100644 --- a/app/Gdoo/CustomerCost/Controllers/CategoryController.php +++ b/app/Gdoo/CustomerCost/Controllers/CategoryController.php @@ -15,7 +15,7 @@ class CategoryController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_cost_category', @@ -64,7 +64,7 @@ class CategoryController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'customer_cost_category', 'id' => $id]); @@ -73,12 +73,12 @@ class CategoryController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function dialogAction() + public function dialog() { $search = search_form([], [ ['text','customer_cost_category.name','名称'], @@ -101,7 +101,7 @@ class CategoryController extends DefaultController } // 删除 - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/CustomerCost/Controllers/CompenController.php b/app/Gdoo/CustomerCost/Controllers/CompenController.php index ad99b48a..c36d59af 100644 --- a/app/Gdoo/CustomerCost/Controllers/CompenController.php +++ b/app/Gdoo/CustomerCost/Controllers/CompenController.php @@ -17,7 +17,7 @@ class CompenController extends AuditController { public $permission = ['importExcel']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_cost_compen', @@ -78,7 +78,7 @@ class CompenController extends AuditController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); @@ -96,17 +96,17 @@ class CompenController extends AuditController ], '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 importExcelAction() + public function importExcel() { if (Request::method() == 'POST') { $file = Request::file('file'); @@ -150,7 +150,7 @@ class CompenController extends AuditController return view('importExcel'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/CustomerCost/Controllers/CostController.php b/app/Gdoo/CustomerCost/Controllers/CostController.php index 0aabd92c..50662a7d 100644 --- a/app/Gdoo/CustomerCost/Controllers/CostController.php +++ b/app/Gdoo/CustomerCost/Controllers/CostController.php @@ -17,7 +17,7 @@ class CostController extends AuditController { public $permission = ['dialog', 'serviceSaleOrder', 'useCount']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_cost', @@ -88,7 +88,7 @@ class CostController extends AuditController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); @@ -106,18 +106,18 @@ class CostController extends AuditController ], '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 serviceSaleOrderAction() + public function serviceSaleOrder() { $header = Grid::header([ 'code' => 'customer_cost', @@ -183,7 +183,7 @@ class CostController extends AuditController } // 可用列表 - public function useCountAction() + public function useCount() { $customer_id = Request::get('customer_id'); $count = DB::table('customer_cost_data') @@ -194,7 +194,7 @@ class CostController extends AuditController } // 批量编辑 - public function batchEditAction() + public function batchEdit() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -215,7 +215,7 @@ class CostController extends AuditController } // 费用关闭 - public function closeAction() + public function close() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -233,7 +233,7 @@ class CostController extends AuditController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/CustomerCost/Controllers/RebateController.php b/app/Gdoo/CustomerCost/Controllers/RebateController.php index d8aba863..0428b82d 100644 --- a/app/Gdoo/CustomerCost/Controllers/RebateController.php +++ b/app/Gdoo/CustomerCost/Controllers/RebateController.php @@ -17,7 +17,7 @@ class RebateController extends AuditController { public $permission = ['importExcel']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'customer_cost_rebate', @@ -78,7 +78,7 @@ class RebateController extends AuditController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); @@ -96,17 +96,17 @@ class RebateController extends AuditController ], '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 importExcelAction() + public function importExcel() { if (Request::method() == 'POST') { $file = Request::file('file'); @@ -146,7 +146,7 @@ class RebateController extends AuditController return view('importExcel'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/CustomerCost/Controllers/ReportController.php b/app/Gdoo/CustomerCost/Controllers/ReportController.php index 86beff69..2f085962 100644 --- a/app/Gdoo/CustomerCost/Controllers/ReportController.php +++ b/app/Gdoo/CustomerCost/Controllers/ReportController.php @@ -12,7 +12,7 @@ class ReportController extends DefaultController /** * 费用使用统计 */ - public function saleOrderDetailAction() + public function saleOrderDetail() { $sdate = date('Y-m-01'); $edate = date('Y-m-d'); diff --git a/app/Gdoo/CustomerCost/views/report/saleOrderDetail.blade.php b/app/Gdoo/CustomerCost/views/report/saleOrderDetail.blade.php index b35fb2b2..3a67e934 100644 --- a/app/Gdoo/CustomerCost/views/report/saleOrderDetail.blade.php +++ b/app/Gdoo/CustomerCost/views/report/saleOrderDetail.blade.php @@ -60,7 +60,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() { diff --git a/app/Gdoo/File/Controllers/AttachmentController.php b/app/Gdoo/File/Controllers/AttachmentController.php index c6dba777..234a5a5a 100644 --- a/app/Gdoo/File/Controllers/AttachmentController.php +++ b/app/Gdoo/File/Controllers/AttachmentController.php @@ -26,7 +26,7 @@ class AttachmentController extends DefaultController parent::__construct(); } - public function draftAction() + public function draft() { set_time_limit(0); @@ -67,7 +67,7 @@ class AttachmentController extends DefaultController return 0; } - public function fileinfoAction() + public function fileinfo() { $id = Request::get('id', 0); $type = Request::get('type', 0); @@ -113,7 +113,7 @@ class AttachmentController extends DefaultController } } - public function removeAction() + public function remove() { $id = Request::get('id', 0); if ($id > 0) { @@ -130,7 +130,7 @@ class AttachmentController extends DefaultController return 0; } - public function uploaderAction() + public function uploader() { set_time_limit(0); @@ -187,7 +187,7 @@ class AttachmentController extends DefaultController ]); } - public function addAction() + public function add() { set_time_limit(0); @@ -234,7 +234,7 @@ class AttachmentController extends DefaultController } } - public function deleteAction() + public function delete() { $gets = Request::all(); if ($gets['id'] > 0) { @@ -254,7 +254,7 @@ class AttachmentController extends DefaultController } // 预览文件 - public function showAction() + public function show() { $id = (int)Request::get('id'); $model = Request::get('model'); @@ -284,7 +284,7 @@ class AttachmentController extends DefaultController /** * 预览文件 */ - public function previewAction() + public function preview() { $id = Request::get('id'); $file = Attachment::where('id', $id)->first(); @@ -301,7 +301,7 @@ class AttachmentController extends DefaultController } // 下载文件 - public function downloadAction() + public function download() { $id = (int)Request::get('id'); $row = DB::table('attachment')->where('id', $id)->first(); diff --git a/app/Gdoo/File/Controllers/CertificateController.php b/app/Gdoo/File/Controllers/CertificateController.php index ba850b9b..b310a79f 100644 --- a/app/Gdoo/File/Controllers/CertificateController.php +++ b/app/Gdoo/File/Controllers/CertificateController.php @@ -13,7 +13,7 @@ use Illuminate\Support\Str; class CertificateController extends DefaultController { - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'file_certificate', @@ -67,7 +67,7 @@ class CertificateController extends DefaultController ]); } - public function createAction() + public function create() { if (Request::method() == 'POST') { $file = Request::file('file'); @@ -104,7 +104,7 @@ class CertificateController extends DefaultController return $this->render(); } - public function downloadAction() + public function download() { $id = (int) Request::get('id', 0); $row = DB::table('file_certificate')->where('id', $id)->first(); @@ -131,7 +131,7 @@ class CertificateController extends DefaultController } } - public function deleteAction() + public function delete() { $id = (array)Request::get('id'); $rows = DB::table('file_certificate')->whereIn('id', $id)->get(); diff --git a/app/Gdoo/File/Controllers/FileController.php b/app/Gdoo/File/Controllers/FileController.php index f88a8440..54289f43 100644 --- a/app/Gdoo/File/Controllers/FileController.php +++ b/app/Gdoo/File/Controllers/FileController.php @@ -21,7 +21,7 @@ class FileController extends DefaultController ['id' => 'receive','name' => '我收到的'], ]; - public function index1Action() + public function index1() { $rows = [ ['id' => 'common', 'name' => '公共云盘'], @@ -35,7 +35,7 @@ class FileController extends DefaultController } // 新建文件夹 - public function folderAction() + public function folder() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -53,7 +53,7 @@ class FileController extends DefaultController } // 共享操作 - public function sharingAction() + public function sharing() { $gets = Request::all(); @@ -86,7 +86,7 @@ class FileController extends DefaultController } // 上传文件 - public function uploadAction() + public function upload() { $parent_id = Request::get('parent_id', 0); @@ -131,7 +131,7 @@ class FileController extends DefaultController } // 个人云盘 - public function indexAction() + public function index() { $user_id = auth()->id(); $parent_id = Request::get('parent_id', 0); @@ -170,7 +170,7 @@ class FileController extends DefaultController } // 共享给我的 - public function receiveAction() + public function receive() { $user_id = auth()->id(); $shares = Share::getItemsSourceBy(['folder', 'file'], $user_id)->pluck('created_id'); @@ -181,7 +181,7 @@ class FileController extends DefaultController } // 共享给我的 - public function receivedataAction() + public function receivedata() { $user_id = Request::get('user_id'); $parent_id = Request::get('parent_id'); @@ -250,7 +250,7 @@ class FileController extends DefaultController } // 我共享的 - public function shareAction() + public function share() { $user_id = Request::get('user_id', auth()->id()); @@ -318,7 +318,7 @@ class FileController extends DefaultController } // 公共网盘 - public function commonAction() + public function common() { $folder_id = Request::get('folder_id', 0); $files = DB::table('file') @@ -340,7 +340,7 @@ class FileController extends DefaultController ]); } - public function downAction() + public function down() { $id = (int) Request::get('id', 0); $row = DB::table('file')->where('id', $id)->first(); @@ -372,7 +372,7 @@ class FileController extends DefaultController } } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = (array)Request::get('id'); diff --git a/app/Gdoo/File/Controllers/InspectReportController.php b/app/Gdoo/File/Controllers/InspectReportController.php index fa8ecbe2..2de7337e 100644 --- a/app/Gdoo/File/Controllers/InspectReportController.php +++ b/app/Gdoo/File/Controllers/InspectReportController.php @@ -13,7 +13,7 @@ use Illuminate\Support\Str; class InspectReportController extends DefaultController { - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'file_inspect_report', @@ -67,7 +67,7 @@ class InspectReportController extends DefaultController ]); } - public function createAction() + public function create() { if (Request::method() == 'POST') { $file = Request::file('file'); @@ -104,7 +104,7 @@ class InspectReportController extends DefaultController return $this->render(); } - public function downloadAction() + public function download() { $id = (int) Request::get('id', 0); $row = DB::table('file_inspect_report')->where('id', $id)->first(); @@ -131,7 +131,7 @@ class InspectReportController extends DefaultController } } - public function deleteAction() + public function delete() { $id = (array)Request::get('id'); $rows = DB::table('file_inspect_report')->whereIn('id', $id)->get(); diff --git a/app/Gdoo/Forum/Controllers/CategoryController.php b/app/Gdoo/Forum/Controllers/CategoryController.php index 585e7a5a..eccdc0e4 100644 --- a/app/Gdoo/Forum/Controllers/CategoryController.php +++ b/app/Gdoo/Forum/Controllers/CategoryController.php @@ -7,7 +7,7 @@ use Gdoo\Index\Controllers\DefaultController; class CategoryController extends DefaultController { - public function indexAction() + public function index() { // 更新排序 if ($post = $this->post('sort')) { @@ -29,7 +29,7 @@ class CategoryController extends DefaultController ]); } - public function addAction() + public function add() { $id = (int)Request::get('id'); @@ -55,7 +55,7 @@ class CategoryController extends DefaultController )); } - public function deleteAction() + public function delete() { if ($id = Request::get('id')) { DB::table('forum')->where('id', $id)->delete(); diff --git a/app/Gdoo/Forum/Controllers/PostController.php b/app/Gdoo/Forum/Controllers/PostController.php index ff3682a9..2fddcf7d 100644 --- a/app/Gdoo/Forum/Controllers/PostController.php +++ b/app/Gdoo/Forum/Controllers/PostController.php @@ -11,7 +11,7 @@ use Gdoo\Index\Controllers\DefaultController; class PostController extends DefaultController { // 板块列表 - public function indexAction() + public function index() { $forum = Forum::where('forum.state', 1); @@ -47,7 +47,7 @@ class PostController extends DefaultController } // 论坛类别帖子列表 - public function forumAction() + public function forum() { $id = Request::get('id'); @@ -95,7 +95,7 @@ class PostController extends DefaultController ]); } - public function addAction() + public function add() { $id = Request::get('id'); $forum_id = Request::get('forum_id'); @@ -140,7 +140,7 @@ class PostController extends DefaultController ]); } - public function commentAction() + public function comment() { $id = Request::get('id'); $parent_id = Request::get('parent_id'); @@ -177,7 +177,7 @@ class PostController extends DefaultController ]); } - public function viewAction() + public function view() { $id = (int)Request::get('id'); @@ -211,7 +211,7 @@ class PostController extends DefaultController ]); } - public function deleteAction() + public function delete() { $id = (int)Request::get('id'); diff --git a/app/Gdoo/Index/Controllers/ApiController.php b/app/Gdoo/Index/Controllers/ApiController.php index 85889bab..9638434f 100644 --- a/app/Gdoo/Index/Controllers/ApiController.php +++ b/app/Gdoo/Index/Controllers/ApiController.php @@ -14,7 +14,7 @@ class ApiController extends Controller /** * 初始化JS输出 */ - public function commonAction() + public function common() { $settings['public_url'] = URL::to('/'); $settings['upload_file_type'] = $this->setting['upload_type']; @@ -31,7 +31,7 @@ class ApiController extends Controller /** * 任务调用 */ - public function taskAction() + public function task() { $rows = DB::table('cron')->where('status', 1)->get(); if ($rows) { @@ -56,7 +56,7 @@ class ApiController extends Controller /** * 获取单据编号 */ - public function billSeqNoAction() + public function billSeqNo() { $bill_id = Request::get('bill_id'); $date = Request::get('date'); @@ -76,7 +76,7 @@ class ApiController extends Controller /** * 汉字转拼音 */ - public function pinyinAction() + public function pinyin() { $word = Request::get('name'); $type = Request::get('type'); @@ -95,7 +95,7 @@ class ApiController extends Controller /** * 显示位置信息 */ - public function locationAction() + public function location() { $gets = Request::all(); return $this->render(array( @@ -106,7 +106,7 @@ class ApiController extends Controller /** * 系统字典 */ - public function dictAction() + public function dict() { $key = Request::get('key'); $rows = option($key); @@ -116,7 +116,7 @@ class ApiController extends Controller /** * 系统选项 */ - public function optionAction() + public function option() { $key = Request::get('key'); $rows = option($key); @@ -126,7 +126,7 @@ class ApiController extends Controller /** * 不支持浏览器提示 */ - public function unsupportedBrowserAction() + public function unsupportedBrowser() { return $this->render(); } @@ -134,7 +134,7 @@ class ApiController extends Controller /* * 显示用户列表 */ - public function dialogAction() + public function dialog() { $gets = Request::all(); return $this->render([ @@ -145,7 +145,7 @@ class ApiController extends Controller /* * 调用省市县显示 */ - public function regionAction() + public function region() { $parent_id = Request::get('parent_id', 0); $layer = Request::get('layer', 1); diff --git a/app/Gdoo/Index/Controllers/AttachmentController.php b/app/Gdoo/Index/Controllers/AttachmentController.php index 706297f8..a787c346 100644 --- a/app/Gdoo/Index/Controllers/AttachmentController.php +++ b/app/Gdoo/Index/Controllers/AttachmentController.php @@ -16,7 +16,7 @@ class AttachmentController extends DefaultController /** * 上传文件 */ - public function uploaderAction() + public function uploader() { if (Request::method() == 'POST') { $file = Request::file('file'); @@ -71,7 +71,7 @@ class AttachmentController extends DefaultController /** * 新建文件 */ - public function createAction() + public function create() { set_time_limit(0); @@ -110,7 +110,7 @@ class AttachmentController extends DefaultController /** * 二维码上传 */ - public function qrcodeAction() + public function qrcode() { $key = Request::get('key'); $path = Request::get('path'); @@ -127,7 +127,7 @@ class AttachmentController extends DefaultController /** * 获取文件列表 */ - public function listAction() + public function list() { $id = Request::get('id'); $rows = AttachmentService::get($id); @@ -137,7 +137,7 @@ class AttachmentController extends DefaultController /** * 获取草稿列表 */ - public function draftAction() + public function draft() { $key = Request::get('key'); $rows = AttachmentService::draft($key); @@ -147,7 +147,7 @@ class AttachmentController extends DefaultController /** * 预览文件 */ - public function showAction() + public function show() { $id = Request::get('id'); @@ -170,7 +170,7 @@ class AttachmentController extends DefaultController /** * 预览文件 */ - public function previewAction() + public function preview() { $id = Request::get('id'); $file = AttachmentService::get($id)[0]; @@ -194,7 +194,7 @@ class AttachmentController extends DefaultController /** * 下载文件 */ - public function downloadAction() + public function download() { $id = Request::get('id'); if ($id) { @@ -204,7 +204,7 @@ class AttachmentController extends DefaultController } } - public function deleteAction() + public function delete() { $gets = Request::all(); if ($gets['id']) { diff --git a/app/Gdoo/Index/Controllers/AuditController.php b/app/Gdoo/Index/Controllers/AuditController.php index 11e37a7d..9f620327 100644 --- a/app/Gdoo/Index/Controllers/AuditController.php +++ b/app/Gdoo/Index/Controllers/AuditController.php @@ -24,7 +24,7 @@ class AuditController extends DefaultController /** * 审核 */ - public function auditAction() + public function audit() { if (Request::method() == 'POST') { $key = Request::get('key'); @@ -48,7 +48,7 @@ class AuditController extends DefaultController /** * 弃审 */ - public function abortAction() + public function abort() { if (Request::method() == 'POST') { $key = Request::get('key'); diff --git a/app/Gdoo/Index/Controllers/DashboardController.php b/app/Gdoo/Index/Controllers/DashboardController.php index f5389e0b..98489b57 100644 --- a/app/Gdoo/Index/Controllers/DashboardController.php +++ b/app/Gdoo/Index/Controllers/DashboardController.php @@ -10,7 +10,7 @@ class DashboardController extends DefaultController { public $permission = ['index', 'config', 'quickMenu', 'settingWidget', 'settingInfo']; - public function indexAction() + public function index() { $auth = auth()->user(); @@ -110,7 +110,7 @@ class DashboardController extends DefaultController } // 仪表板设置 - public function configAction() + public function config() { $auth = auth()->user(); @@ -250,7 +250,7 @@ class DashboardController extends DefaultController } // 添加快捷菜单 - public function quickMenuAction() + public function quickMenu() { $menus = DB::table('menu')->orderBy('lft', 'asc')->get(); $menus = array_nest($menus); @@ -261,7 +261,7 @@ class DashboardController extends DefaultController } // 设置单个组件 - public function settingInfoAction() + public function settingInfo() { // 定义权限 $permissions = option('role.access')->pluck('name', 'id'); @@ -298,7 +298,7 @@ class DashboardController extends DefaultController } // 设置单个组件 - public function settingWidgetAction() + public function settingWidget() { $widget_id = Request::input('widget_id'); $row = UserWidget::where('id', $widget_id)->first(); diff --git a/app/Gdoo/Index/Controllers/DefaultController.php b/app/Gdoo/Index/Controllers/DefaultController.php index 19e49451..2b75dff4 100644 --- a/app/Gdoo/Index/Controllers/DefaultController.php +++ b/app/Gdoo/Index/Controllers/DefaultController.php @@ -48,7 +48,7 @@ class DefaultController extends Controller /** * 保存表单 */ - public function storeAction() + public function store() { $gets = Request::all(); $master = $gets['master']; @@ -81,7 +81,7 @@ class DefaultController extends Controller /** * 关闭行数据 */ - public function closeRowAction() + public function closeRow() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -103,7 +103,7 @@ class DefaultController extends Controller /** * 关闭所有行数据 */ - public function closeAllRowAction() + public function closeAllRow() { $gets = Request::all(); if (Request::method() == 'POST') { diff --git a/app/Gdoo/Index/Controllers/DemoController.php b/app/Gdoo/Index/Controllers/DemoController.php index 4918a210..de626e87 100644 --- a/app/Gdoo/Index/Controllers/DemoController.php +++ b/app/Gdoo/Index/Controllers/DemoController.php @@ -7,12 +7,12 @@ use Request; class DemoController extends Controller { #[Attribute(Attribute::TARGET_FUNCTION)] - public function vouchAction() + public function vouch() { return $this->display(); } - public function helloAction() + public function hello() { } } \ No newline at end of file diff --git a/app/Gdoo/Index/Controllers/IndexController.php b/app/Gdoo/Index/Controllers/IndexController.php index bb816b13..21081c72 100644 --- a/app/Gdoo/Index/Controllers/IndexController.php +++ b/app/Gdoo/Index/Controllers/IndexController.php @@ -18,7 +18,7 @@ class IndexController extends DefaultController 'support', ]; - public function indexAction() + public function index() { $user = auth()->user(); return $this->render([ @@ -27,7 +27,7 @@ class IndexController extends DefaultController } // 技术支持 - public function supportAction() + public function support() { return $this->render(); } @@ -35,7 +35,7 @@ class IndexController extends DefaultController /* * 通用对话框 */ - public function dialogAction() + public function dialog() { $gets = Request::all(); return $this->render([ @@ -44,7 +44,7 @@ class IndexController extends DefaultController } // 获取单个待办数量 - public function badgeAction() + public function badge() { $key = Request::input('key'); if ($key) { @@ -57,7 +57,7 @@ class IndexController extends DefaultController } // 获取全部待办数量 - public function badgesAction() + public function badges() { $badges = ModuleService::badges(); $json = []; diff --git a/app/Gdoo/Index/Controllers/WorkflowController.php b/app/Gdoo/Index/Controllers/WorkflowController.php index a902d0b7..08a1c879 100644 --- a/app/Gdoo/Index/Controllers/WorkflowController.php +++ b/app/Gdoo/Index/Controllers/WorkflowController.php @@ -46,7 +46,7 @@ class WorkflowController extends DefaultController /** * 流程审核 */ - public function flowAuditAction() + public function flowAudit() { $gets = Request::all(); @@ -220,7 +220,7 @@ class WorkflowController extends DefaultController /** * 撤回流程 */ - public function recallAction() + public function recall() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -332,7 +332,7 @@ class WorkflowController extends DefaultController /** * 弃审流程 */ - public function abortAction() + public function abort() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -416,7 +416,7 @@ class WorkflowController extends DefaultController /** * 标记已阅读 */ - public function flowReadAction() + public function flowRead() { if (Request::method() == 'POST') { $gets = Request::get('master'); @@ -430,7 +430,7 @@ class WorkflowController extends DefaultController /** * 流程清除重置 */ - public function flowResetAction() + public function flowReset() { if (Request::method() == 'POST') { $master = Request::get('master'); @@ -460,7 +460,7 @@ class WorkflowController extends DefaultController /** * 保存草稿 */ - public function flowDraftAction() + public function flowDraft() { $gets = Request::all(); $master = $gets['master']; @@ -498,7 +498,7 @@ class WorkflowController extends DefaultController /** * 获取办理步骤 */ - public function flowStepAction() + public function flowStep() { $gets = Request::all(); $master = $gets['master']; @@ -668,7 +668,7 @@ class WorkflowController extends DefaultController /** * 审批记录 */ - public function flowLogAction() + public function flowLog() { $key = Request::get('key'); $keys = AES::decrypt($key, config('app.key')); @@ -745,7 +745,7 @@ class WorkflowController extends DefaultController /** * 回退已经生效的流程 */ - public function flowReturnAction() + public function flowReturn() { $gets = Request::all(); $run_id = $gets['run_id']; @@ -838,7 +838,7 @@ class WorkflowController extends DefaultController /** * 流程修正 */ - public function flowReviseAction() + public function flowRevise() { $gets = Request::all(); $keys = AES::decrypt($gets['key'], config('app.key')); @@ -988,7 +988,7 @@ class WorkflowController extends DefaultController /** * 统计待办流程数量 */ - public function flowCountAction() + public function flowCount() { $rows = DB::table('model_step_log')->where('user_id', auth()->id()) ->where('status', 0) diff --git a/app/Gdoo/Model/Controllers/BillController.php b/app/Gdoo/Model/Controllers/BillController.php index f0aa71a3..184ebbaf 100644 --- a/app/Gdoo/Model/Controllers/BillController.php +++ b/app/Gdoo/Model/Controllers/BillController.php @@ -14,7 +14,7 @@ use Gdoo\Index\Controllers\DefaultController; class BillController extends DefaultController { - public function indexAction() + public function index() { $search = search_form([ 'advanced' => '', @@ -211,7 +211,7 @@ class BillController extends DefaultController ]); } - public function createAction() + public function create() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -245,17 +245,17 @@ class BillController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function storeAction() + public function store() { - return $this->editAction(); + return $this->edit(); } - public function deleteAction() + public function delete() { $ids = (array)Request::get('id'); if (count($ids) > 0) { diff --git a/app/Gdoo/Model/Controllers/FieldController.php b/app/Gdoo/Model/Controllers/FieldController.php index 46e93695..65329e8e 100644 --- a/app/Gdoo/Model/Controllers/FieldController.php +++ b/app/Gdoo/Model/Controllers/FieldController.php @@ -22,7 +22,7 @@ class FieldController extends DefaultController { public $permission = ['getColumns', 'getEnums']; - public function indexAction() + public function index() { $model_id = Request::get('model_id'); @@ -61,7 +61,7 @@ class FieldController extends DefaultController ]); } - public function createAction() + public function create() { $model_id = (int)Request::get('model_id'); $id = (int)Request::get('id'); @@ -384,7 +384,7 @@ class FieldController extends DefaultController /** * 获取字段类型 */ - public function typeAction() + public function type() { $type = Request::get('type'); $model_id = Request::get('model_id'); @@ -396,7 +396,7 @@ class FieldController extends DefaultController /** * 字段关联对象 */ - public function getColumnsAction() + public function getColumns() { $table = Request::get('table'); @@ -416,13 +416,13 @@ class FieldController extends DefaultController return $this->json($rows, true); } - public function getEnumsAction() + public function getEnums() { $enums = Option::where('parent_id', 0)->orderBy('sort', 'asc')->orderBy('id', 'asc')->get(); return $enums; } - public function deleteAction() + public function delete() { $model_id = Request::get('model_id'); $id = Request::get('id'); diff --git a/app/Gdoo/Model/Controllers/ModelController.php b/app/Gdoo/Model/Controllers/ModelController.php index 53cbf199..22d4bf8a 100644 --- a/app/Gdoo/Model/Controllers/ModelController.php +++ b/app/Gdoo/Model/Controllers/ModelController.php @@ -20,7 +20,7 @@ use Gdoo\Index\Controllers\DefaultController; class ModelController extends DefaultController { - public function indexAction() + public function index() { $header = [ 'master_name' => '模型', @@ -167,7 +167,7 @@ class ModelController extends DefaultController ]); } - public function createAction() + public function create() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -200,17 +200,17 @@ class ModelController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function storeAction() + public function store() { - return $this->editAction(); + return $this->edit(); } - public function deleteAction() + public function delete() { $ids = (array)Request::get('id'); if (count($ids) > 0) { diff --git a/app/Gdoo/Model/Controllers/ModuleController.php b/app/Gdoo/Model/Controllers/ModuleController.php index d4306cc4..c1f2abf1 100644 --- a/app/Gdoo/Model/Controllers/ModuleController.php +++ b/app/Gdoo/Model/Controllers/ModuleController.php @@ -16,7 +16,7 @@ class ModuleController extends DefaultController { public $permission = ['refresh']; - public function indexAction() + public function index() { $header = [ 'master_name' => '模块', @@ -148,7 +148,7 @@ class ModuleController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); @@ -160,7 +160,7 @@ class ModuleController extends DefaultController /** * 更新模块列表 */ - public function refreshAction() + public function refresh() { if (Request::method() == 'POST') { $modules = ModuleService::details(); diff --git a/app/Gdoo/Model/Controllers/PermissionController.php b/app/Gdoo/Model/Controllers/PermissionController.php index 5bfc7a07..e01c0192 100644 --- a/app/Gdoo/Model/Controllers/PermissionController.php +++ b/app/Gdoo/Model/Controllers/PermissionController.php @@ -18,7 +18,7 @@ class PermissionController extends DefaultController { public $permission = ['index','create','delete']; - public function indexAction() + public function index() { if (Request::method() == 'POST') { $sorts = Request::get('sort'); @@ -41,7 +41,7 @@ class PermissionController extends DefaultController ]); } - public function createAction() + public function create() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -103,7 +103,7 @@ class PermissionController extends DefaultController ]); } - public function deleteAction() + public function delete() { $id = Request::get('id'); if ($id > 0) { diff --git a/app/Gdoo/Model/Controllers/StepController.php b/app/Gdoo/Model/Controllers/StepController.php index afb55fcb..aea2ef3c 100644 --- a/app/Gdoo/Model/Controllers/StepController.php +++ b/app/Gdoo/Model/Controllers/StepController.php @@ -20,7 +20,7 @@ class StepController extends DefaultController { public $permission = ['condition', 'steps', 'index2', 'save', 'add', 'show']; - public function indexAction() + public function index() { // 更新排序 if (Request::method() == 'POST') { @@ -58,7 +58,7 @@ class StepController extends DefaultController ]); } - public function index2Action() + public function index2() { // 更新排序 if (Request::method() == 'POST') { @@ -122,7 +122,7 @@ class StepController extends DefaultController } // 克隆步骤 - public function addAction() + public function add() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -139,14 +139,14 @@ class StepController extends DefaultController } } - public function showAction() + public function show() { $gets = Request::all(); $row = DB::table('model_step')->where('id', $gets['id'])->first(); return $this->json($row, true); } - public function saveAction() + public function save() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -167,7 +167,7 @@ class StepController extends DefaultController /** * 节点条件 */ - public function conditionAction() + public function condition() { $id = Request::get('id'); $bill_id = Request::get('bill_id'); @@ -240,7 +240,7 @@ class StepController extends DefaultController /** * 创建步骤 */ - public function createAction() + public function create() { $id = Request::get('id'); $bill_id = Request::get('bill_id'); @@ -303,7 +303,7 @@ class StepController extends DefaultController /** * 流程移交 */ - public function moveAction() + public function move() { $id = Request::get('id'); $bill_id = Request::get('bill_id'); @@ -364,7 +364,7 @@ class StepController extends DefaultController ]); } - public function stepsAction() + public function steps() { $table = Request::get('table'); $model = Model::where('table', $table)->first(); @@ -376,7 +376,7 @@ class StepController extends DefaultController return json_encode($rows); } - public function deleteAction() + public function delete() { $id = Request::get('id'); if ($id > 0) { diff --git a/app/Gdoo/Model/Controllers/TemplateController.php b/app/Gdoo/Model/Controllers/TemplateController.php index 675419f4..80174dca 100644 --- a/app/Gdoo/Model/Controllers/TemplateController.php +++ b/app/Gdoo/Model/Controllers/TemplateController.php @@ -17,7 +17,7 @@ class TemplateController extends DefaultController { public $permission = ['create', 'create2', 'create3']; - public function indexAction() + public function index() { if (Request::method() == 'POST') { $sorts = Request::get('sort'); @@ -45,7 +45,7 @@ class TemplateController extends DefaultController ]); } - public function createAction() + public function create() { $gets = Request::all(); @@ -147,7 +147,7 @@ class TemplateController extends DefaultController ]); } - public function create2Action() + public function create2() { $gets = Request::all(); @@ -245,7 +245,7 @@ class TemplateController extends DefaultController ]); } - public function deleteAction() + public function delete() { $id = Request::get('id'); if ($id > 0) { diff --git a/app/Gdoo/Model/Controllers/TodoController.php b/app/Gdoo/Model/Controllers/TodoController.php index 09e1c67e..5af827ca 100644 --- a/app/Gdoo/Model/Controllers/TodoController.php +++ b/app/Gdoo/Model/Controllers/TodoController.php @@ -13,7 +13,7 @@ class TodoController extends DefaultController /** * 流程待办 */ - public function widgetAction(Request $request) + public function widget(Request $request) { if ($request->method() == 'POST') { $bill_id = $request->get('bill_id'); diff --git a/app/Gdoo/Model/Grid.php b/app/Gdoo/Model/Grid.php index 9ad7e4a2..6c92e564 100644 --- a/app/Gdoo/Model/Grid.php +++ b/app/Gdoo/Model/Grid.php @@ -1145,7 +1145,7 @@ class Grid ]; $js = "gdoo.grids.$table = ".json_encode($search, JSON_UNESCAPED_UNICODE).";"; - $js .= "gdoo.grids.$table.action = new gridAction('".$table."', '".$header['master_name']."');"; + $js .= "gdoo.grids.$table.action = new grid('".$table."', '".$header['master_name']."');"; $js .= "gdoo.grids.$table.action.routes = ".json_encode($routes, JSON_UNESCAPED_UNICODE).';'; $js .= "gdoo.grids.$table.action.bill_url = '{$mc}';"; $res = ''; diff --git a/app/Gdoo/Order/Controllers/LogisticsController.php b/app/Gdoo/Order/Controllers/LogisticsController.php index e962fb3b..ce63d273 100644 --- a/app/Gdoo/Order/Controllers/LogisticsController.php +++ b/app/Gdoo/Order/Controllers/LogisticsController.php @@ -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' => '', diff --git a/app/Gdoo/Order/Controllers/OrderController.php b/app/Gdoo/Order/Controllers/OrderController.php index b724b53d..67990d22 100644 --- a/app/Gdoo/Order/Controllers/OrderController.php +++ b/app/Gdoo/Order/Controllers/OrderController.php @@ -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'); diff --git a/app/Gdoo/Order/Controllers/PlanController.php b/app/Gdoo/Order/Controllers/PlanController.php index 308cae0b..9b178c8e 100644 --- a/app/Gdoo/Order/Controllers/PlanController.php +++ b/app/Gdoo/Order/Controllers/PlanController.php @@ -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(); diff --git a/app/Gdoo/Order/Controllers/ReportController.php b/app/Gdoo/Order/Controllers/ReportController.php index dc2f3a2e..00bb54f8 100644 --- a/app/Gdoo/Order/Controllers/ReportController.php +++ b/app/Gdoo/Order/Controllers/ReportController.php @@ -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'); diff --git a/app/Gdoo/Order/Controllers/SampleApplyController.php b/app/Gdoo/Order/Controllers/SampleApplyController.php index dd7ab4d1..d85f08e1 100644 --- a/app/Gdoo/Order/Controllers/SampleApplyController.php +++ b/app/Gdoo/Order/Controllers/SampleApplyController.php @@ -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'); diff --git a/app/Gdoo/Order/Controllers/TypeController.php b/app/Gdoo/Order/Controllers/TypeController.php index 9ee0a3be..91876cd9 100644 --- a/app/Gdoo/Order/Controllers/TypeController.php +++ b/app/Gdoo/Order/Controllers/TypeController.php @@ -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'); diff --git a/app/Gdoo/Order/Controllers/WidgetController.php b/app/Gdoo/Order/Controllers/WidgetController.php index 20511a7c..0fb783ca 100644 --- a/app/Gdoo/Order/Controllers/WidgetController.php +++ b/app/Gdoo/Order/Controllers/WidgetController.php @@ -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') { diff --git a/app/Gdoo/Order/views/plan/export_sale.blade.php b/app/Gdoo/Order/views/plan/export_sale.blade.php index a749ec30..5061d6af 100644 --- a/app/Gdoo/Order/views/plan/export_sale.blade.php +++ b/app/Gdoo/Order/views/plan/export_sale.blade.php @@ -56,7 +56,7 @@ gdoo.grids[table] = {grid: grid}; - var action = new gridAction(table, '外销生产进度表'); + var action = new grid(table, '外销生产进度表'); var panel = $('#' + table + '-controller'); // 过滤数据 diff --git a/app/Gdoo/Order/views/plan/index.blade.php b/app/Gdoo/Order/views/plan/index.blade.php index 97d0bfc0..f491d4d8 100644 --- a/app/Gdoo/Order/views/plan/index.blade.php +++ b/app/Gdoo/Order/views/plan/index.blade.php @@ -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() { diff --git a/app/Gdoo/Order/views/plan/produce.blade.php b/app/Gdoo/Order/views/plan/produce.blade.php index 76299057..7c225bab 100644 --- a/app/Gdoo/Order/views/plan/produce.blade.php +++ b/app/Gdoo/Order/views/plan/produce.blade.php @@ -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() { diff --git a/app/Gdoo/Produce/Controllers/MaterialController.php b/app/Gdoo/Produce/Controllers/MaterialController.php index 0b01a80b..3fcf3dcd 100644 --- a/app/Gdoo/Produce/Controllers/MaterialController.php +++ b/app/Gdoo/Produce/Controllers/MaterialController.php @@ -20,7 +20,7 @@ class MaterialController extends DefaultController { public $permission = ['dialog', 'config', 'configSave', 'planProduct', 'planTotal']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'product_material', @@ -73,7 +73,7 @@ class MaterialController extends DefaultController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); $form = Form::make(['code' => 'product_material', 'id' => $id, 'action' => $action]); @@ -82,13 +82,13 @@ class MaterialController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction('edit'); + return $this->create('edit'); } // 配方 - public function configAction() + public function config() { $id = (int)Request::get('id'); if (Request::method() == 'POST') { @@ -108,7 +108,7 @@ class MaterialController extends DefaultController } // 用料计划 - public function planAction() + public function plan() { $search = search_form([ 'advanced' => 0, @@ -164,7 +164,7 @@ class MaterialController extends DefaultController } // 用料计划产品 - public function planProductAction() + public function planProduct() { $search = search_form([], [], 'model'); $query = $search['query']; @@ -208,7 +208,7 @@ class MaterialController extends DefaultController } // 用料计划总量 - public function planTotalAction() + public function planTotal() { $search = search_form([], [], 'model'); $query = $search['query']; @@ -243,7 +243,7 @@ class MaterialController extends DefaultController } // 配方保存 - public function configSaveAction() + public function configSave() { $gets = Request::all(); $id = $gets['id']; @@ -269,7 +269,7 @@ class MaterialController extends DefaultController return $this->json('配方保存成功。', true); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); @@ -277,7 +277,7 @@ class MaterialController extends DefaultController } } - public function dialogAction() + public function dialog() { $search = search_form([ 'advanced' => '', diff --git a/app/Gdoo/Produce/Controllers/PlanController.php b/app/Gdoo/Produce/Controllers/PlanController.php index 67cfd563..4e563999 100644 --- a/app/Gdoo/Produce/Controllers/PlanController.php +++ b/app/Gdoo/Produce/Controllers/PlanController.php @@ -20,7 +20,7 @@ class PlanController extends WorkflowController { public $permission = ['dialog', 'orderPlan', 'planExport']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'produce_plan', @@ -71,7 +71,7 @@ class PlanController extends WorkflowController } // 生产计划导出 - public function planExportAction() + public function planExport() { $search = search_form([ 'advanced' => 0, @@ -164,7 +164,7 @@ class PlanController extends WorkflowController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); $form = Form::make(['code' => 'produce_plan', 'id' => $id, 'action' => $action]); @@ -173,23 +173,23 @@ class PlanController extends WorkflowController ], 'create'); } - public function auditAction() + public function audit() { - return $this->createAction('edit'); + return $this->create('edit'); } - public function editAction() + public function edit() { - return $this->createAction('edit'); + return $this->create('edit'); } - public function showAction() + public function show() { - return $this->createAction('show'); + return $this->create('show'); } // 参照订单计划 - public function orderPlanAction() + public function orderPlan() { $plan_date = Request::get('plan_date'); $rows = []; @@ -204,7 +204,7 @@ class PlanController extends WorkflowController return $this->json($rows, true); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Product/Controllers/CategoryController.php b/app/Gdoo/Product/Controllers/CategoryController.php index ea754e9b..2b7c3619 100644 --- a/app/Gdoo/Product/Controllers/CategoryController.php +++ b/app/Gdoo/Product/Controllers/CategoryController.php @@ -15,7 +15,7 @@ class CategoryController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'product_category', @@ -71,7 +71,7 @@ class CategoryController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'product_category', 'id' => $id]); @@ -80,12 +80,12 @@ class CategoryController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); @@ -93,7 +93,7 @@ class CategoryController extends DefaultController } } - public function dialogAction() + public function dialog() { $search = search_form([], [ ['text','product_category.name','名称'], diff --git a/app/Gdoo/Product/Controllers/ProductController.php b/app/Gdoo/Product/Controllers/ProductController.php index c2fa98b2..1d929a69 100644 --- a/app/Gdoo/Product/Controllers/ProductController.php +++ b/app/Gdoo/Product/Controllers/ProductController.php @@ -22,7 +22,7 @@ class ProductController extends DefaultController { public $permission = ['dialog', 'show', 'category', 'serviceCustomer']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'product', @@ -89,7 +89,7 @@ class ProductController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'product', 'id' => $id]); @@ -98,12 +98,12 @@ class ProductController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function showAction() + public function show() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'product', 'id' => $id, 'action' => 'show']); @@ -113,7 +113,7 @@ class ProductController extends DefaultController } // 数据导入 - public function importAction() + public function import() { if (Request::method() == 'POST') { return Form::import(['table' => 'product', 'keys' => ['code', 'category_id', 'unit_id']]); @@ -122,7 +122,7 @@ class ProductController extends DefaultController return $this->render(['tips' => $tips], 'layouts.import'); } - public function dialogAction() + public function dialog() { $header = Grid::header([ 'code' => 'product', @@ -175,7 +175,7 @@ class ProductController extends DefaultController /** * 以客户产品列表 */ - public function serviceCustomerAction() + public function serviceCustomer() { $search = search_form( ['advanced' => ''], [ @@ -248,7 +248,7 @@ class ProductController extends DefaultController ]); } - public function categoryAction() + public function category() { if (Request::method() == 'POST') { $model = ProductCategory::orderBy('lft', 'asc'); @@ -259,7 +259,7 @@ class ProductController extends DefaultController } } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Product/Controllers/UnitController.php b/app/Gdoo/Product/Controllers/UnitController.php index f5083cb5..74d5d3a5 100644 --- a/app/Gdoo/Product/Controllers/UnitController.php +++ b/app/Gdoo/Product/Controllers/UnitController.php @@ -14,7 +14,7 @@ class UnitController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'product_unit', @@ -63,7 +63,7 @@ class UnitController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'product_unit', 'id' => $id]); @@ -72,12 +72,12 @@ class UnitController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function dialogAction() + public function dialog() { $search = search_form([], [ ['text','product_unit.name','名称'], @@ -99,7 +99,7 @@ class UnitController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Project/Controllers/CommentController.php b/app/Gdoo/Project/Controllers/CommentController.php index f1fc0613..ef1a7242 100644 --- a/app/Gdoo/Project/Controllers/CommentController.php +++ b/app/Gdoo/Project/Controllers/CommentController.php @@ -19,7 +19,7 @@ class CommentController extends DefaultController public $permission = []; // 添加评论 - public function addAction(Request $request) + public function add(Request $request) { if ($request->method() == 'POST') { $gets = $request->input(); @@ -49,7 +49,7 @@ class CommentController extends DefaultController } // 编辑评论 - public function editAction(Request $request) + public function edit(Request $request) { if ($request->method() == 'POST') { $gets = $request->input(); @@ -74,7 +74,7 @@ class CommentController extends DefaultController } // 删除评论 - public function deleteAction(Request $request) + public function delete(Request $request) { if ($request->method() == 'POST') { $id = $request->input('id'); diff --git a/app/Gdoo/Project/Controllers/ProjectController.php b/app/Gdoo/Project/Controllers/ProjectController.php index 6fa9dd9f..a1e34802 100644 --- a/app/Gdoo/Project/Controllers/ProjectController.php +++ b/app/Gdoo/Project/Controllers/ProjectController.php @@ -20,7 +20,7 @@ class ProjectController extends DefaultController { public $permission = []; - public function indexAction() + public function index() { $search = search_form([ 'referer' => 1, @@ -76,13 +76,13 @@ class ProjectController extends DefaultController } // 项目详情 - public function showAction(Request $request) + public function show(Request $request) { return $this->display([]); } // 添加项目 - public function addAction(Request $request) + public function add(Request $request) { if ($request->method() == 'POST') { $gets = $request->input(); @@ -105,7 +105,7 @@ class ProjectController extends DefaultController } // 编辑项目 - public function editAction(Request $request) + public function edit(Request $request) { if ($request->method() == 'POST') { $gets = $request->input(); @@ -134,7 +134,7 @@ class ProjectController extends DefaultController } // 删除项目 - public function deleteAction(Request $request) + public function delete(Request $request) { $id = $request->input('id'); $id = array_filter((array)$id); diff --git a/app/Gdoo/Project/Controllers/TaskController.php b/app/Gdoo/Project/Controllers/TaskController.php index 700d458c..7914bd81 100644 --- a/app/Gdoo/Project/Controllers/TaskController.php +++ b/app/Gdoo/Project/Controllers/TaskController.php @@ -24,7 +24,7 @@ class TaskController extends DefaultController { public $permission = ['drag', 'sort']; - public function indexAction(Request $request) + public function index(Request $request) { $search = search_form([ 'project_id' => '', @@ -76,7 +76,7 @@ class TaskController extends DefaultController } // 显示任务 - public function showAction(Request $request) + public function show(Request $request) { $search = search_form([ 'project_id' => '' @@ -95,7 +95,7 @@ class TaskController extends DefaultController } // 移动任务 - public function dragAction(Request $request) + public function drag(Request $request) { $gets = $request->input(); @@ -110,7 +110,7 @@ class TaskController extends DefaultController } // 移动任务 - public function sortAction(Request $request) + public function sort(Request $request) { $gets = $request->input(); @@ -129,7 +129,7 @@ class TaskController extends DefaultController } // 添加任务 - public function addAction(Request $request) + public function add(Request $request) { if ($request->method() == 'POST') { $gets = $request->input(); @@ -189,7 +189,7 @@ class TaskController extends DefaultController } // 编辑任务 - public function editAction(Request $request) + public function edit(Request $request) { if ($request->method() == 'POST') { $gets = $request->input(); @@ -311,7 +311,7 @@ class TaskController extends DefaultController } // 删除任务 - public function deleteAction(Request $request) + public function delete(Request $request) { if ($request->method() == 'POST') { $id = $request->input('id'); diff --git a/app/Gdoo/Project/Controllers/WidgetController.php b/app/Gdoo/Project/Controllers/WidgetController.php index 3e991c7a..a634f176 100644 --- a/app/Gdoo/Project/Controllers/WidgetController.php +++ b/app/Gdoo/Project/Controllers/WidgetController.php @@ -13,7 +13,7 @@ class WidgetController extends DefaultController /** * 项目任务信息 */ - public function infoAction() + public function info() { $config = InfoService::getInfo('project_task'); diff --git a/app/Gdoo/Promotion/Controllers/MaterialController.php b/app/Gdoo/Promotion/Controllers/MaterialController.php index 93bd5b58..686d1465 100644 --- a/app/Gdoo/Promotion/Controllers/MaterialController.php +++ b/app/Gdoo/Promotion/Controllers/MaterialController.php @@ -20,7 +20,7 @@ class MaterialController extends DefaultController { public $permission = ['detail', 'dialog', 'store', 'archive', 'download']; - public function indexAction() + public function index() { // 客户权限 $region = regionCustomer('customer_id_customer'); @@ -101,7 +101,7 @@ class MaterialController extends DefaultController ]); } - public function detailAction() + public function detail() { $search = search_form([ 'status' => '', @@ -167,7 +167,7 @@ class MaterialController extends DefaultController ]); } - public function dialogAction() + public function dialog() { $user = auth()->user(); @@ -186,7 +186,7 @@ class MaterialController extends DefaultController return $this->json($rows, true); } - public function showAction() + public function show() { $id = Request::get('id'); $row = Material::with('promotion') @@ -215,7 +215,7 @@ class MaterialController extends DefaultController ]); } - public function auditAction() + public function audit() { $id = (array)Request::get('id'); $status = Request::get('status'); @@ -231,7 +231,7 @@ class MaterialController extends DefaultController return $this->json('操作成功。', true); } - public function archiveAction() + public function archive() { $id = (array)Request::get('id'); @@ -256,7 +256,7 @@ class MaterialController extends DefaultController return $this->json('', true); } - public function downloadAction() + public function download() { $sn = Request::get('sn'); if(empty($sn)) { @@ -265,7 +265,7 @@ class MaterialController extends DefaultController return response()->download(upload_path('promotion/material/archive.zip'), $sn.'_'.date('Y-m-d').'.zip'); } - public function storeAction() + public function store() { // 上传文件 if (Request::method() == 'POST') { @@ -320,7 +320,7 @@ class MaterialController extends DefaultController } } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $var1 = (array)Request::get('id'); diff --git a/app/Gdoo/Promotion/Controllers/PromotionController.php b/app/Gdoo/Promotion/Controllers/PromotionController.php index eb4bad20..4d7b8a7e 100644 --- a/app/Gdoo/Promotion/Controllers/PromotionController.php +++ b/app/Gdoo/Promotion/Controllers/PromotionController.php @@ -19,7 +19,7 @@ class PromotionController extends WorkflowController { public $permission = ['dialog', 'serviceSaleOrder', 'useCount', 'product']; - public function indexAction() + public function index() { // 客户权限 $region = regionCustomer('customer_id_customer'); @@ -109,7 +109,7 @@ class PromotionController extends WorkflowController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); $header['action'] = $action; @@ -136,22 +136,22 @@ class PromotionController 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() { $id = (int) Request::get('id'); $template_id = (int) Request::get('template_id'); @@ -168,7 +168,7 @@ class PromotionController extends WorkflowController } // 赠品促销参照到订单 - public function serviceSaleOrderAction() + public function serviceSaleOrder() { $search = search_form( ['advanced' => ''], [ @@ -320,7 +320,7 @@ class PromotionController extends WorkflowController } // 产品明细 - public function productAction() + public function product() { $query = Request::all(); if (Request::method() == 'POST') { @@ -334,7 +334,7 @@ class PromotionController extends WorkflowController return $this->render(['query' => $query]); } - public function closeAction() + public function close() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -347,7 +347,7 @@ class PromotionController extends WorkflowController } // 可用列表 - public function useCountAction() + public function useCount() { $customer_id = Request::get('customer_id'); @@ -359,7 +359,7 @@ class PromotionController extends WorkflowController return $this->json($count, true); } - public function dialogAction() + public function dialog() { $search = search_form( ['advanced' => ''], [ @@ -474,7 +474,7 @@ class PromotionController extends WorkflowController } // 批量编辑 - public function batchEditAction() + public function batchEdit() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -494,7 +494,7 @@ class PromotionController extends WorkflowController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Promotion/Controllers/ReviewController.php b/app/Gdoo/Promotion/Controllers/ReviewController.php index ad70293f..417dc7e4 100644 --- a/app/Gdoo/Promotion/Controllers/ReviewController.php +++ b/app/Gdoo/Promotion/Controllers/ReviewController.php @@ -16,7 +16,7 @@ class ReviewController extends WorkflowController { public $permission = ['dialog', 'reference', 'useCount', 'feeDetail']; - public function indexAction() + public function index() { // 客户权限 $region = regionCustomer('customer_id_customer'); @@ -79,7 +79,7 @@ class ReviewController extends WorkflowController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); @@ -103,29 +103,29 @@ class ReviewController 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 batchEditAction() + public function batchEdit() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -146,7 +146,7 @@ class ReviewController extends WorkflowController } // 兑现明细 - public function feeDetailAction() + public function feeDetail() { $query = Request::all(); if (Request::method() == 'POST') { @@ -156,7 +156,7 @@ class ReviewController extends WorkflowController return $this->render(['query' => $query]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Purchase/Controllers/OrderController.php b/app/Gdoo/Purchase/Controllers/OrderController.php index 631f79e5..a5470e21 100644 --- a/app/Gdoo/Purchase/Controllers/OrderController.php +++ b/app/Gdoo/Purchase/Controllers/OrderController.php @@ -17,7 +17,7 @@ class OrderController extends WorkflowController { public $permission = ['dialog', 'serviceRecord01']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'purchase_order', @@ -67,7 +67,7 @@ class OrderController extends WorkflowController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); $form = Form::make(['code' => 'purchase_order', 'id' => $id, 'action' => $action]); @@ -76,23 +76,23 @@ class OrderController extends WorkflowController ], 'create'); } - public function auditAction() + public function audit() { - return $this->createAction('edit'); + return $this->create('edit'); } - public function editAction() + public function edit() { - return $this->createAction('edit'); + return $this->create('edit'); } - public function showAction() + public function show() { - return $this->createAction('show'); + return $this->create('show'); } // 参照其他入库单 - public function serviceRecord01Action() + public function serviceRecord01() { $search = search_form( ['advanced' => ''], [ @@ -185,7 +185,7 @@ class OrderController extends WorkflowController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Purchase/Controllers/SupplierController.php b/app/Gdoo/Purchase/Controllers/SupplierController.php index 4c875e28..6a56dfd5 100644 --- a/app/Gdoo/Purchase/Controllers/SupplierController.php +++ b/app/Gdoo/Purchase/Controllers/SupplierController.php @@ -17,7 +17,7 @@ class SupplierController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'supplier', @@ -68,7 +68,7 @@ class SupplierController extends DefaultController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); $form = Form::make(['code' => 'supplier', 'id' => $id, 'action' => $action]); @@ -77,22 +77,22 @@ class SupplierController extends DefaultController ], 'create'); } - public function auditAction() + public function audit() { - return $this->createAction('edit'); + return $this->create('edit'); } - public function editAction() + public function edit() { - return $this->createAction('edit'); + return $this->create('edit'); } - public function showAction() + public function show() { - return $this->createAction('show'); + return $this->create('show'); } - public function dialogAction() + public function dialog() { $search = search_form( ['advanced' => ''], [ @@ -128,7 +128,7 @@ class SupplierController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/StiReport/Controllers/StiReportController.php b/app/Gdoo/StiReport/Controllers/StiReportController.php index 220d59e7..7479cf33 100644 --- a/app/Gdoo/StiReport/Controllers/StiReportController.php +++ b/app/Gdoo/StiReport/Controllers/StiReportController.php @@ -11,7 +11,7 @@ class StiReportController extends DefaultController { public $permission = ['viewer', 'designer', 'saveReport', 'license', 'render']; - public function designerAction() + public function designer() { $template_id = (int)Request::get('template_id'); $template = DB::table('model_template')->where('id', $template_id)->first(); @@ -24,17 +24,17 @@ class StiReportController extends DefaultController return $this->render(['report_name' => $report_name, 'report_file' => $report_file]); } - public function viewerAction() + public function viewer() { return $this->render(); } - public function renderAction() + public function render() { return $this->render(); } - public function saveReportAction() + public function saveReport() { $gets = Request::all(); $fileName = $gets['fileName']; diff --git a/app/Gdoo/Stock/Controllers/AllocationController.php b/app/Gdoo/Stock/Controllers/AllocationController.php index 4a49bd9c..7649cced 100644 --- a/app/Gdoo/Stock/Controllers/AllocationController.php +++ b/app/Gdoo/Stock/Controllers/AllocationController.php @@ -18,7 +18,7 @@ class AllocationController extends WorkflowController { public $permission = ['dialog', 'logistics', 'stockSelect']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'stock_allocation', @@ -69,7 +69,7 @@ class AllocationController extends WorkflowController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); $header['action'] = $action; @@ -83,22 +83,22 @@ class AllocationController 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() { $id = Request::get('id'); $template_id = Request::get('template_id'); @@ -139,7 +139,7 @@ class AllocationController extends WorkflowController } // 选择库存 - public function stockSelectAction() + public function stockSelect() { $search = search_form(['advanced' => ''], [ ['form_type' => 'text', 'name' => '产品名称', 'field' => 'name'], @@ -167,7 +167,7 @@ class AllocationController extends WorkflowController } // 物流信息 - public function logisticsAction() + public function logistics() { if (Request::method() == 'POST') { $gets = Request::get('stock_allocation'); @@ -195,7 +195,7 @@ class AllocationController extends WorkflowController } // 删除 - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Stock/Controllers/CancelController.php b/app/Gdoo/Stock/Controllers/CancelController.php index 643eb186..3276731b 100644 --- a/app/Gdoo/Stock/Controllers/CancelController.php +++ b/app/Gdoo/Stock/Controllers/CancelController.php @@ -16,7 +16,7 @@ class CancelController extends WorkflowController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'stock_cancel', @@ -71,7 +71,7 @@ class CancelController extends WorkflowController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); $header['action'] = $action; @@ -85,22 +85,22 @@ class CancelController 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() { $id = Request::get('id'); $template_id = Request::get('template_id'); @@ -146,7 +146,7 @@ class CancelController extends WorkflowController } // 批量编辑 - public function batchEditAction() + public function batchEdit() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -166,7 +166,7 @@ class CancelController extends WorkflowController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Stock/Controllers/CategoryController.php b/app/Gdoo/Stock/Controllers/CategoryController.php index d1ad593c..d45c9f7a 100644 --- a/app/Gdoo/Stock/Controllers/CategoryController.php +++ b/app/Gdoo/Stock/Controllers/CategoryController.php @@ -15,7 +15,7 @@ class CategoryController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'stock_type', @@ -65,7 +65,7 @@ class CategoryController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'stock_type', 'id' => $id]); @@ -74,12 +74,12 @@ class CategoryController 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' => 'stock_type', @@ -112,7 +112,7 @@ class CategoryController extends DefaultController ], 'dialog'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Stock/Controllers/DeliveryController.php b/app/Gdoo/Stock/Controllers/DeliveryController.php index 0cebe918..6635ccd6 100644 --- a/app/Gdoo/Stock/Controllers/DeliveryController.php +++ b/app/Gdoo/Stock/Controllers/DeliveryController.php @@ -33,7 +33,7 @@ class DeliveryController extends WorkflowController 'autoSave' ]; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'stock_delivery', @@ -111,7 +111,7 @@ class DeliveryController extends WorkflowController ]); } - public function detailAction() + public function detail() { $header = Grid::header([ 'code' => 'stock_delivery', @@ -178,7 +178,7 @@ class DeliveryController extends WorkflowController ]); } - public function autoSaveAction() + public function autoSave() { $gets = Request::all(); $master = $gets['master']; @@ -234,10 +234,10 @@ class DeliveryController extends WorkflowController $url = url($master['uri'].'/show', ['id' => $id, 'client' => $master['client']]); return $this->json($bill['name'].'保存成功', $url); } - return $this->createAction('audit'); + return $this->create('audit'); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); $header['action'] = $action; @@ -260,23 +260,23 @@ class DeliveryController 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 batchEditAction() + public function batchEdit() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -296,7 +296,7 @@ class DeliveryController extends WorkflowController ]); } - public function printAction() + public function print() { $id = Request::get('id'); $template_id = Request::get('template_id'); @@ -333,12 +333,12 @@ class DeliveryController extends WorkflowController } // 默认模板 - $tpl = $this->createAction('print'); + $tpl = $this->create('print'); return $print_type == 'pdf' ? print_prince($tpl) : $tpl; } // 物流信息 - public function logisticsAction() + public function logistics() { if (Request::method() == 'POST') { $gets = Request::get('stock_delivery'); @@ -367,7 +367,7 @@ class DeliveryController extends WorkflowController } // 获取库存 - public function getBatchSelectAction() + public function getBatchSelect() { $search = search_form(['advanced' => ''], [ ['form_type' => 'text', 'name' => '产品名称', 'field' => 'name'], @@ -384,7 +384,7 @@ class DeliveryController extends WorkflowController } // 获取库存(直营) - public function getBatchSelectZYAction() + public function getBatchSelectZY() { $search = search_form(['advanced' => ''], [ ['form_type' => 'text', 'name' => '产品名称', 'field' => 'name'], @@ -401,7 +401,7 @@ class DeliveryController extends WorkflowController } // 获取库存(全部) - public function getBatchSelectAllAction() + public function getBatchSelectAll() { $search = search_form(['advanced' => ''], [ ['form_type' => 'text', 'name' => '产品名称', 'field' => 'name'], @@ -417,7 +417,7 @@ class DeliveryController extends WorkflowController ], 'getBatchSelect'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Stock/Controllers/DirectController.php b/app/Gdoo/Stock/Controllers/DirectController.php index 7cf12249..ee6775a9 100644 --- a/app/Gdoo/Stock/Controllers/DirectController.php +++ b/app/Gdoo/Stock/Controllers/DirectController.php @@ -16,7 +16,7 @@ class DirectController extends WorkflowController { public $permission = ['dialog', 'importExcel']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'stock_direct', @@ -66,7 +66,7 @@ class DirectController extends WorkflowController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); $header['action'] = $action; @@ -80,22 +80,22 @@ class DirectController 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() { $id = Request::get('id'); $template_id = Request::get('template_id'); @@ -153,7 +153,7 @@ class DirectController extends WorkflowController ], 'print/'.$template_id); } - public function importExcelAction() + public function importExcel() { if (Request::method() == 'POST') { $customer_id = Request::get('customer_id'); @@ -228,7 +228,7 @@ class DirectController extends WorkflowController return view('importExcel'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Stock/Controllers/LocationController.php b/app/Gdoo/Stock/Controllers/LocationController.php index 2790b496..8d04a47e 100644 --- a/app/Gdoo/Stock/Controllers/LocationController.php +++ b/app/Gdoo/Stock/Controllers/LocationController.php @@ -15,7 +15,7 @@ class LocationController extends DefaultController { public $permission = ['dialog', 'dialog2', 'serviceWarehouse']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'warehouse_location', @@ -65,7 +65,7 @@ class LocationController extends DefaultController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int)Request::get('id'); $form = Form::make(['code' => 'warehouse_location', 'id' => $id, 'action' => $action]); @@ -74,12 +74,12 @@ class LocationController 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' => 'warehouse_location', @@ -115,7 +115,7 @@ class LocationController extends DefaultController /** * 获取现存量 */ - public function dialog2Action() + public function dialog2() { $header = Grid::header([ 'code' => 'warehouse_location', @@ -151,7 +151,7 @@ class LocationController extends DefaultController /** * 获取仓库货位 */ - public function serviceWarehouseAction() + public function serviceWarehouse() { $warehouse_id = Request::get('warehouse_id'); if (Request::method() == 'POST') { @@ -163,7 +163,7 @@ class LocationController extends DefaultController } } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Stock/Controllers/Record01Controller.php b/app/Gdoo/Stock/Controllers/Record01Controller.php index af0da89e..707607df 100644 --- a/app/Gdoo/Stock/Controllers/Record01Controller.php +++ b/app/Gdoo/Stock/Controllers/Record01Controller.php @@ -16,7 +16,7 @@ class Record01Controller extends AuditController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'stock_record01', @@ -67,7 +67,7 @@ class Record01Controller extends AuditController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); $header['action'] = $action; @@ -81,23 +81,23 @@ class Record01Controller extends AuditController ], $tpl); } - 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 printAction() + public function print() { $this->layout = 'layouts.print2'; - print_prince($this->createAction('print')); + print_prince($this->create('print')); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Stock/Controllers/Record08Controller.php b/app/Gdoo/Stock/Controllers/Record08Controller.php index 124a8f22..3ce61131 100644 --- a/app/Gdoo/Stock/Controllers/Record08Controller.php +++ b/app/Gdoo/Stock/Controllers/Record08Controller.php @@ -16,7 +16,7 @@ class Record08Controller extends AuditController { public $permission = ['dialog', 'importExcel']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'stock_record08', @@ -67,7 +67,7 @@ class Record08Controller extends AuditController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); $header['action'] = $action; @@ -81,23 +81,23 @@ class Record08Controller extends AuditController ], $tpl); } - 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 printAction() + public function print() { $this->layout = 'layouts.print2'; - print_prince($this->createAction('print')); + print_prince($this->create('print')); } - public function importExcelAction() + public function importExcel() { if (Request::method() == 'POST') { $file = Request::file('file'); @@ -148,7 +148,7 @@ class Record08Controller extends AuditController return view('importExcel'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Stock/Controllers/Record09Controller.php b/app/Gdoo/Stock/Controllers/Record09Controller.php index 8b8ee243..bcb702ff 100644 --- a/app/Gdoo/Stock/Controllers/Record09Controller.php +++ b/app/Gdoo/Stock/Controllers/Record09Controller.php @@ -16,7 +16,7 @@ class Record09Controller extends WorkflowController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'stock_record09', @@ -67,7 +67,7 @@ class Record09Controller extends WorkflowController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); $header['action'] = $action; @@ -81,22 +81,22 @@ class Record09Controller extends WorkflowController ], $tpl); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function auditAction() + public function audit() { - return $this->createAction(); + return $this->create(); } - public function showAction() + public function show() { - return $this->createAction('show'); + return $this->create('show'); } - public function printAction() + public function print() { $id = Request::get('id'); $template_id = Request::get('template_id'); @@ -138,7 +138,7 @@ class Record09Controller extends WorkflowController return $tpl; } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Stock/Controllers/Record10Controller.php b/app/Gdoo/Stock/Controllers/Record10Controller.php index 706757ba..fd296cfd 100644 --- a/app/Gdoo/Stock/Controllers/Record10Controller.php +++ b/app/Gdoo/Stock/Controllers/Record10Controller.php @@ -16,7 +16,7 @@ class Record10Controller extends WorkflowController { public $permission = ['dialog', 'print3']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'stock_record10', @@ -67,7 +67,7 @@ class Record10Controller extends WorkflowController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); $header['action'] = $action; @@ -82,30 +82,30 @@ class Record10Controller 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 print2Action() + public function print2() { $this->layout = 'layouts.print2'; - $view = $this->createAction('print'); + $view = $this->create('print'); $viewData = $view->getData(); - print_prince($this->createAction('print')); + print_prince($this->create('print')); } - public function printAction() + public function print() { $id = Request::get('id'); $template_id = Request::get('template_id'); @@ -149,12 +149,12 @@ class Record10Controller extends WorkflowController } else { $this->layout = 'layouts.print2'; - $tpl = $this->createAction('print'); + $tpl = $this->create('print'); print_prince($tpl); } } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Stock/Controllers/Record11Controller.php b/app/Gdoo/Stock/Controllers/Record11Controller.php index b326fc06..b5cb995e 100644 --- a/app/Gdoo/Stock/Controllers/Record11Controller.php +++ b/app/Gdoo/Stock/Controllers/Record11Controller.php @@ -16,7 +16,7 @@ class Record11Controller extends AuditController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'stock_record11', @@ -66,7 +66,7 @@ class Record11Controller extends AuditController ]); } - public function createAction($action = 'edit') + public function create($action = 'edit') { $id = (int) Request::get('id'); $header['action'] = $action; @@ -80,17 +80,17 @@ class Record11Controller extends AuditController ], $tpl); } - 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 printAction() + public function print() { $id = Request::get('id'); $template_id = Request::get('template_id'); @@ -135,12 +135,12 @@ class Record11Controller extends AuditController } else { $this->layout = 'layouts.print2'; - $tpl = $this->createAction('print'); + $tpl = $this->create('print'); print_prince($tpl); } } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Stock/Controllers/ReportController.php b/app/Gdoo/Stock/Controllers/ReportController.php index 9aa1d04f..8baea2ac 100644 --- a/app/Gdoo/Stock/Controllers/ReportController.php +++ b/app/Gdoo/Stock/Controllers/ReportController.php @@ -21,7 +21,7 @@ class ReportController extends DefaultController public $permission = []; // 库存明细表 - public function stockDetailAction() + public function stockDetail() { $sdate = date('Y-m-01'); $edate = date('Y-m-d'); @@ -77,7 +77,7 @@ class ReportController extends DefaultController } // 库存汇总表 - public function stockTotalAction() + public function stockTotal() { $search = search_form([ 'advanced' => 0, @@ -120,7 +120,7 @@ class ReportController extends DefaultController } // 进销存库存汇总表 - public function stockInOutAction() + public function stockInOut() { $sdate = date('Y-m-01'); $edate = date('Y-m-d'); diff --git a/app/Gdoo/Stock/Controllers/TypeController.php b/app/Gdoo/Stock/Controllers/TypeController.php index b9f379b5..898bcfee 100644 --- a/app/Gdoo/Stock/Controllers/TypeController.php +++ b/app/Gdoo/Stock/Controllers/TypeController.php @@ -15,7 +15,7 @@ class TypeController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'sale_type', @@ -66,7 +66,7 @@ class TypeController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'sale_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' => 'sale_type', @@ -113,7 +113,7 @@ class TypeController extends DefaultController ], 'dialog'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/Stock/Controllers/WarehouseController.php b/app/Gdoo/Stock/Controllers/WarehouseController.php index 57320c9f..b07ff15b 100644 --- a/app/Gdoo/Stock/Controllers/WarehouseController.php +++ b/app/Gdoo/Stock/Controllers/WarehouseController.php @@ -15,7 +15,7 @@ class WarehouseController extends DefaultController { public $permission = ['dialog', 'permission']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'warehouse', @@ -67,7 +67,7 @@ class WarehouseController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'warehouse', 'id' => $id]); @@ -76,12 +76,12 @@ class WarehouseController 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' => 'warehouse', @@ -127,7 +127,7 @@ class WarehouseController extends DefaultController /** * 权限设置 */ - public function permissionAction() + public function permission() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -159,7 +159,7 @@ class WarehouseController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/System/Controllers/LogController.php b/app/Gdoo/System/Controllers/LogController.php index 9f0e0c06..1e5c7a22 100644 --- a/app/Gdoo/System/Controllers/LogController.php +++ b/app/Gdoo/System/Controllers/LogController.php @@ -16,7 +16,7 @@ class LogController extends DefaultController /** * 系统日志 */ - public function indexAction() + public function index() { $header = [ 'master_name' => '系统日志', @@ -189,7 +189,7 @@ class LogController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); diff --git a/app/Gdoo/System/Controllers/MailController.php b/app/Gdoo/System/Controllers/MailController.php index dd281a91..23dd41f1 100644 --- a/app/Gdoo/System/Controllers/MailController.php +++ b/app/Gdoo/System/Controllers/MailController.php @@ -18,7 +18,7 @@ class MailController extends DefaultController /** * 邮件设置 */ - public function indexAction() + public function index() { $header = [ 'master_name' => '邮件', @@ -179,12 +179,12 @@ class MailController extends DefaultController ]); } - public function createAction() + public function create() { - return $this->editAction(); + return $this->edit(); } - public function editAction() + public function edit() { $id = (int)Request::get('id'); $row = DB::table('mail')->where('id', $id)->first(); @@ -193,7 +193,7 @@ class MailController extends DefaultController ], 'edit'); } - public function storeAction() + public function store() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -218,7 +218,7 @@ class MailController extends DefaultController } } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); @@ -230,7 +230,7 @@ class MailController extends DefaultController /** * 邮件测试 */ - public function testAction() + public function test() { $mail_to = Request::get('mail_to'); if (Request::method() == 'POST') { diff --git a/app/Gdoo/System/Controllers/MediaController.php b/app/Gdoo/System/Controllers/MediaController.php index 8ad4a224..7da9f5e2 100644 --- a/app/Gdoo/System/Controllers/MediaController.php +++ b/app/Gdoo/System/Controllers/MediaController.php @@ -17,7 +17,7 @@ class MediaController extends DefaultController /** * 二维码上传 */ - public function qrcodeAction() + public function qrcode() { $key = Request::get('key'); list($table, $field) = explode('.', $key); @@ -30,7 +30,7 @@ class MediaController extends DefaultController ], 'qrcode'); } - public function createAction() + public function create() { $folderId = Request::get('folder_id'); $file = Request::file('Filedata'); @@ -82,7 +82,7 @@ class MediaController extends DefaultController return $this->json('文件上传失败'); } - public function dialogAction() + public function dialog() { if (Request::method() == 'POST') { $folder = Request::get('folder'); @@ -120,7 +120,7 @@ class MediaController extends DefaultController /** * 新建文件夹 */ - public function folderAction() + public function folder() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -134,7 +134,7 @@ class MediaController extends DefaultController /** * 下载文件 */ - public function downloadAction() + public function download() { $id = Request::get('id'); if ($id) { @@ -147,7 +147,7 @@ class MediaController extends DefaultController /** * 删除文件 */ - public function deleteAction() + public function delete() { $id = (array)Request::get('id'); if (empty($id)) { diff --git a/app/Gdoo/System/Controllers/MenuController.php b/app/Gdoo/System/Controllers/MenuController.php index e9e79e90..9b9a99ba 100644 --- a/app/Gdoo/System/Controllers/MenuController.php +++ b/app/Gdoo/System/Controllers/MenuController.php @@ -12,7 +12,7 @@ use Gdoo\Index\Controllers\DefaultController; class MenuController extends DefaultController { - public function indexAction() + public function index() { $header = [ 'master_name' => '模型', @@ -174,7 +174,7 @@ class MenuController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); @@ -206,16 +206,16 @@ class MenuController extends DefaultController ], 'create'); } - public function editAction() { - return $this->createAction(); + public function edit() { + return $this->create(); } - public function storeAction() + public function store() { - return $this->editAction(); + return $this->edit(); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); diff --git a/app/Gdoo/System/Controllers/OptionController.php b/app/Gdoo/System/Controllers/OptionController.php index 06abd2ed..08c8c6d5 100644 --- a/app/Gdoo/System/Controllers/OptionController.php +++ b/app/Gdoo/System/Controllers/OptionController.php @@ -14,7 +14,7 @@ class OptionController extends DefaultController { public $permission = ['category']; - public function indexAction() + public function index() { $header = [ 'master_name' => '枚举', @@ -159,12 +159,12 @@ class OptionController extends DefaultController ]); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $row = DB::table('option')->where('id', $id)->first(); @@ -177,7 +177,7 @@ class OptionController extends DefaultController ], 'edit'); } - public function storeAction() + public function store() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -199,7 +199,7 @@ class OptionController extends DefaultController } } - public function categoryAction() + public function category() { if (Request::method() == 'POST') { $rows = Option::where('parent_id', 0)->orderBy('sort', 'asc')->orderBy('id', 'asc')->get(); @@ -208,7 +208,7 @@ class OptionController extends DefaultController } } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); diff --git a/app/Gdoo/System/Controllers/RegionController.php b/app/Gdoo/System/Controllers/RegionController.php index 6c568ec8..1a132298 100644 --- a/app/Gdoo/System/Controllers/RegionController.php +++ b/app/Gdoo/System/Controllers/RegionController.php @@ -15,7 +15,7 @@ class RegionController extends DefaultController { public $permission = ['dialog', 'category']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'region', @@ -68,7 +68,7 @@ class RegionController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'region', 'id' => $id]); @@ -77,12 +77,12 @@ class RegionController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function dialogAction() + public function dialog() { $search = search_form([], [ ['text','region.name','名称'], @@ -113,7 +113,7 @@ class RegionController extends DefaultController ]); } - public function categoryAction() + public function category() { if (Request::method() == 'POST') { $model = Region::orderBy('id', 'asc'); @@ -123,7 +123,7 @@ class RegionController extends DefaultController } } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); diff --git a/app/Gdoo/System/Controllers/SettingController.php b/app/Gdoo/System/Controllers/SettingController.php index c7f4a96e..8d49036d 100644 --- a/app/Gdoo/System/Controllers/SettingController.php +++ b/app/Gdoo/System/Controllers/SettingController.php @@ -16,7 +16,7 @@ class SettingController extends DefaultController /** * 基本设置 */ - public function indexAction() + public function index() { $header = [ 'master_name' => '系统设置', @@ -159,12 +159,12 @@ class SettingController extends DefaultController ]); } - public function createAction() + public function create() { - return $this->editAction(); + return $this->edit(); } - public function editAction() + public function edit() { $id = (int)Request::get('id'); $row = DB::table('setting')->where('id', $id)->first(); @@ -176,7 +176,7 @@ class SettingController extends DefaultController /** * 上传设置 */ - public function uploadAction() + public function upload() { // 扫描字体目录 $paths = new \DirectoryIterator(public_path('assets/fonts')); @@ -194,7 +194,7 @@ class SettingController extends DefaultController /** * 图片设置 */ - public function imageAction() + public function image() { // 扫描字体目录 $paths = new \DirectoryIterator(public_path('assets/fonts')); @@ -212,7 +212,7 @@ class SettingController extends DefaultController /** * 安全设置 */ - public function securityAction() + public function security() { return $this->display(); } @@ -220,7 +220,7 @@ class SettingController extends DefaultController /** * 日期时间 */ - public function datetimeAction() + public function datetime() { $lang = trans('setting'); return $this->display(array( @@ -231,7 +231,7 @@ class SettingController extends DefaultController /** * 保存 */ - public function storeAction() + public function store() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -254,7 +254,7 @@ class SettingController extends DefaultController } } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); diff --git a/app/Gdoo/System/Controllers/SmsController.php b/app/Gdoo/System/Controllers/SmsController.php index 5b6213df..85faba78 100644 --- a/app/Gdoo/System/Controllers/SmsController.php +++ b/app/Gdoo/System/Controllers/SmsController.php @@ -17,7 +17,7 @@ class SmsController extends DefaultController /** * 短信设置 */ - public function indexAction() + public function index() { $header = [ 'master_name' => '短信', @@ -173,7 +173,7 @@ class SmsController extends DefaultController /** * 短信保存 */ - public function storeAction() + public function store() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -194,12 +194,12 @@ class SmsController extends DefaultController } } - public function createAction() + public function create() { - return $this->editAction(); + return $this->edit(); } - public function editAction() + public function edit() { $id = (int)Request::get('id'); $row = DB::table('sms')->where('id', $id)->first(); @@ -208,7 +208,7 @@ class SmsController extends DefaultController ], 'edit'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); @@ -220,7 +220,7 @@ class SmsController extends DefaultController /** * 短信测试 */ - public function testAction() + public function test() { $phone = Request::get('phone'); if (Request::method() == 'POST') { diff --git a/app/Gdoo/System/Controllers/SmsLogController.php b/app/Gdoo/System/Controllers/SmsLogController.php index ba92f05a..fcf65797 100644 --- a/app/Gdoo/System/Controllers/SmsLogController.php +++ b/app/Gdoo/System/Controllers/SmsLogController.php @@ -15,7 +15,7 @@ class SmsLogController extends DefaultController /** * 短信记录 */ - public function indexAction() + public function index() { $header = [ 'master_name' => '短信记录', @@ -147,7 +147,7 @@ class SmsLogController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); diff --git a/app/Gdoo/System/Controllers/WidgetController.php b/app/Gdoo/System/Controllers/WidgetController.php index ff042a84..3548441e 100644 --- a/app/Gdoo/System/Controllers/WidgetController.php +++ b/app/Gdoo/System/Controllers/WidgetController.php @@ -17,7 +17,7 @@ class WidgetController extends DefaultController /** * 部件设置 */ - public function indexAction() + public function index() { $header = [ 'master_name' => '部件', @@ -231,7 +231,7 @@ class WidgetController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); @@ -259,17 +259,17 @@ class WidgetController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function storeAction() + public function store() { - return $this->editAction(); + return $this->edit(); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); @@ -281,7 +281,7 @@ class WidgetController extends DefaultController /** * 更新部件列表 */ - public function refreshAction() + public function refresh() { if (Request::method() == 'POST') { $widgets = ModuleService::widgets(); diff --git a/app/Gdoo/User/Controllers/AuthController.php b/app/Gdoo/User/Controllers/AuthController.php index 535baa23..96966179 100644 --- a/app/Gdoo/User/Controllers/AuthController.php +++ b/app/Gdoo/User/Controllers/AuthController.php @@ -22,7 +22,7 @@ class AuthController extends Controller /** * 二次验证 */ - public function totpAction() + public function totp() { // 时间验证密钥 $t = new Totp(); @@ -58,7 +58,7 @@ class AuthController extends Controller /** * 表单登录 */ - public function loginAction() + public function login() { $gets = Request::all(); @@ -151,7 +151,7 @@ class AuthController extends Controller /** * 验证码 */ - public function captchaAction() + public function captcha() { Captcha::make(); } @@ -159,7 +159,7 @@ class AuthController extends Controller /** * 二维码登录 */ - public function qrcodeAction() + public function qrcode() { return $this->display([ ]); @@ -168,7 +168,7 @@ class AuthController extends Controller /** * 注销 */ - public function logoutAction() + public function logout() { Auth::logout(); Session::flush(); diff --git a/app/Gdoo/User/Controllers/DepartmentController.php b/app/Gdoo/User/Controllers/DepartmentController.php index 4a4b50f9..57b97f1e 100644 --- a/app/Gdoo/User/Controllers/DepartmentController.php +++ b/app/Gdoo/User/Controllers/DepartmentController.php @@ -16,7 +16,7 @@ class DepartmentController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $display = $this->access; @@ -82,7 +82,7 @@ class DepartmentController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'department', 'id' => $id]); @@ -91,12 +91,12 @@ class DepartmentController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function dialogAction() + public function dialog() { $search = search_form([], [ ['text','department.name','名称'], @@ -137,7 +137,7 @@ class DepartmentController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); diff --git a/app/Gdoo/User/Controllers/GroupController.php b/app/Gdoo/User/Controllers/GroupController.php index 8be34fb3..4c889e7f 100644 --- a/app/Gdoo/User/Controllers/GroupController.php +++ b/app/Gdoo/User/Controllers/GroupController.php @@ -16,7 +16,7 @@ class GroupController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'user_group', @@ -67,7 +67,7 @@ class GroupController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'user_group', 'id' => $id]); @@ -76,12 +76,12 @@ class GroupController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/User/Controllers/MessageController.php b/app/Gdoo/User/Controllers/MessageController.php index 7817aaee..82397282 100644 --- a/app/Gdoo/User/Controllers/MessageController.php +++ b/app/Gdoo/User/Controllers/MessageController.php @@ -19,7 +19,7 @@ class MessageController extends Controller /** * 消息列表 */ - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'user_message', @@ -84,7 +84,7 @@ class MessageController extends Controller /* * 消息状态标记 */ - public function statusAction() + public function status() { $id = (array)Request::get('id'); $type = Request::get('type'); @@ -107,7 +107,7 @@ class MessageController extends Controller /** * 新建提醒 */ - public function createAction() + public function create() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -127,7 +127,7 @@ class MessageController extends Controller /** * 显示提醒 */ - public function showAction() + public function show() { $id = Request::get('id'); $row = DB::table('user_message')->find($id); @@ -144,7 +144,7 @@ class MessageController extends Controller /** * 未读提醒 */ - public function countAction() + public function count() { $count = DB::table('user_message') ->where('read_id', Auth::id()) @@ -153,7 +153,7 @@ class MessageController extends Controller return $count; } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/User/Controllers/PositionController.php b/app/Gdoo/User/Controllers/PositionController.php index 6c6b98c0..7a721b16 100644 --- a/app/Gdoo/User/Controllers/PositionController.php +++ b/app/Gdoo/User/Controllers/PositionController.php @@ -16,7 +16,7 @@ class PositionController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'user_position', @@ -68,7 +68,7 @@ class PositionController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'user_position', 'id' => $id]); @@ -77,12 +77,12 @@ class PositionController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function dialogAction() + public function dialog() { $search = search_form([], [ ['text','user_position.name','名称'], @@ -104,7 +104,7 @@ class PositionController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/User/Controllers/ProfileController.php b/app/Gdoo/User/Controllers/ProfileController.php index c6a6f24f..791c96ac 100644 --- a/app/Gdoo/User/Controllers/ProfileController.php +++ b/app/Gdoo/User/Controllers/ProfileController.php @@ -25,7 +25,7 @@ class ProfileController extends DefaultController public $permission = ['index', 'password', 'avatar', 'secret', 'getUser']; // 资料修改 - public function indexAction() + public function index() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -57,7 +57,7 @@ class ProfileController extends DefaultController /** * 获取用户信息 */ - public function getUserAction() + public function getUser() { $user['avatar'] = avatar(auth()->user()->avatar); $user['name'] = auth()->user()->name; @@ -67,7 +67,7 @@ class ProfileController extends DefaultController /** * 更新安全密钥 */ - public function secretAction() + public function secret() { if (Request::method() == 'POST') { $id = Request::get('id'); @@ -80,7 +80,7 @@ class ProfileController extends DefaultController } // 修改密码 - public function passwordAction() + public function password() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -122,7 +122,7 @@ class ProfileController extends DefaultController } // 用户头像 - public function avatarAction() + public function avatar() { $gets = Request::all(); diff --git a/app/Gdoo/User/Controllers/RegionController.php b/app/Gdoo/User/Controllers/RegionController.php index 2ceec418..e4c4a6c1 100644 --- a/app/Gdoo/User/Controllers/RegionController.php +++ b/app/Gdoo/User/Controllers/RegionController.php @@ -12,7 +12,7 @@ class RegionController extends DefaultController /** * 市列表 */ - public function indexAction() + public function index() { $id = (int) Request::get('id', '0'); $parent_id = (int) Request::get('parent_id', '0'); diff --git a/app/Gdoo/User/Controllers/RoleController.php b/app/Gdoo/User/Controllers/RoleController.php index 75d461ab..53b820e8 100644 --- a/app/Gdoo/User/Controllers/RoleController.php +++ b/app/Gdoo/User/Controllers/RoleController.php @@ -25,7 +25,7 @@ class RoleController extends DefaultController { public $permission = ['dialog', 'permission']; - public function indexAction() + public function index() { $display = $this->access; @@ -96,7 +96,7 @@ class RoleController extends DefaultController ]); } - public function configAction() + public function config() { $gets = Request::all(); @@ -168,7 +168,7 @@ class RoleController extends DefaultController ]); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'role', 'id' => $id]); @@ -177,12 +177,12 @@ class RoleController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function dialogAction() + public function dialog() { $search = search_form([], [ ['text','role.name','名称'], @@ -215,7 +215,7 @@ class RoleController extends DefaultController /** * 角色设置 */ - public function permissionAction() + public function permission() { $gets = Request::all(); if (Request::method() == 'POST') { @@ -247,7 +247,7 @@ class RoleController extends DefaultController ]); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/User/Controllers/TokenController.php b/app/Gdoo/User/Controllers/TokenController.php index c7c991a4..a2432316 100644 --- a/app/Gdoo/User/Controllers/TokenController.php +++ b/app/Gdoo/User/Controllers/TokenController.php @@ -28,7 +28,7 @@ class TokenController extends Controller /** * APP登录 */ - public function loginAction() + public function login() { if (Request::isJson()) { $gets = json_decode(Request::getContent(), true); @@ -84,7 +84,7 @@ class TokenController extends Controller return ['message'=>'账户或密码错误。', 'success'=>false]; } - public function logoutAction() + public function logout() { return '注销完成。'; } diff --git a/app/Gdoo/User/Controllers/UserController.php b/app/Gdoo/User/Controllers/UserController.php index 85f00844..b8343122 100644 --- a/app/Gdoo/User/Controllers/UserController.php +++ b/app/Gdoo/User/Controllers/UserController.php @@ -21,7 +21,7 @@ class UserController extends DefaultController { public $permission = ['dialog']; - public function indexAction() + public function index() { $header = Grid::header([ 'code' => 'user', @@ -98,7 +98,7 @@ class UserController extends DefaultController ]); } - public function showAction() + public function show() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'user', 'id' => $id, 'action' => 'show']); @@ -111,7 +111,7 @@ class UserController extends DefaultController ], 'create'); } - public function createAction() + public function create() { $id = (int)Request::get('id'); $form = Form::make(['code' => 'user', 'id' => $id]); @@ -120,12 +120,12 @@ class UserController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function dialogAction() + public function dialog() { $group_id = Request::get('group_id', 1); $header = Grid::header([ @@ -172,7 +172,7 @@ class UserController extends DefaultController } // 数据导入 - public function importAction() + public function import() { if (Request::method() == 'POST') { return Form::import([ @@ -185,7 +185,7 @@ class UserController extends DefaultController return $this->render(['tips' => $tips], 'layouts.import'); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $ids = Request::get('id'); diff --git a/app/Gdoo/User/Controllers/WidgetController.php b/app/Gdoo/User/Controllers/WidgetController.php index fb52d69b..7202bcc2 100644 --- a/app/Gdoo/User/Controllers/WidgetController.php +++ b/app/Gdoo/User/Controllers/WidgetController.php @@ -8,7 +8,7 @@ class WidgetController extends DefaultController public $permission = ['birthday']; // 生日提醒 - public function birthdayAction() + public function birthday() { $rows = DB::table('user')->whereRaw("concat(year(getdata()), DATE_FORMAT(birthday,'-%m-%d')) BETWEEN DATE_FORMAT(getdate(),'%Y-%m-%d') AND DATE_FORMAT(DATE_ADD(getdate(), interval 30 day),'%Y-%m-%d')")->get(); return $this->render(array( diff --git a/app/Gdoo/User/views/message/index.blade.php b/app/Gdoo/User/views/message/index.blade.php index 9ccceadf..53d4fc45 100644 --- a/app/Gdoo/User/views/message/index.blade.php +++ b/app/Gdoo/User/views/message/index.blade.php @@ -35,11 +35,11 @@ // 标记已读 action.read = function() { - statusAction('read'); + status('read'); }; // 标记未读 action.unread = function() { - statusAction('unread'); + status('unread'); }; var grid = new agGridOptions(); diff --git a/app/Gdoo/Wap/Controllers/AuthController.php b/app/Gdoo/Wap/Controllers/AuthController.php index 9d78b562..064cb286 100644 --- a/app/Gdoo/Wap/Controllers/AuthController.php +++ b/app/Gdoo/Wap/Controllers/AuthController.php @@ -19,7 +19,7 @@ class AuthController extends Controller /** * 用户登录 */ - public function loginAction() + public function login() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -41,7 +41,7 @@ class AuthController extends Controller /** * 用户注销 */ - public function logoutAction() + public function logout() { Auth::logout(); return $this->json('解绑成功。', true); diff --git a/app/Gdoo/Wap/Controllers/WechatController.php b/app/Gdoo/Wap/Controllers/WechatController.php index 43c3a3e5..f72153cb 100644 --- a/app/Gdoo/Wap/Controllers/WechatController.php +++ b/app/Gdoo/Wap/Controllers/WechatController.php @@ -17,7 +17,7 @@ class WechatController extends Controller { public $permission = []; - public function configAction() + public function config() { $config = Setting::where('type', 'wechat')->get()->pluck('value', 'key'); return $this->json($config, true); @@ -26,7 +26,7 @@ class WechatController extends Controller /** * 微信用户绑定 */ - public function loginAction() + public function login() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -60,7 +60,7 @@ class WechatController extends Controller /** * 获取微信登录数据 */ - public function authorizeAction() + public function authorize() { try { $app = WechatService::getApp(); @@ -85,7 +85,7 @@ class WechatController extends Controller /** * 微信用户解绑 */ - public function logoutAction() + public function logout() { $openid = Request::get('openid'); DB::table('wechat_user')->where('openid', $openid)->delete(); @@ -96,7 +96,7 @@ class WechatController extends Controller /** * 微信获取配置 */ - public function jsConfigAction() + public function jsConfig() { $app = WechatService::getApp(); $url = Request::get('url'); @@ -107,7 +107,7 @@ class WechatController extends Controller /** * 微信获取配置 */ - public function mapGeocoderAction() + public function mapGeocoder() { $location = Request::get('location'); $text = file_get_contents('https://apis.map.qq.com/ws/geocoder/v1/?location=' . $location . '&key=W6FBZ-JV4K4-O6WU5-XGZOL-GMTPJ-KIFWJ&get_poi=0'); diff --git a/app/Gdoo/Wechat/Controllers/ConfigController.php b/app/Gdoo/Wechat/Controllers/ConfigController.php index 0f9645e3..c3dced7e 100644 --- a/app/Gdoo/Wechat/Controllers/ConfigController.php +++ b/app/Gdoo/Wechat/Controllers/ConfigController.php @@ -25,7 +25,7 @@ class ConfigController extends DefaultController $this->menu = $menu; } - public function configAction() + public function config() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -47,7 +47,7 @@ class ConfigController extends DefaultController /** * 自定义菜单 */ - public function menuAction() + public function menu() { if (Request::ajax()) { diff --git a/app/Gdoo/Wechat/Controllers/EchoController.php b/app/Gdoo/Wechat/Controllers/EchoController.php index e3c0dbdd..7ab0816d 100644 --- a/app/Gdoo/Wechat/Controllers/EchoController.php +++ b/app/Gdoo/Wechat/Controllers/EchoController.php @@ -25,7 +25,7 @@ class EchoController extends Controller parent::__construct(); } - public function indexAction() + public function index() { if (empty($_GET['echostr']) && empty($_GET["signature"]) && empty($_GET["nonce"])) { exit('Access denied'); diff --git a/app/Gdoo/Workflow/Controllers/BillController.php b/app/Gdoo/Workflow/Controllers/BillController.php index 545120e7..d6762dd9 100644 --- a/app/Gdoo/Workflow/Controllers/BillController.php +++ b/app/Gdoo/Workflow/Controllers/BillController.php @@ -20,7 +20,7 @@ use Gdoo\Workflow\Models\BillCategory; class BillController extends DefaultController { - public function indexAction() + public function index() { $header = [ 'master_name' => '流程', @@ -188,7 +188,7 @@ class BillController extends DefaultController ]); } - public function createAction() + public function create() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -222,17 +222,17 @@ class BillController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function storeAction() + public function store() { - return $this->editAction(); + return $this->edit(); } - public function deleteAction() + public function delete() { $ids = (array)Request::get('id'); if (count($ids) > 0) { diff --git a/app/Gdoo/Workflow/Controllers/CategoryController.php b/app/Gdoo/Workflow/Controllers/CategoryController.php index 806fbb37..fc05b56d 100644 --- a/app/Gdoo/Workflow/Controllers/CategoryController.php +++ b/app/Gdoo/Workflow/Controllers/CategoryController.php @@ -12,7 +12,7 @@ use Gdoo\Model\Models\Bill; class CategoryController extends DefaultController { - public function indexAction() + public function index() { $header = [ 'master_name' => '流程类别', @@ -152,7 +152,7 @@ class CategoryController extends DefaultController ]); } - public function createAction() + public function create() { if (Request::method() == 'POST') { $gets = Request::all(); @@ -177,17 +177,17 @@ class CategoryController extends DefaultController ], 'create'); } - public function editAction() + public function edit() { - return $this->createAction(); + return $this->create(); } - public function storeAction() + public function store() { - return $this->editAction(); + return $this->edit(); } - public function deleteAction() + public function delete() { if (Request::method() == 'POST') { $id = Request::get('id'); diff --git a/app/Gdoo/Workflow/Controllers/TemplateController.php b/app/Gdoo/Workflow/Controllers/TemplateController.php index 6b4cad9b..3a7340b9 100644 --- a/app/Gdoo/Workflow/Controllers/TemplateController.php +++ b/app/Gdoo/Workflow/Controllers/TemplateController.php @@ -16,7 +16,7 @@ class TemplateController extends DefaultController { public $permission = ['create', 'create2']; - public function indexAction() + public function index() { if (Request::method() == 'POST') { $sorts = Request::get('sort'); @@ -44,7 +44,7 @@ class TemplateController extends DefaultController ]); } - public function createAction() + public function create() { $gets = Request::all(); @@ -157,7 +157,7 @@ class TemplateController extends DefaultController ]); } - public function create2Action() + public function create2() { $gets = Request::all(); @@ -251,7 +251,7 @@ class TemplateController extends DefaultController ]); } - public function deleteAction() + public function delete() { $id = Request::get('id'); if ($id > 0) { diff --git a/app/Gdoo/Workflow/Controllers/WidgetController.php b/app/Gdoo/Workflow/Controllers/WidgetController.php index 8a9b22ad..3003c801 100644 --- a/app/Gdoo/Workflow/Controllers/WidgetController.php +++ b/app/Gdoo/Workflow/Controllers/WidgetController.php @@ -12,7 +12,7 @@ class WidgetController extends DefaultController { public $permission = ['index']; - public function indexAction() + public function index() { if (Request::method() == 'POST') { $rows = []; diff --git a/routes/web.php b/routes/web.php index ced03182..046a12d8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -25,12 +25,12 @@ if (strpos($path, 'calendar/caldav') === 0) { } if (strpos($path, 'common') === 0) { - app('Gdoo\Index\Controllers\ApiController')->commonAction(); + app('Gdoo\Index\Controllers\ApiController')->common(); } // 首字母大写 $controller = Str::studly($uris['controller']); -$action = 'Gdoo\\'.ucfirst($uris['module']).'\\Controllers\\'.$controller.'Controller@'.$uris['action'].'Action'; +$action = 'Gdoo\\'.ucfirst($uris['module']).'\\Controllers\\'.$controller.'Controller@'.$uris['action']; $method = Request::method();