|
@@ -6,8 +6,8 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
|
|
|
import MySettlementDetaile from "./projectManageDetaile.jsx";
|
|
|
import moment from 'moment';
|
|
|
import '../userMangagement.less';
|
|
|
-import {projectState,orderState} from '../../../../dataDic.js';
|
|
|
-import {getProjectState,getOrderState,getOrderType,getPaymentState,getApprovedState} from '../../../../tools.js';
|
|
|
+import {projectState,orderState,distributeState} from '../../../../dataDic.js';
|
|
|
+import {getProjectState,getOrderState,getOrderType,getPaymentState,getApprovedState,getDistributeState} from '../../../../tools.js';
|
|
|
|
|
|
const ProjectOrder=Form.create()(React.createClass({
|
|
|
loadData(pageNo) {
|
|
@@ -34,7 +34,8 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
orderNo:this.state.orderNoSearch,//订单编号
|
|
|
deletedSign:this.state.deleteSignSearch,//锁定激活
|
|
|
serialNumber:this.state.serialNumberSearch,//项目编号
|
|
|
- principalName:this.state.principalNameSearch
|
|
|
+ principalName:this.state.principalNameSearch,
|
|
|
+ taskDistribution:this.state.distributeSearch
|
|
|
},
|
|
|
success: function (data) {
|
|
|
let theArr = [];
|
|
@@ -62,7 +63,8 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
buyerType:thisdata.buyerType,
|
|
|
salesmanName:thisdata.salesmanName,
|
|
|
departmentName:thisdata.departmentName,
|
|
|
- principalName:thisdata.principalName
|
|
|
+ principalName:thisdata.principalName,
|
|
|
+ taskDistribution:thisdata.taskDistribution
|
|
|
});
|
|
|
};
|
|
|
this.state.pagination.current = data.data.pageNo;
|
|
@@ -177,13 +179,19 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
key: 'approval',
|
|
|
render:(text)=>{return getApprovedState(text) }
|
|
|
},{
|
|
|
+ title: '分派情况',
|
|
|
+ dataIndex: 'taskDistribution',
|
|
|
+ key: 'taskDistribution',
|
|
|
+ render:(text)=>{return getDistributeState(text) }
|
|
|
+ },
|
|
|
+ {
|
|
|
title: '操作',
|
|
|
dataIndex: 'rr',
|
|
|
key: 'rr',
|
|
|
render:(text,record,index)=>{
|
|
|
return (
|
|
|
<div>
|
|
|
- {record.projectStatus==2||record.projectStatus==5?<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation(),this.Knot(record)}}>项目管理</Button>:''}
|
|
|
+ {record.projectStatus==2||record.projectStatus==5?<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation(),this.Knot(record)}}>派单</Button>:''}
|
|
|
{record.projectStatus==2&&<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation(),this.Knots(record)}}>结项</Button>}
|
|
|
{record.projectStatus==1||record.projectStatus==5?<Popconfirm title={'您将作废项目【'+record.roleName+'】,系统将自动同步作废项目任务及项目资料单,请确认'} onConfirm={(e)=>{this.scrapOrder(record)}} okText="确认" cancelText="取消">
|
|
|
<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">作废</Button>
|
|
@@ -255,6 +263,11 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
dataIndex: 'approval',
|
|
|
key: 'approval',
|
|
|
render:(text)=>{return getApprovedState(text) }
|
|
|
+ },{
|
|
|
+ title: '分派情况',
|
|
|
+ dataIndex: 'taskDistribution',
|
|
|
+ key: 'taskDistribution',
|
|
|
+ render:(text)=>{return getDistributeState(text) }
|
|
|
}
|
|
|
],
|
|
|
dataSource: [],
|
|
@@ -484,6 +497,7 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
this.state.orderStatusSearch = undefined;
|
|
|
this.state.salesmanNameSearch = '';
|
|
|
this.state.orderNoSearch='';
|
|
|
+ this.state.distributeSearch=undefined;
|
|
|
this.state.deleteSignSearch=undefined;
|
|
|
this.loadData();
|
|
|
},
|
|
@@ -521,7 +535,16 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
<Input placeholder="项目负责人" style={{width:'150px',marginRight:'10px'}}
|
|
|
value={this.state.principalNameSearch}
|
|
|
onChange={(e) => { this.setState({ principalNameSearch: e.target.value }); }} />
|
|
|
- <span style={{fontSize:'14px',marginRight:'5px'}}>立项时间:</span>
|
|
|
+ <Select placeholder="分派情况" style={{width:'150px',marginLeft:'10px'}}
|
|
|
+ value={this.state.distributeSearch}
|
|
|
+ onChange={(e) => { this.setState({ distributeSearch: e }) }}>
|
|
|
+ {
|
|
|
+ distributeState.map(function (item) {
|
|
|
+ return <Select.Option key={item.value} >{item.key}</Select.Option>
|
|
|
+ })
|
|
|
+ }
|
|
|
+ </Select>
|
|
|
+ <span style={{fontSize:'14px',marginRight:'5px'}}>立项时间:</span>
|
|
|
<RangePicker
|
|
|
value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
|
|
|
this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
|
|
@@ -548,6 +571,15 @@ const ProjectOrder=Form.create()(React.createClass({
|
|
|
})
|
|
|
}
|
|
|
</Select>
|
|
|
+ <Select placeholder="分派情况" style={{width:'150px',marginLeft:'10px'}}
|
|
|
+ value={this.state.distributeSearch}
|
|
|
+ onChange={(e) => { this.setState({ distributeSearch: e }) }}>
|
|
|
+ {
|
|
|
+ distributeState.map(function (item) {
|
|
|
+ return <Select.Option key={item.value} >{item.key}</Select.Option>
|
|
|
+ })
|
|
|
+ }
|
|
|
+ </Select>
|
|
|
<Input placeholder="订单负责人" style={{width:'150px',margin:'10px'}}
|
|
|
value={this.state.salesmanNameSearch}
|
|
|
onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />
|