xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

收款记录创建与修改人

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-09-28 10:10:15 +08:00
parent a3a6cfefc0
commit 90cce108b0
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/controller/FinPaymentApplyController.php
+4 -4
View File
@@ -33,9 +33,9 @@ class FinPaymentApplyController extends BaseController
protected function indexFormat($data) protected function indexFormat($data)
{ {
if (isset($data['doc_user_id'])) //内勤 if (isset($data['doc_user_id'])) //内勤
$data['doc_user_name'] = User::where('id', $data['doc_user_id'])->first()->name; $data['doc_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';
if (isset($data['sales_user_id'])) //业务员 if (isset($data['sales_user_id'])) //业务员
$data['sales_user_name'] = User::where('id', $data['doc_user_id'])->first()->name; $data['sales_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';
if (isset($data['corp_id'])) //公司(渠道) if (isset($data['corp_id'])) //公司(渠道)
$data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->value('item_label')??''; $data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->value('item_label')??'';
if (isset($data['account_id'])) //收款账号 if (isset($data['account_id'])) //收款账号
@@ -76,9 +76,9 @@ class FinPaymentApplyController extends BaseController
protected function showFormat($data) protected function showFormat($data)
{ {
if (isset($data['doc_user_id'])) //内勤 if (isset($data['doc_user_id'])) //内勤
$data['doc_user_name'] = User::where('id', $data['doc_user_id'])->first()->name; $data['doc_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';
if (isset($data['sales_user_id'])) //业务员 if (isset($data['sales_user_id'])) //业务员
$data['sales_user_name'] = User::where('id', $data['doc_user_id'])->first()->name; $data['sales_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';
if (isset($data['corp_id'])) //公司(渠道) if (isset($data['corp_id'])) //公司(渠道)
$data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->value('item_label')??''; $data['corp_name'] = SysDictItem::where('id', $data['corp_id'])->value('item_label')??'';
if (isset($data['account_id'])) //收款账号 if (isset($data['account_id'])) //收款账号
app/common/controller/FinReceiptHisController.php
+11
View File
@@ -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\model\User;
use app\common\service\OssService; use app\common\service\OssService;
use app\common\traits\crud\CrudControllerTrait; use app\common\traits\crud\CrudControllerTrait;
use app\common\service\FinReceiptHisService; use app\common\service\FinReceiptHisService;
@@ -45,6 +46,11 @@ class FinReceiptHisController extends BaseController
$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'])) if (isset($data['fx_receipt_file']))
$data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']); $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
if (isset($data['created_by']))
$data['created_by'] = User::where('id', $data['created_by'])->value('name')??'';
if (isset($data['updated_by']))
$data['updated_by'] = User::where('id', $data['updated_by'])->value('name')??'';
return $data; return $data;
} }
@@ -72,6 +78,11 @@ class FinReceiptHisController extends BaseController
$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'])) if (isset($data['fx_receipt_file']))
$data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']); $data['fx_receipt_file_full'] = (new OssService)->generatePrivateUrl($data['fx_receipt_file']);
if (isset($data['created_by']))
$data['created_by'] = User::where('id', $data['created_by'])->value('name')??'';
if (isset($data['updated_by']))
$data['updated_by'] = User::where('id', $data['updated_by'])->value('name')??'';
return $data; return $data;
} }
} }