q792602257/guangan
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工单类型调整，状态文字调整

Browse Source
This commit is contained in:
Jerry Yan
2025-03-19 11:09:52 +08:00
parent 483bcfd6d8
commit 37823cc98a
2 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugs/think-plugs-ticket/src/controller/Ticket.php
View File

@ -41,7 +41,7 @@ class Ticket extends Controller
$query->like(['title|content|contact_name|ticket_address|contact_phone#keyword'])
->dateBetween(['create_at'])
->equal(['status', 'type_id']);
$query->append(['imgs_arr', 'source_type_name', 'status_text', 'type_name', 'last_reply'])->with('approval');
$query->append(['imgs_arr', 'source_type_name', 'type_name', 'last_reply'])->with('approval');
});
}
@ -80,7 +80,7 @@ class Ticket extends Controller
{
$this->title = '工单详情';
['id' => $id] = $this->_vali(['id.require' => '请指定工单ID！']);
$this->vo = TicketTicket::mk()->with(['user', 'type', 'reply'])->append(['imgs_arr', 'status_text', 'type_name', 'last_reply'])->find($id);
$this->vo = TicketTicket::mk()->with(['user', 'type', 'reply'])->append(['imgs_arr', 'type_name', 'last_reply'])->find($id);
$process = ApprovalProcess::where('type', '=', 'GDSH')->order('id', 'asc')->findOrEmpty();
$instance = ApprovalInstance::query()->with(['steps.approver', 'logs'])->where('process_id', '=', $process->id)->where('oid', '=', $id)->findOrEmpty();
$this->instance = $instance;
@ -130,7 +130,7 @@ class Ticket extends Controller
'ticket_id.require'=>'请指定工单ID！',
'id.require'=>'请指定回复ID！'
]);
$this->vo = TicketTicket::mk()->with(['user', 'type'])->append(['imgs_arr', 'status_text', 'type_name'])->find($ticket_id);
$this->vo = TicketTicket::mk()->with(['user', 'type'])->append(['imgs_arr', 'type_name'])->find($ticket_id);
TicketReply::mForm('reply');
}
@ -198,7 +198,7 @@ class Ticket extends Controller
] = $this->_vali([
'id.require'=>'请指定回复ID！'
]);
$this->vo = TicketTicket::query()->with(['user', 'type'])->append(['imgs_arr', 'status_text', 'type_name'])->find($id);
$this->vo = TicketTicket::query()->with(['user', 'type'])->append(['imgs_arr', 'type_name'])->find($id);
$process = ApprovalProcess::where('type', '=', 'GDSH')->order('id', 'asc')->findOrEmpty();
if ($process->isEmpty()) {
$this->error('未找到可用的审核流程');
@ -368,7 +368,7 @@ class Ticket extends Controller
->dateBetween(['create_at'])
->equal(['status', 'type_id']);
$query->whereIn("id", ApprovalStep::query()->where(['approver_id' => $this->user_id, 'status' => 0, 'approver_type' => 1, 'instance.status' => 0])->field("oid")->select())
->append(['imgs_arr', 'source_type_name', 'status_text', 'type_name', 'last_reply'])->with('approval');
->append(['imgs_arr', 'source_type_name', 'type_name', 'last_reply'])->with('approval');
});
}