提交9.14,晚上

app/admin/controller/project/Audit.php

@@ -46,12 +46,15 @@ class Audit extends BaseController
         if (request()->isAjax()) {
             $param = get_params();//获取内容
 
-            $where = [
+            $where[] = [
                 ["cp_project_audit.approver", "=", $this->uid],//审批人的id
-                ["cp_project_audit.audit_type", "<", 4]
+                ["cp_project_audit.audit_type", "<", 4],
+                ["cp_project_audit.audit_status", "<>", 5]
             ];
+
             if(!empty($param["keywords"])){
-                $where[] = ["c.review_unit_name|c.engineering_type|a.project_name","like","%".$param["keywords"]."%"];
+                $keywords_where = ["c.review_unit_name|c.engineering_type|a.project_name", 'like', '%' . $param['keywords'] . '%'];
+                $where = array_merge($where, [$keywords_where]);
             }
             $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];//分页数据条数
             $order = empty($param['order']) ? 'id desc' : $param['order'];//排序方式
@@ -61,14 +64,7 @@ class Audit extends BaseController
     /*查询字段*/  ->field("a.*,c.project_status,c.sent_review_amount,c.engineering_type,c.review_unit_name")->where($where)->order($order)
                 ->paginate($rows, false, ['query' => $param])
                 ->each(function ($item) {
-                    if ($item->audit_type ==1){//一开始不显示二审
-                        if (isset($item->c['entrust_second_approver'])){
-                            $audit_status =Db::name("project_audit")->where("audit_name" ,"项目分配审核一审")->value("audit_status");
-                            if ($audit_status=1){
-                                $item->whereNotIn('audit_name', ['项目分配审核二审']);
-                            }
-                        }
-                    }
+
                     if ($item->audit_type == 2) {//报告//else_id=>报告id
                         $a = Db::name("project_report")->where("id", $item->else_id)->field("title,status")->find();
                         $item->else_name = $a["title"];
@@ -80,6 +76,7 @@ class Audit extends BaseController
                     }
                 });
 
+
             return table_assign(0, '', $list2);
         } else {
             return view();
@@ -153,7 +150,8 @@ class Audit extends BaseController
 
             $where = [
                 ["cp_project_audit.approver", "=", $this->uid],//审批人是登录的
-                ["cp_project_audit.audit_type", "<", 4]//
+                ["cp_project_audit.audit_type", "<", 4],//
+                ["cp_project_audit.audit_status", "<>", 5]
             ];
             if(!empty($param["keywords"])){
                 $where[] = ["c.review_unit_name|c.engineering_type|a.project_name","like","%".$param["keywords"]."%"];
@@ -165,6 +163,7 @@ class Audit extends BaseController
                 ->field("a.*,c.project_status,c.sent_review_amount,c.engineering_type,c.review_unit_name")->where($where)->order($order)
                 ->paginate($rows, false, ['query' => $param])
                 ->each(function ($item) {
+
                     if ($item->audit_type == 2) {//报告
                         $a = Db::name("project_report")->where("id", $item->else_id)->field("title,status")->find();
                         $item->else_name = $a["title"];
@@ -205,6 +204,7 @@ class Audit extends BaseController
                 ->field("a.*,c.project_status,c.sent_review_amount,c.engineering_type,c.review_unit_name")->where($where)->order($order)
                 ->paginate($rows, false, ['query' => $param])
                 ->each(function ($item) {
+
                     if ($item->audit_type == 2) {
                         $a = Db::name("project_report")->where("id", $item->else_id)->field("title,status")->find();
                         $item->else_name = $a["title"];
@@ -216,7 +216,6 @@ class Audit extends BaseController
                     }
                 });
 
-
             return table_assign(0, '', $list2);
         } else {
             return view();
@@ -246,6 +245,7 @@ class Audit extends BaseController
                 ->field("a.*,c.project_status,c.sent_review_amount,c.engineering_type,c.review_unit_name")->where($where)->order($order)
                 ->paginate($rows, false, ['query' => $param])
                 ->each(function ($item) {
+
                     if ($item->audit_type == 2) {
                         $a = Db::name("project_report")->where("id", $item->else_id)->field("title,status")->find();
                         $item->else_name = $a["title"];
@@ -257,7 +257,6 @@ class Audit extends BaseController
                     }
                 });
 
-
             return table_assign(0, '', $list2);
         } else {
             return view();

app/admin/controller/project/Contact.php

@@ -740,13 +740,13 @@ class Contact extends BaseController
         ProjectAudit::create($auditData);
 
         //发送消息：数据库要更新一下才能用
-//        if (empty($handle['financial'])) {
-//            $handle['financial'] = (array)$details["entrust_maker"];
-//        } else {
-//            $handle['financial'] = array_merge($handle['company'], (array)$details["entrust_maker"]);
-//        }
-//
-//        $this->Pushmessage->pushMessage($detail['project_id'], $handle['financial']);
+        if (empty($handle['financial'])) {
+            $handle['financial'] = (array)$details["entrust_maker"];
+        } else {
+            $handle['financial'] = array_merge($handle['company'], (array)$details["entrust_maker"]);
+        }
+
+        $this->Pushmessage->pushMessage($detail['project_id'], $handle['financial']);
 
 
         $this->ContactModel->where("id", $id)->update(["status" => 3]);

app/admin/view/project/audit/datalist.html

@@ -52,6 +52,7 @@
             parseData: function(res) { // 数据解析回调函数 res=>list2
               // 在这里可以获取数据总数
               allcount =  res.count;
+
               return {
                 code: res.code, // 数据状态码
                 msg: res.msg, // 状态信息
@@ -195,10 +196,10 @@
                     fixed: 'right',
                     field: 'right',
                     title: '操作',
-
                     width: 136,
                     align: 'center',
                     templet: function (item) {
+
                         var h = '';
                         if (item.audit_status === 1) {