bug等

app/custom/controller/api/Upload.php

@@ -27,7 +27,7 @@ class Upload extends Controller
         }
         // 检查文件后缀是否被恶意修改
         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')))) {

plugs/think-plugs-ticket/src/controller/Ticket.php

@@ -66,10 +66,9 @@ class Ticket extends Controller
     public function _form_filter(&$data)
     {
         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([
                 'staff_id'=>$instance_data['staff_id'],
                 'status'=>0,
-                'create_by'=>$adminInfo['id'],
+                'create_id'=>$adminInfo['id'],
             ]);
             $this->success('创建成功！', $view);
         } else {
@@ -490,7 +489,7 @@ class Ticket extends Controller
                 'ys_content'=>$view->ys_content,
                 'staff_id'=>$instance_data['staff_id'],
                 'status'=>0,
-                'create_by'=>$adminInfo['id'],
+                'create_id'=>$adminInfo['id'],
             ]);
             $this->success('创建成功！', $repair);
         } else {
@@ -616,7 +615,7 @@ class Ticket extends Controller
             $view = $ticket->verifys()->save([
                 'staff_id'=>$instance_data['staff_id'],
                 'status'=>0,
-                'create_by'=>$adminInfo['id'],
+                'create_id'=>$adminInfo['id'],
             ]);
             $this->success('创建成功！', $view);
         } else {

plugs/think-plugs-ticket/src/view/common/ticket_flow.html

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

plugs/think-plugs-ticket/src/view/ticket/form.html

@@ -1,5 +1,12 @@
 <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-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">
             <label class="layui-form-label">工单标题</label>
             <div class="layui-input-block">

plugs/think-plugs-ticket/src/view/ticket/index.html

@@ -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>`;
                             }
                         } 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){
-                    if (item.status === 0) {
+                    if (item.status !== 1) {
                         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>`
+                        } else {
+                            return `<span style="color: yellowgreen">待核验完成</span>`
+                        }
                     } else {
                         if (item.state === 2) {
                             return `<span style="color: green">外部工单</span>`

plugs/think-plugs-ticket/src/view/ticket_inter/index.html

@@ -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>`;
                             }
                         } 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){

plugs/think-plugs-ticket/src/view/ticket_outer/index.html

@@ -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>`;
                             }
                         } 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}