From 89bab045dd930182f9b1d0d0d7b0474c8ac87ea9 Mon Sep 17 00:00:00 2001 From: hawind Date: Tue, 2 Mar 2021 01:08:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=92=8C=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ApproachController.php | 6 - .../Approach/Controllers/MarketController.php | 11 +- .../Approach/Controllers/ReviewController.php | 6 - .../Article/Controllers/ArticleController.php | 2 - .../Controllers/CalendarController.php | 19 +- .../Calendar/Controllers/EventController.php | 65 +- .../Calendar/Services/CalendarService.php | 45 - app/Gdoo/Chat/Controllers/ChatController.php | 4 +- .../Customer/Controllers/AuthController.php | 48 - .../Controllers/ComplaintController.php | 10 - .../Controllers/ContactController.php | 11 +- .../Controllers/CustomerApplyController.php | 5 - .../Controllers/CustomerClassController.php | 1 - .../Controllers/CustomerController.php | 9 - .../Controllers/DeliveryAddressController.php | 7 - .../Customer/Controllers/PriceController.php | 7 - .../Controllers/ReconcileController.php | 210 --- .../Customer/Controllers/RegionController.php | 3 - .../Controllers/RegionTaskController.php | 4 - .../Customer/Controllers/TaskController.php | 4 - .../Customer/Controllers/TaxController.php | 6 +- .../Customer/Controllers/TokenController.php | 65 - .../Customer/Controllers/TypeController.php | 3 - .../Customer/views/reconcile/query.blade.php | 129 -- .../Controllers/AdjustController.php | 4 - .../Controllers/CategoryController.php | 19 +- .../Controllers/CompenController.php | 4 - .../Controllers/CostController.php | 4 - .../Controllers/RebateController.php | 8 - .../Controllers/ReportController.php | 9 +- .../File/Controllers/AttachmentController.php | 56 +- .../Controllers/CertificateController.php | 4 +- app/Gdoo/File/Controllers/FileController.php | 30 +- .../Controllers/InspectReportController.php | 4 +- .../File/Controllers/WidgetController.php | 111 -- app/Gdoo/File/views/widget/index.blade.php | 24 - .../Forum/Controllers/CategoryController.php | 6 +- app/Gdoo/Forum/Controllers/PostController.php | 1 + .../Controllers/AttachmentController.php | 12 +- app/Gdoo/Index/Controllers/DemoController.php | 501 ------ .../Model/Controllers/ModuleController.php | 53 +- app/Gdoo/Model/Controllers/StepController.php | 14 +- app/Gdoo/Model/views/module/edit.blade.php | 60 - .../Order/Controllers/LogisticsController.php | 17 +- .../Order/Controllers/OrderController.php | 39 +- .../Controllers/SampleApplyController.php | 12 +- app/Gdoo/Order/Controllers/TypeController.php | 6 - .../Order/Controllers/WidgetController.php | 44 - app/Gdoo/Order/Services/OrderService.php | 10 +- .../Controllers/MaterialController.php | 6 - .../Produce/Controllers/PlanController.php | 6 - app/Gdoo/Produce/Services/ProduceService.php | 10 +- .../Controllers/CategoryController.php | 18 - .../Product/Controllers/ProductController.php | 22 - .../Product/Controllers/UnitController.php | 22 +- .../Project/Controllers/ProjectController.php | 2 +- .../Project/Controllers/TaskController.php | 114 +- app/Gdoo/Project/Services/TaskService.php | 109 ++ .../Controllers/MaterialController.php | 12 +- .../Controllers/PromotionController.php | 15 - .../Controllers/ReviewController.php | 6 - .../Purchase/Controllers/OrderController.php | 5 - .../Controllers/SupplierController.php | 8 - .../Controllers/AllocationController.php | 13 - .../Stock/Controllers/CancelController.php | 7 - .../Stock/Controllers/CategoryController.php | 6 - .../Stock/Controllers/DeliveryController.php | 9 - .../Stock/Controllers/DirectController.php | 7 - .../Stock/Controllers/LocationController.php | 6 - .../Stock/Controllers/Record01Controller.php | 6 - .../Stock/Controllers/Record08Controller.php | 6 - .../Stock/Controllers/Record09Controller.php | 7 - .../Stock/Controllers/Record10Controller.php | 111 -- .../Stock/Controllers/Record11Controller.php | 6 - .../Stock/Controllers/ReportController.php | 12 - app/Gdoo/Stock/Controllers/TypeController.php | 6 - .../Stock/Controllers/WarehouseController.php | 6 - .../views/allocation/print/118.blade.php | 2 +- .../Stock/views/record10/print3/117.blade.php | 45 - app/Gdoo/System/Controllers/LogController.php | 3 - .../System/Controllers/MailController.php | 8 - .../System/Controllers/MediaController.php | 9 +- .../System/Controllers/MenuController.php | 64 - .../System/Controllers/OptionController.php | 7 - .../System/Controllers/RegionController.php | 3 - .../System/Controllers/SettingController.php | 6 - app/Gdoo/System/Controllers/SmsController.php | 6 - .../System/Controllers/SmsLogController.php | 5 +- .../System/Controllers/WidgetController.php | 5 - app/Gdoo/User/Controllers/GroupController.php | 3 - .../User/Controllers/MessageController.php | 5 +- .../User/Controllers/PositionController.php | 18 - .../User/Controllers/ProfileController.php | 4 +- .../User/Controllers/RegionController.php | 1 - app/Gdoo/User/Controllers/RoleController.php | 1 - app/Gdoo/User/Controllers/TokenController.php | 6 +- app/Gdoo/User/Controllers/UserController.php | 4 - .../Wechat/Controllers/EchoController.php | 62 +- .../Controllers/CategoryController.php | 2 - .../Workflow/Controllers/DesignController.php | 88 -- .../Workflow/Controllers/FormController.php | 90 -- .../Controllers/MonitorController.php | 81 - .../Workflow/Controllers/StepController.php | 337 ---- .../Workflow/Controllers/WidgetController.php | 51 - .../Controllers/WorkflowController.php | 1168 -------------- app/Gdoo/Workflow/Models/Process.php | 13 - app/Gdoo/Workflow/Models/Process/Data.php | 13 - app/Gdoo/Workflow/Models/ProcessData.php | 13 - app/Gdoo/Workflow/Models/Workflow.php | 1403 ----------------- app/Gdoo/Workflow/Models/WorkflowCategory.php | 8 - app/Gdoo/Workflow/config.php | 71 +- app/Gdoo/Workflow/views/design/add.blade.php | 82 - .../Workflow/views/design/index.blade.php | 51 - .../Workflow/views/design/query.blade.php | 27 - app/Gdoo/Workflow/views/form/index.blade.php | 133 -- app/Gdoo/Workflow/views/form/review.blade.php | 18 - app/Gdoo/Workflow/views/form/view.blade.php | 44 - app/Gdoo/Workflow/views/mobile/file.blade.php | 97 -- .../Workflow/views/monitor/query.blade.php | 17 - .../Workflow/views/monitor/summary.blade.php | 42 - app/Gdoo/Workflow/views/step/edit.blade.php | 820 ---------- app/Gdoo/Workflow/views/step/index.blade.php | 425 ----- .../views/widget/efficiency.blade.php | 97 -- .../Workflow/views/workflow/add.blade.php | 37 - .../Workflow/views/workflow/correct.blade.php | 34 - .../Workflow/views/workflow/edit.blade.php | 285 ---- .../Workflow/views/workflow/export.blade.php | 29 - .../Workflow/views/workflow/index.blade.php | 131 -- .../Workflow/views/workflow/list.blade.php | 83 - .../Workflow/views/workflow/log.blade.php | 59 - .../views/workflow/mobile/edit.blade.php | 274 ---- .../views/workflow/mobile/list.blade.php | 75 - .../views/workflow/mobile/view.blade.php | 96 -- .../Workflow/views/workflow/monitor.blade.php | 131 -- .../Workflow/views/workflow/next.blade.php | 32 - .../Workflow/views/workflow/print.blade.php | 35 - .../views/workflow/query_form.blade.php | 365 ----- .../views/workflow/query_list.blade.php | 33 - .../Workflow/views/workflow/select.blade.php | 89 -- .../views/workflow/select_monitor.blade.php | 106 -- .../views/workflow/timeout_count.blade.php | 61 - .../views/workflow/timeout_step.blade.php | 78 - .../Workflow/views/workflow/trash.blade.php | 99 -- .../Workflow/views/workflow/view.blade.php | 132 -- app/Support/AES.php | 6 +- app/Support/License.php | 2 +- app/macros.php | 5 - 147 files changed, 214 insertions(+), 9816 deletions(-) delete mode 100644 app/Gdoo/Customer/Controllers/AuthController.php delete mode 100644 app/Gdoo/Customer/Controllers/ReconcileController.php delete mode 100644 app/Gdoo/Customer/Controllers/TokenController.php delete mode 100644 app/Gdoo/Customer/views/reconcile/query.blade.php delete mode 100644 app/Gdoo/File/Controllers/WidgetController.php delete mode 100644 app/Gdoo/File/views/widget/index.blade.php delete mode 100644 app/Gdoo/Model/views/module/edit.blade.php delete mode 100644 app/Gdoo/Stock/views/record10/print3/117.blade.php delete mode 100644 app/Gdoo/Workflow/Controllers/DesignController.php delete mode 100644 app/Gdoo/Workflow/Controllers/FormController.php delete mode 100644 app/Gdoo/Workflow/Controllers/MonitorController.php delete mode 100644 app/Gdoo/Workflow/Controllers/StepController.php delete mode 100644 app/Gdoo/Workflow/Controllers/WorkflowController.php delete mode 100644 app/Gdoo/Workflow/Models/Process.php delete mode 100644 app/Gdoo/Workflow/Models/Process/Data.php delete mode 100644 app/Gdoo/Workflow/Models/ProcessData.php delete mode 100644 app/Gdoo/Workflow/Models/Workflow.php delete mode 100644 app/Gdoo/Workflow/Models/WorkflowCategory.php delete mode 100644 app/Gdoo/Workflow/views/design/add.blade.php delete mode 100644 app/Gdoo/Workflow/views/design/index.blade.php delete mode 100644 app/Gdoo/Workflow/views/design/query.blade.php delete mode 100644 app/Gdoo/Workflow/views/form/index.blade.php delete mode 100644 app/Gdoo/Workflow/views/form/review.blade.php delete mode 100644 app/Gdoo/Workflow/views/form/view.blade.php delete mode 100644 app/Gdoo/Workflow/views/mobile/file.blade.php delete mode 100644 app/Gdoo/Workflow/views/monitor/query.blade.php delete mode 100644 app/Gdoo/Workflow/views/monitor/summary.blade.php delete mode 100644 app/Gdoo/Workflow/views/step/edit.blade.php delete mode 100644 app/Gdoo/Workflow/views/step/index.blade.php delete mode 100644 app/Gdoo/Workflow/views/widget/efficiency.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/add.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/correct.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/edit.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/export.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/index.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/list.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/log.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/mobile/edit.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/mobile/list.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/mobile/view.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/monitor.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/next.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/print.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/query_form.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/query_list.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/select.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/select_monitor.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/timeout_count.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/timeout_step.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/trash.blade.php delete mode 100644 app/Gdoo/Workflow/views/workflow/view.blade.php diff --git a/app/Gdoo/Approach/Controllers/ApproachController.php b/app/Gdoo/Approach/Controllers/ApproachController.php index 3568ec68..dd95fc5d 100644 --- a/app/Gdoo/Approach/Controllers/ApproachController.php +++ b/app/Gdoo/Approach/Controllers/ApproachController.php @@ -94,7 +94,6 @@ class ApproachController extends WorkflowController ]); } - // 新建促销 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -114,25 +113,21 @@ class ApproachController extends WorkflowController ], $tpl); } - // 编辑进店 public function editAction() { return $this->createAction(); } - // 审核进店 public function auditAction() { return $this->createAction('audit'); } - // 显示进店 public function showAction() { return $this->createAction('show'); } - // 显示进店 public function printAction() { $this->layout = 'layouts.print2'; @@ -357,7 +352,6 @@ class ApproachController extends WorkflowController ]); } - // 删除进店申请 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Approach/Controllers/MarketController.php b/app/Gdoo/Approach/Controllers/MarketController.php index bd380b52..4dd75d4c 100644 --- a/app/Gdoo/Approach/Controllers/MarketController.php +++ b/app/Gdoo/Approach/Controllers/MarketController.php @@ -76,7 +76,6 @@ class MarketController extends DefaultController ]); } - // 新建促销 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -90,25 +89,21 @@ class MarketController extends DefaultController ], 'create'); } - // 编辑促销 public function editAction() { return $this->createAction(); } - // 审核促销 public function auditAction() { return $this->createAction('audit'); } - // 显示促销 public function showAction() { return $this->createAction('show'); } - // 删除促销 public function deleteAction() { if (Request::method() == 'POST') { @@ -128,11 +123,7 @@ class MarketController extends DefaultController if (Request::method() == 'POST') { $model = DB::table('approach_market'); - /* - foreach ($header['join'] as $join) { - $model->leftJoin($join[0], $join[1], $join[2], $join[3]); - } - */ + if ($query['sort'] && $query['order']) { $model->orderBy($query['sort'], $query['order']); } diff --git a/app/Gdoo/Approach/Controllers/ReviewController.php b/app/Gdoo/Approach/Controllers/ReviewController.php index b9dcdc12..7fbc3a67 100644 --- a/app/Gdoo/Approach/Controllers/ReviewController.php +++ b/app/Gdoo/Approach/Controllers/ReviewController.php @@ -81,7 +81,6 @@ class ReviewController extends WorkflowController ]); } - // 新建促销 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -106,25 +105,21 @@ class ReviewController extends WorkflowController ], $tpl); } - // 编辑促销 public function editAction() { return $this->createAction(); } - // 审核促销 public function auditAction() { return $this->createAction('audit'); } - // 显示促销 public function showAction() { return $this->createAction('show'); } - // 显示促销 public function printAction() { $this->layout = 'layouts.print2'; @@ -163,7 +158,6 @@ class ReviewController extends WorkflowController return $this->render(['query' => $query]); } - // 删除促销 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Article/Controllers/ArticleController.php b/app/Gdoo/Article/Controllers/ArticleController.php index 839ac872..8f39ef7a 100644 --- a/app/Gdoo/Article/Controllers/ArticleController.php +++ b/app/Gdoo/Article/Controllers/ArticleController.php @@ -101,7 +101,6 @@ class ArticleController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -111,7 +110,6 @@ class ArticleController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); diff --git a/app/Gdoo/Calendar/Controllers/CalendarController.php b/app/Gdoo/Calendar/Controllers/CalendarController.php index c2b7ec9e..3ffd108e 100644 --- a/app/Gdoo/Calendar/Controllers/CalendarController.php +++ b/app/Gdoo/Calendar/Controllers/CalendarController.php @@ -15,7 +15,7 @@ class CalendarController extends DefaultController public $permission = ['calendars', 'help']; /** - * 显示日历 + * 日历首页 */ public function indexAction() { @@ -46,8 +46,8 @@ class CalendarController extends DefaultController $calendars = CalendarService::getCalendars($user_id); $calendars[] = [ - 'id' => 'shared', - 'displayname' => '共享事件', + 'id' => 'shared', + 'displayname' => '共享事件', 'calendarcolor' => '#999', ]; $sources = []; @@ -82,24 +82,20 @@ class CalendarController extends DefaultController } catch (\Exception $e) { return $this->json($e->getMessage()); } - /*} else { - return $this->json('permission denied'); - */ } $calendar = CalendarService::getCalendar($gets['id'], false); return $this->json([ - 'active' => $gets['active'], + 'active' => $gets['active'], 'eventSource' => array( - 'id' => $calendar['id'], - 'url' => url('event/index', ['calendar_id' => $calendar['id']]), + 'id' => $calendar['id'], + 'url' => url('event/index', ['calendar_id' => $calendar['id']]), 'backgroundColor' => $calendar['calendarcolor'], - "borderColor" => $calendar['calendarcolor'], + "borderColor" => $calendar['calendarcolor'], ) ], true); } } - // 添加日历 public function addAction() { $gets = Request::all(); @@ -123,7 +119,6 @@ class CalendarController extends DefaultController return $this->render(); } - // 删除日历 public function deleteAction() { $id = Request::get('id'); diff --git a/app/Gdoo/Calendar/Controllers/EventController.php b/app/Gdoo/Calendar/Controllers/EventController.php index a3e240ec..ed8cc4a2 100644 --- a/app/Gdoo/Calendar/Controllers/EventController.php +++ b/app/Gdoo/Calendar/Controllers/EventController.php @@ -19,7 +19,7 @@ class EventController extends DefaultController { public $permission = ['share', 'items']; - // 事件对象 + // 事件列表 public function indexAction() { $gets = Request::all(); @@ -137,14 +137,6 @@ class EventController extends DefaultController $vcalendar = VObject::parse($event['calendardata']); $vevent = $vcalendar->VEVENT; - /* - $accessclass = $vevent->getAsString('CLASS'); - $permissions = CalendarService::getPermissions($id, Calendar::EVENT, $accessclass); - if(!$permissions & OCP\PERMISSION_UPDATE) { - return $this->json('permission denied'); - } - */ - $delta = new \DateInterval('P0D'); $delta->s = $gets['delta']; @@ -247,13 +239,6 @@ class EventController extends DefaultController $end = $gets['end']; $allday = $gets['allDay']; - /* - if (!$end) { - $duration = 60; - $end = $start + ($duration * 60); - } - */ - $start = new \DateTime('@'.strtotime($start)); $end = new \DateTime('@'.strtotime($end)); @@ -267,22 +252,7 @@ class EventController extends DefaultController $calendar_options = CalendarService::getCalendars(Auth::id(), false); - /* - 分享日历暂时未实现 - foreach($calendars as $calendar) - { - if($calendar['userid'] != OCP\User::getUser()) { - $sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $calendar['id']); - if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\PERMISSION_UPDATE)) { - array_push($calendar_options, $calendar); - } - } else { - array_push($calendar_options, $calendar); - } - }*/ - $options['calendar_options'] = $calendar_options; - $options['access_class_options'] = CalendarService::getAccessClassOptions(); $options['valarm_options'] = CalendarService::getValarmOptions(); $options['repeat_options'] = CalendarService::getRepeatOptions(); @@ -356,12 +326,12 @@ class EventController extends DefaultController $end_at = strtotime($gets['to'].' '.$gets['totime']); $share_data = array( - 'source_id' => $gets['id'], - 'source_type' => 'event', - 'receive_id' => $gets['receive_id'], + 'source_id' => $gets['id'], + 'source_type' => 'event', + 'receive_id' => $gets['receive_id'], 'receive_name' => $gets['receive_name'], - 'start_at' => $start_at, - 'end_at' => $end_at, + 'start_at' => $start_at, + 'end_at' => $end_at, ); $share = ShareService::getItem('event', $gets['id']); @@ -374,7 +344,7 @@ class EventController extends DefaultController return $this->json($e->getMessage()); } - if ($data['calendarid'] != $gets['calendarid']) { + if ($event['calendarid'] != $gets['calendarid']) { try { CalendarService::moveToCalendar($gets['id'], $gets['calendarid']); } catch (\Exception $e) { @@ -394,13 +364,6 @@ class EventController extends DefaultController $object = VObject::parse($event['calendardata']); $vevent = $object->VEVENT; - - /* - $object = Sabre_Calendar_Object::cleanByAccessClass($id, $object); - $accessclass = $vevent->getAsString('CLASS'); - $permissions = CalendarService::getPermissions($id, Calendar::EVENT, $accessclass); - */ - $dtstart = $vevent->DTSTART; $dtend = CalendarService::getDTEndFromVEvent($vevent); @@ -573,7 +536,6 @@ class EventController extends DefaultController $repeat['repeat'] = 'doesnotrepeat'; } - // $options['category_options'] = CalendarService::getCategoryOptions(); $options['calendar_options']= CalendarService::getCalendars(Auth::id(), false); $options['access_class_options'] = CalendarService::getAccessClassOptions(); $options['valarm_options'] = CalendarService::getValarmOptions(); @@ -588,21 +550,9 @@ class EventController extends DefaultController $options['repeat_byweekno_options'] = CalendarService::getByWeekNoOptions(); $options['repeat_bymonthday_options'] = CalendarService::getByMonthDayOptions(); - /* - if($permissions & OCP\PERMISSION_UPDATE) { - $tmpl = new OCP\Template('calendar', 'part.editevent'); - } elseif($permissions & OCP\PERMISSION_READ) { - $tmpl = new OCP\Template('calendar', 'part.showevent'); - } elseif($permissions === 0) { - OCP\JSON::error(array('data' => array('message' => CalendarService::$l10n->t('You do not have the permissions to edit this event.')))); - exit; - }*/ - $options['id'] = $gets['id']; - $options['permissions'] = $permissions; $options['lastmodified'] = $event['lastmodified']; $options['title'] = $summary; - $options['accessclass'] = $accessclass; $options['location'] = $location; $options['categories'] = $categories; $options['calendarid'] = $event['calendarid']; @@ -707,7 +657,6 @@ class EventController extends DefaultController $description = strtr($vevent->getAsString('DESCRIPTION'), array('\,' => ',', '\;' => ';')); $options['id'] = $id; - $options['permissions'] = $permissions; $options['lastmodified'] = $event['lastmodified']; $options['title'] = $summary; $options['location'] = $location; diff --git a/app/Gdoo/Calendar/Services/CalendarService.php b/app/Gdoo/Calendar/Services/CalendarService.php index ff85d945..1537d171 100644 --- a/app/Gdoo/Calendar/Services/CalendarService.php +++ b/app/Gdoo/Calendar/Services/CalendarService.php @@ -491,51 +491,6 @@ class CalendarService return $dtend; } - /** - * @brief Remove all properties which should not be exported for the AccessClass Confidential - * @param string $id Event ID - * @param VObject $vobject Sabre VObject - * @return object - */ - public static function cleanByAccessClass($id, $vobject) - { - // Do not clean your own calendar - if (self::getowner($id) === Auth::id()) { - return $vobject; - } - - if (isset($vobject->VEVENT)) { - $velement = $vobject->VEVENT; - } elseif (isset($vobject->VJOURNAL)) { - $velement = $vobject->VJOURNAL; - } elseif (isset($vobject->VTODO)) { - $velement = $vobject->VTODO; - } - - if (isset($velement->CLASS) && $velement->CLASS->value == 'CONFIDENTIAL') { - foreach ($velement->children as &$property) { - switch ($property->name) { - case 'CREATED': - case 'DTSTART': - case 'RRULE': - case 'DURATION': - case 'DTEND': - case 'CLASS': - case 'UID': - break; - case 'SUMMARY': - $property->value = 'Busy'; - break; - default: - $velement->__unset($property->name); - unset($property); - break; - } - } - } - return $vobject; - } - /** * @brief Get the permissions determined by the access class of an event/todo/journal * @param VObject $vobject Sabre VObject diff --git a/app/Gdoo/Chat/Controllers/ChatController.php b/app/Gdoo/Chat/Controllers/ChatController.php index ede29193..8340b228 100644 --- a/app/Gdoo/Chat/Controllers/ChatController.php +++ b/app/Gdoo/Chat/Controllers/ChatController.php @@ -441,9 +441,7 @@ class ChatController extends Controller // 这里有一点bug，如果只有一条未读只能显示一条 if ($unread_total > 0) { $model->where('cms.status', 0); - } - - //$model->whereRaw("(cm.receive_id = '$gid' and cm.id in(select message_id from chat_message_status where user_id = '$auth_id'))"); + } // 获取大于当前时间的记录 if ($lastdt > 0) { diff --git a/app/Gdoo/Customer/Controllers/AuthController.php b/app/Gdoo/Customer/Controllers/AuthController.php deleted file mode 100644 index b83d53d9..00000000 --- a/app/Gdoo/Customer/Controllers/AuthController.php +++ /dev/null @@ -1,48 +0,0 @@ -json('客户代码不能为空。'); - } - - $user = User::where('username', $gets['username']) - ->where('status', 1) - ->where('group_id', 2)->first(); - - if ($user->id > 0) { - Auth::login($user, true); - Session::put('auth_totp', true); - return $this->json('登录成功。', true); - } else { - return $this->json('登录失败，客户代码无效。'); - } - } - return $this->json('登录失败。'); - } - - public function json($data, $status = false, $type = 'primary') - { - $json = []; - $json['status'] = $status; - $json['state'] = $status; - $json['info'] = $type; - $json['data'] = $data; - return response()->json($json); - } -} diff --git a/app/Gdoo/Customer/Controllers/ComplaintController.php b/app/Gdoo/Customer/Controllers/ComplaintController.php index db9392e4..844b46ee 100644 --- a/app/Gdoo/Customer/Controllers/ComplaintController.php +++ b/app/Gdoo/Customer/Controllers/ComplaintController.php @@ -16,9 +16,6 @@ class ComplaintController extends WorkflowController { public $permission = ['dialog']; - /** - * 订单列表 - */ public function indexAction() { // 客户权限 @@ -84,7 +81,6 @@ class ComplaintController extends WorkflowController ]); } - // 新建促销 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -107,27 +103,21 @@ class ComplaintController extends WorkflowController return $this->display(['form' => $form], $tpl); } - // 编辑促销 public function editAction() { return $this->createAction(); } - // 显示促销 public function showAction() { return $this->createAction('show'); } - // 显示促销 public function printAction() { return $this->createAction('print'); } - /** - * 订单删除 - */ public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Customer/Controllers/ContactController.php b/app/Gdoo/Customer/Controllers/ContactController.php index 8b335329..7fa70c30 100644 --- a/app/Gdoo/Customer/Controllers/ContactController.php +++ b/app/Gdoo/Customer/Controllers/ContactController.php @@ -76,7 +76,6 @@ class ContactController extends DefaultController ]); } - // 新建客户联系人 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -86,19 +85,16 @@ class ContactController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - // 显示客户联系人 public function showAction() { return $this->createAction('show'); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { @@ -107,13 +103,10 @@ class ContactController extends DefaultController } } - /** - * 弹出层信息 - */ public function dialogAction() { $header = Grid::header([ - 'code' => 'customer_contact', + 'code' => 'customer_contact', ]); $search = $header['search_form']; $query = $search['query']; @@ -131,7 +124,7 @@ class ContactController extends DefaultController } } - // 客户圈权限 + // 销售组权限 $region = regionCustomer(); if ($region['authorise']) { foreach ($region['whereIn'] as $key => $where) { diff --git a/app/Gdoo/Customer/Controllers/CustomerApplyController.php b/app/Gdoo/Customer/Controllers/CustomerApplyController.php index 7afcf5d9..35f10726 100644 --- a/app/Gdoo/Customer/Controllers/CustomerApplyController.php +++ b/app/Gdoo/Customer/Controllers/CustomerApplyController.php @@ -93,7 +93,6 @@ class CustomerApplyController extends WorkflowController ]); } - // 新建客户联系人 public function createAction($action = 'create') { $id = (int)Request::get('id'); @@ -112,25 +111,21 @@ class CustomerApplyController extends WorkflowController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction('edit'); } - // 审核 public function auditAction() { return $this->createAction('audit'); } - // 显示客户联系人 public function showAction() { return $this->createAction('show'); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Customer/Controllers/CustomerClassController.php b/app/Gdoo/Customer/Controllers/CustomerClassController.php index 3d37ca02..ee233485 100644 --- a/app/Gdoo/Customer/Controllers/CustomerClassController.php +++ b/app/Gdoo/Customer/Controllers/CustomerClassController.php @@ -101,7 +101,6 @@ class CustomerClassController extends DefaultController $model->search($where); } } - // $model->where('end', 1); $rows = $model->get(); return response()->json(['data' => $rows]); } diff --git a/app/Gdoo/Customer/Controllers/CustomerController.php b/app/Gdoo/Customer/Controllers/CustomerController.php index 4f1dfbdf..16391483 100644 --- a/app/Gdoo/Customer/Controllers/CustomerController.php +++ b/app/Gdoo/Customer/Controllers/CustomerController.php @@ -104,7 +104,6 @@ class CustomerController extends DefaultController ]); } - // 新建客户联系人 public function createAction($action = 'create') { $id = (int)Request::get('id'); @@ -129,13 +128,11 @@ class CustomerController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction('edit'); } - // 批量编辑 public function batchEditAction() { $gets = Request::all(); @@ -156,7 +153,6 @@ class CustomerController extends DefaultController ]); } - // 销售产品价格 public function priceEditAction() { $gets = Request::all(); @@ -195,7 +191,6 @@ class CustomerController extends DefaultController ]); } - // 显示客户联系人 public function showAction() { return $this->createAction('show'); @@ -211,7 +206,6 @@ class CustomerController extends DefaultController return $this->render(['tips' => $tips], 'layouts.import'); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { @@ -220,9 +214,6 @@ class CustomerController extends DefaultController } } - /** - * 弹出层信息 - */ public function dialogAction() { $search = search_form( diff --git a/app/Gdoo/Customer/Controllers/DeliveryAddressController.php b/app/Gdoo/Customer/Controllers/DeliveryAddressController.php index bef730cf..c8c0bec5 100644 --- a/app/Gdoo/Customer/Controllers/DeliveryAddressController.php +++ b/app/Gdoo/Customer/Controllers/DeliveryAddressController.php @@ -75,7 +75,6 @@ class DeliveryAddressController extends DefaultController ]); } - // 新建客户联系人 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -85,19 +84,16 @@ class DeliveryAddressController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - // 显示客户联系人 public function showAction() { return $this->createAction('show'); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { @@ -106,9 +102,6 @@ class DeliveryAddressController extends DefaultController } } - /** - * 弹出层信息 - */ public function dialogAction() { $header = Grid::header([ diff --git a/app/Gdoo/Customer/Controllers/PriceController.php b/app/Gdoo/Customer/Controllers/PriceController.php index 4ecd2dad..225fe093 100644 --- a/app/Gdoo/Customer/Controllers/PriceController.php +++ b/app/Gdoo/Customer/Controllers/PriceController.php @@ -86,7 +86,6 @@ class PriceController extends DefaultController ]); } - // 新建促销 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -96,19 +95,16 @@ class PriceController extends DefaultController ], 'create'); } - // 编辑促销 public function editAction() { return $this->createAction(); } - // 显示促销 public function showAction() { return $this->createAction('edit'); } - // 客户价格列表 public function listAction() { $gets = Request::all(); @@ -135,7 +131,6 @@ class PriceController extends DefaultController return $this->json($rows, true); } - // 参考客户价格 public function referCustomerAction() { $search = search_form( @@ -186,7 +181,6 @@ class PriceController extends DefaultController ]); } - // 数据导入 public function importAction() { if (Request::method() == 'POST') { @@ -196,7 +190,6 @@ class PriceController extends DefaultController return $this->render(['tips' => $tips], 'layouts.import'); } - // 删除促销 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Customer/Controllers/ReconcileController.php b/app/Gdoo/Customer/Controllers/ReconcileController.php deleted file mode 100644 index cdc76ecb..00000000 --- a/app/Gdoo/Customer/Controllers/ReconcileController.php +++ /dev/null @@ -1,210 +0,0 @@ - '', - 'start_at' => '', - 'end_at' => '', - ], []); - - $query = $search['query']; - - if ($query['customer']) { - $customer = DB::table('customer') - ->leftJoin('user', 'customer.user_id', '=', 'user.id') - ->where('customer.id', $query['customer']) - ->first(); - - $ch = curl_init(env('YONYOU_URL').'/yonyou.php?do=ar&start_at='.$query['start_at'].'&end_at='.$query['end_at'].'&customer_code='.$customer['username']); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - $res = curl_exec($ch); - curl_close($ch); - $data = json_decode($res, true); - - $lists = []; - foreach ($data as $row) { - $cDwCode = $row['cDwCode']; - $lists[$cDwCode][] = $row; - } - - $res = []; - $total_start = $total_end = 0; - foreach ($lists as $code => $rows) { - $ye = 0; - foreach ($rows as $i => $row) { - - $ye = $ye + $row['ye']; - $ye = $ye + $row['jf'] - $row['df']; - - if($row['iYear'] && $row['iMonth'] && $row['iDay']) { - $date = date('Y-m-d', strtotime($row['iYear'].'-'.$row['iMonth'].'-'.$row['iDay'])); - $jf = number_format($row['jf'], 2); - $df = number_format($row['df'], 2); - $res[] = [ - 'code' => $code, - 'date' => $date, - 'jmoney' => $jf, - 'dmoney' => $df, - 'balance' => number_format($ye, 2), - 'ccusname' => $row['ccusname'], - 'digest' => $row['cDigest'], - 'ddh' => $row['ddh'], - 'zp' => number_format($row['zp'], 2), - ]; - } else { - $res[] = [ - 'balance' => number_format($row['ye'], 2), - 'ccusname' => $row['ccusname'], - 'code' => $code, - 'digest' => $row['cDigest'], - ]; - $total_start += $row['ye']; - } - } - $res[] = [ - 'balance' => number_format($ye, 2), - 'ccusname' => $rows[0]['ccusname'], - 'code' => $code, - 'digest' => '期末余额' - ]; - $total_end += $ye; - } - - array_unshift($res, [ - 'balance' => number_format($total_start, 2), - 'digest' => '总期初余额', - 'ccusname' => '总期初合计', - ]); - $res[] = [ - 'balance' => number_format($total_end, 2), - 'digest' => '总期末余额', - 'ccusname' => '总期末合计', - ]; - - if (Request::method() == 'POST') { - return response()->json($res); - } - } - return $this->display(); - } - - // 生成对账单 - public function createAction() - { - set_time_limit(0); - - if (Request::method() == 'POST') { - $gets = Request::all(); - - $rules = [ - 'start_at' => 'required|date', - 'end_at' => 'required|date', - ]; - - $v = Validator::make($gets, $rules, [], ['start_at' => '开始日期', 'end_at' => '结束日期']); - if ($v->fails()) { - return $this->json($v->errors()->all()); - } - - /** 数据同步 **/ - $ch = curl_init(env('YONYOU_URL').'/yonyou.php?do=ar&start_at='.$gets['start_at'].'&end_at='.$gets['end_at']); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - $res = curl_exec($ch); - curl_close($ch); - $res = json_decode($res, true); - - // 获取客户数据 - $customers = DB::table('user') - ->leftJoin('customer', 'customer.user_id', '=', 'user.id') - ->where('group_id', 2) - ->pluck('customer.id', 'user.username'); - - $rows = []; - foreach ($res['data'] as $row) { - if ($row['code']) { - $rows[$row['code']][] = $row; - /* - if(empty($customers[$row['code']])) { - return $this->json('订单系统不存在此客户代码: ['.$row['code'].']'); - } - */ - } - } - - // 总余额 - $yes = $res['ye']; - - foreach ($rows as $code => $row) { - $account_id = DB::table('customer_account')->insertGetId([ - 'sn' => date('Ymd').$code, - 'date' => date('Ymd'), - 'code' => $code, - 'customer_id' => (int)$customers[$code], - 'start_at' => $gets['start_at'], - 'end_at' => $gets['end_at'], - ]); - - // 单客户余额 - $ye = $yes[$row['zcode']] > 0 ? $yes[$row['zcode']] : 0.00; - - // 写入余额数据 - DB::table('customer_account_data')->insert([ - 'code' => $code, - 'account_id' => $account_id, - 'balance' => $ye, - 'digest' => '期初余额小计', - ]); - - foreach ($row as $i => $cell) { - $ye = $ye + $cell['jf'] - $cell['df']; - - $data = [ - 'account_id' => $account_id, - 'sn' => date('Ymd').$i, - 'date' => $cell['date'], - 'ycode' => $cell['ycode'], - 'zcode' => $cell['zcode'], - 'code' => $cell['code'], - 'jmoney' => $cell['jf'], - 'dmoney' => $cell['df'], - 'balance' => $ye, - 'digest' => $cell['digest'], - ]; - - DB::table('customer_account_data')->insert($data); - } - - DB::table('customer_account_data')->insert([ - 'code' => $code, - 'account_id' => $account_id, - 'balance' => $ye, - 'digest' => '期木余额小计', - ]); - - // 更新余额 - DB::table('customer_account')->where('id', $account_id)->update([ - 'balance' => $ye, - ]); - } - return $this->json('reload', true); - } - return $this->render(); - } -} diff --git a/app/Gdoo/Customer/Controllers/RegionController.php b/app/Gdoo/Customer/Controllers/RegionController.php index d1d119ce..3364cd84 100644 --- a/app/Gdoo/Customer/Controllers/RegionController.php +++ b/app/Gdoo/Customer/Controllers/RegionController.php @@ -79,7 +79,6 @@ class RegionController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -97,7 +96,6 @@ class RegionController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); @@ -149,7 +147,6 @@ class RegionController extends DefaultController ]); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Customer/Controllers/RegionTaskController.php b/app/Gdoo/Customer/Controllers/RegionTaskController.php index 6afc7990..b725028f 100644 --- a/app/Gdoo/Customer/Controllers/RegionTaskController.php +++ b/app/Gdoo/Customer/Controllers/RegionTaskController.php @@ -91,7 +91,6 @@ class RegionTaskController extends AuditController ]); } - // 新建客户联系人 public function createAction($action = 'create') { $id = (int)Request::get('id'); @@ -112,13 +111,11 @@ class RegionTaskController extends AuditController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction('edit'); } - // 显示客户联系人 public function showAction() { return $this->createAction('show'); @@ -303,7 +300,6 @@ class RegionTaskController extends AuditController ]); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Customer/Controllers/TaskController.php b/app/Gdoo/Customer/Controllers/TaskController.php index cf2441cc..b71cb61d 100644 --- a/app/Gdoo/Customer/Controllers/TaskController.php +++ b/app/Gdoo/Customer/Controllers/TaskController.php @@ -81,7 +81,6 @@ class TaskController extends AuditController ]); } - // 新建客户联系人 public function createAction($action = 'create') { $id = (int)Request::get('id'); @@ -101,13 +100,11 @@ class TaskController extends AuditController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction('edit'); } - // 显示客户联系人 public function showAction() { return $this->createAction('show'); @@ -367,7 +364,6 @@ class TaskController extends AuditController return view('importExcel'); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Customer/Controllers/TaxController.php b/app/Gdoo/Customer/Controllers/TaxController.php index 7099a54e..dc69c57a 100644 --- a/app/Gdoo/Customer/Controllers/TaxController.php +++ b/app/Gdoo/Customer/Controllers/TaxController.php @@ -83,7 +83,6 @@ class TaxController extends AuditController ]); } - // 新建客户联系人 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -93,13 +92,11 @@ class TaxController extends AuditController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction('edit'); } - // 创建客户联系人 public function showAction() { return $this->createAction('show'); @@ -168,8 +165,7 @@ class TaxController extends AuditController 'header' => $header ]); } - - // 删除 + public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Customer/Controllers/TokenController.php b/app/Gdoo/Customer/Controllers/TokenController.php deleted file mode 100644 index 30ed8686..00000000 --- a/app/Gdoo/Customer/Controllers/TokenController.php +++ /dev/null @@ -1,65 +0,0 @@ -json(['message'=>'客户代码不能为空。']); - } - - if ($password == '') { - return response()->json(['message'=>'联系人手机不能为空。']); - } - - // 获取登录用户 - $user = User::where('username', $username) - ->where('group_id', 2) - ->where('status', 1) - ->first(); - - if ($user) { - // 获取客户档案 - $customer = Customer::where('user_id', $user->id)->first(); - - // 登录的客户业务员信息 - $contact = Contact::leftJoin('user', 'user.id', '=', 'customer_contact.user_id') - ->where('customer_contact.customer_id', $customer->id) - ->where('user.phone', $password) - ->first(['user.*', 'customer_contact.id as contact_id']); - - if ($contact) { - $assets = UserAssetService::getRoleAssets($user->role_id); - return response()->json([ - 'token' => $this->createToken($user->id), - 'contact_id' => $contact->contact_id, - 'access' => $assets, - ]); - } else { - return response()->json(['message'=>'客户代码或联系人手机错误。']); - } - } - return response()->json(['message'=>'客户代码或联系人手机错误。']); - } -} diff --git a/app/Gdoo/Customer/Controllers/TypeController.php b/app/Gdoo/Customer/Controllers/TypeController.php index f6b0d551..e60c3e70 100644 --- a/app/Gdoo/Customer/Controllers/TypeController.php +++ b/app/Gdoo/Customer/Controllers/TypeController.php @@ -69,7 +69,6 @@ class TypeController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -79,7 +78,6 @@ class TypeController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); @@ -107,7 +105,6 @@ class TypeController extends DefaultController ]); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Customer/views/reconcile/query.blade.php b/app/Gdoo/Customer/views/reconcile/query.blade.php deleted file mode 100644 index 2e6b606d..00000000 --- a/app/Gdoo/Customer/views/reconcile/query.blade.php +++ /dev/null @@ -1,129 +0,0 @@ -
-
- -
- -
- -
- - -
-
- - {{App\Support\Dialog::user('customer', 'customer', '', 0, 0, 135)}} -
-
- -
-
- - -
-
- -
-
- - -
- - 查询 -
-
- -
-
- -
- -
- -
-
-
-
- - \ No newline at end of file diff --git a/app/Gdoo/CustomerCost/Controllers/AdjustController.php b/app/Gdoo/CustomerCost/Controllers/AdjustController.php index d2df2620..6eaa88c3 100644 --- a/app/Gdoo/CustomerCost/Controllers/AdjustController.php +++ b/app/Gdoo/CustomerCost/Controllers/AdjustController.php @@ -84,7 +84,6 @@ class AdjustController extends AuditController ]); } - // 其他费用 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -103,19 +102,16 @@ class AdjustController extends AuditController ], 'create'); } - // 编辑促销 public function editAction() { return $this->createAction(); } - // 显示促销 public function showAction() { return $this->createAction('show'); } - // 删除促销 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/CustomerCost/Controllers/CategoryController.php b/app/Gdoo/CustomerCost/Controllers/CategoryController.php index 80028a95..96e1e4f7 100644 --- a/app/Gdoo/CustomerCost/Controllers/CategoryController.php +++ b/app/Gdoo/CustomerCost/Controllers/CategoryController.php @@ -67,7 +67,6 @@ class CategoryController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -77,27 +76,11 @@ class CategoryController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - // 显示客户联系人 - public function showAction() - { - $id = (int)Request::get('id'); - $group = Category::find($id); - $options = [ - 'table' => 'customer_cost_category', - 'row' => $group, - ]; - $tpl = Form::show($options); - return $this->display([ - 'tpl' => $tpl, - ]); - } - public function dialogAction() { $search = search_form([], [ @@ -106,7 +89,7 @@ class CategoryController extends DefaultController ]); if (Request::method() == 'POST') { - $model = Type::orderBy('sort', 'asc'); + $model = Category::orderBy('sort', 'asc'); foreach ($search['where'] as $where) { if ($where['active']) { $model->search($where); diff --git a/app/Gdoo/CustomerCost/Controllers/CompenController.php b/app/Gdoo/CustomerCost/Controllers/CompenController.php index 1ec68790..19bc7e1c 100644 --- a/app/Gdoo/CustomerCost/Controllers/CompenController.php +++ b/app/Gdoo/CustomerCost/Controllers/CompenController.php @@ -80,7 +80,6 @@ class CompenController extends AuditController ]); } - // 其他费用 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -99,13 +98,11 @@ class CompenController extends AuditController ], 'create'); } - // 编辑促销 public function editAction() { return $this->createAction(); } - // 显示促销 public function showAction() { return $this->createAction('show'); @@ -155,7 +152,6 @@ class CompenController extends AuditController return view('importExcel'); } - // 删除促销 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/CustomerCost/Controllers/CostController.php b/app/Gdoo/CustomerCost/Controllers/CostController.php index 8fcc0128..71737768 100644 --- a/app/Gdoo/CustomerCost/Controllers/CostController.php +++ b/app/Gdoo/CustomerCost/Controllers/CostController.php @@ -96,7 +96,6 @@ class CostController extends AuditController ]); } - // 其他费用 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -115,13 +114,11 @@ class CostController extends AuditController ], 'create'); } - // 编辑促销 public function editAction() { return $this->createAction(); } - // 显示促销 public function showAction() { return $this->createAction('show'); @@ -245,7 +242,6 @@ class CostController extends AuditController ]); } - // 删除促销 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/CustomerCost/Controllers/RebateController.php b/app/Gdoo/CustomerCost/Controllers/RebateController.php index 59ea006e..7939ef8a 100644 --- a/app/Gdoo/CustomerCost/Controllers/RebateController.php +++ b/app/Gdoo/CustomerCost/Controllers/RebateController.php @@ -80,7 +80,6 @@ class RebateController extends AuditController ]); } - // 其他费用 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -99,13 +98,11 @@ class RebateController extends AuditController ], 'create'); } - // 编辑促销 public function editAction() { return $this->createAction(); } - // 显示促销 public function showAction() { return $this->createAction('show'); @@ -116,17 +113,13 @@ class RebateController extends AuditController if (Request::method() == 'POST') { $file = Request::file('file'); if ($file->isValid()) { - $types = DB::table('customer_order_type')->get()->keyBy('name'); - /* [0] => 客户编码 [1] => 客户名称 [2] => 金额 */ - $rows = readExcel($file->getPathName()); $items = []; - $codes = []; foreach($rows as $i => $row) { if ($i > 1) { @@ -155,7 +148,6 @@ class RebateController extends AuditController return view('importExcel'); } - // 删除促销 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/CustomerCost/Controllers/ReportController.php b/app/Gdoo/CustomerCost/Controllers/ReportController.php index 3898411a..86beff69 100644 --- a/app/Gdoo/CustomerCost/Controllers/ReportController.php +++ b/app/Gdoo/CustomerCost/Controllers/ReportController.php @@ -66,14 +66,7 @@ class ReportController extends DefaultController } } - // 销售会计审核日期 - $rows = $model->leftJoin(DB::raw("(select max(d.updated_at) as audit_date, m.data_id - FROM model_run_log as d left join model_run as m on d.run_id = m.id where m.bill_id = 23 and d.run_name = '销售会计' - GROUP BY m.data_id - ) as l - "), 'l.data_id', '=', 'm.id') - ->whereRaw("(".sql_year_month('l.audit_date', 'ts')." BETWEEN ? AND ?)", $fields['date']) - ->orderBy(DB::raw(sql_year_month('l.audit_date', 'ts')), 'asc') + $rows = $model->orderBy('m.id', 'asc') ->get()->toArray(); foreach($rows as &$row) { diff --git a/app/Gdoo/File/Controllers/AttachmentController.php b/app/Gdoo/File/Controllers/AttachmentController.php index 0c69b637..d90d7810 100644 --- a/app/Gdoo/File/Controllers/AttachmentController.php +++ b/app/Gdoo/File/Controllers/AttachmentController.php @@ -10,6 +10,7 @@ use URL; use Gdoo\File\Models\Attachment; use Gdoo\Index\Controllers\DefaultController; +use Illuminate\Support\Str; class AttachmentController extends DefaultController { @@ -25,9 +26,6 @@ class AttachmentController extends DefaultController parent::__construct(); } - /** - * 添加文件到草稿 - */ public function draftAction() { set_time_limit(0); @@ -69,9 +67,6 @@ class AttachmentController extends DefaultController return 0; } - /** - * 查看文件 - */ public function fileinfoAction() { $id = Request::get('id', 0); @@ -86,11 +81,6 @@ class AttachmentController extends DefaultController return $this->json('文件不存在。'); } - //$isimg = '|jpg|png|gif|bmp|jpeg|', '|'.$ext.'|'; - //$isoffice = '|doc|docx|xls|xlsx|ppt|pptx|pdf|', '|'.$ext.'|'; - //$isbianju = '|doc|docx|xls|xlsx|ppt|pptx|', '|'.$ext.'|'; - //$isyulan = ',txt,log,html,htm,js,php,php3,mp4,md,cs,sql,java,json,css,asp,aspx,shtml,cpp,c,vbs,jsp,xml,bat,ini,conf,sh,', ','.$ext.','; - $isview = 0; $isimg = ['jpg', 'jpeg', 'png', 'gif', 'bmp']; if (in_array($file['type'], $isimg)) { @@ -156,9 +146,6 @@ class AttachmentController extends DefaultController $size = $file->getSize(); $name = $file->getClientOriginalName(); $extension = strtolower($file->getClientOriginalExtension()); - //$name = $paths['filename']; - //$extension = strtolower($name); - //$_FILES['Filedata']['size'] // 保存附件的表名 $table = empty($gets['model']) ? 'attachment' : $gets['model']; @@ -168,24 +155,20 @@ class AttachmentController extends DefaultController // 附件存放目录 $upload_path = upload_path($path); - /* - if(!is_dir($upload_path)) { - mkdir($upload_path, 0755, true); - } - */ + // 附件新名字 - $filename = date('ymdhi').str_random(4).".".$extension; + $filename = date('ymdhi').Str::random(4).".".$extension; if (in_array($extension, explode(',', $upload_type))) { // 移动文件 if ($file->move($upload_path, $filename)) { $data = [ - 'title' => $name, - 'path' => $path, - 'type' => $extension, - 'name' => $filename, - 'size' => $size, - 'add_time' => time(), + 'title' => $name, + 'path' => $path, + 'type' => $extension, + 'name' => $filename, + 'size' => $size, + 'add_time' => time(), 'add_user_id' => Auth::id(), ]; @@ -219,10 +202,7 @@ class AttachmentController extends DefaultController $size = $file->getSize(); $name = $file->getClientOriginalName(); $extension = strtolower($file->getClientOriginalExtension()); - //$name = $paths['filename']; - //$extension = strtolower($name); - //$_FILES['Filedata']['size'] - + // 保存附件的表名 $table = empty($gets['model']) ? 'attachment' : $gets['model']; @@ -231,23 +211,19 @@ class AttachmentController extends DefaultController // 附件存放目录 $upload_path = upload_path($path); - /* - if(!is_dir($upload_path)) { - mkdir($upload_path, 0755, true); - } - */ + // 附件新名字 - $filename = date('ymdhi').str_random(4).".".$extension; + $filename = date('ymdhi').Str::random(4).".".$extension; if (in_array($extension, explode(',', $upload_type))) { // 移动文件 if ($file->move($upload_path, $filename)) { $insert_id = DB::table($table)->insertGetId([ 'title' => $name, - 'path' => $path, - 'type' => $extension, - 'name' => $filename, - 'size' => $size, + 'path' => $path, + 'type' => $extension, + 'name' => $filename, + 'size' => $size, 'add_time' => time(), 'add_user_id' => Auth::id(), ]); diff --git a/app/Gdoo/File/Controllers/CertificateController.php b/app/Gdoo/File/Controllers/CertificateController.php index 79884e5c..d82c5539 100644 --- a/app/Gdoo/File/Controllers/CertificateController.php +++ b/app/Gdoo/File/Controllers/CertificateController.php @@ -9,6 +9,7 @@ use Validator; use Gdoo\Model\Grid; use Gdoo\File\Models\Certificate; +use Illuminate\Support\Str; class CertificateController extends DefaultController { @@ -83,13 +84,12 @@ class CertificateController extends DefaultController // 扩展名称 $extension = $file->getClientOriginalExtension(); // 附件新名字 - $filename = date('dhis_').str_random(4).'.'.$extension; + $filename = date('dhis_').Str::random(4).'.'.$extension; $filename = mb_strtolower($filename); $uploadSuccess = $file->move($upload_path, $filename); if ($uploadSuccess) { // 数据库写入 $draft = new Certificate; - //$draft->name = mb_strtolower($file->getClientOriginalName()); $draft->name = $name; $draft->path = $path.'/'.$filename; $draft->type = $extension; diff --git a/app/Gdoo/File/Controllers/FileController.php b/app/Gdoo/File/Controllers/FileController.php index 6b339ffc..f88a8440 100644 --- a/app/Gdoo/File/Controllers/FileController.php +++ b/app/Gdoo/File/Controllers/FileController.php @@ -8,6 +8,7 @@ use Gdoo\Index\Models\Share; use Gdoo\File\Models\File; use Gdoo\Index\Controllers\DefaultController; +use Illuminate\Support\Str; class FileController extends DefaultController { @@ -105,7 +106,7 @@ class FileController extends DefaultController // 扩展名称 $extension = $file->getClientOriginalExtension(); // 附件新名字 - $filename = date('dhis_').str_random(4).'.'.$extension; + $filename = date('dhis_').Str::random(4).'.'.$extension; $filename = mb_strtolower($filename); $uploadSuccess = $file->move($upload_path, $filename); @@ -132,12 +133,7 @@ class FileController extends DefaultController // 个人云盘 public function indexAction() { - $search = search_form([ - 'referer' => 1, - ], []); - $user_id = auth()->id(); - $parent_id = Request::get('parent_id', 0); $rows = DB::table('file') @@ -187,11 +183,7 @@ class FileController extends DefaultController // 共享给我的 public function receivedataAction() { - $search = search_form([ - 'referer' => 1, - ], []); - - $user_id = Request::get('user_id'); + $user_id = Request::get('user_id'); $parent_id = Request::get('parent_id'); // 共享的全部文件和文件夹 @@ -250,20 +242,16 @@ class FileController extends DefaultController $user = $row = DB::table('user')->where('id', $user_id)->first(); return $this->display([ - 'rows' => $rows, + 'rows' => $rows, 'breadcrumb' => $breadcrumb, - 'parent_id' => $parent_id, - 'user' => $user, + 'parent_id' => $parent_id, + 'user' => $user, ]); } // 我共享的 public function shareAction() { - $search = search_form([ - 'referer' => 1, - ], []); - $user_id = Request::get('user_id', auth()->id()); // 共享的全部文件和文件夹 @@ -323,9 +311,9 @@ class FileController extends DefaultController } return $this->display([ - 'rows' => $rows, + 'rows' => $rows, 'breadcrumb' => $breadcrumb, - 'parent_id' => $parent_id, + 'parent_id' => $parent_id, ]); } @@ -345,8 +333,6 @@ class FileController extends DefaultController $rows = [ 'name' => '公共网盘', 'type' => '', - 'name' => '公共网盘', - 'name' => '公共网盘', ]; return $this->display([ diff --git a/app/Gdoo/File/Controllers/InspectReportController.php b/app/Gdoo/File/Controllers/InspectReportController.php index 2c13f2bf..964eeb65 100644 --- a/app/Gdoo/File/Controllers/InspectReportController.php +++ b/app/Gdoo/File/Controllers/InspectReportController.php @@ -9,6 +9,7 @@ use Validator; use Gdoo\Model\Grid; use Gdoo\File\Models\InspectReport; +use Illuminate\Support\Str; class InspectReportController extends DefaultController { @@ -83,13 +84,12 @@ class InspectReportController extends DefaultController // 扩展名称 $extension = $file->getClientOriginalExtension(); // 附件新名字 - $filename = date('dhis_').str_random(4).'.'.$extension; + $filename = date('dhis_').Str::random(4).'.'.$extension; $filename = mb_strtolower($filename); $uploadSuccess = $file->move($upload_path, $filename); if ($uploadSuccess) { // 数据库写入 $draft = new InspectReport; - //$draft->name = mb_strtolower($file->getClientOriginalName()); $draft->name = $name; $draft->path = $path.'/'.$filename; $draft->type = $extension; diff --git a/app/Gdoo/File/Controllers/WidgetController.php b/app/Gdoo/File/Controllers/WidgetController.php deleted file mode 100644 index 485fde44..00000000 --- a/app/Gdoo/File/Controllers/WidgetController.php +++ /dev/null @@ -1,111 +0,0 @@ - '盛华管理手机客户端', - 'date' => '2018-04-09', - 'android_url' => '/uploads/com.shenghua.oa/1.0.12.apk', - 'ios_url' => '' - ],[ - 'title' => '盛华市场手机客户端', - 'date' => '2018-04-07', - 'android_url' => '/uploads/com.shenghua.customer/1.0.3.apk', - 'ios_url' => '/uploads/com.shenghua.customer/1.0.3.ipa' - ],*/[ - 'title' => '身份验证器(GoogleAuthenticator)', - 'date' => '2015-06-17', - 'android_url' => '/uploads/android/authenticator2_21.apk', - 'ios_url' => '' - ],[ - 'title' => '日历同步助手(Caldav)', - 'date' => '2017-06-29', - 'android_url' => '/uploads/android/calendar.caldav.sync.apk', - 'ios_url' => '' - ]]; - - public function downloadAction() - { - $key = Request::get('key'); - $row = $this->rows[$key]; - - $file = ''; - - if (get_device_type() == 'ios') { - if ($row['ios_url']) { - $file = url($row['ios_url']); - } - $img = '/assets/images/ios_download.png'; - } else { - if ($row['android_url']) { - $file = url($row['android_url']); - } - $img = '/assets/images/android_download.png'; - } - - if (is_weixin()) { - echo ' - - - - - - - -
- -
- - '; - } else { - if ($file) { - echo "
"; - } - } - } - - public function indexAction() - { - if (Request::isJson()) { - foreach ($this->rows as $k => &$row) { - $url = ''; - - if ($row['android_url']) { - $url .= ''; - } - - if ($row['ios_url']) { - $url .= ' '; - } else { - $url .= ' '; - } - - $qrcodeURL = url('index/api/qrcode', ['size' => 6, 'data' => url('file/widget/download', ['key' => $k])]); - - $url .= ' ");\'>'; - - $row['option'] = $url; - } - - $json['total'] = sizeof($this->rows); - $json['data'] = $this->rows; - return response()->json($json); - } - return $this->render(); - } -} diff --git a/app/Gdoo/File/views/widget/index.blade.php b/app/Gdoo/File/views/widget/index.blade.php deleted file mode 100644 index e6954f9d..00000000 --- a/app/Gdoo/File/views/widget/index.blade.php +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - -
标题日期下载
- - \ No newline at end of file diff --git a/app/Gdoo/Forum/Controllers/CategoryController.php b/app/Gdoo/Forum/Controllers/CategoryController.php index d72f5089..585e7a5a 100644 --- a/app/Gdoo/Forum/Controllers/CategoryController.php +++ b/app/Gdoo/Forum/Controllers/CategoryController.php @@ -1,12 +1,12 @@ where('id', $id)->first(); return $this->display(array( - 'row' => $row, + 'row' => $row, )); } - // 论坛列别删除 public function deleteAction() { if ($id = Request::get('id')) { diff --git a/app/Gdoo/Forum/Controllers/PostController.php b/app/Gdoo/Forum/Controllers/PostController.php index b29a6a30..ff3682a9 100644 --- a/app/Gdoo/Forum/Controllers/PostController.php +++ b/app/Gdoo/Forum/Controllers/PostController.php @@ -2,6 +2,7 @@ use DB; use Auth; +use Request; use Gdoo\Forum\Models\Forum; use Gdoo\Forum\Models\ForumPost; diff --git a/app/Gdoo/Index/Controllers/AttachmentController.php b/app/Gdoo/Index/Controllers/AttachmentController.php index b128f88d..aeea8ff2 100644 --- a/app/Gdoo/Index/Controllers/AttachmentController.php +++ b/app/Gdoo/Index/Controllers/AttachmentController.php @@ -6,6 +6,7 @@ use Validator; use DB; use Gdoo\Index\Services\AttachmentService; +use Illuminate\Support\Str; use URL; class AttachmentController extends DefaultController @@ -20,13 +21,6 @@ class AttachmentController extends DefaultController if (Request::method() == 'POST') { $file = Request::file('file'); - /* - $rules = [ - 'file' => 'mimes:'.$this->setting['upload_type'], - ]; - $v = Validator::make(['file' => $file], $rules); - */ - $upload_type = explode(',', $this->setting['upload_type']); if ($file->isValid()) { @@ -47,7 +41,7 @@ class AttachmentController extends DefaultController $upload_path = upload_path().'/'.$path; // 文件新名字 - $filename = date('dhis_').str_random(4).'.'.$extension; + $filename = date('dhis_').Str::random(4).'.'.$extension; $filename = mb_strtolower($filename); if ($file->move($upload_path, $filename)) { @@ -98,7 +92,7 @@ class AttachmentController extends DefaultController $extension = $file->getClientOriginalExtension(); // 文件新名字 - $filename = date('dhis_').str_random(4).'.'.$extension; + $filename = date('dhis_').Str::random(4).'.'.$extension; $filename = mb_strtolower($filename); if ($file->move($upload_path, $filename)) { diff --git a/app/Gdoo/Index/Controllers/DemoController.php b/app/Gdoo/Index/Controllers/DemoController.php index 3d547ddb..4918a210 100644 --- a/app/Gdoo/Index/Controllers/DemoController.php +++ b/app/Gdoo/Index/Controllers/DemoController.php @@ -4,11 +4,6 @@ use DB; use URL; use Request; -use App\Support\Pinyin; - -use Gdoo\User\Models\User; -use Gdoo\Index\Models\Notification; - class DemoController extends Controller { #[Attribute(Attribute::TARGET_FUNCTION)] @@ -19,501 +14,5 @@ class DemoController extends Controller public function helloAction() { - //\App\Jobs\SendEmail::dispatch('abc', ['fvzone@qq.com'], '您的验证码是0123', 'fsdafsd哈哈哈'); - //\App\Jobs\SendSms::dispatch(['15182223008'], '您的验证码是01234'); - - $menus = DB::table('menu')->get(); - foreach($menus as $menu) { - $url = str_replace('.', '/', $menu['url']); - DB::table('menu')->where('id', $menu['id'])->update([ - 'url' => $url, - ]); - } - - //\App\Jobs\SendSite::dispatch([1], '您的验证码是0123'); - exit; - - /* - $dbParams = array( - 'dbname' => 'gdoooa_demo', - 'user' => 'root', - 'password' => 'root', - 'host' => 'localhost:3307', - 'driver' => 'pdo_mysql', - 'charset' => 'utf8mb4', - 'default_table_options' => [ - 'charset' => 'utf8mb4', - 'collate' => 'utf8mb4_unicode_ci', - ] - ); - - $paths = array(base_path(). "/abc"); - $isDevMode = false; - - $config = \Doctrine\ORM\Tools\Setup::createAnnotationMetadataConfiguration($paths, $isDevMode); - $em = \Doctrine\ORM\EntityManager::create($dbParams, $config); - - $platform = $em->getConnection()->getDatabasePlatform(); - $platform->registerDoctrineTypeMapping('enum', 'string'); - - $metadata = $em->getClassMetadata('App\\Share'); - //$cmf = $em->getMetadataFactory(); - //$class = $cmf->getMetadataFor('Share'); - print_r($metadata); - */ - - $abc['indexes'] = [ - 'idx_object_id' => [ - 'columns' => ['source_id'], - ], - ]; - - $abc['columns'] = [ - 'id' => [ - 'name' => '', - 'type' => '', - 'default' => '', - 'notnull' => '', - 'length' => '', - 'unsigned' => '', - 'autoincrement' => '', - 'comment' => '', - ], 'name' => [ - 'name' => '', - 'type' => '', - 'default' => '', - 'notnull' => '', - 'length' => '', - 'unsigned' => '', - 'autoincrement' => '', - 'comment' => '', - ]]; - - file_put_contents(base_path().'/abc.json', json_encode($abc, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)); - - /* - $conn = \Doctrine\DBAL\DriverManager::getConnection($connectionParams); - $sm = $conn->getSchemaManager(); - $columns = $sm->listTableColumns('role'); - - foreach ($columns as $column) { - $column-> - echo $column->getName() . ': ' . $column->getType() . "\n"; - } - print_r($columns); - */ - exit; - - $abc = \Gdoo\Produce\Services\ProduceService::getPlanDetail('2020-08-01', '2020-08-04', 0, 0, 0); - // $abc = \Gdoo\Stock\Service\StockService::reportOrderStockInOut(139, 0, '', '', '2020-08-01', '2020-09-21', 1, 1, 0); - print_r($abc); - exit; - - /* - $rows = DB::table('model_permission')->get(); - foreach($rows as $row) { - $data = json_decode($row['data'], true); - print_r($data); - foreach($data as $k => $rr) { - // _product - print_r($k); - echo "\n"; - } - } - exit; - */ - - /* - $users = DB::table('user') - ->where('group_id', 2) - ->get(['id','status', 'name', 'username']); - - foreach($users as $user) { - DB::table('customer')->where('user_id', $user['id'])->update([ - 'status' => $user['status'], - 'name' => $user['name'], - 'code' => $user['username'], - ]); - } - echo 'demo'; - exit; - */ - - $gets['stock_allocation']['out_warehouse_id'] = 111; - if($gets['stock_allocation']['out_warehouse_id'] <> 140 and $gets['stock_allocation']['out_warehouse_id'] <> 139 and $gets['stock_allocation']['out_warehouse_id'] <> 20005 and $gets['stock_allocation']['out_warehouse_id'] <> 20048) { - echo '1111111111111'; - } - - if($gets['stock_allocation']['out_warehouse_id'] == 140 or $gets['stock_allocation']['out_warehouse_id'] == 139 or $gets['stock_allocation']['out_warehouse_id'] == 20005 or $gets['stock_allocation']['out_warehouse_id'] == 20048) { - echo '22222222222222'; - exit; - } - exit; - - /* - $customers = DB::table('tbb_customer') - ->get(['tbb_customer.*']); - - $users = []; - foreach($customers as $customer) { - $users[] = [ - 'id' => $customer['CustID'], - 'code' => $customer['cCusCode'], - 'name' => $customer['cCusName'], - 'tel' => $customer['cCusPhone'], - 'fax' => $customer['cCusFax'], - 'address' => $customer['cCusAddress'], - - 'head_phone' => $customer['cCusLPersonPhone'], - 'head_name' => $customer['cCusLPerson'], - 'email' => $customer['cCusEmail'], - - // 直营 3 - 'type_id' => (int)($customer['bZykh2'] == 1 ? 3 : 1), - - // 是否调拨 - 'is_allocate' => (int)$customer['bZykh'], - - // 一般纳税人 - 'general_taxpayer' => (int)$customer['Sfybnsr'], - - 'status' => (int)$customer['Status'], - - 'warehouse_address' => $customer['CustWhAddress'], - 'warehouse_tel' => $customer['TelPhone'], - 'warehouse_contact' => $customer['CustWhPerson'], - 'warehouse_phone' => $customer['CustWhPhone'], - 'warehouse_size' => $customer['CustWhSqure'], - ]; - } - */ - - /* - $pwd = bcrypt('123456'); - foreach($users as $user) { - DB::table('user')->insert([ - 'id' => $user['id'], - 'username' => $user['code'], - 'name' => $user['name'], - 'email' => $user['email'], - 'phone' => $user['head_phone'], - 'status' => $user['status'], - 'group_id' => 2, - 'role_id' => 2, - 'password' => $pwd, - ]); - DB::table('customer')->insert($user); - } - exit; - - $ufcustomer = DB::table('ufcustomer')->get()->toArray(); - $ccodes = []; - foreach($ufcustomer as $_ufcustomer) { - $ccodes[$_ufcustomer['cCusHeadCode']][] = $_ufcustomer['cCusCode']; - } - - foreach($ccodes as $cid => $_codes) { - foreach($_codes as $i => $_code) { - - } - } - */ - - //100189 - - $ufcustomer = DB::table('ufcustomer')->get()->toArray(); - $ccodes = []; - foreach($ufcustomer as $_ufcustomer) { - $ccodes[$_ufcustomer['cCusHeadCode']][] = $_ufcustomer['cCusCode']; - } - - $users = DB::table('user')->where('group_id', 2)->get()->keyBy('username')->toArray(); - foreach($ccodes as $cid => $_codes) { - foreach($_codes as $i => $_code) { - - } - } - - /* - set_time_limit(0); - $rows = file_get_contents(public_path('r.json')); - $rows = json_decode($rows, true); - foreach($rows as $row) { - $id1 = DB::table('region')->insertGetId(['name' => $row['name'], 'code' => $row['code'], 'layer' => 1]); - foreach($row['cityList'] as $city) { - $id2 = DB::table('region')->insertGetId(['layer' => 2, 'parent_id' => $id1, 'name' => $city['name'], 'code' => $city['code']]); - foreach($city['areaList'] as $area) { - DB::table('region')->insertGetId(['layer' => 3, 'parent_id' => $id2, 'name' => $area['name'], 'code' => $area['code']]); - } - } - } - echo 111; - */ - exit; - - /* - \App\Jobs\SendSite::dispatch([1], '您的验证码是0123'); - exit; - - DB::enableQueryLog(); - $user = DB::table('user as u')->orderBy('id', 'desc')->orderBy('username', 'asc')->first(); - print_r(DB::getQueryLog()); - */ - /* - $units = option('product.unit')->pluck('id', 'name'); - $rows = DB::table('product')->get(); - foreach($rows as $row) { - $unit = strtolower($row['unit']); - if (isset($units[$unit])) { - $row['unit_id'] = $units[$unit]; - DB::table('product')->where('id', $row['id'])->update($row); - } else { - echo $unit."\n"; - } - } - */ - exit; - /* - $t1 = microtime(true); - - $stocks = DB::table('stock_yonyou_data') - ->groupBy('code') - ->selectRaw('sum(quantity_set - quantity_get) as quantity,code') - ->pluck('quantity', 'code'); - - $abc = 0; - foreach ($stocks as $stock) { - $abc += $stock; - } - - echo $abc."
"; - - $t2 = microtime(true); - echo '耗时'.($t2 - $t1).'秒'; - - `` - - exit; - */ - - //$abc = \Yunpian::send('15182223008', '您的验证码是5967'); - //print_r($abc); - //exit; - - /* - $agentid = 1000035; - $url = 'http://www.shenghuafood.com/article/article/view?id=1336&agentid='.$agentid; - //$url = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww42727b1e44abc7fa&redirect_uri='.$u.'&response_type=code&scope=snsapi_privateinfo&agentid='.$agentid.'&state='.$agentid.'#wechat_redirect'; - - $msg = array( - 'touser' => 'qy01bbfb5d6f30ae009bc0e5b8fb', - 'toparty' => '', - 'msgtype' => 'news', - 'agentid' => $agentid, - 'news' => array( - "articles"=> array( - 0 => array( - "title" => "有新的公告提醒", - "description" => "[公告】关于西安大军区的调整公告", - "url" => $url, - "picurl" => "" - )) - ) - 'text' => array( - "content"=>"各部门及同事：\n". - "为更好的服务好再来大厦，满足大厦入驻员工的班车需求，现对部分班车路线及时刻做相应调整，自2016年9月20日零时生效。详情点击\nhttp://banche.hoolilai.com" - ) - ); - - $api = new \App\Wechat\Work\App($agentid); - - var_dump($api->sendMsgToUser($msg)); - - */ - $xml = simplexml_load_file('tpl.xml'); - /* - $attributes = $xml->record->attributes(); - foreach ($attributes as $k => $v) { - print_r($k.'---'.$v); - } - */ - $form = $xml->xpath("record[@type='form']/form")[0]; - - foreach ($form as $key => $node) { - if ($key == 'group') { - $fields = []; - foreach ($node as $k => $field) { - if ($k == 'field') { - $attr = $field->attributes(); - $col = $attr['col'] - 2; - $abc[] = ''; - $abc[] = '
'; - } - //print_r($k); - } - print_r($abc); - } - } - - //$abc = Yunpian::send('15182223008', '您的验证码是5967'); - //print_r($abc); - - //$ab = new Hawind\Core(); - - // 开启 log - //DB::connection()->enableQueryLog(); - - //$abc = User::whereIn('user.id', [1,2,3,4])->select(['user.*','user.name as role_name'])->paginate(); - - // 获取已执行的查询数组 - //$abc = DB::getQueryLog(); - - //$ab->test($abc); - - //print_r($abc); - - //print_r($cron->isDue()); - //$cron = Cron\CronExpression::factory('0 0 0 ? 1/2 FRI#2 *'); - //if ($cron->isDue()) { - // The promotion should be enabled! - //} - - /* - $datas = DB::table('stock') - ->where('date', '0000-00-00') - ->get(); - - foreach ($datas as $key => $data) { - $data['date'] = date('Y-m-d', $data['add_time']); - DB::table('stock')->where('id', $data['id'])->update($data); - } - */ - - /* - $logs = DB::table('model_step_log') - ->where('table', 'promotion') - ->where('step_status', 'next') - ->where('created_id', '278') - ->get(); - - foreach ($logs as $log) { - $data['data_30'] = date('Y-m-d', $log['created_at']); - DB::table('promotion')->where('id', $log['table_id'])->update($data); - } - */ - - //$sms = new iscms\Alisms\SendsmsPusher(); - - //$t = "项目流程提醒! 主题：关于违反销售管理制度之扣分——龚涛天 -【销售行为】处罚等待确认！"; - //$words = Yunpian::replaceWords($t); - - //$t = str_replace($words[0], $words[1], $t); - - //$b = mb_str_split('销售'); - - //print_r(var_dump($words)); - - //$abc = Yunpian::getBlackWord($words); - - //$abc = Yunpian::getTpl('1701454'); - - // $abc = Yunpian::getUser(); - - //print_r($abc['balance'] / 0.05); - - //print_r($words); - - exit; - - /* - $departments = DB::table('department')->pluck('name', 'id'); - $roles = DB::table('role')->pluck('name', 'id'); - $users = DB::table('user')->pluck('name', 'id'); - - $shares = DB::table('article')->get(); - - foreach ($shares as $share) { - - $id = $name = []; - - $share_user = explode(',', $share['user_id']); - foreach ($share_user as $user) { - if($users[$user]) { - $id[] = 'u'.$user; - $name[] = $users[$user]; - } - } - - $share_role = explode(',', $share['role_id']); - foreach ($share_role as $role) { - if($roles[$role]) { - $id[] = 'r'.$role; - $name[] = $roles[$role]; - } - } - - $share_department = explode(',', $share['department_id']); - foreach ($share_department as $department) { - if($departments[$department]) { - $id[] = 'd'.$department; - $name[] = $departments[$department]; - } - } - - DB::table('article')->where('id', $share['id'])->update([ - 'receive_id' => join(',', $id), - 'receive_name' => join(',', $name) - ]); - } - */ - - /* - $users = User::get(); - - foreach ($users as $user) { - - if($user->password_text == '' && mb_strlen($user->password) == 32) { - $user->password = \Hash::make($user->username); - $user->password_text = $user->username; - $user->save(); - } - } - */ - - /* - $p2 = DB::connection('sqlite') - ->table('city') - ->where('parent_id', 2621) - ->get(); - - print_r($p2); - exit; - - */ - - // app()->configure('pcas'); - - // $abc = config('pcas'); - - // print_r(json_encode($abc, JSON_UNESCAPED_UNICODE)); - - /* - - $users = DB::table('user')->get(); - - foreach ($users as $user) { - - $data['warehouse_tel'] = $user['warehouse_tel']; - $data['warehouse_contact'] = $user['warehouse_contact']; - $data['warehouse_phone'] = $user['warehouse_phone']; - $data['warehouse_address'] = $user['warehouse_address']; - $data['invoice_type'] = $user['invoice']; - - DB::table('customer')->where('user_id', $user['id'])->update($data); - } - */ - // print_r(123); - // exit; - // return $this->render([]); } } \ No newline at end of file diff --git a/app/Gdoo/Model/Controllers/ModuleController.php b/app/Gdoo/Model/Controllers/ModuleController.php index 671d47bb..a3d71289 100644 --- a/app/Gdoo/Model/Controllers/ModuleController.php +++ b/app/Gdoo/Model/Controllers/ModuleController.php @@ -14,11 +14,8 @@ use Gdoo\Index\Controllers\DefaultController; class ModuleController extends DefaultController { - public $permission = ['test', 'refresh']; + public $permission = ['refresh']; - /** - * 邮件设置 - */ public function indexAction() { $header = [ @@ -146,59 +143,11 @@ class ModuleController extends DefaultController $header['search_form'] = $search; $header['js'] = Grid::js($header); - // 配置权限 return $this->display([ 'header' => $header, ]); } - // 新建邮箱帐号 - public function createAction() - { - return $this->editAction(); - } - - // 编辑邮箱帐号 - public function editAction() - { - $id = (int)Request::get('id'); - $row = DB::table('mail')->where('id', $id)->first(); - return $this->render([ - 'row' => $row, - ], 'edit'); - } - - /** - * 保存 - */ - public function storeAction() - { - if (Request::method() == 'POST') { - $gets = Request::all(); - $rules = [ - 'name' => 'required', - 'smtp' => 'required', - 'user' => 'required', - 'password' => 'required', - 'port' => 'required', - ]; - $v = Validator::make($gets, $rules); - if ($v->fails()) { - return $this->json(join('
', $v->errors()->all())); - - } - if ($gets['id']) { - DB::table('mail')->where('id', $gets['id'])->update($gets); - } else { - DB::table('mail')->insert($gets); - } - return $this->json('恭喜你，操作成功。', true); - } - } - - /** - * 删除 - */ public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Model/Controllers/StepController.php b/app/Gdoo/Model/Controllers/StepController.php index 38edcb1b..afb55fcb 100644 --- a/app/Gdoo/Model/Controllers/StepController.php +++ b/app/Gdoo/Model/Controllers/StepController.php @@ -20,9 +20,6 @@ class StepController extends DefaultController { public $permission = ['condition', 'steps', 'index2', 'save', 'add', 'show']; - /** - * 步骤列表 - */ public function indexAction() { // 更新排序 @@ -61,9 +58,6 @@ class StepController extends DefaultController ]); } - /** - * 步骤列表 - */ public function index2Action() { // 更新排序 @@ -127,7 +121,7 @@ class StepController extends DefaultController ]); } - // 添加步骤和克隆步骤 + // 克隆步骤 public function addAction() { if (Request::method() == 'POST') { @@ -145,7 +139,6 @@ class StepController extends DefaultController } } - // 查看步骤信息 public function showAction() { $gets = Request::all(); @@ -153,7 +146,6 @@ class StepController extends DefaultController return $this->json($row, true); } - // 保存步骤 public function saveAction() { if (Request::method() == 'POST') { @@ -384,10 +376,6 @@ class StepController extends DefaultController return json_encode($rows); } - - /** - * 删除步骤 - */ public function deleteAction() { $id = Request::get('id'); diff --git a/app/Gdoo/Model/views/module/edit.blade.php b/app/Gdoo/Model/views/module/edit.blade.php deleted file mode 100644 index 71eca222..00000000 --- a/app/Gdoo/Model/views/module/edit.blade.php +++ /dev/null @@ -1,60 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
名称 - -
邮箱帐号 - -
邮箱密码 - -
SMTP服务器 - -
服务器端口 - -
连接方式 - -
状态 - -
排序 - -
- -
\ No newline at end of file diff --git a/app/Gdoo/Order/Controllers/LogisticsController.php b/app/Gdoo/Order/Controllers/LogisticsController.php index 90286224..1270d346 100644 --- a/app/Gdoo/Order/Controllers/LogisticsController.php +++ b/app/Gdoo/Order/Controllers/LogisticsController.php @@ -70,7 +70,6 @@ class LogisticsController extends DefaultController ]); } - // 新建客户联系人 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -80,19 +79,16 @@ class LogisticsController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - // 创建客户联系人 public function showAction() { return $this->createAction('show'); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { @@ -101,18 +97,15 @@ class LogisticsController extends DefaultController } } - /** - * 弹出层信息 - */ public function dialogAction() { $search = search_form([ 'advanced' => '', - 'prefix' => '', - 'offset' => '', - 'sort' => '', - 'order' => '', - 'limit' => '', + 'prefix' => '', + 'offset' => '', + 'sort' => '', + 'order' => '', + 'limit' => '', ], [ ['text','logistics.name','名称'], ]); diff --git a/app/Gdoo/Order/Controllers/OrderController.php b/app/Gdoo/Order/Controllers/OrderController.php index 28bdc08a..d77eb116 100644 --- a/app/Gdoo/Order/Controllers/OrderController.php +++ b/app/Gdoo/Order/Controllers/OrderController.php @@ -45,9 +45,6 @@ class OrderController extends WorkflowController 'serviceCustomerMoney', ]; - /** - * 订单列表 - */ public function indexAction() { // 客户权限 @@ -61,19 +58,6 @@ class OrderController extends WorkflowController $search = $header['search_form']; $query = $search['query']; - - $search['forms']['field'][] = 'acc_audit_date'; - $search['forms']['condition'][] = ''; - $search['forms']['search'][] = ''; - $search['forms']['option'][] = []; - $search['columns'][] = [ - 'form_type' => 'date', - 'field' => 'acc_audit_date', - 'name' => '销售会计审核日期', - 'options' => [], - ]; - $header['search_form'] = $search; - $cols = $header['cols']; // 自定义列 @@ -259,17 +243,7 @@ class OrderController extends WorkflowController foreach ($search['where'] as $where) { if ($where['active']) { - if ($where['field'] == 'acc_audit_date') { - // 销售会计审核日期 - $model->leftJoin(DB::raw("(select max(d.updated_at) as audit_date, m.data_id - FROM model_run_log as d left join model_run as m on d.run_id = m.id where m.bill_id = 23 and d.run_name = '销售会计' - GROUP BY m.data_id - ) as l - "), 'l.data_id', '=', 'customer_order.id') - ->whereRaw('('.sql_year_month('l.audit_date', 'ts').' = ?)', [$where['search']]); - } else { - $model->search($where); - } + $model->search($where); } } @@ -708,7 +682,6 @@ class OrderController extends WorkflowController } } - // 新建促销 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -731,19 +704,16 @@ class OrderController extends WorkflowController return $this->display(['form' => $form], $tpl); } - // 编辑促销 public function editAction() { return $this->createAction(); } - // 审核 public function auditAction() { return $this->createAction('audit'); } - // 显示促销 public function showAction() { return $this->createAction('show'); @@ -770,7 +740,6 @@ class OrderController extends WorkflowController ]); } - // 显示促销 public function printAction() { $id = Request::get('id'); @@ -809,9 +778,6 @@ class OrderController extends WorkflowController return $print_type == 'pdf' ? print_prince($tpl) : $tpl; } - /** - * 弹出层信息 - */ public function dialogAction() { $header = Grid::header([ @@ -1174,9 +1140,6 @@ class OrderController extends WorkflowController return $data; } - /** - * 订单删除 - */ public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Order/Controllers/SampleApplyController.php b/app/Gdoo/Order/Controllers/SampleApplyController.php index aa2673bc..1d7199b7 100644 --- a/app/Gdoo/Order/Controllers/SampleApplyController.php +++ b/app/Gdoo/Order/Controllers/SampleApplyController.php @@ -20,7 +20,6 @@ class SampleApplyController extends WorkflowController { public $permission = ['dialog', 'serviceDelivery']; - // 列表 public function indexAction() { $header = Grid::header([ @@ -86,7 +85,7 @@ class SampleApplyController extends WorkflowController $model->select($header['select']); - // 发货统计 + // 明细统计 $model->leftJoin(DB::raw('(select SUM(ISNULL(d.money, 0)) money, SUM(ISNULL(d.quantity, 0)) quantity, d.sample_id FROM sample_apply_data as d GROUP BY d.sample_id @@ -118,7 +117,6 @@ class SampleApplyController extends WorkflowController ]); } - // 明细列表 public function detailAction() { $header = Grid::header([ @@ -182,7 +180,6 @@ class SampleApplyController extends WorkflowController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -197,25 +194,21 @@ class SampleApplyController extends WorkflowController ], $tpl); } - // 编辑 public function editAction() { return $this->createAction(); } - // 审核 public function auditAction() { return $this->createAction('audit'); } - // 显示 public function showAction() { return $this->createAction('show'); } - // 打印 public function printAction() { $this->layout = 'layouts.print2'; @@ -227,7 +220,7 @@ class SampleApplyController extends WorkflowController { $gets = Request::all(); if (Request::method() == 'POST') { - $rows = SampleApplyProduct::whereIn('id', $gets['ids'])->get(); + $rows = SampleApply::whereIn('id', $gets['ids'])->get(); foreach($rows as $row) { $row->use_close = $row->use_close == 1 ? 0 : 1; $row->save(); @@ -287,7 +280,6 @@ class SampleApplyController extends WorkflowController ]); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Order/Controllers/TypeController.php b/app/Gdoo/Order/Controllers/TypeController.php index 36d69855..68708b43 100644 --- a/app/Gdoo/Order/Controllers/TypeController.php +++ b/app/Gdoo/Order/Controllers/TypeController.php @@ -69,7 +69,6 @@ class TypeController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -79,15 +78,11 @@ class TypeController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - /** - * 弹出层信息 - */ public function dialogAction() { $header = Grid::header([ @@ -126,7 +121,6 @@ class TypeController extends DefaultController ]); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Order/Controllers/WidgetController.php b/app/Gdoo/Order/Controllers/WidgetController.php index dd73f9ca..c81112a3 100644 --- a/app/Gdoo/Order/Controllers/WidgetController.php +++ b/app/Gdoo/Order/Controllers/WidgetController.php @@ -195,50 +195,6 @@ class WidgetController extends DefaultController } $res = $direct->get(); $rows[] = ['title' => '本月直营共发出 '.number_format($res->sum('count')).' 张发货单，'.number_format($res->sum('quantity')).' 件，'.number_format($res->sum('money')).' 元']; - - /* - // 订单审核状态。 - $model = DB::table('customer_order') - ->leftJoin('customer', 'customer.id', '=', 'customer_order.customer_id') - ->selectRaw('sum(l.xshj_num) AS xshj_num, sum(l.sqjl_num) AS sqjl_num'); - - // 销售会计审核日期 - $model->leftJoin(DB::raw("(select - m.data_id, - sum(case when d.run_name = '销售会计' then 1 else 0 end) as xshj_num, - sum(case when d.run_name = '省区经理' then 1 else 0 end) as sqjl_num - FROM model_run_log as d left join model_run as m on d.run_id = m.id where m.bill_id = 23 and d.updated_id = 0 and d.[option] = 1 - GROUP BY m.data_id - ) as l - "), 'l.data_id', '=', 'customer_order.id'); - - if ($region['authorise']) { - foreach ($region['whereIn'] as $key => $where) { - $model->whereIn($key, $where); - } - } - $res = $model->first(); - $rows[] = ['title' => '订单待审核：销售会计'. $res['xshj_num'].'张，省区经理'.$res['sqjl_num'].'张']; - */ - - /* - // 目前在途[]件。 - $model = DB::table('customer_order') - ->leftJoin('customer_order_data', 'customer_order_data.order_id', '=', 'customer_order.id') - ->leftJoin('customer', 'customer.id', '=', 'customer_order.customer_id') - ->whereRaw('FROM_UNIXTIME(customer_order.created_at,"%Y") BETWEEN '.$lastYear.' AND '.$nowYear) - ->where('customer_order.delivery_time', '>', 0) - ->where('customer_order.arrival_time', 0) - ->selectRaw('SUM(customer_order_data.amount) AS amount'); - - if ($region['authorise']) { - foreach ($region['whereIn'] as $key => $where) { - $model->whereIn($key, $where); - } - } - $res = $model->first(); - $rows[] = ['title' => '目前在途订单 '.(int)$res['amount'].' 件']; - */ $json['total'] = sizeof($rows); $json['data'] = $rows; diff --git a/app/Gdoo/Order/Services/OrderService.php b/app/Gdoo/Order/Services/OrderService.php index f1da09f9..bef15b4a 100644 --- a/app/Gdoo/Order/Services/OrderService.php +++ b/app/Gdoo/Order/Services/OrderService.php @@ -51,7 +51,7 @@ class OrderService } /** - * 获取为使用的促销id + * 获取销售未发订单 * */ public static function getSaleOrderDataSql() @@ -131,7 +131,7 @@ class OrderService } /** - * 获取为使用的促销id + * 获取销售订单未发货 * */ public static function getSaleOrderSelectDetailNotDeliverySql() @@ -174,7 +174,7 @@ class OrderService } /** - * 获取为使用的促销id + * 获取销售订单发货表 * */ public static function getSaleOrderSelectDetailSql() @@ -235,7 +235,7 @@ class OrderService } /** - * 获取为使用的促销id + * 获取销售订单调拨发货 * */ public static function getSaleOrderSelectDetailReqSql() @@ -331,7 +331,7 @@ class OrderService } /** - * 获取为使用的促销id + * 获取赠品其他出库单明细 * */ public static function getSampleSelectDetailSql() diff --git a/app/Gdoo/Produce/Controllers/MaterialController.php b/app/Gdoo/Produce/Controllers/MaterialController.php index a84544ef..b7398faf 100644 --- a/app/Gdoo/Produce/Controllers/MaterialController.php +++ b/app/Gdoo/Produce/Controllers/MaterialController.php @@ -77,7 +77,6 @@ class MaterialController extends DefaultController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -87,7 +86,6 @@ class MaterialController extends DefaultController ], 'create'); } - // 创建 public function editAction() { return $this->createAction('edit'); @@ -275,7 +273,6 @@ class MaterialController extends DefaultController return $this->json('配方保存成功。', true); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { @@ -284,9 +281,6 @@ class MaterialController extends DefaultController } } - /** - * 弹出层信息 - */ public function dialogAction() { $search = search_form([ diff --git a/app/Gdoo/Produce/Controllers/PlanController.php b/app/Gdoo/Produce/Controllers/PlanController.php index 001fc787..7c2ee7d3 100644 --- a/app/Gdoo/Produce/Controllers/PlanController.php +++ b/app/Gdoo/Produce/Controllers/PlanController.php @@ -59,7 +59,6 @@ class PlanController extends WorkflowController } $header['buttons'] = [ - //['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']], ['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1], ]; @@ -167,7 +166,6 @@ class PlanController extends WorkflowController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -177,19 +175,16 @@ class PlanController extends WorkflowController ], 'create'); } - // 审核 public function auditAction() { return $this->createAction('edit'); } - // 创建 public function editAction() { return $this->createAction('edit'); } - // 创建 public function showAction() { return $this->createAction('show'); @@ -211,7 +206,6 @@ class PlanController extends WorkflowController return $this->json($rows, true); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Produce/Services/ProduceService.php b/app/Gdoo/Produce/Services/ProduceService.php index 02b15541..4280f50b 100644 --- a/app/Gdoo/Produce/Services/ProduceService.php +++ b/app/Gdoo/Produce/Services/ProduceService.php @@ -7,13 +7,11 @@ use Gdoo\Stock\Services\StockService; class ProduceService { /** - * 获取开票单位锁定金额 + * 获取生产计划 * - * @i_UserID - * @i_UserName - *@i_Date 日期 - * @i_DeptId 车间 - * @i_IsCalAgain 是否重新计算 + * @date 日期 + * @department_id 车间 + * @isCalAgain 是否重新计算 */ public static function getMaterialPlanDay($date, $department_id, $isCalAgain) { diff --git a/app/Gdoo/Product/Controllers/CategoryController.php b/app/Gdoo/Product/Controllers/CategoryController.php index f8a73ea4..e97d0110 100644 --- a/app/Gdoo/Product/Controllers/CategoryController.php +++ b/app/Gdoo/Product/Controllers/CategoryController.php @@ -70,7 +70,6 @@ class CategoryController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -80,28 +79,11 @@ class CategoryController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - // 显示客户联系人 - public function showAction() - { - $id = (int)Request::get('id'); - $group = ProductCategory::find($id); - $options = [ - 'table' => 'product_category', - 'row' => $group, - ]; - $tpl = Form::show($options); - return $this->display([ - 'tpl' => $tpl, - ]); - } - - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Product/Controllers/ProductController.php b/app/Gdoo/Product/Controllers/ProductController.php index 26379bed..d0b91697 100644 --- a/app/Gdoo/Product/Controllers/ProductController.php +++ b/app/Gdoo/Product/Controllers/ProductController.php @@ -91,7 +91,6 @@ class ProductController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -101,13 +100,11 @@ class ProductController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - // 显示客户联系人 public function showAction() { $id = (int)Request::get('id'); @@ -127,9 +124,6 @@ class ProductController extends DefaultController return $this->render(['tips' => $tips], 'layouts.import'); } - /** - * 弹出层信息 - */ public function dialogAction() { $header = Grid::header([ @@ -281,27 +275,11 @@ class ProductController extends DefaultController } } - // 删除产品 public function deleteAction() { if (Request::method() == 'POST') { $ids = Request::get('id'); return Form::remove(['code' => 'product', 'ids' => $ids]); } - /* - $id = Request::get('id'); - if (empty($id)) { - return $this->error('最少选择一行记录。'); - } - - $products = DB::table('product')->whereIn('id', $id)->get(); - foreach ($products as $product) { - // 删除图片 - image_delete($product['image']); - } - // 删除数据 - DB::table('product')->whereIn('id', $id)->delete(); - */ - return $this->json('恭喜你，产品删除成功。', url_referer('index')); } } diff --git a/app/Gdoo/Product/Controllers/UnitController.php b/app/Gdoo/Product/Controllers/UnitController.php index 0636b246..5ee43e4f 100644 --- a/app/Gdoo/Product/Controllers/UnitController.php +++ b/app/Gdoo/Product/Controllers/UnitController.php @@ -38,9 +38,7 @@ class UnitController extends DefaultController foreach ($header['join'] as $join) { $model->leftJoin($join[0], $join[1], $join[2], $join[3]); } - $model - //->orderBy($header['sort'], $header['order']) - ->orderBy('code', 'asc'); + $model->orderBy('code', 'asc'); foreach ($search['where'] as $where) { if ($where['active']) { @@ -68,7 +66,6 @@ class UnitController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -78,27 +75,11 @@ class UnitController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - // 显示客户联系人 - public function showAction() - { - $id = (int)Request::get('id'); - $group = ProductUnit::find($id); - $options = [ - 'table' => 'warehouse', - 'row' => $group, - ]; - $tpl = Form::show($options); - return $this->display([ - 'tpl' => $tpl, - ]); - } - public function dialogAction() { $search = search_form([], [ @@ -121,7 +102,6 @@ class UnitController extends DefaultController ]); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Project/Controllers/ProjectController.php b/app/Gdoo/Project/Controllers/ProjectController.php index d672309f..6fa9dd9f 100644 --- a/app/Gdoo/Project/Controllers/ProjectController.php +++ b/app/Gdoo/Project/Controllers/ProjectController.php @@ -75,7 +75,7 @@ class ProjectController extends DefaultController ]); } - // 项目显示 + // 项目详情 public function showAction(Request $request) { return $this->display([]); diff --git a/app/Gdoo/Project/Controllers/TaskController.php b/app/Gdoo/Project/Controllers/TaskController.php index 3b256ea4..e1fb3569 100644 --- a/app/Gdoo/Project/Controllers/TaskController.php +++ b/app/Gdoo/Project/Controllers/TaskController.php @@ -14,6 +14,8 @@ use Gdoo\Project\Models\Item; use Gdoo\Project\Models\Log; use Gdoo\Index\Models\Attachment; +use Gdoo\Project\Services\TaskService; + use Gdoo\Index\Controllers\DefaultController; use Gdoo\Index\Services\AttachmentService; use Illuminate\Support\Arr; @@ -36,7 +38,7 @@ class TaskController extends DefaultController $query = $search['query']; if ($request->ajax() && $request->wantsJson()) { - $tasks = $this->data($search); + $tasks = TaskService::data($search); $_tasks = array_nest($tasks, 'name'); $rows = []; foreach($_tasks as $_task) { @@ -47,7 +49,7 @@ class TaskController extends DefaultController } if ($request->ajax()) { - $tasks = $this->data($search); + $tasks = TaskService::data($search); return response()->json(['data' => $tasks]); } @@ -73,114 +75,6 @@ class TaskController extends DefaultController ], 'index/'.$query['tpl']); } - // 读取数据 - public function data($search) - { - $query = $search['query']; - - $user_id = auth()->id(); - - $_items = Task::where('project_id', $query['project_id']) - ->leftJoin('project', 'project.id', '=', 'project_task.project_id') - ->where('parent_id', 0) - ->orderBy('project_task.sort', 'asc') - ->orderBy('project_task.id', 'asc') - ->get(['project_task.*', 'project.user_id as project_user_id'])->toArray(); - - $model = Task::with(['users' => function ($q) { - $q->select(['user.id','user.name as user_name']); - }]); - - $model->where('project_task.project_id', $query['project_id']) - ->leftJoin('project', 'project.id', '=', 'project_task.project_id') - ->leftJoin('user', 'user.id', '=', 'project_task.user_id') - ->where('parent_id', '>', 0); - - foreach ($search['where'] as $where) { - if ($where['active']) { - $model->search($where); - } - } - $_tasks = $model->select(['project_task.*','user.name as user_name', 'project.user_id as project_user_id']) - ->orderBy('project_task.sort', 'asc') - ->orderBy('project_task.id', 'asc') - ->get()->toArray(); - - foreach ($_items as $_item) { - $project_user_id = 0; - if ($_item['project_user_id'] == $user_id) { - $project_user_id = 1; - } - - $tasks[] = [ - 'start_date' => '', - 'parent_id' => 0, - 'parent' => 0, - 'duration' => '', - 'loaded' => true, - 'expanded' => true, - 'id' => $_item['id'], - 'name' => $_item['name'], - 'type' => $_item['type'], - 'created_at' => '', - 'user_id' => 0, - 'user_name' => '', - 'open' => true, - 'option_edit' => $project_user_id, - 'option_delete' => $project_user_id, - 'dhm' => '', - ]; - } - - foreach ($_tasks as $_task) { - $project_user_id = $task_user_id = 0; - - if ($_task['user_id'] == $user_id) { - $task_user_id = 1; - } - - // 显示保存按钮 - if ($_task['project_user_id'] == $user_id) { - $task_user_id = $project_user_id = 1; - } - - $_task['option_edit'] = $task_user_id; - $_task['option_delete'] = $project_user_id; - - $_task['start_date'] = date('Y-m-d', $_task['start_at']); - $_task['name'] = $_task['name']; - $_task['parent'] = $_task['parent_id']; - $_task['users'] = join(',', Arr::pluck($_task['users'], 'user_name')); - $_task['open'] = true; - $_task['loaded'] = true; - $_task['expanded'] = true; - $_task['created_dt'] = format_datetime($_task['created_at']); - $_task['start_dt'] = format_datetime($_task['start_at']); - $_task['end_dt'] = format_datetime($_task['end_at']); - - if ($_task['start_at'] && $_task['end_at']) { - $remain = remain_time($_task['start_at'], $_task['end_at'], ''); - $str = ''; - if ($remain->d) { - $str .= $remain->d.'天'; - } - if ($remain->h) { - $str .= $remain->h.'小时'; - } - if ($remain->i) { - $str .= $remain->i.'分钟'; - } - $_task['duration_date'] = $str; - } - - $_task['duration'] = ($_task['end_at'] - $_task['start_at']) / 86400; - $_task['duration'] = $_task['duration'] > 0 ? $_task['duration'] : 1; - - $tasks[] = $_task; - } - return $tasks; - } - // 显示任务 public function showAction(Request $request) { diff --git a/app/Gdoo/Project/Services/TaskService.php b/app/Gdoo/Project/Services/TaskService.php index a8d468cd..8b91c09f 100644 --- a/app/Gdoo/Project/Services/TaskService.php +++ b/app/Gdoo/Project/Services/TaskService.php @@ -1,7 +1,9 @@ id(); + + $_items = Task::where('project_id', $query['project_id']) + ->leftJoin('project', 'project.id', '=', 'project_task.project_id') + ->where('parent_id', 0) + ->orderBy('project_task.sort', 'asc') + ->orderBy('project_task.id', 'asc') + ->get(['project_task.*', 'project.user_id as project_user_id'])->toArray(); + + $model = Task::with(['users' => function ($q) { + $q->select(['user.id','user.name as user_name']); + }]); + + $model->where('project_task.project_id', $query['project_id']) + ->leftJoin('project', 'project.id', '=', 'project_task.project_id') + ->leftJoin('user', 'user.id', '=', 'project_task.user_id') + ->where('parent_id', '>', 0); + + foreach ($search['where'] as $where) { + if ($where['active']) { + $model->search($where); + } + } + $_tasks = $model->select(['project_task.*','user.name as user_name', 'project.user_id as project_user_id']) + ->orderBy('project_task.sort', 'asc') + ->orderBy('project_task.id', 'asc') + ->get()->toArray(); + + foreach ($_items as $_item) { + $project_user_id = 0; + if ($_item['project_user_id'] == $user_id) { + $project_user_id = 1; + } + + $tasks[] = [ + 'start_date' => '', + 'parent_id' => 0, + 'parent' => 0, + 'duration' => '', + 'loaded' => true, + 'expanded' => true, + 'id' => $_item['id'], + 'name' => $_item['name'], + 'type' => $_item['type'], + 'created_at' => '', + 'user_id' => 0, + 'user_name' => '', + 'open' => true, + 'option_edit' => $project_user_id, + 'option_delete' => $project_user_id, + 'dhm' => '', + ]; + } + + foreach ($_tasks as $_task) { + $project_user_id = $task_user_id = 0; + + if ($_task['user_id'] == $user_id) { + $task_user_id = 1; + } + + // 显示保存按钮 + if ($_task['project_user_id'] == $user_id) { + $task_user_id = $project_user_id = 1; + } + + $_task['option_edit'] = $task_user_id; + $_task['option_delete'] = $project_user_id; + + $_task['start_date'] = date('Y-m-d', $_task['start_at']); + $_task['name'] = $_task['name']; + $_task['parent'] = $_task['parent_id']; + $_task['users'] = join(',', Arr::pluck($_task['users'], 'user_name')); + $_task['open'] = true; + $_task['loaded'] = true; + $_task['expanded'] = true; + $_task['created_dt'] = format_datetime($_task['created_at']); + $_task['start_dt'] = format_datetime($_task['start_at']); + $_task['end_dt'] = format_datetime($_task['end_at']); + + if ($_task['start_at'] && $_task['end_at']) { + $remain = remain_time($_task['start_at'], $_task['end_at'], ''); + $str = ''; + if ($remain->d) { + $str .= $remain->d.'天'; + } + if ($remain->h) { + $str .= $remain->h.'小时'; + } + if ($remain->i) { + $str .= $remain->i.'分钟'; + } + $_task['duration_date'] = $str; + } + + $_task['duration'] = ($_task['end_at'] - $_task['start_at']) / 86400; + $_task['duration'] = $_task['duration'] > 0 ? $_task['duration'] : 1; + + $tasks[] = $_task; + } + return $tasks; + } } \ No newline at end of file diff --git a/app/Gdoo/Promotion/Controllers/MaterialController.php b/app/Gdoo/Promotion/Controllers/MaterialController.php index 8679c617..9f401011 100644 --- a/app/Gdoo/Promotion/Controllers/MaterialController.php +++ b/app/Gdoo/Promotion/Controllers/MaterialController.php @@ -14,13 +14,12 @@ use Gdoo\Model\Grid; use Gdoo\Model\Form; use Gdoo\Index\Controllers\DefaultController; -use Exception; +use Illuminate\Support\Str; class MaterialController extends DefaultController { public $permission = ['detail', 'dialog', 'store', 'archive', 'download']; - // 促销核销列表 public function indexAction() { // 客户权限 @@ -104,7 +103,6 @@ class MaterialController extends DefaultController ]); } - // 促销核销明细 public function detailAction() { $search = search_form([ @@ -171,7 +169,6 @@ class MaterialController extends DefaultController ]); } - // 获取核销列表 public function dialogAction() { $user = auth()->user(); @@ -191,7 +188,6 @@ class MaterialController extends DefaultController return $this->json($rows, true); } - // 显示促销 public function showAction() { $id = Request::get('id'); @@ -221,7 +217,6 @@ class MaterialController extends DefaultController ]); } - // 促销核销审核 public function auditAction() { $id = (array)Request::get('id'); @@ -238,7 +233,6 @@ class MaterialController extends DefaultController return $this->json('操作成功。', true); } - // 促销核销审核 public function archiveAction() { $id = (array)Request::get('id'); @@ -264,7 +258,6 @@ class MaterialController extends DefaultController return $this->json('', true); } - // 促销核销审核 public function downloadAction() { $sn = Request::get('sn'); @@ -301,7 +294,7 @@ class MaterialController extends DefaultController // 文件后缀名 $extension = $image->getClientOriginalExtension(); // 文件新名字 - $filename = date('dhis_').str_random(4).'.'.$extension; + $filename = date('dhis_').Str::random(4).'.'.$extension; $filename = mb_strtolower($filename); if ($image->move($upload_path, $filename)) { @@ -329,7 +322,6 @@ class MaterialController extends DefaultController } } - // 删除核销 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Promotion/Controllers/PromotionController.php b/app/Gdoo/Promotion/Controllers/PromotionController.php index 3bf9535e..f9d26c8b 100644 --- a/app/Gdoo/Promotion/Controllers/PromotionController.php +++ b/app/Gdoo/Promotion/Controllers/PromotionController.php @@ -114,7 +114,6 @@ class PromotionController extends WorkflowController ]); } - // 新建促销 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -142,25 +141,21 @@ class PromotionController extends WorkflowController ], $tpl); } - // 编辑促销 public function editAction() { return $this->createAction(); } - // 审核促销 public function auditAction() { return $this->createAction('audit'); } - // 显示促销 public function showAction() { return $this->createAction('show'); } - // 显示促销 public function printAction() { $id = (int) Request::get('id'); @@ -300,14 +295,6 @@ class PromotionController extends WorkflowController $model->orderBy($query['sort'], $query['order']); } - /* - '17' as fee_src_type_id, - '6' as fee_category_id, - '赠品' as fee_category_id_name, - '2' as type_id, - '赠品' as type_id_name - */ - $rows = $model->get(); $rows->transform(function ($row) { // 赠品 @@ -377,7 +364,6 @@ class PromotionController extends WorkflowController return $this->json($count, true); } - // 核销对话框 public function dialogAction() { $search = search_form( @@ -513,7 +499,6 @@ class PromotionController extends WorkflowController ]); } - // 删除促销 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Promotion/Controllers/ReviewController.php b/app/Gdoo/Promotion/Controllers/ReviewController.php index c821e0a4..20496ae7 100644 --- a/app/Gdoo/Promotion/Controllers/ReviewController.php +++ b/app/Gdoo/Promotion/Controllers/ReviewController.php @@ -82,7 +82,6 @@ class ReviewController extends WorkflowController ]); } - // 新建促销 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -107,25 +106,21 @@ class ReviewController extends WorkflowController ], $tpl); } - // 编辑促销 public function editAction() { return $this->createAction(); } - // 审核促销 public function auditAction() { return $this->createAction('audit'); } - // 显示促销 public function showAction() { return $this->createAction('show'); } - // 显示促销 public function printAction() { $this->layout = 'layouts.print2'; @@ -164,7 +159,6 @@ class ReviewController extends WorkflowController return $this->render(['query' => $query]); } - // 删除促销 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Purchase/Controllers/OrderController.php b/app/Gdoo/Purchase/Controllers/OrderController.php index 0f54d89c..9c4c6113 100644 --- a/app/Gdoo/Purchase/Controllers/OrderController.php +++ b/app/Gdoo/Purchase/Controllers/OrderController.php @@ -69,7 +69,6 @@ class OrderController extends WorkflowController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -79,19 +78,16 @@ class OrderController extends WorkflowController ], 'create'); } - // 审核 public function auditAction() { return $this->createAction('edit'); } - // 创建 public function editAction() { return $this->createAction('edit'); } - // 创建 public function showAction() { return $this->createAction('show'); @@ -191,7 +187,6 @@ class OrderController extends WorkflowController ]); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Purchase/Controllers/SupplierController.php b/app/Gdoo/Purchase/Controllers/SupplierController.php index dbe1e8f2..ed10745d 100644 --- a/app/Gdoo/Purchase/Controllers/SupplierController.php +++ b/app/Gdoo/Purchase/Controllers/SupplierController.php @@ -70,7 +70,6 @@ class SupplierController extends DefaultController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -80,27 +79,21 @@ class SupplierController extends DefaultController ], 'create'); } - // 审核 public function auditAction() { return $this->createAction('edit'); } - // 创建 public function editAction() { return $this->createAction('edit'); } - // 创建 public function showAction() { return $this->createAction('show'); } - /** - * 弹出层信息 - */ public function dialogAction() { $search = search_form( @@ -138,7 +131,6 @@ class SupplierController extends DefaultController ]); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/Controllers/AllocationController.php b/app/Gdoo/Stock/Controllers/AllocationController.php index 05c786e7..d47a7c7a 100644 --- a/app/Gdoo/Stock/Controllers/AllocationController.php +++ b/app/Gdoo/Stock/Controllers/AllocationController.php @@ -18,7 +18,6 @@ class AllocationController extends WorkflowController { public $permission = ['dialog', 'logistics', 'stockSelect']; - // 列表 public function indexAction() { $header = Grid::header([ @@ -72,7 +71,6 @@ class AllocationController extends WorkflowController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -87,25 +85,21 @@ class AllocationController extends WorkflowController ], $tpl); } - // 编辑 public function editAction() { return $this->createAction(); } - // 审核 public function auditAction() { return $this->createAction('audit'); } - // 显示 public function showAction() { return $this->createAction('show'); } - // 打印 public function printAction() { $id = Request::get('id'); @@ -138,17 +132,10 @@ class AllocationController extends WorkflowController 'template' => DB::table('model_template')->where('id', $template_id)->first() ]; - if ($master['in_warehouse_code'] == 27 || $master['in_warehouse_code'] == 21) { - $warehouse_by = '李志全'; - } else { - $warehouse_by = '万海英'; - } - $tpl = $this->display([ 'master' => $master, 'rows' => $rows, 'form' => $form, - 'warehouse_by' => $warehouse_by, ], 'print/'.$template_id); return $tpl; } diff --git a/app/Gdoo/Stock/Controllers/CancelController.php b/app/Gdoo/Stock/Controllers/CancelController.php index 5e65ab8e..95062244 100644 --- a/app/Gdoo/Stock/Controllers/CancelController.php +++ b/app/Gdoo/Stock/Controllers/CancelController.php @@ -16,7 +16,6 @@ class CancelController extends WorkflowController { public $permission = ['dialog']; - // 列表 public function indexAction() { $header = Grid::header([ @@ -74,7 +73,6 @@ class CancelController extends WorkflowController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -89,25 +87,21 @@ class CancelController extends WorkflowController ], $tpl); } - // 编辑 public function editAction() { return $this->createAction(); } - // 审核 public function auditAction() { return $this->createAction('audit'); } - // 显示 public function showAction() { return $this->createAction('show'); } - // 打印 public function printAction() { $id = Request::get('id'); @@ -174,7 +168,6 @@ class CancelController extends WorkflowController ]); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/Controllers/CategoryController.php b/app/Gdoo/Stock/Controllers/CategoryController.php index 3453cab9..6faa3984 100644 --- a/app/Gdoo/Stock/Controllers/CategoryController.php +++ b/app/Gdoo/Stock/Controllers/CategoryController.php @@ -68,7 +68,6 @@ class CategoryController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -78,15 +77,11 @@ class CategoryController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - /** - * 弹出层信息 - */ public function dialogAction() { $header = Grid::header([ @@ -123,7 +118,6 @@ class CategoryController extends DefaultController ], 'dialog'); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/Controllers/DeliveryController.php b/app/Gdoo/Stock/Controllers/DeliveryController.php index b4869913..a96b041a 100644 --- a/app/Gdoo/Stock/Controllers/DeliveryController.php +++ b/app/Gdoo/Stock/Controllers/DeliveryController.php @@ -33,7 +33,6 @@ class DeliveryController extends WorkflowController 'autoSave' ]; - // 发货列表 public function indexAction() { $header = Grid::header([ @@ -115,7 +114,6 @@ class DeliveryController extends WorkflowController ]); } - // 明细列表 public function detailAction() { $header = Grid::header([ @@ -185,7 +183,6 @@ class DeliveryController extends WorkflowController ]); } - // 自动保存 public function autoSaveAction() { $gets = Request::all(); @@ -245,7 +242,6 @@ class DeliveryController extends WorkflowController return $this->createAction('audit'); } - // 新建 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -269,19 +265,16 @@ class DeliveryController extends WorkflowController ], $tpl); } - // 编辑 public function editAction() { return $this->createAction(); } - // 审核 public function auditAction() { return $this->createAction('audit'); } - // 显示 public function showAction() { return $this->createAction('show'); @@ -308,7 +301,6 @@ class DeliveryController extends WorkflowController ]); } - // 打印 public function printAction() { $id = Request::get('id'); @@ -430,7 +422,6 @@ class DeliveryController extends WorkflowController ], 'getBatchSelect'); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/Controllers/DirectController.php b/app/Gdoo/Stock/Controllers/DirectController.php index 48c58b3b..78da3a21 100644 --- a/app/Gdoo/Stock/Controllers/DirectController.php +++ b/app/Gdoo/Stock/Controllers/DirectController.php @@ -16,7 +16,6 @@ class DirectController extends WorkflowController { public $permission = ['dialog', 'importExcel']; - // 列表 public function indexAction() { $header = Grid::header([ @@ -69,7 +68,6 @@ class DirectController extends WorkflowController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -84,25 +82,21 @@ class DirectController extends WorkflowController ], $tpl); } - // 编辑 public function editAction() { return $this->createAction(); } - // 审核 public function auditAction() { return $this->createAction('audit'); } - // 显示 public function showAction() { return $this->createAction('show'); } - // 打印 public function printAction() { $id = Request::get('id'); @@ -236,7 +230,6 @@ class DirectController extends WorkflowController return view('importExcel'); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/Controllers/LocationController.php b/app/Gdoo/Stock/Controllers/LocationController.php index 5b7bdfd0..3d25c8a2 100644 --- a/app/Gdoo/Stock/Controllers/LocationController.php +++ b/app/Gdoo/Stock/Controllers/LocationController.php @@ -68,7 +68,6 @@ class LocationController extends DefaultController ]); } - // 新建客户联系人 public function createAction($action = 'edit') { $id = (int)Request::get('id'); @@ -78,15 +77,11 @@ class LocationController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - /** - * 弹出层信息 - */ public function dialogAction() { $header = Grid::header([ @@ -177,7 +172,6 @@ class LocationController extends DefaultController } } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/Controllers/Record01Controller.php b/app/Gdoo/Stock/Controllers/Record01Controller.php index 76f8967b..12339c00 100644 --- a/app/Gdoo/Stock/Controllers/Record01Controller.php +++ b/app/Gdoo/Stock/Controllers/Record01Controller.php @@ -16,7 +16,6 @@ class Record01Controller extends AuditController { public $permission = ['dialog']; - // 列表 public function indexAction() { $header = Grid::header([ @@ -70,7 +69,6 @@ class Record01Controller extends AuditController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -85,26 +83,22 @@ class Record01Controller extends AuditController ], $tpl); } - // 编辑 public function editAction() { return $this->createAction(); } - // 显示 public function showAction() { return $this->createAction('show'); } - // 打印 public function printAction() { $this->layout = 'layouts.print2'; print_prince($this->createAction('print')); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/Controllers/Record08Controller.php b/app/Gdoo/Stock/Controllers/Record08Controller.php index abd82703..c36c384d 100644 --- a/app/Gdoo/Stock/Controllers/Record08Controller.php +++ b/app/Gdoo/Stock/Controllers/Record08Controller.php @@ -16,7 +16,6 @@ class Record08Controller extends AuditController { public $permission = ['dialog', 'importExcel']; - // 列表 public function indexAction() { $header = Grid::header([ @@ -70,7 +69,6 @@ class Record08Controller extends AuditController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -85,19 +83,16 @@ class Record08Controller extends AuditController ], $tpl); } - // 编辑 public function editAction() { return $this->createAction(); } - // 显示 public function showAction() { return $this->createAction('show'); } - // 打印 public function printAction() { $this->layout = 'layouts.print2'; @@ -155,7 +150,6 @@ class Record08Controller extends AuditController return view('importExcel'); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/Controllers/Record09Controller.php b/app/Gdoo/Stock/Controllers/Record09Controller.php index aa8aae7b..3355d550 100644 --- a/app/Gdoo/Stock/Controllers/Record09Controller.php +++ b/app/Gdoo/Stock/Controllers/Record09Controller.php @@ -16,7 +16,6 @@ class Record09Controller extends WorkflowController { public $permission = ['dialog']; - // 列表 public function indexAction() { $header = Grid::header([ @@ -70,7 +69,6 @@ class Record09Controller extends WorkflowController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -85,25 +83,21 @@ class Record09Controller extends WorkflowController ], $tpl); } - // 编辑 public function editAction() { return $this->createAction(); } - // 审核 public function auditAction() { return $this->createAction(); } - // 显示 public function showAction() { return $this->createAction('show'); } - // 打印 public function printAction() { $id = Request::get('id'); @@ -146,7 +140,6 @@ class Record09Controller extends WorkflowController return $tpl; } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/Controllers/Record10Controller.php b/app/Gdoo/Stock/Controllers/Record10Controller.php index 13a29547..0bfe2a76 100644 --- a/app/Gdoo/Stock/Controllers/Record10Controller.php +++ b/app/Gdoo/Stock/Controllers/Record10Controller.php @@ -16,7 +16,6 @@ class Record10Controller extends WorkflowController { public $permission = ['dialog', 'print3']; - // 列表 public function indexAction() { $header = Grid::header([ @@ -43,15 +42,6 @@ class Record10Controller extends WorkflowController } $model->orderBy($header['sort'], $header['order']); - /* - // 外部库管登录 - if (auth()->id() == 2177) { - $model->whereIn('stock_record10.warehouse_id', [20001, 20047]); - } else { - $model->whereNotIn('stock_record10.warehouse_id', [20001, 20047]); - } - */ - foreach ($search['where'] as $where) { if ($where['active']) { $model->search($where); @@ -79,7 +69,6 @@ class Record10Controller extends WorkflowController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -95,25 +84,21 @@ class Record10Controller extends WorkflowController ], $tpl); } - // 编辑 public function editAction() { return $this->createAction(); } - // 审核 public function auditAction() { return $this->createAction('audit'); } - // 显示 public function showAction() { return $this->createAction('show'); } - // 打印 public function print2Action() { $this->layout = 'layouts.print2'; @@ -122,7 +107,6 @@ class Record10Controller extends WorkflowController print_prince($this->createAction('print')); } - // 显示促销 public function printAction() { $id = Request::get('id'); @@ -172,101 +156,6 @@ class Record10Controller extends WorkflowController } } - // 显示促销 - public function print3Action() - { - $this->layout = 'layouts.print2'; - $id = Request::get('id'); - $template_id = Request::get('template_id'); - if ($template_id == 117) { - - $this->layout = 'layouts.print2'; - - $master = DB::table('stock_record10 as m')->where('m.id', $id) - ->leftJoin('stock_type as st', 'st.id', '=', 'm.type_id') - ->leftJoin('department', 'department.id', '=', 'm.department_id') - ->leftJoin('warehouse', 'warehouse.id', '=', 'm.warehouse_id') - ->selectRaw('m.*, st.name as type_name, warehouse.name as warehouse_name, department.name as department_name') - ->first(); - - $rows = DB::table('stock_record10_data as d') - ->leftJoin('stock_record10 as m', 'm.id', '=', 'd.record10_id') - ->leftJoin('product as p', 'p.id', '=', 'd.product_id') - ->leftJoin('product_unit as pu', 'pu.id', '=', 'p.unit_id') - ->leftJoin('stock_type as st', 'st.id', '=', 'm.type_id') - ->where('m.id', $id) - ->selectRaw(' - d.*, - p.name as product_name, - p.code as product_code, - p.spec as product_spec, - st.name as type_name, - pu.name as product_unit - ') - ->get(); - - $form = [ - 'template' => DB::table('model_template')->where('id', $template_id)->first() - ]; - - $template = "report.fr3"; - $ver = 3.0; - - $id = (int) Request::get('id'); - $header['action'] = 'print'; - $header['code'] = 'stock_record10'; - $header['id'] = $id; - $form = Form::make($header); - - $Tables = []; - foreach($form['prints'] as $print) { - $fields = []; - foreach($print['fields'] as $field) { - $type = 'str'; - $size = 255; - if ($field['type'] == 'INT' || $field['type'] == 'TINYINT') { - $type = 'int'; - $size = 0; - } - if ($field['type'] == 'DATE') { - $type = 'str'; - } - if ($field['type'] == 'DECIMAL') { - $type = 'float'; - $size = 0; - } - $fields[] = ["type" => $type, "size" => $size, "name" => $field['field'], "required" => false]; - } - $Tables[] = [ - 'Name' => $print['name'], - 'Cols' => $fields, - 'Data' => $print['data'], - ]; - } - $jsonObject = [ - "template" => $template, - "ver" => $ver, - "Tables" => $Tables, - ]; - - $jsonStr = json_encode($jsonObject); - - - $tpl = $this->display([ - 'master' => $master, - 'jsonStr' => $jsonStr, - 'rows' => $rows, - 'form' => $form, - ], 'print3/'.$template_id); - return $tpl; - - } else { - $tpl = $this->createAction('print'); - print_prince($tpl); - } - } - - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/Controllers/Record11Controller.php b/app/Gdoo/Stock/Controllers/Record11Controller.php index 3dd2e5ad..d094550c 100644 --- a/app/Gdoo/Stock/Controllers/Record11Controller.php +++ b/app/Gdoo/Stock/Controllers/Record11Controller.php @@ -16,7 +16,6 @@ class Record11Controller extends AuditController { public $permission = ['dialog']; - // 列表 public function indexAction() { $header = Grid::header([ @@ -69,7 +68,6 @@ class Record11Controller extends AuditController ]); } - // 新建 public function createAction($action = 'edit') { $id = (int) Request::get('id'); @@ -84,19 +82,16 @@ class Record11Controller extends AuditController ], $tpl); } - // 编辑 public function editAction() { return $this->createAction(); } - // 显示 public function showAction() { return $this->createAction('show'); } - // 打印 public function printAction() { $id = Request::get('id'); @@ -147,7 +142,6 @@ class Record11Controller extends AuditController } } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/Controllers/ReportController.php b/app/Gdoo/Stock/Controllers/ReportController.php index 94a96b82..9aa1d04f 100644 --- a/app/Gdoo/Stock/Controllers/ReportController.php +++ b/app/Gdoo/Stock/Controllers/ReportController.php @@ -99,18 +99,6 @@ class ReportController extends DefaultController } $rows = []; if ($query['filter'] == 1) { - /* - $rows = DB::select('EXEC P_ReportOrderStockTotal ?,?,?,?,?,?,?,?', [ - $fields['warehouse_id'], - $fields['product_code'], - $fields['type'], - $fields['date'][0], - $fields['date'][1], - auth()->id(), - $fields['batch'], - $fields['bmj'], - ]); - */ $rows = StockService::reportOrderStockTotal( $fields['warehouse_id'], $fields['product_code'], diff --git a/app/Gdoo/Stock/Controllers/TypeController.php b/app/Gdoo/Stock/Controllers/TypeController.php index e582cc8f..33924322 100644 --- a/app/Gdoo/Stock/Controllers/TypeController.php +++ b/app/Gdoo/Stock/Controllers/TypeController.php @@ -68,7 +68,6 @@ class TypeController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -78,15 +77,11 @@ class TypeController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - /** - * 弹出层信息 - */ public function dialogAction() { $header = Grid::header([ @@ -123,7 +118,6 @@ class TypeController extends DefaultController ], 'dialog'); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/Controllers/WarehouseController.php b/app/Gdoo/Stock/Controllers/WarehouseController.php index 7f008fd2..237ef253 100644 --- a/app/Gdoo/Stock/Controllers/WarehouseController.php +++ b/app/Gdoo/Stock/Controllers/WarehouseController.php @@ -68,7 +68,6 @@ class WarehouseController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -78,15 +77,11 @@ class WarehouseController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - /** - * 弹出层信息 - */ public function dialogAction() { $header = Grid::header([ @@ -166,7 +161,6 @@ class WarehouseController extends DefaultController ]); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Stock/views/allocation/print/118.blade.php b/app/Gdoo/Stock/views/allocation/print/118.blade.php index 29947821..389f94d3 100644 --- a/app/Gdoo/Stock/views/allocation/print/118.blade.php +++ b/app/Gdoo/Stock/views/allocation/print/118.blade.php @@ -59,7 +59,7 @@ - +
制单人：{{$master['created_by']}}库管员：{{$warehouse_by}}库管员： 第##页，##页
diff --git a/app/Gdoo/Stock/views/record10/print3/117.blade.php b/app/Gdoo/Stock/views/record10/print3/117.blade.php deleted file mode 100644 index 19d07a1f..00000000 --- a/app/Gdoo/Stock/views/record10/print3/117.blade.php +++ /dev/null @@ -1,45 +0,0 @@ - -
-

康虎云报表系统报表打印测试（Ver 1.2.2）

-

（PHP版演示）

-
- 点按下面的“打印”按钮开始打印
- -
-
-
- 说明：
- 通过修改本页源码中的下列参数控制本页的行为：
-<script language="javascript" type="text/javascript">
-/**下面四个参数必须放在myreport.js脚本后面，以覆盖myreport.js中的默认值**/
-var _delay_send = 1000;         //发送打印服务器前延时时长
-var _delay_close = 1000;         //打印完成后关闭窗口的延时时长, -1则表示不关闭
-var cfprint_addr = "127.0.0.1";         //打印服务器监听地址
-var cfprint_port = 54321;         //打印服务器监听端口
-</script> - -
- -
- - - - - - - - - \ No newline at end of file diff --git a/app/Gdoo/System/Controllers/LogController.php b/app/Gdoo/System/Controllers/LogController.php index ac172d5f..377233ae 100644 --- a/app/Gdoo/System/Controllers/LogController.php +++ b/app/Gdoo/System/Controllers/LogController.php @@ -187,9 +187,6 @@ class LogController extends DefaultController ]); } - /** - * 删除 - */ public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/System/Controllers/MailController.php b/app/Gdoo/System/Controllers/MailController.php index 89eb830d..6d32e63c 100644 --- a/app/Gdoo/System/Controllers/MailController.php +++ b/app/Gdoo/System/Controllers/MailController.php @@ -180,13 +180,11 @@ class MailController extends DefaultController ]); } - // 新建邮箱帐号 public function createAction() { return $this->editAction(); } - // 编辑邮箱帐号 public function editAction() { $id = (int)Request::get('id'); @@ -196,9 +194,6 @@ class MailController extends DefaultController ], 'edit'); } - /** - * 保存 - */ public function storeAction() { if (Request::method() == 'POST') { @@ -224,9 +219,6 @@ class MailController extends DefaultController } } - /** - * 删除 - */ public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/System/Controllers/MediaController.php b/app/Gdoo/System/Controllers/MediaController.php index 000264a6..8ad4a224 100644 --- a/app/Gdoo/System/Controllers/MediaController.php +++ b/app/Gdoo/System/Controllers/MediaController.php @@ -8,6 +8,7 @@ use DB; use Gdoo\System\Models\Media; use Gdoo\Index\Controllers\DefaultController; +use Illuminate\Support\Str; class MediaController extends DefaultController { @@ -29,9 +30,6 @@ class MediaController extends DefaultController ], 'qrcode'); } - /** - * 新建文件 - */ public function createAction() { $folderId = Request::get('folder_id'); @@ -50,7 +48,7 @@ class MediaController extends DefaultController $extension = $file->getClientOriginalExtension(); // 文件新名字 - $filename = date('dhis_').str_random(4).'.'.$extension; + $filename = date('dhis_').Str::random(4).'.'.$extension; $filename = mb_strtolower($filename); $fileTypes = ['image/png', 'image/jpg', 'image/jpeg']; @@ -84,9 +82,6 @@ class MediaController extends DefaultController return $this->json('文件上传失败'); } - /** - * 文件对话框 - */ public function dialogAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/System/Controllers/MenuController.php b/app/Gdoo/System/Controllers/MenuController.php index 5e15f299..95bb137e 100644 --- a/app/Gdoo/System/Controllers/MenuController.php +++ b/app/Gdoo/System/Controllers/MenuController.php @@ -12,7 +12,6 @@ use Gdoo\Index\Controllers\DefaultController; class MenuController extends DefaultController { - // 菜单列表 public function indexAction() { $header = [ @@ -163,73 +162,11 @@ class MenuController extends DefaultController $header['search_form'] = $search; $header['js'] = Grid::js($header); - // 配置权限 return $this->display([ 'header' => $header, ]); - /* - if (Request::method() == 'POST') { - $sorts = Request::get('sort'); - foreach ($sorts as $id => $sort) { - DB::table('menu')->where('id', $id)->update(['sort' => $sort]); - } - tree_rebuild('menu'); - return $this->success('index', '恭喜你，操作成功。'); - } - - $search = search_form([ - 'referer' => 1, - ], []); - - $rows = DB::table('menu') - ->orderBy('lft', 'asc') - ->get(); - */ - - /* - $rows = DB::table('dict')->get(); - - foreach ($rows as $key => $row) { - - $values = json_decode($row['value'], true); - - //$data['parent_id'] = $row['id']; - - $id = DB::table('option')->insertGetId([ - 'parent_id' => 0, - 'name' => $row['name'], - 'value' => $row['key'], - ]); - - $data = []; - - $data['parent_id'] = $id; - - if($values) { - - foreach ($values as $k => $v) { - - $data['sort'] = $k; - $data['value'] = ''.$v['id'].''; - $data['name'] = ''.$v['name'].''; - DB::table('option')->insert($data); - } - } - } - - print_r($rows); - exit; - */ - - //$rows = array_nest($rows); - /* - return $this->display([ - 'rows' => $rows, - ]); - */ } - // 新建菜单 public function createAction() { $id = (int)Request::get('id'); @@ -271,7 +208,6 @@ class MenuController extends DefaultController return $this->editAction(); } - // 删除菜单 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/System/Controllers/OptionController.php b/app/Gdoo/System/Controllers/OptionController.php index d16b9c79..a0c11ece 100644 --- a/app/Gdoo/System/Controllers/OptionController.php +++ b/app/Gdoo/System/Controllers/OptionController.php @@ -14,7 +14,6 @@ class OptionController extends DefaultController { public $permission = ['category']; - // 枚举列表 public function indexAction() { $header = [ @@ -153,7 +152,6 @@ class OptionController extends DefaultController $header['search_form'] = $search; $header['js'] = Grid::js($header); - // 配置权限 return $this->display([ 'header' => $header, ]); @@ -164,7 +162,6 @@ class OptionController extends DefaultController return $this->createAction(); } - // 新建字典 public function createAction() { $id = (int)Request::get('id'); @@ -178,9 +175,6 @@ class OptionController extends DefaultController ], 'edit'); } - /** - * 保存 - */ public function storeAction() { if (Request::method() == 'POST') { @@ -212,7 +206,6 @@ class OptionController extends DefaultController } } - // 删除字典 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/System/Controllers/RegionController.php b/app/Gdoo/System/Controllers/RegionController.php index e68aea6a..8c133597 100644 --- a/app/Gdoo/System/Controllers/RegionController.php +++ b/app/Gdoo/System/Controllers/RegionController.php @@ -72,7 +72,6 @@ class RegionController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -82,7 +81,6 @@ class RegionController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); @@ -129,7 +127,6 @@ class RegionController extends DefaultController } } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/System/Controllers/SettingController.php b/app/Gdoo/System/Controllers/SettingController.php index 99a6dd08..99030032 100644 --- a/app/Gdoo/System/Controllers/SettingController.php +++ b/app/Gdoo/System/Controllers/SettingController.php @@ -153,7 +153,6 @@ class SettingController extends DefaultController $header['search_form'] = $search; $header['js'] = Grid::js($header); - // 配置权限 return $this->display([ 'header' => $header, ]); @@ -161,13 +160,11 @@ class SettingController extends DefaultController return $this->display(); } - // 新建邮箱帐号 public function createAction() { return $this->editAction(); } - // 编辑邮箱帐号 public function editAction() { $id = (int)Request::get('id'); @@ -258,9 +255,6 @@ class SettingController extends DefaultController } } - /** - * 删除 - */ public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/System/Controllers/SmsController.php b/app/Gdoo/System/Controllers/SmsController.php index eacc3f8e..fb047328 100644 --- a/app/Gdoo/System/Controllers/SmsController.php +++ b/app/Gdoo/System/Controllers/SmsController.php @@ -164,7 +164,6 @@ class SmsController extends DefaultController $header['search_form'] = $search; $header['js'] = Grid::js($header); - // 配置权限 return $this->display([ 'header' => $header, ]); @@ -194,13 +193,11 @@ class SmsController extends DefaultController } } - // 新建短信帐号 public function createAction() { return $this->editAction(); } - // 编辑短信帐号 public function editAction() { $id = (int)Request::get('id'); @@ -210,9 +207,6 @@ class SmsController extends DefaultController ], 'edit'); } - /** - * 删除 - */ public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/System/Controllers/SmsLogController.php b/app/Gdoo/System/Controllers/SmsLogController.php index 3cae3ee0..b1278a22 100644 --- a/app/Gdoo/System/Controllers/SmsLogController.php +++ b/app/Gdoo/System/Controllers/SmsLogController.php @@ -13,7 +13,7 @@ class SmsLogController extends DefaultController public $permission = []; /** - * 短信设置 + * 短信记录 */ public function indexAction() { @@ -147,9 +147,6 @@ class SmsLogController extends DefaultController ]); } - /** - * 删除 - */ public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/System/Controllers/WidgetController.php b/app/Gdoo/System/Controllers/WidgetController.php index c31c5605..c0e75a8a 100644 --- a/app/Gdoo/System/Controllers/WidgetController.php +++ b/app/Gdoo/System/Controllers/WidgetController.php @@ -231,7 +231,6 @@ class WidgetController extends DefaultController ]); } - // 新建部件 public function createAction() { $id = (int)Request::get('id'); @@ -260,7 +259,6 @@ class WidgetController extends DefaultController ], 'create'); } - // 编辑部件 public function editAction() { return $this->createAction(); @@ -271,9 +269,6 @@ class WidgetController extends DefaultController return $this->editAction(); } - /** - * 删除部件 - */ public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/User/Controllers/GroupController.php b/app/Gdoo/User/Controllers/GroupController.php index 18f0be9e..c537125c 100644 --- a/app/Gdoo/User/Controllers/GroupController.php +++ b/app/Gdoo/User/Controllers/GroupController.php @@ -68,7 +68,6 @@ class GroupController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -78,13 +77,11 @@ class GroupController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/User/Controllers/MessageController.php b/app/Gdoo/User/Controllers/MessageController.php index 26108673..47e3db14 100644 --- a/app/Gdoo/User/Controllers/MessageController.php +++ b/app/Gdoo/User/Controllers/MessageController.php @@ -143,7 +143,7 @@ class MessageController extends Controller } /** - * 提醒设置 + * 未读提醒 */ public function countAction() { @@ -154,9 +154,6 @@ class MessageController extends Controller return response()->json($count); } - /** - * 删除提醒 - */ public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/User/Controllers/PositionController.php b/app/Gdoo/User/Controllers/PositionController.php index 44d510b4..723a72cf 100644 --- a/app/Gdoo/User/Controllers/PositionController.php +++ b/app/Gdoo/User/Controllers/PositionController.php @@ -69,7 +69,6 @@ class PositionController extends DefaultController ]); } - // 新建客户联系人 public function createAction() { $id = (int)Request::get('id'); @@ -79,27 +78,11 @@ class PositionController extends DefaultController ], 'create'); } - // 创建客户联系人 public function editAction() { return $this->createAction(); } - // 显示客户联系人 - public function showAction() - { - $id = (int)Request::get('id'); - $position = UserPosition::find($id); - $options = [ - 'table' => 'user_position', - 'row' => $position, - ]; - $tpl = Form::show($options); - return $this->display([ - 'tpl' => $tpl, - ]); - } - public function dialogAction() { $search = search_form([], [ @@ -122,7 +105,6 @@ class PositionController extends DefaultController ]); } - // 删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/User/Controllers/ProfileController.php b/app/Gdoo/User/Controllers/ProfileController.php index d1ae7344..c6a6f24f 100644 --- a/app/Gdoo/User/Controllers/ProfileController.php +++ b/app/Gdoo/User/Controllers/ProfileController.php @@ -56,7 +56,6 @@ class ProfileController extends DefaultController /** * 获取用户信息 - * */ public function getUserAction() { @@ -67,7 +66,6 @@ class ProfileController extends DefaultController /** * 更新安全密钥 - * */ public function secretAction() { @@ -81,7 +79,7 @@ class ProfileController extends DefaultController } } - /* 修改密码 */ + // 修改密码 public function passwordAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/User/Controllers/RegionController.php b/app/Gdoo/User/Controllers/RegionController.php index a472d604..2ceec418 100644 --- a/app/Gdoo/User/Controllers/RegionController.php +++ b/app/Gdoo/User/Controllers/RegionController.php @@ -37,6 +37,5 @@ class RegionController extends DefaultController } } echo join("\n", $data); - exit; } } diff --git a/app/Gdoo/User/Controllers/RoleController.php b/app/Gdoo/User/Controllers/RoleController.php index 47e99a31..79ac45b5 100644 --- a/app/Gdoo/User/Controllers/RoleController.php +++ b/app/Gdoo/User/Controllers/RoleController.php @@ -248,7 +248,6 @@ class RoleController extends DefaultController ]); } - // 删除角色 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/User/Controllers/TokenController.php b/app/Gdoo/User/Controllers/TokenController.php index d0dcaa41..458d905e 100644 --- a/app/Gdoo/User/Controllers/TokenController.php +++ b/app/Gdoo/User/Controllers/TokenController.php @@ -75,9 +75,9 @@ class TokenController extends Controller $assets = UserAssetService::getRoleAssets($user->role_id); return response()->json([ - 'token' => $this->createToken($user->id), - 'access' => $assets, - 'user' => $user, + 'user' => $user, + 'token' => $this->createToken($user->id), + 'access' => $assets, 'success' => 1, ]); } diff --git a/app/Gdoo/User/Controllers/UserController.php b/app/Gdoo/User/Controllers/UserController.php index f94de64e..0af86244 100644 --- a/app/Gdoo/User/Controllers/UserController.php +++ b/app/Gdoo/User/Controllers/UserController.php @@ -99,7 +99,6 @@ class UserController extends DefaultController ]); } - // 显示用户 public function showAction() { $id = (int)Request::get('id'); @@ -113,7 +112,6 @@ class UserController extends DefaultController ], 'create'); } - // 新建用户 public function createAction() { $id = (int)Request::get('id'); @@ -123,7 +121,6 @@ class UserController extends DefaultController ], 'create'); } - // 编辑用户 public function editAction() { return $this->createAction(); @@ -191,7 +188,6 @@ class UserController extends DefaultController return $this->render(['tips' => $tips], 'layouts.import'); } - // 账户删除 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Wechat/Controllers/EchoController.php b/app/Gdoo/Wechat/Controllers/EchoController.php index 2eb08262..6bfe06d4 100644 --- a/app/Gdoo/Wechat/Controllers/EchoController.php +++ b/app/Gdoo/Wechat/Controllers/EchoController.php @@ -37,42 +37,6 @@ class EchoController extends Controller $config = WechatService::getConfig(); $this->openid = $msg['FromUserName']; - // $fc = new \GdooWord('igb', database_path().'/dict.igb'); - // $arr = $fc->getAutoWord($msg['Content']); - // Log::info('anc', $arr); - /* - $items = [ - new NewsItem([ - 'title' => '某某某公司发货提醒', - 'description' => "单据编号：123456\n发货时间：2020-01-12", - 'url' => "http://israel.sinaapp.com/cet/index.php?openid=".$this->openid, - 'image' => '', - ]), - ]; - */ - - /* - $items = [ - new NewsItem([ - 'title' => '流程[办公用品采购]审核提醒', - 'description' => "转交人：李先生\n时间：2020-01-12", - 'url' => "http://shenghua.test/index.php?openid=".$this->openid, - 'image' => '', - ]), - ]; - - $news = new News($items); - return $news; - - $msg = new Text("订单发货最新三条\n1.单据编号：123456，发货时间：2020-01-12，件数：123，金额：100\n2.单据编号：123456，发货时间：2020-01-12，件数：123，金额：100\n2.单据编号：123456，发货时间：2020-01-12，件数：123，金额：100"); - $msg = new Text("促销最新三条\n1.单据编号：123456，发货时间：2020-01-12，件数：123，金额：100\n2.单据编号：123456，发货时间：2020-01-12，件数：123，金额：100\n2.单据编号：123456，发货时间：2020-01-12，件数：123，金额：100"); - $msg = new Text("进店最新三条\n1.单据编号：123456，发货时间：2020-01-12，件数：123，金额：100\n2.单据编号：123456，发货时间：2020-01-12，件数：123，金额：100\n2.单据编号：123456，发货时间：2020-01-12，件数：123，金额：100"); - - return $msg; - */ - //print_R($arr); - //exit; - if ($config['status'] == 0) { return '服务关闭中，请稍后再试。'; } @@ -82,11 +46,10 @@ class EchoController extends Controller return $msg['Content']; break; case 'image': - //$this->special('image', $msg); + return $msg['Content']; break; case 'voice': return $msg['Content']; - //$this->special('voice', $msg); break; case 'video': return '收到视频消息'; @@ -211,22 +174,15 @@ class EchoController extends Controller } } - public function replyNews($msg) { - $temple = DB::table('house_temple')->where('ticket', $msg['Ticket'])->first(); + public function replyArticle($msg) { $this->we->reply([ 'type' => 'news', - 'articles' => [[ - 'title' => $temple['name'], - 'description' => $temple['remark'], - 'picurl' => url('uploads/'.$temple['image']), - 'url' => url('wap/index/info', ['id' => $temple['id']]), - ],[ - 'title' => '立即供灯', - 'description' => '立即供灯', - 'picurl' => '', - 'url' => url('wap/light/index', ['temple_id' => $temple['id']]), - ] - ] + 'articles' => [[ + 'title' => '关注', + 'description' => '关注', + 'picurl' => '', + 'url' => '', + ]] ]); } @@ -237,7 +193,7 @@ class EchoController extends Controller { // 有场景参数 if (isset($msg['Ticket'])) { - $this->replyNews($msg); + $this->replyArticle($msg); } } diff --git a/app/Gdoo/Workflow/Controllers/CategoryController.php b/app/Gdoo/Workflow/Controllers/CategoryController.php index 68a19748..78081942 100644 --- a/app/Gdoo/Workflow/Controllers/CategoryController.php +++ b/app/Gdoo/Workflow/Controllers/CategoryController.php @@ -12,7 +12,6 @@ use Gdoo\Model\Models\Bill; class CategoryController extends DefaultController { - // 流程类别 public function indexAction() { $header = [ @@ -188,7 +187,6 @@ class CategoryController extends DefaultController return $this->editAction(); } - // 删除流程类别 public function deleteAction() { if (Request::method() == 'POST') { diff --git a/app/Gdoo/Workflow/Controllers/DesignController.php b/app/Gdoo/Workflow/Controllers/DesignController.php deleted file mode 100644 index 1dd021f7..00000000 --- a/app/Gdoo/Workflow/Controllers/DesignController.php +++ /dev/null @@ -1,88 +0,0 @@ - 1 - ], [ - ['text','work.title','流程名称'], - ['text','work.id','流程编号'], - ['category','work.category_id','流程类别'], - ]); - $query = $search['query']; - - $model = Workflow::query(); - - foreach ($search['where'] as $where) { - if ($where['active']) { - $model->search($where); - } - } - - $rows = $model->paginate()->appends($query); - - $counts = DB::table('work_process') - ->selectRaw('work_id,count(id) as count') - ->groupBy('work_id') - ->pluck('count', 'work_id'); - - $categorys = WorkflowCategory::get()->keyBy('id'); - return $this->display(array( - 'rows' => $rows, - 'counts' => $counts, - 'categorys' => $categorys, - 'search' => $search, - )); - } - - public function addAction() - { - $gets = Request::all(); - $model = Workflow::findOrNew($gets['id']); - - if (Request::method() == 'POST') { - if (empty($gets['title'])) { - return $this->error('流程名称必须填写。'); - } - $model->fill($gets)->save(); - return $this->success('index', '工作流程保存成功。'); - } - - $row = Workflow::find($gets['id']); - $category = WorkflowCategory::get(); - - return $this->display(array( - 'row' => $row, - 'category' => $category, - )); - } - - public function processAction() - { - $this->view->set(array( - 'row' => $row, - )); - return $this->display(); - } - - // 删除流程 - public function deleteAction() - { - $id = Request::get('id', 0); - if ($id > 0) { - // 此处应该删除所有的有关的文件 - Workflow::where('id', $id)->delete(); - return $this->success('index', '工作流删除成功。'); - } - } -} diff --git a/app/Gdoo/Workflow/Controllers/FormController.php b/app/Gdoo/Workflow/Controllers/FormController.php deleted file mode 100644 index d049a25c..00000000 --- a/app/Gdoo/Workflow/Controllers/FormController.php +++ /dev/null @@ -1,90 +0,0 @@ -post()) { - unset($post['count_item']); - - $work_id = $post['work_id']; - - unset($post['work_id']); - - $post['template'] = $_POST['template']; - DB::table('work')->where('id', $work_id)->update($post); - Workflow::cacheForm($work_id); - return $this->json('流程节点添加成功', true); - } - - $workId = Request::get('work_id'); - $row = DB::table('work')->where('id', $workId)->first(); - - return $this->display([ - 'row' => $row, - ]); - } - - // 查看步骤信息 - public function viewAction() - { - $review = Request::get('review'); - $workId = Request::get('id'); - - $work = DB::table('work as w') - ->LeftJoin('work_step as s', 'w.id', '=', 's.work_id') - ->where('s.number', 1) - ->where('w.id', $workId) - ->first(['w.template_short','w.title as work_title','w.id','s.work_id','w.type as work_type','s.field as field_write','s.field_check','s.field_secret','s.field_auto']); - - $work['opflag'] = 1; - // $work['printflag'] = 1; - $work['step_id'] = $stepId; - $work['id'] = $work['work_id']; - - $workFlow = array( - 'workId' => (int)$work['work_id'], - 'stepNumber' => 1, - 'stepId' => $work['step_id'], - 'workType' => $work['work_type'] - ); - - $form = Workflow::parseForm($work['template_short'], $work); - - $work['js'] = json_encode($workFlow); - - $views = [ - 'work' => $work, - 'template' => $form['template'], - 'jsonload' => $form['jsonload'], - 'js' => $form['js'], - ]; - - if ($review == true) { - return $this->render($views, 'review'); - } else { - return $this->display($views, 'view'); - } - } - - // 表单计数 - public function countAction() - { - $workId = Request::get('work_id'); - if ($workId > 0) { - DB::table('work')->where('id', $workId)->increment('count'); - $row = DB::table('work')->where('id', $workId)->first(); - return $row['count']; - } - } -} diff --git a/app/Gdoo/Workflow/Controllers/MonitorController.php b/app/Gdoo/Workflow/Controllers/MonitorController.php deleted file mode 100644 index f53e6b11..00000000 --- a/app/Gdoo/Workflow/Controllers/MonitorController.php +++ /dev/null @@ -1,81 +0,0 @@ -LeftJoin('work', 'work.id', '=', 'work_process.work_id') - ->LeftJoin('user', 'user.id', '=', 'work_process_data.user_id') - ->where('work_process.end_time', 0) - ->where('work_process.state', 1) - ->where('work_process_data.flag', 1) - ->where('work.state', 1) - ->where('user.status', 1); - - foreach ($search['where'] as $where) { - if ($where['active']) { - $model->search($where); - } - } - - $rows = $model->get(['user.name', 'work_process_data.*']); - - $items = []; - foreach ($rows as $row) { - $user_id = $row['user_id']; - - $time = time() - $row['add_time']; - - // 大于三十天 - if ($time > 2592000) { - $items[$user_id]['c'] ++; - - // 大于三天 - } elseif ($time > 259200) { - $items[$user_id]['b'] ++; - - // 大于一天 - } elseif ($time > 86400) { - $items[$user_id]['a'] ++; - } - - $items[$user_id]['total'] ++; - - $items[$user_id]['name'] = $row->user->name ? $row->user->name : $user_id; - $items[$user_id]['user_id'] = $user_id; - } - - $rows = []; - foreach ($items as $user_id => $item) { - $rows[] = $item; - } - - return $this->display([ - 'rows' => $rows, - 'search' => $search, - ]); - } -} diff --git a/app/Gdoo/Workflow/Controllers/StepController.php b/app/Gdoo/Workflow/Controllers/StepController.php deleted file mode 100644 index cb9f079e..00000000 --- a/app/Gdoo/Workflow/Controllers/StepController.php +++ /dev/null @@ -1,337 +0,0 @@ -where('work_id', $work_id) - ->orderBy('id', 'asc') - ->get(); - - $data['total'] = sizeof($rows); - $data['rows'] = $rows; - exit(json_encode($data)); - } - $work = DB::table('work')->where('id', $work_id)->first(); - - return $this->display([ - 'work_id' => $work_id, - 'work' => $work, - ]); - } - - // 添加步骤和克隆步骤 - public function addAction() - { - if (Request::method() == 'POST') { - $gets = Request::all(); - // 是克隆步骤 - if ($gets['id'] > 0) { - $step = DB::table('work_step')->where('id', $gets['id'])->first(); - unset($step['id'], $step['join']); - } - - $count = DB::table('work_step')->where('work_id', $gets['work_id'])->count(); - $step['work_id'] = $gets['work_id']; - $step['number'] = $count + 1; - $step['title'] = '新建步骤'.$step['number']; - DB::table('work_step')->insert($step); - return $this->json('流程节点添加成功', true); - } - } - - // 步骤条件设置 - public function editAction() - { - if (Request::method() == 'POST') { - $post = Request::all(); - - // 验证字段组合 - if ($post['check']) { - $field_check = array(); - $post['check'] = array_filter($post['check']); - foreach ($post['check'] as $k => $v) { - $field_check[] = $v.'='.$post['check_select'][$k]; - } - $post['field_check'] = join(',', $field_check); - } - - // 组合自动选人规则 - if ($post['select_user_type'] > 0) { - $select_keys = array( - 7 => 'select_field_user', - 8 => 'select_process_user' - ); - - $select_key = $select_keys[$post['select_user_type']]; - if ($select_key) { - $post['select_user_sign'] = $post[$select_key]; - } - } - - // checkbox 选项处理 - $post['last'] = empty($post['last']) ? 0 : 1; - $post['deny'] = empty($post['deny']) ? 0 : 1; - $post['print'] = empty($post['print']) ? 0 : 1; - - // 通知人类型 - $post['notification_type'] = empty($post['notification_type']) ? '' : json_encode($post['notification_type']); - - $post['notification_text'] = array_filter($post['notification_text']); - $post['notification_text'] = empty($post['notification_text']) ? '' : json_encode($post['notification_text']); - - // 写字段 - $post['field'] = join(',', (array)$post['write']); - // 保密字段 - $post['field_secret'] = join(',', (array)$post['secret']); - // 宏字段 - $post['field_auto'] = join(',', (array)$post['micro']); - - // 条件转入组合 - if (is_array($post['conditions'])) { - foreach ($post['conditions'] as $step_id => $condition) { - // 检查条件是否是空的 - $data['condition'] = $condition == 'empty' ? '' : join("\n", (array)$condition); - DB::table('work_step')->where('id', $step_id)->update($data); - } - } - - unset( - $post['select_process_user'], - $post['select_field_user'], - $post['check_select'], - $post['conditions'], - $post['check'], - $post['write'], - $post['secret'], - $post['micro'] - ); - - DB::table('work_step')->where('id', $post['id'])->update($post); - - return $this->json('流程节点设置保存成功', true); - } - - $id = (int)Request::get('id'); - $tabs['selected'] = Request::get('tab'); - - // 子表步骤 - $row = DB::table('work_step')->where('id', $id)->first(); - $row['joinArray'] = explode(',', $row['join']); - - // 当前工作全部步骤节点 - $rows = DB::table('work_step')->where('work_id', $row['work_id'])->get(); - $rows = array_by($rows); - - // 取得工作流主表信息 - $fields = Workflow::getFormData($row['work_id']); - $_fields = []; - foreach ($fields as $key => $value) { - if ($value['class'] == 'listview') { - $titles = explode('`', $value['lv_title']); - foreach ($titles as $index => $title) { - if ($title) { - $_value = $value; - $_value['itemid'] = $_value['itemid'].'_'.$index; - $_value['title'] = $value['title'].'['.$title.']'; - $_value['desc'] = $this->getFieldDescription($_value); - $_fields[$key.'_'.$index] = $_value; - } - } - } else { - $value['desc'] = $this->getFieldDescription($value); - $_fields[$key] = $value; - } - } - $fields = $_fields; - - $field_write = explode(",", $row['field']); - $field_secret = explode(",", $row['field_secret']); - $field_check = explode(",", $row['field_check']); - $field_auto = explode(",", $row['field_auto']); - $field_select = array(); - if ($row['field_check']) { - $checkarr = $checkarr2 = $check = array(); - foreach ($field_check as $k => $v) { - if ($v) { - $part = explode("=", $v); - $checkarr[] = $part[0]; - $checkarr2[] = $part[1]; - } - } - } - - // 取得字段名称的id号 - foreach ($fields as $k => $v) { - if (in_array($v['title'], $field_write)) { - $field_select['write'][] = $v['itemid']; - } - if (in_array($v['title'], $field_auto)) { - $field_select['auto'][] = $v['itemid']; - } - if (is_array($checkarr) && in_array($v['title'], $checkarr)) { - $field_select['check'][$v['itemid']] = array_shift($checkarr2); - } - if (in_array($v['title'], $field_secret)) { - $field_select['secret'][] = $v['itemid']; - } - if ($v['class'] != "sign") { - $item_name_all[] = $v['title']; - } - - } - if (strstr($row['field'], "[attach@]")) { - $field_select['write'][] = "attach"; - } - $field_select['write'] = join(',', (array)$field_select['write']); - $field_select['auto'] = join(',', (array)$field_select['auto']); - $field_select['secret'] = join(',', (array)$field_select['secret']); - if (is_array($field_select['check'])) { - $field_select['check'] = json_encode($field_select['check']); - } - - $row['notification_type'] = json_decode($row['notification_type'], true); - $row['notification_text'] = json_decode($row['notification_text'], true); - - return $this->render([ - 'row' => $row, - 'rows' => $rows, - 'tabs' => $tabs, - 'fields' => $fields, - 'field_select'=> $field_select, - ]); - } - - public function getFieldDescription($v) - { - // 步骤字段类型匹配 - $desc = ''; - switch ($v['tag']) { - case "input": - if ($v['type'] == "text") { - if ($v['class'] == "auto") { - $desc .= "宏控件:"; - } - $desc .= '单行文本'; - } elseif ($v['type'] == "checkbox") { - $desc = '复选按钮'; - } elseif ($v['class'] == "date") { - $desc = '日历控件'; - } elseif ($v['class'] == "calc") { - $desc = '计算控件'; - } elseif ($v['class'] == "user") { - $desc = '用户控件'; - } - break; - case "textarea": - $desc = '多行文本'; - if ($v['rich'] == 1) { - $desc .= ":富文本"; - } - break; - case "select": - if ($v['class'] == "auto") { - $desc .= "宏控件:"; - } - $desc .= '下拉菜单'; - break; - case "button": - if ($v['class'] == "data") { - $desc = $lang['DataSelectControl']; - } elseif ($v['class'] == "fetch") { - $desc = $lang['DataGetControl']; - break; - } - break; - case "img": - if ($v['class'] == "radio") { - $desc = '单选按钮'; - } elseif ($v['class'] == "sign") { - $desc = '签章控件'; - } elseif ($v['class'] == "listview") { - $desc = '列表控件'; - } elseif ($v['class'] == "progressbar") { - $desc = $lang['progressbar']; - } elseif ($v['class'] == "imgupload") { - $desc = '图片上传控件'; - } elseif ($v['class'] == "qrcode") { - $desc = '二维码控件'; - } - break; - default: - $desc = ""; - } - return $desc; - } - - // 查看步骤信息 - public function viewAction() - { - $gets = Request::all(); - - $row = DB::table('work_step')->where('id', $gets['id'])->first(); - return $this->json($row, true); - } - - // 表单计数 - public function itemAction() - { - $id = Request::get('id'); - $row = DB::table('work_form')->where('id', $id)->first(); - return $row['max_item'] + 1; - } - - // 保存步骤 - public function saveAction() - { - if (Request::method() == 'POST') { - $gets = Request::all(); - $_join = []; - foreach ($gets['join'] as $join) { - $_join[$join['id']][] = $join['target']; - } - foreach ($gets['position'] as $position) { - $position['join'] = join(',', (array)$_join[$position['id']]); - DB::table('work_step')->where('id', $position['id'])->update($position); - } - return $this->json('流程节点添加成功', true); - } - } - - public function dialogAction() - { - $gets = Request::all(); - // 返回json - if (Request::ajax()) { - $rows = []; - if ($gets['work_id']) { - $rows = DB::table('work_step')->where('work_id', $gets['work_id'])->get(['id','title']); - } - return $this->json($rows); - } - } - - // 删除步骤 - public function deleteAction() - { - if (Request::method() == 'POST') { - $id = Request::get('id'); - DB::table('work_step')->where('id', $id)->delete(); - return $this->json('工作流删除成功。', true); - } - } -} diff --git a/app/Gdoo/Workflow/Controllers/WidgetController.php b/app/Gdoo/Workflow/Controllers/WidgetController.php index 8d9903a1..5ebd4ce1 100644 --- a/app/Gdoo/Workflow/Controllers/WidgetController.php +++ b/app/Gdoo/Workflow/Controllers/WidgetController.php @@ -22,55 +22,4 @@ class WidgetController extends DefaultController } return $this->render(); } - - public function efficiencyAction() - { - if (Request::method() == 'POST') { - $model = DB::table('work_process')->LeftJoin('work_process_data', 'work_process.id', '=', 'work_process_data.process_id') - ->LeftJoin('work', 'work.id', '=', 'work_process.work_id') - ->LeftJoin('user', 'user.id', '=', 'work_process_data.user_id') - ->where('work_process.end_time', 0) - ->where('work_process.state', 1) - ->where('work_process_data.flag', 1) - ->where('work.state', 1) - ->where('user.status', 1); - - // 权限列表 - $users = User::authoriseAccess(); - if ($users) { - $model->whereIn('work_process_data.user_id', $users); - } - - $res = $model->get(['work_process_data.*', 'user.name']); - - $sets = []; - foreach ($res as $row) { - $time = time() - $row['add_time']; - - // 大于三十天 - if ($time > 2592000) { - $sets[$row['user_id']]['c'] ++; - $sets[$row['user_id']]['count'] ++; - // 大于三天 - } elseif ($time > 259200) { - $sets[$row['user_id']]['b'] ++; - $sets[$row['user_id']]['count'] ++; - // 大于一天 - } elseif ($time > 86400) { - //$sets[$row['user_id']]['a'] ++; - } - $sets[$row['user_id']]['user'] = $row['name']; - } - $rows = []; - foreach ($sets as $set) { - if($set['count']) { - $rows[] = $set; - } - } - $json['total'] = sizeof($rows); - $json['data'] = $rows; - return $this->json($rows, true); - } - return $this->render(); - } } diff --git a/app/Gdoo/Workflow/Controllers/WorkflowController.php b/app/Gdoo/Workflow/Controllers/WorkflowController.php deleted file mode 100644 index b4c52d40..00000000 --- a/app/Gdoo/Workflow/Controllers/WorkflowController.php +++ /dev/null @@ -1,1168 +0,0 @@ - '', - 'work' => '', - 'step' => '', - 'option' => 'todo', - 'done' => '', - 'referer' => 1, - 'limit' => 25, - ], [ - ['text','wp.title','工作主题'], - ['category','w.category_id','工作类别'], - ['text','wp.id','工作流程号(ID)'], - ['department','user.department_id','发起人部门'], - ['text','wp.name','工作文号'], - ['text','wp.work_id','流程编号'], - ['text','user.name','工作发起人'], - ['text','handle_user','当前主办人'], - - ]); - $query = $search['query']; - - $model = DB::table('work_process as wp') - ->LeftJoin('work_process_data as wpd', 'wpd.process_id', '=', 'wp.id') - ->LeftJoin('work as w', 'w.id', '=', 'wp.work_id') - ->orderBy('wp.id', 'desc'); - - // 我的工作 - if ($flag == 'index') { - // 待办 - if ($query['option'] == 'todo') { - $model->where('wpd.user_id', Auth::id()) - ->where('wpd.flag', 1) - ->where('wp.state', 1); - } - - // 已办 - if ($query['option'] == 'trans') { - $model->where('wpd.user_id', Auth::id()) - ->where('wpd.flag', 2) - ->where('wp.state', 1); - } - - // 完成 - if ($query['option'] == 'done') { - $model->where('wpd.user_id', Auth::id()); - } - - // 是否完成 - if ($query['option'] == 'done') { - $model->whereRaw('wp.end_user_id > 0'); - } else { - $model->whereRaw('wp.end_user_id = 0'); - } - } - - // 回收站 - if ($flag == 'trash') { - // 数据访问权限 - if (User::authoriseAccess('trash')) { - $model->whereRaw('(wp.start_user_id=? OR wpd.user_id=?)', [Auth::id(), Auth::id()]); - } - $model->where('wp.state', 0); - } - - // 监控工作 - if ($flag == 'monitor') { - if ($query['done'] == 1) { - $model->whereRaw('wp.end_user_id > 0'); - } else { - $model->whereRaw('wp.end_user_id = 0'); - } - $model->where('wp.state', 1); - } - - $handle_user = false; - foreach ($search['where'] as $where) { - if ($where['active']) { - if ($where['field'] == 'w.category_id') { - if ($where['search'][0]) { - $model->where('w.category_id', $where['search'][0]); - } - if ($where['search'][1]) { - $model->where('wp.work_id', $where['search'][1]); - } - if ($where['search'][2]) { - $model->where('wpd.step_id', $where['search'][2]); - } - } else { - if ($where['field'] == 'handle_user') { - $handle_user = true; - $where['field'] = 'user.name'; - } - $model->search($where); - } - } - } - - // 主办人 - if ($handle_user) { - // 搜索当前主办人时匹配最大流水号 - $model->whereRaw('wp.number = wpd.number') - ->LeftJoin('user', 'user.id', '=', 'wpd.user_id'); - } else { - $model->LeftJoin('user', 'user.id', '=', 'wp.start_user_id'); - } - - $model->leftJoin(DB::raw(' - (select top 1 a.id, a.title as name, b.process_id, b.add_time, b.user_id, b.number as serial, a.number, a.timeout - from work_step as a - left join work_process_data as b on a.id = b.step_id order by b.id desc) as sp' - ), 'sp.process_id', '=', 'wpd.process_id'); - - /* - $step = DB::table('work_step as ws') - ->LeftJoin('work_process_data as wpd', 'ws.id', '=', 'wpd.step_id') - ->where('wpd.process_id', $row['process_id']) - ->orderBy('wpd.id', 'desc') - ->first([) - ')) - */ - - // 数据总计 - //$total = $model->distinct('wp.id')->count('wp.id'); - - $rows = $model->paginate($query['limit'])->appends($query); - - /* - $rows = $model->forPage($page, $query['limit']) - ->selectRaw('distinct(wp.id), wp.*, wpd.process_id') - ->get(); - - $rows = Paginator::make($rows, $total)->appends($query); - - if ($rows->count()) { - foreach ($rows as $key => $row) { - $step = DB::table('work_step as ws') - ->LeftJoin('work_process_data as wpd', 'ws.id', '=', 'wpd.step_id') - ->where('wpd.process_id', $row['process_id']) - ->orderBy('wpd.id', 'desc') - ->first(['ws.id', 'ws.title as name', 'wpd.add_time', 'wpd.user_id', 'wpd.number as serial', 'ws.number', 'ws.timeout']); - - $row['step'] = $step; - $rows->put($key, $row); - } - } - */ - - $categorys = WorkflowCategory::where('status', 1)->orderBy('sort', 'asc')->get(['id','title']); - if ($q_work_id) { - $steps = DB::table('work_step')->where('work_id', $q_work_id)->get(); - } - - // 返回json - if (Request::wantsJson()) { - return response()->json($rows); - } - - return $this->display([ - 'rows' => $rows, - 'steps' => $steps, - 'categorys' => $categorys, - 'works' => $works, - 'search' => $search, - 'options' => Workflow::$_options, - ], $tpl); - } - - // 监控流程 - public function monitorAction() - { - return $this->indexAction('monitor'); - } - - // 修正流程进程 - public function correctAction() - { - $gets = Request::all(); - - if (Request::method() == 'POST') { - return $this->json('流程纠正成功。', true); - } - - return $this->render([ - 'rows' => $rows, - ]); - } - - // 回收站 - public function trashAction() - { - return $this->indexAction('trash'); - } - - // 查询流程 - public function queryAction() - { - $id = Request::get('id'); - - if ($id) { - $fields = Workflow::getFormData($id); - - // 获取流程主表 - $work = DB::table('work')->where('id', $id)->first(); - - $columns = [ - 'run_id' => [ - 'field' => 'p.id', - 'name' => '流水号', - 'format' => 'number' - ], - 'run_name' => [ - 'field' => 'p.name', - 'name' => '名称/文号', - 'format' => 'text' - ], - 'run_status' => [ - 'field' => 'p.end_user_id', - 'name' => '流程状态', - 'format' => 'number' - ], - 'run_user_id' => [ - 'field' => 'p.start_user_id', - 'name' => '流程发起人', - 'format' => 'text' - ], - 'run_date' => [ - 'field' => 'p.start_time', - 'name' => '流程开始日期', - 'format' => 'date' - ], - 'run_time' => [ - 'field' => 'p.start_time', - 'name' => '流程开始时间', - 'format' => 'datetime' - ] - ]; - - return $this->display([ - 'work_id' => $id, - 'work' => $work, - 'columns' => $columns, - 'fields' => $fields, - ], 'query_form'); - } else { - $works = Workflow::permission('query_id')->get(); - - $rows = $categorys = []; - foreach ($works as $rowId => $row) { - $rows[$row->category_id][$rowId] = $row; - } - - $j = 0; - - $_categorys = WorkflowCategory::get(); - - foreach ($_categorys as $i => $category) { - if ($i % 3 == false) { - $j++; - } - - $categorys[$j][] = $category; - } - - return $this->display([ - 'rows' => $rows, - 'categorys' => $categorys, - ], 'query_list'); - } - } - - // 导出流程 - public function exportAction() - { - $work_id = Request::get('work_id'); - - if (Request::method() == 'POST') { - $gets = Request::all(); - - $fields = Workflow::getFormData($work_id); - - $query = DB::table('work_data_'.$work_id.' as d') - ->LeftJoin('work_process as p', 'p.id', '=', 'd.process_id') - ->LeftJoin('work_process_data as pd', 'pd.process_id', '=', 'p.id'); - - // 流程开始日期 - $date_a = $gets['date_start_a']; - $date_b = $gets['date_start_b']; - - if ($date_a && $date_b) { - $query->whereBetween('p.start_time', [strtotime($date_a), strtotime($date_b)]); - } elseif ($date_a) { - $query->where('p.start_time', '>', strtotime($date_a)); - } elseif ($date_b) { - $query->where('p.start_time', '<', strtotime($date_b)); - } - - /* - // 流程结束日期 - $date_a = $gets['date_end_a']; - $date_b = $gets['date_end_b']; - - if ($date_a && $date_b) { - $query->whereBetween('p.end_time', [strtotime($date_a), strtotime($date_b)]); - } elseif ($date_a) { - $query->where('p.end_time', '>', strtotime($date_a)); - } elseif ($date_b) { - $query->where('p.end_time', '<', strtotime($date_b)); - } - */ - - // 开始用户 - if ($gets['start_user_id']) { - $query->where('p.start_user_id', $gets['start_user_id']); - } - - // 工作流文号 - if ($gets['run_name']) { - $query->where('p.name', 'like', '%'.$gets['run_name'].'%'); - } - - // 工作状态 - if (is_numeric($gets['status'])) { - if ($gets['status'] == 0) { - $query->where('p.end_user_id', 0); - } else { - $query->where('p.end_user_id', '>', 0); - } - } - - // 查询范围 - if (is_numeric($gets['user_type'])) { - if ($gets['user_type'] == 1) { - $query->where('p.start_user_id', Auth::id()); - } - if ($gets['user_type'] == 2) { - $query->where('pd.user_id', Auth::id()); - } - } - - $selects = $xls = []; - $selects[$gets['group_by']] = $gets['group_by']; - $selects[$gets['order_by']] = $gets['order_by']; - - foreach ($gets['columns'] as $_columns) { - if ($_columns['field']) { - $field = $_columns['field']; - $columns[$field] = $_columns['name']; - - // 去掉表前缀 - $_field = explode('.', $field); - - if ($_columns['total']) { - $selects[$field] = 'sum('.$field.') as '.$_field[1].'_total'; - $name = $_field[1].'_total'; - } else { - $selects[$field] = $field; - $name = $_field[1]; - } - - // 子表显示字段 - if ($_columns['field1']) { - $fields[$name]['show'] = $_columns['field1']; - } - - $xls[] = ['label' => $_columns['name'], 'name' => $name]; - } - } - - // 分组统计 - $query->groupBy($gets['group_by']) - ->orderBy($gets['order_by'], $gets['sort_by']); - - // 去掉条件模板 - array_shift($gets['conditions']); - - $count = count($gets['conditions']); - - $conditions = $values = []; - - if ($gets['conditions']) { - foreach ($gets['conditions'] as $key => $condition) { - // 数组最后一个去掉逻辑 - if ($key + 1 == $count) { - unset($condition['logic']); - } - - $values[] = $condition['value']; - $condition['value'] = '?'; - - $conditions[] = join(' ', $condition); - } - $where = join(' ', $conditions); - - $query->whereRaw($where, $values); - } - - $selects = array_unique($selects); - $query->selectRaw(join(',', $selects)); - $rows = $query->get(); - - $haeds = []; - foreach ($fields as $key => $field) { - if ($field['class'] == 'listview') { - $haed = []; - - $show = $field['show']; - - $tr = explode('`', $field['lv_title']); - foreach ($tr as $i => $td) { - if ($td && isset($show[$i])) { - $haed[] = $td; - } - } - $haeds[$key] = $gets['action'] == 'excel' ? join(',', $haed) : ''.join('', $haed).''; - } - } - - foreach ($rows as $key => &$row) { - $row['start_time'] = format_datetime($row['start_time']); - $row['start_user_id'] = get_user($row['start_user_id'], 'name', 0); - $row['end_user_id'] = $row['end_user_id'] == 0 ? '执行中' : '已结束'; - - foreach ($haeds as $key => $tr) { - if (isset($row[$key])) { - $table = $gets['action'] == 'excel' ? [] : [$tr]; - - $t = json_decode($row[$key], true); - - $show = $fields[$key]['show']; - - if ($t) { - foreach ($t as $tr) { - $tt = []; - foreach ($tr as $i => $td) { - if ($td && isset($show[$i])) { - $tt[] = $td; - } - } - $table[] = $gets['action'] == 'excel' ? join(',', $tt) : ''.join('', $tt).''; - } - } - $row[$key] = $gets['action'] == 'excel' ? join("\n", $table) : ''. join('', $table) .'
'; - } - } - } - - if ($gets['action'] == 'excel') { - writeExcel($xls, $rows, $gets['name'].date('-Y-m-d')); - } - - return $this->display([ - 'rows' => $rows, - 'columns' => $columns, - ]); - } - } - - // 超时统计 - public function timeoutAction() - { - $query = [ - 'option' => 'step', - 'flag' => 1, - ]; - foreach ($query as $k => $v) { - $query[$k] = Request::get($k, $v); - } - - // 超时步骤 - if ($query['option'] == 'step') { - $model = DB::table('work_process as wp') - ->LeftJoin('work_process_data as wpd', 'wpd.process_id', '=', 'wp.id') - ->LeftJoin('work as w', 'w.id', '=', 'wp.work_id') - ->LeftJoin('work_step as ws', 'ws.id', '=', 'wpd.step_id') - ->where('wp.end_user_id', 0) - ->where('ws.number', '>', 1) - ->where('ws.timeout', '>', 0) - ->where('wpd.flag', $query['flag']) - ->orderBy('wp.id', 'desc'); - - $model->selectRaw('wp.*, wpd.process_id, wpd.add_time as trans_at, wpd.deliver_time as deliver_at, wpd.user_id, wpd.flag, wpd.number as step_number, ws.title as step_name, ws.timeout as step_timeout'); - - // 办理中 - if ($query['flag'] == 1) { - $model->addSelect(DB::raw('UNIX_TIMESTAMP() - ((ws.timeout * 3600) + wpd.add_time) as timeout_diff')) - ->whereRaw('UNIX_TIMESTAMP() - ((ws.timeout * 3600) + wpd.add_time) > 0'); - } - - if ($query['flag'] == 2) { - $model->addSelect(DB::raw('wpd.deliver_time - ((ws.timeout * 3600) + wpd.add_time) as timeout_diff')) - ->whereRaw('wpd.deliver_time - ((ws.timeout * 3600) + wpd.add_time) > 0'); - } - - $rows = $model->paginate(); - } - - // 超时统计 - if ($query['option'] == 'count') { - $rows_1 = DB::table('work_process_data as wpd') - ->LeftJoin('work_step as ws', 'ws.id', '=', 'wpd.step_id') - ->where('wpd.number', '>', 1) - ->where('wpd.flag', 1) - ->groupBy('wpd.user_id') - ->selectRaw(' - count(wpd.id) as count, - wpd.user_id, - wpd.flag, - ws.timeout, - UNIX_TIMESTAMP() - ((ws.timeout * 3600) + wpd.add_time) as timeout_1 - ')->get(); - - $rows_2 = DB::table('work_process_data as wpd') - ->LeftJoin('work_step as ws', 'ws.id', '=', 'wpd.step_id') - ->where('wpd.number', '>', 1) - ->where('wpd.flag', 2) - ->groupBy('wpd.user_id') - ->selectRaw(' - count(wpd.id) as count, - wpd.user_id, - wpd.flag, - wpd.deliver_time - ((ws.timeout * 3600) + wpd.add_time) as timeout_2 - ')->get(); - - $rows = []; - - // 办理中 - foreach ($rows_1 as $row) { - $user_id = $row['user_id']; - $rows[$user_id]['count'] += $row['count']; - if ($row['timeout']) { - $rows[$user_id]['timeout_1'] += $row['count']; - } - } - - // 已办理 - foreach ($rows_2 as $row) { - $user_id = $row['user_id']; - $rows[$user_id]['count'] += $row['count']; - if ($row['timeout']) { - $rows[$user_id]['timeout_2'] += $row['count']; - } - } - } - - return $this->display([ - 'query' => $query, - 'rows' => $rows, - ], 'timeout_'. $query['option']); - } - - // 可办理工作列表 - public function listAction() - { - $works = Workflow::permission('sponsor_id')->get(); - - $rows = $categorys = []; - foreach ($works as $rowId => $row) { - $rows[$row->category_id][] = $row; - } - - $categorys = WorkflowCategory::orderBy('sort', 'ASC')->get(); - - $client = Request::get('client'); - if ($client == 'app') { - $tpl = 'mobile/list'; - } else { - $tpl = 'list'; - } - - return $this->display([ - 'rows' => $rows, - 'categorys' => $categorys, - ], $tpl); - } - - // 新建工作表单 - public function addAction() - { - if (Request::method() == 'POST') { - $gets = Request::all(); - - if (empty($gets['title'])) { - return $this->json('工作主题必须填写。'); - } - - // 获取第一步骤编号 - $step = DB::table('work_step')->whereRaw('work_id=? and number=1', [$gets['work_id']])->first(); - - if (empty($step)) { - return $this->json('工作第一步骤不存在。'); - } - - // 写入运行实例 - $gets['start_user_id'] = Auth::id(); - $gets['start_time'] = time(); - - $process_id = DB::table('work_process')->insertGetid($gets); - - // 写入运行实例第一步 - DB::table('work_process_data')->insert([ - 'process_id' => $process_id, - 'step_id' => $step['id'], - 'user_id' => Auth::id(), - 'number' => 1, - ]); - - // 处理工作表建立和更新 - Workflow::updateTable($gets['work_id']); - - // 建立工作 - DB::table('work_data_'.$gets['work_id'])->insert([ - 'process_id' => $process_id, - 'add_user_id' => Auth::id(), - 'add_time' => time(), - ]); - - // 操作日志 - // action_log('work_process', $process_id, 'workflow/workflow/view', 0, $gets['name']); - - return $this->json(['process_id' => $process_id], true); - } - - $id = (int)Request::get('id'); - $row = DB::table('work')->where('id', $id)->first(); - - return $this->render([ - 'row' => $row, - ]); - } - - /** - * 办理工作表单 - */ - public function editAction() - { - $process_id = (int)Request::get('process_id'); - - // 当前主办数据 - $process = DB::table('work_process as p') - ->LeftJoin('work_process_data as d', 'p.id', '=', 'd.process_id') - ->where('p.id', $process_id) - ->where('d.user_id', Auth::id()) - ->orderBy('d.number', 'desc') - ->first(['p.*', 'd.option', 'd.step_id', 'd.id as data_id']); - - // 工作流主数据 - $work = DB::table('work as w') - ->LeftJoin('work_step as s', 'w.id', '=', 's.work_id') - ->where('s.id', $process['step_id']) - ->selectRaw('w.template_short,w.title work_title,w.id work_id,w.type work_type,s.id step_id,s.number step_number,s.field field_write,s.field_secret,s.field_auto,s.field_check,s.last,s.print') - ->first(); - - $data = DB::table('work_data_'.$work['work_id']) - ->where('process_id', $process_id) - ->first(); - - $work['items'] = $data; - $work['process'] = $process; - - // 主办人可编辑表单 - $work['opflag'] = $process['option']; - - $workFlow = [ - 'workId' => $work['work_id'], - 'workType' => $work['work_type'], - 'stepNumber' => $work['step_number'], - 'stepId' => $work['step_id'], - 'dataId' => $process['data_id'], - ]; - - // 处理工作表建立和更新 - Workflow::updateTable($work['work_id']); - - // 编译表单 - $form = Workflow::parseForm($work['template_short'], $work); - - // 公共附件编辑 - $attach = attachment_edit('work_attachment', $data['attachment'], 'workflow'); - - // 公共附件查看权限 - $attach['auth'] = ['view' => 0,'add' => 0]; - if (strpos($work['field_secret'], '[attach@]') === false) { - $attach['auth']['view'] = 1; - } - - // 公共附件添加权限 - if (strpos($work['field_write'], '[attach@]') !== false) { - $attach['auth']['add'] = 1; - } - - $work['js'] = json_encode($workFlow); - - $client = Request::get('client'); - if ($client == 'app') { - $tpl = 'mobile/edit'; - } else { - $tpl = 'edit'; - } - - return $this->display([ - 'attach' => $attach, - 'work' => $work, - 'process' => $process, - 'template' => $form['template'], - 'jsonload' => $form['jsonload'], - 'js' => $form['js'], - ], $tpl); - } - - // 查看表单 - public function viewAction() - { - $process_id = (int)Request::get('process_id'); - - // 当前办理数据 - $model = DB::table('work_process as p') - ->LeftJoin('work_process_data as d', 'p.id', '=', 'd.process_id') - ->orderBy('d.number', 'desc') - ->where('p.id', $process_id); - - // 获取主办数据 - $user = DB::table('work_process_data') - ->where('user_id', Auth::id()) - ->where('process_id', $process_id) - ->first(); - - // 有主办数据 - if ($user) { - $model->where('d.user_id', Auth::id()); - } - - $process = $model->first(['p.*', 'd.step_id', 'd.id as data_id']); - - // 工作流主数据 - $work = DB::table('work as w') - ->LeftJoin('work_step as s', 'w.id', '=', 's.work_id') - ->where('s.id', $process['step_id']) - ->selectRaw('w.template_short,w.title work_title,w.id work_id,w.type work_type,s.id step_id,s.number step_number,s.field field_write,s.field_secret,s.field_auto,s.print') - ->first(); - - $data = DB::table('work_data_'.$work['work_id']) - ->where('process_id', $process_id) - ->first(); - - $work['items'] = $data; - - $workFlow = [ - 'workId' => $work['work_id'], - 'workType' => $work['work_type'], - 'stepNumber' => $work['step_number'], - 'stepId' => $work['step_id'], - 'dataId' => $process['data_id'], - ]; - - // 编译表单 - $form = Workflow::parseForm($work['template_short'], $work); - - $attach = attachment_view('work_attachment', $data['attachment']); - $attach['queue'] = $attach['view']; - $attach['auth'] = ['view' => 0,'add' => 0]; - - if (strpos($work['field_secret'], '[attach@]') === false) { - $attach['auth']['view'] = 1; - } - - $work['js'] = json_encode($workFlow); - - $client = Request::get('client'); - if ($client == 'app') { - $tpl = 'mobile/view'; - } else { - $tpl = 'view'; - } - - return $this->display([ - 'attach' => $attach, - 'work' => $work, - 'process' => $process, - 'template' => $form['template'], - 'jsonload' => $form['jsonload'], - 'js' => $form['js'], - ], $tpl); - } - - // 打印 - public function printAction() - { - $process_id = (int)Request::get('process_id'); - - // 当前办理数据 - $model = DB::table('work_process as p') - ->LeftJoin('work_process_data as d', 'p.id', '=', 'd.process_id') - ->orderBy('d.number', 'desc') - ->where('p.id', $process_id); - - // 获取主办数据 - $user = DB::table('work_process_data') - ->where('user_id', Auth::id()) - ->where('process_id', $process_id) - ->first(['user_id']); - - if ($user) { - $model->where('d.user_id', Auth::id()); - } - - $process = $model->first(['p.*', 'd.step_id', 'd.id as data_id']); - - // 工作主数据 - $work = DB::table('work as w') - ->LeftJoin('work_step as s', 'w.id', '=', 's.work_id') - ->where('s.id', $process['step_id']) - ->selectRaw('w.template_short,w.title work_title,w.id work_id,w.type work_type,s.id step_id,s.number step_number,s.field field_write,s.field_secret,s.field_auto,s.print') - ->first(); - - // 工作数据 - $data = DB::table('work_data_'.$work['work_id']) - ->where('process_id', $process_id) - ->first(); - - $work['items'] = $data; - - // 打印标识 - $work['printflag'] = true; - - $workFlow = [ - 'workId' => $work['work_id'], - 'workType' => $work['work_type'], - 'stepNumber' => $work['step_number'], - 'stepId' => $work['step_id'], - 'dataId' => $process['data_id'], - ]; - - // 编译表单 - $form = Workflow::parseForm($work['template_short'], $work); - - $work['js'] = json_encode($workFlow); - - $this->layout = 'layouts.empty'; - return $this->display([ - 'attach' => $attach, - 'work' => $work, - 'process' => $process, - 'template' => $form['template'], - 'jsonload' => $form['jsonload'], - 'js' => $form['js'], - ]); - } - - /** - * 检查工作表单必填、转入条件、经办人 - */ - public function checkAction() - { - if (Request::method() == 'POST') { - $gets = Request::all(); - - // 获取表单缓存 - $work_form_data = Workflow::getFormData($gets['work_id']); - - // 获取步骤信息 - $step = DB::table('work_step')->where('id', $gets['step_id'])->first(); - - // 组合表单名称和表名 - foreach ($work_form_data as $key => $row) { - $form_data[$row['title']] = $gets[$key]; - } - - // 检查必填字段 - if ($step['field_check']) { - $field_check = explode(',', $step['field_check']); - - $regular = config('default.regular'); - - foreach ($field_check as $check) { - list($key, $value) = explode('=', $check); - - if($value == '') { - continue; - } - - // 如果校验字段不存在则跳过 - if (!isset($form_data[$key])) { - continue; - } - - // 检查是否为空 - if ($value == 'SYS_NOT_NULL') { - if (empty($form_data[$key])) { - return $this->json($key.$regular[$value]['title']); - } - } else { - // 检查为空后的其他正则 - if (!preg_match($regular[$value]['regex'], $form_data[$key])) { - return $this->json($key.$regular[$value]['title']); - } - } - } - } - - // 结束流程标志 - if ($step['type'] == 3) { - $json['step_id'] = '-1'; - } else { - // 取得可以转入的步骤 - $steps = Workflow::checkCondition($gets); - if (is_array($steps)) { - foreach ($steps as $row) { - $json['step_id'][] = $row['id']; - } - $json['step_id'] = join(',', (array)$json['step_id']); - } - } - return $this->json($json, true); - } - } - - // 保存工作表单草稿 - public function draftAction() - { - if (Request::method() == 'POST') { - $gets = Request::all(); - - $data = Workflow::saveForm($gets, true); - - $table = 'work_data_'.$gets['work_id']; - - DB::table($table)->where('process_id', $gets['process_id'])->update($data); - - return $this->json('草稿保存成功。', true); - } - } - - // 获取工作步骤 - public function stepAction() - { - if (Request::method() == 'POST') { - $gets = Request::all(); - - $gets['step_id'] = $gets['next_step_id']; - - if ($gets['step_id'] > 0) { - // 退回上一步 - if ($gets['step_type'] == 'last') { - $data = DB::table('work_process_data') - ->where('process_id', $gets['process_id']) - ->where('step_id', $gets['next_step_id']) - ->orderBy('process_id', 'asc') - ->get(); - - $step['select_user_id'] = $data[0]['user_id']; - $step['select_user_lock'] = 1; - } - // 转交下一步 - elseif ($gets['step_type'] == 'next') { - // 取得下一步骤办理人 - $step = Workflow::getSelectUser($gets); - } - - $html = '
'; - $html .= Dialog::user('user', 'next_user_id', $step['select_user_id'], 0, $step['select_user_lock']); - $html .= '
'; - - // 转交下一步才显示会签人 - if ($gets['step_type'] == 'next') { - $html .= '
'; - $html .= Dialog::user('user', 'next_user_sign', $step['select_user_sign'], 1, $step['select_user_lock']); - $html .= '
'; - } - return $this->json($html); - } - return $this->json(''); - } - } - - // 回退工作 - public function lastAction() - { - // 写入转交数据到下一步 - if (Request::method() == 'POST') { - $gets = Request::all(); - - $res = Workflow::nextStep($gets); - if ($res === true) { - Workflow::notification($gets); - return $this->json(url_referer('index'), true); - } else { - return $this->json($res); - } - } - - $work_id = (int)Request::get('work_id'); - $step_id = (int)Request::get('step_id'); - - $rows = DB::table('work_step') - ->whereRaw('FIND_IN_SET(?, `join`) and work_id=?', [$step_id, $work_id]) - ->get(); - - return $this->render([ - 'step_type' => 'last', - 'rows' => $rows, - ], 'next'); - } - - // 转交工作 - public function nextAction() - { - // 写入转交数据到下一步 - if (Request::method() == 'POST') { - $gets = Request::all(); - $res = Workflow::nextStep($gets); - if ($res === true) { - Workflow::notification($gets); - return $this->json(url_referer('index'), true); - } else { - return $this->json($res); - } - } - - // 显示转交表单 - $step_id = Request::get('step_id'); - - // 结束流程 - if ($step_id == '-1') { - $rows[] = ['id' => '-1', 'title' => '结束流程']; - } - // 普通流程 - elseif ($step_id) { - $_step_id = array_filter(explode(',', $step_id)); - $rows = DB::table('work_step')->whereIn('id', $_step_id)->get(); - } - return $this->render([ - 'step_type' => 'next', - 'rows' => $rows, - ]); - } - - // 结束流程 - public function endAction() - { - if (Request::method() == 'POST') { - $id = Request::get('id'); - $ids = array_filter((array)$id); - - foreach ($ids as $id) { - - // 进入进程结束标志 - DB::table('work_process')->where('id', $id)->update([ - 'end_user_id' => Auth::id(), - 'end_time' => time(), - ]); - } - return $this->back('结束操作成功。'); - } - } - - // 流程记录 - public function logAction() - { - $process_id = Request::get('process_id'); - $rows = DB::table('work_process_data') - ->leftJoin('work_step', 'work_step.id', '=', 'work_process_data.step_id') - //->orderBy('work_process_data.number', 'desc') - ->where('process_id', $process_id)->get(['work_process_data.*', 'work_step.title as step_name']); - return $this->render([ - 'rows' => $rows, - ]); - } - - // 放入回收站 - public function deleteAction() - { - if (Request::method() == 'POST') { - $id = Request::get('id'); - $ids = array_filter((array)$id); - - $status = (int)Request::get('status'); - - foreach ($ids as $id) { - $data['state'] = $status; - DB::table('work_process')->where('id', $id)->update($data); - } - return $this->back('回收操作成功。'); - } - } - - public function dialogAction() - { - $gets = Request::all(); - // 返回json - if (Request::ajax()) { - $rows = DB::table('work')->where('category_id', $gets['category_id'])->get(['id', 'title']); - return $this->json($rows); - } - } - - // 销毁工作 - public function destroyAction() - { - if (Request::method() == 'POST') { - $id = Request::get('id'); - $id = array_filter((array)$id); - - $rows = DB::table('work_process')->whereIn('id', $id)->get()->toArray(); - if ($rows) { - foreach ($rows as $row) { - - // 删除相关数据 - DB::table('work_process')->where('id', $row['id'])->delete(); - DB::table('work_process_data')->where('process_id', $row['id'])->delete(); - DB::table('work_process_log')->where('process_id', $row['id'])->delete(); - - $model = DB::table('work_data_'.$row['work_id']) - ->where('process_id', $row['id']); - - // 工作数据 - $row = $model->first(); - - // 删除工作附件 - attachment_delete('work_attachment', $row['attachment']); - - // 删除工作数据 - $model->delete(); - } - } - - return $this->success('trash', '销毁操作成功。'); - } - } -} diff --git a/app/Gdoo/Workflow/Models/Process.php b/app/Gdoo/Workflow/Models/Process.php deleted file mode 100644 index cf094280..00000000 --- a/app/Gdoo/Workflow/Models/Process.php +++ /dev/null @@ -1,13 +0,0 @@ -belongsTo('Gdoo\User\Models\User'); - } -} diff --git a/app/Gdoo/Workflow/Models/Process/Data.php b/app/Gdoo/Workflow/Models/Process/Data.php deleted file mode 100644 index 51d44391..00000000 --- a/app/Gdoo/Workflow/Models/Process/Data.php +++ /dev/null @@ -1,13 +0,0 @@ -belongsTo('Gdoo\User\Models\User'); - } -} diff --git a/app/Gdoo/Workflow/Models/ProcessData.php b/app/Gdoo/Workflow/Models/ProcessData.php deleted file mode 100644 index 8c9c7f74..00000000 --- a/app/Gdoo/Workflow/Models/ProcessData.php +++ /dev/null @@ -1,13 +0,0 @@ -belongsTo('Gdoo\User\Models\User'); - } -} diff --git a/app/Gdoo/Workflow/Models/Workflow.php b/app/Gdoo/Workflow/Models/Workflow.php deleted file mode 100644 index 1108b296..00000000 --- a/app/Gdoo/Workflow/Models/Workflow.php +++ /dev/null @@ -1,1403 +0,0 @@ - '待办中', - 'trans' => '已办结', - 'done' => '已结束', - ]; - - public static $_timeout = [ - 'step' => '超时步骤', - 'count' => '超时统计', - 'rank' => '超时排名', - ]; - - // 过滤经办人选择 - public function getfilterUsers($type, $department_id, $role_id, $user_id) - { - $model = DB::table('user'); - switch ($type) { - // 获取全部指定经办人 - case 0: - if ($department_id) { - $sql[] = 'department_id IN('.$department_id.')'; - } - if ($role_id) { - $sql[] = 'role_id IN('.$role_id.')'; - } - if ($user_id) { - $sql[] = 'id IN('.$user_id.')'; - } - - if (count($sql) > 0) { - $model->where('department_id IN('.join(" OR ", $sql).')'); - } - break; - // 选择本部门 - case 1: - - if ($department_id > 0) { - $model->where('department_id=?', $department_id); - } - break; - // 选择上级部门 - case 2: - $nodes = DB::table('department')->getTreeById($department_id, 2); - $ids = array_fetch($nodes, 'id'); - if (count($ids) > 0) { - $model->where('department_id IN('.join(",", $ids).')'); - } - break; - // 选择下级部门 - case 3: - $nodes = DB::table('department')->getTreeById($department_id); - $ids = array_fetch($nodes, 'id'); - if (count($ids) > 0) { - $model->where('department_id IN('.join(",", $ids).')'); - } - break; - // 选择本岗位 - case 4: - if ($role_id > 0) { - $model->where('role_id=?', $role_id); - } - break; - } - - $rows = $model->from('user', 'id,role_id,department_id,username,name,phone') - ->where('status=1')->pk()->select(); - - return $rows; - } - - // 自动选人选择 - public function getSelectUser($data) - { - // 工作流办理主表 - $process = DB::table('work_process')->where('id', $data['process_id'])->first(); - - // 工作流设计步骤表 - $step = DB::table('work_step')->where('id', $data['step_id'])->first(); - - $user_type = $step['select_user_type']; - $select_user_id = $select_user_sign = 0; - - switch ($user_type) { - // 选择工作发起人 - case 1: - $select_user_id = $process['start_user_id']; - break; - - // 选择经办人本部门主管 - case 2: - // 选择经办人上级主管领导 - case 3: - // 选择经办人上级分管领导 - case 4: - $department = DB::table('department')->where('id', Auth::user()->department_id)->first(); - if (is_array($department)) { - if ($user_type == 2) { - $select_user_id = $department['manager']; - } - if ($user_type == 3) { - $select_user_id = $department['leader']; - } - if ($user_type == 4) { - $select_user_id = $department['superior']; - } - } - break; - - // 选择经办人一级部门主管 - case 5: - $department = DB::table('department')->where('parent_id', 0)->first(); - if (is_array($department)) { - $select_user_id = $department['manager']; - } - break; - - // 选择指定人员 - case 6: - $select_user_id = $step['select_user_id']; - $select_user_sign = $step['select_user_sign']; - break; - - case 7: - $select_user_id = $data['data_'.$step['select_user_sign']]; - break; - - // 选择指定步骤办理人 - case 8: - if ($data['process_id'] > 0 && $step['select_user_sign'] > 0) { - $process_data = DB::table('work_process_data') - ->where('process_id', $data['process_id']) - ->where('step_id', $step['select_user_sign']) - ->orderBy('process_id', 'asc') - ->get(); - $select_user_id = $process_data[0]['user_id']; - } - break; - - // 选择发起人本部门主管 - case 9: - // 选择发起人上级主管领导 - case 10: - // 选择发起人上级分管领导 - case 11: - $user = DB::table('user')->where('id', $process['start_user_id'])->first(); - $department = DB::table('department')->where('id', $user['department_id'])->first(); - if (is_array($department)) { - if ($user_type == 9) { - $select_user_id = $department['manager']; - } - if ($user_type == 10) { - $select_user_id = $department['leader']; - } - if ($user_type == 11) { - $select_user_id = $department['superior']; - } - } - break; - - // 选择经办人一级部门主管 - case 12: - $department = DB::table('department')->where('parent_id', 0)->first(); - if (is_array($department)) { - $select_user_id = $department['manager']; - } - break; - - // 选择发起人直属领导 - case 13: - $user = DB::table('user')->where('id', $process['start_user_id'])->first(); - if (is_array($user)) { - $select_user_id = $user['leader_id']; - } - break; - - // 选择经办人直属领导 - case 14: - $user = DB::table('user')->where('id', Auth::id())->first(); - if (is_array($user)) { - $select_user_id = $user['leader_id']; - } - break; - } - $step['select_user_id'] = $select_user_id; - $step['select_user_sign'] = $select_user_sign; - return $step; - } - - public function getMacroUser($user_id) - { - if (empty($user_id)) { - return null; - } - - return DB::table('user') - ->LeftJoin('role', 'role.id', '=', 'user.role_id') - ->LeftJoin('department', 'department.id', '=', 'user.department_id') - ->where('user.id', $user_id) - ->first(['user.post as position', 'user.name as user_name', 'role.name as role_name', 'department.name as department_name']); - } - - // 转交工作 - public function nextStep($post) - { - if (!$post['work_id'] || !$post['step_id'] || !$post['data_id'] || !$post['process_id']) { - return '转交工作失败参数错误。'; - } - - // 当前线程数据 - $_data = DB::table('work_process_data')->where('id', $post['data_id'])->first(); - - if ($_data['flag'] == 2) { - return '请不要重复转交工作。'; - } - - // 获取骤数据 - $step = DB::table('work_step')->where('id', $post['step_id'])->first(); - - // 流程退回时如果节点是结束流程重置类型为普通节点 - if ($step['type'] == 3 && $post['step_type'] == 'last') { - $step['type'] = 1; - } - - // 运行进程数据 - $_process = []; - - switch ($step['type']) { - // 普通步骤节点 - case 1: - // 开始步骤节点 - case 2: - // 检查下一步骤编号 - if (!$post['next_step_id']) { - return '下一步必须选择。'; - } - - // 检查下一步骤接收用户编号 - if (!$post['next_user_id']) { - return '下一步主办人不能为空。'; - } - - $_process_data = [ - 'process_id' => $post['process_id'], - 'parent_id' => $post['data_id'], - 'step_id' => $post['next_step_id'], - 'user_id' => $post['next_user_id'], - 'number' => $_data['number'] + 1, - 'add_time' => time(), - ]; - - // 写入下一步主办线程 - DB::table('work_process_data')->insert($_process_data); - - /* - // 会签人数据 - if ($post['next_user_sign']) { - - $next_user_sign = explode(',', $post['next_user_sign']); - // 设置会签人无法操作表单 - $_process_data['option'] = 0; - - foreach ($next_user_sign as $user_id) { - // 写入下一步会签线程 - $_process_data['next_user_id'] = $user_id; - DB::table('work_process_data')->insert($_process_data); - } - }*/ - - break; - - // 结束步骤节点 - case 3: - // 进入进程结束标志 - $_process['end_user_id'] = Auth::id(); - $_process['end_time'] = time(); - break; - - // 子流程步骤节点 - case 4: - return '无子步骤节点功能。'; - break; - } - - // 递增进程运行编号 - $_process['number'] = $_data['number'] + 1; - - // 下一步骤数据 - $next_step = DB::table('work_step')->where('id', $post['next_step_id'])->first(); - $_process['step_number'] = $next_step['number']; - - DB::table('work_process')->where('id', $post['process_id'])->update($_process); - - // 更新当前线程为已办理 - DB::table('work_process_data')->where('id', $post['data_id'])->update([ - 'flag' => 2, - 'deliver_time' => time() - ]); - - // 保存会签意见 - // $feedback = Workflow::saveFeedback($post); - - // 组合保存表单数据 - $data = Workflow::saveForm($post); - - // 更新工作表数据 - DB::table('work_data_'.$post['work_id'])->where('process_id', $post['process_id'])->update($data); - - return true; - } - - // 保存会签数据 - public function saveFeedback($post) - { - // 获取会签数据 - $feedback = $post['feedback']; - - if ($feedback['content']) { - $data = [ - 'process_id' => $post['process_id'], - 'step_id' => $post['step_id'], - 'step_number'=> $post['step_number'], - 'content' => $feedback['content'], - ]; - // 保存会签附件 - if ($feedback['attachment']) { - //$data['attachment'] = attachment_store('work_attachment', $feedback['attachment']); - } - DB::table('work_process_feedback')->insert($data); - } - return true; - } - - - // 保存表单数据 - public function saveForm($post, $draft = false) - { - // 获取表单结构 - $work_form_data = Workflow::getFormData($post['work_id']); - - // 当前步骤表信息 - $step = DB::table('work_step')->where('id', $post['step_id'])->first(); - $write_field = explode(',', $step['field']); - - $old = DB::table('work_data_'.$post['work_id'])->where('process_id', $post['process_id'])->first(); - - $data = array(); - foreach ($work_form_data as $key => $value) { - - // 保存草稿不保存宏字段 - if ($value['class'] == 'auto' && $draft == true) { - continue; - } - - if ($value['class'] == 'listview') { - $_data = (array)json_decode($old[$key], true); - if (count($post[$key])) { - // 组合列表数据 - foreach ($post[$key] as $i => $row) { - foreach ($row as $j => $col) { - $_data[$i][$j] = $col; - } - } - // 重新组合列表顺序 - $__data = []; - foreach ($_data as $row) { - $__data[] = $row; - } - $data[$key] = json_encode($__data); - } - - } elseif (isset($post[$key])) { - // 授权写的字段 - if (in_array($value['title'], $write_field)) { - $data[$key] = $post[$key]; - } - } - } - - // 保存公共附件 - if ($post['attachment']) { - // 设置附件为已经使用 - $data['attachment'] = attachment_store('work_attachment', $post['attachment']); - } - - // 流程执行主表编号 - $data['process_id'] = $post['process_id']; - - $process = DB::table('work_process')->where('id', $post['process_id'])->first(); - - // 操作日志 - // action_log('work_process', $post['process_id'], 'workflow/workflow/view', 1, $process['name']); - - return $data; - } - - // 通知相关办理人 - public function notification($post) - { - $step = DB::table('work_step')->where('id', $post['step_id'])->first(); - $process = DB::table('work_process')->where('id', $post['process_id'])->first(); - - $notification_type = json_decode($step['notification_type'], true); - $notification_text = json_decode($step['notification_text'], true); - - if (empty($notification_type) or empty($notification_text)) { - return false; - } - - // 要通知的三种人: 发起人、经办人、会签人 - $notification_user = array($process['start_user_id'], $post['next_user_id'], $post['next_user_sign']); - - // 取得要通知的人信息 - $_users = DB::table('user')->whereIn('id', $notification_user)->get(['id', 'username', 'email', 'phone']); - $_users = array_by($_users); - - $users = []; - - foreach ($notification_type as $i => $type) { - $user_id = $notification_user[$i]; - $text = $notification_text[$i]; - - // 用户编号和提醒内容为空时跳过循环 - if (!$user_id || !$text || !$type) { - continue; - } - - if (is_array($type)) { - // 获取通知文本 - $users[$i]['text'] = $text; - - // 获取短信通知人 - if (in_array(1, $type) && $_users[$user_id]['phone']) { - $users[$i]['phone'] = $_users[$user_id]['phone']; - } - - // 获取邮件通知人 - if (in_array(2, $type) && $_users[$user_id]['email']) { - $users[$i]['email'] = $_users[$user_id]['email']; - } - - // 获取即时通通知人 - if (in_array(3, $type) && $_users[$user_id]['username']) { - $users[$i]['username'] = $_users[$user_id]['username']; - } - } - } - - foreach ($users as $user) { - $subject = '项目流程提醒! 主题：'.$process['title'].' - '.$user['text']; - $body = '您有新的工作流程办理:
工作主题: '.$process['title'].'
提醒内容: '.$user['text'].'
[点击办理]'; - - // 即时通知 - // NotificationService::site([$user['username']], $subject, $body); - - // 短信通知 - // SendSms::dispatch([$user['phone']], $subject); - - // 邮件通知 - // NotificationService::mail([$user['email']], $subject, $body); - } - return true; - } - - // 检查转入条件 - public function checkCondition($post) - { - // 读取表单结构 - $work_form_data = Workflow::getFormData($post['work_id']); - - // 获取用户职位 - $position = DB::table('user_position')->get(); - $position = array_by($position); - - // 发起工作用户信息 - $process = DB::table('work_process')->where('id', $post['process_id'])->first(); - - $start_user = Workflow::getMacroUser($process['start_user_id']); - $start_user['position_name'] = $position[$start_user['position']]['title']; - - // 当前经办工作用户信息 - $current_user = Workflow::getMacroUser(Auth::id()); - $current_user['position_name'] = $position[$current_user['position']]['title']; - - $form_data = array(); - $form_data['[发起人姓名]'] = "\$start_user['user_name']"; - $form_data['[发起人职位]'] = "\$start_user['position_name']"; - $form_data['[发起人岗位]'] = "\$start_user['role_name']"; - $form_data['[发起人部门]'] = "\$start_user['department_name']"; - - $form_data['[经办人姓名]'] = "\$current_user['user_name']"; - $form_data['[经办人职位]'] = "\$current_user['position_name']"; - $form_data['[经办人岗位]'] = "\$current_user['role_name']"; - $form_data['[经办人部门]'] = "\$current_user['department_name']"; - - $form_data['[步骤号]'] = "\$post['setp_id']"; - $form_data['[流程设计步骤号]'] = "\$post['step_number']"; - - // 未完成 - $form_data['[公共附件名称]'] = "\$post['attachment']"; - $form_data['[公共附件个数]'] = "\$post['attachment']"; - - // 组合表单名称和表名 - foreach ($work_form_data as $key => $row) { - $form_data['`'.$row['title'].'`'] = "\$post['".$key."']"; - } - - $_step = Db::table('work_step')->find($post['step_id']); - if ($_step['join']) { - $_join = explode(',', $_step['join']); - $rows = Db::table('work_step')->whereIn('id', $_join)->get()->toArray(); - } - - if (is_array($rows)) { - $step_condition = []; - $null_condition = 0; - - foreach ($rows as $step) { - - // 空条件时记录后跳出继续 - if (empty($step['condition'])) { - $null_condition ++; - continue; - } - - // 分析转入条件 - $condition = trim(str_replace("\n", " ", html_entity_decode($step['condition']))); - - // 替换表单名称为数据表名 - $condition = strtr($condition, $form_data); - - $test = eval("return $condition;"); - - // 条件满足记录步骤数组 - if ($test) { - $step_condition[] = $step; - } - } - // 有一种情况，多个转入步骤都是空条件, 或单转入步骤条件为空 - if (count($rows) == $null_condition) { - $step_condition = $rows; - } - } - return $step_condition; - } - - // 获取表单数据 - public function getFormData($work_id) - { - $file = storage_path('cache/workflow/form/'.$work_id.'.php'); - - if (!is_file($file)) { - Workflow::cacheForm($work_id); - } - return include $file; - } - - public function cacheForm($work_id, $update = 0) - { - $form = DB::table('work')->where('id', $work_id)->first(); - - if ($form) { - if ($update == 1) { - $form['template'] = preg_replace("/\\s+name\\s?=\\s?\"?data_\\d+\"?/i", "", $form['template']); - $form['count'] = 0; - } - - $template = Workflow::parseHTML($form['template'], $form['count']); - - $content = ""; - $path = storage_path('cache/workflow/form'); - - if (!is_dir($path)) { - mkdir($path, 0777, true); - } - file_put_contents($path.'/'.$work_id.'.php', $content); - - $data['template_short'] = $template[1]; - // 更新表单数量 - if ($update == 1) { - $data['count'] = count($template[0]); - } - - DB::table('work')->where('id', $work_id)->update($data); - return true; - } - return false; - } - - // 获取表单必填字段 - public function getRequired($check) - { - $data = array(); - $list = explode(',', $check); - foreach ($list as $value) { - $keys = explode('=', $value); - $data[$keys[0]] = $keys[1]; - } - return $data; - } - - // 解析表单 - public function parseForm($template_short, $work = array()) - { - $item_secret = $js = $jsonload = array(); - - $work_form_data = Workflow::getFormData($work['work_id']); - - // 获取字段列表 - $fields = array_by($work_form_data, 'title'); - - // 获取是否是必填字段 - $field_check = Workflow::getRequired($work['field_check']); - - foreach ($work_form_data as $key => $item) { - $id = $item['itemid']; - $tag = $item['tag']; - $element = $item['content']; - $value = $item['value']; - $title = $item['title']; - $class = $item['class']; - $style = $item['style']; - $hidden = $type = $item['type']; - $hide = $item['hide']; - $item_name = "data_".$id; - - if ($value == '/') { - $value = ''; - } - - // 把行高加上字体行高 - - if ($tag == 'input') { - $style = preg_replace_callback('/height:(\d+)px;/i', function ($match) { - $height = $match[1] < 28 ? $match[1] + 8 : $match[1]; - return 'height:'.$height.'px;line-height:'.($height-2).'px;'; - }, $style); - } - - // 设置隐藏字段 - if (array_find($work['field_secret'], $title)) { - $template_short = str_ireplace("{" . $item_name . "}", "", $template_short); - $item_secret[] = $id; - } - - $attribute = array('name'=>$item_name, 'id'=>$item_name, 'type'=>$type, 'class'=>$class, 'style'=>$style, 'title'=>$title); - - // 取得流程表单数据 - if ($work['step_number'] > 1) { - $item_value = $work['items'][$item_name]; - } else { - $item_value = empty($work['items'][$item_name]) ? $value : $work['items'][$item_name]; - } - - // 设置只读字段 - $readonly = true; - - // 打印标识 - $print = $work['printflag']; - - // 必填标识 - $required = $field_check[$title]; - - if (($work['work_type'] == 2 && array_find($work['freeitem'], $title)) || ($work['work_type'] == 1 && array_find($work['field_write'], $title)) && $work['opflag']) { - $readonly = false; - } - - switch ($class) { - - // 单行文本 - case "text": - $attribute['type'] = $hidden == true ? 'hidden' : 'text'; - $attribute['class'] = self::formRequired($readonly, $required); - $item_value = $print == true ? self::formDisplay($item_value, $attribute) : self::formText($item_name, $item_value, $attribute); - break; - - // 计算器组件 - case "calc": - - $attribute['type'] = $hidden == true ? 'hidden' : 'text'; - $attribute['class'] = self::formRequired($readonly, $required); - - if ($value == $item_value) { - $item_value = ''; - } - - if ($readonly === false) { - - // 分离计算函数 - $calc = preg_split("/[)(,\+\-\*\/\^\[\]]+/", $value); - $calc_type = $calc[0]; - - $var = ''; - switch ($calc_type) { - - case "LIST": - $s = $fields[$calc[1]]['name']; - $var = 'var v = listView.calc.list("'.$s.'",'.$calc[2].');'; - $var .= '$("#'.$item_name.'").val((isNaN(v) ? 0 : v));'; - break; - - case "LISTS": - $keys = ['LISTS(']; - $values = ['']; - foreach ($calc as $c) { - $c = trim($c); - list($f, $l) = explode(':', $c); - if ($c && isset($fields[$f])) { - $keys[] = $c; - $s = $fields[$f]['name']; - $values[] = 'listView.calc.list("'.$s.'",'.$l.')'; - } - } - $value = rtrim($value, ')'); - $var = 'var v = listView.calc.val('.str_replace($keys, $values, $value).', '.$item['prec'].');'; - $var .= '$("#'.$item_name.'").val(v);'; - break; - - case "MAX": - case "MIN": - case "AVG": - case "MOD": - case "ABS": - $params = []; - foreach ($calc as $i => $_calc) { - if ($i > 0) { - $_calc = $fields[$_calc]['name']; - $params[]= 'listView.calc.getVal("'.$_calc.'")'; - } - } - $n = strtolower($calc_type); - $var = 'var v = listView.calc.'.$n.'('.join(',', $params).');'; - $var .= '$("#'.$item_name.'").val(v);'; - break; - - case "SUM": - $params = []; - foreach ($calc as $i => $c) { - if ($i > 0) { - $c = $fields[$c]['name']; - $params[]= 'listView.calc.getVal("'.$c.'")'; - } - } - $var = 'var v = listView.calc.sum('.join(',', $params).');'; - $var .= '$("#'.$item_name.'").val(v);'; - break; - - case "RMB": - $s = $fields[$calc[1]]['name']; - $var = 'var v = listView.calc.rmb(listView.calc.getVal("'.$s.'"));'; - $var .= '$("#'.$item_name.'").val(v);'; - break; - - case "DATE": - case "DAY": - case "HOUR": - $s = $fields[$calc[1]]['name']; - $d = $fields[$calc[2]]['name']; - $n = strtolower($calc_type); - $var = 'var v = listView.calc.'.$n.'(listView.calc.getVal("'.$d.'", "date")-listView.calc.getVal("'.$s.'", "date"));'; - if ($calc_type != "DATE") { - $var .= 'v = isNaN(v) ? 0 : v;'; - } - $var .= '$("#'.$item_name.'").val(v);'; - break; - default: - $keys = $values = []; - foreach ($calc as $c) { - $c = trim($c); - if ($c && isset($fields[$c])) { - $keys[] = $c; - $values[] = 'listView.calc.getVal("'.$fields[$c]['name'].'")'; - } - } - $var = 'var v = listView.calc.val('.str_replace($keys, $values, $value).', '.$item['prec'].');'; - $var .= '$("#'.$item_name.'").val(v);'; - break; - } - $js[] = 'var timer = setInterval(function() {'.$var.'}, 1000);'; - } - $item_value = $print == true ? self::formDisplay($item_value, $attribute) : self::formText($item_name, $item_value, $attribute); - break; - - // 多行文本 - case "textarea": - $attribute['class'] = self::formRequired($readonly, $required); - $item_value = $print == true ? self::formDisplay(nl2br($item_value), $attribute) : self::formTextarea($item_name, $item_value, $attribute); - break; - - // 单选按钮 - case "radio": - $radio_field = explode('`', $item['radio_field']); - $radio_check = $item_value == '' ? $item['radio_check'] : $item_value; - $disabled = $readonly == true ? ' disabled' : ''; - $radio_value = null; - foreach ($radio_field as $k => $v) { - if ($v) { - $checked = $radio_check == $v ? ' checked' : ''; - $radio_value .= ' '; - } - } - $item_value = $print == true ? $item_value : $radio_value; - break; - - // 复选按钮 - case "checkbox checkbox-inline": - case "checkbox-inline": - case "checkbox": - $attribute['class'] = 'checkbox-inline'; - $checked = $item_value == "on" ? ' checked' : ''; - $readonly = $readonly == true ? ' onclick="this.checked='.($checked ? 1 : 0).';"' : ''; - if($print == true) { - $item_value = $item_value == 'on' ? ' ' : ' '; - } else { - $item_value = ''; - } - break; - - // 下拉菜单 - case "select": - $select_field = explode('`', $item['radio_field']); - $select_value = array(); - unset($attribute['value']); - $select_value[] = ''; - foreach ($select_field as $k => $v) { - if ($v) { - $selected = $item_value == $v ? " selected" : ''; - $select_value[] = ''; - } - } - $readonly == true ? $attribute['readonly'] = 'readonly' : ''; - $readonly == true ? $attribute['onfocus'] = 'this.defaultIndex=this.selectedIndex;' : ''; - $readonly == true ? $attribute['onchange'] = 'this.selectedIndex=this.defaultIndex;' : ''; - $item_value = $print == true ? $item_value : ''; - break; - - // 日历控件 - case "date": - $attribute['value'] = $item_value; - $attribute['autocomplete'] = 'off'; - $attribute['class'] = $readonly == true ? 'readonly': (isset($field_check[$title]) ? 'input-required': 'input-text'); - $readonly = $readonly == true ? ' readonly' : ' onfocus="datePicker({dateFmt:\''.$item['date_format'].'\'});"'; - $item_value = $print == true ? $item_value : ''; - break; - - // 宏控件 - case "auto": - $auto_value = ''; - $dataField = $item['datafld']; - $attribute['class'] = 'input-text'; - $attribute['autocomplete'] = 'off'; - if ($tag == 'input') { - switch ($dataField) { - // 当前日期，形如 1999-01-01 - case "sys_date": - $auto_value = date("Y-m-d"); - break; - - // 当前日期，形如 2009年1月1日 - case "sys_date_cn": - $auto_value = date("Y年m月d日"); - break; - - // 当前日期，形如 2009年1月 - case "sys_date_cn_short1": - $auto_value = date("Y年m月"); - break; - - // 当前日期，形如 1月1日 - case "sys_date_cn_short2": - $auto_value = date("m月d日"); - break; - - // 当前日期，形如 2009年 - case "sys_date_cn_short3": - $auto_value = date("Y年"); - break; - - // 当前年份，形如 2009 - case "sys_date_cn_short4": - $auto_value = date("Y"); - break; - - // 当前时间 - case "sys_time": - $auto_value = time(); - break; - - // 当前日期+时间 - case "sys_datetime": - $auto_value = date('Y-m-d H:i:s'); - break; - - // 当前星期中的第几天，形如 星期一 - case "sys_week": - $weekArray = array("日","一","二","三","四","五","六"); - $auto_value = "星期".$weekArray[date("w")]; - break; - - // 当前用户id - case "sys_user_id": - $auto_value = Auth::id(); - break; - - // 当前用户姓名 - case "sys_user_name": - $auto_value = Auth::user()->name; - break; - - // 当前用户部门(长名称) - case "sys_department_name": - $department = DB::table('department')->where('id', Auth::user()->department_id)->first(['id', 'name']); - $auto_value = $department['name']; - break; - - // 当前用户部门(短名称) - case "sys_department_short_name": - $department = DB::table('department')->where('id', Auth::user()->department_id)->first(['id', 'name']); - $auto_value = $department['name']; - break; - - // 当前用户职位 - case "sys_user_position": - $position = DB::table('user_position')->where('id', Auth::user()->post)->first(['id', 'name']); - $auto_value = $position['name']; - break; - - // 当前用户辅助职位 - case "sys_user_position_assist": - $position = DB::table('user_position')->where('id', Auth::user()->position_assist_id)->first(['id', 'name']); - $auto_value = $position['name']; - break; - - // 当前用户姓名+日期 - case "sys_user_name_date": - $auto_value = Auth::user()->name.date(' Y-m-d'); - break; - - // 当前用户姓名+日期+时间 - case "sys_user_name_datetime": - $auto_value = Auth::user()->name.date(' Y-m-d H:i:s'); - break; - - // 当前业务员姓名 - case "sys_salesman_name": - $user = DB::table('user')->where('id', Auth::user()->salesman_id)->first(['id', 'name']); - $auto_value = $user['name']; - break; - - // 当前业务员姓名 - case "sys_salesman_id": - $auto_value = Auth::user()->salesman_id; - break; - - // 工作流名称 - case "sys_workflow_name": - $auto_value = $work['work_title']; - break; - - // 工作主题 - case "sys_process_title": - $auto_value = $work['process']['title']; - break; - - // 工作文号 - case "sys_process_number": - $auto_value = $work['process']['number']; - break; - } - $attribute['type'] = $hide == true ? 'hidden' : 'text'; - $item_value = $item_value == '{auto}' ? '' : $item_value; - if ($readonly == false) { - $extend = ''; - $attribute['value'] = $item_value == '' ? $auto_value : $item_value; - - if (array_find($work['field_auto'], $title)) { - $extend = ' readonly'; - $attribute['class'] = 'readonly'; - } - } else { - $extend = ' readonly'; - $attribute['class'] = 'readonly'; - $attribute['value'] = $item_value; - } - $item_value = $print == true ? self::formDisplay($item_value, $attribute) : ''; - } - if ($tag == 'select') { - switch ($dataField) { - case "sys_date": - $auto_value = $cur_date; - break; - } - } - break; - - // 部门人员列表 - case "user": - $multi = $item['multi'] == 'true' ? 1 : 0; - $item_value = $print == true ? $item_value : Dialog::user($item['selecttype'], $item_name, $item_value, $multi, $readonly, $item['user_width']); - break; - - case "listview": - $field_title = explode("`", rtrim($item['lv_title'], "`")); - $field_size = explode("`", rtrim($item['lv_size'], "`")); - $field_sum = explode("`", rtrim($item['lv_sum'], "`")); - $field_type = explode("`", rtrim($item['lv_coltype'], "`")); - $field_value = explode("`", rtrim($item['lv_colvalue'], "`")); - - $table = $tbody = $thead = $tfoot = array(); - - $readonly == true; - $writes = $checks = []; - foreach ($field_title as $_title) { - $_name = $title.'['.$_title.']'; - if (array_find($work['field_write'], $_name)) { - $writes[] = true; - $readonly = false; - } else { - $writes[] = false; - } - if (isset($field_check[$_name])) { - $checks[] = $field_check[$_name]; - } else { - $checks[] = ''; - } - } - - $table[] = ''; - - $thead[] = ''; - $tfoot[] = ''; - foreach ($field_title as $k => $v) { - // 组合视图头 - $thead[] = ''; - // 组合视图脚合计 - $tfoot[] = ''; - } - - if ($readonly == false) { - $thead[] = ''; - $tfoot[] = ''; - } - - $thead[] = ''; - $tfoot[] = ''; - - $tbody[] = ''; - $table[] = join("\n", $thead); - $table[] = join("\n", $tbody); - $table[] = join("\n", $tfoot); - $table[] = '
序号
合计'.$v.'操作
'; - - $field = array('writes' => $writes, 'checks' => $checks, 'readonly'=>(int)$readonly,'size'=>$field_size,'sum'=>$field_sum,'type'=>$field_type,'value'=>$field_value); - - $js[] = 'listView.field.'.$key.' = '.json_encode($field).';'; - $js[] = 'listView.data.'.$key.' = '.(empty($item_value) ? '[]' : $item_value).';'; - $jsonload[] = 'listView.init("'.$key.'");'; - $item_value = join("\n", $table); - break; - default: - $item_value = ''; - } - $template_short = str_replace("{".$key."}", $item_value, $template_short); - } - return array('template'=>$template_short,'jsonload'=>join("\n", $jsonload),'js'=>join("\n", $js)); - } - - // 表单生成处理函数 - public function formRequired($readonly, $field) - { - $class = $readonly == true ? 'readonly': (isset($field) ? 'input-required': 'input-text'); - return $class; - } - - // 单行文本 - public function formText($item_name, $item_value, $attribute) - { - $attr = []; - unset($attribute['type']); - foreach ($attribute as $k => $v) { - if ($v) { - $attr[] = $k.'="'.$v.'"'; - } else { - $attr[] = $k; - } - } - return ''; - } - - // 多行文本 - public function formTextarea($item_name, $item_value, $attribute) - { - $attr = []; - unset($attribute['type']); - foreach ($attribute as $k => $v) { - if ($v) { - $attr[] = $k.'="'.$v.'"'; - } else { - $attr[] = $k; - } - } - return ''; - } - - // 表单生成处理函数 - public function formDisplay($value, $attribute) - { - unset($attribute['name'], - $attribute['type'], - $attribute['class'], - $attribute['value'], - $attribute['title'] - ); - - foreach ($attribute as $key => $val) { - if ($val) { - $_attribute[] = $key.'='.$val; - } else { - $_attribute[] = $key; - } - } - $_attribute = join(' ', $_attribute); - $value = ''.$value.''; - return $value; - } - - // 表单生成处理函数 - public function formAttribute($data) - { - $compiled = null; - foreach ($data as $key => $value) { - if ($value) { - $compiled .= ($compiled === null ? '' : ' ').$key.'="'.$value.'"'; - } - } - return $compiled; - } - - /** - * 创建工作流主表 - */ - public static function updateTable($workId) - { - $structure = array( - 'user' => "int NULL", - 'checkbox' => "nvarchar(30) NULL", - 'checkbox checkbox-inline' => "nvarchar(30) NULL", - 'select' => "nvarchar(120) NULL", - 'text' => "nvarchar(255) NULL", - 'textarea' => "nvarchar(max) NULL", - 'auto' => "nvarchar(100) NULL", - 'listview' => "nvarchar(max) NULL", - 'date' => "nvarchar(100) NULL", - 'calc' => "nvarchar(100) NULL", - 'radio' => "nvarchar(30) NULL", - ); - - $work_form_data = Workflow::getFormData($workId); - - $table ='work_data_'.$workId; - - // 检查当前流程数据主表是否存在 - $has_table = Schema::hasTable($table); - - $fields = []; - if ($has_table) { - $columns = Schema::getColumnListing($table); - foreach ($columns as $column) { - if (strpos($column, 'data_') !== false) { - $fields[] = $column; - } - } - } - - $sql_add = "CREATE TABLE IF NOT EXISTS `$table` ( - `id` mediumint(8) NOT NULL auto_increment COMMENT '工作主键', - `process_id` mediumint(8) NOT NULL default '0' COMMENT '执行流程编号', - `attachment` varchar(255) NOT NULL COMMENT '公共附件编号集', - `add_user_id` mediumint(8) NOT NULL default '0' COMMENT '发起人编号', - `add_time` int(10) NOT NULL default '0' COMMENT '发起时间',"; - - foreach ($work_form_data as $key => $data) { - // 新建表时字段组合 - $sql_add .= '`'.$key.'` '.$structure[$data['class']]." COMMENT '{$data['title']}',\n"; - // 更新表时字段组合 - if (in_array($key, $fields) == false) { - $sql_update[] = "ALTER TABLE $table ADD ".$key.' '.$structure[$data['class']]." COMMENT '{$data['title']}'"; - } - } - - $sql_add .= "PRIMARY KEY (`id`), - KEY `idx_process_id` (`process_id`), - KEY `idx_add_user_id` (`add_user_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8;"; - - // 更新或写入新表 - if ($has_table) { - if (is_array($sql_update)) { - foreach ($sql_update as $sql) { - DB::statement($sql); - } - } - } else { - DB::statement($sql_add); - } - return true; - } - - public static function parseHTML($print_model, $start = 0) - { - $print_model_new = $print_model_short = $print_model; - $pos = 0; - $len = strlen($print_model); - $item_id_max = $i = $start; - $j = 0; - while ($pos < $len) { - $pos = strpos($print_model, "<", $pos); - if ($pos === false) { - break; - } - if (substr($print_model, $pos + 1, 1) == "/") { - $pos += 2; - } else { - $pos1 = strpos($print_model, " ", $pos); - $pos2 = strpos($print_model, ">", $pos); - if ($pos2 < $pos1) { - $pos1 = $pos2; - } - $element_name = substr($print_model, $pos + 1, $pos1 - $pos - 1); - $element_name = strtolower($element_name); - $element = ""; - switch ($element_name) { - case "input": - $element = substr($print_model, $pos, $pos2 - $pos + 1); - $pos = $pos2 + 1; - break; - case "button": - $pos2 = stripos($print_model, "", $pos2 + 1); - $element = substr($print_model, $pos, $pos2 - $pos + 9); - $pos = $pos2 + 9; - break; - case "select": - $pos2 = stripos($print_model, "", $pos2 + 1); - $element = substr($print_model, $pos, $pos2 - $pos + 9); - $pos = $pos2 + 9; - break; - case "textarea": - $pos2 = stripos($print_model, "", $pos2 + 1); - $element = substr($print_model, $pos, $pos2 - $pos + 11); - $pos = $pos2 + 11; - break; - case "img": - $element_tmp = substr($print_model, $pos, $pos2 - $pos + 1); - $eclass = self::getattr($element_tmp, "class"); - if (array_find("listview,sign,radio,progressbar,imgupload,qrcode", $eclass)) { - $element = $element_tmp; - } - $pos = $pos2 + 1; - break; - default: - $pos = $pos2 + 1; - } - if ($element != "") { - $eclass = self::getattr($element, "class"); - $ename = self::getattr($element, "name"); - $etag = self::getattr($element, "tag"); - if (!strstr($ename, "data_")) { - ++$i; - $ename = "data_" . $i; - $element_new = self::setattr($element, "name", $ename); - $item_id = $i; - } else { - $item_id = intval(substr($ename, strpos($ename, "_") + 1)); - $element_new = $element; - if ($item_id_max < $item_id) { - $item_id_max = $item_id; - } - } - if (array_find("listview,sign,radio", $eclass)) { - $img_url = URL::to('assets')."/images/icon/"; - switch ($eclass) { - case "listview": - $img_url .= "icon-th-list.png"; - break; - case "sign": - $img_url .= "sign.gif"; - break; - case "radio": - $img_url .= "icon-ok-circle.png"; - } - $element_new = self::setattr($element_new, "src", $img_url); - } - $element_array[$ename]['itemid'] = $item_id; - $element_array[$ename]['tag'] = $etag; - $element_array[$ename]['content'] = $element_new; - $print_model_short = self::str_replace_once($element, "{" . $ename . "}", $print_model_short); - $print_model_new = self::str_replace_once($element, $element_new, $print_model_new); - $matches = self::getattr($element); - foreach ($matches[1] as $k => $attr) { - $attr = strtolower(trim($attr)); - $value = trim($matches[2][$k]); - $value = str_replace("\"", "", $value); - $element_array[$ename][$attr] = $value; - } - if (strtolower($etag) == "textarea" || strtolower($etag) == "select") { - $evalue = self::getattr($element, "value"); - $element_array[$ename]['value'] = $evalue; - } - $etype = self::getattr($element, "type"); - if (strtolower($etype) == "checkbox") { - $checked = self::getattr($element, "checked"); - $evalue = empty($checked) ? "" : "on"; - $element_array[$ename]['value'] = $evalue; - } - } - } - } - $item_id_max = $i < $item_id_max ? $item_id_max : $i; - $output = array($element_array, - $print_model_short, - $print_model_new, - $item_id_max - ); - return $output; - } - - public static function str_replace_once($needle, $replace, $haystack) - { - $pos = strpos($haystack, $needle); - if ($pos === false) { - return $haystack; - } - return substr_replace($haystack, $replace, $pos, strlen($needle)); - } - - public static function getattr($element, $attr = "") - { - $pos = strpos($element, " "); - $etag = substr($element, 1, $pos - 1); - if ($attr == "tag") { - return $etag; - } - if (strtolower($etag) == "textarea" && $attr == "value") { - $expr = "/>([^<>]+)\\s]+)/i"; - } else { - return; - } - preg_match_all($expr, $element, $matches); - $return = str_replace("\"", "", $matches[2][0]); - return $return; - } else { - $expr = "/\\s+(" . $attr_str . ")\\s*=\\s*(\"[^\"]+\"|[^>\\s]+)/i"; - preg_match_all($expr, $element, $matches); - } - return $matches; - } - - public static function setattr($element, $attr, $value) - { - $evalue = self::getattr($element, $attr); - if ($evalue) { - $element = str_ireplace("{$attr}={$evalue}", "", $element); - $element = str_ireplace("{$attr}=\"{$evalue}\"", "", $element); - } - $pos = strpos($element, " "); - $e_tag = substr($element, 1, $pos - 1); - $element = str_ireplace("<" . $e_tag, "<" . $e_tag . (" " . $attr . "=\"{$value}\""), $element); - return $element; - } -} diff --git a/app/Gdoo/Workflow/Models/WorkflowCategory.php b/app/Gdoo/Workflow/Models/WorkflowCategory.php deleted file mode 100644 index e70c00dd..00000000 --- a/app/Gdoo/Workflow/Models/WorkflowCategory.php +++ /dev/null @@ -1,8 +0,0 @@ - [ - "name" => "流程部件", - "actions" => [ - "efficiency" => [ - "name" => "流程效率", - ] - ] - ], - "monitor" => [ - "name" => "监控流程", - "actions" => [ - "summary" => [ - "name" => "汇总" - ] - ] - ], "category" => [ "name" => "流程类别", "actions" => [ @@ -103,60 +87,7 @@ return [ ] ] ], - "step" => [ - "name" => "步骤设计", - "actions" => [ - "index" => [ - "name" => "列表" - ], - "view" => [ - "name" => "查看" - ], - "save" => [ - "name" => "保存" - ], - "add" => [ - "name" => "新建" - ], - "edit" => [ - "name" => "编辑" - ], - "delete" => [ - "name" => "删除" - ] - ] - ], - "form" => [ - "name" => "表单设计", - "actions" => [ - "index" => [ - "name" => "列表" - ], - "view" => [ - "name" => "查看" - ], - "count" => [ - "name" => "新建" - ] - ] - ], - "design" => [ - "name" => "流程设计", - "actions" => [ - "index" => [ - "name" => "列表" - ], - "process" => [ - "name" => "编辑" - ], - "add" => [ - "name" => "新建" - ], - "delete" => [ - "name" => "删除" - ] - ] - ],"template" => [ + "template" => [ "name" => "视图", "actions" => [ "index" => [ diff --git a/app/Gdoo/Workflow/views/design/add.blade.php b/app/Gdoo/Workflow/views/design/add.blade.php deleted file mode 100644 index dd781ff2..00000000 --- a/app/Gdoo/Workflow/views/design/add.blade.php +++ /dev/null @@ -1,82 +0,0 @@ -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
流程名称 *
发起权限 * - {{App\Support\Dialog::search($row, 'id=auth_id&name=auth_name&multi=1')}} -
查询权限 * - {{App\Support\Dialog::search($row, 'id=query_id&name=query_name&multi=1')}} -
流程类型 * - - -
使用状态 * - - - -
所属类别 * - -
流程备注
- - - - -
- -
- -
diff --git a/app/Gdoo/Workflow/views/design/index.blade.php b/app/Gdoo/Workflow/views/design/index.blade.php deleted file mode 100644 index 03f57baa..00000000 --- a/app/Gdoo/Workflow/views/design/index.blade.php +++ /dev/null @@ -1,51 +0,0 @@ -
- -
- @include('design/query') -
- -
- - - - - - - - - - - - - @if($rows) - @foreach($rows as $row) - - - - - - - - - @endforeach - @endif - -
名称类别类型数量编号
{{$row['title']}}{{$categorys[$row->category_id]->title}} @if($row['type']==1) 固定 @else 自由 @endif 流程{{(int)$counts[$row->id]}}{{$row['id']}} - 表单设计 - 流程设计 - 预览 - 编辑 - 删除 -
-
- -
-
- -
- {{$rows->render()}} -
-
-
-
diff --git a/app/Gdoo/Workflow/views/design/query.blade.php b/app/Gdoo/Workflow/views/design/query.blade.php deleted file mode 100644 index 0b552acb..00000000 --- a/app/Gdoo/Workflow/views/design/query.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -
- - @if(isset($access['add'])) - 新建 - @endif - - @include('searchForm') - -
- \ No newline at end of file diff --git a/app/Gdoo/Workflow/views/form/index.blade.php b/app/Gdoo/Workflow/views/form/index.blade.php deleted file mode 100644 index 7daf50a8..00000000 --- a/app/Gdoo/Workflow/views/form/index.blade.php +++ /dev/null @@ -1,133 +0,0 @@ - - - - - -
- -
- -
-

{{$row['title']}}[{{$row['id']}}]

- -
- -
- -
-
- -
-
- -
- 单行文本 - 多行文本 - 下拉菜单 - 单选按钮 - 复选按钮 - 列表控件 - 宏控件 - 日历控件 - 计算控件 - 部门人员控件 - 图片上传控件 - - -
- -
- 预览 - 版本 - 关闭 -
- -
- 保存表单 -
-
-
-
- -
- - - - -
- - -
diff --git a/app/Gdoo/Workflow/views/form/review.blade.php b/app/Gdoo/Workflow/views/form/review.blade.php deleted file mode 100644 index 0cbbe14f..00000000 --- a/app/Gdoo/Workflow/views/form/review.blade.php +++ /dev/null @@ -1,18 +0,0 @@ - -
- {{$template}} -
diff --git a/app/Gdoo/Workflow/views/form/view.blade.php b/app/Gdoo/Workflow/views/form/view.blade.php deleted file mode 100644 index cb3fcb5a..00000000 --- a/app/Gdoo/Workflow/views/form/view.blade.php +++ /dev/null @@ -1,44 +0,0 @@ - - -
- -
- 工作表单 -
- -
- - - - -
-
-
- - -
- {{$template}} -
- - -
-
-
-
-
diff --git a/app/Gdoo/Workflow/views/mobile/file.blade.php b/app/Gdoo/Workflow/views/mobile/file.blade.php deleted file mode 100644 index d41e1399..00000000 --- a/app/Gdoo/Workflow/views/mobile/file.blade.php +++ /dev/null @@ -1,97 +0,0 @@ - - - - -@if($attach['auth']['add'] == true) - - 文件上传 -  文件大小限制{{$setting['upload_max']}} MB - - -@endif - -
-@if($attach['queue']) - @if($attach['queue']) - @foreach($attach['queue'] as $v) -
- {{$v['title']}} - ( - 上传者: {{get_user($v['add_user_id'], 'name')}} -  上传时间: @datetime($v['add_time']) -  大小: {{human_filesize($v['size'])}} - ) - - @if($attach['auth']['add'] == true) - 删除 - @endif - - -
- @endforeach - @endif -@endif -
- -
- @if($attach['draft']) - @foreach($attach['draft'] as $k => $v) -
- ! {{$v['title']}} - ( -  上传者: {{get_user($v['add_user_id'], 'name')}} -  上传时间: @datetime($v['add_time']) -  大小: {{human_filesize($v['size'])}} - ) - - @if($attach['auth']['add'] == true) - 删除 - @endif - - -
- @endforeach - @endif -
diff --git a/app/Gdoo/Workflow/views/monitor/query.blade.php b/app/Gdoo/Workflow/views/monitor/query.blade.php deleted file mode 100644 index f4e0fe37..00000000 --- a/app/Gdoo/Workflow/views/monitor/query.blade.php +++ /dev/null @@ -1,17 +0,0 @@ -
- @include('searchForm') -
- - \ No newline at end of file diff --git a/app/Gdoo/Workflow/views/monitor/summary.blade.php b/app/Gdoo/Workflow/views/monitor/summary.blade.php deleted file mode 100644 index c4f0d130..00000000 --- a/app/Gdoo/Workflow/views/monitor/summary.blade.php +++ /dev/null @@ -1,42 +0,0 @@ -
- -
- @include('monitor/query') -
- -
-
- - - - - - - - - - - - @foreach($rows as $row) - - - - - - - - @endforeach - -
姓名待办数量超过一天超过三天超过三十天
{{$row['name']}}{{$row['total']}}{{$row['a']}}{{$row['b']}}{{$row['c']}}
-
-
- -
-
- -
-
-
-
-
\ No newline at end of file diff --git a/app/Gdoo/Workflow/views/step/edit.blade.php b/app/Gdoo/Workflow/views/step/edit.blade.php deleted file mode 100644 index 06e5ae5c..00000000 --- a/app/Gdoo/Workflow/views/step/edit.blade.php +++ /dev/null @@ -1,820 +0,0 @@ - - - - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
流程名称
步骤序号
办理时限
- 小时 - - -
-
步骤类型 -
其他选项  -   - -
提醒发起人
- - -   -   - - -
-
提醒下一步经办人
- - -   -   - - -
-
提醒下一步会签人
- - -   -   - - -
-
下一步骤
- @if($rows) - @foreach($rows as $k => $v) -    - @endforeach - @endif -
-
-
- -
- - - - - - - - - - - - - - - - - - -
经办权限{{App\Support\Dialog::search($row,'id=permission_id&name=permission_name&multi=1')}}
选人过滤范围
- - -
-
自动选人规则
- - - - -
- - - - - - - -
- - -
- -
- -
- -
- - - - - - - - - - - - @if(isset($fields)) - - - - - - - - - - @if($fields) - @foreach($fields as $k => $v) - - - - - - - - @endforeach - @endif - - @endif -
字段名称控件类型
[流程公共附件]公共附件无
{{$v['title']}}{{$v['desc']}} - @if(!isset($v['datafld'])) -   - - @else - - @endif -
-
- -
- - -
-
-
- - -
diff --git a/app/Gdoo/Workflow/views/step/index.blade.php b/app/Gdoo/Workflow/views/step/index.blade.php deleted file mode 100644 index 5aae41af..00000000 --- a/app/Gdoo/Workflow/views/step/index.blade.php +++ /dev/null @@ -1,425 +0,0 @@ - - - - -
-
- {{$work['title']}} {{$work['id']}} -
-
- -
- -
- 新建步骤 - 重新加载 - 清空连接 -
- -
- -
- -
- - - - - -
- -
- -
-
基本信息
-
-
-
-
表单字段
-
-
-
-
办理人员
-
-
-
-
- -
- 保存连接和视图 -
- -
-
-
diff --git a/app/Gdoo/Workflow/views/widget/efficiency.blade.php b/app/Gdoo/Workflow/views/widget/efficiency.blade.php deleted file mode 100644 index 27382cd7..00000000 --- a/app/Gdoo/Workflow/views/widget/efficiency.blade.php +++ /dev/null @@ -1,97 +0,0 @@ -
-
-
- - - - \ No newline at end of file diff --git a/app/Gdoo/Workflow/views/workflow/add.blade.php b/app/Gdoo/Workflow/views/workflow/add.blade.php deleted file mode 100644 index c6bfef74..00000000 --- a/app/Gdoo/Workflow/views/workflow/add.blade.php +++ /dev/null @@ -1,37 +0,0 @@ -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
-
diff --git a/app/Gdoo/Workflow/views/workflow/correct.blade.php b/app/Gdoo/Workflow/views/workflow/correct.blade.php deleted file mode 100644 index d26b9116..00000000 --- a/app/Gdoo/Workflow/views/workflow/correct.blade.php +++ /dev/null @@ -1,34 +0,0 @@ -
- -
- -
- -
- @if($rows) - @foreach($rows as $row) -
- -
- @endforeach - @endif -
-
- - - - -
-
- - diff --git a/app/Gdoo/Workflow/views/workflow/edit.blade.php b/app/Gdoo/Workflow/views/workflow/edit.blade.php deleted file mode 100644 index 29196faa..00000000 --- a/app/Gdoo/Workflow/views/workflow/edit.blade.php +++ /dev/null @@ -1,285 +0,0 @@ - - -
-
-
-
- 保存草稿 - @if($work['step_number'] == 1) - 转下一步 - @else - 审批 - @endif - @if($work['last'] > 0 && $work['opflag'] == 1) - 退回 - @endif - @if($work['deny'] > 0 && $work['opflag'] == 1) - 拒绝 - @endif - @if($work['print'] > 0) - 打印 - @endif -
-
- -
- -
- 工作主题 -
- -
- - - - - - - - - - - - - - - - - - - - - -
工作主题{{$process['title']}}工作ID{{$process['id']}}
工作文号{{$process['name']}}重要等级 - {{:$levels = array(1=>'普通',2=>'重要',3=>'紧急')}} - {{$levels[$process['level']]}} -
发起人{{get_user($process['start_user_id'], 'name')}}工作描述{{$process['description']}}
-
-
- -
- -
- -
- 工作表单 -
- -
- - - - -
-
-
- - -
- {{$template}} -
- - -
-
-
-
-
- -
-
- 公共附件区 -
- -
- @if($attach['auth']['view'] == true) - @include('attachment/file') - @endif -
-
- -
- -
- 会签意见区 -
- -
-
-
- - - - - - - - - - - - diff --git a/app/Gdoo/Workflow/views/workflow/export.blade.php b/app/Gdoo/Workflow/views/workflow/export.blade.php deleted file mode 100644 index a36def42..00000000 --- a/app/Gdoo/Workflow/views/workflow/export.blade.php +++ /dev/null @@ -1,29 +0,0 @@ - - - -@foreach($columns as $column) - @if($column) - - @endif -@endforeach - - - -@foreach($rows as $row) - - @foreach($row as $key => $row) - - @if($key == 'id') - - @elseif($key == 'start_time') - - @elseif($key == 'end_user_id') - - @else - - @endif - - @endforeach - -@endforeach -
{{$column}}
{{$row}}{{$row}}{{$row}}{{$row}}
diff --git a/app/Gdoo/Workflow/views/workflow/index.blade.php b/app/Gdoo/Workflow/views/workflow/index.blade.php deleted file mode 100644 index a53ca074..00000000 --- a/app/Gdoo/Workflow/views/workflow/index.blade.php +++ /dev/null @@ -1,131 +0,0 @@ -
- -
-
    - @foreach($options as $k => $v) -
  • - {{$v}} -
    • - @endforeach -
-
- -
- -
- -
- - @if(isset($access['delete'])) - 删除 - @endif - - @if(isset($access['trash'])) - 回收站 - @endif - -
- - @if(isset($access['list'])) - 新建 - @endif - - @include('workflow/select') - -
-
- -
-
- - - - - - - - - - - - - - - - - @if($rows) - @foreach($rows as $row) - - - - - - - - - - - - - - - @endforeach - @endif - -
- - 主题 / 文号发起人发起时间步骤(点击查看)当前办理人状态ID发起到现在时间
- @if(isset($access['delete']) && ($row['start_user_id'] == Auth::id() || $access['delete'] == 4)) - - @else - - @endif - - @if($search['query']['option'] == 'todo') - {{$row['title']}} - @else - {{$row['title']}} - @endif -
{{$row['name']}}
- 		{{get_user($row['start_user_id'], 'name')}}@datetime($row['start_time']) - {{$row['step_number']}} - {{$row['step_name']}} -
- diffInHours($start); - } - */ - ?> -
- 		- {{get_user($row['step_user_id'], 'name')}} - - @if($row['end_time']) - 已结束 - @else - 执行中 - @endif - {{$row['id']}} - @if($search['query']['option'] == 'todo') - 办理 - @else - 查看 - @endif -
-
-
- -
-
- -
- {{$rows->render()}} -
-
-
-
diff --git a/app/Gdoo/Workflow/views/workflow/list.blade.php b/app/Gdoo/Workflow/views/workflow/list.blade.php deleted file mode 100644 index e16c5b4d..00000000 --- a/app/Gdoo/Workflow/views/workflow/list.blade.php +++ /dev/null @@ -1,83 +0,0 @@ - - -
-
-
-
-
可用流程列表
-
-
- -
-
-
- @if($categorys) - @foreach($categorys as $k => $cat) -
-
-
- {{$cat['title']}} -
- - @if($rows[$cat['id']]) - @foreach($rows[$cat['id']] as $row) - - - - @endforeach - @endif -
预览 {{$row['title']}}
-
-
- @endforeach - @endif -
-
-
- -
-
- - - - diff --git a/app/Gdoo/Workflow/views/workflow/log.blade.php b/app/Gdoo/Workflow/views/workflow/log.blade.php deleted file mode 100644 index 2227ac8c..00000000 --- a/app/Gdoo/Workflow/views/workflow/log.blade.php +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - @foreach($rows as $i => $row) - - - - - - - - - -@endforeach -
序号步骤办理内容办理人办理类型办理时间办理效率
- {{$row['number']}} - - @if($row['flag'] == 1) - {{$row['step_name']}} - @else - {{$row['step_name']}} - @endif - - {{$row[description]}} - - {{get_user($row['user_id'], 'name')}} - - @if($row[step_status] == 'back') - 退回 - @else - 审批 - @endif - - @datetime($row[deliver_time]) - - diffInHours($e).'小时'; - } else { - echo '无'; - } - $end = $start; - } - - ?> -
\ No newline at end of file diff --git a/app/Gdoo/Workflow/views/workflow/mobile/edit.blade.php b/app/Gdoo/Workflow/views/workflow/mobile/edit.blade.php deleted file mode 100644 index 374a5b63..00000000 --- a/app/Gdoo/Workflow/views/workflow/mobile/edit.blade.php +++ /dev/null @@ -1,274 +0,0 @@ - - -
- -
- 工作主题 -
- -
- - - - - - - - - - - - - - - - - - - - - -
工作主题{{$process['title']}}工作ID{{$process['id']}}
工作文号{{$process['name']}}重要等级 - {{:$levels = array(1=>'普通',2=>'重要',3=>'紧急')}} - {{$levels[$process['level']]}} -
发起人{{get_user($process['start_user_id'], 'name')}}工作描述{{$process['description']}}
-
-
- -
- -
- -
- 工作表单 -
- -
- - - - -
-
-
- - -
- {{$template}} -
- - -
-
-
-
-
- -
-
- 公共附件区 -
- -
- @if($attach['auth']['view'] == true) - @include('attachment/mobile/file') - @endif -
-
- -
- -
- 会签意见区 -
- -
- -
-
- - - - - - - - 保存草稿 - - @if($work['step_number'] == 1) - 转下一步 - @else - 审批 - @endif - - @if($work['last'] > 0 && $work['opflag'] == 1) - 退回 - @endif - - @if($work['deny'] > 0 && $work['opflag'] == 1) - 拒绝 - @endif - -
-
- -
- - - - diff --git a/app/Gdoo/Workflow/views/workflow/mobile/list.blade.php b/app/Gdoo/Workflow/views/workflow/mobile/list.blade.php deleted file mode 100644 index ff23e5bd..00000000 --- a/app/Gdoo/Workflow/views/workflow/mobile/list.blade.php +++ /dev/null @@ -1,75 +0,0 @@ -
- - @if($categorys) - @foreach($categorys as $key => $category) - -
- - @if($category) - @foreach($category as $k => $cat) - -
-
- {{$cat['title']}} -
- - - @if($rows[$cat['id']]) - @foreach($rows[$cat['id']] as $row) - - - - @endforeach - @endif -
{{$row['title']}}
-
- @endforeach - @endif -
- - @endforeach - @endif - -
- - diff --git a/app/Gdoo/Workflow/views/workflow/mobile/view.blade.php b/app/Gdoo/Workflow/views/workflow/mobile/view.blade.php deleted file mode 100644 index dbd5f110..00000000 --- a/app/Gdoo/Workflow/views/workflow/mobile/view.blade.php +++ /dev/null @@ -1,96 +0,0 @@ - - - - -
-
- 工作主题 -
- -
- - - - - - - - - - - - - - - - - - - - - -
工作主题{{$process['title']}}工作ID{{$process['id']}}
工作文号{{$process['name']}}重要等级 - {{:$levels = array(1=>'普通',2=>'重要',3=>'紧急')}} - {{$levels[$process['level']]}} -
发起人{{get_user($process['start_user_id'], 'name')}}工作描述{{$process['description']}}
-
-
- -
- -
- 工作表单 -
- -
- - - - -
-
-
- - -
- {{$template}} -
- - -
-
-
-
-
- -
- -
- 公共附件区 -
- -
- @if($attach['auth']['view'] == true) - @include('attachment/mobile/file') - @endif -
-
\ No newline at end of file diff --git a/app/Gdoo/Workflow/views/workflow/monitor.blade.php b/app/Gdoo/Workflow/views/workflow/monitor.blade.php deleted file mode 100644 index b0a0ea70..00000000 --- a/app/Gdoo/Workflow/views/workflow/monitor.blade.php +++ /dev/null @@ -1,131 +0,0 @@ -
- -
- -
- -
- @include('workflow/select_monitor') -
- -
-
- - - - - - - - - - - - - - - - - @if($rows) - @foreach($rows as $row) - - - - - - - - - - - - - - - - - - @endforeach - @endif - -
- - 主题 / 文号发起人发起时间当前主办人步骤(点击可查看各岗位处理时间)状态发起到现在时间ID
- - - {{$row['title']}} -
{{$row['name']}}
- 		{{get_user($row['start_user_id'], 'name')}}@datetime($row['start_time']) - {{get_user($row['step']['user_id'], 'name')}} - - {{$row['step']['number']}} - {{$row['step']['name']}} - - @if($row['end_time']) - 已结束 - @else - 执行中 - @endif - {{$row['id']}} - 纠正 -
-
-
- -
-
- -
- {{$rows->render()}} -
-
-
-
- - \ No newline at end of file diff --git a/app/Gdoo/Workflow/views/workflow/next.blade.php b/app/Gdoo/Workflow/views/workflow/next.blade.php deleted file mode 100644 index e337f301..00000000 --- a/app/Gdoo/Workflow/views/workflow/next.blade.php +++ /dev/null @@ -1,32 +0,0 @@ -
-
-
- -
- @if($rows) - @foreach($rows as $row) -
- -
- @endforeach - @endif -
-
- - - - -
-
- - diff --git a/app/Gdoo/Workflow/views/workflow/print.blade.php b/app/Gdoo/Workflow/views/workflow/print.blade.php deleted file mode 100644 index 02acdbff..00000000 --- a/app/Gdoo/Workflow/views/workflow/print.blade.php +++ /dev/null @@ -1,35 +0,0 @@ - - - - -
-{{$template}} -
diff --git a/app/Gdoo/Workflow/views/workflow/query_form.blade.php b/app/Gdoo/Workflow/views/workflow/query_form.blade.php deleted file mode 100644 index c06aa3ff..00000000 --- a/app/Gdoo/Workflow/views/workflow/query_form.blade.php +++ /dev/null @@ -1,365 +0,0 @@ -
- -
- -
- 统计报表选项 -
- -
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- {{App\Support\Dialog::user('user','start_user_id',$row->start_user_id, 0, 0)}} -
-
- -
- -
- -
-
- -
- -
-
-
从
- -
-
-
至
- -
-
-
- - - -
- -
- -
-
- - -
- -
- - - - - - - - - - - - - - - - - - - - - - - -
左括号字段条件值右括号逻辑 - -
- - - - - - - - - - - - -
- - - -
-
- -
-
- -
- -
- - - - - - - - - - - - @foreach($columns as $key => $column) - - - - - - - - @endforeach - - @foreach($fields as $field) - - - - - - - - @endforeach -
显示字段格式合计排序
- - - [{{$column['name']}}] - - {{$column['format']}} - - - - - - -
- - - - {{$field['title']}} - @if($field['class'] == 'listview') - -
- @foreach($trs as $i => $tr) - @if($tr) -   - @endif - @endforeach - @endif -
- 		- - - - - - - -
-
-
- -
- -
- -   - -
-
- -
- -
- -
-
- - - -
- - - -
- -
- - - - diff --git a/app/Gdoo/Workflow/views/workflow/query_list.blade.php b/app/Gdoo/Workflow/views/workflow/query_list.blade.php deleted file mode 100644 index 10a283d1..00000000 --- a/app/Gdoo/Workflow/views/workflow/query_list.blade.php +++ /dev/null @@ -1,33 +0,0 @@ -
- -@if($categorys) -@foreach($categorys as $key => $category) - -
- - @if($category) - @foreach($category as $k => $cat) - -
-
- - {{$cat['title']}} -
- - - @if($rows[$cat['id']]) - @foreach($rows[$cat['id']] as $row) - - - - @endforeach - @endif -
{{$row['title']}}
-
- @endforeach - @endif -
- -@endforeach -@endif -
diff --git a/app/Gdoo/Workflow/views/workflow/select.blade.php b/app/Gdoo/Workflow/views/workflow/select.blade.php deleted file mode 100644 index e0b2854f..00000000 --- a/app/Gdoo/Workflow/views/workflow/select.blade.php +++ /dev/null @@ -1,89 +0,0 @@ -@include('searchForm') - - \ No newline at end of file diff --git a/app/Gdoo/Workflow/views/workflow/select_monitor.blade.php b/app/Gdoo/Workflow/views/workflow/select_monitor.blade.php deleted file mode 100644 index 83a1e133..00000000 --- a/app/Gdoo/Workflow/views/workflow/select_monitor.blade.php +++ /dev/null @@ -1,106 +0,0 @@ -
- -
- - -
- - @include('searchForm') -
- \ No newline at end of file diff --git a/app/Gdoo/Workflow/views/workflow/timeout_count.blade.php b/app/Gdoo/Workflow/views/workflow/timeout_count.blade.php deleted file mode 100644 index 697e1668..00000000 --- a/app/Gdoo/Workflow/views/workflow/timeout_count.blade.php +++ /dev/null @@ -1,61 +0,0 @@ -
- -
- -
    - @foreach(Workflow::$_timeout as $_key => $_option) -
  • - {{$_option}} -
    • - @endforeach -
-
- -
-
-
- - -
-
-
- -
- - - - - - - - - - - - @if($rows) - @foreach($rows as $user_id => $row) - - - - - - - - @endforeach - @endif - -
人员办理总数超时数量(办理中)超时数量(已办理)超时总计
{{get_user($user_id, 'name')}}{{$row['count']}} - {{(int)$row['timeout_1']}} - - {{(int)$row['timeout_2']}} - - {{(int)$row['timeout_1'] + $row['timeout_2']}} -
-
-
diff --git a/app/Gdoo/Workflow/views/workflow/timeout_step.blade.php b/app/Gdoo/Workflow/views/workflow/timeout_step.blade.php deleted file mode 100644 index 3606af9e..00000000 --- a/app/Gdoo/Workflow/views/workflow/timeout_step.blade.php +++ /dev/null @@ -1,78 +0,0 @@ -
- -
- -
    - @foreach(Workflow::$_timeout as $_key => $_option) -
  • - {{$_option}} -
    • - @endforeach -
-
- -
-
-
- 办理状态 - - -
-
-
- -
- - - - - - - - - - - - - @if($rows) - @foreach($rows as $row) - - - - - - - - - @endforeach - @endif - -
编号主题 / 文号主办人步骤状态超时 / 办理时限
{{$row['id']}} - {{$row['title']}} -
{{$row['name']}}
- 		{{get_user($row['user_id'], 'name')}} - {{$row['step_number']}} - {{$row['step_name']}} - - @if($row['flag'] == 2) -
已办理
- @else -
办理中
- @endif - 		- {{remain_time(time(), $row['timeout_diff'] + time())}} -
{{$row['step_timeout']}}小时
-
-
- -
-
-
- {{$rows->render()}} -
-
-
-
diff --git a/app/Gdoo/Workflow/views/workflow/trash.blade.php b/app/Gdoo/Workflow/views/workflow/trash.blade.php deleted file mode 100644 index 701f3a52..00000000 --- a/app/Gdoo/Workflow/views/workflow/trash.blade.php +++ /dev/null @@ -1,99 +0,0 @@ -
- -
-
- -
- -
    - @if(isset($access['delete'])) -
  • 恢复
    • - @endif - @if(isset($access['destroy'])) -
  • -
  • 销毁
    • - @endif -
-
- - @include('workflow/select') -
-
- -
-
- - - - - - - - - - - - - - @if($rows) - @foreach($rows as $row) - - - - - - - - - - @endforeach - @endif - -
- - 主题 / 文号发起人当前主办人步骤状态ID
- @if(isset($access['delete']) && ($row['start_user_id'] == Auth::id() || $access['trash'] == 4)) - - @else - - @endif - - {{$row['title']}} -
{{$row['name']}}
- 		{{get_user($row['start_user_id'], 'name')}}{{get_user($row['step']['user_id'], 'name')}} - {{$row['step']['number']}} - {{$row['step']['name']}} - -
- diffInHours($start); - } */ - ?> -
- 		- @if($row['end_time']) - 已结束 - @else - 执行中 - @endif - {{$row['id']}}
-
-
- -
-
- -
- {{$rows->render()}} -
-
-
-
\ No newline at end of file diff --git a/app/Gdoo/Workflow/views/workflow/view.blade.php b/app/Gdoo/Workflow/views/workflow/view.blade.php deleted file mode 100644 index 337ff01b..00000000 --- a/app/Gdoo/Workflow/views/workflow/view.blade.php +++ /dev/null @@ -1,132 +0,0 @@ - - -
-
-
-
- 提取费用 - @if($work['print'] > 0) - 打印 - @endif -
-
- -
-
- 工作主题 -
- -
- - - - - - - - - - - - - - - - - - - - - -
工作主题{{$process['title']}}工作ID{{$process['id']}}
工作文号{{$process['name']}}重要等级 - {{:$levels = array(1=>'普通',2=>'重要',3=>'紧急')}} - {{$levels[$process['level']]}} -
发起人{{get_user($process['start_user_id'], 'name')}}工作描述{{$process['description']}}
-
-
- -
- -
- 工作表单 -
- -
- - - - -
-
-
- - -
- {{$template}} -
- - -
-
-
-
-
- -
- -
- 公共附件区 -
- -
- @if($attach['auth']['view'] == true) - @include('attachment/file') - @endif -
-
- -
-
- - \ No newline at end of file diff --git a/app/Support/AES.php b/app/Support/AES.php index 4afe296c..9e2ec013 100644 --- a/app/Support/AES.php +++ b/app/Support/AES.php @@ -38,7 +38,7 @@ class AES */ public static function encrypt($data, $key) { - $iv = openssl_random_pseudo_bytes(16); + $iv = openssl_random_pseudo_bytes(16); $encrypted = [ base64_encode($iv), openssl_encrypt($data, 'aes-256-cbc', $key, 0, $iv) @@ -56,8 +56,8 @@ class AES */ public static function decrypt($data, $key) { - $encrypt = json_decode(base64_decode($data), true); - $iv = base64_decode($encrypt[0]); + $encrypt = json_decode(base64_decode($data), true); + $iv = base64_decode($encrypt[0]); $decrypted = openssl_decrypt($encrypt[1], 'aes-256-cbc', $key, 0, $iv); return $decrypted; } diff --git a/app/Support/License.php b/app/Support/License.php index c65834ac..f6b68327 100644 --- a/app/Support/License.php +++ b/app/Support/License.php @@ -26,7 +26,7 @@ class License } /** - * 设置演示表，操作时候进行判断 + * 判断是否演示模式 */ public static function demoCheck($table = null) { diff --git a/app/macros.php b/app/macros.php index 2f5edb9b..64298d23 100644 --- a/app/macros.php +++ b/app/macros.php @@ -293,11 +293,6 @@ Builder::macro('permission', function ($field, $user = null, $null = false, $all } if ($children) { - $dep = explode(',', $us['deptpath']); - foreach ($dep as $deps) { - $_deps = str_replace(['[', ']'], ['', ''], $deps); - $where[] = db_instr($fids, 'd'.$_deps); - } } $sql = join(' or ', $where);