update

app/adminapi/lists/bid/BidBiddingDecisionLists.php

@@ -17,8 +17,8 @@ namespace app\adminapi\lists\bid;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
-use app\common\model\bid\BidBiddingDecision;
 	use app\common\lists\ListsSearchInterface;
+	use app\common\model\bid\BidBiddingDecision;
 	use app\common\model\custom\Custom;
 	use app\common\model\project\Project;
 	
@@ -79,6 +79,7 @@ class BidBiddingDecisionLists extends BaseAdminDataLists implements ListsSearchI
 					$item['is_margin'] = $item->is_margin_text;
 					$item['is_internal_resources'] = $item->is_internal_resources_text;
 					$item['project_assurance'] = $item->project_assurance_text;
+					$item['approve_check_status_text'] = $item->approve_check_status_text;
 					unset($item['delete_time']);
 					return $item;
 				})

app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php

@@ -17,10 +17,10 @@ namespace app\adminapi\lists\bid;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\auth\Admin;
 	use app\common\model\bid\BidBiddingDecision;
 	use app\common\model\bid\BidBuyBiddingDocument;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\custom\Custom;
 	use app\common\model\project\Project;
 	
@@ -90,6 +90,7 @@ class BidBuyBiddingDocumentLists extends BaseAdminDataLists implements ListsSear
 					$item['bid_type'] = $bid_decision->bid_type_text;
 					$item['is_margin'] = $bid_decision->is_margin_text;
 					$item['margin_amount'] = $bid_decision['margin_amount'];
+					$item['approve_check_status_text'] = $item->approve_check_status_text;
 					return $item;
 				})
 				->toArray();

app/adminapi/lists/bid/BidDocumentExaminationLists.php

@@ -17,11 +17,11 @@ namespace app\adminapi\lists\bid;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\auth\Admin;
 	use app\common\model\bid\BidBiddingDecision;
 	use app\common\model\bid\BidBuyBiddingDocument;
 	use app\common\model\bid\BidDocumentExamination;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\bid\BidDocumentExaminationDetail;
 	use app\common\model\custom\Custom;
 	use app\common\model\project\Project;
@@ -92,6 +92,7 @@ class BidDocumentExaminationLists extends BaseAdminDataLists implements ListsSea
 					$item['margin_amount'] = $bid_decision['margin_amount'];
 					$item['bid_opening_date'] = $bid_decision['bid_opening_date'];
 					$item['total_amount'] = BidDocumentExaminationDetail::where('bid_document_examination_id', $item['id'])->sum('sale_amount');
+					$item['approve_check_status_text'] = $item->approve_check_status_text;
 					return $item;
 				})
 				->toArray();

app/adminapi/lists/bid/BidSecurityApplyLists.php

@@ -17,9 +17,9 @@ namespace app\adminapi\lists\bid;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\bid\BidBiddingDecision;
 	use app\common\model\bid\BidSecurityApply;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\bid\BidSecurityRefund;
 	use app\common\model\custom\Custom;
 	use app\common\model\project\Project;
@@ -78,6 +78,7 @@ class BidSecurityApplyLists extends BaseAdminDataLists implements ListsSearchInt
 					$data['has_refund_amount'] = BidSecurityRefund::where('bid_security_apply_id', $data['id'])->sum('refund_amount');
 					//未退金额
 					$data['not_refund_amount'] = $data['margin_amount'] - $data['has_refund_amount'];
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/bid/BidSecurityRefundLists.php

@@ -17,14 +17,13 @@ namespace app\adminapi\lists\bid;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\bank\BankAccount;
 	use app\common\model\bid\BidBiddingDecision;
 	use app\common\model\bid\BidSecurityApply;
 	use app\common\model\bid\BidSecurityRefund;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\custom\Custom;
 	use app\common\model\project\Project;
-use think\facade\Db;
 	
 	/**
 	 * BidSecurityRefund列表
@@ -75,6 +74,7 @@ class BidSecurityRefundLists extends BaseAdminDataLists implements ListsSearchIn
 					$data['project_code'] = $project['project_code'];
 					$data['bidding_time'] = $bidding_decision['bidding_time'];
 					$data['bank_account_info'] = BankAccount::field('account_sn,deposit_bank,account_name,account')->where('id', $data['bank_account_id'])->findOrEmpty();
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/contract/ContractLists.php

@@ -17,17 +17,16 @@ namespace app\adminapi\lists\contract;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\auth\Admin;
 	use app\common\model\bid\BidBuyBiddingDocument;
 	use app\common\model\contract\Contract;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\contract\ContractNegotiation;
 	use app\common\model\custom\Custom;
 	use app\common\model\finance\FinanceInvoiceApply;
 	use app\common\model\finance\FinanceRefundApply;
 	use app\common\model\finance\FinanceReturnedRecord;
 	use app\common\model\project\Project;
-use think\facade\Db;
 	
 	/**
 	 * 项目合同列表
@@ -106,6 +105,7 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface,L
 					$data['not_invoicing_amount'] = $data['reality_contract_amount'] - $data['invoicing_amount'];
 					//结算差异（带计算）
 					$data['settlement_difference'] = 0;
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/contract/ContractNegotiationLists.php

@@ -17,13 +17,12 @@ namespace app\adminapi\lists\contract;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\auth\Admin;
 	use app\common\model\contract\Contract;
 	use app\common\model\contract\ContractNegotiation;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\custom\Custom;
 	use app\common\model\project\Project;
-use think\facade\Db;
 	
 	/**
 	 * 合同洽商列表
@@ -84,6 +83,7 @@ class ContractNegotiationLists extends BaseAdminDataLists implements ListsSearch
 					$data['custom_name'] = $custom['name'];
 					$data['negotiation_type'] = $data->negotiation_type_text;
 					$data['profit_rate'] = ($data['profit_rate'] * 100) . '%';
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/contract/ProcurementContractLists.php

@@ -17,15 +17,14 @@ namespace app\adminapi\lists\contract;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
-use app\common\model\contract\ProcurementContract;
 	use app\common\lists\ListsSearchInterface;
+	use app\common\model\contract\ProcurementContract;
 	use app\common\model\contract\ProcurementContractDetail;
 	use app\common\model\finance\FinancePaymentApply;
 	use app\common\model\finance\FinanceReceiptRecord;
 	use app\common\model\finance\FinanceRefundRecord;
 	use app\common\model\project\Project;
 	use app\common\model\supplier\Supplier;
-use think\facade\Db;
 	
 	/**
 	 * 采购合同列表
@@ -90,6 +89,7 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch
 					$data['has_storage_num'] = 0;
 					//未入库数量
 					$data['not_storage_num'] = $data['num'] - $data['has_storage_num'];
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/contract/SubcontractingContractLists.php

@@ -17,8 +17,8 @@ namespace app\adminapi\lists\contract;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
-use app\common\model\contract\SubcontractingContract;
 	use app\common\lists\ListsSearchInterface;
+	use app\common\model\contract\SubcontractingContract;
 	use app\common\model\contract\SubcontractingContractDetail;
 	use app\common\model\contract\SubcontractingContractNegotiation;
 	use app\common\model\finance\FinancePaymentApply;
@@ -93,6 +93,7 @@ class SubcontractingContractLists extends BaseAdminDataLists implements ListsSea
 					$data['refund_amount'] = FinanceRefundRecord::where('contract_id', $data['id'])->where('contract_type', 2)->sum('refund_amount');;
 					//结算差异
 					$data['settlement_difference'] = 0;
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/contract/SubcontractingContractNegotiationLists.php

@@ -17,12 +17,11 @@ namespace app\adminapi\lists\contract;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\contract\SubcontractingContract;
 	use app\common\model\contract\SubcontractingContractNegotiation;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
 	use app\common\model\supplier\Supplier;
-use think\facade\Db;
 	
 	/**
 	 * SubcontractingContractNegotiation列表
@@ -74,6 +73,7 @@ class SubcontractingContractNegotiationLists extends BaseAdminDataLists implemen
 					$data['project_code'] = $project['project_code'];
 					$data['project_name'] = $project['name'];
 					$data['negotiation_type_text'] = $data->negotiation_type_text;
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/finance/FinanceInvoiceApplyLists.php

@@ -17,10 +17,10 @@ namespace app\adminapi\lists\finance;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\contract\Contract;
 	use app\common\model\custom\Custom;
 	use app\common\model\finance\FinanceInvoiceApply;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
 	
 	/**
@@ -80,6 +80,7 @@ class FinanceInvoiceApplyLists extends BaseAdminDataLists implements ListsSearch
 					$data['period'] = $data->period_text;
 					$data['tax_rate'] = $data->tax_rate_text;
 					$data['invoice_type'] = $data->invoice_type_text;
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/finance/FinancePaymentApplyLists.php

@@ -17,14 +17,13 @@ namespace app\adminapi\lists\finance;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\contract\ProcurementContract;
 	use app\common\model\contract\SubcontractingContract;
 	use app\common\model\finance\FinancePaymentApply;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\finance\FinancePaymentPlan;
 	use app\common\model\project\Project;
 	use app\common\model\supplier\Supplier;
-use think\facade\Db;
 	
 	
 	/**
@@ -85,6 +84,7 @@ class FinancePaymentApplyLists extends BaseAdminDataLists implements ListsSearch
 					$data['contract_no'] = $contract['contract_no'];
 					$data['contract_name'] = $contract['contract_name'];
 					$data['period'] = $finance_payment_plan->period_text;
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/finance/FinancePaymentPlanLists.php

@@ -17,14 +17,13 @@ namespace app\adminapi\lists\finance;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\contract\ProcurementContract;
 	use app\common\model\contract\SubcontractingContract;
 	use app\common\model\finance\FinancePaymentApply;
 	use app\common\model\finance\FinancePaymentPlan;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
 	use app\common\model\supplier\Supplier;
-use think\facade\Db;
 	
 	/**
 	 * FinancePaymentPlan列表
@@ -83,6 +82,7 @@ class FinancePaymentPlanLists extends BaseAdminDataLists implements ListsSearchI
 					$data['contract_name'] = $contract['contract_name'];
 					$data['has_payment_amount'] = FinancePaymentApply::where('finance_payment_plan_id', $data['id'])->sum('amount');
 					$data['not_payment_amount'] = $data['amount'] - $data['has_payment_amount'];
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/finance/FinanceReceiptRecordLists.php

@@ -17,13 +17,12 @@ namespace app\adminapi\lists\finance;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\contract\ProcurementContract;
 	use app\common\model\contract\SubcontractingContract;
 	use app\common\model\finance\FinanceReceiptRecord;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
 	use app\common\model\supplier\Supplier;
-use think\facade\Db;
 	
 	
 	/**
@@ -82,6 +81,7 @@ class FinanceReceiptRecordLists extends BaseAdminDataLists implements ListsSearc
 					$data['contract_no'] = $contract['contract_no'];
 					$data['contract_name'] = $contract['contract_name'];
 					$data['contract_type'] = $data->contract_type_text;
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/finance/FinanceRefundApplyLists.php

@@ -17,11 +17,11 @@ namespace app\adminapi\lists\finance;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\bank\BankAccount;
 	use app\common\model\contract\Contract;
 	use app\common\model\custom\Custom;
 	use app\common\model\finance\FinanceRefundApply;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
 	
 	
@@ -81,6 +81,7 @@ class FinanceRefundApplyLists extends BaseAdminDataLists implements ListsSearchI
 					$data['contract_code'] = $contract['contract_code'];
 					$data['refund_type'] = $data->refund_type_text;
 					$data['bank_account_info'] = BankAccount::field('account_sn,deposit_bank,account_name,account')->where('id', $data['bank_account_id'])->findOrEmpty();
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/finance/FinanceRefundRecordLists.php

@@ -17,14 +17,12 @@ namespace app\adminapi\lists\finance;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
-use app\common\model\bank\BankAccount;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\contract\ProcurementContract;
 	use app\common\model\contract\SubcontractingContract;
 	use app\common\model\finance\FinanceRefundRecord;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
 	use app\common\model\supplier\Supplier;
-use think\facade\Db;
 	
 	/**
 	 * FinanceRefundRecord列表
@@ -80,6 +78,7 @@ class FinanceRefundRecordLists extends BaseAdminDataLists implements ListsSearch
 					$data['contract_name'] = $contract['contract_name'];
 					$data['contract_type_text'] = $data->contract_type_text;
 					$data['refund_type_text'] = $data->refund_type_text;
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/finance/FinanceReturnedMoneyLists.php

@@ -17,14 +17,13 @@ namespace app\adminapi\lists\finance;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\auth\Admin;
 	use app\common\model\contract\Contract;
+	use app\common\model\custom\Custom;
 	use app\common\model\finance\FinanceReturnedMoney;
 	use app\common\model\finance\FinanceReturnedRecord;
 	use app\common\model\project\Project;
-use app\common\model\custom\Custom;
-use app\common\lists\ListsSearchInterface;
-use think\facade\Db;
 	
 	
 	/**
@@ -87,6 +86,7 @@ class FinanceReturnedMoneyLists extends BaseAdminDataLists implements ListsSearc
 					$data['return_duty'] = $return_duty['name'];
 					$data['has_return_amount'] = FinanceReturnedRecord::where('finance_returned_money_id', $data['id'])->sum('amount');
 					$data['not_return_amount'] = $data['amount'] - $data['has_return_amount'];
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/finance/FinanceReturnedRecordLists.php

@@ -17,14 +17,13 @@ namespace app\adminapi\lists\finance;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\bank\BankAccount;
 	use app\common\model\contract\Contract;
 	use app\common\model\custom\Custom;
 	use app\common\model\finance\FinanceReturnedMoney;
 	use app\common\model\finance\FinanceReturnedRecord;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
-use think\facade\Db;
 	
 	/**
 	 * FinanceReturnedRecord列表
@@ -85,6 +84,7 @@ class FinanceReturnedRecordLists extends BaseAdminDataLists implements ListsSear
 					$data['invoice_status'] = $data->invoice_status_text;
 					$data['pay_type'] = $data->pay_type_text;
 					$data['bank_account_info'] = BankAccount::field('account_sn,deposit_bank,account_name,account')->where('id', $data['bank_account_id'])->findOrEmpty();
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/material/MaterialPurchaseRequestLists.php

@@ -16,8 +16,8 @@ namespace app\adminapi\lists\material;
 	
 	
 	use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\material\MaterialPurchaseRequest;
 	use app\common\lists\ListsSearchInterface;
+	use app\common\model\material\MaterialPurchaseRequest;
 	use app\common\model\project\Project;
 	
 	
@@ -64,6 +64,7 @@ class MaterialPurchaseRequestLists extends BaseAdminDataLists implements ListsSe
 					$project = Project::field('name,project_code')->where('id', $data['project_id'])->findOrEmpty();
 					$data['project_name'] = $project['name'];
 					$data['project_code'] = $project['project_code'];
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/project/ProjectCostAdjustmentLists.php

@@ -17,9 +17,9 @@ namespace app\adminapi\lists\project;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectCostAdjustment;
-use app\common\lists\ListsSearchInterface;
 	
 	
 	/**
@@ -64,6 +64,7 @@ class ProjectCostAdjustmentLists extends BaseAdminDataLists implements ListsSear
 					$project = Project::field('name,project_code')->where('id', $data['project_id'])->findOrEmpty();
 					$data['project_name'] = $project['name'];
 					$data['project_code'] = $project['project_code'];
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/project/ProjectCostBudgetLists.php

@@ -17,9 +17,9 @@ namespace app\adminapi\lists\project;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectCostBudget;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\ProjectCostBudgetDetail;
 	
 	
@@ -68,6 +68,7 @@ class ProjectCostBudgetLists extends BaseAdminDataLists implements ListsSearchIn
 					$data['project_code'] = $project['project_code'];
 					//预算总金额
 					$data['total_amount'] = ProjectCostBudgetDetail::where('cost_budget_id', $data['id'])->sum('amount');
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/project/ProjectEquipmentBudgetLists.php

@@ -17,9 +17,9 @@ namespace app\adminapi\lists\project;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectEquipmentBudget;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\ProjectEquipmentBudgetDetail;
 	
 	
@@ -70,6 +70,7 @@ class ProjectEquipmentBudgetLists extends BaseAdminDataLists implements ListsSea
 					$data['total_num'] = ProjectEquipmentBudgetDetail::where('equipment_budget_id', $data['id'])->sum('num');
 					//预算总金额
 					$data['total_amount'] = ProjectEquipmentBudgetDetail::where('equipment_budget_id', $data['id'])->sum('amount');
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/project/ProjectExpenseReimbursementLists.php

@@ -17,9 +17,9 @@ namespace app\adminapi\lists\project;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectExpenseReimbursement;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\ProjectExpenseReimbursementDetail;
 	use app\common\model\project\ProjectLoanApply;
 	
@@ -73,6 +73,7 @@ class ProjectExpenseReimbursementLists extends BaseAdminDataLists implements Lis
 					$data['total_amount'] = ProjectExpenseReimbursementDetail::where('expense_reimbursement_id', $data['id'])->sum('amount');
 					$data['pay_amount'] = $data['total_amount'] - $data['offset_loan_amount'];
 					$data['reimbursement_type'] = $data->reimbursement_type_text;
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					unset($data['project_id'], $data['loan_apply_id']);
 					return $data;
 				})

app/adminapi/lists/project/ProjectLaborBudgetLists.php

@@ -17,9 +17,9 @@ namespace app\adminapi\lists\project;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectLaborBudget;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\ProjectLaborBudgetDetail;
 	
 	
@@ -70,6 +70,7 @@ class ProjectLaborBudgetLists extends BaseAdminDataLists implements ListsSearchI
 					$data['total_num'] = ProjectLaborBudgetDetail::where('labor_budget_id', $data['id'])->sum('num');
 					//预算总金额
 					$data['total_amount'] = ProjectLaborBudgetDetail::where('labor_budget_id', $data['id'])->sum('amount');
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 				})
 				->toArray();
 		}

app/adminapi/lists/project/ProjectLoanApplyLists.php

@@ -17,10 +17,10 @@ namespace app\adminapi\lists\project;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectExpenseReimbursement;
 	use app\common\model\project\ProjectLoanApply;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\ProjectTravelReimbursement;
 	
 	
@@ -73,6 +73,7 @@ class ProjectLoanApplyLists extends BaseAdminDataLists implements ListsSearchInt
 					$expense_deduction = ProjectExpenseReimbursement::where('loan_apply_id', $data['id'])->sum('offset_loan_amount');
 					$data['has_return_amount'] = $trip_deduction + $expense_deduction;
 					$data['not_return_amount'] = $data['loan_amount'] - $data['has_return_amount'];
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/project/ProjectMaterialBudgetLists.php

@@ -17,10 +17,10 @@ namespace app\adminapi\lists\project;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\material\MaterialPurchaseRequestDetail;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectMaterialBudget;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\ProjectMaterialBudgetDetail;
 	
 	
@@ -76,6 +76,7 @@ class ProjectMaterialBudgetLists extends BaseAdminDataLists implements ListsSear
 					$data['total_apply_num'] = MaterialPurchaseRequestDetail::where('project_material_budget_detail_id', 'in', $ProjectMaterialBudgetDetailIds)->sum('num');
 					//剩余预算总数量
 					$data['total_residual_num'] = $data['total_num'] - $data['total_apply_num'];
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/project/ProjectSettlementLists.php

@@ -17,12 +17,12 @@ namespace app\adminapi\lists\project;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\auth\Admin;
 	use app\common\model\contract\Contract;
 	use app\common\model\contract\ContractNegotiation;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectSettlement;
-use app\common\lists\ListsSearchInterface;
 	
 	
 	/**
@@ -78,6 +78,7 @@ class ProjectSettlementLists extends BaseAdminDataLists implements ListsSearchIn
 					//结算差异
 					$item['settlement_difference'] = bcsub(($item['contract_amount'] + $item['negotiation_amount']), $item['settlement_amount']);
 					$item['add_user_name'] = $admin['name'];
+					$item['approve_check_status_text'] = $item->approve_check_status_text;
 					unset($item['project_id'], $item['contract_id'], $item['add_user']);
 					return $item;
 				})

app/adminapi/lists/project/ProjectSubcontractSettlementLists.php

@@ -17,13 +17,13 @@ namespace app\adminapi\lists\project;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\auth\Admin;
 	use app\common\model\contract\ContractNegotiation;
 	use app\common\model\contract\SubcontractingContract;
 	use app\common\model\contract\SubcontractingContractDetail;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectSubcontractSettlement;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\supplier\Supplier;
 	
 	
@@ -81,6 +81,7 @@ class ProjectSubcontractSettlementLists extends BaseAdminDataLists implements Li
 					//结算差异
 					$item['settlement_difference'] = bcsub(($item['contract_amount'] + $item['negotiation_amount']), $item['settlement_amount']);
 					$item['add_user_name'] = $admin['name'];
+					$item['approve_check_status_text'] = $item->approve_check_status_text;
 					unset($item['project_id'], $item['contract_id'], $item['add_user']);
 					return $item;
 				})

app/adminapi/lists/project/ProjectSubpackageBudgetLists.php

@@ -17,10 +17,10 @@ namespace app\adminapi\lists\project;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\contract\SubcontractingContractDetail;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectSubpackageBudget;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\ProjectSubpackageBudgetDetail;
 	
 	
@@ -75,6 +75,7 @@ class ProjectSubpackageBudgetLists extends BaseAdminDataLists implements ListsSe
 					$data['has_subcontract_num'] = SubcontractingContractDetail::where('subpackage_budget_detail_id', 'in', $project_subpackage_budget_detail_ids)->sum('num');
 					//剩余工作量
 					$data['residue_num'] = $data['total_num'] - $data['has_subcontract_num'];
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/project/ProjectTotalBudgetLists.php

@@ -72,6 +72,7 @@
 					$data['profit'] = $data['contract_amount'] - $data['total_cost'];
 					//利润率
 					$data['profit_rate'] = !empty((float)$data['contract_amount']) ? ($data['profit'] / $data['contract_amount']) : 0;
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/project/ProjectTravelReimbursementLists.php

@@ -17,12 +17,12 @@ namespace app\adminapi\lists\project;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\auth\Admin;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectLoanApply;
 	use app\common\model\project\ProjectManagerAppointment;
 	use app\common\model\project\ProjectTravelReimbursement;
-use app\common\lists\ListsSearchInterface;
 	use app\common\model\project\ProjectTravelReimbursementDetail;
 	use app\common\model\project\ProjectTripApply;
 	
@@ -87,6 +87,7 @@ class ProjectTravelReimbursementLists extends BaseAdminDataLists implements List
 					unset($data['trip_apply_id'], $data['loan_apply_id']);
 					$data['total_amount'] = ProjectTravelReimbursementDetail::where('travel_reimbursement_id', $data['id'])->sum('total_amount');
 					$data['pay_amount'] = $data['total_amount'] - $data['offset_loan_amount'];
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/lists/project/ProjectTripApplyLists.php

@@ -17,11 +17,11 @@ namespace app\adminapi\lists\project;
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsExcelInterface;
+	use app\common\lists\ListsSearchInterface;
 	use app\common\model\auth\Admin;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectManagerAppointment;
 	use app\common\model\project\ProjectTripApply;
-use app\common\lists\ListsSearchInterface;
 	
 	
 	/**
@@ -75,6 +75,7 @@ class ProjectTripApplyLists extends BaseAdminDataLists implements ListsSearchInt
 						$admin = Admin::field('name')->where('id', $manager['project_manager'])->findOrEmpty();
 						$data['project_manager'] = $admin['name'];
 					}
+					$data['approve_check_status_text'] = $data->approve_check_status_text;
 					return $data;
 				})
 				->toArray();

app/adminapi/logic/bid/BidBiddingDecisionLogic.php

@@ -160,7 +160,7 @@
 		{
 			$data = BidBiddingDecision::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/bid/BidBuyBiddingDocumentLogic.php

@@ -15,12 +15,12 @@
 	namespace app\adminapi\logic\bid;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\auth\Admin;
 	use app\common\model\bid\BidBiddingDecision;
 	use app\common\model\bid\BidBuyBiddingDocument;
 	use app\common\model\bid\BidDocumentExamination;
 	use app\common\model\custom\Custom;
-use app\common\logic\BaseLogic;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
 	use think\facade\Db;
@@ -148,10 +148,11 @@ class BidBuyBiddingDocumentLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = BidBuyBiddingDocument::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/bid/BidDocumentExaminationLogic.php

@@ -14,12 +14,12 @@
 	
 	namespace app\adminapi\logic\bid;
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\auth\Admin;
 	use app\common\model\bid\BidBiddingDecision;
 	use app\common\model\bid\BidBuyBiddingDocument;
 	use app\common\model\bid\BidDocumentExamination;
 	use app\common\model\bid\BidDocumentExaminationDetail;
-use app\common\logic\BaseLogic;
 	use app\common\model\bid\BidResult;
 	use app\common\model\custom\Custom;
 	use app\common\model\oa\FlowApprove;
@@ -63,8 +63,7 @@ class BidDocumentExaminationLogic extends BaseLogic
 					'business_contract_deviation_annex' => $params['business_contract_deviation_annex'] ? json_encode($params['business_contract_deviation_annex']) : null,
 				]);
 				if (!empty($params['quotation_detail'])) {
-				foreach ($params['quotation_detail'] as $item)
-				{
+					foreach ($params['quotation_detail'] as $item) {
 						BidDocumentExaminationDetail::create([
 							'bid_document_examination_id' => $bidDocumentExamination->id,
 							'product_id' => $item['product_id'],
@@ -108,8 +107,7 @@ class BidDocumentExaminationLogic extends BaseLogic
 					'update_time' => time(),
 				]);
 				if (!empty($params['quotation_detail'])) {
-				foreach ($params['quotation_detail'] as $item)
-				{
+					foreach ($params['quotation_detail'] as $item) {
 						if (!empty($item['id'])) {
 							BidDocumentExaminationDetail::where('id', $item['id'])->update([
 								'bid_document_examination_id' => $params['id'],
@@ -202,10 +200,11 @@ class BidDocumentExaminationLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = BidDocumentExamination::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/bid/BidSecurityApplyLogic.php

@@ -15,12 +15,12 @@
 	namespace app\adminapi\logic\bid;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\bid\BidBiddingDecision;
 	use app\common\model\bid\BidSecurityApply;
+	use app\common\model\custom\Custom;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
-use app\common\model\custom\Custom;
-use app\common\logic\BaseLogic;
 	use think\facade\Db;
 	
 	
@@ -143,10 +143,11 @@ class BidSecurityApplyLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = BidSecurityApply::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/bid/BidSecurityRefundLogic.php

@@ -15,14 +15,14 @@
 	namespace app\adminapi\logic\bid;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\bank\BankAccount;
 	use app\common\model\bid\BidBiddingDecision;
 	use app\common\model\bid\BidSecurityApply;
 	use app\common\model\bid\BidSecurityRefund;
-use app\common\logic\BaseLogic;
+	use app\common\model\custom\Custom;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
-use app\common\model\custom\Custom;
 	use think\facade\Db;
 	
 	
@@ -139,10 +139,11 @@ class BidSecurityRefundLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = BidSecurityRefund::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/contract/ContractLogic.php

@@ -15,15 +15,15 @@
 	namespace app\adminapi\logic\contract;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\auth\Admin;
 	use app\common\model\bid\BidBuyBiddingDocument;
 	use app\common\model\contract\Contract;
-use app\common\logic\BaseLogic;
+	use app\common\model\custom\Custom;
 	use app\common\model\finance\FinanceReturnedMoney;
 	use app\common\model\finance\FinanceReturnedRecord;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
-use app\common\model\custom\Custom;
 	use think\facade\Db;
 	
 	
@@ -76,8 +76,7 @@ class ContractLogic extends BaseLogic
 					"remark" => $params['remark'] ?? '',
 					'annex' => $params['annex'] ? json_encode($params['annex']) : null,
 				]);
-	        foreach ($params['returned_money'] as $item)
-	        {
+				foreach ($params['returned_money'] as $item) {
 					FinanceReturnedMoney::create([
 						'project_id' => $buy_bidding_document['project_id'],
 						'contract_id' => $contractRes->id,
@@ -143,8 +142,7 @@ class ContractLogic extends BaseLogic
 					"remark" => $params['remark'] ?? '',
 					'annex' => $params['annex'] ? json_encode($params['annex']) : null,
 				]);
-	        foreach ($params['returned_money'] as $item)
-	        {
+				foreach ($params['returned_money'] as $item) {
 					if (isset($item['id']) && $item['id'] != '') {
 						FinanceReturnedMoney::where('id', $item['id'])->update([
 							'project_id' => $buy_bidding_document['project_id'],
@@ -224,10 +222,11 @@ class ContractLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = Contract::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/contract/ContractNegotiationLogic.php

@@ -163,7 +163,7 @@
 		{
 			$data = ContractNegotiation::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/contract/ProcurementContractLogic.php

@@ -15,9 +15,9 @@
 	namespace app\adminapi\logic\contract;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\contract\ProcurementContract;
 	use app\common\model\contract\ProcurementContractDetail;
-use app\common\logic\BaseLogic;
 	use app\common\model\dict\DictData;
 	use app\common\model\finance\FinancePaymentPlan;
 	use app\common\model\oa\FlowApprove;
@@ -69,8 +69,7 @@ class ProcurementContractLogic extends BaseLogic
 					'remark' => $params['remark'] ?? '',
 					'annex' => $params['annex'] ? json_encode($params['annex']) : null,
 				]);
-            foreach ($params['procurement_contract_detail'] as $v)
-            {       
+				foreach ($params['procurement_contract_detail'] as $v) {
 					ProcurementContractDetail::create([
 						'contract_id' => $procurementContract->id,
 						'material_purchase_request_detail_id' => $v['material_purchase_request_detail_id'],
@@ -83,8 +82,7 @@ class ProcurementContractLogic extends BaseLogic
 						'amount_including_tax' => $v['num'] * $v['price'],
 					]);
 				}
-	        foreach ($params['payment_plan'] as $v)
-	        {
+				foreach ($params['payment_plan'] as $v) {
 					FinancePaymentPlan::create([
 						'supplier_id' => $params['supplier_id'],
 						'project_id' => $params['project_id'],
@@ -140,8 +138,7 @@ class ProcurementContractLogic extends BaseLogic
 					'remark' => $params['remark'] ?? '',
 					'annex' => $params['annex'] ? json_encode($params['annex']) : null,
 				]);
-			foreach ($params['procurement_contract_detail'] as $v)
-			{
+				foreach ($params['procurement_contract_detail'] as $v) {
 					if (isset($v['id']) && $v != '') {
 						ProcurementContractDetail::where('id', $v['id'])->update([
 							'contract_id' => $params['id'],
@@ -168,8 +165,7 @@ class ProcurementContractLogic extends BaseLogic
 						]);
 					}
 				}
-			foreach ($params['payment_plan'] as $v)
-			{
+				foreach ($params['payment_plan'] as $v) {
 					if (isset($v['id']) && $v != '') {
 						FinancePaymentPlan::where('id', $v['id'])->update([
 							'supplier_id' => $params['supplier_id'],
@@ -220,6 +216,7 @@ class ProcurementContractLogic extends BaseLogic
 			}
 			return ProcurementContract::destroy($params['id']);
 		}
+		
 		/**
 		 * @notes 获取采购合同详情
 		 * @param $params
@@ -246,10 +243,11 @@ class ProcurementContractLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = ProcurementContract::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/contract/SubcontractingContractLogic.php

@@ -15,9 +15,9 @@
 	namespace app\adminapi\logic\contract;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\contract\SubcontractingContract;
 	use app\common\model\contract\SubcontractingContractDetail;
-use app\common\logic\BaseLogic;
 	use app\common\model\dict\DictData;
 	use app\common\model\finance\FinancePaymentPlan;
 	use app\common\model\oa\FlowApprove;
@@ -69,8 +69,7 @@ class SubcontractingContractLogic extends BaseLogic
 					'remark' => $params['remark'] ?? '',
 					'annex' => $params['annex'] ? json_encode($params['annex']) : null,
 				]);
-		    foreach ($params['subcontracting_contract_detail'] as $v)
-		    {
+				foreach ($params['subcontracting_contract_detail'] as $v) {
 					SubcontractingContractDetail::create([
 						'contract_id' => $res->id,
 						'subpackage_budget_detail_id' => $v['subpackage_budget_detail_id'],
@@ -84,8 +83,7 @@ class SubcontractingContractLogic extends BaseLogic
 						'remark' => $v['remark'] ?? '',
 					]);
 				}
-		    foreach ($params['payment_plan'] as $v)
-		    {
+				foreach ($params['payment_plan'] as $v) {
 					FinancePaymentPlan::create([
 						'supplier_id' => $params['supplier_id'],
 						'project_id' => $params['project_id'],
@@ -141,8 +139,7 @@ class SubcontractingContractLogic extends BaseLogic
 					'remark' => $params['remark'] ?? '',
 					'annex' => $params['annex'] ? json_encode($params['annex']) : null,
 				]);
-		    foreach ($params['subcontracting_contract_detail'] as $v)
-		    {
+				foreach ($params['subcontracting_contract_detail'] as $v) {
 					if (isset($v['id']) && $v != '') {
 						SubcontractingContractDetail::where('id', $v['id'])->update([
 							'contract_id' => $params['id'],
@@ -171,8 +168,7 @@ class SubcontractingContractLogic extends BaseLogic
 						]);
 					}
 				}
-		    foreach ($params['payment_plan'] as $v)
-		    {
+				foreach ($params['payment_plan'] as $v) {
 					if (isset($v['id']) && $v != '') {
 						FinancePaymentPlan::where('id', $v['id'])->update([
 							'supplier_id' => $params['supplier_id'],
@@ -224,7 +220,6 @@ class SubcontractingContractLogic extends BaseLogic
 		}
 		
 		
-
 		/**
 		 * @notes 获取详情
 		 * @param $params
@@ -251,10 +246,11 @@ class SubcontractingContractLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = SubcontractingContract::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php

@@ -149,7 +149,7 @@
 		{
 			$data = SubcontractingContractNegotiation::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php

@@ -15,15 +15,15 @@
 	namespace app\adminapi\logic\finance;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\contract\Contract;
 	use app\common\model\contract\ContractNegotiation;
+	use app\common\model\custom\Custom;
 	use app\common\model\dict\DictData;
 	use app\common\model\finance\FinanceInvoiceApply;
-use app\common\logic\BaseLogic;
 	use app\common\model\finance\FinanceReturnedRecord;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
-use app\common\model\custom\Custom;
 	use think\facade\Db;
 	
 	
@@ -183,10 +183,11 @@ class FinanceInvoiceApplyLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = FinanceInvoiceApply::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/finance/FinancePaymentApplyLogic.php

@@ -207,7 +207,7 @@
 		{
 			$data = FinancePaymentApply::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/finance/FinancePaymentPlanLogic.php

@@ -165,7 +165,7 @@
 		{
 			$data = FinancePaymentPlan::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/finance/FinanceReceiptRecordLogic.php

@@ -15,13 +15,13 @@
 	namespace app\adminapi\logic\finance;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\contract\ProcurementContract;
 	use app\common\model\contract\SubcontractingContract;
 	use app\common\model\dict\DictData;
 	use app\common\model\finance\FinanceReceiptRecord;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
-use app\common\logic\BaseLogic;
 	use app\common\model\supplier\Supplier;
 	use think\facade\Db;
 	
@@ -175,10 +175,11 @@ class FinanceReceiptRecordLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = FinanceReceiptRecord::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/finance/FinanceRefundApplyLogic.php

@@ -15,11 +15,11 @@
 	namespace app\adminapi\logic\finance;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\bank\BankAccount;
 	use app\common\model\contract\Contract;
 	use app\common\model\custom\Custom;
 	use app\common\model\finance\FinanceRefundApply;
-use app\common\logic\BaseLogic;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
 	use think\facade\Db;
@@ -147,10 +147,11 @@ class FinanceRefundApplyLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = FinanceRefundApply::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/finance/FinanceRefundRecordLogic.php

@@ -15,11 +15,11 @@
 	namespace app\adminapi\logic\finance;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\bank\BankAccount;
 	use app\common\model\contract\ProcurementContract;
 	use app\common\model\contract\SubcontractingContract;
 	use app\common\model\finance\FinanceRefundRecord;
-use app\common\logic\BaseLogic;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
 	use app\common\model\supplier\Supplier;
@@ -166,10 +166,11 @@ class FinanceRefundRecordLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = FinanceRefundRecord::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php

@@ -142,7 +142,7 @@
 		{
 			$data = FinanceReturnedMoney::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/finance/FinanceReturnedRecordLogic.php

@@ -175,7 +175,7 @@
 		{
 			$data = FinanceReturnedRecord::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/marketing/MarketingBidEvaluationLogic.php

@@ -193,7 +193,7 @@
 		{
 			$data = MarketingBidEvaluation::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/marketing/MarketingContractLogic.php

@@ -225,7 +225,7 @@
 		{
 			$data = MarketingContract::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php

@@ -187,7 +187,7 @@
 		{
 			$data = MarketingContract::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/marketing/MarketingSupplementaryAgreementLogic.php

@@ -184,7 +184,7 @@
 		{
 			$data = MarketingContract::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/material/MaterialPurchaseRequestLogic.php

@@ -174,7 +174,7 @@
 		{
 			$data = MaterialPurchaseRequest::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectCostAdjustmentLogic.php

@@ -15,11 +15,11 @@
 	namespace app\adminapi\logic\project;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\auth\Admin;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectCostAdjustment;
-use app\common\logic\BaseLogic;
 	use think\facade\Db;
 	
 	
@@ -126,10 +126,11 @@ class ProjectCostAdjustmentLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = ProjectCostAdjustment::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectCostBudgetLogic.php

@@ -15,12 +15,12 @@
 	namespace app\adminapi\logic\project;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\dept\Dept;
 	use app\common\model\dept\Orgs;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectCostBudget;
-use app\common\logic\BaseLogic;
 	use app\common\model\project\ProjectCostBudgetDetail;
 	use think\facade\Db;
 	
@@ -53,8 +53,7 @@ class ProjectCostBudgetLogic extends BaseLogic
 					'remark' => $params['remark'] ?? '',
 					'annex' => $params['annex'] ? json_encode($params['annex']) : null,
 				]);
-	        foreach ($params['cost_budget_detail'] as $item)
-	        {
+				foreach ($params['cost_budget_detail'] as $item) {
 					ProjectCostBudgetDetail::create([
 						'project_id' => $params['project_id'],
 						'cost_budget_id' => $res->id,
@@ -94,8 +93,7 @@ class ProjectCostBudgetLogic extends BaseLogic
 					'remark' => $params['remark'] ?? '',
 					'annex' => $params['annex'] ? json_encode($params['annex']) : null,
 				]);
-	        foreach ($params['cost_budget_detail'] as $item)
-	        {
+				foreach ($params['cost_budget_detail'] as $item) {
 					if (isset($item['id']) && $item['id'] != '') {
 						ProjectCostBudgetDetail::where('id', $item['id'])->update([
 							'project_id' => $params['project_id'],
@@ -163,10 +161,11 @@ class ProjectCostBudgetLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = ProjectCostBudget::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectEquipmentBudgetLogic.php

@@ -15,12 +15,12 @@
 	namespace app\adminapi\logic\project;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\dept\Dept;
 	use app\common\model\dept\Orgs;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectEquipmentBudget;
-use app\common\logic\BaseLogic;
 	use app\common\model\project\ProjectEquipmentBudgetDetail;
 	use think\facade\Db;
 	
@@ -53,8 +53,7 @@ class ProjectEquipmentBudgetLogic extends BaseLogic
 					'remark' => $params['remark'] ?? '',
 					'annex' => $params['annex'] ? json_encode($params['annex']) : null,
 				]);
-	        foreach ($params['equipment_budget_detail'] as $item)
-	        {
+				foreach ($params['equipment_budget_detail'] as $item) {
 					ProjectEquipmentBudgetDetail::create([
 						'project_id' => $params['project_id'],
 						'equipment_budget_id' => $res->id,
@@ -96,8 +95,7 @@ class ProjectEquipmentBudgetLogic extends BaseLogic
 					'remark' => $params['remark'] ?? '',
 					'annex' => $params['annex'] ? json_encode($params['annex']) : null,
 				]);
-	        foreach ($params['equipment_budget_detail'] as $item)
-	        {
+				foreach ($params['equipment_budget_detail'] as $item) {
 					if (isset($item['id']) && $item['id'] != '') {
 						ProjectEquipmentBudgetDetail::where('id', $item['id'])->update([
 							'project_id' => $params['project_id'],
@@ -171,10 +169,11 @@ class ProjectEquipmentBudgetLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = ProjectEquipmentBudget::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectExpenseReimbursementLogic.php

@@ -15,12 +15,12 @@
 	namespace app\adminapi\logic\project;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\bank\BankAccount;
 	use app\common\model\dict\DictData;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectExpenseReimbursement;
-use app\common\logic\BaseLogic;
 	use app\common\model\project\ProjectExpenseReimbursementDetail;
 	use app\common\model\project\ProjectExpenseReimbursementInvoiceDetail;
 	use app\common\model\project\ProjectLoanApply;
@@ -231,10 +231,11 @@ class ProjectExpenseReimbursementLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = ProjectExpenseReimbursement::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectLaborBudgetLogic.php

@@ -14,12 +14,12 @@
 	
 	namespace app\adminapi\logic\project;
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\dept\Dept;
 	use app\common\model\dept\Orgs;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectLaborBudget;
-use app\common\logic\BaseLogic;
 	use app\common\model\project\ProjectLaborBudgetDetail;
 	use think\facade\Db;
 	
@@ -52,8 +52,7 @@ class ProjectLaborBudgetLogic extends BaseLogic
 					'remark' => $params['remark'] ?? '',
 					'annex' => $params['annex'] ? json_encode($params['annex']) : null,
 				]);
-	        foreach ($params['labor_budget_detail'] as $item)
-	        {
+				foreach ($params['labor_budget_detail'] as $item) {
 					ProjectLaborBudgetDetail::create([
 						'project_id' => $params['project_id'],
 						'labor_budget_id' => $res->id,
@@ -95,8 +94,7 @@ class ProjectLaborBudgetLogic extends BaseLogic
 					'annex' => $params['annex'] ? json_encode($params['annex']) : null,
 					'update_time' => time(),
 				]);
-	        foreach ($params['labor_budget_detail'] as $item)
-	        {
+				foreach ($params['labor_budget_detail'] as $item) {
 					if (isset($item['id']) && $item['id'] != '') {
 						ProjectLaborBudgetDetail::where('id', $item['id'])->update([
 							'project_id' => $params['project_id'],
@@ -167,10 +165,11 @@ class ProjectLaborBudgetLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = ProjectLaborBudget::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectLoanApplyLogic.php

@@ -15,11 +15,11 @@
 	namespace app\adminapi\logic\project;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\bank\BankAccount;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectLoanApply;
-use app\common\logic\BaseLogic;
 	use think\facade\Db;
 	
 	
@@ -133,10 +133,11 @@ class ProjectLoanApplyLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = ProjectLoanApply::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectMaterialBudgetLogic.php

@@ -173,7 +173,7 @@
 		{
 			$data = ProjectMaterialBudget::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectSettlementLogic.php

@@ -141,7 +141,7 @@
 		{
 			$data = ProjectSettlement::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectSubcontractSettlementLogic.php

@@ -142,7 +142,7 @@
 		{
 			$data = ProjectSubcontractSettlement::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectSubpackageBudgetLogic.php

@@ -180,7 +180,7 @@
 		{
 			$data = ProjectSubpackageBudget::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectTotalBudgetLogic.php

@@ -168,7 +168,7 @@
 		{
 			$data = ProjectTotalBudget::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-			if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectTravelReimbursementLogic.php

@@ -15,6 +15,7 @@
 	namespace app\adminapi\logic\project;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\auth\Admin;
 	use app\common\model\bank\BankAccount;
 	use app\common\model\dict\DictData;
@@ -23,7 +24,6 @@ use app\common\model\project\Project;
 	use app\common\model\project\ProjectLoanApply;
 	use app\common\model\project\ProjectManagerAppointment;
 	use app\common\model\project\ProjectTravelReimbursement;
-use app\common\logic\BaseLogic;
 	use app\common\model\project\ProjectTravelReimbursementDetail;
 	use app\common\model\project\ProjectTravelReimbursementInvoiceDetail;
 	use app\common\model\project\ProjectTripApply;
@@ -263,10 +263,11 @@ class ProjectTravelReimbursementLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = ProjectTravelReimbursement::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}

app/adminapi/logic/project/ProjectTripApplyLogic.php

@@ -15,12 +15,12 @@
 	namespace app\adminapi\logic\project;
 	
 	
+	use app\common\logic\BaseLogic;
 	use app\common\model\auth\Admin;
 	use app\common\model\oa\FlowApprove;
 	use app\common\model\project\Project;
 	use app\common\model\project\ProjectManagerAppointment;
 	use app\common\model\project\ProjectTripApply;
-use app\common\logic\BaseLogic;
 	use think\facade\Db;
 	
 	
@@ -141,10 +141,11 @@ class ProjectTripApplyLogic extends BaseLogic
 			return $data->toArray();
 		}
 		
-	public static function approve($params,$admin_id): bool{
+		public static function approve($params, $admin_id): bool
+		{
 			$data = ProjectTripApply::where('id', $params['id'])->findOrEmpty();
 			$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
-		if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){
+			if ((!empty($data['approve_id']) && $approve_data['check_status'] != 3) || (!empty($data['approve_id']) && $approve_data['check_status'] != 4)) {
 				self::setError('当前内容存在审核信息，请勿重复提交');
 				return false;
 			}