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

Merge branch 'develop'

Browse Source
This commit is contained in:
mzl
2025-10-12 17:10:14 +08:00
parent 3a7449e2e9
commit 89d633389c
43 changed files with 4173 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/controller/ApprovalRecordsController.php
+2 -2
View File
@@ -36,7 +36,7 @@ class ApprovalRecordsController extends BaseController
'biz_id' => $record['instance']['biz_id'],
'biz_desc' => '备货单【'.$record['instance']['bizInfo']['order_no'].'】',
'biz_type' => $record['instance']['flow_type'],
'biz_type' => $record['instance']['biz_type'],
'initiator_name' => $record['instance']['initiator']['name'],
'initiator_avatar' => $record['instance']['initiator']['avatar'],
@@ -113,7 +113,7 @@ class ApprovalRecordsController extends BaseController
'biz_id' => $record['instance']['biz_id'],
'biz_desc' => '业务单号【'.$record['instance']['bizInfo']['order_no'].'】',
'biz_type' => $record['instance']['flow_type'],
'biz_type' => $record['instance']['biz_type'],
'flow_type' => $record['instance']['flow_type'],
'initiator_name' => $record['instance']['initiator']['name'],
app/admin/controller/StockOrdersController.php
+1 -1
View File
@@ -38,7 +38,7 @@ class StockOrdersController extends BaseController
if (isset($data['id'])) {
$appro = new \app\common\utils\approval\service\ApprovalFlowService();
$appro = $appro->getBriefStatusByBiz($data['id'], null, 'name');
$map = ['processing'=>'审批中','pending'=>'审批中','approved'=>'已通过','rejected'=>'已拒绝','revoked'=>'已撤回'];
$map = ['processing'=>'审批中','pending'=>'审批中','approved'=>'已通过','rejected'=>'已拒绝','revoked'=>'已撤回','voided'=>'已作废'];
if ($appro) {
$data['appro_status'] = [
'status' => $appro['status'],
app/admin/controller/UserGroupController.php
+61
View File
@@ -0,0 +1,61 @@
<?php
namespace app\admin\controller;
use app\common\controller\BaseController;
use app\common\traits\crud\CrudControllerTrait;
use app\common\service\UserGroupService;
class UserGroupController extends BaseController
{
use CrudControllerTrait;
protected $service;
public function __construct()
{
$this->service = new UserGroupService();
}
/**
* 列表页数据格式化
*
* @param array $data
* @return array
*/
protected function indexFormat($data)
{
if (isset($data['records']) && count($data['records']) > 0) {
foreach ($data['records'] as &$record) {
$result = [
'id' => $record['id'],
'title' => $record['title'],
'scenario_code' => $record['scenario_code'],
'leader_id' => 0,
'leader_name' => '',
'sort' => $record['sort'],
'status' => $record['status'],
'created_at' => date('Y-m-d H:i:s', $record['created_at']),
'updated_at' => date('Y-m-d H:i:s', $record['updated_at'])
];
if (isset($record['groupMembers']) && count($record['groupMembers']) > 0) {
foreach ($record['groupMembers'] as $member) {
if ($member['user'] !== null) {
$result['user'][] = [
'id' => $member['user']['id'],
'name' => $member['user']['name'],
'is_leader' => $member['is_leader'],
];
if ($member['is_leader'] === 1) {
$result['leader_id'] = $member['user']['id'];
$result['leader_name'] = $member['user']['name'];
}
}
}
}
$record = $result;
}
unset($record);
}
return $data;
}
}
app/admin/controller/UserGroupMembersController.php
+33
View File
@@ -0,0 +1,33 @@
<?php
namespace app\admin\controller;
use app\common\controller\BaseController;
use app\common\traits\crud\CrudControllerTrait;
use app\common\service\UserGroupMembersService;
class UserGroupMembersController extends BaseController
{
use CrudControllerTrait;
protected $service;
public function __construct()
{
$this->service = new UserGroupMembersService();
}
/**
* 列表页数据格式化
*
* @param array $data
* @return array
*/
// protected function indexFormat($data)
// {
// if (isset($data['created_at']))
// $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
// if (isset($data['updated_at']))
// $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
// return $data;
// }
}