diff --git a/public/react/src/forge/Order/MilepostDetail.js b/public/react/src/forge/Order/MilepostDetail.js
index 09bc8f958..345ffcc68 100644
--- a/public/react/src/forge/Order/MilepostDetail.js
+++ b/public/react/src/forge/Order/MilepostDetail.js
@@ -1,16 +1,14 @@
import React , { Component } from "react";
-import {Link, NavLink} from 'react-router-dom';
-import { Input ,Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
+import {Link} from 'react-router-dom';
+import { Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
import './order.css';
import NoneData from '../../modules/courses/coursesPublic/NoneData';
-import Nav from './Nav';
import OrderItem from './OrderItem';
import axios from 'axios';
-const Search = Input.Search;
/**
* issue_chosen:下拉的筛选列表,
* data:列表接口返回的所有数据,
@@ -197,7 +195,7 @@ class MilepostDetail extends Component{
render(){
- const { issue_chosen , issues , limit , page , search_count , data , miledata , author_id , isSpin,openselect,closeselect } = this.state;
+ const { issue_chosen , issues , limit , page , search_count , data , miledata , isSpin,openselect,closeselect } = this.state;
const { projectsId,meilid } = this.props.match.params;
const Paginations = (
diff --git a/public/react/src/forge/Order/order.js b/public/react/src/forge/Order/order.js
index 2c7bdc80c..32aae9fa8 100644
--- a/public/react/src/forge/Order/order.js
+++ b/public/react/src/forge/Order/order.js
@@ -1,5 +1,5 @@
import React , { Component } from "react";
-import {Link, NavLink} from 'react-router-dom';
+import {Link} from 'react-router-dom';
import { Input ,Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
import './order.css';
@@ -43,7 +43,15 @@ class order extends Component{
status_type:'1',
//设置选择高亮
openselect:1,
- closeselect:undefined
+ closeselect:undefined,
+ issue_tag_ids:'标签',
+ tracker_ids:'所有分类',
+ author_ids:'发布人',
+ assigned_to_ids:'指派人',
+ priority_ids:'优先度',
+ done_ratios:'完成度',
+ paix:'排序'
+
}
}
@@ -93,8 +101,70 @@ class order extends Component{
getOption=(e,id,name)=>{
console.log("get_optin", e.key)
+ if(id+'s'==="issue_tag_ids"){
+ this.setState({
+ [id]:e.key,
+ issue_tag_ids:name
+ })
+ }
+ if(id+'s'==="tracker_ids"){
+ this.setState({
+ [id]:e.key,
+ tracker_ids:name
+ })
+ }
+ if(id+'s'==="author_ids"){
+ this.setState({
+ [id]:e.key,
+ author_ids:name
+ })
+ }
+ if(id+'s'==="assigned_to_ids"){
+ this.setState({
+ [id]:e.key,
+ assigned_to_ids:name
+ })
+ }
+ if(id+'s'==="priority_ids"){
+ this.setState({
+ [id]:e.key,
+ priority_ids:name
+ })
+ }
+ if(id+'s'==="done_ratios"){
+ this.setState({
+ [id]:e.key,
+ done_ratios:name
+ })
+ }
+ if(e.key==="created_on"){
+ if(e.item.props.value==="desc"){
+ this.setState({
+ [id]:e.key,
+ paix:'最新创建'
+ })
+ }else{
+ this.setState({
+ [id]:e.key,
+ paix:'最早创建'
+ })
+ }
+ }else{
+ if(e.item.props.value==="desc"){
+ this.setState({
+ [id]:e.key,
+ paix:'最新更新'
+ })
+ }else{
+ this.setState({
+ [id]:e.key,
+ paix:'最早更新'
+ })
+ }
+ }
+
this.setState({
- [id]:e.key
+ [id]:e.key,
})
const { page,limit,search,author_id,assigned_to_id } = this.state;
if(e.key==="all"){
@@ -173,7 +243,7 @@ class order extends Component{
// 筛选：全部、指派给我、由我创建
ChangeAssign=(type)=>{
- const { limit, search, status_type} = this.state;
+ const { limit, search} = this.state;
this.setState({
isSpin:true
})
@@ -261,7 +331,7 @@ class order extends Component{