Skip to content

朱继来 / 后台订单管理

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

调整审单

parent a8757b11
Inline Side-by-side
Showing with 29 additions and 12 deletions
public/js/change_order.js
...@@ -683,7 +683,9 @@ ...@@ -683,7 +683,9 @@
for (var i in items) { for (var i in items) {
if (!items[i].is_add) { if (!items[i].is_add) {
$('.change_item_'+i).find('.change_goods_price').val(items[i].goods_price); $('.change_item_'+i).find('.change_goods_price').val(items[i].goods_price);
$('.change_item_'+i).find('.change_goods_number').val(items[i].goods_number); $('.change_item_'+i).find('.change_goods_number').val(items[i].goods_number);
$('.change_item_'+i).find('.change_standard_brand_id').val(items[i].standard_brand_id);
$('.change_item_'+i).find('.change_standard_brand_name').val(items[i].standard_brand_name);
if (items[i].status == -1) { if (items[i].status == -1) {
$('.change_item_'+i).find('.change_status').val(items[i].status); $('.change_item_'+i).find('.change_status').val(items[i].status);
...@@ -694,16 +696,17 @@ ...@@ -694,16 +696,17 @@
items_len++; items_len++;
} }
// 添加新增商品
for (var i in items) { for (var i in items) {
if (!items[i].is_add) continue; if (!items[i].is_add) continue;
if (!items[i].add_type) { if (!items[i].add_type) {
var sup = items[i].canal ? items[i].supplier_id+'.'+items[i].canal : items[i].supplier_id; var sup = items[i].canal ? items[i].supplier_id+'.'+items[i].canal : items[i].supplier_id;
new_str += '<tr data-sup="'+sup+'">'; new_str += '<tr data-sup="'+sup+'" data-brand_id="'+items[i].brand_id+'" data-brand_name="'+items[i].brand_name+'">';
} else { } else {
new_str += '<tr>'; new_str += '<tr data-brand_id="'+items[i].brand_id+'" data-brand_name="'+items[i].brand_name+'">';
} }
new_str += '<td>'+i+'</td>\ new_str += '<td>'+i+'</td>\
<td>\ <td>\
<input type="hidden" name="change_info['+i+'][supplier_name]" value="'+items[i].supplier_name+'">\ <input type="hidden" name="change_info['+i+'][supplier_name]" value="'+items[i].supplier_name+'">\
...@@ -714,6 +717,16 @@ ...@@ -714,6 +717,16 @@
<p>'+items[i].goods_name+'</p>\ <p>'+items[i].goods_name+'</p>\
</td>\ </td>\
<td>\ <td>\
<input class="change_brand_id" type="hidden" name="change_info['+i+'][brand_id]" value="'+items[i].brand_id+'">\
<input class="change_brand_name" type="hidden" name="change_info['+i+'][brand_name]" value="'+items[i].brand_name+'">\
<p>'+items[i].brand_name+'</p>\
</td>\
<td>\
<input type="hidden" class="change_standard_brand_id" name="change_info['+i+'][standard_brand_id]" value="'+items[i].standard_brand_id+'" />\
<input type="text" class="change_standard_brand_name" name="change_info['+i+'][standard_brand_name]" value="'+items[i].standard_brand_name+'" readonly />\
<i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true" data-type=21></i>\
</td>\
<td>\
<input class="only_number num change_goods_number" name="change_info['+i+'][goods_number]" value="'+items[i].goods_number+'">\ <input class="only_number num change_goods_number" name="change_info['+i+'][goods_number]" value="'+items[i].goods_number+'">\
</td>\ </td>\
<td>\ <td>\
......
public/js/standardBrand.js
...@@ -49,7 +49,6 @@ layui.use(['table', 'form'], function() { ...@@ -49,7 +49,6 @@ layui.use(['table', 'form'], function() {
var self = $(this); var self = $(this);
var type = self.data('type'); // 1-后台购物车，2-后台审单 var type = self.data('type'); // 1-后台购物车，2-后台审单
$('.standard_brand_name').val('');
scm_brand_id = 0; scm_brand_id = 0;
scm_brand_name = ''; scm_brand_name = '';
...@@ -99,8 +98,8 @@ layui.use(['table', 'form'], function() { ...@@ -99,8 +98,8 @@ layui.use(['table', 'form'], function() {
$.lie.add_order.lists(user_id, 1, 1, delivery_place); $.lie.add_order.lists(user_id, 1, 1, delivery_place);
} else { } else {
self.parents('tr').find('.standard_brand_id').val(scm_brand_id); self.parents('tr').find('.change_standard_brand_id').val(scm_brand_id);
self.parents('tr').find('.standard_brand_name').val(scm_brand_name); self.parents('tr').find('.change_standard_brand_name').val(scm_brand_name);
} }
return false; return false;
...@@ -119,7 +118,8 @@ layui.use(['table', 'form'], function() { ...@@ -119,7 +118,8 @@ layui.use(['table', 'form'], function() {
} }
}) })
$('.curr-brand').text(curr_brand_name) $('.standard_brand_name').val('');
$('.curr-brand').text(curr_brand_name);
}) })
}) })
\ No newline at end of file
resources/views/changeOrder/content.blade.php
...@@ -165,14 +165,15 @@ ...@@ -165,14 +165,15 @@
</td> </td>
<td> <td>
<input class="change_brand_id" type="hidden" name="change_info[{{$v['rec_id']}}][brand_id]" value="{{$v['brand_id']}}"> <input class="change_brand_id" type="hidden" name="change_info[{{$v['rec_id']}}][brand_id]" value="{{$v['brand_id']}}">
<input class="change_brand_name" type="hidden" name="change_info[{{$v['rec_id']}}][brand_name]" value="{{$v['brand_name']}}">
<p>{{$v['brand_name']}}</p> <p>{{$v['brand_name']}}</p>
</td> </td>
<td> <td>
@if ($v['standard_brand_name']) @if ($v['standard_brand_name'] || $v['status'] == -1)
<p>{{$v['standard_brand_name']}}</p> <p>{{$v['standard_brand_name']}}</p>
@else @else
<input type="hidden" class="standard_brand_id" name="change_info[{{$v['rec_id']}}][standard_brand_id]" /> <input type="hidden" class="change_standard_brand_id" name="change_info[{{$v['rec_id']}}][standard_brand_id]" />
<input type="text" class="standard_brand_name" name="change_info[{{$v['rec_id']}}][standard_brand_name]" readonly /> <input type="text" class="change_standard_brand_name" name="change_info[{{$v['rec_id']}}][standard_brand_name]" readonly />
<i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true" data-type=2></i> <i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true" data-type=2></i>
@endif @endif
</td> </td>
......
resources/views/changeOrder/tempSave.blade.php
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
<table class="table table-bordered table-hover"> <table class="table table-bordered table-hover">
<thead> <thead>
<tr> <tr>
<th width="40%">型号</th> <th width="20%">型号</th>
<th width="20%">标准品牌</th>
<th>调整数量</th> <th>调整数量</th>
<th>调整单价</th> <th>调整单价</th>
<th width="20%">状态</th> <th width="20%">状态</th>
...@@ -40,6 +41,7 @@ ...@@ -40,6 +41,7 @@
@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>{{$v['goods_number']}}</td> <td>{{$v['goods_number']}}</td>
<td>{{$v['goods_price']}}</td> <td>{{$v['goods_price']}}</td>
<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