From 427dabb95d745cf36b59f2cdab58221869d834aa Mon Sep 17 00:00:00 2001 From: hawind Date: Fri, 26 Feb 2021 05:52:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=89=93=E5=8D=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD=20=E5=8E=BB=E6=8E=89=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=89=8D=E7=AB=AF=E6=96=87=E4=BB=B6=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9D=83=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 19 +- README.md | 35 +- app/Gdoo/Index/Controllers/ApiController.php | 4 +- app/Gdoo/Index/Controllers/Controller.php | 9 +- .../Index/Services/NotificationService.php | 2 +- .../Index/views/dashboard/index.blade.php | 2 +- .../Index/views/dashboard/index2.blade.php | 501 ---- app/Gdoo/Index/views/index/support.blade.php | 12 +- .../Model/views/template/create.blade.php | 6 +- .../Order/Controllers/OrderController.php | 68 +- app/Gdoo/Order/Services/OrderService.php | 36 + .../Project/Controllers/TaskController.php | 6 +- .../Project/views/task/index/gantt.blade.php | 36 +- .../Project/views/task/index/index.blade.php | 32 +- .../Project/views/task/index/js.blade.php | 29 +- .../Controllers/StiReportController.php | 7 +- .../Stock/Controllers/DeliveryController.php | 93 +- app/Gdoo/Stock/Services/DeliveryService.php | 62 + .../Stock/views/delivery/print/112.blade.php | 2 +- app/Gdoo/System/views/media/qrcode.blade.php | 2 +- app/Gdoo/User/Services/UserService.php | 2 +- app/Gdoo/User/views/auth/login.blade.php | 23 +- app/Support/helpers.php | 16 +- public/assets/dist/bundle.min.js | 2 +- .../assets/vendor/stimulsoft/php/activate.php | 15 - .../assets/vendor/stimulsoft/php/designer.php | 63 - .../assets/vendor/stimulsoft/php/handler.php | 94 - public/assets/vendor/stimulsoft/php/index.php | 19 - .../assets/vendor/stimulsoft/php/render.php | 45 - .../php/stimulsoft/adapters/mssql.php | 181 -- .../php/stimulsoft/adapters/mysql.php | 161 -- .../stimulsoft/php/stimulsoft/classes.php | 225 -- .../stimulsoft/php/stimulsoft/helper.php | 443 --- .../stimulsoft/php/stimulsoft/license.key | 1 - .../stimulsoft/php/stimulsoft/license.php | 10 - .../assets/vendor/stimulsoft/php/viewer.php | 72 - public/assets/vendor/weui/example/example.css | 1 - public/assets/vendor/weui/example/example.js | 297 -- .../weui/example/images/icon_footer.png | Bin 1697 -> 0 bytes .../weui/example/images/icon_footer_link.png | Bin 1697 -> 0 bytes .../vendor/weui/example/images/icon_intro.png | Bin 748 -> 0 bytes .../example/images/icon_nav_actionSheet.png | Bin 15352 -> 0 bytes .../weui/example/images/icon_nav_article.png | Bin 425 -> 0 bytes .../weui/example/images/icon_nav_button.png | Bin 1232 -> 0 bytes .../weui/example/images/icon_nav_cell.png | Bin 196 -> 0 bytes .../weui/example/images/icon_nav_dialog.png | Bin 838 -> 0 bytes .../weui/example/images/icon_nav_feedback.png | Bin 924 -> 0 bytes .../weui/example/images/icon_nav_flow.png | Bin 1391 -> 0 bytes .../weui/example/images/icon_nav_form.png | Bin 200 -> 0 bytes .../weui/example/images/icon_nav_icons.png | Bin 1735 -> 0 bytes .../weui/example/images/icon_nav_layout.png | Bin 357 -> 0 bytes .../weui/example/images/icon_nav_msg.png | Bin 924 -> 0 bytes .../weui/example/images/icon_nav_nav.png | Bin 579 -> 0 bytes .../weui/example/images/icon_nav_panel.png | Bin 669 -> 0 bytes .../weui/example/images/icon_nav_progress.png | Bin 548 -> 0 bytes .../weui/example/images/icon_nav_search.png | Bin 1068 -> 0 bytes .../example/images/icon_nav_search_bar.png | Bin 1445 -> 0 bytes .../weui/example/images/icon_nav_special.png | Bin 495 -> 0 bytes .../weui/example/images/icon_nav_tab.png | Bin 521 -> 0 bytes .../weui/example/images/icon_nav_toast.png | Bin 701 -> 0 bytes .../weui/example/images/icon_nav_z-index.png | Bin 388 -> 0 bytes .../weui/example/images/icon_nav_zindex.png | Bin 388 -> 0 bytes .../weui/example/images/icon_tabbar.png | Bin 1176 -> 0 bytes .../weui/example/images/layers/content.png | Bin 86418 -> 0 bytes .../weui/example/images/layers/navigation.png | Bin 12688 -> 0 bytes .../weui/example/images/layers/popout.png | Bin 9243 -> 0 bytes .../example/images/layers/transparent.gif | Bin 1745 -> 0 bytes .../vendor/weui/example/images/logo.png | Bin 2751 -> 0 bytes .../vendor/weui/example/images/pic_160.png | Bin 2243 -> 0 bytes .../weui/example/images/pic_article.png | Bin 816 -> 0 bytes .../vendor/weui/example/images/vcode.jpg | Bin 2775 -> 0 bytes public/assets/vendor/weui/example/index.html | 1958 ------------- .../weui/example/snapshot/actionSheet.png | Bin 55293 -> 0 bytes .../vendor/weui/example/snapshot/button.png | Bin 113423 -> 0 bytes .../vendor/weui/example/snapshot/cell.png | Bin 56627 -> 0 bytes .../vendor/weui/example/snapshot/dialog1.png | Bin 16672 -> 0 bytes .../vendor/weui/example/snapshot/dialog2.png | Bin 18102 -> 0 bytes .../vendor/weui/example/snapshot/grid.png | Bin 17002 -> 0 bytes .../vendor/weui/example/snapshot/icons.png | Bin 18410 -> 0 bytes .../vendor/weui/example/snapshot/progress.png | Bin 9609 -> 0 bytes .../vendor/weui/example/snapshot/qrcode.png | Bin 392 -> 0 bytes .../vendor/weui/example/snapshot/result.png | Bin 110500 -> 0 bytes .../vendor/weui/example/snapshot/text.png | Bin 201114 -> 0 bytes .../vendor/weui/example/snapshot/toast1.png | Bin 101150 -> 0 bytes .../vendor/weui/example/snapshot/toast2.png | Bin 102314 -> 0 bytes .../assets/vendor/weui/example/zepto.min.js | 1 - public/assets/vendor/weui/weui.css | 2519 ----------------- public/mix-manifest.json | 2 +- resources/js/components/Notification.vue | 46 +- resources/views/attachment/qrcode.blade.php | 4 +- resources/views/errors/abort.blade.php | 2 +- resources/views/layouts/header.blade.php | 21 +- .../views/layouts/mobile/header.blade.php | 16 +- resources/views/layouts/print.blade.php | 33 +- resources/views/layouts/print3.blade.php | 6 +- resources/views/layouts/print4.blade.php | 2 +- resources/views/layouts/print_html.blade.php | 284 +- .../{print2.blade.php => print_pdf.blade.php} | 0 .../views/layouts/print_stiReport.blade.php | 254 +- resources/views/layouts/wechat.blade.php | 10 +- webpack.mix.js | 1 + 101 files changed, 442 insertions(+), 7350 deletions(-) delete mode 100644 app/Gdoo/Index/views/dashboard/index2.blade.php create mode 100644 app/Gdoo/Stock/Services/DeliveryService.php delete mode 100644 public/assets/vendor/stimulsoft/php/activate.php delete mode 100644 public/assets/vendor/stimulsoft/php/designer.php delete mode 100644 public/assets/vendor/stimulsoft/php/handler.php delete mode 100644 public/assets/vendor/stimulsoft/php/index.php delete mode 100644 public/assets/vendor/stimulsoft/php/render.php delete mode 100644 public/assets/vendor/stimulsoft/php/stimulsoft/adapters/mssql.php delete mode 100644 public/assets/vendor/stimulsoft/php/stimulsoft/adapters/mysql.php delete mode 100644 public/assets/vendor/stimulsoft/php/stimulsoft/classes.php delete mode 100644 public/assets/vendor/stimulsoft/php/stimulsoft/helper.php delete mode 100644 public/assets/vendor/stimulsoft/php/stimulsoft/license.key delete mode 100644 public/assets/vendor/stimulsoft/php/stimulsoft/license.php delete mode 100644 public/assets/vendor/stimulsoft/php/viewer.php delete mode 100644 public/assets/vendor/weui/example/example.css delete mode 100644 public/assets/vendor/weui/example/example.js delete mode 100644 public/assets/vendor/weui/example/images/icon_footer.png delete mode 100644 public/assets/vendor/weui/example/images/icon_footer_link.png delete mode 100644 public/assets/vendor/weui/example/images/icon_intro.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_actionSheet.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_article.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_button.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_cell.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_dialog.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_feedback.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_flow.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_form.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_icons.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_layout.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_msg.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_nav.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_panel.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_progress.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_search.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_search_bar.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_special.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_tab.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_toast.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_z-index.png delete mode 100644 public/assets/vendor/weui/example/images/icon_nav_zindex.png delete mode 100644 public/assets/vendor/weui/example/images/icon_tabbar.png delete mode 100644 public/assets/vendor/weui/example/images/layers/content.png delete mode 100644 public/assets/vendor/weui/example/images/layers/navigation.png delete mode 100644 public/assets/vendor/weui/example/images/layers/popout.png delete mode 100644 public/assets/vendor/weui/example/images/layers/transparent.gif delete mode 100644 public/assets/vendor/weui/example/images/logo.png delete mode 100644 public/assets/vendor/weui/example/images/pic_160.png delete mode 100644 public/assets/vendor/weui/example/images/pic_article.png delete mode 100644 public/assets/vendor/weui/example/images/vcode.jpg delete mode 100644 public/assets/vendor/weui/example/index.html delete mode 100644 public/assets/vendor/weui/example/snapshot/actionSheet.png delete mode 100644 public/assets/vendor/weui/example/snapshot/button.png delete mode 100644 public/assets/vendor/weui/example/snapshot/cell.png delete mode 100644 public/assets/vendor/weui/example/snapshot/dialog1.png delete mode 100644 public/assets/vendor/weui/example/snapshot/dialog2.png delete mode 100644 public/assets/vendor/weui/example/snapshot/grid.png delete mode 100644 public/assets/vendor/weui/example/snapshot/icons.png delete mode 100644 public/assets/vendor/weui/example/snapshot/progress.png delete mode 100644 public/assets/vendor/weui/example/snapshot/qrcode.png delete mode 100644 public/assets/vendor/weui/example/snapshot/result.png delete mode 100644 public/assets/vendor/weui/example/snapshot/text.png delete mode 100644 public/assets/vendor/weui/example/snapshot/toast1.png delete mode 100644 public/assets/vendor/weui/example/snapshot/toast2.png delete mode 100644 public/assets/vendor/weui/example/zepto.min.js delete mode 100644 public/assets/vendor/weui/weui.css rename resources/views/layouts/{print2.blade.php => print_pdf.blade.php} (100%) diff --git a/.env.example b/.env.example index 77c5be2d..57046dd6 100644 --- a/.env.example +++ b/.env.example @@ -49,27 +49,24 @@ MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" # 即时通讯 -REALTIME_KEY=fsmDyhOBxjUo8Nksd0EAlyJWT4jtfSAO +REALTIME_KEY= REALTIME_URL=ws://192.168.0.2:6002/realtime REALTIME_API=http://192.168.0.2:6002/api -# 二次验证开关 -AUTH_TOTP_STATUS=false +# 是否二次验证 +AUTH_TOTP=false -# 微信推送 -WECHAT_MESSAGE_PUSH_STATUS=false +# 是否微信推送 +WECHAT_MESSAGE_PUSH=false # 外部接口 -PLUGIN_SYNC_API_STATUS=false PLUGIN_SYNC_API_URL= # PRINCE转换 PRINCE_DIR=E:/develop/Prince/engine/bin/prince.exe -# 添加ag-grid授权 -AGGRID_LICENSE= +# ag-grid授权 +AGGRID_LICENSE="agGrid.LicenseManager.setLicenseKey('key');" -# 演示版本 +# 演示模式 DEMO_VERSION=false - -DEMO_DATA="agGrid.LicenseManager.prototype.validateLicense = function() {}" diff --git a/README.md b/README.md index 10b0710f..0bb30d8c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,13 @@ [![release][release-badge]][release-link] ## 介绍 -本系统是给企业定制开发的，基于laravel 8.x框架开发。基本进销存功能、营销管理功能、业务员销售团队分级管理、支持客户自主下单。 +1. 进销存功能、营销管理功能、简单生产计划、业务员销售团队分级管理、支持客户任务和业务员任务进度统计、支持客户自主下单。特别注重销售管理、业绩分析。 +2. 主要为食品行业生产型和贸易企业定制开发。 +3. 包括强大的自定义功能，模型字段(自定义跨表映射功能、视图管理、流程管理、字段权限管理) + + +## 架构 +基于PHP框架Laravel 8.x + MySQL 8.x ## 申明 @@ -75,16 +81,25 @@ QQ交流群: 79446405 ![h5兼容](http://demo.gdoo.net/uploads/demo/12.png) -## 架构 -基于PHP框架Laravel 8.x + MySQL 8.x - ## 安装 - 1. 上传压缩包到目录，这里推荐使用宝塔面板，安装php-8.x、mysql-8.x、nginx - 2. 然后使用 composer install --no-dev 安装依赖 - 3. 如果要修改前端文件请执行 yarn install 安装依赖 - 4. 最后导入 database/gdoo-2.2.sql - 5. 然后执行 php artisan key:generate - 6. 修改.env相关配置 +1. 推荐使用宝塔面板，安装nginx 1.18.x、php-8.x(需要扩展：fileinfo)、mysql-8.x(mariaDB 10.4.x)，如果你使用win请自行安装相关环境 +2. 创建网站和数据库, 数据库字符utf8mb4, 在网站目录中设置PHP命令行版本为php-80 +3. 下载gdoo: https://gitee.com/hawind/gdoo 上传至宝塔网站根目录并解压 +4. 打开Xshell并登录, 执行 composer -v 查看composer版本, 执行 composer self-update 升级composer至最新版本 +5. 切换命令行到网站根目录 cd /www/wwwroot/yousite +6. 执行 composer install --no-dev 安装依赖 +7. 执行 cp .env.example .env 并修改相关配置 +8. 执行 php artisan key:generate +9. 打开宝塔数据库管理： + 1. 将项目database目录中的 gdoo-2.2.sql 文件上传并导入到数据库 +10. 打开宝塔网站管理： + 1. 设置运行目录为public + 2. 设置伪静态为laravel5 +11. 打开网站并用 admin/123456 登录 + +## 开发 +1. 请在项目根目录执行 yarn install 安装前端依赖 +2. 待续 [license-badge]: https://img.shields.io/badge/license-apache2-blue.svg [license-link]: LICENSE diff --git a/app/Gdoo/Index/Controllers/ApiController.php b/app/Gdoo/Index/Controllers/ApiController.php index f2b1300d..1417a88d 100644 --- a/app/Gdoo/Index/Controllers/ApiController.php +++ b/app/Gdoo/Index/Controllers/ApiController.php @@ -30,8 +30,8 @@ class ApiController extends Controller $settings['public_url'] = URL::to('/'); $settings['upload_file_type'] = $this->setting['upload_type']; $settings['upload_max_size'] = $this->setting['upload_max']; - $settings['openSource'] = $this->openSource; - + $settings['realtime'] = not_empty(env('REALTIME_KEY')); + header('Content-type: text/javascript'); echo 'var settings = '. json_encode($settings, JSON_UNESCAPED_UNICODE); exit; diff --git a/app/Gdoo/Index/Controllers/Controller.php b/app/Gdoo/Index/Controllers/Controller.php index 2ff5b924..7f3ef03a 100644 --- a/app/Gdoo/Index/Controllers/Controller.php +++ b/app/Gdoo/Index/Controllers/Controller.php @@ -27,11 +27,6 @@ class Controller extends BaseController */ public $powered = 'Gdoo'; - /** - * @var 是否开源版 - */ - public $openSource = false; - /** * @var 配置参数 */ @@ -79,14 +74,14 @@ class Controller extends BaseController $this->ret = RetService::make(); View::share([ - 'title' => 'GdooOA', + 'title' => 'Gdoo', 'setting' => $this->setting, 'public_url' => URL::to('/'), 'upload_url' => URL::to('/uploads'), 'static_url' => URL::to('/static'), 'asset_url' => URL::to('/assets'), 'version' => $this->version, - 'openSource' => $this->openSource, + 'licenseType' => env('LICENSE_TYPE'), 'resVersion' => $this->resVersion, ]); } diff --git a/app/Gdoo/Index/Services/NotificationService.php b/app/Gdoo/Index/Services/NotificationService.php index c46ad26d..5e41ea3d 100644 --- a/app/Gdoo/Index/Services/NotificationService.php +++ b/app/Gdoo/Index/Services/NotificationService.php @@ -16,7 +16,7 @@ class NotificationService */ public static function wechatTemplate($users, $content) { - if (env('WECHAT_MESSAGE_PUSH_STATUS') === false) { + if (env('WECHAT_MESSAGE_PUSH') === false) { return false; } diff --git a/app/Gdoo/Index/views/dashboard/index.blade.php b/app/Gdoo/Index/views/dashboard/index.blade.php index 54940b21..7c932eea 100644 --- a/app/Gdoo/Index/views/dashboard/index.blade.php +++ b/app/Gdoo/Index/views/dashboard/index.blade.php @@ -291,7 +291,7 @@ a { outline: none; }
- {{$version}} {{$openSource ? '开源版' : '企业版'}} + {{$version}} {{$licenseType ? $licenseType : '开源版'}}
diff --git a/app/Gdoo/Index/views/dashboard/index2.blade.php b/app/Gdoo/Index/views/dashboard/index2.blade.php deleted file mode 100644 index e85580b9..00000000 --- a/app/Gdoo/Index/views/dashboard/index2.blade.php +++ /dev/null @@ -1,501 +0,0 @@ - - -
- -
-
- - - -
-
-
- - -
-
- - -
-
-
- -
-
-
- @forelse($quicks as $quick) -
- -
- - 0 -
-
{{$quick['name']}}
- -
- @empty -
- -
- -
-
添加快捷
- -
- @endforelse -
-
- -
- @foreach($infos as $info) - @if($info['status']) -
- -
- -
-
{{$info['name']}}
- -
- -
-
-
较上月
-
50%
-
-
- -
- @endif - @endforeach -
- -
- @foreach($grids as $grid) -
- @foreach($widgets as $widget) - @if($widget['status']) - @if($widget['grid'] == $grid) -
-
-
- {{$widget['name']}} -
-
-
- -
- @endif - @endif - @endforeach -
- @endforeach -
-
-
- -
-
- {{$version}} {{$openSource ? '开源版' : '企业版'}} -
-
- - - - \ No newline at end of file diff --git a/app/Gdoo/Index/views/index/support.blade.php b/app/Gdoo/Index/views/index/support.blade.php index 043b06a1..663a20f9 100644 --- a/app/Gdoo/Index/views/index/support.blade.php +++ b/app/Gdoo/Index/views/index/support.blade.php @@ -5,7 +5,7 @@ 软件版本 - {{$version}} {{$openSource ? '开源版' : '企业版'}} + {{$version}} {{$licenseType ? $licenseType : '开源版'}} @@ -26,11 +26,19 @@ - 支持方式 + 联系方式 15182223008(电话/微信) + + + QQ交流群 + + + 79446405 + + diff --git a/app/Gdoo/Model/views/template/create.blade.php b/app/Gdoo/Model/views/template/create.blade.php index 11cf008b..38c15b44 100644 --- a/app/Gdoo/Model/views/template/create.blade.php +++ b/app/Gdoo/Model/views/template/create.blade.php @@ -224,10 +224,10 @@
- - + +
diff --git a/app/Gdoo/Order/Controllers/OrderController.php b/app/Gdoo/Order/Controllers/OrderController.php index 846d2391..f70b7399 100644 --- a/app/Gdoo/Order/Controllers/OrderController.php +++ b/app/Gdoo/Order/Controllers/OrderController.php @@ -773,50 +773,40 @@ class OrderController extends WorkflowController // 显示促销 public function printAction() { - $this->layout = 'layouts.print2'; - $id = Request::get('id'); $template_id = Request::get('template_id'); - if ($template_id == 121) { + $template = DB::table('model_template')->where('id', $template_id)->first(); + $print_type = $template['print_type']; + $this->layout = 'layouts.print_'.$print_type; + $print_tpl = view()->exists(Request::controller().'.print.'.$template_id); - $master = DB::table('customer_order as co')->where('co.id', $id) - ->leftJoin('customer as c', 'c.id', '=', 'co.customer_id') - ->leftJoin('customer_tax as ct', 'ct.id', '=', 'co.tax_id') - ->leftJoin('sale_type as st', 'st.id', '=', 'co.type_id') - ->selectRaw('co.*, ct.name as tax_name, c.name as customer_name, st.name as type_name') - ->first(); + $form = [ + 'template' => $template, + ]; - $rows = DB::table('customer_order_data as cod') - ->leftJoin('customer_order as co', 'co.id', '=', 'cod.order_id') - ->leftJoin('product as p', 'p.id', '=', 'cod.product_id') - ->leftJoin('product_unit as pu', 'pu.id', '=', 'p.unit_id') - ->leftJoin('customer_order_type as cot', 'cot.id', '=', 'cod.type_id') - ->where('co.id', $id) - ->selectRaw(' - cod.*, - cod.delivery_quantity * p.weight as total_weight, - p.name as product_name, - p.spec as product_spec, - cot.name as type_name, - pu.name as product_unit, - p.material_type, - p.product_type - ') - ->get(); - - $form = [ - 'template' => DB::table('model_template')->where('id', $template_id)->first() - ]; - - $tpl = $this->display([ - 'master' => $master, - 'rows' => $rows, - 'form' => $form, - ], 'print/'.$template_id); - } else { - $tpl = $this->createAction('print'); + if ($print_tpl) { + $data = OrderService::getPrintData($id); + $data['form'] = $form; + $data['template'] = $template; + $tpl = $this->display($data, 'print/'.$template_id); + return $print_type == 'pdf' ? print_prince($tpl) : $tpl; } - print_prince($tpl); + + if ($print_type == 'stiReport') { + $data = OrderService::getPrintData($id); + $print_data = [ + 'master' => [$data['master']], + 'money' => $data['money'], + 'customer_order_data' => $data['rows'], + ]; + return $this->display([ + 'template' => $template, + 'print_data' => $print_data, + ]); + } + + $tpl = $this->createAction('print'); + return $print_type == 'pdf' ? print_prince($tpl) : $tpl; } /** diff --git a/app/Gdoo/Order/Services/OrderService.php b/app/Gdoo/Order/Services/OrderService.php index f881fc75..40046fe6 100644 --- a/app/Gdoo/Order/Services/OrderService.php +++ b/app/Gdoo/Order/Services/OrderService.php @@ -14,6 +14,42 @@ class OrderService return BadgeService::getModelTodo('customer_order'); } + /** + * 自定义查询打印数据 + */ + public static function getPrintData($id) + { + $master = DB::table('customer_order as co')->where('co.id', $id) + ->leftJoin('customer as c', 'c.id', '=', 'co.customer_id') + ->leftJoin('customer_tax as ct', 'ct.id', '=', 'co.tax_id') + ->leftJoin('sale_type as st', 'st.id', '=', 'co.type_id') + ->selectRaw('co.*, ct.name as tax_name, c.name as customer_name, st.name as type_name') + ->first(); + + $rows = DB::table('customer_order_data as cod') + ->leftJoin('customer_order as co', 'co.id', '=', 'cod.order_id') + ->leftJoin('product as p', 'p.id', '=', 'cod.product_id') + ->leftJoin('product_unit as pu', 'pu.id', '=', 'p.unit_id') + ->leftJoin('customer_order_type as cot', 'cot.id', '=', 'cod.type_id') + ->where('co.id', $id) + ->selectRaw(' + cod.*, + cod.delivery_quantity * p.weight as total_weight, + p.name as product_name, + p.spec as product_spec, + cot.name as type_name, + pu.name as product_unit, + p.material_type, + p.product_type + ') + ->get(); + + return [ + 'master' => $master, + 'rows' => $rows, + ]; + } + /** * 获取为使用的促销id * diff --git a/app/Gdoo/Project/Controllers/TaskController.php b/app/Gdoo/Project/Controllers/TaskController.php index 5524a452..3b256ea4 100644 --- a/app/Gdoo/Project/Controllers/TaskController.php +++ b/app/Gdoo/Project/Controllers/TaskController.php @@ -123,7 +123,7 @@ class TaskController extends DefaultController 'name' => $_item['name'], 'type' => $_item['type'], 'created_at' => '', - 'user_id' => '', + 'user_id' => 0, 'user_name' => '', 'open' => true, 'option_edit' => $project_user_id, @@ -154,7 +154,9 @@ class TaskController extends DefaultController $_task['open'] = true; $_task['loaded'] = true; $_task['expanded'] = true; - $_task['created_at'] = format_datetime($_item['created_at']); + $_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'], ''); diff --git a/app/Gdoo/Project/views/task/index/gantt.blade.php b/app/Gdoo/Project/views/task/index/gantt.blade.php index db63d7b3..a6e9a245 100644 --- a/app/Gdoo/Project/views/task/index/gantt.blade.php +++ b/app/Gdoo/Project/views/task/index/gantt.blade.php @@ -3,9 +3,6 @@ - diff --git a/resources/views/layouts/print3.blade.php b/resources/views/layouts/print3.blade.php index 8de848bd..70db8e44 100644 --- a/resources/views/layouts/print3.blade.php +++ b/resources/views/layouts/print3.blade.php @@ -3,9 +3,9 @@ {{$setting['title']}} - - - + + + - - - - - - - -
-
-
- @if($form['print_type'] == 'stiReport') - HTML打印 - 打印 - 模板设计 - @else - 打印 - @endif - 关闭 -
-

打印预览

-
-
- -
-
- -
-
-
- -
- -
-
{{$setting['print_title']}}{{$form['template']['name']}}
-
- {{$content}} -
-
-
- - +@include('layouts/print') \ No newline at end of file diff --git a/resources/views/layouts/print2.blade.php b/resources/views/layouts/print_pdf.blade.php similarity index 100% rename from resources/views/layouts/print2.blade.php rename to resources/views/layouts/print_pdf.blade.php diff --git a/resources/views/layouts/print_stiReport.blade.php b/resources/views/layouts/print_stiReport.blade.php index 07760817..c8e9af68 100644 --- a/resources/views/layouts/print_stiReport.blade.php +++ b/resources/views/layouts/print_stiReport.blade.php @@ -3,9 +3,9 @@ {{$setting['title']}} - - - + + +