From d5cd3ca6695f7991806272613b00dbc56d72d97f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 6 Jan 2024 10:14:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80customer=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/project/ProjectController.php     | 8 ++++----
 app/adminapi/lists/bill/AcceptanceBillLists.php           | 6 +++---
 app/adminapi/lists/contract/ContractLists.php             | 6 +++---
 .../lists/expense/ExpenseReimbursementDetailLists.php     | 4 ++--
 app/adminapi/lists/expense/ExpenseReimbursementLists.php  | 6 +++---
 app/adminapi/lists/finance/FinanceInvoiceApplyLists.php   | 6 +++---
 app/adminapi/lists/finance/FinanceRefundApplyLists.php    | 2 +-
 app/adminapi/lists/finance/FinanceReturnedMoneyLists.php  | 6 +++---
 app/adminapi/lists/finance/FinanceReturnedRecordLists.php | 6 +++---
 app/adminapi/logic/bill/AcceptanceBillLogic.php           | 4 ++--
 app/adminapi/logic/contract/ContractLogic.php             | 4 ++--
 app/adminapi/logic/expense/ExpenseReimbursementLogic.php  | 4 ++--
 app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php   | 4 ++--
 app/adminapi/logic/finance/FinanceRefundApplyLogic.php    | 4 ++--
 app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php  | 4 ++--
 app/adminapi/logic/finance/FinanceReturnedRecordLogic.php | 4 ++--
 app/adminapi/logic/project/ProjectSettlementLogic.php     | 4 ++--
 app/adminapi/validate/bill/AcceptanceBillValidate.php     | 8 ++++----
 app/adminapi/validate/contract/ContractValidate.php       | 4 ++--
 .../validate/expense/ExpenseReimbursementValidate.php     | 8 ++++----
 .../validate/finance/FinanceInvoiceApplyValidate.php      | 4 ++--
 .../validate/finance/FinanceRefundApplyValidate.php       | 4 ++--
 .../validate/finance/FinanceReturnedMoneyValidate.php     | 4 ++--
 .../validate/finance/FinanceReturnedRecordValidate.php    | 4 ++--
 app/common/model/bill/AcceptanceBill.php                  | 2 +-
 app/common/model/contract/Contract.php                    | 2 +-
 app/common/model/expense/ExpenseReimbursement.php         | 2 +-
 app/common/model/finance/FinanceInvoiceApply.php          | 2 +-
 app/common/model/finance/FinanceRefundApply.php           | 2 +-
 app/common/model/finance/FinanceReturnedMoney.php         | 2 +-
 app/common/model/finance/FinanceReturnedRecord.php        | 2 +-
 31 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/app/adminapi/controller/project/ProjectController.php b/app/adminapi/controller/project/ProjectController.php
index 30ef8bf05..70f7f2aad 100644
--- a/app/adminapi/controller/project/ProjectController.php
+++ b/app/adminapi/controller/project/ProjectController.php
@@ -121,12 +121,12 @@ class ProjectController extends BaseAdminController
 		if($project->isEmpty()){
 			return $this->fail('项目数据不存在');
 		}
-		$data = Contract::field('id,custome_id,contract_name,contract_code,contract_type,contract_status,business_director,contract_date,amount,amount_daxie')
-				->where('custome_id',$project['custom_id'])
+		$data = Contract::field('id,customer_id,contract_name,contract_code,contract_type,contract_status,business_director,contract_date,amount,amount_daxie')
+				->where('customer_id',$project['custom_id'])
 				->select()->each(function($item)use($project){
 					$item['contract_type_text'] = $item->contract_type_text;
 					$item['contract_status_text'] = $item->contract_status_text;
-					$custom = Custom::field('name')->where('id',$item['custome_id'])->findOrEmpty();
+					$custom = Custom::field('name')->where('id',$item['customer_id'])->findOrEmpty();
 					$admin = Admin::field('name')->where('id',$item['business_director'])->findOrEmpty();
 					$item['project_name'] = $project['name'];
 					$item['project_code'] = $project['project_code'];
@@ -134,7 +134,7 @@ class ProjectController extends BaseAdminController
 					$item['business_director_name'] = $admin['name'];
 					return $item;
 				})->toArray();
-		$count = Contract::field('id')->where('custome_id',$project['custom_id'])->count();
+		$count = Contract::field('id')->where('customer_id',$project['custom_id'])->count();
 		$result = [
 			'count' => $count,
 			'page_no' => $pageNo,
diff --git a/app/adminapi/lists/bill/AcceptanceBillLists.php b/app/adminapi/lists/bill/AcceptanceBillLists.php
index 99038bcea..3fd0e53cf 100644
--- a/app/adminapi/lists/bill/AcceptanceBillLists.php
+++ b/app/adminapi/lists/bill/AcceptanceBillLists.php
@@ -38,7 +38,7 @@ class AcceptanceBillLists extends BaseAdminDataLists implements ListsSearchInter
     public function setSearch(): array
     {
         return [
-            '=' => ['ab.org_id', 'ab.dept_id', 'ab.custome_id', 'ab.project_id', 'ab.contract_id', 'ab.bill_sn', 'ab.bank_account_id', 'ab.bill_type'],
+            '=' => ['ab.org_id', 'ab.dept_id', 'ab.customer_id', 'ab.project_id', 'ab.contract_id', 'ab.bill_sn', 'ab.bank_account_id', 'ab.bill_type'],
         ];
     }
 
@@ -61,7 +61,7 @@ class AcceptanceBillLists extends BaseAdminDataLists implements ListsSearchInter
             ->leftJoin('dept d','d.id = ab.dept_id')
             ->leftJoin('project p','p.id = ab.project_id')
             ->leftJoin('contract c','c.id = ab.contract_id')
-            ->leftJoin('custom ct','ct.id = ab.custome_id')
+            ->leftJoin('custom ct','ct.id = ab.customer_id')
             ->leftJoin('bank_account ba','ba.id = ab.bank_account_id')
             ->field('ab.*, d.name as dept_name, o.name as org_name, ct.name as customer_name, p.name as project_name, c.contract_code, c.contract_name, ba.deposit_bank, ba.account_name, ba.account')
             ->limit($this->limitOffset, $this->limitLength)
@@ -96,7 +96,7 @@ class AcceptanceBillLists extends BaseAdminDataLists implements ListsSearchInter
         ->leftJoin('dept d','d.id = ab.dept_id')
         ->leftJoin('project p','p.id = ab.project_id')
         ->leftJoin('contract c','c.id = ab.contract_id')
-        ->leftJoin('custom ct','ct.id = ab.custome_id')->count();
+        ->leftJoin('custom ct','ct.id = ab.customer_id')->count();
     }
 
 }
\ No newline at end of file
diff --git a/app/adminapi/lists/contract/ContractLists.php b/app/adminapi/lists/contract/ContractLists.php
index 6bafb12ff..fdc6410e5 100644
--- a/app/adminapi/lists/contract/ContractLists.php
+++ b/app/adminapi/lists/contract/ContractLists.php
@@ -38,7 +38,7 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['c.org_id', 'c.dept_id', 'c.custome_id', 'c.contract_name', 'c.contract_type', 'c.contract_code'],
+            '=' => ['c.org_id', 'c.dept_id', 'c.customer_id', 'c.contract_name', 'c.contract_type', 'c.contract_code'],
         ];
     }
 
@@ -61,7 +61,7 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface
             ->leftJoin('orgs o','o.id = c.org_id')
             ->leftJoin('dept d','d.id = c.dept_id')
             ->leftJoin('project p','p.id = bbbd.project_id')
-            ->leftJoin('custom ct','ct.id = c.custome_id')
+            ->leftJoin('custom ct','ct.id = c.customer_id')
             ->field('c.*, d.name as dept_name, o.name as org_name, bbbd.project_id, p.name as project_name, p.project_code, ct.name as customer_name')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['c.id' => 'desc'])
@@ -89,7 +89,7 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface
             ->whereNull('c.delete_time')
             ->leftJoin('bid_buy_bidding_document bbbd','c.id = c.buy_bidding_document_id')
             ->leftJoin('project p','p.id = bbbd.project_id')
-            ->leftJoin('custom ct','ct.id = c.custome_id')->count();
+            ->leftJoin('custom ct','ct.id = c.customer_id')->count();
     }
 
 }
\ No newline at end of file
diff --git a/app/adminapi/lists/expense/ExpenseReimbursementDetailLists.php b/app/adminapi/lists/expense/ExpenseReimbursementDetailLists.php
index ce929b1f8..060a4efbb 100644
--- a/app/adminapi/lists/expense/ExpenseReimbursementDetailLists.php
+++ b/app/adminapi/lists/expense/ExpenseReimbursementDetailLists.php
@@ -60,7 +60,7 @@ class ExpenseReimbursementDetailLists extends BaseAdminDataLists implements List
             ->leftJoin('expense_reimbursement er','er.id = erd.expense_id')
             ->leftJoin('orgs o','o.id = er.org_id')
             ->leftJoin('dept d','d.id = er.dept_id')
-            ->leftJoin('custom ct','ct.id = er.custome_id')
+            ->leftJoin('custom ct','ct.id = er.customer_id')
             ->field('erd.*, er.reimburser, er.reimbursement_date, er.pay_type, d.name as dept_name, o.name as org_name, ct.name as customer_name')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['er.id' => 'desc'])
@@ -88,7 +88,7 @@ class ExpenseReimbursementDetailLists extends BaseAdminDataLists implements List
         ->leftJoin('expense_reimbursement er','er.id = erd.expense_id')
         ->leftJoin('orgs o','o.id = er.org_id')
         ->leftJoin('dept d','d.id = er.dept_id')
-        ->leftJoin('custom ct','ct.id = er.custome_id')->count();
+        ->leftJoin('custom ct','ct.id = er.customer_id')->count();
     }
 
 }
\ No newline at end of file
diff --git a/app/adminapi/lists/expense/ExpenseReimbursementLists.php b/app/adminapi/lists/expense/ExpenseReimbursementLists.php
index 5ca267f6d..4cedbaf41 100644
--- a/app/adminapi/lists/expense/ExpenseReimbursementLists.php
+++ b/app/adminapi/lists/expense/ExpenseReimbursementLists.php
@@ -38,7 +38,7 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
     public function setSearch(): array
     {
         return [
-            '=' => ['er.reimburser', 'er.reimbursement_date', 'er.custome_id', 'er.payee_name', 'er.payee_account'],
+            '=' => ['er.reimburser', 'er.reimbursement_date', 'er.customer_id', 'er.payee_name', 'er.payee_account'],
         ];
     }
 
@@ -59,7 +59,7 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
             ->whereNull('er.delete_time')
             ->leftJoin('orgs o','o.id = er.org_id')
             ->leftJoin('dept d','d.id = er.dept_id')
-            ->leftJoin('custom ct','ct.id = er.custome_id')
+            ->leftJoin('custom ct','ct.id = er.customer_id')
             ->field('er.*, d.name as dept_name, o.name as org_name, ct.name as customer_name')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['er.id' => 'desc'])
@@ -87,7 +87,7 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
         ->whereNull('er.delete_time')
         ->leftJoin('orgs o','o.id = er.org_id')
         ->leftJoin('dept d','d.id = er.dept_id')
-        ->leftJoin('custom ct','ct.id = er.custome_id')->count();
+        ->leftJoin('custom ct','ct.id = er.customer_id')->count();
     }
 
 }
\ No newline at end of file
diff --git a/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php b/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php
index 73230f85e..8022daf63 100644
--- a/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php
+++ b/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php
@@ -38,7 +38,7 @@ class FinanceInvoiceApplyLists extends BaseAdminDataLists implements ListsSearch
     public function setSearch(): array
     {
         return [
-            '=' => ['fia.custome_id', 'fia.contract_id', 'fia.invoicing_company_name'],
+            '=' => ['fia.customer_id', 'fia.contract_id', 'fia.invoicing_company_name'],
         ];
     }
 
@@ -60,7 +60,7 @@ class FinanceInvoiceApplyLists extends BaseAdminDataLists implements ListsSearch
             ->leftJoin('contract c','c.id = fia.contract_id')
             ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id')
             ->leftJoin('project p','p.id = bbbd.project_id')
-            ->leftJoin('custom ct','ct.id = fia.custome_id')
+            ->leftJoin('custom ct','ct.id = fia.customer_id')
             ->field('fia.*, bbbd.project_id, p.name as project_name, p.project_code, ct.name as customer_name')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['fia.id' => 'desc'])
@@ -89,7 +89,7 @@ class FinanceInvoiceApplyLists extends BaseAdminDataLists implements ListsSearch
             ->leftJoin('contract c','c.id = fia.contract_id')
             ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id')
             ->leftJoin('project p','p.id = bbbd.project_id')
-            ->leftJoin('custom ct','ct.id = fia.custome_id')->count();
+            ->leftJoin('custom ct','ct.id = fia.customer_id')->count();
     }
 
 }
\ No newline at end of file
diff --git a/app/adminapi/lists/finance/FinanceRefundApplyLists.php b/app/adminapi/lists/finance/FinanceRefundApplyLists.php
index 353780c24..a613c717b 100644
--- a/app/adminapi/lists/finance/FinanceRefundApplyLists.php
+++ b/app/adminapi/lists/finance/FinanceRefundApplyLists.php
@@ -38,7 +38,7 @@ class FinanceRefundApplyLists extends BaseAdminDataLists implements ListsSearchI
     public function setSearch(): array
     {
         return [
-            '=' => ['custome_id', 'contract_id', 'collection_acccount'],
+            '=' => ['customer_id', 'contract_id', 'collection_acccount'],
         ];
     }
 
diff --git a/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php b/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php
index 19ff46960..0724ffd55 100644
--- a/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php
+++ b/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php
@@ -41,7 +41,7 @@ class FinanceReturnedMoneyLists extends BaseAdminDataLists implements ListsSearc
     public function setSearch(): array
     {
         return [
-            '=' => ['frm.custome_id', 'frm.contract_id', 'frm.return_status'],
+            '=' => ['frm.customer_id', 'frm.contract_id', 'frm.return_status'],
         ];
     }
 
@@ -63,7 +63,7 @@ class FinanceReturnedMoneyLists extends BaseAdminDataLists implements ListsSearc
             ->leftJoin('contract c','c.id = frm.contract_id')
             ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id')
             ->leftJoin('project p','p.id = bbbd.project_id')
-            ->leftJoin('custom ct','ct.id = c.custome_id')
+            ->leftJoin('custom ct','ct.id = c.customer_id')
             ->field('frm.*, bbbd.project_id, c.contract_code, c.contract_name, c.contract_type, p.name as project_name, p.project_code, ct.name as customer_name')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['frm.id' => 'desc'])
@@ -88,7 +88,7 @@ class FinanceReturnedMoneyLists extends BaseAdminDataLists implements ListsSearc
         ->leftJoin('contract c','c.id = frm.contract_id')
         ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id')
         ->leftJoin('project p','p.id = bbbd.project_id')
-        ->leftJoin('custom ct','ct.id = c.custome_id')->count();
+        ->leftJoin('custom ct','ct.id = c.customer_id')->count();
     }
 
 }
\ No newline at end of file
diff --git a/app/adminapi/lists/finance/FinanceReturnedRecordLists.php b/app/adminapi/lists/finance/FinanceReturnedRecordLists.php
index 55848b1cd..819d9815b 100644
--- a/app/adminapi/lists/finance/FinanceReturnedRecordLists.php
+++ b/app/adminapi/lists/finance/FinanceReturnedRecordLists.php
@@ -38,7 +38,7 @@ class FinanceReturnedRecordLists extends BaseAdminDataLists implements ListsSear
     public function setSearch(): array
     {
         return [
-            '=' => ['frr.custome_id', 'frr.contract_id', 'frr.finance_returned_money_id'],
+            '=' => ['frr.customer_id', 'frr.contract_id', 'frr.finance_returned_money_id'],
         ];
     }
 
@@ -60,7 +60,7 @@ class FinanceReturnedRecordLists extends BaseAdminDataLists implements ListsSear
             ->leftJoin('contract c','c.id = frr.contract_id')
             ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id')
             ->leftJoin('project p','p.id = bbbd.project_id')
-            ->leftJoin('custom ct','ct.id = c.custome_id')
+            ->leftJoin('custom ct','ct.id = c.customer_id')
             ->field('frr.*, bbbd.project_id, c.contract_code, c.contract_name, c.contract_type, p.name as project_name, p.project_code, ct.name as customer_name')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['frr.id' => 'desc'])
@@ -85,7 +85,7 @@ class FinanceReturnedRecordLists extends BaseAdminDataLists implements ListsSear
         ->leftJoin('contract c','c.id = frr.contract_id')
         ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id')
         ->leftJoin('project p','p.id = bbbd.project_id')
-        ->leftJoin('custom ct','ct.id = c.custome_id')->count();
+        ->leftJoin('custom ct','ct.id = c.customer_id')->count();
     }
 
 }
\ No newline at end of file
diff --git a/app/adminapi/logic/bill/AcceptanceBillLogic.php b/app/adminapi/logic/bill/AcceptanceBillLogic.php
index b680442a7..22bdac23f 100644
--- a/app/adminapi/logic/bill/AcceptanceBillLogic.php
+++ b/app/adminapi/logic/bill/AcceptanceBillLogic.php
@@ -43,7 +43,7 @@ class AcceptanceBillLogic extends BaseLogic
             AcceptanceBill::create([
                 'org_id' => $params['org_id'] ?? 0,
                 'dept_id' => $params['dept_id'] ?? 0,
-                'custome_id' => $params['custome_id'] ?? 0,
+                'customer_id' => $params['customer_id'] ?? 0,
                 'project_id' => $params['project_id'] ?? 0,
                 'contract_id' => $params['contract_id'] ?? 0,
                 'receipt_date' => $params['receipt_date'] ?? '',
@@ -82,7 +82,7 @@ class AcceptanceBillLogic extends BaseLogic
             AcceptanceBill::where('id', $params['id'])->update([
                 'org_id' => $params['org_id'] ?? 0,
                 'dept_id' => $params['dept_id'] ?? 0,
-                'custome_id' => $params['custome_id'] ?? 0,
+                'customer_id' => $params['customer_id'] ?? 0,
                 'project_id' => $params['project_id'] ?? 0,
                 'contract_id' => $params['contract_id'] ?? 0,
                 'receipt_date' => $params['receipt_date'] ?? '',
diff --git a/app/adminapi/logic/contract/ContractLogic.php b/app/adminapi/logic/contract/ContractLogic.php
index e18a24c5d..cbb543687 100644
--- a/app/adminapi/logic/contract/ContractLogic.php
+++ b/app/adminapi/logic/contract/ContractLogic.php
@@ -45,7 +45,7 @@ class ContractLogic extends BaseLogic
             Contract::create([
                 'org_id' => $params['org_id'] ?? 0,
                 'dept_id' => $params['dept_id'] ?? 0,
-                'custome_id' => $params['custome_id'] ?? 0,
+                'customer_id' => $params['customer_id'] ?? 0,
                 'approve_id' => $params['approve_id'] ?? 0,
                 'buy_bidding_document_id' => $params['buy_bidding_document_id'] ?? 0,
                 'contract_name' => $params['contract_name'] ?? '',
@@ -99,7 +99,7 @@ class ContractLogic extends BaseLogic
             Contract::where('approve_id', $params['approve_id'])->update([
                 'org_id' => $params['org_id'] ?? 0,
                 'dept_id' => $params['dept_id'] ?? 0,
-                'custome_id' => $params['custome_id'] ?? 0,
+                'customer_id' => $params['customer_id'] ?? 0,
                 'approve_id' => $params['approve_id'] ?? 0,
                 'buy_bidding_document_id' => $params['buy_bidding_document_id'] ?? 0,
                 'contract_name' => $params['contract_name'] ?? '',
diff --git a/app/adminapi/logic/expense/ExpenseReimbursementLogic.php b/app/adminapi/logic/expense/ExpenseReimbursementLogic.php
index 50856fff8..cba916f70 100644
--- a/app/adminapi/logic/expense/ExpenseReimbursementLogic.php
+++ b/app/adminapi/logic/expense/ExpenseReimbursementLogic.php
@@ -48,7 +48,7 @@ class ExpenseReimbursementLogic extends BaseLogic
                 'approve_id' => $params['approve_id'] ?? 0,
                 'reimburser' => $params['reimburser'] ?? '',
                 'reimbursement_date' => $params['reimbursement_date'] ?? '',
-                'custome_id' => $params['custome_id'] ?? 0,
+                'customer_id' => $params['customer_id'] ?? 0,
                 'pay_type' => $params['pay_type'] ?? 0,
                 'reimbursement_amount' => $params['reimbursement_amount'] ?? 0,
                 'reimbursement_amount_daxie' => $params['reimbursement_amount_daxie'] ?? '',
@@ -112,7 +112,7 @@ class ExpenseReimbursementLogic extends BaseLogic
                 'approve_id' => $params['approve_id'] ?? 0,
                 'reimburser' => $params['reimburser'] ?? '',
                 'reimbursement_date' => $params['reimbursement_date'] ?? '',
-                'custome_id' => $params['custome_id'] ?? 0,
+                'customer_id' => $params['customer_id'] ?? 0,
                 'pay_type' => $params['pay_type'] ?? 0,
                 'reimbursement_amount' => $params['reimbursement_amount'] ?? 0,
                 'reimbursement_amount_daxie' => $params['reimbursement_amount_daxie'] ?? '',
diff --git a/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php b/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
index 7d9700620..2fc3a8f95 100644
--- a/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
+++ b/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
@@ -44,7 +44,7 @@ class FinanceInvoiceApplyLogic extends BaseLogic
         Db::startTrans();
         try {
             FinanceInvoiceApply::create([
-                'custome_id' => $params['custome_id'] ?? 0,
+                'customer_id' => $params['customer_id'] ?? 0,
                 'contract_id' => $params['contract_id'] ?? 0,
                 'approve_id' => $params['approve_id'] ?? 0,
                 'invoicing_date' => $params['invoicing_date'] ?? '',
@@ -96,7 +96,7 @@ class FinanceInvoiceApplyLogic extends BaseLogic
         Db::startTrans();
         try {
             FinanceInvoiceApply::where('id', $params['id'])->update([
-                'custome_id' => $params['custome_id'] ?? 0,
+                'customer_id' => $params['customer_id'] ?? 0,
                 'contract_id' => $params['contract_id'] ?? 0,
                 'approve_id' => $params['approve_id'] ?? 0,
                 'invoicing_date' => $params['invoicing_date'] ?? '',
diff --git a/app/adminapi/logic/finance/FinanceRefundApplyLogic.php b/app/adminapi/logic/finance/FinanceRefundApplyLogic.php
index 0051af9a7..4ef1bbb79 100644
--- a/app/adminapi/logic/finance/FinanceRefundApplyLogic.php
+++ b/app/adminapi/logic/finance/FinanceRefundApplyLogic.php
@@ -41,7 +41,7 @@ class FinanceRefundApplyLogic extends BaseLogic
         Db::startTrans();
         try {
             FinanceRefundApply::create([
-                'custome_id' => $params['custome_id'] ?? 0,
+                'customer_id' => $params['customer_id'] ?? 0,
                 'contract_id' => $params['contract_id'] ?? 0,
                 'approve_id' => $params['approve_id'] ?? 0,
                 'refund_date' => $params['refund_date'] ?? '',
@@ -78,7 +78,7 @@ class FinanceRefundApplyLogic extends BaseLogic
         Db::startTrans();
         try {
             FinanceRefundApply::create([
-                'custome_id' => $params['custome_id'] ?? 0,
+                'customer_id' => $params['customer_id'] ?? 0,
                 'contract_id' => $params['contract_id'] ?? 0,
                 'approve_id' => $params['approve_id'] ?? 0,
                 'refund_date' => $params['refund_date'] ?? '',
diff --git a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
index ae0a58246..0e866f7de 100644
--- a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
+++ b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
@@ -43,7 +43,7 @@ class FinanceReturnedMoneyLogic extends BaseLogic
         Db::startTrans();
         try {
             FinanceReturnedMoney::create([
-                'custome_id' => $params['custome_id'] ?? 0,
+                'customer_id' => $params['customer_id'] ?? 0,
                 'contract_id' => $params['contract_id'] ?? 0,
                 'return_date' => $params['return_date'] ?? '',
                 'period' => $params['period'] ?? '',
@@ -76,7 +76,7 @@ class FinanceReturnedMoneyLogic extends BaseLogic
         Db::startTrans();
         try {
             FinanceReturnedMoney::where('id', $params['id'])->update([
-                'custome_id' => $params['custome_id'] ?? 0,
+                'customer_id' => $params['customer_id'] ?? 0,
                 'contract_id' => $params['contract_id'] ?? 0,
                 'return_date' => $params['return_date'] ?? '',
                 'period' => $params['period'] ?? '',
diff --git a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php
index 88b25c3ad..10d6f8bb8 100644
--- a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php
+++ b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php
@@ -41,7 +41,7 @@ class FinanceReturnedRecordLogic extends BaseLogic
         Db::startTrans();
         try {
             FinanceReturnedRecord::create([
-                'custome_id' => $params['custome_id'],
+                'customer_id' => $params['customer_id'],
                 'contract_id' => $params['contract_id'],
                 'finance_returned_money_id' => $params['finance_returned_money_id'],
                 'return_date' => $params['return_date'],
@@ -82,7 +82,7 @@ class FinanceReturnedRecordLogic extends BaseLogic
         Db::startTrans();
         try {
             FinanceReturnedRecord::where('id', $params['id'])->update([
-                'custome_id' => $params['custome_id'],
+                'customer_id' => $params['customer_id'],
                 'contract_id' => $params['contract_id'],
                 'finance_returned_money_id' => $params['finance_returned_money_id'],
                 'return_date' => $params['return_date'],
diff --git a/app/adminapi/logic/project/ProjectSettlementLogic.php b/app/adminapi/logic/project/ProjectSettlementLogic.php
index 847451924..6b8e304f9 100644
--- a/app/adminapi/logic/project/ProjectSettlementLogic.php
+++ b/app/adminapi/logic/project/ProjectSettlementLogic.php
@@ -121,8 +121,8 @@ class ProjectSettlementLogic extends BaseLogic
     {
 		$data = ProjectSettlement::field('id,settlement_code,project_id,contract_id,settlement_amount,settlement_amount_uppercase,remaining_amount,settlement_date,remark,annex')->findOrEmpty($params['id'])->toArray();
 		$project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty();
-		$contract = Contract::field('custome_id,contract_name,contract_code,amount,amount_daxie')->where('id',$data['contract_id'])->findOrEmpty();
-		$custom = Custom::field('name')->where('id',$contract['custome_id'])->findOrEmpty();
+		$contract = Contract::field('customer_id,contract_name,contract_code,amount,amount_daxie')->where('id',$data['contract_id'])->findOrEmpty();
+		$custom = Custom::field('name')->where('id',$contract['customer_id'])->findOrEmpty();
 		$data['project_name'] = $project['name'];
 	    $data['project_code'] = $project['project_code'];
 	    $data['contract_name'] = $contract['contract_name'];
diff --git a/app/adminapi/validate/bill/AcceptanceBillValidate.php b/app/adminapi/validate/bill/AcceptanceBillValidate.php
index 68e936b3d..b67199b28 100644
--- a/app/adminapi/validate/bill/AcceptanceBillValidate.php
+++ b/app/adminapi/validate/bill/AcceptanceBillValidate.php
@@ -34,7 +34,7 @@ class AcceptanceBillValidate extends BaseValidate
         'id' => 'require',
         'org_id' => 'require',
         'dept_id' => 'require',
-        'custome_id' => 'require',
+        'customer_id' => 'require',
         'project_id' => 'require',
         'contract_id' => 'require',
         'receipt_date' => 'require',
@@ -54,7 +54,7 @@ class AcceptanceBillValidate extends BaseValidate
         'id' => 'id',
         'org_id' => '组织id',
         'dept_id' => '部门id',
-        'custome_id' => '客户id',
+        'customer_id' => '客户id',
         'project_id' => '项目id',
         'contract_id' => '销售合同id',
         'receipt_date' => '收票日期',
@@ -74,7 +74,7 @@ class AcceptanceBillValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['org_id','dept_id','custome_id','project_id','contract_id','receipt_date','bill_sn','bank_account_id','bill_type','draft_acceptance_bank','receipt_amount']);
+        return $this->only(['org_id','dept_id','customer_id','project_id','contract_id','receipt_date','bill_sn','bank_account_id','bill_type','draft_acceptance_bank','receipt_amount']);
     }
 
 
@@ -86,7 +86,7 @@ class AcceptanceBillValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id','org_id','dept_id','custome_id','project_id','contract_id','receipt_date','bill_sn','bank_account_id','bill_type','draft_acceptance_bank','receipt_amount']);
+        return $this->only(['id','org_id','dept_id','customer_id','project_id','contract_id','receipt_date','bill_sn','bank_account_id','bill_type','draft_acceptance_bank','receipt_amount']);
     }
 
 
diff --git a/app/adminapi/validate/contract/ContractValidate.php b/app/adminapi/validate/contract/ContractValidate.php
index 39e7d5c0e..a626bfa20 100644
--- a/app/adminapi/validate/contract/ContractValidate.php
+++ b/app/adminapi/validate/contract/ContractValidate.php
@@ -33,7 +33,7 @@ class ContractValidate extends BaseValidate
     protected $rule = [
         'id' => 'require',
         'approve_id' => 'require',
-        'custome_id' => 'require',
+        'customer_id' => 'require',
         'buy_bidding_document_id' => 'require',
         'contract_name' => 'require',
         'contract_code' => 'require',
@@ -69,7 +69,7 @@ class ContractValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id', 'approve_id', 'custome_id', 'buy_bidding_document_id', 'contract_name', 'contract_code']);
+        return $this->only(['id', 'approve_id', 'customer_id', 'buy_bidding_document_id', 'contract_name', 'contract_code']);
     }
 
 
diff --git a/app/adminapi/validate/expense/ExpenseReimbursementValidate.php b/app/adminapi/validate/expense/ExpenseReimbursementValidate.php
index a7ab7f76f..a19222adb 100644
--- a/app/adminapi/validate/expense/ExpenseReimbursementValidate.php
+++ b/app/adminapi/validate/expense/ExpenseReimbursementValidate.php
@@ -37,7 +37,7 @@ class ExpenseReimbursementValidate extends BaseValidate
         'approve_id' => 'require',
         'reimburser' => 'require',
         'reimbursement_date' => 'require',
-        'custome_id' => 'require',
+        'customer_id' => 'require',
         'pay_type' => 'require',
         'payee_name' => 'require',
         'payee_bank' => 'require',
@@ -56,7 +56,7 @@ class ExpenseReimbursementValidate extends BaseValidate
         'approve_id' => '审批id',
         'reimburser' => '报销人',
         'reimbursement_date' => '报销日期',
-        'custome_id' => '客户id',
+        'customer_id' => '客户id',
         'pay_type' => '付款方式',
         'payee_name' => '收款人姓名',
         'payee_bank' => '收款银行',
@@ -72,7 +72,7 @@ class ExpenseReimbursementValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['org_id','dept_id','approve_id','reimburser','reimbursement_date','custome_id','pay_type','payee_name','payee_bank','payee_account']);
+        return $this->only(['org_id','dept_id','approve_id','reimburser','reimbursement_date','customer_id','pay_type','payee_name','payee_bank','payee_account']);
     }
 
 
@@ -84,7 +84,7 @@ class ExpenseReimbursementValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id','org_id','dept_id','approve_id','reimburser','reimbursement_date','custome_id','pay_type','payee_name','payee_bank','payee_account']);
+        return $this->only(['id','org_id','dept_id','approve_id','reimburser','reimbursement_date','customer_id','pay_type','payee_name','payee_bank','payee_account']);
     }
 
 
diff --git a/app/adminapi/validate/finance/FinanceInvoiceApplyValidate.php b/app/adminapi/validate/finance/FinanceInvoiceApplyValidate.php
index e6831d60d..b56436abb 100644
--- a/app/adminapi/validate/finance/FinanceInvoiceApplyValidate.php
+++ b/app/adminapi/validate/finance/FinanceInvoiceApplyValidate.php
@@ -32,7 +32,7 @@ class FinanceInvoiceApplyValidate extends BaseValidate
       */
     protected $rule = [
         'id' => 'require',
-        'custome_id' => 'require',
+        'customer_id' => 'require',
         'contract_id' => 'require',
         'approve_id' => 'require',
     ];
@@ -67,7 +67,7 @@ class FinanceInvoiceApplyValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id', 'custome_id', 'contract_id', 'approve_id']);
+        return $this->only(['id', 'customer_id', 'contract_id', 'approve_id']);
     }
 
 
diff --git a/app/adminapi/validate/finance/FinanceRefundApplyValidate.php b/app/adminapi/validate/finance/FinanceRefundApplyValidate.php
index 9c6a341fc..4226fd1da 100644
--- a/app/adminapi/validate/finance/FinanceRefundApplyValidate.php
+++ b/app/adminapi/validate/finance/FinanceRefundApplyValidate.php
@@ -32,7 +32,7 @@ class FinanceRefundApplyValidate extends BaseValidate
       */
     protected $rule = [
         'id' => 'require',
-        'custome_id' => 'require',
+        'customer_id' => 'require',
         'contract_id' => 'require',
         'approve_id' => 'require',
     ];
@@ -67,7 +67,7 @@ class FinanceRefundApplyValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id', 'custome_id', 'contract_id', 'approve_id']);
+        return $this->only(['id', 'customer_id', 'contract_id', 'approve_id']);
     }
 
 
diff --git a/app/adminapi/validate/finance/FinanceReturnedMoneyValidate.php b/app/adminapi/validate/finance/FinanceReturnedMoneyValidate.php
index cb45cd533..133046fc8 100644
--- a/app/adminapi/validate/finance/FinanceReturnedMoneyValidate.php
+++ b/app/adminapi/validate/finance/FinanceReturnedMoneyValidate.php
@@ -32,7 +32,7 @@ class FinanceReturnedMoneyValidate extends BaseValidate
       */
     protected $rule = [
         'id' => 'require',
-        'custome_id' => 'require',
+        'customer_id' => 'require',
         'contract_id' => 'require',
     ];
 
@@ -66,7 +66,7 @@ class FinanceReturnedMoneyValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id', 'custome_id', 'contract_id']);
+        return $this->only(['id', 'customer_id', 'contract_id']);
     }
 
 
diff --git a/app/adminapi/validate/finance/FinanceReturnedRecordValidate.php b/app/adminapi/validate/finance/FinanceReturnedRecordValidate.php
index a402c7143..28a52a650 100644
--- a/app/adminapi/validate/finance/FinanceReturnedRecordValidate.php
+++ b/app/adminapi/validate/finance/FinanceReturnedRecordValidate.php
@@ -32,7 +32,7 @@ class FinanceReturnedRecordValidate extends BaseValidate
       */
     protected $rule = [
         'id' => 'require',
-        'custome_id' => 'require',
+        'customer_id' => 'require',
         'contract_id' => 'require',
     ];
 
@@ -66,7 +66,7 @@ class FinanceReturnedRecordValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id', 'custome_id', 'contract_id', 'finance_returned_money_id']);
+        return $this->only(['id', 'customer_id', 'contract_id', 'finance_returned_money_id']);
     }
 
 
diff --git a/app/common/model/bill/AcceptanceBill.php b/app/common/model/bill/AcceptanceBill.php
index 1149b4fb9..a946d246e 100644
--- a/app/common/model/bill/AcceptanceBill.php
+++ b/app/common/model/bill/AcceptanceBill.php
@@ -39,7 +39,7 @@ class AcceptanceBill extends BaseModel
      */
     public function custom()
     {
-        return $this->hasOne(\app\common\model\custom\Custom::class, 'id', 'custome_id');
+        return $this->hasOne(\app\common\model\custom\Custom::class, 'id', 'customer_id');
     }
 
     /**
diff --git a/app/common/model/contract/Contract.php b/app/common/model/contract/Contract.php
index 82831909c..a8c9331d6 100644
--- a/app/common/model/contract/Contract.php
+++ b/app/common/model/contract/Contract.php
@@ -33,7 +33,7 @@ class Contract extends BaseModel
 
     public function custom()
     {
-        return $this->belongsTo(\app\common\model\custom\Custom::class, 'custome_id');
+        return $this->belongsTo(\app\common\model\custom\Custom::class, 'customer_id');
     }
 
     public function document()
diff --git a/app/common/model/expense/ExpenseReimbursement.php b/app/common/model/expense/ExpenseReimbursement.php
index 902f2db07..2d5b0e352 100644
--- a/app/common/model/expense/ExpenseReimbursement.php
+++ b/app/common/model/expense/ExpenseReimbursement.php
@@ -55,7 +55,7 @@ class ExpenseReimbursement extends BaseModel
 
     public function custom()
     {
-        return $this->belongsTo(\app\common\model\custom\Custom::class, 'custome_id');
+        return $this->belongsTo(\app\common\model\custom\Custom::class, 'customer_id');
     }
 
     public function org()
diff --git a/app/common/model/finance/FinanceInvoiceApply.php b/app/common/model/finance/FinanceInvoiceApply.php
index 05b6c44b8..e5caf21c8 100644
--- a/app/common/model/finance/FinanceInvoiceApply.php
+++ b/app/common/model/finance/FinanceInvoiceApply.php
@@ -32,7 +32,7 @@ class FinanceInvoiceApply extends BaseModel
  
     public function custom()
     {
-        return $this->belongsTo(\app\common\model\custom\Custom::class, 'custome_id');
+        return $this->belongsTo(\app\common\model\custom\Custom::class, 'customer_id');
     }
 
     public function contract()
diff --git a/app/common/model/finance/FinanceRefundApply.php b/app/common/model/finance/FinanceRefundApply.php
index 91c936a49..0d54f29f5 100644
--- a/app/common/model/finance/FinanceRefundApply.php
+++ b/app/common/model/finance/FinanceRefundApply.php
@@ -32,7 +32,7 @@ class FinanceRefundApply extends BaseModel
 
     public function custom()
     {
-        return $this->belongsTo(\app\common\model\custom\Custom::class, 'custome_id');
+        return $this->belongsTo(\app\common\model\custom\Custom::class, 'customer_id');
     }
 
     public function contract()
diff --git a/app/common/model/finance/FinanceReturnedMoney.php b/app/common/model/finance/FinanceReturnedMoney.php
index 9c4ed2706..928ec7b5f 100644
--- a/app/common/model/finance/FinanceReturnedMoney.php
+++ b/app/common/model/finance/FinanceReturnedMoney.php
@@ -32,7 +32,7 @@ class FinanceReturnedMoney extends BaseModel
 
     public function custom()
     {
-        return $this->belongsTo(\app\common\model\custom\Custom::class, 'custome_id');
+        return $this->belongsTo(\app\common\model\custom\Custom::class, 'customer_id');
     }
 
     public function contract()
diff --git a/app/common/model/finance/FinanceReturnedRecord.php b/app/common/model/finance/FinanceReturnedRecord.php
index 77cf2bd91..6db7b7d8a 100644
--- a/app/common/model/finance/FinanceReturnedRecord.php
+++ b/app/common/model/finance/FinanceReturnedRecord.php
@@ -32,7 +32,7 @@ class FinanceReturnedRecord extends BaseModel
 
     public function custom()
     {
-        return $this->belongsTo(\app\common\model\custom\Custom::class, 'custome_id');
+        return $this->belongsTo(\app\common\model\custom\Custom::class, 'customer_id');
     }
 
     public function contract()