提交 aa7d8600 authored 作者: 窦斌's avatar 窦斌

edit

上级 acb02381
...@@ -1504,6 +1504,8 @@ class LoginController extends Controller ...@@ -1504,6 +1504,8 @@ class LoginController extends Controller
$privileges = DB::table('privileges_technician_applet') $privileges = DB::table('privileges_technician_applet')
// ->whereIn('pri_id', $pri_id) // ->whereIn('pri_id', $pri_id)
->where('pri_show', 1) ->where('pri_show', 1)
->orderBy('pri_sord', 'asc')
->orderBy('pri_id', 'asc')
->get()->toArray(); ->get()->toArray();
$privileges = json_decode(json_encode($privileges), true); $privileges = json_decode(json_encode($privileges), true);
$privileges = array_values($privileges); $privileges = array_values($privileges);
......
...@@ -11641,10 +11641,10 @@ class WashOrderService extends Service ...@@ -11641,10 +11641,10 @@ class WashOrderService extends Service
->where('state', 1) ->where('state', 1)
->update(['state'=>2]); ->update(['state'=>2]);
} else { } else {
$wor_data['wor_state'] = 2; //11取消待审核 $wor_data['wor_state'] = 5; //11取消待审核
$wor_data['wor_update_time'] = date('Y-m-d H:i:s'); $wor_data['wor_update_time'] = date('Y-m-d H:i:s');
$wor_res = DB::table('work_order') $wor_res = DB::table('work_order')
->where('wor_id', $request['wor_id']) ->where('wor_order_id', $request['ord_id'])
->update($wor_data); ->update($wor_data);
$ord_data['ord_wor_state'] = 2; //订单的工单状态1未派工单2服务中4已完成7待接单11取消订单 $ord_data['ord_wor_state'] = 2; //订单的工单状态1未派工单2服务中4已完成7待接单11取消订单
$ord_data['ord_update_time'] = $now_time; $ord_data['ord_update_time'] = $now_time;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论