|
@@ -2,6 +2,7 @@ import React from 'react';
|
|
import ajax from 'jquery/src/ajax/xhr.js';
|
|
import ajax from 'jquery/src/ajax/xhr.js';
|
|
import $ from 'jquery/src/ajax';
|
|
import $ from 'jquery/src/ajax';
|
|
import { Form,Radio, Button, Input, Select, Spin, Table, message, Modal ,Popconfirm} from 'antd';
|
|
import { Form,Radio, Button, Input, Select, Spin, Table, message, Modal ,Popconfirm} from 'antd';
|
|
|
|
+import {getPost} from '@/tools';
|
|
|
|
|
|
const Assign=React.createClass({
|
|
const Assign=React.createClass({
|
|
departmentList() {
|
|
departmentList() {
|
|
@@ -45,7 +46,7 @@ const Assign=React.createClass({
|
|
},
|
|
},
|
|
getInitialState() {
|
|
getInitialState() {
|
|
return {
|
|
return {
|
|
- contact:0,
|
|
|
|
|
|
+ contact:1,
|
|
selectedRows: [],
|
|
selectedRows: [],
|
|
searchMore: true,
|
|
searchMore: true,
|
|
loading: false,
|
|
loading: false,
|
|
@@ -81,7 +82,10 @@ const Assign=React.createClass({
|
|
title: '职务',
|
|
title: '职务',
|
|
dataIndex: 'position',
|
|
dataIndex: 'position',
|
|
key: 'position',
|
|
key: 'position',
|
|
- width:100
|
|
|
|
|
|
+ width:100,
|
|
|
|
+ render:text=>{
|
|
|
|
+ return getPost(text)
|
|
|
|
+ }
|
|
},{
|
|
},{
|
|
title: '联系手机',
|
|
title: '联系手机',
|
|
dataIndex: 'contactMobile',
|
|
dataIndex: 'contactMobile',
|
|
@@ -94,7 +98,7 @@ const Assign=React.createClass({
|
|
width:100,
|
|
width:100,
|
|
render:(text,record,index)=>{
|
|
render:(text,record,index)=>{
|
|
return (
|
|
return (
|
|
- <Popconfirm title={'您确认将(订单/任务/项目) 【'+this.props.data.orderNo+'】 分配给【'+record.departmentName+'-'+record.name+'】?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
|
|
|
|
|
|
+ <Popconfirm title={'您确认将'+this.props.title+' 【'+this.props.data.orderNo+'】 分配给【'+record.departmentName+'-'+record.name+'】?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
|
|
<Button style={{marginRight:'5px'}} type="primary">选定</Button>
|
|
<Button style={{marginRight:'5px'}} type="primary">选定</Button>
|
|
</Popconfirm>
|
|
</Popconfirm>
|
|
)
|
|
)
|
|
@@ -214,10 +218,11 @@ const Assign=React.createClass({
|
|
componentWillReceiveProps(nextProps) {
|
|
componentWillReceiveProps(nextProps) {
|
|
this.state.visible=nextProps.showDesc;
|
|
this.state.visible=nextProps.showDesc;
|
|
if(nextProps.showDesc){
|
|
if(nextProps.showDesc){
|
|
- this.departmentList();
|
|
|
|
|
|
+ this.contactList();
|
|
|
|
+ this.departmentList()
|
|
}
|
|
}
|
|
this.setState({
|
|
this.setState({
|
|
- contact:0
|
|
|
|
|
|
+ contact:1
|
|
})
|
|
})
|
|
},
|
|
},
|
|
render() {
|
|
render() {
|