Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 23110569 by 朱继来
Options

调整同步状态

parent 420ae476
Inline Side-by-side
Showing with 8 additions and 11 deletions
app/Http/Controllers/OrderController.php
...@@ -540,11 +540,7 @@ Class OrderController extends Controller ...@@ -540,11 +540,7 @@ Class OrderController extends Controller
->where(function ($query) use ($map) { ->where(function ($query) use ($map) {
// 同步状态 // 同步状态
if (!empty($map['erp_order_id'])) { if (!empty($map['erp_order_id'])) {
if ($map['erp_order_id'] == 1) { $query->where('o.erp_order_id', '<>', '');
$query->where('o.erp_order_id', '<>', '');
} else {
$query->where('o.erp_order_id', '=', '');
}
} }
}) })
->where(function ($query) use ($map) { ->where(function ($query) use ($map) {
......
resources/views/orderlist/content.blade.php
...@@ -136,7 +136,6 @@ ...@@ -136,7 +136,6 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li data-val="" class="active">全部</li> <li data-val="" class="active">全部</li>
<li data-val="1">已同步</li> <li data-val="1">已同步</li>
<li data-val="-1">未同步</li>
</ul> </ul>
</div> </div>
</dd> </dd>
...@@ -248,11 +247,13 @@ ...@@ -248,11 +247,13 @@
?> ?>
</td> </td>
<td class="show-list"> <td class="show-list">
@if ($v['erp_order_id']) <?php
已同步 if (in_array($v['status'], [-1, 1, 2])) {
@else echo '不需同步';
未同步 } else {
@endif echo $v['erp_order_id'] ? '已同步' : '未同步';
}
?>
</td> </td>
<td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</td> <td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</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