From b7ad755ca7b5aa65deb23d7e63ee1fa0da201c83 Mon Sep 17 00:00:00 2001 From: shengchanzhe <179998674@qq.com> Date: Sun, 14 Jan 2024 12:26:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0quotation=5Fdetail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/adminapi/logic/bid/BidDocumentExaminationLogic.php | 2 +- app/adminapi/logic/quotation/QuotationLogic.php | 2 +- app/adminapi/validate/bid/BidDocumentExaminationValidate.php | 2 +- app/adminapi/validate/quotation/QuotationValidate.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/adminapi/logic/bid/BidDocumentExaminationLogic.php b/app/adminapi/logic/bid/BidDocumentExaminationLogic.php index 0b6ed1727..1f5b4471f 100644 --- a/app/adminapi/logic/bid/BidDocumentExaminationLogic.php +++ b/app/adminapi/logic/bid/BidDocumentExaminationLogic.php @@ -66,7 +66,7 @@ class BidDocumentExaminationLogic extends BaseLogic 'business_contract_deviation_annex' => !empty($params['business_contract_deviation_annex']) ? $params['business_contract_deviation_annex'] : null, ]); if(!empty($params['quotation_detail'])){ - $quotation_detail = json_decode($params['quotation_detail'],true); + $quotation_detail = $params['quotation_detail']; foreach ($quotation_detail as $item) { BidDocumentExaminationDetail::create([ diff --git a/app/adminapi/logic/quotation/QuotationLogic.php b/app/adminapi/logic/quotation/QuotationLogic.php index 15027b3d6..456b34e58 100644 --- a/app/adminapi/logic/quotation/QuotationLogic.php +++ b/app/adminapi/logic/quotation/QuotationLogic.php @@ -44,7 +44,7 @@ class QuotationLogic extends BaseLogic public static function add(array $params): bool { $amount_including_tax = 0; - $quotation_detail = json_decode($params['quotation_detail'],true); + $quotation_detail = $params['quotation_detail']; $tax_rate_dict = DictData::where('type_value','tax_rate')->column('name','value'); foreach($quotation_detail as &$v){ $amount_including_tax += $v['num'] * $v['tax_inclusive_price']; diff --git a/app/adminapi/validate/bid/BidDocumentExaminationValidate.php b/app/adminapi/validate/bid/BidDocumentExaminationValidate.php index 7ca715640..70176e2bd 100644 --- a/app/adminapi/validate/bid/BidDocumentExaminationValidate.php +++ b/app/adminapi/validate/bid/BidDocumentExaminationValidate.php @@ -162,7 +162,7 @@ class BidDocumentExaminationValidate extends BaseValidate public function checkQuotationDetail($value,$rule,$data): bool|string { - $quotation_detail = json_decode($value,true); + $quotation_detail = $value; if(empty($quotation_detail) || !is_array($quotation_detail)){ return '审查明细数据格式错误'; } diff --git a/app/adminapi/validate/quotation/QuotationValidate.php b/app/adminapi/validate/quotation/QuotationValidate.php index 2a2da14a2..adcbd95f4 100644 --- a/app/adminapi/validate/quotation/QuotationValidate.php +++ b/app/adminapi/validate/quotation/QuotationValidate.php @@ -149,7 +149,7 @@ class QuotationValidate extends BaseValidate public function checkQuotationDetail($value,$rule,$data): bool|string { - $quotation_detail = json_decode($value,true); + $quotation_detail = $value; if(empty($quotation_detail) || !is_array($quotation_detail)){ return '报价明细数据格式错误'; }