Skip to content

朱继来 / 后台订单管理

Go to a project
Commit bf049b01 by 朱继来
Options

审核提交

parent 53c20bf3
Expand all
Inline Side-by-side
Showing with 36 additions and 28 deletions
app/Http/Controllers/OrderController.php
...@@ -838,14 +838,6 @@ Class OrderController extends Controller ...@@ -838,14 +838,6 @@ Class OrderController extends Controller
$pay_time_limit = $payTime == 'other' ? $payTimeOther : $payTime; $pay_time_limit = $payTime == 'other' ? $payTimeOther : $payTime;
} else { } else {
$pay_time_limit = $request->input('pay_time_limit'); $pay_time_limit = $request->input('pay_time_limit');
}
$is_temp_save = $request->input('is_temp_save', '');
if ($is_temp_save) { // 临时保存接口
$url = Config('website.api_domain').'order/tempSaveOrder';
} else {
$url = Config('website.api_domain').'order/changeOrder';
} }
$check['k1'] = time(); $check['k1'] = time();
...@@ -884,6 +876,21 @@ Class OrderController extends Controller ...@@ -884,6 +876,21 @@ Class OrderController extends Controller
"product_use_classone_sn" => $request->input('product_use_classone_sn', ''), // 终端客户信息 一级分类 "product_use_classone_sn" => $request->input('product_use_classone_sn', ''), // 终端客户信息 一级分类
"product_use_classtwo_sn" => $request->input('product_use_classtwo_sn', ''), // 终端客户信息 二级分类 "product_use_classtwo_sn" => $request->input('product_use_classtwo_sn', ''), // 终端客户信息 二级分类
]; ];
$is_temp_save = $request->input('is_temp_save', '');
if ($is_temp_save) { // 临时保存接口
$resData['payTime'] = $payTime;
$resData['payTimeOther'] = $payTimeOther;
$url = Config('website.api_domain').'order/tempSaveOrder';
} else {
$auditor_role = $request->input('auditor_role', 1); // 当前操作人角色
$resData['status'] = $auditor_role == 3 ? 1 : 2; // 角色为‘查看自己’时，状态为待审核，否则为待付款
$url = Config('website.api_domain').'order/changeOrder';
}
// dd(curlApi($url, $resData, "POST")); // dd(curlApi($url, $resData, "POST"));
$temp = json_decode(curlApi($url, $resData, "POST"), true); $temp = json_decode(curlApi($url, $resData, "POST"), true);
......
public/js/goods.js
...@@ -89,10 +89,12 @@ ...@@ -89,10 +89,12 @@
var curr_no = goods_len + 1; // 当前添加行序号 var curr_no = goods_len + 1; // 当前添加行序号
var data = eval('('+resp.data+')'); var data = eval('('+resp.data+')');
var order_item = data.item; // 当前新增商品信息 var order_item = data.item; // 当前新增商品信息
var sup = order_item.canal ? order_item.supplier_id+'.'+order_item.canal : order_item.supplier_id;
html += '<tr">\ html += '<tr data-sup="'+sup+'">\
<td>'+curr_no+'</td>\ <td>'+curr_no+'</td>\
<td>\ <td>\
<input type="hidden" name="change_info['+curr_no+'][supplier_id]" value="'+order_item.supplier_id+'">\
<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>\
...@@ -108,12 +110,13 @@ ...@@ -108,12 +110,13 @@
</td>\ </td>\
<td>\ <td>\
<input class="change_status" type="hidden" name="change_info['+curr_no+'][status]" value="1">\ <input class="change_status" type="hidden" name="change_info['+curr_no+'][status]" value="1">\
<span class="change_status_val">正常</span>\ <span class="change_status_val">正常<i style="color:green;">(新增)</i></span>\
</td>\ </td>\
<td>\ <td>\
<a class="btn btn-xs btn-danger deletegoods" href="javascript:;" data-id="" data-type="1">删除</a>\ <a class="btn btn-xs btn-danger deletegoods" href="javascript:;" data-id="" data-type="1">删除</a>\
<input class="is_add" type="hidden" name="change_info['+curr_no+'][is_add]" value="1" />\ <input class="is_add" type="hidden" name="change_info['+curr_no+'][is_add]" value="1" />\
<input type="hidden" name="change_info['+curr_no+'][goods_id]" value="'+order_item.goods_id+'" />\ <input type="hidden" name="change_info['+curr_no+'][goods_id]" value="'+order_item.goods_id+'" />\
<input type="hidden" name="change_info['+curr_no+'][canal]" value="'+order_item.canal+'" />\
</td>\ </td>\
</tr>'; </tr>';
...@@ -259,7 +262,7 @@ ...@@ -259,7 +262,7 @@
var curr_no = goods_len + 1; // 当前添加行序号 var curr_no = goods_len + 1; // 当前添加行序号
html += '<tr">\ html += '<tr>\
<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+'">\
...@@ -277,7 +280,7 @@ ...@@ -277,7 +280,7 @@
</td>\ </td>\
<td>\ <td>\
<input class="change_status" type="hidden" name="change_info['+curr_no+'][status]" value="1">\ <input class="change_status" type="hidden" name="change_info['+curr_no+'][status]" value="1">\
<span class="change_status_val">正常</span>\ <span class="change_status_val">正常<i style="color:green;">(新增)</i></span>\
</td>\ </td>\
<td>\ <td>\
<a class="btn btn-xs btn-danger deletegoods" href="javascript:;" data-id="" data-type="1">删除</a>\ <a class="btn btn-xs btn-danger deletegoods" href="javascript:;" data-id="" data-type="1">删除</a>\
......
resources/views/changeOrder/content.blade.php
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<div class="order-change-main"> <div class="order-change-main">
@if (($order_info['order_goods_type'] == 1 && $order_info['status'] == 1) || ($order_info['order_goods_type'] == 2 && $order_info['adjust_count'] < 2)) @if (($order_info['order_goods_type'] == 1 && $order_info['status'] == 1) || ($order_info['order_goods_type'] == 2 && $order_info['adjust_count'] < 2))
<form id="checkOrderForm" class="form-horizontal table-responsive"> <form id="checkOrderForm" class="form-horizontal table-responsive">
<input type="hidden" name="auditor_role" value="{{ $role }}" >
<input type="hidden" name="order_sn" value="{{$order_info['order_sn']}}"> <input type="hidden" name="order_sn" value="{{$order_info['order_sn']}}">
<input type="hidden" name="user_id" value="{{$order_info['user_id']}}"> <input type="hidden" name="user_id" value="{{$order_info['user_id']}}">
<input type="hidden" id="order_id" name="order_id" value="{{$order_info['order_id']}}"> <input type="hidden" id="order_id" name="order_id" value="{{$order_info['order_id']}}">
...@@ -178,7 +179,7 @@ ...@@ -178,7 +179,7 @@
<tbody> <tbody>
@foreach ($order_items_info as $k=>$v) @foreach ($order_items_info as $k=>$v)
<tr data-sup="{{$v['canal'] ? $v['supplier_id'].'.'.$v['canal'] : $v['supplier_id']}}"> <tr class="change_item_{{$v['rec_id']}}" data-sup="{{$v['canal'] ? $v['supplier_id'].'.'.$v['canal'] : $v['supplier_id']}}">
<input class="change_rec_id" type="hidden" name="change_rec_id" value="{{ $v['rec_id'] }}"> <input class="change_rec_id" type="hidden" name="change_rec_id" value="{{ $v['rec_id'] }}">
<td>{{ $k+1 }}</td> <td>{{ $k+1 }}</td>
<td> <td>
...@@ -193,7 +194,7 @@ ...@@ -193,7 +194,7 @@
<input class="only_number num change_goods_number" name="change_info[{{$v['rec_id']}}][goods_number]" value="{{$v['goods_number']}}"> <input class="only_number num change_goods_number" name="change_info[{{$v['rec_id']}}][goods_number]" value="{{$v['goods_number']}}">
</td> </td>
<td> <td>
<input class="price only_number" name="change_info[{{$v['rec_id']}}][goods_price]" data-origin="{{$v['original_price']}}" data-price="{{$v['goods_price']}}" value="{{$v['goods_price']}}"> <input class="price only_number change_goods_price" name="change_info[{{$v['rec_id']}}][goods_price]" data-origin="{{$v['original_price']}}" data-price="{{$v['goods_price']}}" value="{{$v['goods_price']}}">
</td> </td>
<!-- 销售类型为预售时展示 --> <!-- 销售类型为预售时展示 -->
@if ($order_info['sale_type'] == 2) @if ($order_info['sale_type'] == 2)
...@@ -213,7 +214,7 @@ ...@@ -213,7 +214,7 @@
<td> <td>
<input class="change_status" type="hidden" name="change_info[{{$v['rec_id']}}][status]" value="{{$v['status']}}"> <input class="change_status" type="hidden" name="change_info[{{$v['rec_id']}}][status]" value="{{$v['status']}}">
<span class="change_status_val">{{ $v['status'] == 1 ? '正常' : '已取消' }}</span> <span class="change_status_val">{{ $v['status'] == 1 ? '正常' : '<i class="error">已取消</i>' }}</span>
</td> </td>
@if (count($order_items_info) > 1 && in_array($order_info['status'], [1, 2])) @if (count($order_items_info) > 1 && in_array($order_info['status'], [1, 2]))
......
resources/views/changeOrder/tempSave.blade.php
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div id="temp-save-info"> <div id="temp-save-info">
<div class="order-change-main"> <div class="order-change-main">
<form id="tempSaveForm" class="form-horizontal table-responsive"> <form id="tempSaveForm" class="form-horizontal table-responsive">
@if (isset($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">
<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>
...@@ -39,18 +39,9 @@ ...@@ -39,18 +39,9 @@
@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> <td>{{$v['goods_name']}}</td>
<input type="hidden" name="change_info[{{$k}}][goods_name]" value="{{$v['goods_name']}}"> <td>{{$v['goods_number']}}</td>
<p>{{$v['goods_name']}}</p> <td>{{$v['goods_price']}}</td>
</td>
<td>
<input type="hidden" name="change_info[{{$k}}][goods_number]" value="{{$v['goods_number']}}">
<p>{{$v['goods_number']}}</p>
</td>
<td>
<input type="hidden" name="change_info[{{$k}}][goods_price]" value="{{$v['goods_price']}}">
<p>{{$v['goods_price']}}</p>
</td>
<td> <td>
{{ $v['status'] == 1 ? '正常' : '<i style="color: red;">已取消</i>' }} {{ $v['status'] == 1 ? '正常' : '<i style="color: red;">已取消</i>' }}
...@@ -131,3 +122,9 @@ ...@@ -131,3 +122,9 @@
</form> </form>
</div> </div>
</div> </div>
<script>
var temp_save_info = '{!! json_encode($order_temp_info["temp_save_info"]) !!}';
temp_save_info = eval('('+temp_save_info+')');
console.log(temp_save_info)
</script>
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