提交9.12,修改了财评添加和送审单位部分问题

app/admin/controller/project/Cost.php

@@ -287,7 +287,7 @@ class Cost extends BaseController
     }
 
     /**
-     * 添加
+     * 添加/保存
      */
     public function add()
     {
@@ -315,8 +315,11 @@ class Cost extends BaseController
             $param["entrust_maker_name"] = get_login_admin("nickname");
             $param["entrust_phone"] = get_login_admin("mobile");
 
+            if(!isset($param["entrust_second_approver_name"])&&!empty($param["entrust_second_approver"])){
+                $param["entrust_second_approver_name"] = get_admin($param["entrust_second_approver"])["nickname"];
+            }
             $param["entrust_approver_name"] = get_admin($param["entrust_approver"])["nickname"];
-            $param["entrust_second_approver_name"] = get_admin($param["entrust_second_approver"])["nickname"];
+            //$param["entrust_second_approver_name"] = get_admin($param["entrust_second_approver"])["nickname"];
 
 
             $param["project_status"] = 1;
@@ -919,6 +922,23 @@ class Cost extends BaseController
             $detail["project_end_time"] !=null?$detail["project_end_time"]:null;
             $detail["project_start_time"] !=null?$detail["project_start_time"]:null;
 
+            //送审业主
+            $proprietorDepartmentIds = Db::name("department")
+                ->where([
+                    ["delete_time", "=", 0],
+                    ["pid", "=", 0],
+                    ["type", "=", 1], //1表示业主
+                    ["entrust_unit", "=", $unit_name]
+                ])->column('id');
+            $where = [
+                ['status', '>=', 0],
+                ['unit_name', 'in', $proprietorDepartmentIds]
+            ];
+            $proprietor =Db::name("admin")->where($where)->field(["id","nickname"])->select()->toArray();
+            $proprietor = array_values($proprietor);
+            View::assign("proprietor", $proprietor);
+            //
+
             if (!empty($detail)) {
                 View::assign('advent_time', $advent_time);
 

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

@@ -195,6 +195,7 @@
                     {volist name="$proprietor" id="v"}
                     <option value="{$v.id}">{$v.nickname}</option>
                     {/volist}
+                    <input type="hidden" name="sent_review_head_name" value="{$v.nickname}">
                 </select>
             </th>
         </tr>

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

@@ -490,14 +490,13 @@
     <tr>
 
     <!--        财评自己创建时需添加送审业主-->
-    {if $detail.project_status == 1 && $detail.proprietor_status =null}
+    {if $detail.project_status == 1 &&$detail.proprietor_status ==0}
     <tr>
       <th class="form-title">送审业主 <font style="color: red !important;">*</font></th>
       <th colspan="2">
-        <!--                送审单位负责人-->
         <select name="sent_review_head" lay-reqText="请选择送审业主">
-          <option value="">请选择送审业主(暂时不选)</option>
-          {volist name="person" id="v"}
+          <option value="{$detail.sent_review_head}">{$detail.sent_review_head_name}</option>
+          {volist name="proprietor" id="v"}
           <option value="{$v.id}">{$v.nickname}</option>
           {/volist}
         </select>