pdkj
/
store-manage
generated from liutk/owl-admin-base
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

admin check_status map

main
panliang 2024-05-04 08:41:28 +08:00
parent db7395fe36
commit adc8cfcb9c
9 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Admin/Controllers/AgreementController.php
View File

@ -108,7 +108,7 @@ class AgreementController extends AdminController
['label' => __('agreement.employee_id'), 'content' => '${employee.name}'],
['label' => __('agreement.store_id'), 'content' => '${store.title}'],
['label' => __('agreement.created_at'), 'content' => '${created_at}'],
['label' => __('agreement.remarks'), 'content' => '${remarks}', 'span' => 3],
['label' => __('agreement.remarks'), 'content' => '${remarks}', 'span' => 2],
['label' => __('agreement.images'), 'content' => amisMake()->Images()->name('images')->enlargeAble(), 'span' => 3],
['label' => __('workflow_log.check_status'), 'content' => amisMake()->Mapping()->name('workflow.check_status')->map(CheckStatus::options())],
['label' => __('workflow_log.checked_at'), 'content' => '${workflow.checked_at}'],

4
app/Admin/Services/AgreementService.php
View File

@ -47,10 +47,10 @@ class AgreementService extends BaseService
if ($user->can('admin.agreement.view')) {
array_push($actions, 'view');
}
if ($user->can('admin.agreement.update') && $model->canUpdate()) {
if ($user->can('admin.agreement.update') && !in_array($model->workflow->check_status, [CheckStatus::Processing])) {
array_push($actions, 'edit');
}
if ($user->can('admin.agreement.delete')) {
if ($user->can('admin.agreement.delete') && !in_array($model->workflow->check_status, [CheckStatus::Processing])) {
array_push($actions, 'delete');
}
if ($user->can('admin.agreement.download') && in_array($model->workflow->check_status, [CheckStatus::Success])) {

5
app/Admin/Services/EmployeePromotionService.php
View File

@ -54,7 +54,7 @@ class EmployeePromotionService extends BaseService
if ($user->can('admin.hr.promotion.update') && !in_array($model->promotion_status, [PromotionStatus::Processing])) {
array_push($actions, 'edit');
}
if ($user->can('admin.hr.promotion.delete') && !in_array($model->promotion_status, [PromotionStatus::Processing, PromotionStatus::Fail])) {
if ($user->can('admin.hr.promotion.delete') && !in_array($model->promotion_status, [PromotionStatus::Processing])) {
array_push($actions, 'delete');
}
if (in_array($model->promotion_status, [PromotionStatus::Processing])) {
@ -174,9 +174,6 @@ class EmployeePromotionService extends BaseService
{
$list = $this->query()->with(['workflow'])->whereIn('id', explode(',', $ids))->get();
foreach ($list as $item) {
if (!$item->canUpdate()) {
throw new RuntimeException($item->promotion_status->text() . ', 无法删除');
}
$item->delete();
}
return true;

2
app/Admin/Services/EmployeeSignRepairService.php
View File

@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
use Slowlyo\OwlAdmin\Admin;
use App\Enums\CheckStatus;
use Slowlyo\OwlAdmin\Models\AdminUser;
use App\Models\AdminUser;
use App\Exceptions\RuntimeException;
class EmployeeSignRepairService extends BaseService

30
app/Enums/CheckStatus.php
View File

@ -28,15 +28,27 @@ enum CheckStatus: int
*/
case Cancel = 5;
public static function options(): array
public static function options($index = 1): array
{
return [
self::None->value => '待提审',
self::Processing->value => '审核中',
self::Success->value => '已通过',
self::Fail->value => '已拒绝',
// self::Cancel->value => '已取消',
$maps = [
// 申请人看到的状态
1 => [
self::None->value => '待提审',
self::Processing->value => '审核中',
self::Success->value => '已通过',
self::Fail->value => '未通过',
// self::Cancel->value => '已取消',
],
// 审核人看到的状态
2 => [
self::None->value => '未开始',
self::Processing->value => '待审核',
self::Success->value => '已通过',
self::Fail->value => '未通过',
// self::Cancel->value => '已取消',
]
];
return data_get($maps, $index);
}
public static function labelMap(): array
@ -50,8 +62,8 @@ enum CheckStatus: int
];
}
public function text()
public function text($index = 1)
{
return data_get(self::options(), $this->value);
return data_get(self::options($index), $this->value);
}
}

4
app/Enums/PromotionStatus.php
View File

@ -34,8 +34,8 @@ enum PromotionStatus: int
self::Employee->value => '待补充',
self::Invitor->value => '待推荐',
self::Processing->value => '审核中',
self::Success->value => '审核通过',
self::Fail->value => '审核不通过',
self::Success->value => '已通过',
self::Fail->value => '未通过',
];
}

2
app/Models/Employee.php
View File

@ -11,7 +11,7 @@ use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Model;
use Laravel\Sanctum\HasApiTokens;
use Slowlyo\OwlAdmin\Models\AdminUser;
use App\Models\AdminUser;
use App\Enums\UserRole;
use Illuminate\Database\Eloquent\Builder;

2
app/Traits/HasCheckActions.php
View File

@ -77,7 +77,7 @@ trait HasCheckActions
amis()->TableColumn()->name('batch_id')->label(__('workflow_log.batch_id')),
amis()->TableColumn()->name('check_name')->label(__('workflow_log.check_name')),
amis()->TableColumn()->name('check_user.name')->label(__('workflow_log.check_user_id')),
amis()->TableColumn()->name('check_status')->label(__('workflow_log.check_status'))->set('type', 'mapping')->map(CheckStatus::options()),
amis()->TableColumn()->name('check_status')->label(__('workflow_log.check_status'))->set('type', 'mapping')->map(CheckStatus::options(2)),
amis()->TableColumn()->name('checked_at')->label(__('workflow_log.checked_at')),
amis()->TableColumn()->name('remarks')->label(__('workflow_log.remarks')),
])->itemActions([

2
lang/zh_CN/agreement.php
View File

@ -9,5 +9,5 @@ return [
'employee_id' => '上传人',
'images' => '合同图片',
'remarks' => '备注',
'store_id' => '合同',
'store_id' => '门店',
];