hzd 3 ماه پیش
والد
کامیت
9faccf9996

+ 1 - 1
application/admin/controller/ConveyCron.php

@@ -60,7 +60,7 @@ class ConveyCron extends Auth
                 $lists[$k]['week_day'] = isset($this->weeks[$v['week']])? $this->weeks[$v['week']]:"";
 
                 $lists[$k]['start_title'] = Db::name('address')->where('id',$v['start'])->value("title");
-                $lists[$k]['end_title'] = Db::name('address')->where('id',$v['start'])->value("title");
+                $lists[$k]['end_title'] = Db::name('address')->where('id',$v['end'])->value("title");
              }
 
             //数据返回

+ 2 - 2
application/admin/view/convey_cron/add.html

@@ -268,14 +268,14 @@
                         console.log(item);
                         // this.end = item.ends > 0?parseInt(item.ends):'';
                         if(item.starts >0){
-                            this.start = parseInt(item.starts);
+                            this.start = parseInt(item.starts).toString();
                         }else {
                             if(item.startList.length ==0){
 
                             }
                         }
                         if(item.ends >0){
-                            this.end = parseInt(item.ends);
+                            this.end = parseInt(item.ends).toString();
                         }else {
                             if(item.endList.length ==0){
 

+ 10 - 8
application/common/model/Orders.php

@@ -134,14 +134,15 @@ class Orders extends Base {
         }
         if ($type == 1) {
             if ($data['userType'] == 0) {
-                $sData['send_time'] = getTime();
+
                 if (!isset($data['to_user_id']) || empty($data['to_user_id'])) {
-                    $this->error = '请选择执行人';
-                    return false;
-//                    $sData['order_mode'] = 1;
-//                    $data['to_user_id'] = "";
+//                    $this->error = '请选择执行人';
+//                    return false;
+                    $sData['order_mode'] = 1;
+                    $data['to_user_id'] = "";
                 }else{
-//                    $sData['order_mode'] = 4;
+                    $sData['send_time'] = getTime();
+                    $sData['order_mode'] = 4;
                 }
                 if ($data['work_type_mode'] == 1) {
                     if (!isset($data['type_id']) || empty($data['type_id'])) {
@@ -158,8 +159,9 @@ class Orders extends Base {
                 $sData['order_mode'] = 1;
                 $sData['is_deal'] = 1;
                 if (!isset($data['to_roles_id']) || empty($data['to_roles_id'])) {
-                    $this->error = '请选择二级调度';
-                    return false;
+//                    $this->error = '请选择二级调度';
+//                    return false;
+                    $sData['is_deal'] = 0;
                 }
             }
         }

+ 1 - 0
config/cron.php

@@ -19,5 +19,6 @@ return [
         \app\cron\GreenTimeout::class,
         \app\cron\TemperatureDevice::class,
         \app\cron\Orders::class,
+        \app\cron\ConveyCron::class,
     ]
 ];