mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
weiz 2024-01-27 17:57:47 +08:00
parent 256e0bd053
commit e4aa11133b
16 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/model/bid/BidSecurityApply.php
View File

@ -43,6 +43,6 @@ class BidSecurityApply extends BaseModel
public function getPayTypeTextAttr($value,$data){
$dict = DictData::where('type_value','pay_type')->column('name','value');
return $dict[$data['pay_type']];
return !empty($data['pay_type']) ? $dict[$data['pay_type']] : '';
}
}

6
app/common/model/contract/Contract.php
View File

@ -34,18 +34,18 @@ class Contract extends BaseModel
public function getContractTypeTextAttr($value,$data): string
{
$dictData = DictData::where('type_value','contract_type')->column('name','value');
return $dictData[$data['contract_type']];
return !empty($data['contract_type']) ? $dictData[$data['contract_type']] : '';
}
public function getContractStatusTextAttr($value,$data): string
{
$dictData = DictData::where('type_value','contract_status')->column('name','value');
return $dictData[$data['contract_status']];
return !empty($data['contract_status']) ? $dictData[$data['contract_status']] : '';
}
public function getContractPricingMethodTextAttr($value,$data){
$dictData = DictData::where('type_value','contract_pricing_method')->column('name','value');
return $dictData[$data['contract_pricing_method']];
return !empty($data['contract_pricing_method']) ? $dictData[$data['contract_pricing_method']] : '';
}
public function getExpireAttr($value): string

2
app/common/model/contract/ContractNegotiation.php
View File

@ -47,7 +47,7 @@ class ContractNegotiation extends BaseModel
public function getNegotiationTypeTextAttr($value,$data){
$dict = DictData::where('type_value','negotiation_type')->column('name','value');
return $dict[$data['negotiation_type']];
return !empty($data['negotiation_type']) ? $dict[$data['negotiation_type']] : '';
}
}

6
app/common/model/contract/ProcurementContract.php
View File

@ -42,17 +42,17 @@ class ProcurementContract extends BaseModel
public function getContractTypeTextAttr($value,$data){
$dict = DictData::where('type_value','procurement_contract_type')->column('name','value');
return $dict[$data['contract_type']];
return !empty($data['contract_type']) ? $dict[$data['contract_type']] : '';
}
public function getPayTypeTextAttr($value,$data){
$dict = DictData::where('type_value','pay_type')->column('name','value');
return $dict[$data['pay_type']];
return !empty($data['pay_type']) ? $dict[$data['pay_type']] : '';
}
public function getAccountPeriodTextAttr($value,$data){
$dict = DictData::where('type_value','account_period')->column('name','value');
return $dict[$data['account_period']];
return !empty($data['account_period']) ? $dict[$data['account_period']] : '';
}
}

2
app/common/model/custom/CustomerDemand.php
View File

@ -34,7 +34,7 @@ class CustomerDemand extends BaseModel
public function getImportanceTextAttr($value,$data): string
{
$dictData = DictData::where('type_value','importance')->column('name','value');
return $dictData[$data['importance']];
return !empty($data['importance']) ? $dictData[$data['importance']] : '';
}
public function getRecordingTimeAttr($value): string

6
app/common/model/finance/FinanceInvoiceApply.php
View File

@ -42,17 +42,17 @@ class FinanceInvoiceApply extends BaseModel
public function getPeriodTextAttr($value,$data){
$dict = DictData::where('type_value','pay_period')->column('name','value');
return $dict[$data['period']];
return !empty($data['period']) ? $dict[$data['period']] : '';
}
public function getTaxRateTextAttr($value,$data){
$dict = DictData::where('type_value','tax_rate')->column('name','value');
return $dict[$data['tax_rate']];
return !empty($data['tax_rate']) ? $dict[$data['tax_rate']] : '';
}
public function getInvoiceTypeTextAttr($value,$data){
$dict = DictData::where('type_value','invoice_type')->column('name','value');
return $dict[$data['invoice_type']];
return !empty($data['invoice_type']) ? $dict[$data['invoice_type']] : '';
}
public function getMailingTimeAttr($value){

6
app/common/model/finance/FinancePaymentApply.php
View File

@ -43,17 +43,17 @@ class FinancePaymentApply extends BaseModel
public function getPaymentNatureTextAttr($value,$data){
$dict = DictData::where('type_value','payment_natrue')->column('name','value');
return $dict[$data['payment_nature']];
return !empty($data['payment_nature']) ? $dict[$data['payment_nature']] : '';
}
public function getPayTypeTextAttr($value,$data){
$dict = DictData::where('type_value','pay_type')->column('name','value');
return $dict[$data['pay_type']];
return !empty($data['pay_type']) ? $dict[$data['pay_type']] : '';
}
public function getInvoiceStatusTextAttr($value,$data){
$dict = DictData::where('type_value','invoice_status')->column('name','value');
return $dict[$data['invoice_status']];
return !empty($data['invoice_status']) ? $dict[$data['invoice_status']] : '';
}
public function getPayDateAttr($value): string

4
app/common/model/finance/FinancePaymentPlan.php
View File

@ -43,12 +43,12 @@ class FinancePaymentPlan extends BaseModel
public function getPeriodTextAttr($value,$data){
$dict = DictData::where('type_value','pay_period')->column('name','value');
return $dict[$data['period']];
return !empty($data['period']) ? $dict[$data['period']] : '';
}
public function getStatusTextAttr($value,$data){
$dict = DictData::where('type_value','pay_status')->column('name','value');
return $dict[$data['status']];
return !empty($data['status']) ? $dict[$data['status']] : '';
}
public function getPayDateAttr($value): string

4
app/common/model/finance/FinanceReceiptRecord.php
View File

@ -47,12 +47,12 @@ class FinanceReceiptRecord extends BaseModel
public function getInvoiceTypeTextAttr($value,$data){
$dict = DictData::where('type_value','invoice_type')->column('name','value');
return $dict[$data['invoice_type']];
return !empty($data['invoice_type']) ? $dict[$data['invoice_type']] : '';
}
public function getInvoiceTaxRateTextAttr($value,$data){
$dict = DictData::where('type_value','tax_rate')->column('name','value');
return $dict[$data['invoice_tax_rate']];
return !empty($data['invoice_tax_rate']) ? $dict[$data['invoice_tax_rate']] : '';
}
public function getContractTypeTextAttr($value,$data): string

2
app/common/model/finance/FinanceRefundApply.php
View File

@ -37,7 +37,7 @@ class FinanceRefundApply extends BaseModel
public function getRefundTypeTextAttr($value,$data){
$dict = DictData::where('type_value','refund_type')->column('name','value');
return $dict[$data['refund_type']];
return !empty($data['refund_type']) ? $dict[$data['refund_type']] : '';
}
public function getRefundDateAttr($value): string

2
app/common/model/finance/FinanceRefundRecord.php
View File

@ -48,6 +48,6 @@ class FinanceRefundRecord extends BaseModel
public function getRefundTypeTextAttr($value,$data){
$dict = DictData::where('type_value','refund_type')->column('name','value');
return $dict[$data['refund_type']];
return !empty($data['refund_type']) ? $dict[$data['refund_type']] : '';
}
}

4
app/common/model/finance/FinanceReturnedMoney.php
View File

@ -37,12 +37,12 @@ class FinanceReturnedMoney extends BaseModel
public function getPeriodTextAttr($value,$data){
$dict = DictData::where('type_value','pay_period')->column('name','value');
return $dict[$data['period']];
return !empty($data['period']) ? $dict[$data['period']] : '';
}
public function getReturnStatusTextAttr($value,$data){
$dict = DictData::where('type_value','return_status')->column('name','value');
return $dict[$data['return_status']];
return !empty($data['return_status']) ? $dict[$data['return_status']] : '';
}
public function getReturnDateAttr($value): string

6
app/common/model/finance/FinanceReturnedRecord.php
View File

@ -37,17 +37,17 @@ class FinanceReturnedRecord extends BaseModel
public function getCollectionTypeTextAttr($value,$data){
$dict = DictData::where('type_value','collection_type')->column('name','value');
return $dict[$data['collection_type']];
return !empty($data['collection_type']) ? $dict[$data['collection_type']] : '';
}
public function getInvoiceStatusTextAttr($value,$data){
$dict = DictData::where('type_value','invoice_status')->column('name','value');
return $dict[$data['invoice_status']];
return !empty($data['invoice_status']) ? $dict[$data['invoice_status']] : '';
}
public function getPayTypeTextAttr($value,$data){
$dict = DictData::where('type_value','pay_type')->column('name','value');
return $dict[$data['pay_type']];
return !empty($data['pay_type']) ? $dict[$data['pay_type']] : '';
}
public function getReturnDateAttr($value): string

2
app/common/model/project/Project.php
View File

@ -34,7 +34,7 @@ class Project extends BaseModel
public function getStatusTextAttr($value,$data)
{
$dictData = DictData::where('type_value','project_status')->column('name','value');
return $dictData[$data['status']];
return !empty($data['status']) ? $dictData[$data['status']] : '';
}
public function getProjectContentTextAttr($value,$data)

2
app/common/model/project/ProjectMaterialBudgetDetail.php
View File

@ -33,6 +33,6 @@ class ProjectMaterialBudgetDetail extends BaseModel
public function getBudgetTypeTextAttr($value,$data){
$dict = DictData::where('type_value','budget_type')->column('name','value');
return $dict[$data['budget_type']];
return !empty($data['budget_type']) ? $dict[$data['budget_type']] : '';
}
}

2
app/common/model/quotation/QuotationDetail.php
View File

@ -33,6 +33,6 @@ class QuotationDetail extends BaseModel
public function getTaxRateTextAttr($value,$data){
$dictData = DictData::where('type_value','tax_rate')->column('name','value');
return $dictData[$data['tax_rate']];
return !empty($data['tax_rate']) ? $dictData[$data['tax_rate']] : '';
}
}