Skip to content

朱继来 / 后台订单管理

Go to a project
Commit e429e1b3 by 朱继来
Options

fix

parents dc24b061 9f9a91bb
Inline Side-by-side
Showing with 90 additions and 37 deletions
app/Http/Controllers/OrderController.php
......@@ -2060,10 +2060,9 @@ Class OrderController extends Controller
*/
public function send_mail(Request $request)
{
$id = $request->input('id');
$cc_email = $request->input('cc_email', '');
$info = $this->orderDetail($request, $id);
$id = $request->input('id');
$cc_email = $request->input('cc_email', ''); // 额外抄送人
$info = $this->orderDetail($request, $id);
//循环订单详情
foreach ($info['order_items_info'] as $key => $value) {
......@@ -2114,11 +2113,21 @@ Class OrderController extends Controller
$data['toUser'] = $send_mail_array; // 收件人
$cc_send_mail_array = Config('config.cc_email'); // 固定抄送人
$perm = new PermController;
$manager_email = $perm->getManager($request); // 获取上级主管邮箱
if ($manager_email) {
$cc_send_mail_array = array_merge($cc_send_mail_array, $manager_email); // 合并上级主管邮箱
}
$cc_send_mail_array[] = $request->user->email; // 默认抄送给自己
$cc_send_mail_array = array_unique($cc_send_mail_array); // 去重
$cc_email_arr = [];
if ($cc_email) { // 后台选择的抄送人
if ($cc_email) { // 后台选择的额外抄送人
$CmsModel = new CmsModel();
foreach ($cc_email as $v) {
......
app/Http/Controllers/PermController.php
......@@ -146,7 +146,7 @@
$roleId = isset($role->roleId) ? $role->roleId : 0;
// $user = DB::select("SELECT * FROM `t_user_perm` WHERE `bid` = $bid AND `roles` REGEXP $roleId");
$user = DB::select("SELECT * FROM `t_user_perm` WHERE `bid` = $bid AND `roles` LIKE '%\"".$roleId."\"%' ORDER BY `mtime`");
$user = DB::select("SELECT `userId` FROM `t_user_perm` WHERE `bid` = $bid AND `roles` LIKE '%\"".$roleId."\"%' ORDER BY `mtime`");
if ($user) {
foreach ($user as $v) {
......@@ -155,7 +155,7 @@
if ($userId) {
foreach ($userId as $id) {
$userInfo = DB::table('user_info')->where('userId', $id)->select('userId', 'name', 'status')->first();
$userInfo = DB::table('user_info')->where('userId', $id)->select('userId', 'name', 'email', 'status')->first();
// 判断用户是否已离职 4为离职状态
// if ($userInfo->status != 4) {
......@@ -342,4 +342,30 @@
return $data;
}
// 获取角色对应的主管邮箱
public function getManager($request)
{
$role = $this->getUserRole($request); // 当前用户角色
$manager_key = array_search($role, Config('perm_args.manager_to_kefu')); // 获取对应的主管key
if (!$manager_key) return false;
$role_name = array_search($manager_key, Config('perm_args.roles')); // 获取主管对应的角色名称
if (!$role_name) return false;
$res = $this->getRoleUsers($request, $role_name); // 获取角色对应的用户
$email = [];
if ($res) {
foreach ($res as $v) {
$email[] = $v->email;
}
}
return $email;
}
}
\ No newline at end of file
public/css/order.css
......@@ -319,4 +319,6 @@ input[type="color"],
.bs-deselect-all{float: right; width: 50% !important;}
.bootstrap-select .btn{padding: 4px 12px;}
.list-item-table .caption th { background: #fff; }
\ No newline at end of file
.list-item-table .caption th { background: #fff; }
.input-radio input { margin-left: -15px !important; }
\ No newline at end of file
public/js/order.js
......@@ -561,50 +561,58 @@
var content = '<div class="form-group">'+
'<label>网站数据不准: </label>'+
'<div class="input-radio">'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="价格不准">价格不准</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="库存数量不准">库存数量不准</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="批次不准(或者没有)">批次不准(或者没有)</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="货期不准">货期不准</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="价格不准">价格不准</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="库存数量不准">库存数量不准</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="批次不准(或者没有)">批次不准(或者没有)</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="货期不准">货期不准</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="起订量不准">起订量不准</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="品牌不准">品牌不准</label>'+
'</div>'+
'</div>'+
'<div class="form-group">'+
'<label>更改订单信息: </label>'+
'<div class="input-radio">'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="更改发票信息">更改发票信息</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="更改收票地址">更改收票地址</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="增删改型号/数量">增删改型号/数量</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="需使用或更改优惠券">需使用或更改优惠券</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="更改付款方式">更改付款方式</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="更改发票信息">更改发票信息</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="更改收票地址">更改收票地址</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="更改收货地址">更改收货地址</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="增删改型号/数量">增删改型号/数量</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="需使用或更改优惠券">需使用或更改优惠券</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="更改付款方式">更改付款方式</label>'+
'</div>'+
'</div>'+
'<div class="form-group">'+
'<label>额外附加费: </label>'+
'<div class="input-radio">'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="产地税">产地税</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="关税">关税</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="3C商检">3C商检</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="运费">运费</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="产地税">产地税</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="关税">关税</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="3C商检">3C商检</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="运费">运费</label>'+
'</div>'+
'</div>'+
'<div class="form-group">'+
'<label>客户需求变动: </label>'+
'<div class="input-radio">'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="客户找到更优渠道">客户找到更优渠道</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="客户上游取消需求">客户上游取消需求</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="客户找到更优渠道">客户找到更优渠道</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="客户上游取消需求">客户上游取消需求</label>'+
'</div>'+
'</div>'+
'<div class="form-group">'+
'<label>其他问题: </label>'+
'<div class="input-radio">'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="采购漏下单">采购漏下单</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="订单处理时间较长,供应商库存不足">订单处理时间较长,供应商库存不足</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="管制、禁运物料">管制、禁运物料</label>'+
'<label class="radio-inline"><input type="checkbox" name="cancel_reason" value="商品报关无法归类">商品报关无法归类</label>'+
'<label class="radio-inline" style="margin-left:0px"><input type="checkbox" name="cancel_reason" value="客户测试下单">客户测试下单</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="采购漏下单">采购漏下单</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="订单处理时间较长,供应商库存不足">订单处理时间较长,供应商库存不足</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="管制、禁运物料">管制、禁运物料</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="商品报关无法归类">商品报关无法归类</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="客户测试下单">客户测试下单</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="1">其他</label>'+
'</div>'+
'<div class="input-other-reason" style="display:none;">'+
'<textarea class="form-control" name="input-other-reason" placeholder="请填写其他原因"></textarea>'+
'</div>'+
'</div>';
......@@ -614,17 +622,16 @@
content: content,
btn:['确认', '取消'],
btn1:function(index){
var cancel_reason = $('input[name=cancel_reason]:checked').val();
// var cancel_reason = $('input[name=cancel_reason]:checked').val();
$select = new Array();
// $select = new Array();
$('input[name=cancel_reason]:checked').each(function(data,select_check){
// $('input[name=cancel_reason]:checked').each(function(data,select_check){
$select[data] = ($(select_check).val());
})
// $select[data] = ($(select_check).val());
// })
cancel_reason = $select.join(', ');
// cancel_reason = $select.join(', ');
var other_reason = $('textarea[name=input-other-reason]').val();
......@@ -684,7 +691,7 @@
if (cancel_reason == 1) {
$('.input-other-reason').show();
$('.layui-layer-content').css('height', '310px');
$('.layui-layer-content').css('height', 'auto');
} else {
$('.input-other-reason').hide();
$('.layui-layer-content').css('height', 'auto');
......
resources/views/detail/content.blade.php
......@@ -449,6 +449,10 @@
<th>商品名</th>
@endif
@if ($order_info['order_goods_type'] == 1)
<th>供应商</th>
@endif
<th>制造商</th>
<!-- ERP或京东订单 -->
......@@ -515,6 +519,10 @@
<td><a href="{{Config('website.main_url').'goods_'.$v['goods_id'].'.html?ptag=order'}}" target="_blank">{{$v['goods_name']}}</a></td>
@endif
@if ($order_info['order_goods_type'] == 1)
<td>{{$v['supplier_name']}}</td>
@endif
<td>{{$v['brand_name']}}</td>
<td id="goods_number_{{$v['rec_id']}}">{{$v['goods_number']}}</td>
<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