diff --git a/app/adminapi/lists/custom/CustomServiceLists.php b/app/adminapi/lists/custom/CustomServiceLists.php
index 12a05216e..32b568142 100644
--- a/app/adminapi/lists/custom/CustomServiceLists.php
+++ b/app/adminapi/lists/custom/CustomServiceLists.php
@@ -42,7 +42,7 @@ class CustomServiceLists extends BaseAdminDataLists implements ListsSearchInterf
     {
         return [
             '=' => ['custom_id', 'project_id', 'classification', 'urgency', 'processing_result', 'processed_user'],
-	        '%like%' => ['name','receiver']
+	        '%like%' => ['custom_service_code','name','receiver']
         ];
     }
 
@@ -58,15 +58,34 @@ class CustomServiceLists extends BaseAdminDataLists implements ListsSearchInterf
      */
     public function lists(): array
     {
-        return CustomService::field('id,custom_id,project_id,contract_id,custom_service_code,name,receiver,date,classification,processing_result,urgency,processed_user,is_solve,done_date,score')
-	           ->where($this->searchWhere)->limit($this->limitOffset, $this->limitLength)->order(['id' => 'desc'])
+		$params = $this->request->get(['custom_id','project_code','custom_name','contract_code']);
+		$where = [];
+		if(isset($params['custom_id']) && $params['custom_id'] != ''){
+			$project_ids = Project::where('custom_id',$params['custom_id'])->column('id');
+			$where[] = ['project_id','in',$project_ids];
+		}
+	    if(isset($params['project_code']) && $params['project_code'] != ''){
+		    $project_ids = Project::where('project_code','like','%'.$params['project_code'].'%')->column('id');
+		    $where[] = ['project_id','in',$project_ids];
+	    }
+	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
+			$custom_ids = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
+		    $project_ids = Project::where('custom_id','in',$custom_ids)->column('id');
+		    $where[] = ['project_id','in',$project_ids];
+	    }
+	    if(isset($params['contract_code']) && $params['contract_code'] != ''){
+		    $contract_ids = Contract::where('contract_code','like','%'.$params['contract_code'].'%')->column('id');
+		    $where[] = ['contract_id','in',$contract_ids];
+	    }
+        return CustomService::field('id,custom_service_code,project_id,contract_id,name,receiver,date,classification,processing_result,urgency,processed_user,is_solve,done_date,score')
+	           ->where($this->searchWhere)->where($where)->limit($this->limitOffset, $this->limitLength)->order(['id' => 'desc'])
 	           ->select()->each(function($item){
 				   $item['classification'] = $item->classification_text;
 				   $item['processing_result'] = $item->processing_result_text;
 				   $item['urgency'] = $item->urgency_text;
 		           $item['is_solve_text'] = $item->is_solve_text;
 		           $project = Project::field('custom_id,name,project_code')->where('id',$item['project_id'])->findOrEmpty();
-		           $custom = Custom::field('name,master_name,master_phone')->where('id',$item['custom_id'])->findOrEmpty();
+		           $custom = Custom::field('name,master_name,master_phone')->where('id',$project['custom_id'])->findOrEmpty();
 		           $contract = Contract::field('contract_code')->where('id',$item['contract_id'])->findOrEmpty();
 		           $admin = Admin::field('name')->where('id',$item['processed_user'])->findOrEmpty();
 		           $item['project_name'] = $project['name'];
@@ -90,7 +109,26 @@ class CustomServiceLists extends BaseAdminDataLists implements ListsSearchInterf
      */
     public function count(): int
     {
-        return CustomService::where($this->searchWhere)->count();
+	    $params = $this->request->get(['custom_id','project_code','custom_name','contract_code']);
+	    $where = [];
+	    if(isset($params['custom_id']) && $params['custom_id'] != ''){
+		    $project_ids = Project::where('custom_id',$params['custom_id'])->column('id');
+		    $where[] = ['project_id','in',$project_ids];
+	    }
+	    if(isset($params['project_code']) && $params['project_code'] != ''){
+		    $project_ids = Project::where('project_code','like','%'.$params['project_code'].'%')->column('id');
+		    $where[] = ['project_id','in',$project_ids];
+	    }
+	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
+		    $custom_ids = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
+		    $project_ids = Project::where('custom_id','in',$custom_ids)->column('id');
+		    $where[] = ['project_id','in',$project_ids];
+	    }
+	    if(isset($params['contract_code']) && $params['contract_code'] != ''){
+		    $contract_ids = Contract::where('contract_code','like','%'.$params['contract_code'].'%')->column('id');
+		    $where[] = ['contract_id','in',$contract_ids];
+	    }
+        return CustomService::where($this->searchWhere)->where($where)->count();
     }
 
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/custom/CustomServiceLogic.php b/app/adminapi/logic/custom/CustomServiceLogic.php
index 9f37bb537..ef5998416 100644
--- a/app/adminapi/logic/custom/CustomServiceLogic.php
+++ b/app/adminapi/logic/custom/CustomServiceLogic.php
@@ -45,10 +45,9 @@ class CustomServiceLogic extends BaseLogic
         Db::startTrans();
         try {
             CustomService::create([
-				'custom_id' => $params['custom_id'],
+	            'custom_service_code' => data_unique_code('售后工单'),
                 'project_id' => $params['project_id'],
                 'contract_id' => $params['contract_id'],
-				'custom_service_code' => data_unique_code('售后工单'),
                 'date' => strtotime($params['date']),
                 'classification' => $params['classification'],
                 'urgency' => $params['urgency'],
@@ -122,10 +121,10 @@ class CustomServiceLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-		$field = 'id,project_id,contract_id,custom_service_code,date,classification,urgency,receiver,processed_user,name,description,notes,annex,processing_result,processing_process,processing_hours,done_date,score,is_solve,feedback';
+		$field = 'id,custom_service_code,project_id,contract_id,date,classification,urgency,receiver,processed_user,name,description,notes,annex,processing_result,processing_process,processing_hours,done_date,score,is_solve,feedback';
         $data = CustomService::field($field)->findOrEmpty($params['id']);
-		$project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty();
-		$custom = Custom::field('name,master_name,master_phone')->where('id',$data['custom_id'])->findOrEmpty();
+		$project = Project::field('name,project_code,custom_id')->where('id',$data['project_id'])->findOrEmpty();
+		$custom = Custom::field('name,master_name,master_phone')->where('id',$project['custom_id'])->findOrEmpty();
 		$contract = Contract::field('contract_code')->where('id',$data['contract_id'])->findOrEmpty();
 		$admin = Admin::field('name')->where('id',$data['processed_user'])->findOrEmpty();
 		$data['project_name'] = $project['name'];
diff --git a/app/adminapi/validate/custom/CustomServiceValidate.php b/app/adminapi/validate/custom/CustomServiceValidate.php
index 714f7c47c..8863219a5 100644
--- a/app/adminapi/validate/custom/CustomServiceValidate.php
+++ b/app/adminapi/validate/custom/CustomServiceValidate.php
@@ -17,7 +17,6 @@ namespace app\adminapi\validate\custom;
 
 use app\common\model\auth\Admin;
 use app\common\model\contract\Contract;
-use app\common\model\custom\Custom;
 use app\common\model\dict\DictData;
 use app\common\model\project\Project;
 use app\common\validate\BaseValidate;
@@ -37,7 +36,6 @@ class CustomServiceValidate extends BaseValidate
       */
     protected $rule = [
         'id' => 'require',
-	    'custom_id' => 'require|checkCustom',
         'project_id' => 'require|checkProject',
         'contract_id' => 'require|checkContract',
 	    'date' => 'require|dateFormat:Y-m-d',
@@ -56,7 +54,6 @@ class CustomServiceValidate extends BaseValidate
 
 	protected $message = [
 		'id.require' => '缺少必要参数',
-		'custom_id.require' => '请选择客户',
 		'project_id.require' => '请选择项目',
 		'contract_id.require' => '请选择项目合同',
 		'date.require' => '请选择日期',
@@ -128,24 +125,12 @@ class CustomServiceValidate extends BaseValidate
         return $this->only(['id']);
     }
 	
-	public function checkCustom($value): bool|string
-	{
-		$custom = Custom::where('id',$value)->findOrEmpty();
-		if($custom->isEmpty()){
-			return '客户信息不存在';
-		}
-		return true;
-	}
-	
-	public function checkProject($value,$rule,$data): bool|string
+	public function checkProject($value): bool|string
 	{
 		$project = Project::where('id',$value)->findOrEmpty();
 		if($project->isEmpty()){
 			return '项目不存在';
 		}
-		if($project['custom_id'] != $data['custom_id']){
-			return '项目信息无效';
-		}
 		return true;
 	}