Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Project.php

@@ -591,8 +591,12 @@ class Project extends Base
 
         $khinfo = Db::name("customer_info")->where(["companyNo"=>$info['khNo']])->find();
         $info['khName'] = isset($khinfo['companyName'])?$khinfo['companyName']:"";
-
-        $ladder = Db::name("project_plan")->where(['projectNo'=>$projectNo,"is_del"=>0])->select()->toArray();
+        if($type==1){
+            $where = ['projectNo'=>$projectNo,"is_del"=>0,"status"=>1];
+        }else{
+            $where = ['projectNo'=>$projectNo,"is_del"=>0];
+        }
+        $ladder = Db::name("project_plan")->where($where)->select()->toArray();
         $info=[];
         if(!empty($ladder)){
             foreach ($ladder as $value){