durian
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改工单详情的样式问题

This commit is contained in:
sylor_huang@126.com 2020-06-05 12:02:26 +08:00
parent 585d2e886c
commit 4266216ee1
3 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/forge/Newfile/UserSubmitComponent.js
View File

@ -49,12 +49,12 @@ class UserSubmitComponent extends Component {
})
.then((result) => {
this.setState({isSpin: false})
if (result && result.data.name) {
if (result.data && result.data.name) {
let url = values.branchname
? `/projects/${projectsId}/coders?branch=${values.branchname}`
: `/projects/${projectsId}/coders`;
if(result.pr_id){
url = `/projects/${projectsId}/merge/${result.pr_id}/Messagecount`
if(result.data.pr_id){
url = `/projects/${projectsId}/merge/${result.data.pr_id}/Messagecount`
}
// const url = values.branchname
// ? `/projects/${projectsId}/coders?branch=${values.branchname}`
@ -92,12 +92,12 @@ class UserSubmitComponent extends Component {
})
.then((result) => {
this.setState({isSpin: false})
if (result && result.data.status === 1) {
if (result.data && result.data.status === 1) {
let url = values.branchname
? `/projects/${projectsId}/coders?branch=${values.branchname}`
: `/projects/${projectsId}/coders`;
if(result.pr_id){
url = `/projects/${projectsId}/merge/${result.pr_id}/Messagecount`
if(result.data.pr_id){
url = `/projects/${projectsId}/merge/${result.data.pr_id}/Messagecount`
}
this.props.history.push(url);

30
src/forge/Order/Detail.js
View File

@ -304,8 +304,8 @@ class Detail extends Component {
<Comments order_id={orderId} showNotification={this.props.showNotification} {...this.props} />
</div>
<div className="list-left list-left-padding">
<div className="pd20 background-f">
<p className="grid-item pb15">
<div className="list-right-item-padding background-f">
<p className="grid-item-left pb15">
<span className="issue_detail_info">分支:</span>
<span>{data && data.branch_name ? data.branch_name : "--"}</span>
</p>
@ -321,53 +321,57 @@ class Detail extends Component {
</p>
} */}
<p className="grid-item pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">标签:</span>
<span>
{data && data.issue_tags ? (
<span
className="issue-tag-show"
<span className="grid-item">
<span
className="tagColor"
style={{ background: data.issue_tags[0].color }}
>
{data.issue_tags[0].name}
</span>
{data.issue_tags[0].name}
</span>
) : (
"--"
)}
</span>
</p>
<p className="grid-item pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">里程碑:</span>
<span className="title_overflow">
{data && data.version ? data.version : "--"}
</span>
</p>
<p className="grid-item pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">状态:</span>
<span>
{data && data.issue_status ? data.issue_status : "--"}
</span>
</p>
<p className="grid-item pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">分类:</span>
<span>{data && data.tracker ? data.tracker : "--"}</span>
</p>
<p className="grid-item pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">负责人:</span>
<span>
{data && data.assign_user_name ? data.assign_user_name : "--"}
</span>
</p>
<p className="grid-item pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">开始日期:</span>
<span>{data && data.start_date ? data.start_date : "--"}</span>
</p>
<p className="grid-item pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">结束日期:</span>
<span>{data && data.due_date ? data.due_date : "--"}</span>
</p>
<p className="grid-item pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">完成度:</span>
<span>{data && data.done_ratio ? data.done_ratio : "--"}</span>
</p>

15
src/forge/Order/order.css
View File

@ -631,8 +631,8 @@ a.issue-type-button.active:hover {
}
.issue_detail_info {
width: 65px;
margin-right: 15px;
text-align: right;
/* margin-right: 15px;
text-align: right; */
color: #888888;
}
.list-left-padding {
@ -681,4 +681,13 @@ a.issue-type-button.active:hover {
.issue-form-right .ant-row label{font-size: 14px !important; font-weight: 500;}
.issue-edit-form-right{margin-bottom: 0 !important;}
.plr10{padding: 0 10px;}
.issue-form-index .editormd-toolbar{position: absolute !important;}
.issue-form-index .editormd-toolbar{position: absolute !important;}
.list-right-item-padding{padding: 20px 35px 10px 35px;}
.tagColor {
display: inline-block;
width: 28px;
height: 14px;
border-radius: 4px;
margin-right: 5px;
vertical-align: middle;
}