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

增加审批签名

Browse Source
This commit is contained in:
mzl
2025-09-11 16:52:10 +08:00
parent eb13146763
commit fe64299303
6 changed files with 64 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/crm/service/StockOrdersService.php
+37 -5
View File
@@ -14,6 +14,8 @@ use app\common\model\User;
use support\exception\BusinessException;
use support\Db;
use support\Model;
use app\admin\model\ApprovalInstances;
use app\admin\model\ApprovalRecords;
class StockOrdersService
{
@@ -225,8 +227,8 @@ class StockOrdersService
$data['approval_status'] = $data['approval_status'] == 1 ? 1 : 0;
// if ($data['is_final'] == 1) {
$data['pick_up_date'] = strtotime($data['pick_up_date']);
$data['collect_all_date'] = strtotime($data['collect_all_date']);
$data['pick_up_date'] = $data['pick_up_date'] ? strtotime($data['pick_up_date']) : 0;
$data['collect_all_date'] = $data['collect_all_date'] ? strtotime($data['collect_all_date']) : 0;
// }
return $data;
}
@@ -577,7 +579,7 @@ class StockOrdersService
$vehList[$v->unique_id] = $vehListItem + $mv;
}
// var_dump($item->moneyValues);
$mvs = [];
foreach ($item->moneyValues as $moneys) {
$mvs[$moneys->field] = [
@@ -588,7 +590,7 @@ class StockOrdersService
// 'currency_info' => SysCurrency::where('currency_code', $money->currency)->value('currency_symbol'),
];
}
// var_dump($mvs);
$accList = [];
foreach ($item->accounts as $k => $v) {
$accList[] = [
@@ -642,13 +644,40 @@ class StockOrdersService
// 'cif_total_amount' => $cifTotalAmount,
// 'cif_total_amount_symbol' => $cifTotalAmountSymbol,
// 'profit' => number_format($totalProfit, 2, '.', ''),
'currency_symbol' => $item->settlement_currency // 假设利润使用相同货币
'currency_symbol' => $item->settlement_currency,
'sign_imgs' => $this->queryAppro($item->id),
'contract_url' => (!empty($item->contract)) ? (new \app\common\service\OssService)->generatePrivateUrl($item->contract) : ''
];
// var_dump($veh);
return $veh;
}
public function queryAppro($bizId)
{
$instances = ApprovalInstances::where('biz_id', $bizId)->where('biz_type', 'stock_orders')->first();
if (!$instances) {
return [];
}
$records = ApprovalRecords::where('instance_id', $instances->id)->where('action', 'approve')->orderBy('step_index', 'asc')->pluck('approver_id')->toArray();
if (count($records) == 0) {
return [];
}
$signImg = User::whereIn('id', $records)->pluck('sign_img')->toArray();
if (count($signImg) == 0) {
return [];
}
$signImgs = [];
foreach ($signImg as $k => $v) {
$signImgs[$k] = (!empty($v))?(new \app\common\service\OssService)->generatePrivateUrl($v):'';
}
return $signImgs;
}
/**
* 打印数据
*/
@@ -735,6 +764,9 @@ class StockOrdersService
$data['eta_ship_date'] = strtotime($data['eta_ship_date']);
$data['latest_arrival_date'] = strtotime($data['latest_arrival_date']);
$data['approval_status'] = $data['approval_status'] == 1 ? 1 : 0;
$data['pick_up_date'] = $data['pick_up_date'] ? strtotime($data['pick_up_date']) : 0;
$data['collect_all_date'] = $data['collect_all_date'] ? strtotime($data['collect_all_date']) : 0;
return $data;
}