diff --git a/app/adminapi/validate/quotation/QuotationValidate.php b/app/adminapi/validate/quotation/QuotationValidate.php index 2a2da14a2..e711372c0 100644 --- a/app/adminapi/validate/quotation/QuotationValidate.php +++ b/app/adminapi/validate/quotation/QuotationValidate.php @@ -149,6 +149,8 @@ class QuotationValidate extends BaseValidate public function checkQuotationDetail($value,$rule,$data): bool|string { + halt(222); + $quotation_detail = json_decode($value,true); if(empty($quotation_detail) || !is_array($quotation_detail)){ return '报价明细数据格式错误'; diff --git a/app/common/model/project/Project.php b/app/common/model/project/Project.php index 71b32ad9e..33fa5f599 100644 --- a/app/common/model/project/Project.php +++ b/app/common/model/project/Project.php @@ -46,13 +46,15 @@ class Project extends BaseModel public function getBiddingMethodTextAttr($value,$data) { $dictData = DictData::where('type_value','bidding_method')->column('name','value'); - return empty($data['bidding_method']) ? '' : $dictData[$data['bidding_method']]; + $dictData[0] =''; + return $dictData[$data['bidding_method']]; } public function getRelationshipTextAttr($value,$data) { $dictData = DictData::where('type_value','relationship')->column('name','value'); - return empty($data['relationship']) ? '' : $dictData[$data['relationship']]; + $dictData[0] =''; + return $dictData[$data['relationship']]; } public function getInformationSourcesTextAttr($value,$data) @@ -64,43 +66,50 @@ class Project extends BaseModel public function getConstructionFundsSourcesTextAttr($value,$data) { $dictData = DictData::where('type_value','construction_funds_sources')->column('name','value'); - return empty($data['construction_funds_sources']) ? '' : $dictData[$data['construction_funds_sources']]; + $dictData[0] =''; + return $dictData[$data['construction_funds_sources']]; } public function getConstructionFinancialStatusTextAttr($value,$data) { $dictData = DictData::where('type_value','construction_financial_status')->column('name','value'); - return empty($data['construction_financial_status']) ? '' : $dictData[$data['construction_financial_status']]; + $dictData[0] =''; + return $dictData[$data['construction_financial_status']]; } public function getConstructionRecognitionTextAttr($value,$data) { $dictData = DictData::where('type_value','construction_recognition')->column('name','value'); - return empty($data['construction_recognition']) ? '' : $dictData[$data['construction_recognition']]; + $dictData[0] =''; + return $dictData[$data['construction_recognition']]; } public function getMyConstructionRecognitionTextAttr($value,$data) { $dictData = DictData::where('type_value','my_construction_recognition')->column('name','value'); - return empty($data['my_construction_recognition']) ? '' : $dictData[$data['my_construction_recognition']]; + $dictData[0] =''; + return $dictData[$data['my_construction_recognition']]; } public function getStrategicSignificanceTextAttr($value,$data) { $dictData = DictData::where('type_value','strategic_significance')->column('name','value'); - return empty($data['strategic_significance']) ? '' : $dictData[$data['strategic_significance']]; + $dictData[0] =''; + return $dictData[$data['strategic_significance']]; } public function getIndustryTextAttr($value,$data) { $dictData = DictData::where('type_value','industry')->column('name','value'); - return empty($data['industry']) ? '' : $dictData[$data['industry']]; + $dictData[0] =''; + return $dictData[$data['industry']]; } public function getUnitNatureTextAttr($value,$data) { $dictData = DictData::where('type_value','unit_nature')->column('name','value'); - return empty($data['unit_nature']) ? '' : $dictData[$data['unit_nature']]; + $dictData[0] =''; + return $dictData[$data['unit_nature']]; } public function getBiddingTimeAttr($value): string