diff --git a/spug_api/apps/deploy/views.py b/spug_api/apps/deploy/views.py index 96ebb08..4298c91 100644 --- a/spug_api/apps/deploy/views.py +++ b/spug_api/apps/deploy/views.py @@ -36,6 +36,8 @@ class RequestView(View): app_host_ids=F('deploy__host_ids'), app_extend=F('deploy__extend'), rep_extra=F('repository__extra'), + do_by_user=F('do_by__nickname'), + approve_by_user=F('approve_by__nickname'), created_by_user=F('created_by__nickname')): tmp = item.to_dict() tmp['env_id'] = item.env_id @@ -49,6 +51,8 @@ class RequestView(View): tmp['app_host_ids'] = json.loads(item.app_host_ids) tmp['status_alias'] = item.get_status_display() tmp['created_by_user'] = item.created_by_user + tmp['approve_by_user'] = item.approve_by_user + tmp['do_by_user'] = item.do_by_user if item.app_extend == '1': tmp['visible_rollback'] = item.deploy_id not in counter counter[item.deploy_id] = True diff --git a/spug_web/src/pages/deploy/request/Table.js b/spug_web/src/pages/deploy/request/Table.js index aadd75d..6963827 100644 --- a/spug_web/src/pages/deploy/request/Table.js +++ b/spug_web/src/pages/deploy/request/Table.js @@ -77,6 +77,17 @@ function ComTable() { dataIndex: 'created_at', sorter: (a, b) => a['created_at'].localeCompare(b['created_at']), hide: true + }, { + title: '审核人', + dataIndex: 'approve_by_user', + hide: true + }, { + title: '审核时间', + dataIndex: 'approve_at' + }, { + title: '发布人', + dataIndex: 'do_by_user', + hide: true }, { title: '发布时间', dataIndex: 'do_at',