From 9b9785fbb417aafd10f85b54d43f84bec767bcaf Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Tue, 3 Dec 2024 17:00:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=85=B3=E8=81=94=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/model/TicketRepair.php | 24 ++ .../src/model/TicketRepairAccept.php | 24 ++ .../src/model/TicketTicket.php | 15 ++ .../src/model/TicketVerify.php | 24 ++ .../src/view/ticket/detail.html | 144 ++++++++-- .../src/view/ticket_inter/detail.html | 247 ++++++++++++++---- .../src/view/ticket_outer/detail.html | 193 +++++++++----- 7 files changed, 527 insertions(+), 144 deletions(-) create mode 100644 plugs/think-plugs-ticket/src/model/TicketRepair.php create mode 100644 plugs/think-plugs-ticket/src/model/TicketRepairAccept.php create mode 100644 plugs/think-plugs-ticket/src/model/TicketVerify.php diff --git a/plugs/think-plugs-ticket/src/model/TicketRepair.php b/plugs/think-plugs-ticket/src/model/TicketRepair.php new file mode 100644 index 0000000..8c7ca1f --- /dev/null +++ b/plugs/think-plugs-ticket/src/model/TicketRepair.php @@ -0,0 +1,24 @@ +belongsTo(TicketTicket::class, 'ticket_id'); + } + + public function staff() + { + return $this->belongsTo(InspectionStaff::class, 'staff_id'); + } + + public function getImgsArrAttr($value, $data) + { + return str2arr($data['imgs'] ?: '', '|'); + } +} \ No newline at end of file diff --git a/plugs/think-plugs-ticket/src/model/TicketRepairAccept.php b/plugs/think-plugs-ticket/src/model/TicketRepairAccept.php new file mode 100644 index 0000000..cf7115a --- /dev/null +++ b/plugs/think-plugs-ticket/src/model/TicketRepairAccept.php @@ -0,0 +1,24 @@ +belongsTo(TicketTicket::class, 'ticket_id'); + } + + public function staff() + { + return $this->belongsTo(InspectionStaff::class, 'staff_id'); + } + + public function getImgsArrAttr($value, $data) + { + return str2arr($data['imgs'] ?: '', '|'); + } +} \ No newline at end of file diff --git a/plugs/think-plugs-ticket/src/model/TicketTicket.php b/plugs/think-plugs-ticket/src/model/TicketTicket.php index 2cde2ea..752df37 100644 --- a/plugs/think-plugs-ticket/src/model/TicketTicket.php +++ b/plugs/think-plugs-ticket/src/model/TicketTicket.php @@ -105,6 +105,21 @@ class TicketTicket extends Model return $this->belongsTo(TicketDept::class, 'dept_id'); } + public function verify() + { + return $this->hasMany(TicketVerify::class, 'ticket_id')->order('create_at', 'desc'); + } + + public function repair() + { + return $this->hasMany(TicketRepair::class, 'ticket_id')->order('create_at', 'desc'); + } + + public function repair_accept() + { + return $this->hasMany(TicketRepairAccept::class, 'ticket_id')->order('create_at', 'desc'); + } + public function scopeUnConf($query) { return $query->where('state', '=', '0'); diff --git a/plugs/think-plugs-ticket/src/model/TicketVerify.php b/plugs/think-plugs-ticket/src/model/TicketVerify.php new file mode 100644 index 0000000..9ee7917 --- /dev/null +++ b/plugs/think-plugs-ticket/src/model/TicketVerify.php @@ -0,0 +1,24 @@ +belongsTo(TicketTicket::class, 'ticket_id'); + } + + public function staff() + { + return $this->belongsTo(InspectionStaff::class, 'staff_id'); + } + + public function getImgsArrAttr($value, $data) + { + return str2arr($data['imgs'] ?: '', '|'); + } +} \ No newline at end of file diff --git a/plugs/think-plugs-ticket/src/view/ticket/detail.html b/plugs/think-plugs-ticket/src/view/ticket/detail.html index 6abddab..102b3b9 100644 --- a/plugs/think-plugs-ticket/src/view/ticket/detail.html +++ b/plugs/think-plugs-ticket/src/view/ticket/detail.html @@ -1,37 +1,125 @@ -
-
工单内容
-
-
- 工单编号：{$vo.id|default=""} +
+
    +
  • 基本信息
    • +
  • 现场核实情况
    • +
  • 关联随手拍
    • +
+
+
+
+
工单内容
+
+
+ 工单编号：{$vo.id|default=""} +
+
+ 工单标题：{$vo.title|default=""} +
+
+ 反馈人信息：{$vo.contact_name|default="未填写名称"}， + 联系方式：{$vo.contact_phone|default="未填写联系方式"}， + 联系地址：{$vo.contact_address|default="未填写地址"} +
+
+ 工单类型：{$vo.type_name|default=""} +
+
+ 工单地址：{$vo.ticket_address|default=""} +
+
+ 工单内容：{$vo.content|default=""} +
+
+ 工单图片： +
+ {foreach $vo.imgs_arr as $img} + image +   + {/foreach} +
+
+
+
-
- 工单标题：{$vo.title|default=""} +
+
+
现场核实情况
+ {if $vo.verify} +
+ {foreach $vo.verify as $verify} + + + + + + + + + + + + + + + + + + + + + + + +
提交时间{$verify.create_at|default=""}
核实人{$verify.staff.name|default=""}【联系方式：{$verify.staff.phone|default=""}】
核实结果{$verify.content|default=""}
图片 +
+ {foreach $verify.imgs_arr as $img} + image +   + {/foreach} +
+
预估工作量{$verify.work_days|default=""}
+
+ {else /} +
+
+ 暂无核实记录 +
+
+ {/if} +
-
- 反馈人信息：{$vo.contact_name|default="未填写名称"}， - 联系方式：{$vo.contact_phone|default="未填写联系方式"}， - 联系地址：{$vo.contact_address|default="未填写地址"} -
-
- 工单类型：{$vo.type_name|default=""} -
-
- 工单地址：{$vo.ticket_address|default=""} -
-
- 工单内容：{$vo.content|default=""} -
-
- 工单图片： -
- {foreach $vo.imgs_arr as $img} - image -   - {/foreach} +
+
+
关联随手拍
+
+ + + + + + + + + + + + {foreach $vo.userShares as $user_share} + + + + + + + + + {/foreach} +
随手拍编号问题类型反馈人联系方式反馈时间
{$user_share.id}{$user_share.type_name|default=""}{$user_share.contact_name|default=""}{$user_share.contact_phone|default=""}{$user_share.create_at|default=""}
+
+
工单流转详情
diff --git a/plugs/think-plugs-ticket/src/view/ticket_inter/detail.html b/plugs/think-plugs-ticket/src/view/ticket_inter/detail.html index 6abddab..ac0150b 100644 --- a/plugs/think-plugs-ticket/src/view/ticket_inter/detail.html +++ b/plugs/think-plugs-ticket/src/view/ticket_inter/detail.html @@ -1,65 +1,198 @@ -
-
工单内容
-
-
- 工单编号：{$vo.id|default=""} +
+
    +
  • 基本信息
    • +
  • 核实情况
    • +
  • 维修情况
    • +
  • 验收情况
    • +
  • 结算情况
    • +
+
+
+
+
工单内容
+
+
+ 工单编号：{$vo.id|default=""} +
+
+ 工单标题：{$vo.title|default=""} +
+
+ 反馈人信息：{$vo.contact_name|default="未填写名称"}， + 联系方式：{$vo.contact_phone|default="未填写联系方式"}， + 联系地址：{$vo.contact_address|default="未填写地址"} +
+
+ 工单类型：{$vo.type_name|default=""} +
+
+ 工单地址：{$vo.ticket_address|default=""} +
+
+ 工单内容：{$vo.content|default=""} +
+
+ 工单图片： +
+ {foreach $vo.imgs_arr as $img} + image +   + {/foreach} +
+
+
+
-
- 工单标题：{$vo.title|default=""} +
+
+
现场核实情况
+ {if $vo.verify} +
+ {foreach $vo.verify as $verify} + + + + + + + + + + + + + + + + + + + + + + + +
提交时间{$verify.create_at|default=""}
核实人{$verify.staff.name|default=""}【联系方式：{$verify.staff.phone|default=""}】
核实结果{$verify.content|default=""}
图片 +
+ {foreach $verify.imgs_arr as $img} + image +   + {/foreach} +
+
预估工作量{$verify.work_days|default=""}
+
+ {else /} +
+
+ 暂无核实记录 +
+
+ {/if} +
-
- 反馈人信息：{$vo.contact_name|default="未填写名称"}， - 联系方式：{$vo.contact_phone|default="未填写联系方式"}， - 联系地址：{$vo.contact_address|default="未填写地址"} +
+
+
工单维修情况
+ {if $vo.repair} +
+ {foreach $vo.repair as $repair} + + + + + + + + + + + + + + + + + + + +
提交时间{$repair.create_at|default=""}
维修人{$repair.staff.name|default=""}【联系方式：{$repair.staff.phone|default=""}】
维修结果{$repair.content|default=""}
图片 +
+ {foreach $repair.imgs_arr as $img} + image +   + {/foreach} +
+
+ {/foreach} +
+ {else /} +
+
+ 暂无维修记录 +
+
+ {/if} +
-
- 工单类型：{$vo.type_name|default=""} +
+
+
工单验收情况
+ {if $vo.repair_accept} +
+ {foreach $vo.repair_accept as $accept} + + + + + + + + + + + + + + + + + + + +
提交时间{$accept.create_at|default=""}
验收人{$accept.staff.name|default=""}【联系方式：{$accept.staff.phone|default=""}】
验收结果{$accept.content|default=""}
图片 +
+ {foreach $accept.imgs_arr as $img} + image +   + {/foreach} +
+
+ {/foreach} +
+ {else /} +
+
+ 暂无验收记录 +
+
+ {/if} +
-
- 工单地址：{$vo.ticket_address|default=""} -
-
- 工单内容：{$vo.content|default=""} -
-
- 工单图片： -
- {foreach $vo.imgs_arr as $img} - image -   - {/foreach} +
+
+
工单结算情况
+ {if $vo.calculate} + {else /} +
+
+ 暂无结算记录 +
+
+ 结算 +
+
+ {/if}
-
-
-
工单流转详情
-
- - - - - - - - - - - {notempty name='vo.reply'} - {foreach $vo.reply as $reply} - - - - - - - {/foreach} - {else} - - - - {/notempty} - -
工单处理人处理类型工单处理时间处理内容
{$reply.username|default=""}{$reply.type_name|default=""}{$reply.create_at|default=""}{$reply.content|default=""}
暂无工单流转记录
-
\ No newline at end of file diff --git a/plugs/think-plugs-ticket/src/view/ticket_outer/detail.html b/plugs/think-plugs-ticket/src/view/ticket_outer/detail.html index 6abddab..cfcbe62 100644 --- a/plugs/think-plugs-ticket/src/view/ticket_outer/detail.html +++ b/plugs/think-plugs-ticket/src/view/ticket_outer/detail.html @@ -1,65 +1,140 @@ -
-
工单内容
-
-
- 工单编号：{$vo.id|default=""} +
+
    +
  • 基本信息
    • +
  • 核实情况
    • +
  • 维修情况
    • +
+
+
+
+
工单内容
+
+
+ 工单编号：{$vo.id|default=""} +
+
+ 工单标题：{$vo.title|default=""} +
+
+ 反馈人信息：{$vo.contact_name|default="未填写名称"}， + 联系方式：{$vo.contact_phone|default="未填写联系方式"}， + 联系地址：{$vo.contact_address|default="未填写地址"} +
+
+ 工单类型：{$vo.type_name|default=""} +
+
+ 工单地址：{$vo.ticket_address|default=""} +
+
+ 工单内容：{$vo.content|default=""} +
+
+ 工单图片： +
+ {foreach $vo.imgs_arr as $img} + image +   + {/foreach} +
+
+
+
-
- 工单标题：{$vo.title|default=""} +
+
+
现场核实情况
+ {if $vo.verify} +
+ {foreach $vo.verify as $verify} + + + + + + + + + + + + + + + + + + + + + + + +
提交时间{$verify.create_at|default=""}
核实人{$verify.staff.name|default=""}【联系方式：{$verify.staff.phone|default=""}】
核实结果{$verify.content|default=""}
图片 +
+ {foreach $verify.imgs_arr as $img} + image +   + {/foreach} +
+
预估工作量{$verify.work_days|default=""}
+
+ {else /} +
+
+ 暂无核实记录 +
+
+ {/if} +
-
- 反馈人信息：{$vo.contact_name|default="未填写名称"}， - 联系方式：{$vo.contact_phone|default="未填写联系方式"}， - 联系地址：{$vo.contact_address|default="未填写地址"} -
-
- 工单类型：{$vo.type_name|default=""} -
-
- 工单地址：{$vo.ticket_address|default=""} -
-
- 工单内容：{$vo.content|default=""} -
-
- 工单图片： -
- {foreach $vo.imgs_arr as $img} - image -   - {/foreach} +
+
+
工单维修情况
+ {if $vo.repair} +
+ {foreach $vo.repair as $repair} + + + + + + + + + + + + + + + + + + + + + + + +
提交时间{$repair.create_at|default=""}
维修人{$repair.staff.name|default=""}【联系方式：{$repair.staff.phone|default=""}】
维修结果{$repair.content|default=""}
图片 +
+ {foreach $repair.imgs_arr as $img} + image +   + {/foreach} +
+
预估工作量{$verify.work_days|default=""}
+ {/foreach} +
+ {else /} +
+
+ 暂无维修记录 +
+
+ {/if}
-
-
-
工单流转详情
-
- - - - - - - - - - - {notempty name='vo.reply'} - {foreach $vo.reply as $reply} - - - - - - - {/foreach} - {else} - - - - {/notempty} - -
工单处理人处理类型工单处理时间处理内容
{$reply.username|default=""}{$reply.type_name|default=""}{$reply.create_at|default=""}{$reply.content|default=""}
暂无工单流转记录
-
\ No newline at end of file