Merge remote-tracking branch 'origin/develop' into feature/hant

# Conflicts:
#	application/admin/controller/AutoDispatchLogic.php
#	application/common/Logic/OrderLogic.php

application/admin/behavior/OrderDispatchLog.php

@@ -4,6 +4,7 @@ namespace app\admin\behavior;
 
 use app\admin\controller\SendMailLogic;
 use app\admin\model\OrderDispatch;
+use app\admin\model\TtsLog;
 use app\common\Logic\NoticeLogic;
 use app\common\model\Order;
 use think\Exception;
@@ -48,6 +49,7 @@ class OrderDispatchLog
                     ];
                     $service = new NoticeLogic();
                     $service->dispatchNotice($dispatch);
+                    TtsLog::create($data);
                 }
             }
 

application/admin/controller/AutoDispatchLogic.php

@@ -55,7 +55,7 @@ class AutoDispatchLogic
         //日志
         $hookparams['order'] = $order;
         $hookparams['role'] = 1;
-        $hookparams['auth'] = $auth;
+        $hookparams['auth'] = null;
         $hookparams['remark'] = '系统自动完成派单';//. $worker->name.'('.$worker->tel.')';
         Hook::listen('order_change', $hookparams);
 

application/admin/controller/Message.php

@@ -130,7 +130,7 @@ class Message extends Backend
         $count = 0;
         //超管不提醒新消息
         //if(!$this->auth->isSuperAdmin()){
-        if(!$this->auth->id != 1){
+       // if(!$this->auth->id != 1){
             $count =  $this->model
                 ->where('type',1)
                 ->where('to_id',$this->auth->id)
@@ -139,7 +139,7 @@ class Message extends Backend
                 ->whereRaw("FIND_IN_SET({$this->auth->id}, read_uid) = 0 OR read_uid = ''  or read_uid is null")
                 ->whereTime('create_time', '>=', '-3 days')
                 ->count();
-        }
+       // }
         return [
             'count' =>  $count
         ];

application/admin/controller/orders/Dispatchrecord.php

@@ -141,7 +141,7 @@ class Dispatchrecord extends Backend
                 $dispatch->follow = 1;
             }
             $dispatch->record_count ++;
-            $params['admin_id'] = $this->auth->id;
+            //$params['admin_id'] = $this->auth->id;
             $result = $this->model->allowField(true)->save($params);
             $dispatch->save();
             Db::commit();

application/common/command/CheckOrderDispatchGotCommand.php

@@ -17,7 +17,7 @@ class CheckOrderDispatchGotCommand extends Command
     protected function configure()
     {
         $this->setName('check:dispatch-toget')
-            ->setDescription('【自动派单未接单检测,五分钟未接单，重派派单】/【自动派单上门时间已到，未完成上门】，5分钟执行一次');
+            ->setDescription('【自动派单未接单检测,五分钟未接单，重派派单】/【自动派单上门时间已到，未完成上门】，每分钟执行一次');
     }
 
     protected function execute(Input $input, Output $output){

application/common/command/CheckSmsPlantCommand.php

@@ -14,7 +14,7 @@ class CheckSmsPlantCommand extends Command
     protected function configure()
     {
         $this->setName('check:dispatch-sms-plant')
-            ->setDescription('dispatch已预约任务短信提醒，每小时执行一次');
+            ->setDescription('dispatch已预约任务短信提醒，每5分钟执行一次');
     }
 
     protected function execute(Input $input, Output $output){

application/common/command/CheckTTSOverTimeCommand.php

@@ -17,7 +17,7 @@ class CheckTTSOverTimeCommand extends Command
     protected function configure()
     {
         $this->setName('check:dispatch-tts-overtime')
-            ->setDescription('dispatch超时未完成任务语音通知，每10分钟执行一次');
+            ->setDescription('dispatch超时未完成任务语音通知，每5分钟执行一次');
     }
 
     protected function execute(Input $input, Output $output){

application/common/command/CheckTTSPlantCommand.php

@@ -17,7 +17,7 @@ class CheckTTSPlantCommand extends Command
     protected function configure()
     {
         $this->setName('check:dispatch-tts-plant')
-            ->setDescription('dispatch已预约任务语音提醒，每小时执行一次');
+            ->setDescription('dispatch已预约任务语音提醒，每5分钟执行一次');
     }
 
     protected function execute(Input $input, Output $output){

application/common/command/CheckTTSTaskCommand.php

@@ -17,7 +17,7 @@ class CheckTTSTaskCommand extends Command
     protected function configure()
     {
         $this->setName('check:dispatch-tts-task')
-            ->setDescription('语音发送任务，每分钟执行一次');
+            ->setDescription('语音发送任务，每1分钟执行一次');
     }
 
     protected function execute(Input $input, Output $output){

public/assets/js/backend/auth/admin.js

@@ -79,6 +79,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'],
                                     // }
                                     return Table.api.formatter.operate.call(this, value, row, index);
                                 },
+                                align: 'left',
                                 buttons: [
                                     {
                                         name: "setArea",
@@ -91,6 +92,31 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'],
                                         icon: 'fa fa-add',
                                         refresh: true,
                                     },
+                                    {
+                                        name: 'edit',
+                                        text: "修改",
+                                        icon: 'fa fa-pencil',
+                                        title: __('Edit'),
+                                        extend: 'data-toggle="tooltip" data-container="body"',
+                                        classname: 'btn btn-xs btn-info btn-editone',
+                                    },
+                                    {
+                                        name: 'del',
+                                        text: "删除",
+                                        icon: 'fa fa-trash',
+                                        title: __('Delete'),
+                                        extend: 'data-toggle="tooltip"',
+                                        classname: 'btn btn-xs btn-danger btn-delone',
+                                        visible: function (row) {
+                                            if (row.id == Config.admin.id) {
+                                                return false;
+                                            }
+                                            if (row.id == 1 || row.id == 100) {
+                                                return false;
+                                            }
+                                            return true;
+                                        }
+                                    },
                                 ],
                             }
                         ]

public/assets/js/backend/orders/dispatch2.js

@@ -90,7 +90,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
                         {field: 'worker_name', title: __('Worker_name'), operate: 'LIKE'},
                         {field: 'worker_tel', title: __('Worker_tel'), operate: 'LIKE'},
                         {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('自动')}, formatter: Table.api.formatter.normal,
-                            defaultValue: '1'
+                           // defaultValue: '1'
                         },