diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index a9e81a95..17755fda 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -3,7 +3,7 @@ import { Link } from "react-router-dom"; import axios from "axios"; import { getImageUrl } from "educoder"; -import { Form , Popconfirm , Tag } from "antd"; +import { Form , Popconfirm , Tag , Spin } from "antd"; import Attachments from "../Upload/attachment"; import RenderHtml from "../../components/render-html"; import Comments from "../comments/comments"; @@ -27,7 +27,7 @@ class Detail extends Component { limit: 10, page: 1, search_count: undefined, - isSpin: false, + isSpins: true, showFiles: true, quillValue: "", quillFlag: false, @@ -52,6 +52,7 @@ class Detail extends Component { if (result) { this.setState({ data: result.data, + isSpins:false }); } }) @@ -144,7 +145,7 @@ class Detail extends Component { ChangePage = (page) => { this.setState({ page, - isSpin: true, + isSpins: true, }); const { limit } = this.state; this.getjournalslist(page, limit); @@ -186,7 +187,7 @@ class Detail extends Component { render() { const { projectsId, orderId } = this.props.match.params; - const { data } = this.state; + const { data , isSpins } = this.state; const get_color = (type) => { if (type === "高") { return "#e67e22"; @@ -200,111 +201,112 @@ class Detail extends Component { }; return ( -
-
-
-
- - - -
-
- - - 【 - {data && data.issue_classify === "issue" - ? data.tracker + +
+
+
+
+ + + +
+
+ + + 【 + {data && data.issue_classify === "issue" ? data.tracker - : "缺陷" - : "合并请求"} - 】 + ? data.tracker + : "缺陷" + : "合并请求"} + 】 + + {data && data.subject} - {data && data.subject} - - {data && data.priority && ( - {data.priority} - )} -
-
- - - {data && data.author_name} - - - 添加于 {data && data.created_at} - - {data && data.user_permission ? ( - - - 复制 - - this.deletedetail(orderId)} - > - - 删除 + {data && data.priority && ( + {data.priority} + )} +
+
+ + + {data && data.author_name} + + + 添加于 {data && data.created_at} + + {data && data.user_permission ? ( + + + 复制 - + this.deletedetail(orderId)} + > + + 删除 + + - - 编辑 - - - ) : ( - "" - )} + + 编辑 + + + ) : ( + "" + )} +
-
-
-
- {data && data.description && data.description.length > 0 ? ( - this.commentCtx(data.description) +
+
+ {data && data.description && data.description.length > 0 ? ( + this.commentCtx(data.description) + ) : ( + 没有描述 + )} +
+ {data && data.attachments && data.attachments.length > 0 ? ( + ) : ( - 没有描述 + "" )}
- {data && data.attachments && data.attachments.length > 0 ? ( - - ) : ( - "" - )}
-
- -
-
+ +
+

分支: @@ -375,7 +377,8 @@ class Detail extends Component {

-
+
+ ); } } diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index dd5c1cc3..cbb60455 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { Dropdown, Icon, Menu, Pagination, Typography, Popconfirm } from 'antd'; +import { Dropdown, Icon, Menu, Pagination, Typography, Popconfirm , Spin } from 'antd'; import NoneData from '../Nodata'; import axios from 'axios'; import './order.css'; @@ -20,7 +20,9 @@ class Milepost extends Component { status: 'open', openselect: 1, closeselect: undefined, - order_name: undefined + order_name: undefined, + + spinings:true } } @@ -38,9 +40,9 @@ class Milepost extends Component { } }).then((result) => { if (result) { - this.setState({ - data: result.data + data: result.data, + spinings:false }) } }).catch((error) => { @@ -56,7 +58,8 @@ class Milepost extends Component { this.setState({ status: 'open', openselect: current_user.user_id, - closeselect: undefined + closeselect: undefined, + }) this.getList(1, 'open', 'desc', order_name); } else { @@ -144,7 +147,7 @@ class Milepost extends Component { render() { - const { data, limit, page, openselect, closeselect } = this.state; + const { data, limit, page, openselect, closeselect , spinings } = this.state; const { projectsId } = this.props.match.params; const menu = ( @@ -159,7 +162,8 @@ class Milepost extends Component { return ( -
+ +
里程碑{data && data.issue_tags_count}已创建 @@ -266,6 +270,7 @@ class Milepost extends Component {
: "" }
+ ) } } diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js index b01f683a..8a51ed0b 100644 --- a/src/forge/Order/MilepostDetail.js +++ b/src/forge/Order/MilepostDetail.js @@ -29,7 +29,7 @@ class MilepostDetail extends Component { issue_chosen: undefined, data: undefined, issues: undefined, - isSpin: false, + isSpin: true, search: undefined, author_id: undefined, assigned_to_id: undefined,