Merge branch 'dev' of https://gitea.lihaink.cn/mkm/engineering into dev

app/adminapi/lists/cost_project/CostApprovedProjectLists.php

@@ -63,11 +63,12 @@
 		public function lists(): array
 		{
 			$status = $this->request->get('status', 0);
-			return MarketingContract::where($this->searchWhere)->where('review_status', 1)
+			return MarketingContract::where($this->searchWhere)->where('review_status', 1)->where('contract_type',0)
 				->where('status', $status)
 				->limit($this->limitOffset, $this->limitLength)
 				->order(['id' => 'desc'])
-				->select()->each(function ($data) {
+				->select()
+				->each(function ($data) {
 					$custom = MarketingCustom::field('name')->where('id', $data['part_a'])->findOrEmpty();
 					$dept = Dept::where('id', 'in', [$data['signed_dept'], $data['supervise_dept']])->column('name', 'id');
 					$admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id');

app/adminapi/logic/supervision_project/SupervisionProjectLogic.php

@@ -67,6 +67,7 @@ class SupervisionProjectLogic extends BaseLogic
                 'engineering_status' => $params['engineering_status'],
                 'project_manager' => $params['project_manager'],
                 'part_a_unit' => $params['part_a_unit'],
+                'part_a' => $params['part_a'],
                 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
                 'create_user' => $params['create_user'],
                 'create_time' => !empty($params['create_time']) ? strtotime($params['create_time']) : time(),

app/common/model/supervision_project/SupervisionProject.php

@@ -14,9 +14,11 @@
 
 namespace app\common\model\supervision_project;
 
-
+use app\common\model\auth\Admin;
 use app\common\model\BaseModel;
+use app\common\model\dept\Dept;
 use app\common\model\dict\DictData;
+use app\common\model\marketing\MarketingContract;
 use think\model\concern\SoftDelete;
 
 
@@ -56,6 +58,37 @@ class SupervisionProject extends BaseModel
 		return !empty($data['engineering_status']) ? $dict[$data['engineering_status']] : '';
 	}
 	
+	public function getSupervisionDepartmentAttr($value,$data){
+		if($value){
+			return Dept::where('id',$value)->value('name');
+		}
+		return $value;
+	}
+	public function getImplementationDepartmentAttr($value,$data){
+		if($value){
+			return Dept::where('id',$value)->value('name');
+		}
+		return $value;
+	}
+	public function getProjectDepartmentAttr($value,$data){
+		if($value){
+			return Dept::where('id',$value)->value('name');
+		}
+		return $value;
+	}
+	public function getProjectManagerAttr($value,$data){
+		if($value){
+			return Admin::where('id',$value)->value('name');
+		}
+		return $value;
+	}
+	public function getContractAttr($value,$data){
+		if($value){
+			return MarketingContract::where('id',$value)->value('contract_name');
+		}
+		return $value;
+	}
+
 	public function getActualStartDateAttr($value): string
 	{
 		return !empty($value) ? date('Y-m-d', $value) : '';