作者 ZhengBing He

合并分支 'workorder' 到 'master'

Workorder



查看合并请求 !2393
... ... @@ -220,8 +220,6 @@ class AsideTicketController extends BaseController
// 其他字段有提交数据才修改,比如star plan_end_at
if ($request->input('title'))
$ticket->title = $request->input('title');
if ($request->input('subtitle'))
$ticket->title = $request->input('subtitle');
if ($request->input('content'))
$ticket->content = $request->input('content');
if ($request->input('star'))
... ... @@ -231,8 +229,6 @@ class AsideTicketController extends BaseController
if ($request->input('status'))
$ticket->status = $request->input('status');
$ticket->wechat_switch = $request->input('wechat_switch', 1);
if ($ticket->status == Tickets::STATUS_COMPLETED)
{
// 完成工单,把子任务里面未完成的工单改为完成
... ...
... ... @@ -25,15 +25,13 @@ class AsideTicketUpdateRequest extends FormRequest
{
return [
'title' => 'nullable|string',
'subtitle' => 'nullable|string',
'content' => 'nullable|string',
'files' => 'nullable|array',
'status' => 'nullable|in:0,1,2,3|integer',
'engineer_ids' => 'nullable|array',
'star' => 'nullable|in:1,2,3|integer',
'plan_end_at' => 'nullable|date',
'reply' => 'nullable|string', // 弃用
'wechat_switch' => 'nullable|in:0,1|integer', // 微信通知开关
'reply' => 'nullable|string', // 弃用
];
}
}
... ...