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

bug等

Browse Source
This commit is contained in:
Jerry Yan
2025-03-26 11:10:38 +08:00
parent 429ba62763
commit 94fb410e64
7 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/custom/controller/api/Upload.php
View File

@ -27,7 +27,7 @@ class Upload extends Controller
} }
// 检查文件后缀是否被恶意修改 // 检查文件后缀是否被恶意修改
if (strtolower(pathinfo(parse_url($saveFileName, PHP_URL_PATH), PATHINFO_EXTENSION)) !== $extension) { if (strtolower(pathinfo(parse_url($saveFileName, PHP_URL_PATH), PATHINFO_EXTENSION)) !== $extension) {
$this->error('文件后缀异常，请重新上传文件！'); // $this->error('文件后缀异常，请重新上传文件！');
} }
// 屏蔽禁止上传指定后缀的文件 // 屏蔽禁止上传指定后缀的文件
if (!in_array($extension, str2arr(sysconf('storage.allow_exts|raw')))) { if (!in_array($extension, str2arr(sysconf('storage.allow_exts|raw')))) {

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

@ -66,10 +66,9 @@ class Ticket extends Controller
public function _form_filter(&$data) public function _form_filter(&$data)
{ {
if ($this->request->isPost()) { if ($this->request->isPost()) {
$data['user_id'] = 0; $data['user_type'] = 'admin';
$data['user_id'] = $this->request->session('user')['id'];
} }
ApprovalInstance::query()->where('oid', '=', $data['id'])->delete();
$data['status'] = -1;
} }
/** /**
@ -377,7 +376,7 @@ class Ticket extends Controller
$view = $ticket->views()->save([ $view = $ticket->views()->save([
'staff_id'=>$instance_data['staff_id'], 'staff_id'=>$instance_data['staff_id'],
'status'=>0, 'status'=>0,
'create_by'=>$adminInfo['id'], 'create_id'=>$adminInfo['id'],
]); ]);
$this->success('创建成功！', $view); $this->success('创建成功！', $view);
} else { } else {
@ -490,7 +489,7 @@ class Ticket extends Controller
'ys_content'=>$view->ys_content, 'ys_content'=>$view->ys_content,
'staff_id'=>$instance_data['staff_id'], 'staff_id'=>$instance_data['staff_id'],
'status'=>0, 'status'=>0,
'create_by'=>$adminInfo['id'], 'create_id'=>$adminInfo['id'],
]); ]);
$this->success('创建成功！', $repair); $this->success('创建成功！', $repair);
} else { } else {
@ -616,7 +615,7 @@ class Ticket extends Controller
$view = $ticket->verifys()->save([ $view = $ticket->verifys()->save([
'staff_id'=>$instance_data['staff_id'], 'staff_id'=>$instance_data['staff_id'],
'status'=>0, 'status'=>0,
'create_by'=>$adminInfo['id'], 'create_id'=>$adminInfo['id'],
]); ]);
$this->success('创建成功！', $view); $this->success('创建成功！', $view);
} else { } else {

28
plugs/think-plugs-ticket/src/view/common/ticket_flow.html
View File

@ -1,29 +1,29 @@
<div class="layui-tab layui-tab-brief"> <div class="layui-tab layui-tab-brief">
<ul class="layui-tab-title"> <ul class="layui-tab-title">
{if $ticket.user_shares} {if $ticket.user_shares && sizeof($ticket.user_shares) > 0}
<li>关联随手拍</li> <li>关联随手拍</li>
{/if} {/if}
{if $ticket.inspection_shares} {if $ticket.inspection_shares && sizeof($ticket.inspection_shares) > 0}
<li>关联维修人员上报</li> <li>关联维修人员上报</li>
{/if} {/if}
{if $ticket.views} {if $ticket.views && sizeof($ticket.views) > 0}
<li>核验信息</li> <li>核验信息</li>
{/if} {/if}
{if $ticket.repair_process} {if $ticket.repair_process && sizeof($ticket.repair_process) > 0}
<li>维修审核信息</li> <li>维修审核信息</li>
{/if} {/if}
{if $ticket.repairs} {if $ticket.repairs && sizeof($ticket.repairs) > 0}
<li>维修信息</li> <li>维修信息</li>
{/if} {/if}
{if $ticket.verify_process} {if $ticket.verify_process && sizeof($ticket.verify_process) > 0}
<li>验收审核信息</li> <li>验收审核信息</li>
{/if} {/if}
{if $ticket.verifys} {if $ticket.verifys && sizeof($ticket.verifys) > 0}
<li>验收信息</li> <li>验收信息</li>
{/if} {/if}
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content">
{if $ticket.user_shares} {if $ticket.user_shares && sizeof($ticket.user_shares) > 0}
<div class="layui-tab-item"> <div class="layui-tab-item">
<div class="layui-card"> <div class="layui-card">
<div class="layui-card-header">关联随手拍</div> <div class="layui-card-header">关联随手拍</div>
@ -54,7 +54,7 @@
</div> </div>
</div> </div>
{/if} {/if}
{if $ticket.inspection_shares} {if $ticket.inspection_shares && sizeof($ticket.inspection_shares) > 0}
<div class="layui-tab-item"> <div class="layui-tab-item">
<div class="layui-card"> <div class="layui-card">
<div class="layui-card-header">关联维修人员上报</div> <div class="layui-card-header">关联维修人员上报</div>
@ -85,7 +85,7 @@
</div> </div>
</div> </div>
{/if} {/if}
{if $ticket.views} {if $ticket.views && sizeof($ticket.views) > 0}
<div class="layui-tab-item"> <div class="layui-tab-item">
<div class="layui-card"> <div class="layui-card">
<div class="layui-card-header">核验信息</div> <div class="layui-card-header">核验信息</div>
@ -164,7 +164,7 @@
</div> </div>
</div> </div>
{/if} {/if}
{if $ticket.repair_process} {if $ticket.repair_process && sizeof($ticket.repair_process) > 0}
<div class="layui-tab-item"> <div class="layui-tab-item">
<div class="layui-collapse"> <div class="layui-collapse">
<div class="layui-colla-item"> <div class="layui-colla-item">
@ -192,7 +192,7 @@
</div> </div>
</div> </div>
{/if} {/if}
{if $ticket.repairs} {if $ticket.repairs && sizeof($ticket.repairs) > 0}
<div class="layui-tab-item"> <div class="layui-tab-item">
<div class="layui-card"> <div class="layui-card">
<div class="layui-card-header">核验信息</div> <div class="layui-card-header">核验信息</div>
@ -247,7 +247,7 @@
</div> </div>
</div> </div>
{/if} {/if}
{if $ticket.verify_process} {if $ticket.verify_process && sizeof($ticket.verify_process) > 0}
<div class="layui-tab-item"> <div class="layui-tab-item">
<div class="layui-collapse"> <div class="layui-collapse">
<div class="layui-colla-item"> <div class="layui-colla-item">
@ -275,7 +275,7 @@
</div> </div>
</div> </div>
{/if} {/if}
{if $ticket.verifys} {if $ticket.verifys && sizeof($ticket.verifys) > 0}
<div class="layui-tab-item"> <div class="layui-tab-item">
<div class="layui-card"> <div class="layui-card">
<div class="layui-card-header">验收信息</div> <div class="layui-card-header">验收信息</div>

7
plugs/think-plugs-ticket/src/view/ticket/form.html
View File

@ -1,5 +1,12 @@
<form class="layui-form layui-card" action="{:sysuri()}" data-auto="true" method="post" autocomplete="off" data-table-id="ticketTable"> <form class="layui-form layui-card" action="{:sysuri()}" data-auto="true" method="post" autocomplete="off" data-table-id="ticketTable">
<div class="layui-row"> <div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label">工单地址</label>
<div class="layui-input-block">
<input type="text" name="ticket_region" value='{$vo.ticket_region|default="四川省/广安市/广安区"}' readonly required placeholder="工单地址" class="layui-input">
<input type="text" name="ticket_address" value='{$vo.ticket_address|default=""}' required placeholder="工单地址" class="layui-input">
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">工单标题</label> <label class="layui-form-label">工单标题</label>
<div class="layui-input-block"> <div class="layui-input-block">

9
plugs/think-plugs-ticket/src/view/ticket/index.html
View File

@ -87,15 +87,20 @@
return `<a data-modal="{:url('view/detail')}?id=${view.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" data-title="查看核验工单" title="查看核验工单">查看工单</a>`; return `<a data-modal="{:url('view/detail')}?id=${view.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" data-title="查看核验工单" title="查看核验工单">查看工单</a>`;
} }
} else { } else {
return `<a data-modal="{:url('view_process_create')}?ticket_id=${item.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" title="提请核验">创建核验工单</a>`; return `<a data-modal="{:url('view_ticket_create')}?ticket_id=${item.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" title="提请核验">创建核验工单</a>`;
} }
}}, }},
{field:'status', title:'状态', width:80, templet:function(item){ {field:'status', title:'状态', width:80, templet:function(item){
if (item.status === 0) { if (item.status !== 1) {
if (!item.views || item.views.length === 0) { if (!item.views || item.views.length === 0) {
return `<span style="color: red">待核验</span>` return `<span style="color: red">待核验</span>`
} }
const view = item.views[item.views.length - 1];
if (view.status == 1) {
return `<span style="color: red">待分配</span>` return `<span style="color: red">待分配</span>`
} else {
return `<span style="color: yellowgreen">待核验完成</span>`
}
} else { } else {
if (item.state === 2) { if (item.state === 2) {
return `<span style="color: green">外部工单</span>` return `<span style="color: green">外部工单</span>`

2
plugs/think-plugs-ticket/src/view/ticket_inter/index.html
View File

@ -82,7 +82,7 @@
return `<a data-modal="{:url('view/detail')}?id=${view.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" data-title="查看核验工单" title="查看核验工单">查看工单</a>`; return `<a data-modal="{:url('view/detail')}?id=${view.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" data-title="查看核验工单" title="查看核验工单">查看工单</a>`;
} }
} else { } else {
return `<a data-modal="{:url('view_process_create')}?ticket_id=${item.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" title="提请核验">创建核验工单</a>`; return `<a data-modal="{:url('view_ticket_create')}?ticket_id=${item.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" title="提请核验">创建核验工单</a>`;
} }
}}, }},
{field: 'repair', title:'维修情况', width: 100, minWidth:100, templet:function(item){ {field: 'repair', title:'维修情况', width: 100, minWidth:100, templet:function(item){

2
plugs/think-plugs-ticket/src/view/ticket_outer/index.html
View File

@ -84,7 +84,7 @@
return `<a data-modal="{:url('view/detail')}?id=${view.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" data-title="查看核验工单" title="查看核验工单">查看工单</a>`; return `<a data-modal="{:url('view/detail')}?id=${view.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" data-title="查看核验工单" title="查看核验工单">查看工单</a>`;
} }
} else { } else {
return `<a data-modal="{:url('view_process_create')}?ticket_id=${item.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" title="提请核验">创建核验工单</a>`; return `<a data-modal="{:url('view_ticket_create')}?ticket_id=${item.id}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-normal" title="提请核验">创建核验工单</a>`;
} }
}}, }},
{fixed: 'right', title:'操作', toolbar: '#toolbar', width:200} {fixed: 'right', title:'操作', toolbar: '#toolbar', width:200}