Skip to content

朱继来 / 后台订单管理

Go to a project
Commit e5dbf226 by 朱继来
Options

调整下单购物车展示

parent 0730701f
Inline Side-by-side
Showing with 20 additions and 11 deletions
public/js/add_order.js
......@@ -506,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()); // 倍数
......@@ -909,7 +913,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>'+
......@@ -921,9 +925,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>'+
......
resources/views/addOrder/content.blade.php
......@@ -406,22 +406,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="10%">SKUID</th>
<th width="15%">商品名称</th>
<th width="10%">商品名称</th>
<th width="10%">制造商</th>
<th width="10%">标准品牌</th>
<th width="5%">倍数</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>
......
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，且处于开票状态，且存在权限 -->
......
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