Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 203b28b2 by 朱继来
Options

调整主管审核流程（申请再审核）

parent ea1ddf3a
Inline Side-by-side
Showing with 13 additions and 14 deletions
app/Http/Controllers/OrderController.php
...@@ -894,13 +894,12 @@ Class OrderController extends Controller ...@@ -894,13 +894,12 @@ Class OrderController extends Controller
$url = Config('website.api_domain').'order/tempSaveOrder'; $url = Config('website.api_domain').'order/tempSaveOrder';
} else { } else {
$auditor_role = $request->input('auditor_role', 1); // 当前操作人角色 // $auditor_role = $request->input('auditor_role', 1); // 当前操作人角色
$order_goods_type = $request->input('order_goods_type', 1); // $order_goods_type = $request->input('order_goods_type', 1);
if ($order_goods_type == 1) { // if ($order_goods_type == 1) {
// $resData['status'] = $auditor_role == 3 ? 1 : 2; // 角色为‘查看自己’时，状态为待审核，否则为待付款 // $resData['is_manager'] = $auditor_role == 3 ? 0 : 1; // 角色为‘查看自己’时，is_manager = 0
$resData['is_manager'] = $auditor_role == 3 ? 0 : 1; // 角色为‘查看自己’时，is_manager = 0 // }
}
$url = Config('website.api_domain').'order/changeOrder'; $url = Config('website.api_domain').'order/changeOrder';
} }
......
resources/views/changeOrder/content.blade.php
...@@ -405,7 +405,7 @@ ...@@ -405,7 +405,7 @@
@endif @endif
@if ($order_info['order_goods_type'] == 1) @if ($order_info['order_goods_type'] == 1)
<a class="btn btn-info tempSave" style="margin-right: 20px;">保存</a> <a class="btn btn-info tempSave" style="margin-right: 20px;">临时保存</a>
@endif @endif
@if ($order_info['order_goods_type'] == 2 && $order_temp_info['status'] == 1) @if ($order_info['order_goods_type'] == 2 && $order_temp_info['status'] == 1)
......
resources/views/changeOrder/tempSave.blade.php
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<tr> <tr>
<td><?= $order_temp_info['temp_save_info']['customer_cn'] ?></td> <td><?= $order_temp_info['temp_save_info']['customer_cn'] ?></td>
<td><?= $order_temp_info['temp_save_info']['customer_en'] ?></td> <td><?= $order_temp_info['temp_save_info']['customer_en'] ?></td>
<td><?= Config('params.end_user_type')[$order_temp_info['temp_save_info']['customer_type']] ?></td> <td><?= $order_temp_info['temp_save_info']['customer_type'] ? Config('params.end_user_type')[$order_temp_info['temp_save_info']['customer_type']] : '' ?></td>
<td><?= $order_temp_info['temp_save_info']['product_use'] ?></td> <td><?= $order_temp_info['temp_save_info']['product_use'] ?></td>
</tr> </tr>
</table> </table>
......
resources/views/detail/content.blade.php
...@@ -165,18 +165,18 @@ ...@@ -165,18 +165,18 @@
@endif @endif
<!-- 申请主管审核 --> <!-- 申请主管审核 -->
@if (isset($order_temp_info['is_manager_audit']) && $order_temp_info['is_manager_audit'] == 1 && $order_info['status'] == 2) @if (isset($order_temp_info['is_manager_audit']) && $order_temp_info['is_manager_audit'] == 1)
<a class="btn btn-info apply-manager-audit" data-id="{{$order_info['order_id']}}">申请主管审核</a> <a class="btn btn-info apply-manager-audit" data-id="{{$order_info['order_id']}}">申请主管审核</a>
@endif @endif
<!-- 主管审核 --> <!-- 主管审核 -->
@if (isset($order_temp_info['is_manager_audit']) && (($order_info['status'] == 2 && $order_temp_info['is_manager_audit'] == 2) || ($order_info['status'] > 2 && $order_temp_info['is_manager_audit'] != 3)) && in_array($role, [1, 2]) && empty($order_temp_info['erp_sn'])) @if (isset($order_temp_info['is_manager_audit']) && $order_temp_info['is_manager_audit'] == 2 && in_array($role, [1, 2]) && empty($order_temp_info['erp_sn']))
<a class="btn btn-danger manager-audit" data-id="{{$order_info['order_id']}}">主管审核</a> <a class="btn btn-danger manager-audit" data-id="{{$order_info['order_id']}}">主管审核</a>
@endif @endif
<!-- 判断邮件发送时机 --> <!-- 判断邮件发送时机 -->
@if (!empty($order_temp_info['erp_sn']) && in_array($order_info['status'], [2, 3, 4])) @if (!empty($order_temp_info['erp_sn']) && in_array($order_info['status'], [2, 3, 4]))
<a class="btn btn-primary send_mail" data-id="{{ $order_info['order_id'] }}">发送邮件</a> <a class="btn btn-warning send_mail" data-id="{{ $order_info['order_id'] }}">发送邮件</a>
@endif @endif
<!-- 预付款 管理员完成首款对账后改变'对账'按钮 --> <!-- 预付款 管理员完成首款对账后改变'对账'按钮 -->
@if (in_array($order_info['status'], [2, 3]) && in_array('check_account', $userPerms)) @if (in_array($order_info['status'], [2, 3]) && in_array('check_account', $userPerms))
......
resources/views/orderlist/content.blade.php
...@@ -352,12 +352,12 @@ ...@@ -352,12 +352,12 @@
@endif @endif
<!-- 申请主管审核 --> <!-- 申请主管审核 -->
@if (isset($order_extend->is_manager_audit) && $order_extend->is_manager_audit == 1 && $v['status'] == 2) @if (isset($order_extend->is_manager_audit) && $order_extend->is_manager_audit == 1)
<a class="btn btn-info apply-manager-audit" data-id="{{$v['order_id']}}">申请主管审核</a> <a class="btn btn-info apply-manager-audit" data-id="{{$v['order_id']}}">申请主管审核</a>
@endif @endif
<!-- 主管审核 (待付款且待主管审核 || 已付款且主管未审核) && 主管角色 && 未同步 --> <!-- 待主管审核 && 主管角色 && 未同步 -->
@if (isset($order_extend->is_manager_audit) && (($v['status'] == 2 && $order_extend->is_manager_audit == 2) || ($v['status'] > 2 && $order_extend->is_manager_audit != 3)) && in_array($role, [1, 2]) && empty($order_extend->erp_sn)) @if (isset($order_extend->is_manager_audit) && $order_extend->is_manager_audit == 2 && in_array($role, [1, 2]) && empty($order_extend->erp_sn))
<a class="btn btn-danger manager-audit" data-id="{{$v['order_id']}}">主管审核</a> <a class="btn btn-danger manager-audit" data-id="{{$v['order_id']}}">主管审核</a>
@endif @endif
......
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