|
@@ -315,11 +315,19 @@ 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"])){
|
|
|
+ if(($param["entrust_second_approver"])&&!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"];
|
|
|
+ //送审
|
|
|
+ if(($param["sent_review_head"])&&!empty($param["sent_review_head"])){
|
|
|
+ $param["sent_review_head_name"] = get_admin($param["sent_review_head"])["nickname"];
|
|
|
+ $param["sent_review_unit"]=get_admin($param["sent_review_head"])["unit_name"];
|
|
|
+ $param["sent_review_unit_name"]=Db::name("department")->where("id",$param["sent_review_unit"])->value("title");
|
|
|
+ $param["sent_review_phone"] = get_admin($param["sent_review_head"])["mobile"];
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
|
|
|
$param["project_status"] = 1;
|
|
@@ -428,7 +436,7 @@ class Cost extends BaseController
|
|
|
//获取审批人员的名称,get_admin获取管理人员信息
|
|
|
$param["entrust_approver_name"] = get_admin($param["entrust_approver"])["nickname"];
|
|
|
|
|
|
- if(!isset($param["entrust_second_approver_name"])&&!empty($param["entrust_second_approver"])){
|
|
|
+ if(isset($param["entrust_second_approver"])&&!empty($param["entrust_second_approver"])){
|
|
|
$param["entrust_second_approver_name"] = get_admin($param["entrust_second_approver"])["nickname"];
|
|
|
}
|
|
|
|
|
@@ -842,6 +850,17 @@ class Cost extends BaseController
|
|
|
if (isset($param["project_end_time"])) {
|
|
|
$param["project_end_time"] = $param["project_end_time"] ? strtotime($param["project_end_time"]) : 0;
|
|
|
}
|
|
|
+ //二审
|
|
|
+ if(($param["entrust_second_approver"])&&!empty($param["entrust_second_approver"])){
|
|
|
+ $param["entrust_second_approver_name"] = get_admin($param["entrust_second_approver"])["nickname"];
|
|
|
+ }
|
|
|
+ //送审
|
|
|
+ if(($param["sent_review_head"])&&!empty($param["sent_review_head"])){
|
|
|
+ $param["sent_review_head_name"] = get_admin($param["sent_review_head"])["nickname"];
|
|
|
+ $param["sent_review_unit"]=get_admin($param["sent_review_head"])["unit_name"];
|
|
|
+ $param["sent_review_unit_name"]=Db::name("department")->where("id",$param["sent_review_unit"])->value("title");
|
|
|
+ $param["sent_review_phone"] = get_admin($param["sent_review_head"])["mobile"];//电话
|
|
|
+ }
|
|
|
$field_name = array_keys($this->field_name);
|
|
|
$ab = $this->model->where("id", $param["id"])->field($field_name)->find()->toArray();
|
|
|
$ab["project_start_time"] = date('Y-m-d', $ab["project_start_time"]);
|
|
@@ -1262,7 +1281,7 @@ class Cost extends BaseController
|
|
|
|
|
|
public function project_user()
|
|
|
{
|
|
|
- $param = get_params();
|
|
|
+ $param = get_params();//9.13加了一个送审人的 //委托创建人,评审负责人/操作team/
|
|
|
$ids = $this->model->where("id", $param["project_id"])->field("entrust_maker,review_head,operate_head,operate_team")->find()->toArray();
|
|
|
$idarr = $ids["operate_team"] . ',' . $ids["operate_head"] . ',' . $ids["review_head"] . ',' . $ids["entrust_maker"];
|
|
|
$idarr = explode(",", $idarr);
|