This commit is contained in:
2025-03-27 14:36:13 +08:00
parent 9293e5767c
commit f63d2e0353
7 changed files with 16 additions and 35 deletions

View File

@ -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,

View File

@ -1,7 +1,7 @@
<div class="layui-timeline-item">
<i class="layui-icon layui-timeline-axis"></i>
<div class="layui-timeline-content layui-text">
<h3 class="layui-timeline-title">{$index+1}
<h3 class="layui-timeline-title">{$index+1}{$step.title}
{if $step.status == 1}
<span class="layui-badge layui-bg-green">已通过</span>
{elseif $step.status == 2}
@ -25,7 +25,6 @@
审核说明:{$step.content}
</div>
{else}
{$step.title}
{/if}
</div>
</div>

View File

@ -1,15 +1,10 @@
<div class="layui-timeline-item">
<i class="layui-icon layui-timeline-axis"></i>
<div class="layui-timeline-content layui-text">
<h3 class="layui-timeline-title">{$index+1}
<h3 class="layui-timeline-title">{$index+1}{$step.title}
{if isset($current_step)}
{if $current_step == $index}(当前步骤){/if}
{/if}
</h3>
<div class="layui-timeline-content">
<p>
{$step.title}
</p>
</div>
</div>
</div>

View File

@ -61,7 +61,7 @@
<tr>
<td>位置</td>
<td>
<div id="map" style="height: 320px;"></div>
<div id="map{$vo.id}" style="height: 320px;"></div>
</td>
</tr>
{/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, //设置俯仰角

View File

@ -7,7 +7,10 @@
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-card">
<div class="layui-card-header">工单内容</div>
<div class="layui-card-header" style="display: flex; flex-direction: row; justify-content: space-between">
<span>工单内容</span>
<a data-modal="{:url('ticket/repair_ticket_create')}?ticket_id={$vo.ticket.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" title="创建维修工单">重新创建维修工单</a>
</div>
<div class="layui-card-body">
<div class="layui-table">
<table class="layui-table">

View File

@ -1,13 +1,6 @@
{extend name="table"}
{block name="button"}
<!--{if auth("add")}-->
<button type="button" class="layui-btn layui-btn-sm" data-modal='{:url("add")}' data-title="添加工单">添加工单</button>
<!--{/if}-->
<!--{if auth("import")}-->
<a class="layui-btn layui-btn-sm layui-btn-active" target="_blank" href="/static/ticket_import_template.xlsx">下载导入模板</a>
<button class='layui-btn layui-btn-sm layui-btn-success' data-file data-type="xlsx,xls" data-uptype='local' data-field="ticket_excel">导入工单</button>
<!--{/if}-->
{/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 `<a data-modal="{:url('verify/detail')}?id=${verify.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-active" data-title="查看验收工单" title="查看验收工单">验收完毕</a>`;
} else {
return `<a data-modal="{:url('verify/detail')}?id=${verify.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-active" data-title="查看验收工单" title="查看验收工单">查看工单</a>`;
}
} else if (item.verify_pid) {
if (item.verify_pid) {
// 已有验收流程
if (item.verify_process.status === 0) {
return `正在审核`
} else if (item.verify_process.status === 1) {
return `<a data-modal="{:url('verify_ticket_create')}?ticket_id=${item.id}" data-height="80%" data-width="40%" class="layui-btn layui-btn-xs layui-btn-active" title="创建验收工单">创建验收工单</a>`;
return `<a data-modal="{:url('verify_ticket_create')}?ticket_id=${item.id}" data-height="80%" data-width="40%" class="layui-btn layui-btn-xs layui-btn-active" title="创建验收工单">验收通过</a>`;
} else if (item.verify_process.status === 2) {
return `<a data-modal="{:url('verify_process_create')}?ticket_id=${item.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-danger" data-title="提请验收" title="提请验收">已驳回</a>`;
} else if (item.verify_process.status === -1) {

View File

@ -1,13 +1,6 @@
{extend name="table"}
{block name="button"}
<!--{if auth("add")}-->
<button type="button" class="layui-btn layui-btn-sm" data-modal='{:url("add")}' data-title="添加工单">添加工单</button>
<!--{/if}-->
<!--{if auth("import")}-->
<a class="layui-btn layui-btn-sm layui-btn-active" target="_blank" href="/static/ticket_import_template.xlsx">下载导入模板</a>
<button class='layui-btn layui-btn-sm layui-btn-success' data-file data-type="xlsx,xls" data-uptype='local' data-field="ticket_excel">导入工单</button>
<!--{/if}-->
{/block}
{block name="content"}