```
feat(shopro_huifu): 完善进件功能支持编辑模式 - 修改Onboard控制器中的saveDraft方法,增加onboardId参数以支持编辑现有记录 - 在前端模板中优化用户和角色显示,添加条件渲染和样式类 - 新增resolveRoleLabel方法用于解析角色标签,优化角色标签显示逻辑 - 调整表单数据处理流程,确保编辑模式下正确获取用户和角色信息 - 增强数据验证逻辑,防止非法操作和数据不一致问题 ```
这个提交包含在:
@@ -506,6 +506,27 @@ class HuifuOnboardAdminView
|
||||
];
|
||||
}
|
||||
|
||||
protected static function resolveRoleLabel($roleType, $roleRefId, array $roles = [])
|
||||
{
|
||||
foreach ($roles as $role) {
|
||||
if ($role['role_type'] === $roleType && intval($role['role_ref_id']) === intval($roleRefId)) {
|
||||
return $role['role_label'];
|
||||
}
|
||||
}
|
||||
if ($roleType === 'promoter') {
|
||||
return '分销商';
|
||||
}
|
||||
if ($roleType === 'regional_agent') {
|
||||
$agent = Db::name('shopro_regional_agent')->where('id', $roleRefId)->find();
|
||||
$label = '区域公司';
|
||||
if ($agent && !empty($agent['area_name'])) {
|
||||
$label .= '(' . $agent['area_name'] . ')';
|
||||
}
|
||||
return $label;
|
||||
}
|
||||
return $roleType;
|
||||
}
|
||||
|
||||
public static function formDataFromRow($row)
|
||||
{
|
||||
$data = is_array($row) ? $row : $row->toArray();
|
||||
@@ -516,22 +537,20 @@ class HuifuOnboardAdminView
|
||||
$form[$field] = self::fullUrl($form[$field]);
|
||||
}
|
||||
}
|
||||
$user = self::fetchUser($data['user_id'] ?? 0);
|
||||
$roles = self::listRolesForUser($data['user_id'] ?? 0);
|
||||
$roleLabel = '';
|
||||
foreach ($roles as $role) {
|
||||
if ($role['role_type'] === ($data['role_type'] ?? '') && intval($role['role_ref_id']) === intval($data['role_ref_id'] ?? 0)) {
|
||||
$roleLabel = $role['role_label'];
|
||||
break;
|
||||
}
|
||||
}
|
||||
$userId = intval($data['user_id'] ?? 0);
|
||||
$user = self::fetchUser($userId);
|
||||
$userOption = self::formatUserOption($user);
|
||||
$roles = self::listRolesForUser($userId);
|
||||
$roleType = (string) ($data['role_type'] ?? '');
|
||||
$roleRefId = intval($data['role_ref_id'] ?? 0);
|
||||
$roleLabel = self::resolveRoleLabel($roleType, $roleRefId, $roles);
|
||||
|
||||
return [
|
||||
'onboard_id' => intval($data['id'] ?? 0),
|
||||
'user_id' => intval($data['user_id'] ?? 0),
|
||||
'user_label' => trim(($user['nickname'] ?? '') . ' (' . ($user['mobile'] ?? $data['user_id']) . ')'),
|
||||
'role_type' => $data['role_type'] ?? '',
|
||||
'role_ref_id' => intval($data['role_ref_id'] ?? 0),
|
||||
'user_id' => $userId,
|
||||
'user_label' => $userOption['option_label'] ?? trim(($user['nickname'] ?? '') . ' (' . ($user['mobile'] ?? $userId) . ')'),
|
||||
'role_type' => $roleType,
|
||||
'role_ref_id' => $roleRefId,
|
||||
'role_label' => $roleLabel,
|
||||
'onboard_status' => $data['onboard_status'] ?? '',
|
||||
'form' => $form,
|
||||
|
||||
在新工单中引用
屏蔽一个用户