Skip to content

朱继来 / 后台订单管理

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

Merge branch 'zjl_merge_20200821'

parents d04b6c23 66957556
Inline Side-by-side
Showing with 122 additions and 47 deletions
app/Http/Controllers/AddOrderController.php
......@@ -562,6 +562,7 @@ Class AddOrderController extends Controller
$data['role'] = $request->input('role', '');
$data['tax_id'] = $request->input('tax_id');
$data['user_coupon_id'] = $request->input('user_coupon_id');
$data['send_type'] = $request->input('zy_delivery_type'); // 发货方式
if ($data['type'] == 1) { // 联营
$data['customer_cn'] = $request->input('customer_cn', '');
......
public/css/detail.css
......@@ -161,6 +161,11 @@ li {
width: 100px;
}
@media screen and (max-width: 1550px) {
.shop-lists input { width: 80px; }
.select-standard-brand { width: 20px; }
}
.amount-section{
margin-top: 40px;
text-align: right;
......
public/js/add_order.js
......@@ -281,7 +281,7 @@
return false;
}
if (!/\d/.test(sku_id)) {
if (!/^\d*$/.test(sku_id)) {
layer.msg('参数错误，请输入正确的SKU_ID');
return false;
}
......@@ -301,7 +301,6 @@
$('.sku-info').show();
var data = resp.data;
var status_val = '';
$('.goods_name').text(data.goods_name);
......@@ -357,7 +356,9 @@
}
}
if (goods_type == 1) {
var joint_goods_type = ['1', '2']; // 商品联营类型
if (joint_goods_type.indexOf(data.goods_type) != -1) {
html += '<th>USD价格</th>';
}
......@@ -373,7 +374,7 @@
html += '<td><span class="goods-min-num">'+data.tiered[i]['purchases']+'</span></td><td>￥<span class="goods-min-price">'+data.tiered[i]['price_cn']+'</span></td>';
}
if (goods_type == 1) {
if (joint_goods_type.indexOf(data.goods_type) != -1) {
html += '<td>$<span class="goods-min-price-us">'+data.tiered[i]['price_us']+'</span></td>';
}
} else {
......@@ -383,7 +384,7 @@
html += '<td><span>'+data.tiered[i]['purchases']+'</span></td><td>￥<span>'+data.tiered[i]['price_cn']+'</span></td>';
}
if (goods_type == 1) {
if (joint_goods_type.indexOf(data.goods_type) != -1) {
html += '<td>$<span>'+data.tiered[i]['price_us']+'</span></td>';
}
}
......@@ -418,7 +419,7 @@
return false;
}
if (goods_type == 1) { // 联营需要选择交货地
// if (goods_type == 1) { // 联营需要选择交货地
delivery_place = $('input[name=delivery_place]:checked').val();
if (delivery_place == null) {
......@@ -426,10 +427,10 @@
return false;
}
if (type == 3 || type == 4) {
layer.msg('仅支持联营商品下单，请在自营订单中下单');
return false;
}
// if (type == 3 || type == 4) {
// layer.msg('仅支持联营商品下单，请在自营订单中下单');
// return false;
// }
var goods_min_price = $(this).parents('.sku-info').find('.goods-min-price').text();
var goods_min_price_us = $(this).parents('.sku-info').find('.goods-min-price-us').text();
......@@ -445,12 +446,12 @@
return false;
}
}
} else {
if (type == 1 || type == 2) { // 1.联营 2.专卖
layer.msg('仅支持自营商品下单，请在联营订单中下单');
return false;
}
}
// } else {
// if (type == 1 || type == 2) { // 1.联营 2.专卖
// layer.msg('仅支持自营商品下单，请在联营订单中下单');
// return false;
// }
// }
var datax = {
uid: user_id,
......@@ -505,7 +506,11 @@
layer.msg('购买数量低于最小起订量，默认调整为最小起订量');
}
if (goods_type == 1) { // 联营需要选择交货地
var curr_goods_type = $(this).parents('tr').data('goods_type');
var joint_goods_type = ['1', '2']; // 商品联营类型
// if (goods_type == 1) { // 联营需要选择交货地
if (joint_goods_type.indexOf(curr_goods_type) != -1) {
delivery_place = $('input[name=delivery_place]:checked').val();
} else { // 自营数量需要结合倍数
var mpl = Number(self.parents('tr').find('.goods_mpl').text()); // 倍数
......@@ -728,12 +733,18 @@
var tax_id = $('.tax_id').val();
var inv_type = $('input[name=inv_type]:checked').val();
var user_coupon_id = $('.user_coupon_id').val();
var zy_delivery_type = $('.zy_delivery_type').val();
if (!address_id) {
layer.msg('请选择快递信息');
return false;
}
if (!zy_delivery_type) {
layer.msg('请选择发货方式');
return false;
}
if (type == 4) { // 自营其他业务
var business_type = $('#business_type').val();
datax.business_type = business_type;
......@@ -796,10 +807,9 @@
datax.tax_id = tax_id;
datax.user_coupon_id = user_coupon_id;
datax.zy_delivery_type = zy_delivery_type;
}
// self.attr('disabled', true).css('pointer-events', 'none'); // 成功生成订单后禁用按钮，防止重复提交
// 自营线上
if (type == 2 && is_online == 1) {
var sale_type = $('#sale_type').val();
......@@ -908,7 +918,7 @@
// list = list.reverse();
// 购物车列表
for (var i = len - 1 ; i >= 0; i--) {
html += '<tr data-cid="'+list[i].cart_id+'" data-type="'+list[i].type+'" min_buy="'+list[i].min_buy+'" data-sup_name="'+list[i].supplier_name+'" data-sup_id="'+list[i].supplier_id+'" data-brand_id="'+list[i].brand_id+'" data-brand_name="'+list[i].brand_name+'">'+
html += '<tr data-cid="'+list[i].cart_id+'" data-type="'+list[i].type+'" min_buy="'+list[i].min_buy+'" data-sup_name="'+list[i].supplier_name+'" data-sup_id="'+list[i].supplier_id+'" data-brand_id="'+list[i].brand_id+'" data-brand_name="'+list[i].brand_name+'" data-goods_type="'+list[i].goods_type+'">'+
'<td>'+(len - i)+'</td>'+
'<td class="goods_id">'+list[i].goods_id+'</td>'+
'<td>'+list[i].goods_name+'</td>'+
......@@ -920,9 +930,10 @@
html += '<input type="text" class="change_standard_brand_name" name="standard_brand_name" value="'+list[i].standard_brand_name+'" readonly /><i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true" data-type=1></i></td>';
}
if (goods_type == 2) {
html += '<td><span class="goods_mpl">'+list[i].mpl+'</span></td>';
}
// if (goods_type == 2) {
var mpl = list[i].mpl ? list[i].mpl : '';
html += '<td><span class="goods_mpl">'+mpl+'</span></td>';
// }
html += '<td><input type="text" class="goods_num" name="goods_num" value="'+list[i].goods_number+'" data-origin_num="'+list[i].goods_number+'"></td>'+
'<td class="goods_price">'+list[i].goods_price+'</td>'+
......@@ -954,7 +965,7 @@
}
// 自营商品检查数量
if (goods_type == 2) {
// if (goods_type == 2) { // 20200826 订单合并后，不以goods_type为判断条件
var changeGoods = [];
$('.shop-table tbody tr').each(function() {
......@@ -963,8 +974,11 @@
var mpl = Number($(this).find('.goods_mpl').text());
var cart_id = $(this).data('cid');
var type = $(this).data('type');
var curr_goods_type = $(this).data('goods_type');
var self_goods_type = ['3', '4']; // 自营商品类型
if (num % mpl != 0) {
// 自营商品 且 数量与倍数不匹配
if (self_goods_type.indexOf(curr_goods_type) != -1 && num % mpl != 0) {
num = Math.ceil(num / mpl) * mpl;
$.ajax({
......@@ -986,7 +1000,7 @@
layer.alert('已按倍数调整购买数量，商品ID：'+changeGoods.join(', '));
self.lists(user_id, goods_type, is_online, delivery_place); // 加载购物车列表
}
}
// }
} else {
layer.msg(resp.errmsg || '网络异常');
......@@ -1102,9 +1116,11 @@
$('.extend_fee_val').empty().text(data.extend_fee_format); // 附加费
}
if (goods_type == 2 && business_type != 2) { // 自营仓库损耗不需要运费
$('.express_fee_val').empty().text(data.finally_shipping_price_format); // 运费
}
// if (goods_type == 2 && business_type != 2) { // 自营仓库损耗不需要运费
// $('.express_fee_val').empty().text(data.finally_shipping_price_format); // 运费
// }
$('.express_fee_val').empty().text(data.finally_shipping_price_format); // 订单合并后，如果存在运费则需要展示
} else {
$('.amount-section').show();
$('.order_amount').empty().text(data.order_amount_format);
......
public/js/change_order.js
......@@ -138,7 +138,8 @@
var extra_fee = $('input[name="extra_fee"]').val() ? parseFloat($('input[name="extra_fee"]').val()) : 0;
var freight_fee = $('input[name="freight_fee"]').val() ? parseFloat($('input[name="freight_fee"]').val()) : 0; // 运费
var total = parseFloat(goods_total + freight_fee + extra_fee).toFixed(2);
var discount_amount = $('input[name="discount_amount"]').val() ? parseFloat($('input[name="discount_amount"]').val()) : 0; // 优惠券
var total = parseFloat(goods_total + extra_fee + freight_fee + discount_amount).toFixed(2);
goods_total = goods_total.toFixed(2);
......@@ -546,15 +547,13 @@
var order_amount = parseFloat($('.total').text());
var extra_fee = $('input[name=extra_fee]').val() ? $('input[name=extra_fee]').val() : 0;
var freight_fee = $('input[name=freight_fee]').val() ? $('input[name=freight_fee]').val() : 0;
var discount_amount = $('input[name="discount_amount"]').val() ? parseFloat($('input[name="discount_amount"]').val()) : 0; // 优惠券
var last_paid = parseFloat(order_amount + parseFloat(pay_preferential)).toFixed(2); // 实际支付金额
var order_type_extend = $('#order_type_extend').val();
var content = '<div class="submit-check">';
content += '<p class="error">请核对订单金额，谨慎操作！</p>';
content += '<p><label>商品总金额：</label>'+currencySign + goods_amount+'</p>';
content += '<p><label>优惠金额：</label>'+discount_amount+'</p>'+
'<p><label>附加费金额：</label>'+extra_fee+'</p>'+
'<p><label>运费金额：</label>'+freight_fee+'</p>'+
......@@ -605,7 +604,7 @@
}
})
// layer.msg('审核提交中...', {icon: 16, time: 0, shade: 0.3}); // 阻止重复提交
layer.msg('审核提交中...', {icon: 16, time: 0, shade: 0.3}); // 阻止重复提交
},
btn2: function(index, layero){
layer.close(index);
......
public/js/goods.js
......@@ -100,6 +100,8 @@
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+'">\
<td>'+curr_no+'</td>\
<td>\
......@@ -107,6 +109,7 @@
<input type="hidden" name="change_info['+curr_no+'][supplier_name]" value="'+order_item.supplier_name+'">\
<p>'+order_item.supplier_name+'</p>\
</td>\
<td>'+sale_type+'</td>\
<td>\
<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>\
......@@ -311,12 +314,15 @@
}
}
var sale_type = order_item.sale_type == 1 ? '现卖' : '预售';
html += '<tr data-brand_name="'+add_brand_name+'">\
<td>'+curr_no+'</td>\
<td>\
<input type="hidden" name="change_info['+curr_no+'][supplier_name]" value="'+add_supplier_name+'">\
<p>'+add_supplier_name+'</p>\
</td>\
<td>'+sale_type+'</td>\
<td>\
<input class="change_goods_name" type="hidden" name="change_info['+curr_no+'][goods_name]" value="'+add_goods_name+'">\
<p>'+add_goods_name+'</p>\
......
resources/views/addOrder/content.blade.php
......@@ -97,6 +97,23 @@
</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">
<h4>发票信息 <span class="title-tips"><i class="fa fa-info-circle"></i>可在订单中心完善发票信息，需要在订单审核通过前填写发票信息，否则无法同步至ERP</span></h4>
......@@ -314,7 +331,8 @@
<span>快捷入口：
<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>
<div class="batch-btn">
......@@ -406,22 +424,26 @@
</div>
<!-- 商品列表 -->
<style>
.shop-table tbody tr td{ word-break: break-all; }
</style>
<div class="shop-lists table-responsive">
<table class="table table-bordered table-hover shop-table">
<thead>
<tr>
<th width="5%">序号</th>
<th width="4%">序号</th>
<th width="10%">SKUID</th>
<th width="15%">商品名称</th>
<th width="10%">商品名称</th>
<th width="10%">制造商</th>
<th width="10%">标准品牌</th>
<th width="4%">倍数</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="10%">批次</th>
<th width="6%">供应商</th>
<th width="6%">采购员</th>
<th width="7%">批次</th>
<th width="5%">操作</th>
</tr>
</thead>
......@@ -464,6 +486,11 @@
</div>
<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-val text-danger order_amount"></p>
</div>
......
resources/views/changeOrder/content.blade.php
......@@ -11,6 +11,7 @@
/* 提交审核弹框label */
.submit-check label { display: inline-block; width: 120px; text-align: right;}
input[type="text"] {width: 120px;}
</style>
<div class="tabs-box">
......@@ -144,6 +145,7 @@
<thead>
<th width="5%">序号</th>
<th width="10%">供应商</th>
<th width="5%">销售类型</th>
<th width="10%">型号</th>
<th width="10%">品牌</th>
@if ($order_info['order_goods_type'] == 1)
......@@ -175,6 +177,7 @@
<input type="hidden" name="change_info[{{$v['rec_id']}}][supplier_name]" value="{{$v['supplier_name']}}">
<p>{{$v['supplier_name']}}</p>
</td>
<td>{{ $v['sale_type'] == 1 ? '现卖' : '预售' }}</td>
<td>
<input class="change_goods_id" type="hidden" name="change_info[{{$v['rec_id']}}][goods_id]" value="{{$v['goods_id']}}">
<input class="change_goods_name" type="hidden" name="change_info[{{$v['rec_id']}}][goods_name]" value="{{$v['goods_name']}}">
......@@ -367,11 +370,20 @@
</tr>
@endif
@if ($order_price_info['discount_amount'])
<tr>
<th>优惠金额</th>
<td>
<span>{{ $order_price_info['discount_amount'] }}</span>
<input class="only_number discount_amount" type="hidden" name="discount_amount" value="{{ $order_price_info['discount_amount'] }}">
</td>
</tr>
@endif
@if (($order_info['order_goods_type'] == 1 && $order_price_info['shipping_price']) || $order_info['order_goods_type'] == 2)
<tr>
<th>运费</th>
<td>
<span>{{$currency}}</span>
<input class="only_number freight_fee" type="text" name="freight_fee" value="{{ $order_price_info['shipping_price'] }}">
</td>
</tr>
......
resources/views/changeOrder/tempSave.blade.php
......@@ -3,10 +3,10 @@
#tempSaveForm { padding: 15px; }
</style>
<div id="temp-save-info">
<div class="order-change-main">
<form id="tempSaveForm" class="form-horizontal table-responsive">
<div class="order-change-main row-fluid table-responsive">
<form id="tempSaveForm" class="form-horizontal">
@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">
<th colspan="4" style="text-align: center; background: #f9f9f9;">终端客户信息</th>
</tr>
......@@ -25,7 +25,8 @@
</table>
@endif
<table class="table table-bordered table-hover">
<div class="row-fluid table-responsive">
<table class="table table-bordered table-hover text-nowrap">
<thead>
<tr>
<th width="20%">型号</th>
......@@ -60,6 +61,8 @@
@endif
</tbody>
</table>
</div>
<hr>
<table class="table table-bordered table-hover">
<tr>
......
resources/views/detail/content.blade.php
......@@ -207,7 +207,7 @@
@endif
@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
<!-- 已发货之后的状态 -->
......@@ -244,7 +244,7 @@
@endif
@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
<!-- 订单状态大于4，且处于开票状态，且存在权限 -->
......
resources/views/detail/detail_base_info.blade.php
......@@ -27,6 +27,9 @@
<th>支付方式</th>
<th>支付状态</th>
<th>支付类型</th>
@if ($order_info['order_goods_type'] == 1)
<th>发货方式</th>
@endif
<th>发货状态</th>
<th>物流单号</th>
<th>京东订单编号</th>
......@@ -100,6 +103,9 @@
}
?>
</td>
@if ($order_info['order_goods_type'] == 1)
<td>{{ $order_temp_info['zy_delivery_type'] == 1 ? '现货发货' : '拼单发货' }}</td>
@endif
<td>
<?php
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