dengzhiguo 6 years ago
parent
commit
0d09d043ad
28 changed files with 1319 additions and 740 deletions
  1. 1 3
      js/component/manageCenter/financialManage/bonus/jsBonus.jsx
  2. 1 3
      js/component/manageCenter/financialManage/bonus/yxBonus.jsx
  3. 4 0
      js/component/manageCenter/financialManage/content.less
  4. 18 3
      js/component/manageCenter/financialManage/distribute/inSpecial.jsx
  5. 16 3
      js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx
  6. 16 3
      js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx
  7. 20 5
      js/component/manageCenter/financialManage/distribute/outSpecial.jsx
  8. 1 0
      js/component/manageCenter/financialManage/distribute/paiDan.jsx
  9. 10 0
      js/component/manageCenter/financialManage/distribute/public.less
  10. 2 0
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  11. 95 1
      js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx
  12. 93 4
      js/component/manageCenter/order/orderNew/addService.jsx
  13. 91 0
      js/component/manageCenter/order/orderNew/approveds.jsx
  14. 134 25
      js/component/manageCenter/order/orderNew/billing.jsx
  15. 90 0
      js/component/manageCenter/order/orderNew/chargeback.jsx
  16. 89 0
      js/component/manageCenter/order/orderNew/examine.jsx
  17. 90 0
      js/component/manageCenter/order/orderNew/inquiry.jsx
  18. 5 3
      js/component/manageCenter/order/orderNew/press.jsx
  19. 90 0
      js/component/manageCenter/order/orderNew/reject.jsx
  20. 91 0
      js/component/manageCenter/project/project/projectAssignment.jsx
  21. 91 0
      js/component/manageCenter/project/project/projectQuery.jsx
  22. 3 0
      js/component/manageCenter/project/task/table.less
  23. 1 1
      js/component/manageCenter/project/task/taskCount.jsx
  24. 0 677
      js/component/manageCenter/project/task/taskQuery.1.jsx
  25. 246 3
      js/component/manageCenter/project/task/taskQuery.jsx
  26. 5 5
      js/component/manageCenter/publicComponent/assign.jsx
  27. 15 0
      js/component/manageCenter/set/organization/organization.jsx
  28. 1 1
      package.json

+ 1 - 3
js/component/manageCenter/financialManage/bonus/jsBonus.jsx

@@ -381,9 +381,7 @@ const JsBonus = React.createClass({
                     </Select>    
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
-                    <div style={{float:'right'}}>
-                       <Button onClick={this.exportExec}>导出excel</Button>
-                    </div>
+                    <Button onClick={this.exportExec} type='primary'>导出excel</Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                         <span>签单时间 :</span>

+ 1 - 3
js/component/manageCenter/financialManage/bonus/yxBonus.jsx

@@ -364,9 +364,7 @@ const YxBonus = React.createClass({
 
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
-                    <div style={{float:'right'}}>
-                       <Button onClick={this.exportExec}>导出excel</Button>
-                    </div>
+                    <Button onClick={this.exportExec} type='primary'>导出excel</Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                         <span>签单时间 :</span>

+ 4 - 0
js/component/manageCenter/financialManage/content.less

@@ -28,6 +28,10 @@
     }
 }
 
+.ant-modal-close {
+	color: rgba(255,0,0,1);
+}
+
 .ant-modal-body {
     .modal-box {
         overflow: hidden;

+ 18 - 3
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -4,7 +4,7 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './public.less';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Checkbox ,Modal, Upload ,Popconfirm,Cascader,Tabs} from 'antd';
-import {getProcessStatus,getApproval,getProvinceA,beforeUploadFile,getInvoiceStatus,getprovince,splitUrl} from '@/tools';
+import {getProcessStatus,getProjectStatus,getApproval,getProvinceA,beforeUploadFile,getInvoiceStatus,getprovince,splitUrl} from '@/tools';
 import {projectProgress,specially,province,invoiceStatus} from '../../../dataDic.js';
 
 const FormItem = Form.Item;
@@ -199,6 +199,7 @@ const inSpecial = React.createClass({
 							addresseeProvince:thisdata.addresseeProvince,
 							addresseeCity:thisdata.addresseeCity,
 							addresseeArea:thisdata.addresseeArea,
+							alreadyAmount:thisdata.alreadyAmount,
 							recipientAddress:thisdata.recipientAddress,
 							orgCodeUrl: thisdata.voucherUrl ? splitUrl(thisdata.voucherUrl, ',', globalConfig.avatarHost + '/upload') : [],
 						})
@@ -251,6 +252,9 @@ const inSpecial = React.createClass({
                     title: '项目状态',
                     dataIndex: 'projectStatus',
                     key: 'projectStatus',
+					render:(text)=>{
+						return getProjectStatus(text)
+					}
                 },
                 {
                     title: '申请开票(万)',
@@ -428,7 +432,7 @@ const inSpecial = React.createClass({
 			    } else {
 			        for (let i = 0; i < data.data.list.length; i++) {
 			            let thisdata = data.data.list[i];
-						sum += parseFloat(thisdata.amount).toFixed(4);
+						sum += parseFloat(thisdata.amount);
 			            theArr.push({
 			                 id: thisdata.id,
 			                 orderno: thisdata.orderno,//订单编号
@@ -616,7 +620,7 @@ const inSpecial = React.createClass({
 									        {...formItemLayout}
 									        label={
 									        	<span>
-									        		<strong style={{ color: '#f00' }}>*</strong>开票金额
+									        		<strong style={{ color: '#f00' }}>*</strong>开票金额(万元)
 									        	</span> 
 									        } >                             
 									        <span>{this.state.amount}</span>
@@ -698,6 +702,7 @@ const inSpecial = React.createClass({
 										<span>{this.state.post===0?'是':"否"}</span>
 									</FormItem>
 								</div>
+								{this.state.post === 0?<div>
 								<div className="clearfix">
 									<FormItem className="half-item"
 									        {...formItemLayout}
@@ -726,6 +731,16 @@ const inSpecial = React.createClass({
 										<span>{this.state.recipientAddress}</span>
 								    </FormItem>
 								</div>
+								</div>:''}
+								<FormItem className="half-item"
+								        {...formItemLayout}
+								        label={
+								        	<span>
+								        		<strong style={{ color: '#f00' }}>*</strong>开票金额总计
+								        	</span> 
+								        } >                             
+								        <span>{this.state.alreadyAmount}万元</span>
+								</FormItem>
 							</div>
 						</Spin>
 					</Form>

+ 16 - 3
js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx

@@ -4,7 +4,7 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './public.less';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Checkbox ,Modal, Upload ,Popconfirm,Cascader,Tabs} from 'antd';
-import {getProcessStatus,getApproval,getProvinceA,beforeUploadFile,getInvoiceStatus,getprovince,splitUrl} from '@/tools';
+import {getProcessStatus,getProjectStatus,getApproval,getProvinceA,beforeUploadFile,getInvoiceStatus,getprovince,splitUrl} from '@/tools';
 import {projectProgress,specially,province,invoiceStatus} from '../../../dataDic.js';
 
 const FormItem = Form.Item;
@@ -201,6 +201,7 @@ const invoiceApplyList = React.createClass({
 							addresseeProvince:thisdata.addresseeProvince,
 							addresseeCity:thisdata.addresseeCity,
 							addresseeArea:thisdata.addresseeArea,
+							alreadyAmount:thisdata.alreadyAmount,
 							recipientAddress:thisdata.recipientAddress,
 							orgCodeUrl: thisdata.voucherUrl ? splitUrl(thisdata.voucherUrl, ',', globalConfig.avatarHost + '/upload') : [],
 						})
@@ -253,6 +254,9 @@ const invoiceApplyList = React.createClass({
                     title: '项目状态',
                     dataIndex: 'projectStatus',
                     key: 'projectStatus',
+					render:(text)=>{
+						return getProjectStatus(text)
+					}
                 },
                 {
                     title: '申请开票(万)',
@@ -430,7 +434,7 @@ const invoiceApplyList = React.createClass({
 			    } else {
 			        for (let i = 0; i < data.data.list.length; i++) {
 			            let thisdata = data.data.list[i];
-						sum += parseFloat(thisdata.amount).toFixed(4);
+						sum += parseFloat(thisdata.amount);
 			            theArr.push({
 			                 id: thisdata.id,
 			                 orderno: thisdata.orderno,//订单编号
@@ -627,7 +631,7 @@ const invoiceApplyList = React.createClass({
 									        {...formItemLayout}
 									        label={
 									        	<span>
-									        		<strong style={{ color: '#f00' }}>*</strong>开票金额
+									        		<strong style={{ color: '#f00' }}>*</strong>开票金额(万元)
 									        	</span> 
 									        } >                             
 									        <span>{this.state.amount}</span>
@@ -739,6 +743,15 @@ const invoiceApplyList = React.createClass({
 								    </FormItem>
 								</div>
 								</div>:''}
+								<FormItem className="half-item"
+								        {...formItemLayout}
+								        label={
+								        	<span>
+								        		<strong style={{ color: '#f00' }}>*</strong>开票金额总计
+								        	</span> 
+								        } >                             
+								        <span>{this.state.alreadyAmount}万元</span>
+								</FormItem>
 							</div>
 						</Spin>
 					</Form>

+ 16 - 3
js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx

@@ -4,7 +4,7 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './public.less';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Checkbox ,Modal, Upload ,Popconfirm,Cascader,Tabs} from 'antd';
-import {getProcessStatus,getApproval,getProvinceA,beforeUploadFile,getInvoiceStatus,getprovince,splitUrl} from '@/tools';
+import {getProcessStatus,getProjectStatus,getApproval,getProvinceA,beforeUploadFile,getInvoiceStatus,getprovince,splitUrl} from '@/tools';
 import {projectProgress,specially,province,invoiceStatus} from '../../../dataDic.js';
 
 const FormItem = Form.Item;
@@ -201,6 +201,7 @@ const invoiceApplyListWai = React.createClass({
 							addresseeProvince:thisdata.addresseeProvince,
 							addresseeCity:thisdata.addresseeCity,
 							addresseeArea:thisdata.addresseeArea,
+							alreadyAmount:thisdata.alreadyAmount,
 							recipientAddress:thisdata.recipientAddress,
 							orgCodeUrl: thisdata.voucherUrl ? splitUrl(thisdata.voucherUrl, ',', globalConfig.avatarHost + '/upload') : [],
 						})
@@ -253,6 +254,9 @@ const invoiceApplyListWai = React.createClass({
                     title: '项目状态',
                     dataIndex: 'projectStatus',
                     key: 'projectStatus',
+					render:(text)=>{
+						return getProjectStatus(text)
+					}
                 },
                 {
                     title: '申请开票(万)',
@@ -430,7 +434,7 @@ const invoiceApplyListWai = React.createClass({
 			    } else {
 			        for (let i = 0; i < data.data.list.length; i++) {
 			            let thisdata = data.data.list[i];
-						sum += parseFloat(thisdata.amount).toFixed(4);
+						sum += parseFloat(thisdata.amount);
 			            theArr.push({
 			                 id: thisdata.id,
 			                 orderno: thisdata.orderno,//订单编号
@@ -627,7 +631,7 @@ const invoiceApplyListWai = React.createClass({
 									        {...formItemLayout}
 									        label={
 									        	<span>
-									        		<strong style={{ color: '#f00' }}>*</strong>开票金额
+									        		<strong style={{ color: '#f00' }}>*</strong>开票金额(万元)
 									        	</span> 
 									        } >                             
 									        <span>{this.state.amount}</span>
@@ -739,6 +743,15 @@ const invoiceApplyListWai = React.createClass({
 								    </FormItem>
 								</div>
 								</div>:''}
+								<FormItem className="half-item"
+								        {...formItemLayout}
+								        label={
+								        	<span>
+								        		<strong style={{ color: '#f00' }}>*</strong>开票金额总计
+								        	</span> 
+								        } >                             
+								        <span>{this.state.alreadyAmount}万元</span>
+								</FormItem>
 							</div>
 						</Spin>
 					</Form>

+ 20 - 5
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -4,7 +4,7 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './public.less';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Checkbox ,Modal, Upload ,Popconfirm,Cascader,Tabs} from 'antd';
-import {getProcessStatus,getApproval,getProvinceA,beforeUploadFile,getInvoiceStatus,getprovince,splitUrl} from '@/tools';
+import {getProcessStatus,getProjectStatus,getApproval,getProvinceA,beforeUploadFile,getInvoiceStatus,getprovince,splitUrl} from '@/tools';
 import {projectProgress,specially,province,invoiceStatus} from '../../../dataDic.js';
 
 const FormItem = Form.Item;
@@ -199,6 +199,7 @@ const outSpecial = React.createClass({
 							addresseeProvince:thisdata.addresseeProvince,
 							addresseeCity:thisdata.addresseeCity,
 							addresseeArea:thisdata.addresseeArea,
+							alreadyAmount:thisdata.alreadyAmount,
 							recipientAddress:thisdata.recipientAddress,
 							orgCodeUrl: thisdata.voucherUrl ? splitUrl(thisdata.voucherUrl, ',', globalConfig.avatarHost + '/upload') : [],
 						})
@@ -251,6 +252,9 @@ const outSpecial = React.createClass({
                     title: '项目状态',
                     dataIndex: 'projectStatus',
                     key: 'projectStatus',
+					render:(text)=>{
+						return getProjectStatus(text)
+					}
                 },
                 {
                     title: '申请开票(万)',
@@ -428,7 +432,7 @@ const outSpecial = React.createClass({
 			    } else {
 			        for (let i = 0; i < data.data.list.length; i++) {
 			            let thisdata = data.data.list[i];
-						sum += parseFloat(thisdata.amount).toFixed(4);
+						sum += parseFloat(thisdata.amount);
 			            theArr.push({
 			                 id: thisdata.id,
 			                 orderno: thisdata.orderno,//订单编号
@@ -508,7 +512,7 @@ const outSpecial = React.createClass({
                     <Input placeholder="订单编号"
                         value={this.state.orderNoSearch}
                         onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
-					<Select placeholder="订单部门"
+					{/*<Select placeholder="订单部门"
 					    style={{ width: 150 ,marginRight:10}}
 					    value={this.state.departmenttList}
 					    onChange={(e) => { this.setState({ departmenttList: e }) }}>
@@ -517,7 +521,7 @@ const outSpecial = React.createClass({
 					                return <Select.Option key={item.id} >{item.name}</Select.Option>
 					        })
 					    }
-					</Select>
+					</Select>*/}
                     <Button type="primary" onClick={this.search} style={{ marginLeft:10}}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                 </div>
@@ -616,7 +620,7 @@ const outSpecial = React.createClass({
 									        {...formItemLayout}
 									        label={
 									        	<span>
-									        		<strong style={{ color: '#f00' }}>*</strong>开票金额
+									        		<strong style={{ color: '#f00' }}>*</strong>开票金额(万元)
 									        	</span> 
 									        } >                             
 									        <span>{this.state.amount}</span>
@@ -698,6 +702,7 @@ const outSpecial = React.createClass({
 										<span>{this.state.post===0?'是':"否"}</span>
 									</FormItem>
 								</div>
+								{this.state.post === 0?<div>
 								<div className="clearfix">
 									<FormItem className="half-item"
 									        {...formItemLayout}
@@ -726,6 +731,16 @@ const outSpecial = React.createClass({
 										<span>{this.state.recipientAddress}</span>
 								    </FormItem>
 								</div>
+								</div>:''}
+								<FormItem className="half-item"
+								        {...formItemLayout}
+								        label={
+								        	<span>
+								        		<strong style={{ color: '#f00' }}>*</strong>开票金额总计
+								        	</span> 
+								        } >                             
+								        <span>{this.state.alreadyAmount}万元</span>
+								</FormItem>
 							</div>
 						</Spin>
 					</Form>

+ 1 - 0
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -310,6 +310,7 @@ const PaiDan = React.createClass({
                     showDesc={this.state.assignVisible}
                     closeDesc={this.closeAssign.bind(this)
 					}
+					roleName={'财务专员'}
 					requestMethod={"post"}
                 />
                 <Modal visible={this.state.boHuiVisible} 

+ 10 - 0
js/component/manageCenter/financialManage/distribute/public.less

@@ -38,6 +38,11 @@ button:focus,button:active{
     width: 50%;
     display: inline-block;
 }
+.large-item {
+	float: left;
+	width: 80%;
+	margin-bottom: 10px;
+}
 table tr span,table tr td{
     overflow: hidden;
     white-space:nowrap; 
@@ -66,6 +71,11 @@ table tr span,table tr td{
         width: 50%;
         margin-bottom: 10px;
     }
+	.large-item {
+		float: left;
+		width: 80%;
+		margin-bottom: 10px;
+	}
     .item-title {
         line-height: 30px;
         font-size: 14px;

+ 2 - 0
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -149,6 +149,7 @@ const ShouKuang = React.createClass({
                     title: '订单编号',
                     dataIndex: 'orderNo',
                     key: 'orderNo',
+					fixed:'left'
                 },
                 {
                     title: '签单日期',
@@ -395,6 +396,7 @@ const ShouKuang = React.createClass({
                         <Table columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             rowSelection={false}
+							scroll={{ x: true, y: 0 }}
                             pagination={this.state.pagination}
                             onRowClick={this.tableRowClick.bind(this)} />
                     </Spin>

+ 95 - 1
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -230,7 +230,23 @@ const NewService = Form.create()(React.createClass({
                     dataIndex: 'confirmTime',
                     key: 'confirmTime',
                 }
-			]
+			],
+			columnsrizhi:[
+							{
+								title:'流程',
+								dataIndex: 'processName',
+								key: 'processName'
+							},
+							{
+								title:'操作人',
+								dataIndex: 'adminName',
+								key: 'adminName'
+							},{
+								title:'时间',
+								dataIndex: 'createDate',
+								key: 'createDate'
+							}
+						],
 		};
 	},
 	//新建订单、编辑订单保存
@@ -409,6 +425,62 @@ const NewService = Form.create()(React.createClass({
 			addnextVisible: true
 		})
 	},
+	
+	rizhi(){
+			console.log(this.state.orderNo)
+			this.setState({
+				loading:true
+			})
+			$.ajax({
+				method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: '/api/admin/newOrder/selectOrderLog',
+				data: {
+				  orderNo:this.props.datauser.orderNo
+				},
+				success: function (data) {
+					let theArr = [];
+				    let thisData = data.data;                
+				    if (!thisData.length) {
+				        if (data.error && data.error.length) {
+				            message.warning(data.error[0].message);
+				        };
+				        thisData = {};
+				    }else{
+				       for(let i = 0; i < data.data.length; i++) {
+				       	let thisdata = data.data[i];
+				       	theArr.push({
+				       		processName:thisdata.processName,		
+				       		adminName:thisdata.adminName,		
+				       		createDate:thisdata.createDate,
+				       	});
+				       };
+				    };
+					this.setState({
+						dataSourcerizhi: theArr
+					})
+				 }.bind(this),
+				}).always(function () {
+				     this.setState({            	
+				         loading: false
+				     });
+				 }.bind(this));
+			},
+		
+		//查看订单日志
+		getOrderLog(){
+			this.setState({
+				rizhivisible:true
+			})
+			this.rizhi()
+		},
+		closeOrderLog(){
+			this.setState({
+				rizhivisible:false
+			})
+		},
+	
 	nextCancel() {
 		this.setState({
 			addnextVisible: false
@@ -1342,6 +1414,9 @@ const NewService = Form.create()(React.createClass({
 												                    fileList={this.getOrgCodeUrl}
 												                    pictureUrl={this.state.orgCodeUrl} />
 												                    <p>图片建议:要清晰。</p>
+																<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
+																															onClick={this.getOrderLog}
+																						>查看订单							日志</Button>	
 												            </FormItem>
 												        </div>
 												        <div className='clearfix'>
@@ -1418,6 +1493,9 @@ const NewService = Form.create()(React.createClass({
 									                                onCancel={() => { this.setState({ previewVisible: false }) }}>
 									                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
 									                            </Modal>
+																<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
+																															onClick={this.getOrderLog}
+																						>查看订单							日志</Button>
 									                        </FormItem>    
 								                        </div>
 								                        <div className='clearfix'>
@@ -1925,6 +2003,22 @@ const NewService = Form.create()(React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
+					<Modal  visible={this.state.rizhivisible}
+							className="admin-desc-content"
+							width='800px'
+							maskClosable={false}
+							title='订单日志'
+							footer={null}
+							onCancel={this.closeOrderLog}>
+							<div className="patent-table">
+							    <Spin spinning={this.state.loading}>
+							        <Table columns={this.state.columnsrizhi}
+							            dataSource={this.state.dataSourcerizhi}
+										pagination={false}
+							            />
+							    </Spin>
+							</div>
+					</Modal>
     	    </div>
 		)
 	}

+ 93 - 4
js/component/manageCenter/order/orderNew/addService.jsx

@@ -236,6 +236,22 @@ const NewService = Form.create()(React.createClass({
 							}
                 }
 			],
+			columnsrizhi:[
+				{
+					title:'流程',
+					dataIndex: 'processName',
+					key: 'processName'
+				},
+				{
+					title:'操作人',
+					dataIndex: 'adminName',
+					key: 'adminName'
+				},{
+					title:'时间',
+					dataIndex: 'createDate',
+					key: 'createDate'
+				}
+			],
 			
 			contactList:[],
 			loading:false,
@@ -394,7 +410,6 @@ const NewService = Form.create()(React.createClass({
 				legalPerson: this.state.legalPerson,//企业法人
 				legalPersonTel: this.state.legalPersonTel,//企业法人联系电话
 				approval: this.state.approval,//特批状态
-				contractNo: this.state.contractNo,//合同编号
 				orderRemarks: this.state.orderRemarks,//订单备注
 				contractPictureUrl:theorgCodeUrl.length?theorgCodeUrl:'',
 				orderDep:this.state.organizationSearch
@@ -434,7 +449,6 @@ const NewService = Form.create()(React.createClass({
 				legalPerson: this.state.legalPerson,//企业法人
 				legalPersonTel: this.state.legalPersonTel,//企业法人联系电话
 				approval: this.state.approval,//特批状态
-				contractNo: this.state.contractNo,//合同编号
 				orderRemarks: this.state.orderRemarks,//订单备注
 			}
 		}).done(function(data) {
@@ -690,6 +704,60 @@ const NewService = Form.create()(React.createClass({
 		})
 	},
 	
+	rizhi(){
+		this.setState({
+			loading:true
+		})
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: '/api/admin/newOrder/selectOrderLog',
+			data: {
+			  orderNo:this.props.datauser.orderNo
+			},
+			success: function (data) {
+				let theArr = [];
+			    let thisData = data.data;                
+			    if (!thisData.length) {
+			        if (data.error && data.error.length) {
+			            message.warning(data.error[0].message);
+			        };
+			        thisData = {};
+			    }else{
+			       for(let i = 0; i < data.data.length; i++) {
+			       	let thisdata = data.data[i];
+			       	theArr.push({
+			       		processName:thisdata.processName,		
+			       		adminName:thisdata.adminName,		
+			       		createDate:thisdata.createDate,
+			       	});
+			       };
+			    };
+				this.setState({
+					dataSourcerizhi: theArr
+				})
+			 }.bind(this),
+			}).always(function () {
+			     this.setState({            	
+			         loading: false
+			     });
+			 }.bind(this));
+		},
+	
+	//查看订单日志
+	getOrderLog(){
+		this.setState({
+			rizhivisible:true
+		})
+		this.rizhi()
+	},
+	closeOrderLog(){
+		this.setState({
+			rizhivisible:false
+		})
+	},
+	
 	getOrgCodeUrl(e) {
         this.setState({ orgCodeUrl: e });
     },
@@ -1156,8 +1224,7 @@ const NewService = Form.create()(React.createClass({
 						                    		<FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="合同编号" >                             
-							                                {this.state.processStatus==0?<Input placeholder="请输入合同编号" value={this.state.contractNo}
-							                                    	onChange={(e)=>{this.setState({contractNo:e.target.value})}} style={{width:'240px'}} />:<span>{this.state.contractNo}</span>}
+							                                {<span>{this.state.contractNo}</span>}
 								                    </FormItem>
 						                    		<FormItem className="half-item"
 							                            {...formItemLayout}
@@ -1317,6 +1384,9 @@ const NewService = Form.create()(React.createClass({
 											                    fileList={this.getOrgCodeUrl}
 											                    pictureUrl={this.state.orgCodeUrl} />
 											                    <p>图片建议:要清晰。</p>
+															<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
+															onClick={this.getOrderLog}
+						>查看订单							日志</Button>	
 											            </FormItem>:
 											            <FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="合同扫描件">
 								                            <Upload className="demandDetailShow-upload"
@@ -1334,6 +1404,9 @@ const NewService = Form.create()(React.createClass({
 								                                onCancel={() => { this.setState({ previewVisible: false }) }}>
 								                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
 								                            </Modal>
+															<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
+															onClick={this.getOrderLog}
+						>查看订单							日志</Button>
 								                        </FormItem>}
 												    </div>
 												        <div className='clearfix'>
@@ -1627,6 +1700,22 @@ const NewService = Form.create()(React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
+					<Modal  visible={this.state.rizhivisible}
+							className="admin-desc-content"
+							width='800px'
+							maskClosable={false}
+							title='订单日志'
+							footer={null}
+							onCancel={this.closeOrderLog}>
+							<div className="patent-table">
+							    <Spin spinning={this.state.loading}>
+							        <Table columns={this.state.columnsrizhi}
+							            dataSource={this.state.dataSourcerizhi}
+										pagination={false}
+							            />
+							    </Spin>
+							</div>
+					</Modal>
     	    </div>
 		)
 	}

+ 91 - 0
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -256,6 +256,22 @@ const IntentionCustomer = Form.create()(React.createClass({
 					}
                 }
 			],
+			columnsrizhi:[
+							{
+								title:'流程',
+								dataIndex: 'processName',
+								key: 'processName'
+							},
+							{
+								title:'操作人',
+								dataIndex: 'adminName',
+								key: 'adminName'
+							},{
+								title:'时间',
+								dataIndex: 'createDate',
+								key: 'createDate'
+							}
+						],
 			dataSourceX: [],
 			ContactsLists: [{
 					title: '催款科目',
@@ -406,6 +422,62 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
+	
+	rizhi(){
+			console.log(this.state.orderNo)
+			this.setState({
+				loading:true
+			})
+			$.ajax({
+				method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: '/api/admin/newOrder/selectOrderLog',
+				data: {
+				  orderNo:this.state.orderNo
+				},
+				success: function (data) {
+					let theArr = [];
+				    let thisData = data.data;                
+				    if (!thisData.length) {
+				        if (data.error && data.error.length) {
+				            message.warning(data.error[0].message);
+				        };
+				        thisData = {};
+				    }else{
+				       for(let i = 0; i < data.data.length; i++) {
+				       	let thisdata = data.data[i];
+				       	theArr.push({
+				       		processName:thisdata.processName,		
+				       		adminName:thisdata.adminName,		
+				       		createDate:thisdata.createDate,
+				       	});
+				       };
+				    };
+					this.setState({
+						dataSourcerizhi: theArr
+					})
+				 }.bind(this),
+				}).always(function () {
+				     this.setState({            	
+				         loading: false
+				     });
+				 }.bind(this));
+			},
+		
+		//查看订单日志
+		getOrderLog(){
+			this.setState({
+				rizhivisible:true
+			})
+			this.rizhi()
+		},
+		closeOrderLog(){
+			this.setState({
+				rizhivisible:false
+			})
+		},
+	
 	//节点列表
 	jiedian(orderNos) {
 		$.ajax({
@@ -775,6 +847,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 							                    fileList={this.getOrgCodeUrl}
 							                    pictureUrl={this.state.orgCodeUrl} />
 							                    <p>图片建议:要清晰。</p>
+											<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
+																										onClick={this.getOrderLog}
+																	>查看订单							日志</Button>	
 							            </FormItem>
 							        </div>
 							        <div className='clearfix'>
@@ -906,6 +981,22 @@ const IntentionCustomer = Form.create()(React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
+					<Modal  visible={this.state.rizhivisible}
+							className="admin-desc-content"
+							width='800px'
+							maskClosable={false}
+							title='订单日志'
+							footer={null}
+							onCancel={this.closeOrderLog}>
+							<div className="patent-table">
+							    <Spin spinning={this.state.loading}>
+							        <Table columns={this.state.columnsrizhi}
+							            dataSource={this.state.dataSourcerizhi}
+										pagination={false}
+							            />
+							    </Spin>
+							</div>
+					</Modal>
                	</div>  
             </div>
 			);

+ 134 - 25
js/component/manageCenter/order/orderNew/billing.jsx

@@ -53,7 +53,7 @@ const PicturesWall = React.createClass({
                 <Upload
                 	beforeUpload={beforeUploadFile}
                     action={globalConfig.context + "/api/admin/orderInvoice/uploadOrderInvoiceFile"}
-                    data={{ 'sign': '' }}
+                    data={{ 'sign': 'order_invoice_file' }}
                     listType="picture-card"
                     fileList={fileList}
                     onPreview={this.handlePreview}
@@ -149,6 +149,7 @@ const MyService=Form.create()(React.createClass({
 			flag:false,
             searchMore: true,
             loading: false,
+			alreadyAmount:0,
             intentOrder:true,
             formalOrder:true,
             pagination: {
@@ -284,7 +285,7 @@ const MyService=Form.create()(React.createClass({
 				invoiceType:this.state.invoiceType,
 				unitName:this.state.unitName,
 				taxNumber:this.state.taxNumber,
-				amount:this.state.amount,
+				amount:parseFloat(this.state.amount),
 				banks:this.state.banks,
 				content:this.state.content,
 				unitAddress:this.state.unitAddress,
@@ -297,7 +298,8 @@ const MyService=Form.create()(React.createClass({
 				addresseeProvince:this.state.post === 0?this.state.ProvinceCity[0]:'',
 				addresseeCity:this.state.post === 0?this.state.ProvinceCity[1]:'',
 				addresseeArea:this.state.post === 0?this.state.ProvinceCity[2]:'',
-				recipientAddress:this.state.recipientAddress},
+				recipientAddress:this.state.recipientAddress,
+				alreadyAmount:parseFloat(this.state.alreadyAmount)},
 			sumData = {},
 			sumData1 = {};
 		switch (this.state.status) {
@@ -308,7 +310,30 @@ const MyService=Form.create()(React.createClass({
 			case 1:api = '/api/admin/orderInvoice/createOrderInvoice';
 					api1 = '/api/admin/orderInvoice/updateOrderInvoice'
 					sumData = fdata;
-					sumData1 = fdata;
+					sumData1 = {
+				orderNo:this.state.orderNo3,
+				type:this.state.type,
+				status:this.state.status,
+				approval:this.state.ordapproval,
+				remarks:this.state.remarks,
+				invoiceType:this.state.invoiceType,
+				unitName:this.state.unitName,
+				taxNumber:this.state.taxNumber,
+				amount:parseFloat(this.state.amount),
+				banks:this.state.banks,
+				content:this.state.content,
+				unitAddress:this.state.unitAddress,
+				invoiceRemarks:this.state.invoiceRemarks,
+				unitMobile:this.state.unitMobile,
+				voucherUrl:theorgCodeUrl.length?theorgCodeUrl:'',
+				post:this.state.post,
+				addressee:this.state.addressee,
+				addresseeMobile:this.state.addresseeMobile,
+				addresseeProvince:this.state.post === 0?this.state.ProvinceCity[0]:'',
+				addresseeCity:this.state.post === 0?this.state.ProvinceCity[1]:'',
+				addresseeArea:this.state.post === 0?this.state.ProvinceCity[2]:'',
+				recipientAddress:this.state.recipientAddress,
+				alreadyAmount:parseFloat(this.state.alreadyAmount)};
 					sumData1.id = this.state.id;
 					method = 'post'
 				break;
@@ -344,6 +369,18 @@ const MyService=Form.create()(React.createClass({
 				message.warning('金额不能为空')
 				return
 			}
+			if (isNaN(this.state.amount)) {
+				message.warning('开票金额包含非法字符,请重新输入')
+				return
+			}
+			if (isNaN(this.state.alreadyAmount)) {
+				message.warning('开票金额总计包含非法字符,请重新输入')
+				return
+			}
+			if (parseFloat(this.state.alreadyAmount)<0) {
+				message.warning('开票金额总计不能小于0,请重新输入')
+				return
+			}
 			if (!this.state.banks) {
 				message.warning('开户行不能为空')
 				return
@@ -360,7 +397,12 @@ const MyService=Form.create()(React.createClass({
 				message.warning('单位电话不能为空')
 				return
 			}
+			if (this.state.alreadyAmount === '') {
+				message.warning('开票金额总计不能为空')
+				return
+			}
 		}
+		console.log(this.state.flag,this.state.status)
         this.setState({
             loading: true
         });
@@ -399,6 +441,7 @@ const MyService=Form.create()(React.createClass({
 								addresseeProvince:thisdata.addresseeProvince,
 								addresseeCity:thisdata.addresseeCity,
 								addresseeArea:thisdata.addresseeArea,
+								alreadyAmount:thisdata.alreadyAmount,
 								ProvinceCity: ProvinceCityArr[0]!=null?ProvinceCityArr:undefined,//省市区
 								recipientAddress:thisdata.recipientAddress,
 								orgCodeUrl: thisdata.voucherUrl ? splitUrl(thisdata.voucherUrl, ',', globalConfig.avatarHost + '/upload') : [],
@@ -412,8 +455,10 @@ const MyService=Form.create()(React.createClass({
 			if(!data.error.length) {
 				if(this.state.status === 1){
 					message.success('提交成功!');
-					this.inRecordData()
 					this.visitCancels()
+					if (this.state.flag) {
+						this.inRecordData()
+					}
 				}else if(this.state.status === 0){
 					message.success('保存成功!');
 					this.visitCancels()
@@ -450,6 +495,7 @@ const MyService=Form.create()(React.createClass({
 			addresseeArea:'',
 			recipientAddress:'',
 			ordapproval:undefined,
+			alreadyAmount:'',
 			ProvinceCity:[]
 		})
 	},
@@ -510,10 +556,9 @@ const MyService=Form.create()(React.createClass({
 			orderNo3:record.orderNo,
 			avisible:true,
 			flag:false,
-			type:0,
 			invoiceType:0,
+			alreadyAmount:0,
 			unitName:this.state.dataSource[index].userName,
-			ordapproval:0,
 			post:1
 		})
 	},
@@ -564,6 +609,7 @@ const MyService=Form.create()(React.createClass({
 							addresseeProvince:thisdata.addresseeProvince,
 							addresseeCity:thisdata.addresseeCity,
 							addresseeArea:thisdata.addresseeArea,
+							alreadyAmount:thisdata.alreadyAmount,
 							recipientAddress:thisdata.recipientAddress,
 							orgCodeUrl: thisdata.voucherUrl ? splitUrl(thisdata.voucherUrl, ',', globalConfig.avatarHost + '/upload') : [],
 						})
@@ -963,7 +1009,7 @@ const MyService=Form.create()(React.createClass({
 					  className="admin-desc-content"
 					  footer=''
 					  title = '开具发票申请单'
-					  width='900px'
+					  width='1000px'
 					  visible={this.state.avisible}
 					  onOk={this.visitOks}
 					  onCancel={this.visitCancels}
@@ -995,6 +1041,9 @@ const MyService=Form.create()(React.createClass({
 									    	<Radio value={0}>省内</Radio>
 									    	<Radio value={1}>省外</Radio>
 									    </RadioGroup>
+										<span style={{position:'absolute',color:'red',fontSize:'10px',lineHeight:'20px'}}>
+										省内:湖南省<br></br>省外:除湖南省以外
+										</span>
 									</FormItem>
 									<FormItem className="half-item"
 									    {...formItemLayout}
@@ -1005,6 +1054,9 @@ const MyService=Form.create()(React.createClass({
 									    	<Radio value={0}>否</Radio>
 									    	<Radio value={1}>是</Radio>
 									    </RadioGroup>
+										<span style={{position:'absolute',color:'red',fontSize:'10px',lineHeight:'15px'}}>
+										注:特批单,省内省外,<br></br>分别由周总,省外总经理<br></br>特批后,方可至开票流程
+										</span>
 									</FormItem>
 									</div>
 									<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>
@@ -1039,6 +1091,9 @@ const MyService=Form.create()(React.createClass({
 										        } >                             
 										        {<Input placeholder="请输入单位名称" value={this.state.unitName}
 										            	onChange={(e)=>{this.setState({unitName:e.target.value})}} style={{width:'240px'}} />}
+												<span style={{position:'absolute',color:'red',fontSize:'10px',lineHeight:'15px',width:'30%'}}>
+												系统读取单位<br></br>名称,可修改
+												</span>
 										</FormItem>
 										<FormItem className="half-item"
 										        {...formItemLayout}
@@ -1054,20 +1109,23 @@ const MyService=Form.create()(React.createClass({
 										        {...formItemLayout}
 										        label={
 										        	<span>
-										        		<strong style={{ color: '#f00' }}>*</strong>开票金额
+										        		<strong style={{ color: '#f00' }}>*</strong>开票金额(万元)
 										        	</span> 
 										        } >                             
 										        {<Input placeholder="请输入开票金额" value={this.state.amount}
-										            	onChange={(e)=>{this.setState({amount:e.target.value})}} style={{width:'240px'}} />}
+										            	onChange={(e)=>{this.setState({amount:e.target.value}),console.log(typeof this.state.amount)}} style={{width:'240px'}} />}
+												<span style={{position:'absolute',color:'red',fontSize:'10px',lineHeight:'15px',width:'30%'}}>
+												退票请写负数<br></br>金额
+												</span>		
 										</FormItem>
 										<FormItem className="half-item"
 										        {...formItemLayout}
 										        label={
 										        	<span>
-										        		<strong style={{ color: '#f00' }}>*</strong>开户行银行账号
+										        		<strong style={{ color: '#f00' }}>*</strong>开户行银行账号
 										        	</span> 
 										        } >                             
-										        {<Input placeholder="请输入开户行银行账号" value={this.state.banks}
+										        {<Input placeholder="请输入开户行银行账号" value={this.state.banks}
 										            	onChange={(e)=>{this.setState({banks:e.target.value})}} style={{width:'240px'}} />}
 										</FormItem>
 										<FormItem className="half-item"
@@ -1095,6 +1153,9 @@ const MyService=Form.create()(React.createClass({
 										        label="备注" >                             
 										        {<Input placeholder="请备注开票公司名称" value={this.state.invoiceRemarks}
 										            	onChange={(e)=>{this.setState({invoiceRemarks:e.target.value})}} style={{width:'240px'}} />}
+												<span style={{position:'absolute',color:'red',fontSize:'10px',lineHeight:'15px',width:'30%'}}>
+												开票公司名称,<br></br>如:科德集团
+												</span>			
 										</FormItem>
 										<FormItem className="half-item"
 										        {...formItemLayout}
@@ -1169,6 +1230,19 @@ const MyService=Form.create()(React.createClass({
 											    	onChange={(e)=>{this.setState({recipientAddress:e.target.value})}} style={{width:'240px'}} />}
 									    </FormItem>
 									</div>:''}
+									<FormItem className="half-item"
+									        {...formItemLayout}
+									        label={
+									        	<span>
+									        		<strong style={{ color: '#f00' }}>*</strong>开票金额总计
+									        	</span> 
+									        } >                             
+									        {<Input value={this.state.alreadyAmount}
+									            	onChange={(e)=>{this.setState({alreadyAmount:e.target.value})}} style={{width:'40px'}} />}万元
+											<span style={{position:'absolute',color:'red',fontSize:'10px',lineHeight:'15px',marginLeft:'20px'}}>
+										默认值为0.新开票订单此项不用填.<br></br>以前已开票订单,请填写已开票的总计<br></br>金额,便于审核核对!
+										</span>			
+									</FormItem>
 								</div>
 								<Button className="cancel" type="primary" style={{marginRight:"50px",float:'right'}} size="large" onClick={this.submitApp}>提交申请</Button>
 								{/*<Button className="cancel" type="primary" style={{marginRight:"50px",float:'right',background:'deepskyblue',border:'none'}} size="large" onClick={this.saveApp}>保存</Button>*/}
@@ -1219,7 +1293,7 @@ const MyService=Form.create()(React.createClass({
 					  className="admin-desc-content"
 					  footer=''
 					  title = '开具发票申请单'
-					  width='900px'
+					  width='1000px'
 					  visible={this.state.cvisible}
 					  onOk={this.visitOks}
 					  onCancel={this.visitCancels}
@@ -1251,16 +1325,22 @@ const MyService=Form.create()(React.createClass({
 									    	<Radio value={0}>省内</Radio>
 									    	<Radio value={1}>省外</Radio>
 									    </RadioGroup>
+										<span style={{position:'absolute',color:'red',fontSize:'10px',lineHeight:'20px'}}>
+										省内:湖南省<br></br>省外:除湖南省以外
+										</span>
 									</FormItem>
 									<FormItem className="half-item"
 									    {...formItemLayout}
 									    label="特批:" >
-									    <RadioGroup value={this.state.ordapproval}
+									    <RadioGroup value={!this.state.ordapproval?0:1}
 									            	onChange={(e)=>{this.setState({ordapproval:e.target.value})}}
 									    >
 									    	<Radio value={0}>否</Radio>
 									    	<Radio value={1}>是</Radio>
 									    </RadioGroup>
+										<span style={{position:'absolute',color:'red',fontSize:'10px',lineHeight:'15px'}}>
+										注:特批单,省内省外,<br></br>分别由周总,省外总经理<br></br>特批后,方可至开票流程
+										</span>
 									</FormItem>
 									</div>
 									<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>
@@ -1295,6 +1375,9 @@ const MyService=Form.create()(React.createClass({
 										        } >                             
 										        {<Input placeholder="请输入单位名称" value={this.state.unitName}
 										            	onChange={(e)=>{this.setState({unitName:e.target.value})}} style={{width:'240px'}} />}
+												<span style={{position:'absolute',color:'red',fontSize:'10px',lineHeight:'15px',width:'30%'}}>
+												系统读取单位<br></br>名称,可修改
+												</span>
 										</FormItem>
 										<FormItem className="half-item"
 										        {...formItemLayout}
@@ -1310,20 +1393,23 @@ const MyService=Form.create()(React.createClass({
 										        {...formItemLayout}
 										        label={
 										        	<span>
-										        		<strong style={{ color: '#f00' }}>*</strong>开票金额
+										        		<strong style={{ color: '#f00' }}>*</strong>开票金额(万元)
 										        	</span> 
 										        } >                             
 										        {<Input placeholder="请输入开票金额" value={this.state.amount}
 										            	onChange={(e)=>{this.setState({amount:e.target.value})}} style={{width:'240px'}} />}
+												<span style={{position:'absolute',color:'red',fontSize:'10px',lineHeight:'15px',width:'30%'}}>
+												填写本次开票<br></br>金额
+												</span>		
 										</FormItem>
 										<FormItem className="half-item"
 										        {...formItemLayout}
 										        label={
 										        	<span>
-										        		<strong style={{ color: '#f00' }}>*</strong>开户行银行账号
+										        		<strong style={{ color: '#f00' }}>*</strong>开户行银行账号
 										        	</span> 
 										        } >                             
-										        {<Input placeholder="请输入开户行银行账号" value={this.state.banks}
+										        {<Input placeholder="请输入开户行银行账号" value={this.state.banks}
 										            	onChange={(e)=>{this.setState({banks:e.target.value})}} style={{width:'240px'}} />}
 										</FormItem>
 										<FormItem className="half-item"
@@ -1351,6 +1437,9 @@ const MyService=Form.create()(React.createClass({
 										        label="备注" >                             
 										        {<Input placeholder="请备注开票公司名称" value={this.state.invoiceRemarks}
 										            	onChange={(e)=>{this.setState({invoiceRemarks:e.target.value})}} style={{width:'240px'}} />}
+												<span style={{position:'absolute',color:'red',fontSize:'10px',lineHeight:'15px',width:'30%'}}>
+												开票公司名称,<br></br>如:科德集团
+												</span>			
 										</FormItem>
 										<FormItem className="half-item"
 										        {...formItemLayout}
@@ -1393,8 +1482,7 @@ const MyService=Form.create()(React.createClass({
 										    </RadioGroup>
 										</FormItem>
 									</div>
-									{this.state.post === 0?<div>
-									<div className="clearfix">
+									{this.state.post === 0?<div className="clearfix">
 										<FormItem className="half-item"
 										        {...formItemLayout}
 										        label="收信人姓名" >                             
@@ -1407,8 +1495,8 @@ const MyService=Form.create()(React.createClass({
 										        {<Input placeholder="请输入电话" value={this.state.addresseeMobile}
 										            	onChange={(e)=>{this.setState({addresseeMobile:e.target.value})}} style={{width:'240px'}} />}
 										</FormItem>
-									</div>
-									<div className="clearfix">
+									</div>:''}
+									{this.state.post === 0?<div className="clearfix">
 										<FormItem className="half-item"
 									        {...formItemLayout}
 									       label="省-市-区"
@@ -1416,8 +1504,8 @@ const MyService=Form.create()(React.createClass({
 											<Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'95%'}}
 												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }}  />
 									    </FormItem>
-									</div>
-									<div className="clearfix">
+									</div>:''}
+									{this.state.post === 0?<div className="clearfix">
 										<FormItem className="half-item"
 									        {...formItemLayout}
 									       label="详细地址"
@@ -1425,8 +1513,20 @@ const MyService=Form.create()(React.createClass({
 											{<Input placeholder="请输入详细地址" value={this.state.recipientAddress}
 											    	onChange={(e)=>{this.setState({recipientAddress:e.target.value})}} style={{width:'240px'}} />}
 									    </FormItem>
-									</div>
 									</div>:''}
+									<FormItem className="half-item"
+									        {...formItemLayout}
+									        label={
+									        	<span>
+									        		<strong style={{ color: '#f00' }}>*</strong>开票金额总计
+									        	</span> 
+									        } >                             
+									        {<Input value={this.state.alreadyAmount}
+									            	onChange={(e)=>{this.setState({alreadyAmount:e.target.value})}} style={{width:'40px'}} />}万元
+											<span style={{position:'absolute',color:'red',fontSize:'10px',lineHeight:'15px',marginLeft:'20px'}}>
+										默认值为0.新开票订单此项不用填.<br></br>以前已开票订单,请填写已开票的总计<br></br>金额,便于审核核对!
+										</span>			
+									</FormItem>
 								</div>
 								<Button className="cancel" type="primary" style={{marginRight:"50px",float:'right'}} size="large" onClick={this.submitApp}>提交申请</Button>
 								{/*<Button className="cancel" type="primary" style={{marginRight:"50px",float:'right',background:'deepskyblue',border:'none'}} size="large" onClick={this.saveApp}>保存</Button>*/}
@@ -1515,7 +1615,7 @@ const MyService=Form.create()(React.createClass({
 										        {...formItemLayout}
 										        label={
 										        	<span>
-										        		<strong style={{ color: '#f00' }}>*</strong>开票金额
+										        		<strong style={{ color: '#f00' }}>*</strong>开票金额(万元)
 										        	</span> 
 										        } >                             
 										        <span>{this.state.amount}</span>
@@ -1628,6 +1728,15 @@ const MyService=Form.create()(React.createClass({
 									</div>
 									</div>:''}
 								</div>
+								<FormItem className="half-item"
+								        {...formItemLayout}
+								        label={
+								        	<span>
+								        		<strong style={{ color: '#f00' }}>*</strong>开票金额总计
+								        	</span> 
+								        } >                             
+								        <span>{this.state.alreadyAmount}万元</span>
+								</FormItem>
 							</Spin>
 						</Form>
 					</Modal>

+ 90 - 0
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -252,6 +252,22 @@ const IntentionCustomer = Form.create()(React.createClass({
 					}
                 }
 			],
+			columnsrizhi:[
+							{
+								title:'流程',
+								dataIndex: 'processName',
+								key: 'processName'
+							},
+							{
+								title:'操作人',
+								dataIndex: 'adminName',
+								key: 'adminName'
+							},{
+								title:'时间',
+								dataIndex: 'createDate',
+								key: 'createDate'
+							}
+						],
 			dataSourceX: [],
 			ContactsLists: [{
 					title: '催款科目',
@@ -378,6 +394,61 @@ const IntentionCustomer = Form.create()(React.createClass({
 		this.jiedian(record.orderNo);
 	},	
 	
+	rizhi(){
+			console.log(this.state.orderNo)
+			this.setState({
+				loading:true
+			})
+			$.ajax({
+				method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: '/api/admin/newOrder/selectOrderLog',
+				data: {
+				  orderNo:this.state.orderNo
+				},
+				success: function (data) {
+					let theArr = [];
+				    let thisData = data.data;                
+				    if (!thisData.length) {
+				        if (data.error && data.error.length) {
+				            message.warning(data.error[0].message);
+				        };
+				        thisData = {};
+				    }else{
+				       for(let i = 0; i < data.data.length; i++) {
+				       	let thisdata = data.data[i];
+				       	theArr.push({
+				       		processName:thisdata.processName,		
+				       		adminName:thisdata.adminName,		
+				       		createDate:thisdata.createDate,
+				       	});
+				       };
+				    };
+					this.setState({
+						dataSourcerizhi: theArr
+					})
+				 }.bind(this),
+				}).always(function () {
+				     this.setState({            	
+				         loading: false
+				     });
+				 }.bind(this));
+			},
+		
+		//查看订单日志
+		getOrderLog(){
+			this.setState({
+				rizhivisible:true
+			})
+			this.rizhi()
+		},
+		closeOrderLog(){
+			this.setState({
+				rizhivisible:false
+			})
+		},		
+	
     //详情关闭
     nextCancel() {
 		this.setState({
@@ -730,6 +801,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 				                                onCancel={() => { this.setState({ previewVisible: false }) }}>
 				                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
 				                            </Modal>
+											<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
+																										onClick={this.getOrderLog}
+																	>查看订单							日志</Button>
 				                        </FormItem>
 							        </div>
 							        <div className='clearfix'>
@@ -888,6 +962,22 @@ const IntentionCustomer = Form.create()(React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
+					<Modal  visible={this.state.rizhivisible}
+							className="admin-desc-content"
+							width='800px'
+							maskClosable={false}
+							title='订单日志'
+							footer={null}
+							onCancel={this.closeOrderLog}>
+							<div className="patent-table">
+							    <Spin spinning={this.state.loading}>
+							        <Table columns={this.state.columnsrizhi}
+							            dataSource={this.state.dataSourcerizhi}
+										pagination={false}
+							            />
+							    </Spin>
+							</div>
+					</Modal>
                	</div>  
             </div>
 			);

+ 89 - 0
js/component/manageCenter/order/orderNew/examine.jsx

@@ -263,6 +263,22 @@ const IntentionCustomer = Form.create()(React.createClass({
 					}
                 }
 			],
+			columnsrizhi:[
+				{
+					title:'流程',
+					dataIndex: 'processName',
+					key: 'processName'
+				},
+				{
+					title:'操作人',
+					dataIndex: 'adminName',
+					key: 'adminName'
+				},{
+					title:'时间',
+					dataIndex: 'createDate',
+					key: 'createDate'
+				}
+			],
 			dataSourceX: [],
 			ContactsLists: [{
 					title: '催款科目',
@@ -413,6 +429,60 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
+	
+	rizhi(){
+		console.log(this.state.orderNo)
+		this.setState({
+			loading:true
+		})
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: '/api/admin/newOrder/selectOrderLog',
+			data: {
+			  orderNo:this.state.orderNo
+			},
+			success: function (data) {
+				let theArr = [];
+			    let thisData = data.data;                
+			    if (!thisData.length) {
+			        if (data.error && data.error.length) {
+			            message.warning(data.error[0].message);
+			        };
+			        thisData = {};
+			    }else{
+			       for(let i = 0; i < data.data.length; i++) {
+			       	let thisdata = data.data[i];
+			       	theArr.push({
+			       		processName:thisdata.processName,		
+			       		adminName:thisdata.adminName,		
+			       		createDate:thisdata.createDate,
+			       	});
+			       };
+			    };
+				this.setState({
+					dataSourcerizhi: theArr
+				})
+			 }.bind(this),
+			}).always(function () {
+			     this.setState({            	
+			         loading: false
+			     });
+			 }.bind(this));
+		},
+		
+		getOrderLog(){
+			this.setState({
+				rizhivisible:true
+			})
+			this.rizhi()
+		},
+		closeOrderLog(){
+			this.setState({
+				rizhivisible:false
+			})
+		},
 	//节点列表
 	jiedian(orderNos) {
 		$.ajax({
@@ -747,6 +817,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 				                                onCancel={() => { this.setState({ previewVisible: false }) }}>
 				                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
 				                            </Modal>
+											<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
+													onClick={this.getOrderLog}
+											>查看订单日志</Button>
 				                        </FormItem>
 							        </div>
 							        <div className='clearfix'>
@@ -879,6 +952,22 @@ const IntentionCustomer = Form.create()(React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
+					<Modal  visible={this.state.rizhivisible}
+							className="admin-desc-content"
+							width='800px'
+							maskClosable={false}
+							title='订单日志'
+							footer={null}
+							onCancel={this.closeOrderLog}>
+							<div className="patent-table">
+							    <Spin spinning={this.state.loading}>
+							        <Table columns={this.state.columnsrizhi}
+							            dataSource={this.state.dataSourcerizhi}
+										pagination={false}
+							            />
+							    </Spin>
+							</div>
+					</Modal>
                	</div>  
             </div>
 			);

+ 90 - 0
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -255,6 +255,22 @@ const IntentionCustomer = Form.create()(React.createClass({
 					}
                 }
 			],
+			columnsrizhi:[
+							{
+								title:'流程',
+								dataIndex: 'processName',
+								key: 'processName'
+							},
+							{
+								title:'操作人',
+								dataIndex: 'adminName',
+								key: 'adminName'
+							},{
+								title:'时间',
+								dataIndex: 'createDate',
+								key: 'createDate'
+							}
+						],
 			dataSourceX: [],
 			ContactsLists: [{
 					title: '催款科目',
@@ -521,6 +537,61 @@ const IntentionCustomer = Form.create()(React.createClass({
 			noVisible:false
 		})
 	},
+	
+	rizhi(){
+			console.log(this.state.orderNo)
+			this.setState({
+				loading:true
+			})
+			$.ajax({
+				method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: '/api/admin/newOrder/selectOrderLog',
+				data: {
+				  orderNo:this.state.orderNo
+				},
+				success: function (data) {
+					let theArr = [];
+				    let thisData = data.data;                
+				    if (!thisData.length) {
+				        if (data.error && data.error.length) {
+				            message.warning(data.error[0].message);
+				        };
+				        thisData = {};
+				    }else{
+				       for(let i = 0; i < data.data.length; i++) {
+				       	let thisdata = data.data[i];
+				       	theArr.push({
+				       		processName:thisdata.processName,		
+				       		adminName:thisdata.adminName,		
+				       		createDate:thisdata.createDate,
+				       	});
+				       };
+				    };
+					this.setState({
+						dataSourcerizhi: theArr
+					})
+				 }.bind(this),
+				}).always(function () {
+				     this.setState({            	
+				         loading: false
+				     });
+				 }.bind(this));
+			},
+		
+		//查看订单日志
+		getOrderLog(){
+			this.setState({
+				rizhivisible:true
+			})
+			this.rizhi()
+		},
+		closeOrderLog(){
+			this.setState({
+				rizhivisible:false
+			})
+		},
 	//搜索
 	search() {
     	this.setState({
@@ -727,6 +798,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 				                                onCancel={() => { this.setState({ previewVisible: false }) }}>
 				                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
 				                            </Modal>
+											<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
+																										onClick={this.getOrderLog}
+																	>查看订单							日志</Button>
 				                        </FormItem>
 							        </div>
 							        <div className='clearfix'>
@@ -851,6 +925,22 @@ const IntentionCustomer = Form.create()(React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
+					<Modal  visible={this.state.rizhivisible}
+							className="admin-desc-content"
+							width='800px'
+							maskClosable={false}
+							title='订单日志'
+							footer={null}
+							onCancel={this.closeOrderLog}>
+							<div className="patent-table">
+							    <Spin spinning={this.state.loading}>
+							        <Table columns={this.state.columnsrizhi}
+							            dataSource={this.state.dataSourcerizhi}
+										pagination={false}
+							            />
+							    </Spin>
+							</div>
+					</Modal>
                	</div>  
             </div>
 			);

+ 5 - 3
js/component/manageCenter/order/orderNew/press.jsx

@@ -207,7 +207,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 				{
                     title: '订单编号',
                     dataIndex: 'orderNo',
-                    key: 'orderNo'
+                    key: 'orderNo',
+					fixed:'left'
                 }, {
                     title: '签单时间',
                     dataIndex: 'signDate',
@@ -506,7 +507,6 @@ const IntentionCustomer = Form.create()(React.createClass({
                     <span>催款节点统计</span>
                 </div>
                	<div className="user-search">             
-               		<Button type="primary" onClick={this.exportExec} style={{float:'right'}}>导出催款列表</Button>
                    <Input placeholder="客户名称" style={{width:'150px',marginBottom:'10px'}}
 	                        value={this.state.customerName}
 	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
@@ -533,10 +533,12 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
                     <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button> 
+					<Button type="primary" onClick={this.exportExec} >导出催款列表</Button>
                    	<div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
 	                        <Table columns={this.state.columns}
-	                            dataSource={this.state.dataSource}    
+	                            dataSource={this.state.dataSource}  
+								scroll={{ x: 1500, y: 0 }}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination} 
 	                            onRowClick={this.tableRowClick}

+ 90 - 0
js/component/manageCenter/order/orderNew/reject.jsx

@@ -198,6 +198,22 @@ const IntentionCustomer = Form.create()(React.createClass({
                     }
                 }
 			],
+			columnsrizhi:[
+							{
+								title:'流程',
+								dataIndex: 'processName',
+								key: 'processName'
+							},
+							{
+								title:'操作人',
+								dataIndex: 'adminName',
+								key: 'adminName'
+							},{
+								title:'时间',
+								dataIndex: 'createDate',
+								key: 'createDate'
+							}
+						],
 			data: [],
 			dataSource: [],
 			columnsX: [
@@ -745,6 +761,61 @@ const IntentionCustomer = Form.create()(React.createClass({
 			}
 		}.bind(this));
 	},
+	
+	rizhi(){
+			console.log(this.state.orderNo)
+			this.setState({
+				loading:true
+			})
+			$.ajax({
+				method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: '/api/admin/newOrder/selectOrderLog',
+				data: {
+				  orderNo:this.state.orderNo
+				},
+				success: function (data) {
+					let theArr = [];
+				    let thisData = data.data;                
+				    if (!thisData.length) {
+				        if (data.error && data.error.length) {
+				            message.warning(data.error[0].message);
+				        };
+				        thisData = {};
+				    }else{
+				       for(let i = 0; i < data.data.length; i++) {
+				       	let thisdata = data.data[i];
+				       	theArr.push({
+				       		processName:thisdata.processName,		
+				       		adminName:thisdata.adminName,		
+				       		createDate:thisdata.createDate,
+				       	});
+				       };
+				    };
+					this.setState({
+						dataSourcerizhi: theArr
+					})
+				 }.bind(this),
+				}).always(function () {
+				     this.setState({            	
+				         loading: false
+				     });
+				 }.bind(this));
+			},
+		
+		//查看订单日志
+		getOrderLog(){
+			this.setState({
+				rizhivisible:true
+			})
+			this.rizhi()
+		},
+		closeOrderLog(){
+			this.setState({
+				rizhivisible:false
+			})
+		},
 	//点击签单
 	handleCancels(e) {
 		this.setState({
@@ -1064,6 +1135,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 							                    fileList={this.getOrgCodeUrl}
 							                    pictureUrl={this.state.orgCodeUrl} />
 							                    <p>图片建议:要清晰。</p>
+											<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
+																										onClick={this.getOrderLog}
+																	>查看订单							日志</Button>	
 							            </FormItem>
 							        </div>
 							        <div className='clearfix'>
@@ -1285,6 +1359,22 @@ const IntentionCustomer = Form.create()(React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
+					<Modal  visible={this.state.rizhivisible}
+							className="admin-desc-content"
+							width='800px'
+							maskClosable={false}
+							title='订单日志'
+							footer={null}
+							onCancel={this.closeOrderLog}>
+							<div className="patent-table">
+							    <Spin spinning={this.state.loading}>
+							        <Table columns={this.state.columnsrizhi}
+							            dataSource={this.state.dataSourcerizhi}
+										pagination={false}
+							            />
+							    </Spin>
+							</div>
+					</Modal>
                	</div>  
             </div>
 			);

+ 91 - 0
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -171,6 +171,22 @@ const PaiDan = React.createClass({
                     }
                 }
             ],
+			columnsrizhi:[
+							{
+								title:'流程',
+								dataIndex: 'processName',
+								key: 'processName'
+							},
+							{
+								title:'操作人',
+								dataIndex: 'adminName',
+								key: 'adminName'
+							},{
+								title:'时间',
+								dataIndex: 'createDate',
+								key: 'createDate'
+							}
+						],
             dataSource: [],
             searchTime: [],
             columnsX: [
@@ -396,6 +412,61 @@ const PaiDan = React.createClass({
 		}.bind(this));
 	},
 	
+	rizhi(){
+			console.log(this.state.orderNo)
+			this.setState({
+				loading:true
+			})
+			$.ajax({
+				method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: '/api/admin/newOrder/selectOrderLog',
+				data: {
+				  orderNo:this.state.orderNo
+				},
+				success: function (data) {
+					let theArr = [];
+				    let thisData = data.data;                
+				    if (!thisData.length) {
+				        if (data.error && data.error.length) {
+				            message.warning(data.error[0].message);
+				        };
+				        thisData = {};
+				    }else{
+				       for(let i = 0; i < data.data.length; i++) {
+				       	let thisdata = data.data[i];
+				       	theArr.push({
+				       		processName:thisdata.processName,		
+				       		adminName:thisdata.adminName,		
+				       		createDate:thisdata.createDate,
+				       	});
+				       };
+				    };
+					this.setState({
+						dataSourcerizhi: theArr
+					})
+				 }.bind(this),
+				}).always(function () {
+				     this.setState({            	
+				         loading: false
+				     });
+				 }.bind(this));
+			},
+		
+		//查看订单日志
+		getOrderLog(){
+			this.setState({
+				rizhivisible:true
+			})
+			this.rizhi()
+		},
+		closeOrderLog(){
+			this.setState({
+				rizhivisible:false
+			})
+		},
+	
 	supervisor(e,state){ //客户名称与服务名称自动补全
 		$.ajax({
 	        method: "get",
@@ -895,6 +966,10 @@ const PaiDan = React.createClass({
 								            label="订单留言" >
 							        	 <span>{this.state.orderRemarks}</span>
 								        </FormItem>
+										
+										<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
+																									onClick={this.getOrderLog}
+																>查看订单							日志</Button>
 							        </div>
 							        <div className='clearfix'>
 			                    		<FormItem className="half-item"
@@ -1082,6 +1157,22 @@ const PaiDan = React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
+					<Modal  visible={this.state.rizhivisible}
+							className="admin-desc-content"
+							width='800px'
+							maskClosable={false}
+							title='订单日志'
+							footer={null}
+							onCancel={this.closeOrderLog}>
+							<div className="patent-table">
+							    <Spin spinning={this.state.loading}>
+							        <Table columns={this.state.columnsrizhi}
+							            dataSource={this.state.dataSourcerizhi}
+										pagination={false}
+							            />
+							    </Spin>
+							</div>
+					</Modal>
         </div> )
     }
 })

+ 91 - 0
js/component/manageCenter/project/project/projectQuery.jsx

@@ -154,6 +154,22 @@ const PaiDan = React.createClass({
                     render: text => { return text==5||text==6?getProcessStatus(text):'未分配'}
                 }
             ],
+			columnsrizhi:[
+							{
+								title:'流程',
+								dataIndex: 'processName',
+								key: 'processName'
+							},
+							{
+								title:'操作人',
+								dataIndex: 'adminName',
+								key: 'adminName'
+							},{
+								title:'时间',
+								dataIndex: 'createDate',
+								key: 'createDate'
+							}
+						],
             dataSource: [],
             searchTime: [],
             columnsX: [
@@ -350,6 +366,62 @@ const PaiDan = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+	
+	rizhi(){
+			console.log(this.state.orderNo)
+			this.setState({
+				loading:true
+			})
+			$.ajax({
+				method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: '/api/admin/newOrder/selectOrderLog',
+				data: {
+				  orderNo:this.state.orderNo
+				},
+				success: function (data) {
+					let theArr = [];
+				    let thisData = data.data;                
+				    if (!thisData.length) {
+				        if (data.error && data.error.length) {
+				            message.warning(data.error[0].message);
+				        };
+				        thisData = {};
+				    }else{
+				       for(let i = 0; i < data.data.length; i++) {
+				       	let thisdata = data.data[i];
+				       	theArr.push({
+				       		processName:thisdata.processName,		
+				       		adminName:thisdata.adminName,		
+				       		createDate:thisdata.createDate,
+				       	});
+				       };
+				    };
+					this.setState({
+						dataSourcerizhi: theArr
+					})
+				 }.bind(this),
+				}).always(function () {
+				     this.setState({            	
+				         loading: false
+				     });
+				 }.bind(this));
+			},
+		
+		//查看订单日志
+		getOrderLog(){
+			this.setState({
+				rizhivisible:true
+			})
+			this.rizhi()
+		},
+		closeOrderLog(){
+			this.setState({
+				rizhivisible:false
+			})
+		},
+	
     //关闭详情
 	visitCancel(e){
 		this.setState({
@@ -615,6 +687,9 @@ const PaiDan = React.createClass({
 				                                onCancel={() => { this.setState({ previewVisible: false }) }}>
 				                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
 				                            </Modal>
+											<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
+																										onClick={this.getOrderLog}
+																	>查看订单							日志</Button>
 				                        </FormItem>
 							        </div>
 							        <div className='clearfix'>
@@ -704,6 +779,22 @@ const PaiDan = React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
+					<Modal  visible={this.state.rizhivisible}
+							className="admin-desc-content"
+							width='800px'
+							maskClosable={false}
+							title='订单日志'
+							footer={null}
+							onCancel={this.closeOrderLog}>
+							<div className="patent-table">
+							    <Spin spinning={this.state.loading}>
+							        <Table columns={this.state.columnsrizhi}
+							            dataSource={this.state.dataSourcerizhi}
+										pagination={false}
+							            />
+							    </Spin>
+							</div>
+					</Modal>
         </div> )
     }
 })

+ 3 - 0
js/component/manageCenter/project/task/table.less

@@ -0,0 +1,3 @@
+.ant-table-thead > tr > th{
+	text-align: center
+}

+ 1 - 1
js/component/manageCenter/project/task/taskCount.jsx

@@ -349,7 +349,6 @@ const IntentionCustomer = Form.create()(React.createClass({
                     <span>工时数据统计</span>
                 </div>
                	<div className="user-search">             
-               		<Button type="primary" onClick={this.exportExec} style={{float:'right'}}>导出工时数据</Button>
                    <Input placeholder="客户名称" style={{width:'150px',marginBottom:'10px'}}
 	                        value={this.state.customerName}
 	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
@@ -363,6 +362,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                         onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
                     <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button> 
+               		<Button type="primary" onClick={this.exportExec}>导出工时数据</Button>
                    	<div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
 	                        <Table columns={this.state.columns}

+ 0 - 677
js/component/manageCenter/project/task/taskQuery.1.jsx

@@ -1,677 +0,0 @@
-import React,{Component} from 'react';
-import ajax from 'jquery/src/ajax/xhr.js';
-import $ from 'jquery/src/ajax';
-import moment from 'moment';
-import '@/manageCenter/financialManage/distribute/public.less';
-import { Icon, Button,Form, Input, Select, Upload,Col,Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
-import OrderDesc from '@/manageCenter/financialManage/orderDetail/orderDesc'
-import Assign from '@/manageCenter/publicComponent/assign';
-import {getProcessStatus,getApproval,getTaskStatus,getLiquidationStatus,getApprovedState,getProjectState,splitUrl,getProjectStatus,getboutique} from '@/tools';
-const FormItem =Form.Item;
-
-const Task = React.createClass({
-    loadData(pageNo) {
-        this.state.data = [];
-        this.setState({
-            page:pageNo,
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/orderProject/selectTaskList",
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                specially:1,//经理
-                name: this.state.nameSearch,//客户名称
-                orderNo:this.state.orderNoSearch,//订单编号
-                depId: this.state.departmenttSearch,//订单部门
-                taskId:this.state.taskId, //任务编号
-                taskStatus:this.state.taskStatus,//任务状态
-                adminName:this.state.adminName,//任务受理人
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data || !data.data.list) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
-                        theArr.push({
-                            key: i,
-                            orderNo: thisdata.orderNo,//订单编号
-                            id:thisdata.id,//任务ID
-		                    taskName:thisdata.taskName,//名称
-		                    cname:thisdata.cname,//项目品类
-                            receiverName:thisdata.receiverName,//受理人
-                            projectStatus:thisdata.projectStatus,//项目状态
-                            taskStatus:thisdata.taskStatus,//任务状态
-                            taskDate:thisdata.taskDate,//分配时间
-                            commodityQuantity:thisdata.commodityQuantity,//数量
-                            userName:thisdata.userName,//用户名
-                            depName:thisdata.depName,//部门名称
-                            receiverName:thisdata.receiverName,//任务责任人
-                        });
-                    };
-                }
-                this.state.pagination.current = data.data.pageNo;
-                this.state.pagination.total = data.data.totalCount;
-                if(data.data&&data.data.list&&!data.data.list.length){
-					this.state.pagination.current=0
-					this.state.pagination.total=0
-				}
-                this.setState({
-                    dataSource: theArr,
-                    pagination: this.state.pagination
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
-    getInitialState() {
-        return {
-            searchMore: true,
-            assignVisible:false,
-            releaseDate: [],
-            roleName:'',
-            departmentArr: [],
-            boHuivisible:false,
-            selectedRowKeys: [],
-            selectedRows: [],
-            paginations:false,
-            loading: false,
-            pagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
-                pageSize: 10,
-                onChange: function (page) {
-                    this.loadData(page);
-                }.bind(this),
-                showTotal: function (total) {
-                    return '共' + total + '条数据';
-                }
-            },
-            columns: [
-                {
-                    title: '任务编号',
-                    dataIndex: 'id',
-                    key: 'id',
-                }, {
-                    title: '任务名称',
-                    dataIndex: 'taskName',
-                    key: 'taskName',
-                },  {
-                    title: '订单编号',
-                    dataIndex: 'orderNo',
-                    key: 'orderNo',
-                },
-                {
-                    title: '业务类别',
-                    dataIndex: 'cname',
-                    key: 'cname',
-                },
-                {
-                    title: '客户名称',
-                    dataIndex: 'userName',
-                    key: 'userName',
-                },
-                {
-                    title: '任务状态',
-                    dataIndex: 'taskStatus',
-                    key: 'taskStatus',
-                    render: text => { return getTaskStatus(text)}
-                },
-                {
-                    title: '项目状态',
-                    dataIndex: 'projectStatus',
-                    key: 'projectStatus',
-                    render: text => { return getProjectStatus(text)}
-                },
-                {
-                    title: '分配时间',
-                    dataIndex: 'taskDate',
-                    key: 'taskDate'
-                },
-                {
-                    title: '任务数量',
-                    dataIndex: 'commodityQuantity',
-                    key: 'commodityQuantity'
-                },
-                {
-                    title: '任务责任人',
-                    dataIndex: 'receiverName',
-                    key: 'receiverName'
-                },{
-                    title: '订单部门',
-                    dataIndex: 'depName',
-                    key: 'depName'
-                }
-            ],
-            dataSource: [],
-            searchTime: [],
-            columnsX: [
-				{
-                    title: '业务项目名称',
-                    dataIndex: 'commodityName',
-                    key: 'commodityName'
-                }, {
-                    title: '项目类别',
-                    dataIndex: 'cname',
-                    key: 'cname',
-                    
-                },{
-                    title: '项目数量',
-                    dataIndex: 'commodityQuantity',
-                    key: 'commodityQuantity'
-                }, {
-                    title: '金额(万元)',
-                    dataIndex: 'commodityPrice',
-                    key: 'commodityPrice'
-                }, {
-                    title: '负责人',
-                    dataIndex: 'contacts',
-                    key: 'contacts'
-                }, {
-                    title: '负责人电话',
-                    dataIndex: 'contactsMobile',
-                    key: 'contactsMobile'
-                }, {
-                    title: '主要项目',
-                    dataIndex: 'main',
-                    key: 'main',
-                    render:(text)=>{
-                    	return (text?'是':'否')
-                    }
-                }, {
-                    title: '项目说明',
-                    dataIndex: 'taskComment',
-                    key: 'taskComment',
-					render:(text)=>{
-						return (text&&text.length>8?text.substr(0,8)+'…':text)
-					}
-                }
-			],
-			dataSourceX: [],
-        }
-    },
-    /* 分派 */
-    evaluate(record,nub){
-        this.state.assignData=record;
-        this.setState({
-        	nub,
-            assignVisible:true
-        })
-    },
-   
-    componentWillMount() {
-    	this.departmentList();
-        this.loadData();
-    },
-    tableRowClick(record, index) {
-        this.state.RowData = record;
-        this.setState({
-            visible: true,
-        });
-        this.xiangqing(record.orderNo);
-		this.xiangmu(record.orderNo);
-    },
-     //订单详情
-	xiangqing(orderNos) {
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context +"/api/admin/newOrder/getOrderNewDetail",
-			data: {
-				orderNo:orderNos
-			},
-			success: function(data) {
-				let theArr = [];
-				
-				if(data.error.length || data.data.list == "") {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-				} else {
-					let thisdata=data.data;
-					this.setState({
-						 orderNo: thisdata.orderNo,//订单编号
-						 contractNo: thisdata.contractNo,//合同编号
-						 userName:thisdata.userName,//客户名称
-						 signDate:thisdata.signDate,//签单时间
-						 processStatus:thisdata.processStatus,//流程状态
-	                     liquidationStatus:thisdata.liquidationStatus,//结算状态
-	                     contacts:thisdata.contacts,//企业联系人
-	                     contactMobile:thisdata.contactMobile,//联系人电话
-	                     legalPerson:thisdata.legalPerson,//法人
-	                     legalPersonTel:thisdata.legalPersonTel,//法人电话
-	                     firstAmount:thisdata.firstAmount,//签单金额
-	                     totalAmount:thisdata.totalAmount,//首付金额
-	                     approval:thisdata.approval,//特批状态
-	                     settlementAmount:thisdata.settlementAmount,//已收款项
-	                     orderRemarks:thisdata.orderRemarks,//订单留言
-	                     orgCodeUrl: thisdata.contractPictureUrl ? splitUrl(thisdata.contractPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],//图片地址
-	                     salesmanName:thisdata.salesmanName,//营销员名称
-	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
-	                     financeName:thisdata.financeName,//财务名称
-	                     financeMobile:thisdata.financeMobile,//财务电话
-	                     depName:thisdata.depName,//订单部门
-					})
-				};
-				
-			}.bind(this),
-		}).always(function() {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
-	//项目列表
-	xiangmu(orderNos) {
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context +"/api/admin/newOrder/getOrderTask",
-			data: {
-				orderNo:orderNos
-			},
-			success: function(data) {
-				let theArr = [];
-				
-				if(data.error.length || data.data.list == "") {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-				} else {
-					for (let i = 0; i < data.data.length; i++) {
-                        let thisdata = data.data[i];
-                        theArr.push({
-                             key: i,
-                             id:thisdata.id,
-                             orderNo:thisdata.orderNo,//订单编号
-                             commodityId:thisdata.commodityId,//项目ID
-                             commodityName:thisdata.commodityName,//项目名称
-                             cname:thisdata.cname,//项目类别
-                             commodityPrice:thisdata.commodityPrice,//项目价格
-                             commodityQuantity:thisdata.commodityQuantity,//项目数量
-                             main:thisdata.main,//是否为主要任务
-                             taskComment:thisdata.taskComment,//任务说明
-                             contacts:thisdata.contacts,//联系人
-                             contactsMobile:thisdata.contactsMobile,//联系人电话
-                             taskStatus:thisdata.taskStatus,//是否分配
-                        });
-                    };
-				};
-				this.setState({
-                    dataSourceX: theArr,
-                });
-			}.bind(this),
-		}).always(function() {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
-	 //关闭详情
-	visitCancel(e){
-		this.setState({
-			visible:false
-		})
-		this.reset();
-	},
-	visitOk(e){
-		this.setState({
-			visible:false
-		})
-		this.reset();
-	},
-    closeDesc(e, s) {
-        this.state.showDesc = e;
-        if (s) {
-            this.loadData(this.state.page);
-        };
-    },
-    closeAssign(e, s) {
-    	this.state.roleName='';
-        this.state.assignVisible = e;
-        if (s) {
-            this.loadData(this.state.page);
-        };
-    },
-    nextCancel() {
-		this.setState({
-			addnextVisible: false
-		})
-	},
-	//点击打卡项目详情
-	tableRowClickX(record, index) {
-        this.setState({
-        	jid:record.id,//项目ID
-        	kid:record.commodityId,//商品ID
-        	commodityName:record.commodityName,//金额
-        	commodityPrice:record.commodityPrice,//金额
-        	commodityQuantity:record.commodityQuantity,//数量
-        	taskComment:record.taskComment,//备注
-        	main:record.main.toString(),//是否为主要
-        	addnextVisible:true,
-        	addState:0,
-        });
-    },
-    search() {
-        this.loadData();
-    },
-    reset() {
-        this.state.nameSearch = '';
-        this.state.releaseDate = [];
-        this.state.orderNoSearch='';
-        this.state.taskNoSearch='';
-        this.state.departmenttSearch=undefined;
-        this.loadData(this.state.page);
-    },
-    searchSwitch() {
-        this.setState({
-            searchMore: !this.state.searchMore
-        });
-    },
-    //部门
-	departmentList() {
-		this.setState({
-			loading: true
-		});
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + "/api/admin/organization/selectSuperId",
-			data: {
-
-			},
-			success: function(data) {
-				let thedata = data.data;
-				let theArr = [];
-				if(!thedata) {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-					thedata = {};
-				} else {
-					thedata.map(function(item, index) {
-						theArr.push({
-							key: index,
-							name: item.name,
-							id: item.id,
-						})
-					})
-				}
-				this.setState({
-					departmentArr: theArr,
-				})
-			}.bind(this),
-		}).always(function() {
-			this.setState({
-				loading: false
-			});
-		}.bind(this));
-	},
-    render() { 
-        const rowSelection = {
-            selectedRowKeys: this.state.selectedRowKeys,
-            onChange: (selectedRowKeys, selectedRows) => {
-                this.setState({
-                    selectedRows: selectedRows.slice(-1),
-                    selectedRowKeys: selectedRowKeys.slice(-1)
-                });
-            }
-        };
-        const formItemLayout = {
-            labelCol: { span: 8 },
-            wrapperCol: { span: 14 },
-        };
-        const hasSelected = this.state.selectedRowKeys.length > 0;
-        const { RangePicker } = DatePicker;
-        let departmentArr = this.state.departmentArr || [];
-        return ( <div className="user-content">
-            <div className="content-title">
-                    <span>任务查询</span>
-                </div>
-                <div className="user-search">
-                    <Input placeholder="客户名称"
-                        value={this.state.nameSearch}
-                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
-                    <Input placeholder="订单编号"
-                        value={this.state.orderNoSearch}
-                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
-                    <Input placeholder="任务编号"
-                        value={this.state.taskNoSearch}
-                        onChange={(e) => { this.setState({ taskNoSearch: e.target.value }); }} />
-                    <Select placeholder="选择部门"
-                        style={{ width: 150 ,marginRight:'10px'}}
-                        value={this.state.departmenttSearch}
-                        onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
-                        {
-                            departmentArr.map(function (item) {
-                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
-                            })
-                        }
-               		 </Select> 
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>
-                    {/* <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
-                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                        <span>订单时间 :</span>
-                        <RangePicker
-                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-                    </div> */}
-                </div>
-                <div className="patent-table">
-                    <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
-                            dataSource={this.state.dataSource}
-                            rowSelection={rowSelection}
-                            pagination={this.state.pagination}
-                            onRowClick={this.tableRowClick.bind(this)} />
-                    </Spin>
-                </div>
-                <Assign
-                    title="任务"
-                    selApi={"/api/admin/orderProject/projectDistribution"}
-                    data={this.state.assignData}
-                    showDesc={this.state.assignVisible}
-                    closeDesc={this.closeAssign.bind(this)}
-                    fenpaiData={8}
-                    specially={0}
-                    roleName={this.state.nub}
-                />
-                <Modal	
-				      className="customeDetails"
-				      footer=''
-			          title="任务详情"
-			          width='900px'
-			          visible={this.state.visible}
-			          onOk={this.visitOk}
-					  onCancel={this.visitCancel}							          							          
-			        >	
-				        <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
-				            <Spin spinning={this.state.loading}>
-				                <div className="clearfix">
-				                	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="订单编号" >
-			                            <span>{this.state.orderNo}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同编号" >  
-			                            <span>{this.state.contractNo}</span>
-				                    </FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="客户名称" >  
-			                            <span>{this.state.userName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同签订时间" >   
-			                            <span>{this.state.signDate}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="流程状态" >  
-			                            <span>{getProcessStatus(this.state.processStatus)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="结算状态" >  
-			                            <span>{getLiquidationStatus(this.state.liquidationStatus)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="企业联系人" >                             
-		                                <span>{this.state.contacts}</span>
-				                    </FormItem>
-				                     <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="联系人电话" >                             
-		                                <span>{this.state.contactMobile}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="企业法人" >                             
-		                                <span>{this.state.legalPerson}</span>
-		                            </FormItem>
-				                     <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="法人电话" >  
-			                             <span>{this.state.legalPersonTel}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单金额(万元)" >                             
-		                                 <span>{this.state.totalAmount}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="首付金额(万元)" >                             
-		                                <span>{this.state.firstAmount}</span>
-				                    </FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="特批立项" >  
-			                            <span>{getApprovedState(this.state.approval)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="已收款项(万元)" >  
-			                            <span>{this.state.settlementAmount}</span>
-		                    		</FormItem>
-				                    <div className='clearfix'>
-							        	<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="订单留言" >
-							        	 <span>{this.state.orderRemarks}</span>
-								        </FormItem>
-							        </div>
-							        <div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人" >  
-				                            <span>{this.state.salesmanName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人电话" >  
-                            				<span>{this.state.salesmanMobile}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单部门" >  
-				                            <span>{this.state.depName}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人" >  
-				                            <span>{this.state.financeName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人电话" >  
-                            				<span>{this.state.financeMobile}</span>
-			                    		</FormItem>
-			                    	</div>
-						            <div>
-					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
-					                	{this.state.processStatus==0?<Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加项目明细</Button>:""}
-					                </div>
-					                <div className="patent-table">
-					                    <Spin spinning={this.state.loading}>
-					                        <Table columns={this.state.columnsX}
-					                            dataSource={this.state.dataSourceX}
-					                            pagination={this.state.paginations}
-					                            onRowClick={this.tableRowClickX} 
-					                            />
-					                    </Spin>
-						            </div>
-				                </div>
-				            </Spin>
-				        </Form>
-			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='800px'
-                        title='项目任务详情'                    
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
-			                <Spin spinning={this.state.loading}>
-				                <div className='clearfix'>
-			                    	<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目名称" >
-			                    			<span>{this.state.commodityName}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目数量" >
-			                    			<span>{this.state.commodityQuantity}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="金额(万元)" >
-			                    			<span>{this.state.commodityPrice}</span>
-			                    	</FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="主要项目" >  
-			                            <span>{getboutique(this.state.main)}</span>
-		                    		</FormItem>
-				                    <div className='clearfix'>
-				                    	<FormItem 
-				                            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-				                            label="服务说明" >
-			                    			<span>{this.state.taskComment}</span>
-				                    	</FormItem>
-			                    	</div>
-			                    </div>	
-			                </Spin>
-			            </Form >
-			        </Modal>
-        </div> )
-    }
-})
- 
-export default Task;

+ 246 - 3
js/component/manageCenter/project/task/taskQuery.jsx

@@ -3,9 +3,10 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import '@/manageCenter/financialManage/distribute/public.less';
-import { Icon, Button,Form, Input, Select, Upload,Col,Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
+import { Icon, Button, Form, Radio, Input, InputNumber, Select, Upload,Col,Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
 import OrderDesc from '@/manageCenter/financialManage/orderDetail/orderDesc'
 import Assign from '@/manageCenter/publicComponent/assign';
+import './table.less';
 import {getProcessStatus,getApproval,getTaskStatus,getLiquidationStatus,getApprovedState,getProjectState,splitUrl,getProjectStatus,getboutique} from '@/tools';
 const FormItem =Form.Item;
 
@@ -81,6 +82,7 @@ const Task = React.createClass({
             assignVisible:false,
             releaseDate: [],
             roleName:'',
+			testFlag:true,
             departmentArr: [],
             boHuivisible:false,
             selectedRowKeys: [],
@@ -119,7 +121,7 @@ const Task = React.createClass({
                     key: 'cname',
                 },
                 {
-                    title: '客户名称',
+                    title: '客户名称(软著数/下证数)',
                     dataIndex: 'userName',
                     key: 'userName',
                 },
@@ -200,6 +202,29 @@ const Task = React.createClass({
                 }
 			],
 			dataSourceX: [],
+			columnsY: [
+				{
+			        title: '批次',
+			        dataIndex: 'a',
+			        key: 'a',
+					align:'center'
+			    }, {
+			        title: '下注时间',
+			        dataIndex: 'a',
+			        key: 'a',
+					align:'center'
+			    }, {
+			        title: '下证数量',
+			        dataIndex: 'a',
+			        key: 'a',
+					align:'center'
+			    }, {
+			        title: '未下证数量',
+			        dataIndex: 'a',
+			        key: 'a',
+					align:'center'
+			    }, 
+			]	
         }
     },
     /* 分派 */
@@ -334,6 +359,11 @@ const Task = React.createClass({
 		})
 		this.reset();
 	},
+	foo(){
+		this.setState({
+			testFlag:false
+		})
+	},
     closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
@@ -465,6 +495,7 @@ const Task = React.createClass({
                		 </Select> 
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
+					<Button type='primary' style={{marginLeft:'10px'}}>导出Excel</Button>
                     {/* <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                         <span>订单时间 :</span>
@@ -479,6 +510,7 @@ const Task = React.createClass({
                         <Table columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
+							onHeaderRow={(column,index) =>{console.log(column.index)}}
                             pagination={this.state.pagination}
                             onRowClick={this.tableRowClick.bind(this)} />
                     </Spin>
@@ -631,7 +663,7 @@ const Task = React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.addnextVisible}
                         onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='800px'
+                        width='900px'
                         title='项目任务详情'                    
                         footer=''
                         className="admin-desc-content">
@@ -670,6 +702,217 @@ const Task = React.createClass({
 			                </Spin>
 			            </Form >
 			        </Modal>
+					<Modal maskClosable={false} visible={this.state.testFlag}
+					    onOk={this.nextCancel} onCancel={this.foo}
+					    width='800px'
+					    title='项目概况'                    
+					    footer=''
+					    className="admin-desc-content">
+						<div className="clearfix">
+							<FormItem className="large-item"
+								labelCol={{ span: 5 }}
+								wrapperCol={{ span: 14 }}
+								label="当前项目情况">
+								<Radio.Group value={this.state.aaa}>
+									<Radio value={1}>开启</Radio>
+									<Radio value={2}>暂停</Radio>
+								</Radio.Group>
+								<Button type='primary' size='small' style={{marginTop:'5px',position:'absolute'}}>操作日志</Button>
+							</FormItem>
+						</div>
+						<div className="clearfix">
+							<FormItem className="large-item"
+								labelCol={{ span: 5 }}
+								wrapperCol={{ span: 14 }}
+								label="退单">
+								<Radio.Group value={this.state.aaa}>
+									<Radio value={1}>项目已完成退单</Radio>
+									<Radio value={2}>项目未完成退单</Radio>
+									<Radio value={3}>其他</Radio>
+								</Radio.Group>
+							</FormItem>
+						</div>
+						<div className="clearfix">
+							<FormItem className="large-item"
+								labelCol={{ span: 5 }}
+								wrapperCol={{ span: 14 }}
+								label="请备注退单原因">
+								<Input.TextArea />
+							</FormItem>
+						</div>
+						<div className="clearfix">
+							<FormItem className="large-item"
+								labelCol={{ span: 5 }}
+								wrapperCol={{ span: 14 }}
+								label="满意度表格">
+								<Radio.Group value={this.state.aaa}>
+									<Radio value={1}>已收回</Radio>
+									<Radio value={2}>未收回</Radio>
+									<Radio value={3}>其他</Radio>
+								</Radio.Group>
+							</FormItem>
+						</div>
+						<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>
+						<div className="clearfix">
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="是否特批">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="项目进度">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="合同编号">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="结算状态">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="流程状态">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="订单编号">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="材料是否启动">
+								<span></span>
+							</FormItem>
+						</div>
+						<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>
+						<div className="clearfix">
+							<h3 style={{marginTop:'10px',marginLeft:'10px'}}>任务信息</h3>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="任务编号">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="任务名称">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="任务状态">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="任务类别">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="证书编号">
+								<span></span>
+							</FormItem>
+						</div>
+						<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>
+						<div className="clearfix">
+							<h3 style={{marginTop:'10px',marginLeft:'10px'}}>联系信息</h3>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="客户名称">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="企业法人">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="法人电话">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="客户联系人">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="联系人电话">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="企业地址">
+								<span></span>
+							</FormItem>
+						</div>
+						<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>
+						<div className="clearfix">
+							<h3 style={{marginTop:'10px',marginLeft:'10px'}}>订单负责人</h3>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="负责人">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="负责人电话">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="财务负责人">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="财务负责人电话">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="附件">
+								<span></span>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="备注">
+								<Input.TextArea />
+							</FormItem>
+						</div>
+						<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>
+						<div className="clearfix">
+							<h3 style={{marginTop:'10px',marginLeft:'10px'}}>项目申报进度</h3>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="启动时间">
+								<DatePicker style={{marginTop:'5px'}}/>
+							</FormItem>
+							<FormItem className="half-item"
+								{...formItemLayout}
+								label="软著派单数量">
+								<InputNumber />
+							</FormItem>
+							<div className='half-item'>
+							
+							</div>
+							<div className='half-item'>
+								<Button type='primary' style={{marginLeft:'45px'}}>+增加下证信息</Button>
+							</div>
+							<div className="patent-table">
+							    <Spin spinning={this.state.loading}>
+							        <Table columns={this.state.columnsY} width={400}/>
+							    </Spin>
+							</div>
+						</div>
+					</Modal>
         </div> )
     }
 })

+ 5 - 5
js/component/manageCenter/publicComponent/assign.jsx

@@ -46,7 +46,7 @@ const Assign=React.createClass({
 	},
     getInitialState() {
         return {
-            contact:1,
+            contact:0,
             selectedRows: [],
             searchMore: true,
             loading: false,
@@ -139,7 +139,7 @@ const Assign=React.createClass({
                 pageSize: 99,
                 departmentId:this.state.departmenttList,
                 name:this.state.financeNameSearch,
-                roleName:'财务专员'
+                roleName:this.props.roleName
             },
             success: function (data) {
                 let theArr = [];
@@ -249,14 +249,14 @@ const Assign=React.createClass({
     componentWillReceiveProps(nextProps) {
         this.state.visible=nextProps.showDesc;
         if(nextProps.showDesc){
-            this.contactList(nextProps,1);
+            this.contactList(nextProps,0);
             this.departmentList()
             this.setState({
                 orderNo:nextProps.data.orderNo
             })
         }
         this.setState({
-            contact:1
+            contact:0
         })
     },
     render() {
@@ -274,8 +274,8 @@ const Assign=React.createClass({
 			                	<div>
                                     <span style={{marginRight:5}}>常用联系人:</span>
                                     <Radio.Group onChange={(e)=>{this.setState({contact:e.target.value})}} value={this.state.contact}>
-                                        <Radio value={1}>否</Radio>
                                         <Radio value={0}>是</Radio>
+                                        <Radio value={1}>否</Radio>
                                     </Radio.Group>
 			                		<Select placeholder="部门"
 				                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}

+ 15 - 0
js/component/manageCenter/set/organization/organization.jsx

@@ -198,6 +198,8 @@ const Organization=Form.create()(React.createClass({
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
+							updateOrganization:this.state.updateOrganization,
+							abbreviation:this.state.abbreviation
 			            }
 			        }).done(function (data) { 
 			            this.setState({
@@ -227,6 +229,7 @@ const Organization=Form.create()(React.createClass({
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
+							abbreviation:this.state.abbreviation
 			            }
 			        }).done(function (data) { 
 			            this.setState({
@@ -259,6 +262,7 @@ const Organization=Form.create()(React.createClass({
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
+							abbreviation:this.state.abbreviation
 			            }
 			        }).done(function (data) { 
 			            this.setState({
@@ -289,6 +293,7 @@ const Organization=Form.create()(React.createClass({
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
+							abbreviation:this.state.abbreviation
 			            }
 			        }).done(function (data) { 
 			            this.setState({
@@ -357,6 +362,7 @@ const Organization=Form.create()(React.createClass({
                      editTime:thisdata.createTime,//创建时间
                      editRemarks: thisdata.remarks,//组织职能说明
                      editDataSource: theArr,
+					 abbreviation:thisdata.abbreviation
                 });
             }.bind(this),
         }).always(function (data) {
@@ -809,6 +815,15 @@ const Organization=Form.create()(React.createClass({
 				                            
 			                   		    </FormItem>
 		                   		    </div>
+									<div className="clearfix">
+				                    	<FormItem 
+					                            labelCol={{ span: 7 }}
+					                        	wrapperCol={{ span: 12 }}
+					                            label="缩写" >
+				                    	     <Input placeholder="缩写" value={this.state.abbreviation} 
+				                                onChange={(e)=>{this.setState({abbreviation:e.target.value})}}/>
+					                    </FormItem>
+				                    </div>
 		                   		    <div className="clearfix">
 				                    	<FormItem 
 						                    labelCol={{ span: 7 }}

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.1.01",
+  "version": "1.1.05",
   "description": "",
   "main": "index.js",
   "scripts": {