Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

朱继来 / 后台订单管理

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 0
  • Pipelines
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Files
  • Commits
  • Branches
  • Tags
  • Contributors
  • Graph
  • Compare
  • Charts
Commit 2dcca98e authored 7 years ago by 朱继来's avatar 朱继来
Browse files
Options
  • _('Browse Files')
  • Download
  • Plain Diff

Merge branch 'zjl_fake_data_20180319' into 'master'

添加竞调账号

See merge request !15
parents 1889b493 e808af2a
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
  • app/Http/Controllers/OrderController.php
app/Http/Controllers/OrderController.php
View file @ 2dcca98e
...@@ -245,6 +245,11 @@ Class OrderController extends Controller ...@@ -245,6 +245,11 @@ Class OrderController extends Controller
$data['sale_id'] = $request->user->userId; $data['sale_id'] = $request->user->userId;
} }
// 竞调账号
if ($info['username'] == 'vpadmin@ichunt.com') {
$map['is_fake'] = 1;
}
// 获取所有的业务员 (包括经理和交易员) // 获取所有的业务员 (包括经理和交易员)
// $sale_list = $this->getSales('销售'); // $sale_list = $this->getSales('销售');
$perm = new PermController; $perm = new PermController;
...@@ -299,6 +304,11 @@ Class OrderController extends Controller ...@@ -299,6 +304,11 @@ Class OrderController extends Controller
/* 查看ERP订单 */ /* 查看ERP订单 */
$map['offline_order'] = [2, 3]; // 2-ERP, 3-JD $map['offline_order'] = [2, 3]; // 2-ERP, 3-JD
// 竞调账号
if ($info['username'] == 'vpadmin@ichunt.com') {
$map['is_fake'] = 1;
}
// 获取所有的业务员 (包括经理和交易员) // 获取所有的业务员 (包括经理和交易员)
$perm = new PermController; $perm = new PermController;
$manager = $perm->getRoleUsers($request, '经理'); $manager = $perm->getRoleUsers($request, '经理');
......
This diff is collapsed. Click to expand it.
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment