caiping

app/admin/controller/Index.php

@@ -933,7 +933,6 @@ class Index extends BaseController
             }
 
         }
-
         View::assign("sent_review_cost", $sent_review_cost_real);
         View::assign("amount", $amount_real);
         View::assign("num", $num);

app/admin/controller/project/Cost.php

@@ -99,7 +99,18 @@ class Cost extends BaseController
 
             $where3 =[];
             if (!empty($param['project_status'])) {
-                $where3[] = ['project_status', '=', $param['project_status']];
+                if($param['project_status'] == 100){
+                    $where3[] = ['project_status', '=', 0];
+                    $where3[] = ['proprietor_status', '=', 0];
+                }else if($param['project_status'] == 101){
+                    $where3[] = ['project_status', '=', 0];
+                    $where3[] = ['proprietor_status', '=', 1];
+                }else if($param['project_status'] == 102){
+                    $where3[] = ['project_status', '=', 0];
+                    $where3[] = ['proprietor_status', '=', 2];
+                }else{
+                    $where3[] = ['project_status', '=', $param['project_status']];
+                }
             }
             if (!empty($param['province'])) {
                 $where3[] = ['province', '=', $param['province']];

app/admin/controller/project/CostCompany.php

@@ -85,9 +85,19 @@ class CostCompany extends BaseController
             }
             $where3 = array();
             if (!empty($param['project_status'])) {
-                $where3[] = ['project_status', '=', $param['project_status']];
+                if($param['project_status'] == 100){
+                    $where3[] = ['project_status', '=', 0];
+                    $where3[] = ['proprietor_status', '=', 0];
+                }else if($param['project_status'] == 101){
+                    $where3[] = ['project_status', '=', 0];
+                    $where3[] = ['proprietor_status', '=', 1];
+                }else if($param['project_status'] == 102){
+                    $where3[] = ['project_status', '=', 0];
+                    $where3[] = ['proprietor_status', '=', 2];
+                }else{
+                    $where3[] = ['project_status', '=', $param['project_status']];
+                }
             }
-
             if (!empty($param['province'])) {
                 $where3[] = ['province', '=', $param['province']];
             }

app/admin/controller/project/CostProprietor.php

@@ -67,7 +67,6 @@ class CostProprietor extends BaseController
                 $param["project_end_time"] = $param["project_end_time"] ? strtotime($param["project_end_time"]) : 0;
             }
             if (!empty($param['project_status'])) {
-
                 if($param['project_status'] == 100){
                     $where[] = ['project_status', '=', 0];
                     $where[] = ['proprietor_status', '=', 0];
@@ -80,7 +79,6 @@ class CostProprietor extends BaseController
                 }else{
                     $where[] = ['project_status', '=', $param['project_status']];
                 }
-
             }
             if (!empty($param['proprietor_status'])) {
                 $where[] = ['proprietor_status', '=', $param['proprietor_status']];

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

@@ -8,7 +8,7 @@
             <div class="layui-input-inline" style="width:100px;">
                 <select name="project_status" lay-filter="status">
                     <option value="">项目状态</option>
-                    <option value="1">立项中</option>
+                    <option value="1">财政局立项中</option>
                     <option value="2">审批中</option>
                     <option value="3">待接收</option>
                     <option value="4">分配中</option>
@@ -17,6 +17,9 @@
                     <option value="7">退审中</option>
                     <option value="8">已归档</option>
                     <option value="9">已退审</option>
+                    <option value="100">立项中</option>
+                    <option value="101">审核中</option>
+                    <option value="102">待接收</option>
                 </select>
             </div>
 

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

@@ -7,7 +7,7 @@
             <div class="layui-input-inline" style="width:100px;">
                 <select name="project_status" lay-filter="status">
                     <option value="">项目状态</option>
-                    <option value="1">立项中</option>
+                    <option value="1">财政局立项中</option>
                     <option value="2">审批中</option>
                     <option value="3">待接收</option>
                     <option value="4">分配中</option>
@@ -16,6 +16,9 @@
                     <option value="7">退审中</option>
                     <option value="8">已归档</option>
                     <option value="9">已退审</option>
+                    <option value="100">立项中</option>
+                    <option value="101">审核中</option>
+                    <option value="102">待接收</option>
                 </select>
             </div>