222222

plugs/think-plugs-inspection/src/controller/api/auth/Message.php

@@ -20,7 +20,7 @@ class Message extends Auth
 
     public function read()
     {
-        $message_id = $this->request->post('message_id');
+        $message_id = $this->request->post('id');
         $message = $this->staff->messages()->where('id', $message_id)->find();
         if (empty($message)) {
             $this->error('消息不存在');

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

@@ -2,6 +2,7 @@
 
 namespace plugin\ticket\controller;
 
+use app\custom\model\CustomMessage;
 use plugin\inspection\model\InspectionStaff;
 use plugin\ticket\model\ApprovalInstance;
 use plugin\ticket\model\ApprovalProcess;
@@ -379,6 +380,8 @@ class Ticket extends Controller
                 'status'=>0,
                 'title'=>'您有新的核验工单需要处理',
                 'content'=>'您有新的核验工单需要处理，请及时处理。',
+                'type' => 'TICKET_VIEW',
+                'oid' => $view->id,
             ]);
             $this->success('创建成功！', $view);
         } else {
@@ -480,6 +483,13 @@ class Ticket extends Controller
                         'content' => $comment_data['content'],
                         'result' => "后台用户反馈",
                     ]);
+                    CustomMessage::create([
+                        'user_id' => $share->user_id,
+                        'title' => "随手拍反馈",
+                        'content' => "您的随手拍有新的回复了，请及时查看。",
+                        'type' => 'USER_SHARE',
+                        'oid' => $share->id,
+                    ]);
                 }
                 TicketTicket::mk()->commit();
             } catch (\Exception $e) {

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

@@ -2,6 +2,7 @@
 
 namespace plugin\ticket\controller;
 
+use app\custom\model\CustomMessage;
 use plugin\inspection\model\InspectionStaff;
 use plugin\ticket\model\ApprovalInstance;
 use plugin\ticket\model\ApprovalProcess;
@@ -211,6 +212,7 @@ class TicketInter extends Controller
                     }
                     ApprovalStep::create([
                         'instance_id' => $instance->id,
+                        'title' => $step['title'],
                         'step_number' => $index,
                         'approver_type' => $step['approver_type'],
                         'approver_id' => $approver_id,
@@ -267,6 +269,8 @@ class TicketInter extends Controller
                 'status'=>0,
                 'title'=>'您有新的维修工单需要处理',
                 'content'=>'您有新的维修工单需要处理，请及时处理。',
+                'type' => 'TICKET_REPAIR',
+                'oid' => $view->id,
             ]);
             $ticket->kj_user_id = $instance_data['kj_user_id'];
             $this->success('创建成功！', $view);
@@ -446,6 +450,13 @@ class TicketInter extends Controller
                         'content' => $comment_data['content'],
                         'result' => "后台用户反馈",
                     ]);
+                    CustomMessage::create([
+                        'user_id' => $share->user_id,
+                        'title' => "随手拍反馈",
+                        'content' => "您的随手拍有新的回复了，请及时查看。",
+                        'type' => 'USER_SHARE',
+                        'oid' => $share->id,
+                    ]);
                 }
                 TicketTicket::mk()->commit();
             } catch (\Exception $e) {

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

@@ -2,6 +2,7 @@
 
 namespace plugin\ticket\controller;
 
+use app\custom\model\CustomMessage;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use plugin\inspection\model\InspectionStaff;
 use plugin\ticket\model\ApprovalInstance;
@@ -186,6 +187,13 @@ class TicketOuter extends Controller
                         'content' => $comment_data['content'],
                         'result' => "后台用户反馈",
                     ]);
+                    CustomMessage::create([
+                        'user_id' => $share->user_id,
+                        'title' => "随手拍反馈",
+                        'content' => "您的随手拍有新的回复了，请及时查看。",
+                        'type' => 'USER_SHARE',
+                        'oid' => $share->id,
+                    ]);
                 }
                 TicketTicket::mk()->commit();
             } catch (\Exception $e) {

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

@@ -2,6 +2,7 @@
 
 namespace plugin\ticket\controller;
 
+use app\custom\model\CustomMessage;
 use plugin\points_mall\service\UserPointService;
 use plugin\ticket\model\TicketCommonReply;
 use plugin\ticket\model\TicketTicket;
@@ -131,6 +132,13 @@ class UserShare extends Controller
             'content' => $basic_data['content'],
             'result' => $result,
         ]);
+        CustomMessage::create([
+            'user_id' => $share->user_id,
+            'title' => "随手拍反馈",
+            'content' => "您的随手拍有新的回复了，请及时查看。",
+            'type' => 'USER_SHARE',
+            'oid' => $share->id,
+        ]);
         $this->success('处理成功！');
     }
 

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

@@ -47,7 +47,7 @@
     <select class="layui-select" lay-filter="approverId" required lay-search>
         <option value="">请选择审批人</option>
         {foreach $users as $user}
-        <option value="{$user.id}" {{# if (d.approver_id == {$user.id}) {}} selected {{# } }}>{$user.username}</option>
+        <option value="{$user.id}" {{# if (d.approver_id == {$user.id}) {}} selected {{# } }}>{$user.nickname}</option>
         {/foreach}
     </select>
     {{# } else { }}
@@ -102,6 +102,8 @@ $(function () {
             if (obj.event === 'remove') {
                 obj.del();
             }
+            const currData = table.cache['processStepTable'] || [];
+            $('input[name="steps"]').val(JSON.stringify(currData))
         });
         table.on('edit(processStepTable)', function (obj) {
             const currData = table.cache['processStepTable'] || [];
@@ -128,6 +130,7 @@ $(function () {
             table.reload('processStepTable', {
                 data: currData
             });
+            $('input[name="steps"]').val(JSON.stringify(currData))
         });
     });
 

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

@@ -1,4 +1,4 @@
-<div class="layui-tab layui-tab-brief">
+<div class="layui-tab layui-tab-brief" id="ticket_flow">
     <ul class="layui-tab-title">
         {if $ticket.user_shares && sizeof($ticket.user_shares) > 0}
         <li>关联随手拍</li>
@@ -336,3 +336,10 @@
         {/if}
     </div>
 </div>
+<script>
+    $(function () {
+        const ticket_flow = $('#ticket_flow')
+        ticket_flow.find('ul > li:first-child').addClass('layui-this').end()
+        ticket_flow.find('.layui-tab-content > div:first-child').addClass('layui-show').end()
+    })
+</script>

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

@@ -32,7 +32,7 @@
             <!--{/if}-->
         {{# } else if (d.views && d.views.length > 0) { }}
             <a data-modal="{:url('view/detail')}?id={{ d.views[d.views.length - 1].id }}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs layui-btn-danger" data-title="查看核验工单" title="查看核验工单">查看核验工单</a>
-            {{# if (view.status == 1) { }}
+            {{# if (d.views[d.views.length - 1].status == 1) { }}
             <!--{if auth("move")}-->
             <a data-modal="{:url('move')}?id={{ d.id }}" data-height="80%" data-width="80%" class="layui-btn layui-btn-xs" title="分配">分配</a>
             <!--{/if}-->

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

@@ -12,17 +12,6 @@
             </select>
         </div>
     </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">选择控价人员</label>
-        <div class="layui-input-block">
-            <select name="kj_user_id">
-                <option value="">请选择控价人员</option>
-                {foreach $users as $item}
-                <option value="{$item.id}">{$item.nickname} （{$item.phone}）</option>
-                {/foreach}
-            </select>
-        </div>
-    </div>
     <div class="layui-form-item text-center">
         <button class="layui-btn layui-btn-normal" type='submit'>创建维修工单</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消</button>