diff --git a/app/admin/controller/order/AdminWithdrawOrder.php b/app/admin/controller/order/AdminWithdrawOrder.php index 2f04eb8..ff4d7cb 100644 --- a/app/admin/controller/order/AdminWithdrawOrder.php +++ b/app/admin/controller/order/AdminWithdrawOrder.php @@ -59,19 +59,15 @@ class AdminWithdrawOrder extends Backend ->order($order) ->paginate($limit); - $list = $res->items(); - foreach ($list as $idx => $item) { + $listArr = []; + foreach ($res->items() as $item) { $row = is_array($item) ? $item : $item->toArray(); - $canReview = $this->canReviewOrder($row) ? 1 : 0; - if (is_array($item)) { - $list[$idx]['can_review'] = $canReview; - } else { - $item->setAttr('can_review', $canReview); - } + $row['can_review'] = $this->canReviewOrder($row) ? 1 : 0; + $listArr[] = $row; } return $this->success('', [ - 'list' => $list, + 'list' => $listArr, 'total' => $res->total(), 'remark' => get_route_remark(), ]); @@ -229,6 +225,9 @@ class AdminWithdrawOrder extends Backend if (!$this->auth) { return false; } + if ($this->auth->isSuperAdmin()) { + return true; + } foreach ($this->buildPermissionRoutePaths('order/adminWithdrawOrder', 'review') as $routePath) { if ($this->auth->check($routePath)) { return true; diff --git a/web/src/views/backend/order/adminWithdrawOrder/index.vue b/web/src/views/backend/order/adminWithdrawOrder/index.vue index 3d06f6c..e7b93bf 100644 --- a/web/src/views/backend/order/adminWithdrawOrder/index.vue +++ b/web/src/views/backend/order/adminWithdrawOrder/index.vue @@ -46,6 +46,7 @@ import { onMounted, provide, reactive, ref, useTemplateRef } from 'vue' import { useI18n } from 'vue-i18n' import { baTableApi } from '/@/api/common' +import { auth } from '/@/utils/common' import TableHeader from '/@/components/table/header/index.vue' import Table from '/@/components/table/index.vue' import baTableClass from '/@/utils/baTable' @@ -78,7 +79,15 @@ const optButtons: OptButton[] = [ text: '', type: 'warning', icon: 'fa fa-check-square-o', - display: (row: TableRow) => Number(row.status) === 0 && Number((row as anyObj).can_review ?? 0) === 1, + display: (row: TableRow) => { + if (Number(row.status) !== 0) { + return false + } + if (auth('review')) { + return true + } + return Number((row as anyObj).can_review ?? 0) === 1 + }, click: (row: TableRow) => { baTable.form.operate = 'Review' baTable.form.operateIds = [String(row[baTable.table.pk!])] diff --git a/web/src/views/backend/order/adminWithdrawOrder/popupForm.vue b/web/src/views/backend/order/adminWithdrawOrder/popupForm.vue index a92b622..00e1432 100644 --- a/web/src/views/backend/order/adminWithdrawOrder/popupForm.vue +++ b/web/src/views/backend/order/adminWithdrawOrder/popupForm.vue @@ -13,7 +13,10 @@ -
+
, relationKey: string, padding-top: 8px; } + :deep(.el-form-item__content) { + flex: 1; + min-width: 0; + } + + :deep(.el-input), + :deep(.el-textarea) { + width: 100%; + } + .review-reject-hint { margin-bottom: 14px; }