diff --git a/plugs/think-plugs-ticket/src/controller/TicketInter.php b/plugs/think-plugs-ticket/src/controller/TicketInter.php index c761372..e105c35 100644 --- a/plugs/think-plugs-ticket/src/controller/TicketInter.php +++ b/plugs/think-plugs-ticket/src/controller/TicketInter.php @@ -260,6 +260,12 @@ class TicketInter extends Controller if ($staff->isEmpty()) { $this->error('未找到维修人员信息'); } + if ($ticket->repairs && sizeof($ticket->repairs) > 0) { + $repair = $ticket->repairs[sizeof($ticket->repairs)-1]; + if ($repair->status !== 1) { + $this->error('工单未维修完成,请勿重复操作'); + } + } $view = $ticket->repairs()->save([ 'staff_id'=>$instance_data['staff_id'], 'status'=>0, diff --git a/plugs/think-plugs-ticket/src/view/common/step.html b/plugs/think-plugs-ticket/src/view/common/step.html index 4839860..31a8fb6 100644 --- a/plugs/think-plugs-ticket/src/view/common/step.html +++ b/plugs/think-plugs-ticket/src/view/common/step.html @@ -1,7 +1,7 @@
-

第{$index+1}步 +

第{$index+1}步:{$step.title} {if $step.status == 1} 已通过 {elseif $step.status == 2} @@ -25,7 +25,6 @@ 审核说明:{$step.content}

{else} - {$step.title} {/if}
diff --git a/plugs/think-plugs-ticket/src/view/common/step_p.html b/plugs/think-plugs-ticket/src/view/common/step_p.html index 7abc742..b458a65 100644 --- a/plugs/think-plugs-ticket/src/view/common/step_p.html +++ b/plugs/think-plugs-ticket/src/view/common/step_p.html @@ -1,15 +1,10 @@
-

第{$index+1}步 +

第{$index+1}步:{$step.title} {if isset($current_step)} {if $current_step == $index}(当前步骤){/if} {/if}

-
-

- {$step.title} -

-
diff --git a/plugs/think-plugs-ticket/src/view/inspection_share/detail.html b/plugs/think-plugs-ticket/src/view/inspection_share/detail.html index 274213c..5e518f0 100644 --- a/plugs/think-plugs-ticket/src/view/inspection_share/detail.html +++ b/plugs/think-plugs-ticket/src/view/inspection_share/detail.html @@ -61,7 +61,7 @@ 位置 -
+
{/if} @@ -76,7 +76,7 @@ //定义地图中心点坐标 var center = new TMap.LatLng("{$vo.ticket_lat}", "{$vo.ticket_lng}") //定义map变量,调用 TMap.Map() 构造函数创建地图 - var map = new TMap.Map(document.getElementById('map'), { + var map = new TMap.Map(document.getElementById('map{$vo.id}'), { center: center,//设置地图中心点坐标 zoom: 17.2, //设置地图缩放级别 pitch: 30, //设置俯仰角 diff --git a/plugs/think-plugs-ticket/src/view/repair/detail.html b/plugs/think-plugs-ticket/src/view/repair/detail.html index b18f31f..d96d96d 100644 --- a/plugs/think-plugs-ticket/src/view/repair/detail.html +++ b/plugs/think-plugs-ticket/src/view/repair/detail.html @@ -7,7 +7,10 @@
-
工单内容
+
+ 工单内容 + 重新创建维修工单 +
diff --git a/plugs/think-plugs-ticket/src/view/ticket_inter/index.html b/plugs/think-plugs-ticket/src/view/ticket_inter/index.html index edca96e..29270ea 100644 --- a/plugs/think-plugs-ticket/src/view/ticket_inter/index.html +++ b/plugs/think-plugs-ticket/src/view/ticket_inter/index.html @@ -1,13 +1,6 @@ {extend name="table"} {block name="button"} - - - - -下载导入模板 - - {/block} {block name="content"} @@ -139,20 +132,12 @@ if (item.repairs[item.repairs.length - 1].status !== 1) { return `请先完成维修` } - if (item.verifys && item.verifys.length > 0) { - // 已有验收工单 - const verify = item.verifys[item.verifys.length - 1]; - if (verify.status == 1) { - return `验收完毕`; - } else { - return `查看工单`; - } - } else if (item.verify_pid) { + if (item.verify_pid) { // 已有验收流程 if (item.verify_process.status === 0) { return `正在审核` } else if (item.verify_process.status === 1) { - return `创建验收工单`; + return `验收通过`; } else if (item.verify_process.status === 2) { return `已驳回`; } else if (item.verify_process.status === -1) { diff --git a/plugs/think-plugs-ticket/src/view/ticket_outer/index.html b/plugs/think-plugs-ticket/src/view/ticket_outer/index.html index 5f7d291..8d35eba 100644 --- a/plugs/think-plugs-ticket/src/view/ticket_outer/index.html +++ b/plugs/think-plugs-ticket/src/view/ticket_outer/index.html @@ -1,13 +1,6 @@ {extend name="table"} {block name="button"} - - - - -下载导入模板 - - {/block} {block name="content"}