收汇附件名称
This commit is contained in:
@@ -5,6 +5,7 @@ use app\common\controller\BaseController;
|
|||||||
use app\common\model\Country;
|
use app\common\model\Country;
|
||||||
use app\common\model\SysAccount;
|
use app\common\model\SysAccount;
|
||||||
use app\common\model\SysCurrency;
|
use app\common\model\SysCurrency;
|
||||||
|
use app\common\service\OssService;
|
||||||
use app\common\traits\crud\CrudControllerTrait;
|
use app\common\traits\crud\CrudControllerTrait;
|
||||||
use app\common\service\FinReceiptService;
|
use app\common\service\FinReceiptService;
|
||||||
|
|
||||||
@@ -41,6 +42,8 @@ class FinReceiptController extends BaseController
|
|||||||
$data['country_name'] = Country::where('id', $data['currency_id'])->first()->cn_addr;
|
$data['country_name'] = Country::where('id', $data['currency_id'])->first()->cn_addr;
|
||||||
if (isset($data['currency_id'])) //付款币种
|
if (isset($data['currency_id'])) //付款币种
|
||||||
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->first()->currency_name;
|
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->first()->currency_name;
|
||||||
|
if (isset($data['fx_receipt_file']))
|
||||||
|
$data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,6 +69,8 @@ class FinReceiptController extends BaseController
|
|||||||
$data['country_name'] = Country::where('id', $data['currency_id'])->first()->cn_addr;
|
$data['country_name'] = Country::where('id', $data['currency_id'])->first()->cn_addr;
|
||||||
if (isset($data['currency_id'])) //付款币种
|
if (isset($data['currency_id'])) //付款币种
|
||||||
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->first()->currency_name;
|
$data['currency_name'] = SysCurrency::where('id', $data['currency_id'])->first()->currency_name;
|
||||||
|
if (isset($data['fx_receipt_file']))
|
||||||
|
$data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -40,7 +40,7 @@ class FinReceipt extends Model
|
|||||||
/**
|
/**
|
||||||
* 允许自动填充模型字段
|
* 允许自动填充模型字段
|
||||||
*/
|
*/
|
||||||
protected $fillable = ['id', 'receipt_no', 'payment_apply_id', 'country_id', 'remitter', 'account_id', 'currency_id', 'amount', 'discount_amount', 'total_amount_cny', 'exchange_rate', 'arrived_at', 'received_at', 'voucher_no', 'fx_receipt_file', 'is_domestic_return', 'created_by', 'updated_by', 'created_at', 'updated_at'];
|
protected $fillable = ['id', 'receipt_no', 'payment_apply_id', 'country_id', 'remitter', 'account_id', 'currency_id', 'amount', 'discount_amount', 'total_amount_cny', 'exchange_rate', 'arrived_at', 'received_at', 'voucher_no', 'fx_receipt_file', 'fx_receipt_file_name', 'is_domestic_return', 'created_by', 'updated_by', 'created_at', 'updated_at'];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 不允许自动填充模型字段
|
* 不允许自动填充模型字段
|
||||||
|
|||||||
Reference in New Issue
Block a user