update

app/adminapi/controller/project_process_management/ProjectChangeVisaController.php

@@ -106,6 +106,9 @@ class ProjectChangeVisaController extends BaseAdminController
         $result = ProjectChangeVisaLogic::detail($params);
         return $this->data($result);
     }
-
-
+	
+	public function datas()
+	{
+		return $this->data(ProjectChangeVisaLogic::datas());
+	}
 }

app/adminapi/controller/project_process_management/ProjectProgressPaymentController.php

@@ -106,6 +106,10 @@ class ProjectProgressPaymentController extends BaseAdminController
         $result = ProjectProgressPaymentLogic::detail($params);
         return $this->data($result);
     }
-
+	
+	public function datas()
+	{
+		return $this->data(ProjectProgressPaymentLogic::datas());
+	}
 
 }

app/adminapi/lists/project_process_management/ProjectChangeVisaContentLists.php

@@ -16,6 +16,7 @@ namespace app\adminapi\lists\project_process_management;
 
 
 use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\project_process_management\ProjectChangeVisa;
 use app\common\model\project_process_management\ProjectChangeVisaContent;
 use app\common\lists\ListsSearchInterface;
 
@@ -38,6 +39,7 @@ class ProjectChangeVisaContentLists extends BaseAdminDataLists implements ListsS
     public function setSearch(): array
     {
         return [
+			'=' => ['project_change_visa_id'],
 			'%like%' => ['directory','unit_name','major','category','review_content','review_comments','reviewer']
         ];
     }
@@ -57,7 +59,10 @@ class ProjectChangeVisaContentLists extends BaseAdminDataLists implements ListsS
         return ProjectChangeVisaContent::where($this->searchWhere)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
-            ->select()
+            ->select()->each(function($data){
+				$project_change_visa =  ProjectChangeVisa::field('num')->where('id',$data['project_change_visa_id'])->findOrEmpty();
+				$data['project_change_visa_num'] = $project_change_visa['num'];
+	        })
             ->toArray();
     }
 

app/adminapi/lists/project_process_management/ProjectProgressPaymentDetailLists.php

@@ -16,6 +16,7 @@ namespace app\adminapi\lists\project_process_management;
 
 
 use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\project_process_management\ProjectProgressPayment;
 use app\common\model\project_process_management\ProjectProgressPaymentDetail;
 use app\common\lists\ListsSearchInterface;
 
@@ -38,7 +39,7 @@ class ProjectProgressPaymentDetailLists extends BaseAdminDataLists implements Li
     public function setSearch(): array
     {
         return [
-            
+            '=' => ['project_progress_payment_id']
         ];
     }
 
@@ -58,7 +59,10 @@ class ProjectProgressPaymentDetailLists extends BaseAdminDataLists implements Li
             ->field(['id', 'project_progress_payment_id', 'directory', 'unit_project_name', 'time', 'image_progress', 'declared_cost_tj', 'declared_cost_az', 'declared_cost_other', 'jdsbzj_xiaoji', 'audit_cost_tj', 'audit_cost_az', 'audit_cost_other', 'jdshzj_xiaoji', 'deduction_amount', 'completed_rate', 'contract_total_amount', 'ljwc_funds', 'current_payable_funds', 'payment_rate', 'dcntract_payment_rate', 'remark'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
-            ->select()
+            ->select()->each(function($data){
+				$project_progress_payment = ProjectProgressPayment::field('num')->where('id',$data['project_progress_payment_id'])->findOrEmpty();
+				$data['project_progress_payment_num'] = $project_progress_payment['num'];
+	        })
             ->toArray();
     }
 

app/adminapi/logic/project_process_management/ProjectChangeVisaLogic.php

@@ -48,10 +48,12 @@ class ProjectChangeVisaLogic extends BaseLogic
                 'djr' => $params['djr'],
                 'djrq' => $params['djrq'],
             ]);
-            foreach ($params['project_change_visa_content'] as $item) {
-                $item['project_change_visa_id'] = $projectChangeVisa->id;
-                ProjectChangeVisaContentLogic::add($item);
-            }
+			if(!empty($params['project_change_visa_content'])){
+				foreach ($params['project_change_visa_content'] as $item) {
+					$item['project_change_visa_id'] = $projectChangeVisa->id;
+					ProjectChangeVisaContentLogic::add($item);
+				}
+			}
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -78,7 +80,16 @@ class ProjectChangeVisaLogic extends BaseLogic
                 'djr' => $params['djr'],
                 'djrq' => $params['djrq'],
             ]);
-
+	        if(!empty($params['project_change_visa_content'])){
+		        foreach ($params['project_change_visa_content'] as $item) {
+					if(!empty($item['id'])){
+						ProjectChangeVisaContentLogic::edit($item);
+					}else{
+						$item['project_change_visa_id'] = $params['id'];
+						ProjectChangeVisaContentLogic::add($item);
+					}
+		        }
+	        }
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -120,4 +131,16 @@ class ProjectChangeVisaLogic extends BaseLogic
         $data['project_change_visa_content'] = ProjectChangeVisaContent::where('project_change_visa_id', $data['id'])->select();
         return $data;
     }
+	
+	public static function datas()
+	{
+		$datas = ProjectChangeVisa::field(['id', 'num'])
+			->order(['id' => 'desc'])
+			->select()
+			->toArray();
+		foreach ($datas as &$item) {
+			$item['projectinfo'] = 'ID：' . $item['id'] . ' / 单号：' . $item['num'];
+		}
+		return $datas;
+	}
 }

app/adminapi/logic/project_process_management/ProjectProgressPaymentLogic.php

@@ -52,10 +52,12 @@ class ProjectProgressPaymentLogic extends BaseLogic
                 'ljhj' => $params['ljhj'],
 	            'annex' => $params['annex'] ? json_encode($params['annex']) : null,
             ]);
-            foreach ($params['project_progress_payment_detail'] as $item) {
-                $item['project_progress_payment_id'] = $p->id;
-                ProjectProgressPaymentDetailLogic::add($item);
-            }
+			if(!empty($params['project_progress_payment_detail'])){
+				foreach ($params['project_progress_payment_detail'] as $item) {
+					$item['project_progress_payment_id'] = $p->id;
+					ProjectProgressPaymentDetailLogic::add($item);
+				}
+			}
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -86,7 +88,16 @@ class ProjectProgressPaymentLogic extends BaseLogic
                 'ljhj' => $params['ljhj'],
 	            'annex' => $params['annex'] ? json_encode($params['annex']) : null,
             ]);
-
+	        if(!empty($params['project_progress_payment_detail'])){
+		        foreach ($params['project_progress_payment_detail'] as $item) {
+					if(!empty($item['id'])){
+						ProjectProgressPaymentDetailLogic::edit($item);
+					}else{
+						$item['project_progress_payment_id'] = $params['id'];
+						ProjectProgressPaymentDetailLogic::add($item);
+					}
+		        }
+	        }
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -128,4 +139,16 @@ class ProjectProgressPaymentLogic extends BaseLogic
         $data['project_progress_payment_detail'] = ProjectProgressPaymentDetail::where('project_progress_payment_id', $data['id'])->select();
         return $data;
     }
+	
+	public static function datas()
+	{
+		$datas = ProjectProgressPayment::field(['id', 'num'])
+			->order(['id' => 'desc'])
+			->select()
+			->toArray();
+		foreach ($datas as &$item) {
+			$item['projectinfo'] = 'ID：' . $item['id'] . ' / 单号：' . $item['num'];
+		}
+		return $datas;
+	}
 }