议价驳回显示驳回原因和议价状态，项目创建时不添加待办

app/admin/controller/Consult.php

@@ -1438,7 +1438,11 @@ class Consult extends Base
             //reject驳回原因，status==5表示驳回
             $value['reject']=[];
             if ($value['status'] == 5) {
-                $value['reject'] = Db::name('bargain_order')->where(['infoNo' => $infoNo])->whereIn('status', [5, 6])->column('remark');
+                $value['reject'] = Db::name('bargain_order')
+                    ->field('id,remark,status')
+                    ->where(['infoNo' => $infoNo])
+                    ->whereIn('status', [5, 6])
+                    ->select();
             }
             $data[] = $value;
         }

app/admin/controller/Data.php

@@ -6,8 +6,8 @@ use think\App;
 use think\facade\Db;
 
 //数据统计类
-//class Data extends Base
-class Data
+class Data extends Base
+
 {
     //数据看板，获取相关统计数据
     public function index()
@@ -46,20 +46,20 @@ class Data
 
         //5.本月完成率列表(按照完成率排序，前三名的部门、完成单数和完成率，区分今日、本周、本月和毛利率状态：2达标、1最低、0不达标等情况)
         $data['month_completion_rate'] = [
-            'today'=>[
-                ['company' => 'xxx部', 'completion rate' => '30%', 'type' => '2'],
-                ['company' => 'xx部', 'completion rate' => '20%', 'type' => '1'],
-                ['company' => 'x部', 'completion rate' => '10%', 'type' => '0'],
+            'today' => [
+                ['company' => 'xxx部', 'completion' => 10, 'completion_rate' => '30%', 'type' => '2'],
+                ['company' => 'xx部', 'completion' => 10, 'completion_rate' => '20%', 'type' => '1'],
+                ['company' => 'x部', 'completion' => 10, 'completion_rate' => '10%', 'type' => '0'],
             ],
-            'week'=>[
-                ['company' => 'xxx部', 'completion rate' => '30%', 'type' => '2'],
-                ['company' => 'xx部', 'completion rate' => '20%', 'type' => '1'],
-                ['company' => 'x部', 'completion rate' => '10%', 'type' => '0'],
+            'week' => [
+                ['company' => 'xxx部', 'completion' => 10, 'completion_rate' => '30%', 'type' => '2'],
+                ['company' => 'xx部', 'completion' => 10, 'completion_rate' => '20%', 'type' => '1'],
+                ['company' => 'x部', 'completion' => 10, 'completion_rate' => '10%', 'type' => '0'],
             ],
-            'month'=>[
-                ['company' => 'xxx部', 'completion rate' => '30%', 'type' => '2'],
-                ['company' => 'xx部', 'completion rate' => '20%', 'type' => '1'],
-                ['company' => 'x部', 'completion rate' => '10%', 'type' => '0'],
+            'month' => [
+                ['company' => 'xxx部', 'completion' => 10, 'completion_rate' => '30%', 'type' => '2'],
+                ['company' => 'xx部', 'completion' => 10, 'completion_rate' => '20%', 'type' => '1'],
+                ['company' => 'x部', 'completion' => 10, 'completion_rate' => '10%', 'type' => '0'],
             ],
         ];
 

app/admin/controller/Project.php

@@ -111,16 +111,6 @@ class Project extends Base
                     }
                     $in = Db::name("project_info")->insertAll($la);
                     if($in>0){
-
-                        //项目创建成功之后，添加到待办列表中
-                        $process = [
-                            "order_code" => $projectNo,//把项目编码放到这儿
-                            //"order_id"=>0,//没有订单id，默认0
-                            "order_status" => 2,//2表示'流程中'
-                            "order_type" => 'PRO'//MLL表示'毛利率'
-                        ];
-                        ProcessOrder::AddProcess($this->post['token'], $process);
-
                         Db::commit();
                         return app_show(0,"项目新建成功",['projectNo'=>$projectNo]);
                     }