Commit f85896b9 by end

修改

parent 1d16a4cb
No preview for this file type
...@@ -51,11 +51,6 @@ class EnrollManag extends React.Component { ...@@ -51,11 +51,6 @@ class EnrollManag extends React.Component {
key: "name", key: "name",
}, },
{ {
title: "上级部门",
dataIndex: "orgNames",
key: "orgNames",
},
{
title: "所在部门", title: "所在部门",
dataIndex: "orgName", dataIndex: "orgName",
key: "orgName", key: "orgName",
...@@ -77,60 +72,36 @@ class EnrollManag extends React.Component { ...@@ -77,60 +72,36 @@ class EnrollManag extends React.Component {
}, },
}, },
// { // {
// title: "报名花费", // title: intl.get("operate").d("操作"),
// dataIndex: "expenditure", // dataIndex: "auditResult",
// key: "expenditure", // key: "operation",
// render: text => { // render: (text, record) =>
// return text?text:"/"; // text === 1 ? (
// }, // <div>
// <Popconfirm
// title="确定通过审核?"
// onConfirm={() => this.handlePass(record.id)}
// >
// <a href="javascript:void(0)" style={{ color: "#00CCFF" }}>
// 通过
// </a>
// </Popconfirm>
// <Popconfirm
// title="确定不通过审核?"
// onConfirm={() => this.handleUnPass(record.id)}
// >
// <a
// href="javascript:void(0)"
// style={{ marginLeft: "10px", color: "#00CCFF" }}
// >
// 不通过
// </a>
// </Popconfirm>
// </div>
// ) : (
// ""
// ),
// }, // },
{
title: "审核结果",
dataIndex: "auditResult",
key: "auditResult",
render: text => {
return text === 1 ? (
<span>待审核</span>
) : text === 2 ? (
<span>审核通过</span>
) : text === 3 ? (
<span>审核不通过</span>
) : (
""
);
},
},
{
title: intl.get("operate").d("操作"),
dataIndex: "auditResult",
key: "operation",
render: (text, record) =>
text === 1 ? (
<div>
<Popconfirm
title="确定通过审核?"
onConfirm={() => this.handlePass(record.id)}
>
<a href="javascript:void(0)" style={{ color: "#00CCFF" }}>
通过
</a>
</Popconfirm>
<Popconfirm
title="确定不通过审核?"
onConfirm={() => this.handleUnPass(record.id)}
>
<a
href="javascript:void(0)"
style={{ marginLeft: "10px", color: "#00CCFF" }}
>
不通过
</a>
</Popconfirm>
</div>
) : (
""
),
},
]; ];
// 页数切换 // 页数切换
this.handlePageChange = this.handlePageChange.bind(this); this.handlePageChange = this.handlePageChange.bind(this);
...@@ -312,17 +283,6 @@ class EnrollManag extends React.Component { ...@@ -312,17 +283,6 @@ class EnrollManag extends React.Component {
<Spin spinning={this.state.loading}> <Spin spinning={this.state.loading}>
<div className={styles.comment}> <div className={styles.comment}>
<div style={{ marginBottom: 20, marginLeft: 20 }}> <div style={{ marginBottom: 20, marginLeft: 20 }}>
审核状态:
<Select
defaultValue=""
style={{ width: 120, marginRight: 40 }}
onChange={this.handleGetState}
>
<Option value="">全部</Option>
<Option value="1">待审核</Option>
<Option value="2">审核通过</Option>
<Option value="3">审核不通过</Option>
</Select>
用户关键字: 用户关键字:
<Input <Input
placeholder="请输入用户关键字" placeholder="请输入用户关键字"
...@@ -342,7 +302,7 @@ class EnrollManag extends React.Component { ...@@ -342,7 +302,7 @@ class EnrollManag extends React.Component {
> >
查询 查询
</Button> </Button>
<Popconfirm {/* <Popconfirm
title="确定导出项目明细?" title="确定导出项目明细?"
okText= {intl.get("Yes").d("确定")} okText= {intl.get("Yes").d("确定")}
cancelText={intl.get("Cancel").d("取消")} cancelText={intl.get("Cancel").d("取消")}
...@@ -351,7 +311,7 @@ class EnrollManag extends React.Component { ...@@ -351,7 +311,7 @@ class EnrollManag extends React.Component {
<Button type="primary" style={{ marginLeft: 20 }}> <Button type="primary" style={{ marginLeft: 20 }}>
导出 导出
</Button> </Button>
</Popconfirm> </Popconfirm> */}
</div> </div>
{/*7月1号不上*/} {/*7月1号不上*/}
{/*<div style={{marginBottom:20}}>*/} {/*<div style={{marginBottom:20}}>*/}
......
...@@ -3103,7 +3103,7 @@ class NewTP extends Component { ...@@ -3103,7 +3103,7 @@ class NewTP extends Component {
<ExportBtn urlParameter="trainingProject" scopeId={record.id} /> <ExportBtn urlParameter="trainingProject" scopeId={record.id} />
</div> </div>
) : null} */} ) : null} */}
{record.sign === 1 ? ( {record.enablePosition === 1 ? (
<div> <div>
<Popconfirm <Popconfirm
title="确认导出?" title="确认导出?"
......
...@@ -106,6 +106,7 @@ export function trainlist(param, cb) { ...@@ -106,6 +106,7 @@ export function trainlist(param, cb) {
total: data.total, total: data.total,
//签到(0:否,1:是) //签到(0:否,1:是)
sign: temp[i].enableSign, sign: temp[i].enableSign,
enablePosition: temp[i].enablePosition,
//报名(0:否,1:是) //报名(0:否,1:是)
enroll: temp[i].enableEnroll, enroll: temp[i].enableEnroll,
visibleRange: temp[i].visibleRange, visibleRange: temp[i].visibleRange,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment