From 5eb8d3acda9d4c2849213ea88f6285b30dc78cd0 Mon Sep 17 00:00:00 2001
From: dingyongkang <837816638@qq.com>
Date: Mon, 2 Mar 2020 11:48:16 +0800
Subject: [PATCH] =?UTF-8?q?pr=20=E9=87=8C=E7=A8=8B=E7=A2=91=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8Fbug=20=E5=8F=8A=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/forge/Index.js               |  2 +-
 public/react/src/forge/Merge/MergeItem.js     | 19 ++++---
 public/react/src/forge/Merge/merge.js         |  8 +--
 public/react/src/forge/Order/Milepost.js      |  8 +--
 .../react/src/forge/Order/MilepostDetail.js   | 57 +++++++------------
 public/react/src/forge/Order/order.css        | 16 ++++++
 public/react/src/forge/Order/order.js         |  2 +-
 7 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/public/react/src/forge/Index.js b/public/react/src/forge/Index.js
index 437867a48..158be3e42 100644
--- a/public/react/src/forge/Index.js
+++ b/public/react/src/forge/Index.js
@@ -67,7 +67,7 @@ class Index extends Component{
         ></Route>
         <Route path="/projects/:projectsId"
           render={
-            (props) => (<ProjectDetail {...this.props} {...props} {...this.state} />)
+            (props) => (<ProjectDetail {...this.props} {...props} {...this.state} current_user={current_user}/>)
           }
         ></Route>
         <Route exact path="/projects"
diff --git a/public/react/src/forge/Merge/MergeItem.js b/public/react/src/forge/Merge/MergeItem.js
index 4db006450..af244eca4 100644
--- a/public/react/src/forge/Merge/MergeItem.js
+++ b/public/react/src/forge/Merge/MergeItem.js
@@ -26,21 +26,26 @@ class MergeItem extends Component{
           issues.map((item,key)=>{
             return(
               <div className="issueItem">
-                <div className="flex-1">
+              <div className="flex-1">
                   <p className="mb15 df">
                     <span className="issueNo"># {search_count - (key + (page-1) * limit)}</span>
-                    <Link to={`/projects/${projectsId}/merge/${item.pull_request_id}/Messagecount`} className="flex-1 hide-1 font-16 color-grey-3 lineh-30">{item.name}</Link>
+                    <Link to={`/projects/${projectsId}/orders/${item.id}/detail`} className="flex-1 hide-1 font-16 color-grey-3 lineh-30">{item.name}</Link>
                   </p>
-                  <p className="color-grey-6">
-                    <span>{item.created_at}</span>
-                    { item.journals_count ? <span className="ml20"><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</span> : "" }
+                  <p className="color-grey-6 font-12">
+                    <span>{item.format_time}</span><span className="ml5">发布</span>
+                    {
+                      item.updated_at === item.format_time ?
+                        ""
+                        :
+                        <span className="ml20"><span>{item.updated_at}</span><span className="ml5">更新</span></span>
+                    }
                   </p>
-                </div>  
+                </div>
                   <ul className="topWrapper_select">
                   <li>{this.set_issue_tags(item.issue_tags)}</li>
                   {/*<li>{item.issue_type || "--"}</li>*/}
                   <li>{item.version || "--"}</li>
-                  <li>{item.author_name || "--"}</li>
+                  <li>{item.assign_user_name || "--"}</li>
                   <li>{ item.journals_count ? <span><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</span> : "" }</li>
                 </ul>
               </div>
diff --git a/public/react/src/forge/Merge/merge.js b/public/react/src/forge/Merge/merge.js
index 2baa32603..1add40549 100644
--- a/public/react/src/forge/Merge/merge.js
+++ b/public/react/src/forge/Merge/merge.js
@@ -188,21 +188,21 @@ class merge extends Component{
     if(e.key==='created_on'){
       if(e.item.props.value==="desc"){
         this.setState({
-         paix:'到期日从近到远'
+         paix:'最新创建'
         })
       }else{
         this.setState({
-          paix:'到期日从远到近'
+          paix:'最早创建'
         })
       }
     }else{
       if(e.item.props.value==="desc"){
         this.setState({
-          paix:'完成度从低到高'
+          paix:'最新更新'
         })
       }else{
         this.setState({
-          paix:'完成度从高到低'
+          paix:'最早更新'
         })
       }
     }
diff --git a/public/react/src/forge/Order/Milepost.js b/public/react/src/forge/Order/Milepost.js
index 63cd30cc3..2c4ab323b 100644
--- a/public/react/src/forge/Order/Milepost.js
+++ b/public/react/src/forge/Order/Milepost.js
@@ -151,10 +151,10 @@ class Milepost extends Component{
       <Menu onClick={this.arrayList}>
         <Menu.Item key={'created_on'} value="desc">到期日从近到远</Menu.Item>
         <Menu.Item key={'created_on'} value="asc">到期日从远到近</Menu.Item>
-        <Menu.Item key={'issues_count'} value="desc">完成度从低到高</Menu.Item>
-        <Menu.Item key={'issues_count'} value="asc">完成度从高到低</Menu.Item>
-        <Menu.Item key={'percent'} value="asc">工单从多到少</Menu.Item>
-        <Menu.Item key={'percent'} value="asc">工单从少到多</Menu.Item>
+        <Menu.Item key={'percent'} value="desc">完成度从低到高</Menu.Item>
+        <Menu.Item key={'percent'} value="asc">完成度从高到低</Menu.Item>
+        <Menu.Item key={'issues_count'} value="asc">工单从多到少</Menu.Item>
+        <Menu.Item key={'issues_count'} value="desc">工单从少到多</Menu.Item>
       </Menu>
     )
 
diff --git a/public/react/src/forge/Order/MilepostDetail.js b/public/react/src/forge/Order/MilepostDetail.js
index bccfd38bb..587d8de70 100644
--- a/public/react/src/forge/Order/MilepostDetail.js
+++ b/public/react/src/forge/Order/MilepostDetail.js
@@ -42,7 +42,6 @@ class MilepostDetail extends Component{
       //设置选择高亮
       openselect:1,
       closeselect:undefined,
-      miledata:undefined,
       // status_type: undefined
       issue_tag_ids:'标签',
       tracker_ids:'所有分类',
@@ -57,36 +56,8 @@ class MilepostDetail extends Component{
   componentDidMount=()=>{
     this.getSelectList();
     this.getIssueList();
-    this.getmeil();
   }
 
-  getmeil=()=>{
-    const { projectsId } = this.props.match.params;
-    const { meilid } = this.props.match.params;
-    const url = `/projects/${projectsId}/versions/${meilid}/edit.json`;
-    axios.get(url,{
-      params:{
-        projectsId,meilid
-      }
-    }).then((result)=>{
-      if(result){
-        this.setState({
-            miledata:result.data,
-    
-        })
-        this.props.form.setFieldsValue({
-            name:result.data.name,
-            description:result.data.description
-          });
-
-      }
-    }).catch((error)=>{
-      console.log(error);
-    })
-
-
-
-  }
 
   getSelectList=()=>{
     const { projectsId } = this.props.match.params;
@@ -104,12 +75,12 @@ class MilepostDetail extends Component{
   }
 
   // 获取列表数据
-  getIssueList=(page,limit,search,author_id,assigned_to_id,id,value,status_type)=>{
+  getIssueList=(page,limit,search,author_id,assigned_to_id,id,value,status_type,order_name, order_type)=>{
     const { projectsId,meilid} = this.props.match.params;
     const url = `/projects/${projectsId}/versions/${meilid}.json`;
     axios.get(url,{
       params:{
-        page,limit,search,author_id,assigned_to_id,status_type,
+        page,limit,search,author_id,assigned_to_id,status_type,order_name, order_type,
         [id]:value
       }
     }).then((result)=>{
@@ -190,15 +161,16 @@ class MilepostDetail extends Component{
         })
       }
     }
-
     this.setState({
       [id]:e.key
     })
+
+
     const { page,limit,search,author_id,assigned_to_id } = this.state;
     if(e.key==="all"){
       this.getIssueList(page,limit,search,author_id,assigned_to_id,id);
     }else{
-      this.getIssueList(page,limit,search,author_id,assigned_to_id,id,e.key);
+      this.getIssueList(page,limit,search,author_id,assigned_to_id,id,undefined,undefined,e.key, e.item.props.value);
     }
   }
 
@@ -265,7 +237,7 @@ class MilepostDetail extends Component{
 
   render(){
 
-    const { issue_chosen , issues , limit , page , search_count , data , miledata  , isSpin,openselect,closeselect } = this.state;
+    const { issue_chosen , issues , limit , page , search_count , data  , isSpin,openselect,closeselect } = this.state;
     const { projectsId,meilid } = this.props.match.params;
 
     const menu = (
@@ -289,13 +261,24 @@ class MilepostDetail extends Component{
     )
     return(
       <div className="main">
-        <div className="topWrapper">
-          <p>{miledata&&miledata.name}</p>
+        <div className="miledetail">
+        <div className="topmilepost">
+          <p>{data&&data.name}</p>
           <div className="milepostdiv">
           <Link to={`/projects/${projectsId}/orders/${meilid}/meilpost`} className="topWrapper_btn" style={{marginRight:15}} >编辑里程碑</Link>
           <Link to={`/projects/${projectsId}/orders/new`} className="topWrapper_btn">创建工单</Link>
           </div>
-        
+        </div>
+        <div className="grid-item mr10">
+            <i className="iconfont icon-rili font-14 mr5">
+                </i>
+                  {
+                   data&&data.effective_date ?
+                  <span >{data&&data.effective_date} {data&&data.percent.toFixed(2)}%完成</span>
+                        :
+                      <span >暂无截止时间 {data&&data.percent.toFixed(2)}%完成</span>
+                     }
+                  </div>
         </div>
         <div className="topWrapper" style={{borderBottom:"none"}}>
           {/* <p className="topWrapper_type">
diff --git a/public/react/src/forge/Order/order.css b/public/react/src/forge/Order/order.css
index b32cbd112..0de96a077 100644
--- a/public/react/src/forge/Order/order.css
+++ b/public/react/src/forge/Order/order.css
@@ -6,6 +6,22 @@
   border-bottom: 1px solid #EEEEEE;
   flex-wrap: wrap;
 }
+
+.topmilepost{
+  padding: 20px 0;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+
+.miledetail{
+  padding: 20px 0;
+  box-sizing: border-box;
+  justify-content: space-between;
+  border-bottom: 1px solid #EEEEEE;
+  flex-wrap: wrap;
+}
 .topWrapper_nav{
   display: flex;
 
diff --git a/public/react/src/forge/Order/order.js b/public/react/src/forge/Order/order.js
index 57ac4546b..21aa64402 100644
--- a/public/react/src/forge/Order/order.js
+++ b/public/react/src/forge/Order/order.js
@@ -81,7 +81,7 @@ class order extends Component{
     const url = `/projects/${projectsId}/issues.json`;
     axios.get(url,{
       params:{
-        page,limit,search,author_id,assigned_to_id,status_type,order_name, order_type,
+        page,limit,search,author_id,assigned_to_id,status_type,order_name,order_type,
         [id]:value
       }
     }).then((result)=>{