|
@@ -1,5 +1,5 @@
|
|
|
import React from 'react';
|
|
|
-import { Spin, Button, Tabs } from 'antd';
|
|
|
+import { Spin, Button, Tabs, Table } from 'antd';
|
|
|
import ajax from 'jquery/src/ajax/xhr.js'
|
|
|
import $ from 'jquery/src/ajax';
|
|
|
import DemandDesc from '../../portal/search/demandDesc';
|
|
@@ -22,7 +22,7 @@ const Content = React.createClass({
|
|
|
url: globalConfig.context + "/api/user/portal/achievementInterestList",
|
|
|
data: {
|
|
|
pageNo: pageNo || 1,
|
|
|
- pageSize: this.state.pagination.pageSize
|
|
|
+ pageSize: this.state.achievementPagination.pageSize
|
|
|
},
|
|
|
success: function (data) {
|
|
|
let theArr = [];
|
|
@@ -35,11 +35,12 @@ const Content = React.createClass({
|
|
|
let thisdata = data.data.list[i];
|
|
|
theArr.push({
|
|
|
key: i,
|
|
|
- id: thisdata.id,
|
|
|
- achievementId: thisdata.achievementId,
|
|
|
+ interestId: thisdata.id,
|
|
|
+ id: thisdata.achievementId,
|
|
|
createTime: thisdata.createTime,
|
|
|
name: thisdata.name,
|
|
|
serialNumber: thisdata.serialNumber,
|
|
|
+ keyword: thisdata.keyword,
|
|
|
deletedSign: thisdata.deletedSign,
|
|
|
auditStatus: thisdata.auditStatus,
|
|
|
createTimeFormattedDate: thisdata.createTimeFormattedDate
|
|
@@ -68,21 +69,10 @@ const Content = React.createClass({
|
|
|
method: "get",
|
|
|
dataType: "json",
|
|
|
crossDomain: false,
|
|
|
- url: globalConfig.context + "/api/user/demand/list",
|
|
|
+ url: globalConfig.context + "/api/user/portal/demandInterestList",
|
|
|
data: {
|
|
|
pageNo: pageNo || 1,
|
|
|
- pageSize: this.state.pagination.pageSize,
|
|
|
- serialNumber: this.state.serialNumber,
|
|
|
- name: this.state.name,
|
|
|
- keyword: this.state.keyword,
|
|
|
- demandType: this.state.demandType ? Number(this.state.demandType) : undefined,
|
|
|
- status: this.state.status ? Number(this.state.status) : undefined,
|
|
|
- releaseStatus: this.state.releaseStatus ? Number(this.state.releaseStatus) : undefined,
|
|
|
- validityPeriodStartDate: this.state.validityPeriodDate[0],
|
|
|
- validityPeriodEndDate: this.state.validityPeriodDate[1],
|
|
|
- releaseDateStartDate: this.state.releaseDate[0],
|
|
|
- releaseDateEndDate: this.state.releaseDate[1],
|
|
|
- auditStatus: this.state.auditStatus
|
|
|
+ pageSize: this.state.demandPagination.pageSize
|
|
|
},
|
|
|
success: function (data) {
|
|
|
let theArr = [];
|
|
@@ -95,28 +85,24 @@ const Content = React.createClass({
|
|
|
let thisdata = data.data.list[i];
|
|
|
theArr.push({
|
|
|
key: i,
|
|
|
- id: thisdata.id,
|
|
|
- serialNumber: thisdata.serialNumber,
|
|
|
- dataCategory: thisdata.dataCategory,
|
|
|
- name: thisdata.name,
|
|
|
+ interestId: thisdata.id,
|
|
|
+ id: thisdata.demandtId,
|
|
|
+ createTime: thisdata.createTime,
|
|
|
keyword: thisdata.keyword,
|
|
|
- releaseDate: thisdata.releaseDate,
|
|
|
- demandType: thisdata.demandType,
|
|
|
- validityPeriod: thisdata.validityPeriod,
|
|
|
+ name: thisdata.name,
|
|
|
status: thisdata.status,
|
|
|
- releaseStatus: thisdata.releaseStatus,
|
|
|
- employerId: thisdata.employerId,
|
|
|
- releaseDateFormattedDate: thisdata.releaseDateFormattedDate,
|
|
|
- validityPeriodFormattedDate: thisdata.validityPeriodFormattedDate,
|
|
|
- auditStatus: thisdata.auditStatus
|
|
|
+ serialNumber: thisdata.serialNumber,
|
|
|
+ deletedSign: thisdata.deletedSign,
|
|
|
+ auditStatus: thisdata.auditStatus,
|
|
|
+ createTimeFormattedDate: thisdata.createTimeFormattedDate
|
|
|
});
|
|
|
};
|
|
|
}
|
|
|
- this.state.pagination.current = data.data.pageNo;
|
|
|
- this.state.pagination.total = data.data.totalCount;
|
|
|
+ this.state.demandPagination.current = data.data.pageNo;
|
|
|
+ this.state.demandPagination.total = data.data.totalCount;
|
|
|
this.setState({
|
|
|
- dataSource: theArr,
|
|
|
- pagination: this.state.pagination
|
|
|
+ demandDataSource: theArr,
|
|
|
+ demandPagination: this.state.demandPagination
|
|
|
});
|
|
|
}.bind(this),
|
|
|
}).always(function () {
|
|
@@ -156,50 +142,22 @@ const Content = React.createClass({
|
|
|
dataIndex: 'keyword',
|
|
|
key: 'keyword',
|
|
|
}, {
|
|
|
- title: '需求类型',
|
|
|
- dataIndex: 'demandType',
|
|
|
- key: 'demandType',
|
|
|
- render: text => { return getDemandType(text); }
|
|
|
- }, {
|
|
|
- title: '审核状态',
|
|
|
+ title: '状态',
|
|
|
dataIndex: 'auditStatus',
|
|
|
key: 'auditStatus',
|
|
|
- render: text => {
|
|
|
- switch (text) {
|
|
|
- case "0":
|
|
|
- return <span>未提交审核(草稿)</span>;
|
|
|
- case "1":
|
|
|
- return <span>提交审核</span>;
|
|
|
- case "2":
|
|
|
- return <span>审核中</span>;
|
|
|
- case "3":
|
|
|
- return <span>审核通过</span>;
|
|
|
- case "4":
|
|
|
- return <span>审核未通过</span>;
|
|
|
+ render: (text, record) => {
|
|
|
+ if (record.deletedSign == 1) {
|
|
|
+ return "已删除"
|
|
|
+ } else if (record.auditStatus !== 3) {
|
|
|
+ return "已下架"
|
|
|
+ } else {
|
|
|
+ return "正常"
|
|
|
}
|
|
|
}
|
|
|
}, {
|
|
|
- title: '需求状态',
|
|
|
- dataIndex: 'status',
|
|
|
- key: 'status',
|
|
|
- render: text => {
|
|
|
- switch (text) {
|
|
|
- case "0":
|
|
|
- return <span>进行中</span>;
|
|
|
- case "1":
|
|
|
- return <span>未解决</span>;
|
|
|
- case "2":
|
|
|
- return <span>已解决</span>;
|
|
|
- }
|
|
|
- }
|
|
|
- }, {
|
|
|
- title: '有效期限',
|
|
|
- dataIndex: 'validityPeriodFormattedDate',
|
|
|
- key: 'validityPeriodFormattedDate',
|
|
|
- }, {
|
|
|
- title: '发布时间',
|
|
|
- dataIndex: 'releaseDateFormattedDate',
|
|
|
- key: 'releaseDateFormattedDate',
|
|
|
+ title: '关注时间',
|
|
|
+ dataIndex: 'createTimeFormattedDate',
|
|
|
+ key: 'createTimeFormattedDate',
|
|
|
}
|
|
|
],
|
|
|
achievementDataSource: [],
|
|
@@ -229,82 +187,63 @@ const Content = React.createClass({
|
|
|
dataIndex: 'keyword',
|
|
|
key: 'keyword',
|
|
|
}, {
|
|
|
- title: '需求类型',
|
|
|
- dataIndex: 'demandType',
|
|
|
- key: 'demandType',
|
|
|
- render: text => { return getDemandType(text); }
|
|
|
- }, {
|
|
|
- title: '审核状态',
|
|
|
+ title: '状态',
|
|
|
dataIndex: 'auditStatus',
|
|
|
key: 'auditStatus',
|
|
|
- render: text => {
|
|
|
- switch (text) {
|
|
|
- case "0":
|
|
|
- return <span>未提交审核(草稿)</span>;
|
|
|
- case "1":
|
|
|
- return <span>提交审核</span>;
|
|
|
- case "2":
|
|
|
- return <span>审核中</span>;
|
|
|
- case "3":
|
|
|
- return <span>审核通过</span>;
|
|
|
- case "4":
|
|
|
- return <span>审核未通过</span>;
|
|
|
+ render: (text, record) => {
|
|
|
+ if (record.deletedSign == 1) {
|
|
|
+ return "已删除"
|
|
|
+ } else if (record.auditStatus !== 3) {
|
|
|
+ return "已下架"
|
|
|
+ } else if (record.status == 0) {
|
|
|
+ return "未解决"
|
|
|
+ } else if (record.status == 1) {
|
|
|
+ return "已解决"
|
|
|
}
|
|
|
}
|
|
|
}, {
|
|
|
- title: '需求状态',
|
|
|
- dataIndex: 'status',
|
|
|
- key: 'status',
|
|
|
- render: text => {
|
|
|
- switch (text) {
|
|
|
- case "0":
|
|
|
- return <span>进行中</span>;
|
|
|
- case "1":
|
|
|
- return <span>未解决</span>;
|
|
|
- case "2":
|
|
|
- return <span>已解决</span>;
|
|
|
- }
|
|
|
- }
|
|
|
- }, {
|
|
|
- title: '有效期限',
|
|
|
- dataIndex: 'validityPeriodFormattedDate',
|
|
|
- key: 'validityPeriodFormattedDate',
|
|
|
- }, {
|
|
|
- title: '发布时间',
|
|
|
- dataIndex: 'releaseDateFormattedDate',
|
|
|
- key: 'releaseDateFormattedDate',
|
|
|
+ title: '关注时间',
|
|
|
+ dataIndex: 'createTimeFormattedDate',
|
|
|
+ key: 'createTimeFormattedDate',
|
|
|
}
|
|
|
],
|
|
|
demandDataSource: [],
|
|
|
};
|
|
|
},
|
|
|
- componentDidMount() {
|
|
|
+ componentWillMount() {
|
|
|
this.achievementLoadData();
|
|
|
+ this.demandLoadData();
|
|
|
},
|
|
|
tabChange(key) {
|
|
|
|
|
|
},
|
|
|
demandRowClick(record, index) {
|
|
|
this.state.demandRowData = record;
|
|
|
- this.setState({
|
|
|
- demandShowDesc: true
|
|
|
- });
|
|
|
+ if (record.deletedSign !== 1 && record.auditStatus == 3) {
|
|
|
+ this.setState({
|
|
|
+ demandShowDesc: true
|
|
|
+ });
|
|
|
+ };
|
|
|
},
|
|
|
achievementRowClick(record, index) {
|
|
|
this.state.achievementRowData = record;
|
|
|
- this.setState({
|
|
|
- achievementShowDesc: true
|
|
|
- });
|
|
|
+ if (record.deletedSign !== 1 && record.auditStatus == 3) {
|
|
|
+ this.setState({
|
|
|
+ achievementShowDesc: true
|
|
|
+ });
|
|
|
+ };
|
|
|
},
|
|
|
demandCloseDesc(e) {
|
|
|
this.setState({
|
|
|
demandShowDesc: e
|
|
|
});
|
|
|
+ this.demandLoadData();
|
|
|
},
|
|
|
achievementCloseDesc(e) {
|
|
|
this.setState({
|
|
|
achievementShowDesc: e
|
|
|
});
|
|
|
+ this.achievementLoadData();
|
|
|
},
|
|
|
render() {
|
|
|
return (
|
|
@@ -327,10 +266,10 @@ const Content = React.createClass({
|
|
|
</Spin>
|
|
|
<DemandDesc data={this.state.demandRowData}
|
|
|
showDesc={this.state.demandShowDesc}
|
|
|
- closeDesc={this.demandShowDesc} />
|
|
|
+ closeDesc={this.demandCloseDesc} />
|
|
|
<AchievementDesc data={this.state.achievementRowData}
|
|
|
showDesc={this.state.achievementShowDesc}
|
|
|
- closeDesc={this.achievementShowDesc} />
|
|
|
+ closeDesc={this.achievementCloseDesc} />
|
|
|
</div>
|
|
|
)
|
|
|
}
|