Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 83c40a4f by 朱继来
Options

Merge branch 'zjl_erp_syn_20190514' into development

parents 0f03f375 9ee1a62c
Inline Side-by-side
Showing with 178 additions and 97 deletions
app/Http/Controllers/OrderController.php
......@@ -188,6 +188,8 @@ function getOrderSource($order_id, $order_type=1)
$source = '移动端';
} else if (preg_match('/pf=6/', $order_source->order_source)) {
$source = '小程序';
} else if (preg_match('/pf=7/', $order_source->order_source)) {
$source = '象牙宝';
} else {
$source = '未知';
}
......@@ -403,8 +405,8 @@ Class OrderController extends Controller
$map['is_new_order'] = $request->input('is_new_order', '');
$map['business_type'] = $request->input('business_type', '');
// 订单查看权限---交易员、客服、测试
if (in_array($info['role'], [3, 4])) {
// 订单查看权限---交易员、客服、自营客服
if (in_array($info['role'], [3, 4, 7])) {
// 筛选自己的订单
$map['sale_id'] = $request->user->userId;
}
......@@ -448,14 +450,17 @@ Class OrderController extends Controller
// 获取所有的业务员 （包括经理、交易员、客服、测试）
$perm = new PermController;
if ($tid == 1 || $tid == 3) {
if ($tid == 1) {
$manager = $perm->getRoleUsers($request, '经理');
$test = $perm->getRoleUsers($request, '测试');
$sales = $perm->getRoleUsers($request, '交易员');
$kefu = $perm->getRoleUsers($request, '客服');
$sale_list = array_merge($manager, $sales, $test, $kefu);
} else {
$sale_list = $perm->getRoleUsers($request, '客服');
} else if ($tid == 2) {
$manager = $perm->getRoleUsers($request, '自营客服主管');
$test = $perm->getRoleUsers($request, '测试');
$kefu = $perm->getRoleUsers($request, '自营客服');
$sale_list = array_merge($manager, $test, $kefu);
}
//获取订单列表
......@@ -822,15 +827,21 @@ Class OrderController extends Controller
$info = $this->orderDetail($request, $id);
$this->pageHeader($request, $info, '推送业务员', ["title" => '推送业务员', "href" => '#']);
// 获取所有的业务员
$sale_list = $this->getSales('销售');
$perm = new PermController;
$manager = $perm->getRoleUsers($request, '经理');
$test = $perm->getRoleUsers($request, '测试');
$sale_list = $perm->getRoleUsers($request, '交易员');
$kefu = $perm->getRoleUsers($request, '客服');
$tags = $request->input('tags', '');
if ($tags && $tags == 'self') {
$manager = $perm->getRoleUsers($request, '自营客服主管');
$test = $perm->getRoleUsers($request, '测试');
$sale_list = '';
$kefu = $perm->getRoleUsers($request, '自营客服');
} else {
$manager = $perm->getRoleUsers($request, '经理');
$test = $perm->getRoleUsers($request, '测试');
$sale_list = $perm->getRoleUsers($request, '交易员');
$kefu = $perm->getRoleUsers($request, '客服');
}
$info['manager'] = $this->filterLeave($manager);
$info['test'] = $this->filterLeave($test);
......@@ -1244,6 +1255,7 @@ Class OrderController extends Controller
'user_mobile' => $mobile,
'order_info' => $temp['data']['order_info'],
'user_info' => $temp['data']['order_info']['user_info'],
'company_info' => $temp['data']['order_info']['company_info'],
'order_invoice_info' => $temp['data']['order_invoice_info'],
'order_items_info' => $temp['data']['order_items_info'],
'order_address_info' => $temp['data']['order_address_info'],
......
app/Http/Controllers/PermController.php
......@@ -88,6 +88,8 @@
return 8;
} else if ($department->name == '财务') {
return 9;
} else if ($department->name == '自营客服主管') {
return 10;
} else {
return 0;
}
......
app/Model/OrderModel.php
......@@ -140,6 +140,7 @@ class OrderModel extends Model
case '1':
case '2':
case '6':
case '7':
$string .= "FIND_IN_SET('pf=".$v."', o.order_source) OR ";
break;
case '3':
......@@ -256,17 +257,11 @@ class OrderModel extends Model
// 订单数据处理
$cellData = $this->exportList($list);
if ($map['order_goods_type'] == 1) {
$sale_name = '推送业务员';
} else {
$sale_name = '客服';
}
// 标题
if ($map['order_goods_type'] == 1) {
$headerCell = ['订单ID', '订单编号', '会员账号', '是否为新订单', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', $sale_name, '商品总额', '运费', '附加费', '优惠券', '订单总额', '付款类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注', '是否为测试订单'];
$headerCell = ['订单ID', '订单编号', '会员账号', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', '客服', '商品总额', '运费', '附加费', '优惠券', '订单总额', '付款类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注', '是否为测试订单', '是否为新订单'];
} else {
$headerCell = ['订单ID', '订单编号', '销售类型', '业务类型', '会员账号', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', $sale_name, '商品总额', '运费', '附加费', '优惠券', '订单总额', '付款类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注', '是否为测试订单'];
$headerCell = ['订单ID', '订单编号', '会员账号', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', '客服', '商品总额', '运费', '附加费', '优惠券', '订单总额', '付款类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注', '是否为测试订单', '销售类型', '业务类型'];
}
array_unshift($cellData, $headerCell);
......@@ -443,6 +438,8 @@ class OrderModel extends Model
$source = '移动端';
} else if (preg_match('/pf=6/', $order_source->order_source)) {
$source = '小程序';
} else if (preg_match('/pf=7/', $order_source->order_source)) {
$source = '象牙宝';
} else {
$source = '未知';
}
......
resources/views/addOffline/content.blade.php
......@@ -120,12 +120,12 @@
</div>
<div class="row">
<div class="col-sm-6">
<!-- <div class="col-sm-6">
<div class="form-group">
<span>供应商：</span>
<span class="supplier_name"></span>
</div>
</div>
</div> -->
<div class="col-sm-6">
<div class="form-group">
......@@ -133,25 +133,23 @@
<span class="stock"></span>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<span>起订量：</span>
<span class="moq"></span>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<span>标准包装量：</span>
<span class="mpq"></span>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<span>状态：</span>
......@@ -159,6 +157,15 @@
</div>
</div>
</div>
<!-- <div class="row">
<div class="col-sm-6">
<div class="form-group">
<span>状态：</span>
<span class="status"></span>
</div>
</div>
</div> -->
</div>
<div class="sku-info-right table-responsive">
......
resources/views/detail/content.blade.php
......@@ -236,7 +236,7 @@
@if(in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms))
<a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
@endif
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && !$extend)
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && isset($extend) && !$extend)
<?php
if ($order_info['status'] > 3) { // 已付款请求财务接口判断是否能修改发票
$isChangeInvoice = App\Http\Controllers\isChangeInvoice($order_info['order_sn']);
......@@ -302,7 +302,7 @@
</table>
@endif
<!-- <table class="table table-bordered">
<table class="table table-bordered">
<tr class="caption">
<th colspan="4" style="text-align: center; background: #f9f9f9;">合同乙方信息
@if ($order_info['status'] == 1)
......@@ -317,19 +317,47 @@
<th>联系人</th>
<th>联系电话</th>
</tr>
@if ($order_temp_info['contract_com_name'])
<?php
if ($order_temp_info['contract_com_name']) {
$contract_com_name = $order_temp_info['contract_com_name'];
$contract_com_addr = $order_temp_info['contract_com_addr'];
$contract_link_name = $order_temp_info['contract_link_name'];
$contract_link_tel = $order_temp_info['contract_link_tel'];
} else { // 若未填写乙方信息，则拉取相关数据
// 公司名称
if (isset($order_invoice_info['tax_title']) && $order_invoice_info['tax_title'])
$contract_com_name = $order_invoice_info['tax_title'];
else if (isset($company_info['com_name']) && $company_info['com_name'])
$contract_com_name = $company_info['com_name'];
else
$contract_com_name = $user_info['mobile'] ? $user_info['mobile'] : $user_info['email'];
// 公司地址
if (isset($order_invoice_info['company_address']) && $order_invoice_info['company_address'])
$contract_com_addr = $order_invoice_info['company_address'];
else if (isset($company_info['com_address']) && $company_info['com_address'])
$contract_com_addr = $company_info['com_address'];
else
$contract_com_addr = $order_address_info['province_val'].$order_address_info['city_val'].$order_address_info['district_val'].$order_address_info['address'];
// 联系人
$contract_link_name = $order_address_info['consignee'];
// 联系电话
if (isset($user_info['mobile']))
$contract_link_tel = $user_info['mobile'];
else
$contract_link_tel = $order_address_info['mobile'];
}
?>
<tr>
<td>{{ $order_temp_info['contract_com_name'] }}</td>
<td>{{ $order_temp_info['contract_com_addr'] }}</td>
<td>{{ $order_temp_info['contract_link_name'] }}</td>
<td>{{ $order_temp_info['contract_link_tel'] }}</td>
<td>{{ $contract_com_name }}</td>
<td>{{ $contract_com_addr }}</td>
<td>{{ $contract_link_name }}</td>
<td>{{ $contract_link_tel }}</td>
</tr>
@else
<tr>
<td colspan="4" style="text-align: center;">无乙方信息</td>
</tr>
@endif
</table> -->
</table>
<!-- 发票收货地址 -->
@if ($order_invoice_address_info)
......@@ -893,25 +921,25 @@
<div class="form-group">
<label class="col-sm-4 control-label"><i class="text-danger">*</i> 公司名称：</label>
<div class="col-sm-8">
<input type="text" name="contract_com_name" class="form-control contract_com_name" value="{{$order_temp_info['contract_com_name']}}">
<input type="text" name="contract_com_name" class="form-control contract_com_name" value="{{ $contract_com_name }}">
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label"><i class="text-danger">*</i> 公司地址：</label>
<div class="col-sm-8">
<textarea name="contract_com_addr" class="form-control contract_com_addr" cols="30" rows="3">{{$order_temp_info['contract_com_addr']}}</textarea>
<textarea name="contract_com_addr" class="form-control contract_com_addr" cols="30" rows="3">{{ $contract_com_addr }}</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label"><i class="text-danger">*</i> 联系人：</label>
<div class="col-sm-8">
<input type="text" name="contract_link_name" class="form-control contract_link_name" value="{{$order_temp_info['contract_link_name']}}">
<input type="text" name="contract_link_name" class="form-control contract_link_name" value="{{ $contract_link_name }}">
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label"><i class="text-danger">*</i> 联系电话：</label>
<div class="col-sm-8">
<input type="text" name="contract_link_tel" class="form-control contract_link_tel" value="{{$order_temp_info['contract_link_tel']}}">
<input type="text" name="contract_link_tel" class="form-control contract_link_tel" value="{{ $contract_link_tel }}">
</div>
</div>
</form>
......
resources/views/detail/sendSales.blade.php
......@@ -9,78 +9,82 @@
<input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
<table class="table table-bordered table-hover check-table" style="min-height:150px;">
@if (!empty($manager))
<tr>
<td class="check-table-title" width="20%">经理：</td>
@if ($order_info['order_goods_type'] == 1)
<td class="check-table-title" width="10%">经理：</td>
@else
<td class="check-table-title" width="10%">客服主管：</td>
@endif
<td>
@if (!empty($manager))
<ul>
@foreach ($manager as $k => $v)
@if ($v->userId == $order_info['sale_id'])
<li><label><input type="radio" name="sale_id" value="{{$v->userId}}" checked /><span>{{$v->name}}</span></label></li>
@else
<li><label><input type="radio" name="sale_id" value="{{$v->userId}}"/><span>{{$v->name}}</span></label></li>
@endif
@endforeach
</ul>
@endif
<ul>
@foreach ($manager as $k => $v)
@if ($v->userId == $order_info['sale_id'])
<li><label><input type="radio" name="sale_id" value="{{$v->userId}}" checked /><span>{{$v->name}}</span></label></li>
@else
<li><label><input type="radio" name="sale_id" value="{{$v->userId}}"/><span>{{$v->name}}</span></label></li>
@endif
@endforeach
</ul>
</td>
</tr>
@endif
@if (!empty($sale_list))
<tr>
<td class="check-table-title" width="20%">交易员：</td>
<td class="check-table-title">交易员：</td>
<td>
@if (!empty($sale_list))
<ul>
@foreach ($sale_list as $key => $vo)
<ul>
@foreach ($sale_list as $key => $vo)
@if ($vo->userId == $order_info['sale_id'])
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}" checked /><span>{{$vo->name}}</span></label></li>
@else
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}"/><span>{{$vo->name}}</span></label></li>
@endif
@endforeach
</ul>
</td>
</tr>
@endif
@if (!empty($kefu))
<tr>
<td class="check-table-title">客服：</td>
<td>
<ul>
@foreach ($kefu as $key => $vo)
@if ($vo->userId == $order_info['sale_id'])
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}" checked /><span>{{$vo->name}}</span></label></li>
@else
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}"/><span>{{$vo->name}}</span></label></li>
@endif
@endforeach
</ul>
@endif
@endif
@endforeach
</ul>
</td>
</tr>
@endif
@if (!empty($test))
<tr>
<td class="check-table-title" width="20%">客服：</td>
<td class="check-table-title">测试：</td>
<td>
@if (!empty($kefu))
<ul>
@foreach ($kefu as $key => $vo)
@if ($vo->userId == $order_info['sale_id'])
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}" checked /><span>{{$vo->name}}</span></label></li>
@else
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}"/><span>{{$vo->name}}</span></label></li>
@endif
@endforeach
</ul>
@endif
<ul>
@foreach ($test as $key => $vo)
@if ($vo->userId == $order_info['sale_id'])
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}" checked /><span>{{$vo->name}}</span></label></li>
@else
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}"/><span>{{$vo->name}}</span></label></li>
@endif
@endforeach
</ul>
</td>
</tr>
@endif
<!-- 查看权限：当前推送人 或 管理员、经理、测试、运营助理 或 自营客服主管 -->
@if ($sale_id == $order_info['sale_id'] || (in_array($role, [1, 2, 5, 8]) || in_array($role, [1, 10]) ))
<tr>
<td class="check-table-title" width="20%">测试：</td>
<td>
@if (!empty($test))
<ul>
@foreach ($test as $key => $vo)
@if ($vo->userId == $order_info['sale_id'])
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}" checked /><span>{{$vo->name}}</span></label></li>
@else
<li><label><input type="radio" name="sale_id" value="{{$vo->userId}}"/><span>{{$vo->name}}</span></label></li>
@endif
@endforeach
</ul>
@endif
</td>
</tr>
<!-- 查看权限：当前推送人或管理员、经理、测试、运营助理 -->
@if ($sale_id == $order_info['sale_id'] || in_array($role, [1, 2, 5, 8]))
<tr>
<td class="check-table-title" width="20%">备注信息：</td>
<td class="check-table-title">备注信息：</td>
<td>
<textarea name="send_remark" id="send_remark" class="form-control">{{$order_temp_info['send_remark']}}</textarea>
</td>
......
resources/views/selfOrder/content.blade.php
......@@ -59,7 +59,29 @@
</select>
</dd>
</dl>
<dl>
<dt>客服：</dt>
<dd>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7">
<option value="">全部</option>
<option value="0">无推送</option>
<optgroup label="在职">
@foreach ($sale_list as $v)
@if ($v->status != 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
<optgroup label="离职">
@foreach ($sale_list as $v)
@if ($v->status == 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
</select>
</dd>
</dl>
<dl>
<dt>支付方式：</dt>
<dd>
......@@ -84,6 +106,7 @@
<option value="3">后台</option>
<option value="4">京东</option>
<option value="6">小程序</option>
<option value="7">象牙宝</option>
</select>
</dd>
</dl>
......@@ -186,6 +209,7 @@
<th class="pl30">订单状态</th>
<th class="pl30">销售类型</th>
<th class="pl30">支付方式</th>
<th class="pl30">客服</th>
<th class="pl30">订单来源</th>
<th class="pl30">发货状态</th>
<th class="pl30">下单时间</th>
......@@ -228,6 +252,8 @@
<td class="show-list">{{$v['sale_type'] == 1 ? '现卖' : '预售'}}</td>
<td class="show-list"><?php print_r(App\Http\Controllers\getPayName($v['order_id'])); ?></td>
<td class="show-list"><?php print_r(App\Http\Controllers\getSalesName($v['sale_id'])); ?></td>
<td class="show-list"><?php echo App\Http\Controllers\getOrderSource($v['order_id'], $v['order_type']); ?></td>
......@@ -266,6 +292,11 @@
<a class="btn btn-success" href="/change/{{$v['order_id']}}?tags=self" target="_blank">人工审单</a>
@endif
<!-- 管理员和自营客服主管或有推送权限显示 -->
@if ((in_array($role, [1, 10]) || in_array('self_send_salesman', $userPerms)))
<a class="btn btn-info" href="/sendSales/{{ $v['order_id'] }}?tags=self" target="_blank">推送</a>
@endif
@if ($v['status'] > 1 && in_array('self_order_download_contract', $userPerms))
<a class="btn btn-default download-contract" data-id="{{$v['order_id']}}" href="javascript:;">下载合同</a>
@endif
......@@ -279,7 +310,7 @@
<!-- 点击展示内容 -->
<tr class="show-other-content">
<td colspan="10">
<td colspan="11">
<table class="table table-hover table-bordered">
<tr>
<td class="table-list-title">公司名称</td>
......
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