Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 1db080fe by 朱继来
Options

Merge branch 'zjl_merge_20200821'

parents d04b6c23 66957556
Expand all
Inline Side-by-side
Showing with 92 additions and 44 deletions
app/Http/Controllers/AddOrderController.php
...@@ -562,6 +562,7 @@ Class AddOrderController extends Controller ...@@ -562,6 +562,7 @@ Class AddOrderController extends Controller
$data['role'] = $request->input('role', ''); $data['role'] = $request->input('role', '');
$data['tax_id'] = $request->input('tax_id'); $data['tax_id'] = $request->input('tax_id');
$data['user_coupon_id'] = $request->input('user_coupon_id'); $data['user_coupon_id'] = $request->input('user_coupon_id');
$data['send_type'] = $request->input('zy_delivery_type'); // 发货方式
if ($data['type'] == 1) { // 联营 if ($data['type'] == 1) { // 联营
$data['customer_cn'] = $request->input('customer_cn', ''); $data['customer_cn'] = $request->input('customer_cn', '');
......
public/css/detail.css
...@@ -161,6 +161,11 @@ li { ...@@ -161,6 +161,11 @@ li {
width: 100px; width: 100px;
} }
@media screen and (max-width: 1550px) {
.shop-lists input { width: 80px; }
.select-standard-brand { width: 20px; }
}
.amount-section{ .amount-section{
margin-top: 40px; margin-top: 40px;
text-align: right; text-align: right;
......
public/js/goods.js
...@@ -100,6 +100,8 @@ ...@@ -100,6 +100,8 @@
buyers_option += '<option value="'+buyers[i].userId+'">'+buyers[i].name+'</option>'; buyers_option += '<option value="'+buyers[i].userId+'">'+buyers[i].name+'</option>';
} }
var sale_type = order_item.sale_type == 1 ? '现卖' : '预售';
html += '<tr data-sup="'+sup+'" data-brand_name="'+order_item.brand_name+'">\ html += '<tr data-sup="'+sup+'" data-brand_name="'+order_item.brand_name+'">\
<td>'+curr_no+'</td>\ <td>'+curr_no+'</td>\
<td>\ <td>\
...@@ -107,6 +109,7 @@ ...@@ -107,6 +109,7 @@
<input type="hidden" name="change_info['+curr_no+'][supplier_name]" value="'+order_item.supplier_name+'">\ <input type="hidden" name="change_info['+curr_no+'][supplier_name]" value="'+order_item.supplier_name+'">\
<p>'+order_item.supplier_name+'</p>\ <p>'+order_item.supplier_name+'</p>\
</td>\ </td>\
<td>'+sale_type+'</td>\
<td>\ <td>\
<input class="change_goods_name" type="hidden" name="change_info['+curr_no+'][goods_name]" value="'+order_item.goods_name+'">\ <input class="change_goods_name" type="hidden" name="change_info['+curr_no+'][goods_name]" value="'+order_item.goods_name+'">\
<p>'+order_item.goods_name+'</p>\ <p>'+order_item.goods_name+'</p>\
...@@ -311,12 +314,15 @@ ...@@ -311,12 +314,15 @@
} }
} }
var sale_type = order_item.sale_type == 1 ? '现卖' : '预售';
html += '<tr data-brand_name="'+add_brand_name+'">\ html += '<tr data-brand_name="'+add_brand_name+'">\
<td>'+curr_no+'</td>\ <td>'+curr_no+'</td>\
<td>\ <td>\
<input type="hidden" name="change_info['+curr_no+'][supplier_name]" value="'+add_supplier_name+'">\ <input type="hidden" name="change_info['+curr_no+'][supplier_name]" value="'+add_supplier_name+'">\
<p>'+add_supplier_name+'</p>\ <p>'+add_supplier_name+'</p>\
</td>\ </td>\
<td>'+sale_type+'</td>\
<td>\ <td>\
<input class="change_goods_name" type="hidden" name="change_info['+curr_no+'][goods_name]" value="'+add_goods_name+'">\ <input class="change_goods_name" type="hidden" name="change_info['+curr_no+'][goods_name]" value="'+add_goods_name+'">\
<p>'+add_goods_name+'</p>\ <p>'+add_goods_name+'</p>\
......
resources/views/addOrder/content.blade.php
...@@ -97,6 +97,23 @@ ...@@ -97,6 +97,23 @@
</div> </div>
</div> </div>
<div class="shipping-info">
<h4>发货方式 <span class="title-tips"><i class="fa fa-info-circle"></i>现货发货创建的自营通知单，账户为原客户账户，公司和原客户地址； 拼单发货创建的自营通知单，账户为15011111111，猎芯公司以及星火仓的地址</span></h4>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<span><i class="text-danger">*</i> 选择发货方式：</span>
<select name="zy_delivery_type" class="zy_delivery_type">
<option value="">请选择</option>
<option value="1">现货发货</option>
<option value="2">拼单发货</option>
</select>
</div>
</div>
</div>
</div>
<div class="invoice-info"> <div class="invoice-info">
<h4>发票信息 <span class="title-tips"><i class="fa fa-info-circle"></i>可在订单中心完善发票信息，需要在订单审核通过前填写发票信息，否则无法同步至ERP</span></h4> <h4>发票信息 <span class="title-tips"><i class="fa fa-info-circle"></i>可在订单中心完善发票信息，需要在订单审核通过前填写发票信息，否则无法同步至ERP</span></h4>
...@@ -314,7 +331,8 @@ ...@@ -314,7 +331,8 @@
<span>快捷入口： <span>快捷入口：
<a href="{{Config('website.add-sku-url')}}" target="_blank" style="margin-right: 10px;">+新增SKU</a> <a href="{{Config('website.add-sku-url')}}" target="_blank" style="margin-right: 10px;">+新增SKU</a>
<a href="{{Config('website.search-sku-url-1')}}" target="_blank">查询SKU</a> <a href="{{Config('website.search-sku-url-1')}}" target="_blank" style="margin-right: 10px;">查询联营SKU</a>
<a href="{{Config('website.search-sku-url-2')}}" target="_blank">查询自营SKU</a>
</span> </span>
<div class="batch-btn"> <div class="batch-btn">
...@@ -406,22 +424,26 @@ ...@@ -406,22 +424,26 @@
</div> </div>
<!-- 商品列表 --> <!-- 商品列表 -->
<style>
.shop-table tbody tr td{ word-break: break-all; }
</style>
<div class="shop-lists table-responsive"> <div class="shop-lists table-responsive">
<table class="table table-bordered table-hover shop-table"> <table class="table table-bordered table-hover shop-table">
<thead> <thead>
<tr> <tr>
<th width="5%">序号</th> <th width="4%">序号</th>
<th width="10%">SKUID</th> <th width="10%">SKUID</th>
<th width="15%">商品名称</th> <th width="10%">商品名称</th>
<th width="10%">制造商</th> <th width="10%">制造商</th>
<th width="10%">标准品牌</th> <th width="10%">标准品牌</th>
<th width="4%">倍数</th>
<th width="8%">采购数量</th> <th width="8%">采购数量</th>
<th width="7%">采购单价</th> <th width="7%">采购单价</th>
<th width="7%">小计</th> <th width="7%">小计</th>
<th width="7%">货期</th> <th width="7%">货期</th>
<th width="7%">供应商</th> <th width="6%">供应商</th>
<th width="7%">采购员</th> <th width="6%">采购员</th>
<th width="10%">批次</th> <th width="7%">批次</th>
<th width="5%">操作</th> <th width="5%">操作</th>
</tr> </tr>
</thead> </thead>
...@@ -464,6 +486,11 @@ ...@@ -464,6 +486,11 @@
</div> </div>
<div class="row"> <div class="row">
<p class="con-title"><span>运费：</span></p>
<p class="con-val express_fee_val">0.00</p>
</div>
<div class="row">
<p class="con-title"><span>应付金额：</span></p> <p class="con-title"><span>应付金额：</span></p>
<p class="con-val text-danger order_amount"></p> <p class="con-val text-danger order_amount"></p>
</div> </div>
......
resources/views/changeOrder/tempSave.blade.php
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
#tempSaveForm { padding: 15px; } #tempSaveForm { padding: 15px; }
</style> </style>
<div id="temp-save-info"> <div id="temp-save-info">
<div class="order-change-main"> <div class="order-change-main row-fluid table-responsive">
<form id="tempSaveForm" class="form-horizontal table-responsive"> <form id="tempSaveForm" class="form-horizontal">
@if ($order_temp_info['temp_save_info']['customer_cn']) @if ($order_temp_info['temp_save_info']['customer_cn'])
<table class="table table-bordered table-hover"> <table class="table table-bordered table-hover text-nowrap">
<tr class="caption"> <tr class="caption">
<th colspan="4" style="text-align: center; background: #f9f9f9;">终端客户信息</th> <th colspan="4" style="text-align: center; background: #f9f9f9;">终端客户信息</th>
</tr> </tr>
...@@ -25,41 +25,44 @@ ...@@ -25,41 +25,44 @@
</table> </table>
@endif @endif
<table class="table table-bordered table-hover"> <div class="row-fluid table-responsive">
<thead> <table class="table table-bordered table-hover text-nowrap">
<tr> <thead>
<th width="20%">型号</th> <tr>
<th width="20%">标准品牌</th> <th width="20%">型号</th>
<th>调整数量</th> <th width="20%">标准品牌</th>
<th>调整单价</th> <th>调整数量</th>
<th>采购员</th> <th>调整单价</th>
<th>批次</th> <th>采购员</th>
<th>状态</th> <th>批次</th>
</tr> <th>状态</th>
</thead> </tr>
</thead>
<tbody> <tbody>
@if (isset($order_temp_info['temp_save_info']['change_info'])) @if (isset($order_temp_info['temp_save_info']['change_info']))
@foreach ($order_temp_info['temp_save_info']['change_info'] as $k => $v) @foreach ($order_temp_info['temp_save_info']['change_info'] as $k => $v)
<tr> <tr>
<td>{{$v['goods_name']}}</td> <td>{{$v['goods_name']}}</td>
<td>{{ isset($v['standard_brand_name']) ? $v['standard_brand_name'] : '' }}</td> <td>{{ isset($v['standard_brand_name']) ? $v['standard_brand_name'] : '' }}</td>
<td>{{$v['goods_number']}}</td> <td>{{$v['goods_number']}}</td>
<td>{{$v['goods_price']}}</td> <td>{{$v['goods_price']}}</td>
<td>{{ isset($v['buyer_id']) ? App\Http\Controllers\getSalesName($v['buyer_id']) : '' }}</td> <td>{{ isset($v['buyer_id']) ? App\Http\Controllers\getSalesName($v['buyer_id']) : '' }}</td>
<td>{{ isset($v['batch']) ? $v['batch'] : '' }}</td> <td>{{ isset($v['batch']) ? $v['batch'] : '' }}</td>
<td> <td>
<?= $v['status'] == 1 ? '正常' : '<i style="color: red;">已取消</i>' ?> <?= $v['status'] == 1 ? '正常' : '<i style="color: red;">已取消</i>' ?>
@if (isset($v['is_add'])) @if (isset($v['is_add']))
<i style="color: green;">（新增）</i> <i style="color: green;">（新增）</i>
@endif @endif
</td> </td>
</tr> </tr>
@endforeach @endforeach
@endif @endif
</tbody> </tbody>
</table> </table>
</div>
<hr> <hr>
<table class="table table-bordered table-hover"> <table class="table table-bordered table-hover">
<tr> <tr>
......
resources/views/detail/content.blade.php
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
@endif @endif
@if (in_array($order_info['status'], array(3, 4, 7)) && in_array('order_refund', $userPerms)) @if (in_array($order_info['status'], array(3, 4, 7)) && in_array('order_refund', $userPerms))
<a href="{{URL('refund', ['order_id'=>$order_info['order_id']])}}" class="btn btn-info order_refund">退货退款</a> <!-- <a href="{{URL('refund', ['order_id'=>$order_info['order_id']])}}" class="btn btn-info order_refund">退货退款</a> -->
@endif @endif
<!-- 已发货之后的状态 --> <!-- 已发货之后的状态 -->
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
@endif @endif
@if (in_array($order_info['status'], [7, 8, 10]) && in_array('self_order_refund', $userPerms)) @if (in_array($order_info['status'], [7, 8, 10]) && in_array('self_order_refund', $userPerms))
<a href="/return/{{$order_info['order_id']}}?tags=self" class="btn btn-info order_refund">退货申请</a> <!-- <a href="/return/{{$order_info['order_id']}}?tags=self" class="btn btn-info order_refund">退货申请</a> -->
@endif @endif
<!-- 订单状态大于4，且处于开票状态，且存在权限 --> <!-- 订单状态大于4，且处于开票状态，且存在权限 -->
......
resources/views/detail/detail_base_info.blade.php
...@@ -27,6 +27,9 @@ ...@@ -27,6 +27,9 @@
<th>支付方式</th> <th>支付方式</th>
<th>支付状态</th> <th>支付状态</th>
<th>支付类型</th> <th>支付类型</th>
@if ($order_info['order_goods_type'] == 1)
<th>发货方式</th>
@endif
<th>发货状态</th> <th>发货状态</th>
<th>物流单号</th> <th>物流单号</th>
<th>京东订单编号</th> <th>京东订单编号</th>
...@@ -100,6 +103,9 @@ ...@@ -100,6 +103,9 @@
} }
?> ?>
</td> </td>
@if ($order_info['order_goods_type'] == 1)
<td>{{ $order_temp_info['zy_delivery_type'] == 1 ? '现货发货' : '拼单发货' }}</td>
@endif
<td> <td>
<?php <?php
if ($order_shipping_info) { if ($order_shipping_info) {
......
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