|
|
|
@ -4,10 +4,10 @@ import {Link} from 'react-router-dom';
|
|
|
|
import axios from 'axios';
|
|
|
|
import axios from 'axios';
|
|
|
|
import Nav from './Nav';
|
|
|
|
import Nav from './Nav';
|
|
|
|
import UploadComponent from '../Upload/Index';
|
|
|
|
import UploadComponent from '../Upload/Index';
|
|
|
|
|
|
|
|
import { getImageUrl } from 'educoder';
|
|
|
|
import{ Modal,Col,Form,Input,Tooltip,Select } from 'antd'
|
|
|
|
import{ Modal,Col,Form,Input,Tooltip,Select } from 'antd'
|
|
|
|
import NoneData from '../../modules/courses/coursesPublic/NoneData';
|
|
|
|
import NoneData from '../../modules/courses/coursesPublic/NoneData';
|
|
|
|
|
|
|
|
import Attachments from '../Upload/attachment'
|
|
|
|
|
|
|
|
|
|
|
|
const TextArea = Input.TextArea;
|
|
|
|
const TextArea = Input.TextArea;
|
|
|
|
const Option = Select.Option;
|
|
|
|
const Option = Select.Option;
|
|
|
|
@ -35,6 +35,8 @@ class CopyDetail extends Component{
|
|
|
|
priority_id:0,
|
|
|
|
priority_id:0,
|
|
|
|
done_ratio:0,
|
|
|
|
done_ratio:0,
|
|
|
|
textcount:"",
|
|
|
|
textcount:"",
|
|
|
|
|
|
|
|
fileList:undefined,
|
|
|
|
|
|
|
|
get_attachments: undefined
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -65,7 +67,13 @@ class CopyDetail extends Component{
|
|
|
|
status_id:result.data.status_id,
|
|
|
|
status_id:result.data.status_id,
|
|
|
|
priority_id:result.data.priority_id,
|
|
|
|
priority_id:result.data.priority_id,
|
|
|
|
done_ratio:result.data.done_ratio,
|
|
|
|
done_ratio:result.data.done_ratio,
|
|
|
|
textcount:result.data.description
|
|
|
|
textcount:result.data.description,
|
|
|
|
|
|
|
|
branch_name: result.data.branch_name,
|
|
|
|
|
|
|
|
get_attachments: result.data.attachments,
|
|
|
|
|
|
|
|
fileList:undefined,
|
|
|
|
|
|
|
|
issue_tag_ids: result.data.issue_tags && result.data.issue_tags[0].id,
|
|
|
|
|
|
|
|
fixed_version_id: result.data.fixed_version_id,
|
|
|
|
|
|
|
|
assigned_to_id: result.data.assigned_to_id
|
|
|
|
|
|
|
|
|
|
|
|
})
|
|
|
|
})
|
|
|
|
this.getjournalslist();
|
|
|
|
this.getjournalslist();
|
|
|
|
@ -133,6 +141,7 @@ class CopyDetail extends Component{
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
handleSubmit=()=>{
|
|
|
|
handleSubmit=()=>{
|
|
|
|
|
|
|
|
const { fileList } = this.state;
|
|
|
|
this.props.form.validateFieldsAndScroll((err, values) => {
|
|
|
|
this.props.form.validateFieldsAndScroll((err, values) => {
|
|
|
|
if(!err){
|
|
|
|
if(!err){
|
|
|
|
const { projectsId,orderId} = this.props.match.params;
|
|
|
|
const { projectsId,orderId} = this.props.match.params;
|
|
|
|
@ -145,10 +154,11 @@ class CopyDetail extends Component{
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
axios.put(url,{
|
|
|
|
axios.put(url,{
|
|
|
|
project_id:projectsId,
|
|
|
|
project_id:projectsId,
|
|
|
|
subject:subject,
|
|
|
|
subject:subject,
|
|
|
|
id: orderId,
|
|
|
|
id: orderId,
|
|
|
|
description:this.state.textcount,
|
|
|
|
description:this.state.textcount,
|
|
|
|
|
|
|
|
attachment_ids:fileList,
|
|
|
|
...values
|
|
|
|
...values
|
|
|
|
}).then(result=>{
|
|
|
|
}).then(result=>{
|
|
|
|
if(result){
|
|
|
|
if(result){
|
|
|
|
@ -166,176 +176,192 @@ class CopyDetail extends Component{
|
|
|
|
render(){
|
|
|
|
render(){
|
|
|
|
const { projectsId,orderId } = this.props.match.params;
|
|
|
|
const { projectsId,orderId } = this.props.match.params;
|
|
|
|
const { getFieldDecorator } = this.props.form;
|
|
|
|
const { getFieldDecorator } = this.props.form;
|
|
|
|
|
|
|
|
const { current_user } = this.props;
|
|
|
|
const { issue_tag_ids , fixed_version_id , branch_name , status_id , tracker_id , issue_type ,assigned_to_id , priority_id , done_ratio,
|
|
|
|
const { issue_tag_ids , fixed_version_id , branch_name , status_id , tracker_id , issue_type ,assigned_to_id , priority_id , done_ratio,
|
|
|
|
issue_chosen , branches } = this.state;
|
|
|
|
issue_chosen , branches, subject, textcount,get_attachments } = this.state;
|
|
|
|
return(
|
|
|
|
return(
|
|
|
|
<div className="main">
|
|
|
|
<div className="main">
|
|
|
|
<div className="topWrapper">
|
|
|
|
<div className="topWrapper">
|
|
|
|
<Nav {...this.props} {...this.state}/>
|
|
|
|
<Nav {...this.props} {...this.state}/>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div>
|
|
|
|
<div>
|
|
|
|
<Form>
|
|
|
|
<Form>
|
|
|
|
<div className="f-wrap-between mt20" style={{alignItems:"flex-start"}}>
|
|
|
|
<div className="f-wrap-between mt20" style={{alignItems: "flex-start"}}>
|
|
|
|
<div className="list-right df divwidth" >
|
|
|
|
<div className="list-right df">
|
|
|
|
<ul className="ul_width">
|
|
|
|
<Link to={``}><img className="user_img"
|
|
|
|
<li>
|
|
|
|
src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/></Link>
|
|
|
|
<div className="df">
|
|
|
|
<div className="new_context">
|
|
|
|
<div style={{width:40}}>标题</div>
|
|
|
|
<Form.Item>
|
|
|
|
<Input value={this.state.subject} style={{marginLeft:25}} size={10} onChange={this.changmodelname}></Input>
|
|
|
|
{getFieldDecorator('subject', {
|
|
|
|
</div>
|
|
|
|
rules: [{
|
|
|
|
</li>
|
|
|
|
required: true, message: '请填写工单标题'
|
|
|
|
<li style={{marginTop:15}}>
|
|
|
|
}],
|
|
|
|
<div className="df" >
|
|
|
|
initialValue: subject
|
|
|
|
<Link to={``}><img class="user_img" onClick={this.imgshow} src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1608431072,669449145&fm=27&gp=0.jpg" alt=""/> </Link>
|
|
|
|
})(
|
|
|
|
<div className="new_context">
|
|
|
|
<Input placeholder="标题" onChange={this.changmodelname}/>
|
|
|
|
<TextArea defaultValue={this.state.textcount} style={{height:"200px"}} value={this.state.textcount} onChange={this.changmodelcount}/>
|
|
|
|
)}
|
|
|
|
<UploadComponent load={this.UploadFunc}></UploadComponent>
|
|
|
|
</Form.Item>
|
|
|
|
|
|
|
|
<Form.Item>
|
|
|
|
<div className="topWrapper">
|
|
|
|
{getFieldDecorator('description', {
|
|
|
|
<div className="detail_p"> </div>
|
|
|
|
rules: [],
|
|
|
|
<a className="topWrapper_btn fr" type="submit" style={{marginLeft:5}} onClick={()=>this.deleteorder(orderId)}>关闭</a>
|
|
|
|
initialValue: textcount
|
|
|
|
<a className="topWrapper_btn fr" type="submit" style={{marginLeft:5}} onClick={this.handleSubmit}>保存</a>
|
|
|
|
})(
|
|
|
|
|
|
|
|
<TextArea placeholder="请输入工单的描述..." style={{height: "300px"}} onChange={this.changmodelcount}/>
|
|
|
|
|
|
|
|
)}
|
|
|
|
|
|
|
|
</Form.Item>
|
|
|
|
|
|
|
|
<UploadComponent load={this.UploadFunc}
|
|
|
|
|
|
|
|
showNotification={this.props.showNotification}></UploadComponent>
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
get_attachments ?
|
|
|
|
|
|
|
|
<Attachments attachments={get_attachments} showNotification={this.props.showNotification}
|
|
|
|
|
|
|
|
canDelete={true}/>
|
|
|
|
|
|
|
|
:
|
|
|
|
|
|
|
|
""
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
<p className="clearfix mt15 text-right">
|
|
|
|
|
|
|
|
<a className="topWrapper_btn fr" type="submit" style={{marginLeft: 5}}
|
|
|
|
|
|
|
|
onClick={this.handleSubmit}>保存</a>
|
|
|
|
|
|
|
|
<Link to={`/projects/${projectsId}/orders/${orderId}/detail`}
|
|
|
|
|
|
|
|
className="a_btn cancel_btn fr">取消</Link>
|
|
|
|
|
|
|
|
</p>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div className="list-left" style={{paddingRight: "0px", paddingLeft: "15px", paddingTop: "10px"}}>
|
|
|
|
</li>
|
|
|
|
<div className="list-l-panel">
|
|
|
|
</ul>
|
|
|
|
<Form.Item
|
|
|
|
</div>
|
|
|
|
label="分支"
|
|
|
|
<div className="list-left DetailRight">
|
|
|
|
>
|
|
|
|
<div className="list-l-panel">
|
|
|
|
{getFieldDecorator('branch_name', {
|
|
|
|
<Form.Item
|
|
|
|
initialValue: branch_name,
|
|
|
|
label="分支"
|
|
|
|
rules: [],
|
|
|
|
>
|
|
|
|
})(
|
|
|
|
{getFieldDecorator('branch_name', {
|
|
|
|
<Select>
|
|
|
|
initialValue:0,
|
|
|
|
<Option value={''}>分支未指定</Option>
|
|
|
|
rules: [],
|
|
|
|
{
|
|
|
|
})(
|
|
|
|
branches && branches.length > 0 && branches.map((item, key) => {
|
|
|
|
<Select value={branch_name} >
|
|
|
|
return (
|
|
|
|
<Option value={0}>分支未指定</Option>
|
|
|
|
<Option value={item}>{item}</Option>
|
|
|
|
{
|
|
|
|
)
|
|
|
|
branches && branches.length >0 && branches.map((item,key)=>{
|
|
|
|
})
|
|
|
|
return(
|
|
|
|
}
|
|
|
|
<Option value={item}>{item}</Option>
|
|
|
|
</Select>
|
|
|
|
)
|
|
|
|
)}
|
|
|
|
})
|
|
|
|
</Form.Item>
|
|
|
|
}
|
|
|
|
<Form.Item
|
|
|
|
</Select>
|
|
|
|
label="标签"
|
|
|
|
)}
|
|
|
|
>
|
|
|
|
</Form.Item>
|
|
|
|
{getFieldDecorator('issue_tag_ids', {
|
|
|
|
<Form.Item
|
|
|
|
initialValue: issue_tag_ids ? [issue_tag_ids] : "",
|
|
|
|
label="标签"
|
|
|
|
rules: [],
|
|
|
|
>
|
|
|
|
})(
|
|
|
|
{getFieldDecorator('issue_tag_ids', {
|
|
|
|
<Select>
|
|
|
|
initialValue:0,
|
|
|
|
<Option value={''}>未选择标签</Option>
|
|
|
|
rules: [],
|
|
|
|
{this.renderSelect(issue_chosen && issue_chosen.issue_tag)}
|
|
|
|
})(
|
|
|
|
</Select>
|
|
|
|
<Select value={issue_tag_ids}>
|
|
|
|
)}
|
|
|
|
<Option value={0}>未选择标签</Option>
|
|
|
|
</Form.Item>
|
|
|
|
{ this.renderSelect(issue_chosen && issue_chosen.issue_tag) }
|
|
|
|
<Form.Item
|
|
|
|
</Select>
|
|
|
|
label="里程碑"
|
|
|
|
)}
|
|
|
|
>
|
|
|
|
</Form.Item>
|
|
|
|
{getFieldDecorator('fixed_version_id', {
|
|
|
|
<Form.Item
|
|
|
|
initialValue: fixed_version_id ? fixed_version_id : "",
|
|
|
|
label="里程碑"
|
|
|
|
rules: [],
|
|
|
|
>
|
|
|
|
})(
|
|
|
|
{getFieldDecorator('fixed_version_id', {
|
|
|
|
<Select>
|
|
|
|
initialValue:0,
|
|
|
|
<Option value={''}>未选择里程碑</Option>
|
|
|
|
rules: [],
|
|
|
|
{this.renderSelect(issue_chosen && issue_chosen.issue_version)}
|
|
|
|
})(
|
|
|
|
</Select>
|
|
|
|
<Select value={fixed_version_id}>
|
|
|
|
)}
|
|
|
|
<Option value={0}>未选择里程碑</Option>
|
|
|
|
</Form.Item>
|
|
|
|
{ this.renderSelect(issue_chosen && issue_chosen.issue_version) }
|
|
|
|
<Form.Item
|
|
|
|
</Select>
|
|
|
|
label="状态"
|
|
|
|
)}
|
|
|
|
>
|
|
|
|
</Form.Item>
|
|
|
|
{getFieldDecorator('status_id', {
|
|
|
|
<Form.Item
|
|
|
|
initialValue: status_id,
|
|
|
|
label="状态"
|
|
|
|
rules: [{
|
|
|
|
>
|
|
|
|
required: true, message: '请选择完成状态'
|
|
|
|
{getFieldDecorator('status_id', {
|
|
|
|
}],
|
|
|
|
initialValue:status_id,
|
|
|
|
})(
|
|
|
|
rules: [{
|
|
|
|
<Select>
|
|
|
|
required: true, message: '请选择完成状态'
|
|
|
|
{this.renderSelect(issue_chosen && issue_chosen.issue_status)}
|
|
|
|
}],
|
|
|
|
</Select>
|
|
|
|
})(
|
|
|
|
)}
|
|
|
|
<Select >
|
|
|
|
</Form.Item>
|
|
|
|
{ this.renderSelect(issue_chosen && issue_chosen.issue_status) }
|
|
|
|
<Form.Item
|
|
|
|
</Select>
|
|
|
|
label="分类"
|
|
|
|
)}
|
|
|
|
>
|
|
|
|
</Form.Item>
|
|
|
|
{getFieldDecorator('tracker_id', {
|
|
|
|
<Form.Item
|
|
|
|
initialValue: tracker_id,
|
|
|
|
label="分类"
|
|
|
|
rules: [{
|
|
|
|
>
|
|
|
|
required: true, message: '请选择分类'
|
|
|
|
{getFieldDecorator('tracker_id', {
|
|
|
|
}],
|
|
|
|
initialValue:tracker_id,
|
|
|
|
})(
|
|
|
|
rules: [{
|
|
|
|
<Select>
|
|
|
|
required: true, message: '请选择分类'
|
|
|
|
{this.renderSelect(issue_chosen && issue_chosen.tracker)}
|
|
|
|
}],
|
|
|
|
</Select>
|
|
|
|
})(
|
|
|
|
)}
|
|
|
|
<Select value={tracker_id}>
|
|
|
|
</Form.Item>
|
|
|
|
{ this.renderSelect(issue_chosen && issue_chosen.tracker) }
|
|
|
|
<Form.Item
|
|
|
|
</Select>
|
|
|
|
label="指派成员"
|
|
|
|
)}
|
|
|
|
>
|
|
|
|
</Form.Item>
|
|
|
|
{getFieldDecorator('assigned_to_id', {
|
|
|
|
<Form.Item
|
|
|
|
initialValue: assigned_to_id ? assigned_to_id : "",
|
|
|
|
label="指派成员"
|
|
|
|
rules: [{}],
|
|
|
|
>
|
|
|
|
})(
|
|
|
|
{getFieldDecorator('assigned_to_id', {
|
|
|
|
<Select value={assigned_to_id}>
|
|
|
|
initialValue:assigned_to_id,
|
|
|
|
<Option value={''}>未指派成员</Option>
|
|
|
|
rules: [{
|
|
|
|
{this.renderSelect(issue_chosen && issue_chosen.assign_user)}
|
|
|
|
}],
|
|
|
|
</Select>
|
|
|
|
})(
|
|
|
|
)}
|
|
|
|
<Select value={assigned_to_id}>
|
|
|
|
</Form.Item>
|
|
|
|
<Option value={""}>未指派成员</Option>
|
|
|
|
<Form.Item
|
|
|
|
{ this.renderSelect(issue_chosen && issue_chosen.assign_user) }
|
|
|
|
label="优先度"
|
|
|
|
</Select>
|
|
|
|
>
|
|
|
|
)}
|
|
|
|
{getFieldDecorator('priority_id', {
|
|
|
|
</Form.Item>
|
|
|
|
|
|
|
|
<Form.Item
|
|
|
|
|
|
|
|
label="优先度"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
{getFieldDecorator('priority_id', {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
initialValue:priority_id,
|
|
|
|
initialValue: priority_id,
|
|
|
|
rules: [{
|
|
|
|
rules: [{
|
|
|
|
required: true, message: '请选择优先度'
|
|
|
|
required: true, message: '请选择优先度'
|
|
|
|
}],
|
|
|
|
}],
|
|
|
|
})(
|
|
|
|
})(
|
|
|
|
<Select>
|
|
|
|
<Select>
|
|
|
|
{ this.renderSelect(issue_chosen && issue_chosen.priority) }
|
|
|
|
{this.renderSelect(issue_chosen && issue_chosen.priority)}
|
|
|
|
</Select>
|
|
|
|
</Select>
|
|
|
|
)}
|
|
|
|
)}
|
|
|
|
</Form.Item>
|
|
|
|
</Form.Item>
|
|
|
|
<Form.Item
|
|
|
|
<Form.Item
|
|
|
|
label="完成度"
|
|
|
|
label="完成度"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
{getFieldDecorator('done_ratio', {
|
|
|
|
{getFieldDecorator('done_ratio', {
|
|
|
|
initialValue:done_ratio,
|
|
|
|
initialValue: done_ratio,
|
|
|
|
rules: [{
|
|
|
|
rules: [{
|
|
|
|
required: true, message: '请选择完成度'
|
|
|
|
required: true, message: '请选择完成度'
|
|
|
|
}],
|
|
|
|
}],
|
|
|
|
})(
|
|
|
|
})(
|
|
|
|
<Select value={done_ratio}>
|
|
|
|
<Select value={done_ratio}>
|
|
|
|
{ this.renderSelect(issue_chosen && issue_chosen.done_ratio) }
|
|
|
|
{this.renderSelect(issue_chosen && issue_chosen.done_ratio)}
|
|
|
|
</Select>
|
|
|
|
</Select>
|
|
|
|
)}
|
|
|
|
)}
|
|
|
|
</Form.Item>
|
|
|
|
</Form.Item>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</Form>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</Form>
|
|
|
|
<Modal
|
|
|
|
|
|
|
|
onCancel={this.handleCancel}
|
|
|
|
|
|
|
|
visible={this.state.isShow}
|
|
|
|
|
|
|
|
width="400px"
|
|
|
|
|
|
|
|
footer={
|
|
|
|
|
|
|
|
[]
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
bodyStyle={{textAlign: 'center'}}
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<img className="list_img"
|
|
|
|
|
|
|
|
src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1608431072,669449145&fm=27&gp=0.jpg"
|
|
|
|
|
|
|
|
alt=""/>
|
|
|
|
|
|
|
|
</Modal>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<Modal
|
|
|
|
|
|
|
|
onCancel={this.handleCancel}
|
|
|
|
|
|
|
|
visible={this.state.isShow}
|
|
|
|
|
|
|
|
width="400px"
|
|
|
|
|
|
|
|
footer={
|
|
|
|
|
|
|
|
[]
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
bodyStyle={{textAlign:'center'}}
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<img class="list_img" src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1608431072,669449145&fm=27&gp=0.jpg" alt=""/>
|
|
|
|
|
|
|
|
</Modal>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
