diff --git a/spug_web/src/pages/schedule/Table.js b/spug_web/src/pages/schedule/Table.js
index ea96882..a23777c 100644
--- a/spug_web/src/pages/schedule/Table.js
+++ b/spug_web/src/pages/schedule/Table.js
@@ -1,6 +1,6 @@
import React from 'react';
import { observer } from 'mobx-react';
-import { Table, Divider, Modal, Tag, message } from 'antd';
+import { Table, Divider, Modal, Tag, Dropdown, Icon, Menu, message } from 'antd';
import ComForm from './Form';
import http from 'libs/http';
import store from './store';
@@ -14,6 +14,18 @@ class ComTable extends React.Component {
colors = ['green', 'orange', 'red'];
+ moreMenus = (info) => (
+
+ );
+
columns = [{
title: '序号',
key: 'series',
@@ -29,7 +41,11 @@ class ComTable extends React.Component {
title: '最新状态',
render: info => {
if (info.is_active) {
- return {info['latest_status_alias']}
+ if (info['latest_status_alias']) {
+ return {info['latest_status_alias']}
+ } else {
+ return 待调度
+ }
} else {
return 未激活
}
@@ -43,13 +59,18 @@ class ComTable extends React.Component {
ellipsis: true
}, {
title: '操作',
+ width: 180,
render: info => (
- this.handleActive(info)}>{info.is_active ? '禁用' : '激活'}
+ store.showForm(info)}>详情
store.showForm(info)}>编辑
- this.handleDelete(info)}>删除
+ this.moreMenus(info)} trigger={['click']}>
+
+ 更多
+
+
)
}];
@@ -85,10 +106,12 @@ class ComTable extends React.Component {
render() {
let data = store.records;
if (store.f_status !== undefined) {
- if (store.f_status === -2) {
+ if (store.f_status === -3) {
data = data.filter(item => !item['is_active'])
- } else if (store.f_status === -1) {
+ } else if (store.f_status === -2) {
data = data.filter(item => item['is_active'])
+ } else if (store.f_status === -1) {
+ data = data.filter(item => item['is_active'] && !item['latest_status_alias'])
} else {
data = data.filter(item => item['latest_status'] === store.f_status)
}
diff --git a/spug_web/src/pages/schedule/index.js b/spug_web/src/pages/schedule/index.js
index 4f9b772..abcfc43 100644
--- a/spug_web/src/pages/schedule/index.js
+++ b/spug_web/src/pages/schedule/index.js
@@ -11,8 +11,9 @@ export default observer(function () {