liting2017 7 년 전
부모
커밋
99550ef8ba
43개의 변경된 파일8257개의 추가작업 그리고 2046개의 파일을 삭제
  1. 199 0
      js/component/dataDic.js
  2. 0 1
      js/component/manageCenter/achievement/techAchievementAudit/auditDesc.jsx
  3. 1 1
      js/component/manageCenter/bottom.jsx
  4. 0 5
      js/component/manageCenter/customer/customerService/myBusiness.jsx
  5. 0 1
      js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx
  6. 0 2
      js/component/manageCenter/customer/reviewed/expertReview.jsx
  7. 0 2
      js/component/manageCenter/customer/reviewed/identityAuditsOne.jsx
  8. 0 1
      js/component/manageCenter/demand/demandAudit/techDemandAudit.jsx
  9. 0 2
      js/component/manageCenter/demand/demandRelease/demandReleaseDesc.jsx
  10. 0 2
      js/component/manageCenter/demand/techDemandQueryDesc.jsx
  11. 0 1
      js/component/manageCenter/idea/news/news.jsx
  12. 0 1
      js/component/manageCenter/idea/policy/techPolicyPublishs.jsx
  13. 31 7
      js/component/manageCenter/order/content.jsx
  14. 0 12
      js/component/manageCenter/order/departmentOrder/serviceManage.jsx
  15. 614 264
      js/component/manageCenter/order/myOrder/addService.jsx
  16. 547 0
      js/component/manageCenter/order/departmentOrder/servicesOrder/serviceManage.jsx
  17. 348 0
      js/component/manageCenter/order/flowSettlement/billManage/myBill.jsx
  18. 478 0
      js/component/manageCenter/order/flowSettlement/billManage/myBillDetaile.jsx
  19. 138 93
      js/component/manageCenter/order/flowSettlement/myBill.jsx
  20. 476 0
      js/component/manageCenter/order/flowSettlement/billManagement/myBillDetaile.jsx
  21. 348 0
      js/component/manageCenter/order/flowSettlement/billQuery/myBill.jsx
  22. 478 0
      js/component/manageCenter/order/flowSettlement/billQuery/myBillDetaile.jsx
  23. 358 0
      js/component/manageCenter/order/flowSettlement/myBill/myBill.jsx
  24. 478 0
      js/component/manageCenter/order/flowSettlement/myBill/myBillDetaile.jsx
  25. 0 293
      js/component/manageCenter/order/flowSettlement/myBillDetaile.jsx
  26. 1340 0
      js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx
  27. 198 103
      js/component/manageCenter/order/myOrder/myService.jsx
  28. 3 3
      js/component/manageCenter/order/orderManagement/approveOrder.jsx
  29. 2 2
      js/component/manageCenter/order/orderManagement/approveOrderDetaile.jsx
  30. 60 52
      js/component/manageCenter/order/orderManagement/publicOrder.jsx
  31. 120 174
      js/component/manageCenter/order/orderManagement/publicOrderDetaile.jsx
  32. 124 93
      js/component/manageCenter/order/settlementOrder/mySettlement.jsx
  33. 263 176
      js/component/manageCenter/order/settlementOrder/managementDetaile.jsx
  34. 0 462
      js/component/manageCenter/order/settlementOrder/mySettlementDetaile.jsx
  35. 599 0
      js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx
  36. 199 143
      js/component/manageCenter/order/settlementOrder/settlementManagement.jsx
  37. 0 2
      js/component/manageCenter/servicesManage/contract/contract.jsx
  38. 27 23
      js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx
  39. 669 118
      js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx
  40. 0 2
      js/component/manageCenter/set/business/businessCategory.jsx
  41. 14 2
      js/component/manageCenter/set/business/businessProject.jsx
  42. 0 1
      js/component/manageCenter/set/userManagementS/user.jsx
  43. 145 2
      js/component/tools.js

+ 199 - 0
js/component/dataDic.js

@@ -1834,4 +1834,203 @@ module.exports = {
 	    }
 	    
     ],
+    //订单开发字典
+    //订单类型		
+    orderType:[
+    	 {
+	        value: "0",
+	        key: "科技服务"
+	    }, {
+	        value: "1",
+	        key: "科技成果"
+	    }, {
+	        value: "2",
+	        key: "科技需求"
+	    }, {
+	        value: "3",
+	        key: "专家邀约"
+	    }, {
+	        value: "4",
+	        key: "活动报名"
+	    }, {
+	        value: "5",
+	        key: "会员升级"
+	    }, {
+	        value: "6",
+	        key: "咨询师"
+	    }
+    ],
+    //订单阶段		
+    orderStage:[
+    	 {
+	        value: "0",
+	        key: "意向"
+	    }, {
+	        value: "1",
+	        key: "订单"
+	    }, {
+	        value: "2",
+	        key: "合同"
+	    }, {
+	        value: "3",
+	        key: "项目"
+	    }
+	    
+    ],
+    //订单状态		
+    orderState:[
+    	 {
+	        value: "1",
+	        key: "待确认"
+	    }, {
+	        value: "10",
+	        key: "买家已取消"
+	    }, {
+	        value: "11",
+	        key: "卖家已拒绝"
+	    }, {
+	        value: "2",
+	        key: "待签单"
+	    }, {
+	        value: "20",
+	        key: "买家已取消"
+	    }, {
+	        value: "21",
+	        key: "卖家已取消"
+	    }, {
+	        value: "3",
+	        key: "已签单"
+	    }
+    ],
+    //付款状态		
+    paymentState:[
+    	 {
+	        value: "0",
+	        key: "首付待付请"
+	    }, {
+	        value: "1",
+	        key: "尾款待付清"
+	    }, {
+	        value: "2",
+	        key: "已付请"
+	    }, {
+	        value: "3",
+	        key: "退款待确认"
+	    }, {
+	        value: "4",
+	        key: "退款已同意"
+	    }, {
+	        value: "5",
+	        key: "退款已拒绝"
+	    }, {
+	        value: "6",
+	        key: "退款已完成"
+	    }, {
+	        value: "7",
+	        key: "待提现"
+	    }, {
+	        value: "8",
+	        key: "已提现"
+	    }
+    ],
+     //订单渠道		
+    orderChannel:[
+    	 {
+	        value: "0",
+	        key: "app"
+	    }, {
+	        value: "1",
+	        key: "门户网站"
+	    }, {
+	        value: "2",
+	        key: "线下营销"
+	    }
+    ],
+     //特批状态		
+    approvedState:[
+    	 {
+	        value: "0",
+	        key: "非特批"
+	    }, {
+	        value: "1",
+	        key: "特批待审核"
+	    }, {
+	        value: "2",
+	        key: "通过"
+	    },{
+	        value: "3",
+	        key: "驳回"
+	    }
+    ],
+     //交易渠道		
+    transactionChannel:[
+    	 {
+	        value: "0",
+	        key: "微信"
+	    }, {
+	        value: "1",
+	        key: "支付宝"
+	    }, {
+	        value: "2",
+	        key: "银联"
+	    }
+    ],
+     //交易科目		
+    transactionProject:[
+    	 {
+	        value: "0",
+	        key: "代收"
+	    }, {
+	        value: "1",
+	        key: "代付"
+	    }, {
+	        value: "2",
+	        key: "退款"
+	    }
+    ],
+     //支付方式		
+    paymentMethod:[
+    	 {
+	        value: "0",
+	        key: "在线支付"
+	    }, {
+	        value: "1",
+	        key: "线下支付"
+	    }
+    ],
+     //锁定或废除		
+    lock:[
+    	{
+	        value: "0",
+	        key: "正常"
+	    },{
+	        value: "1",
+	        key: "作废"
+	    }, {
+	        value: "1",
+	        key: "锁定"
+	    }
+    ],
+    //项目状态		
+    projectState:[
+    	 {
+	        value: "0",
+	        key: "未达立项条件"
+	    }, {
+	        value: "1",
+	        key: "待立项"
+	    }, {
+	        value: "2",
+	        key: "已立项"
+	    },{
+	        value: "3",
+	        key: "进行中"
+	    },{
+	        value: "4",
+	        key: "已结项"
+	    }, {
+	        value: "5",
+	        key: "已撤项"
+	    }
+    ],
 };

+ 0 - 1
js/component/manageCenter/achievement/techAchievementAudit/auditDesc.jsx

@@ -344,7 +344,6 @@ const AchievementDetailShow = Form.create()(React.createClass({
     	this.loadData(this.props.data.id, this.props.detailApiUrl,this.props.data.ownerType);
     },
     componentWillReceiveProps(nextProps) {
-    	console.log(nextProps)
         if (!this.props.visible && nextProps.visible) {
             this.loadData(nextProps.data.id, nextProps.detailApiUrl,nextProps.data.ownerType);
             this.state.textFileList = [];

+ 1 - 1
js/component/manageCenter/bottom.jsx

@@ -6,7 +6,7 @@ const Bottom = React.createClass({
         return (
             <div className="account-bottom">
                 <p>阿凡提科技</p>
-                <p>技术支持@湖南智明</p>
+                <p>技术支持@阿凡提</p>
             </div>
         )
     }

+ 0 - 5
js/component/manageCenter/customer/customerService/myBusiness.jsx

@@ -822,7 +822,6 @@ const MyBusiness = Form.create()(React.createClass({
 	                }
 	           });     
 	   		}	
-	   		console.log(theType);
 			this.setState({
 				  khId:theType
 			})
@@ -830,8 +829,6 @@ const MyBusiness = Form.create()(React.createClass({
 		},
 		//上级主管输入框失去焦点是判断客户是否存在
 		selectAuto(value,options){
-			console.log(value);
-			console.log(options);
 			let theType='';
 			let contactLists=this.state.customerArr||[];
 				if (value) {
@@ -841,7 +838,6 @@ const MyBusiness = Form.create()(React.createClass({
 	                }
 	           });     
 	   		}	
-	   		console.log(theType);
 			this.setState({
 				superior:value,
 				khId:theType
@@ -859,7 +855,6 @@ const MyBusiness = Form.create()(React.createClass({
 	                }
 	           });     
 	   		}
-			console.log(theType);
 			this.setState({
 				theTypes:theType
 			})

+ 0 - 1
js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx

@@ -2013,7 +2013,6 @@ const IndividualCustomer = Form.create()(React.createClass({
 		})
 	},
 	blurChange(e){
-		console.log(e)
 		let theType='';
 		let contactLists=this.state.customerArr||[];
 			if (e) {

+ 0 - 2
js/component/manageCenter/customer/reviewed/expertReview.jsx

@@ -757,7 +757,6 @@ const QueryCustomer = Form.create()(React.createClass({
 			},
 			success: function(data) {
 				let thisData = data.data;
-				console.log(thisData);
 				$.ajax({
 					method: "post",
 					dataType: "json",
@@ -804,7 +803,6 @@ const QueryCustomer = Form.create()(React.createClass({
 			},
 			success: function(data) {
 				let thisData = data.data;
-				console.log(thisData);
 				$.ajax({
 					method: "post",
 					dataType: "json",

+ 0 - 2
js/component/manageCenter/customer/reviewed/identityAuditsOne.jsx

@@ -653,7 +653,6 @@ const QueryCustomer = Form.create()(React.createClass({
 			},
 			success: function(data) {
 				let thisData = data.data;
-				console.log(thisData);
 				$.ajax({
 					method: "post",
 					dataType: "json",
@@ -700,7 +699,6 @@ const QueryCustomer = Form.create()(React.createClass({
 			},
 			success: function(data) {
 				let thisData = data.data;
-				console.log(thisData);
 				$.ajax({
 					method: "post",
 					dataType: "json",

+ 0 - 1
js/component/manageCenter/demand/demandAudit/techDemandAudit.jsx

@@ -312,7 +312,6 @@ const TechDemandPublish = React.createClass({
                 deletedIds.push(rowItem.id,rowItem.techBrokerIdd)
             };
         };
-        console.log(deletedIds);
         this.setState({
             selectedRowKeys: [],
             loading: deletedIds.length > 0

+ 0 - 2
js/component/manageCenter/demand/demandRelease/demandReleaseDesc.jsx

@@ -146,7 +146,6 @@ const DemandDetailShow = Form.create()(React.createClass({
         };
     },
     loadData(id, detailApiUrl,dataCategory) {
-    	console.log(dataCategory);
         this.setState({
             loading: true
         });
@@ -832,7 +831,6 @@ const DemandDetail = React.createClass({
         }.bind(this));
     },
     tableRowClick(record, index) {
-    	console.log(111);
         window.open(globalConfig.context + '/portal/detail/achievementDetail.html?id=' + record.id + '&type=' + record.ownerType);
     },
     handleCancel(e) {

+ 0 - 2
js/component/manageCenter/demand/techDemandQueryDesc.jsx

@@ -149,7 +149,6 @@ const DemandDetailShow = Form.create()(React.createClass({
         this.setState({
             loading: true
         });
-        console.log(this.props.data);
         $.ajax({
             method: "get",
             dataType: "json",
@@ -749,7 +748,6 @@ const DemandDetailForm = Form.create()(React.createClass({
         this.setState({
             loading: true
         });
-        console.log(this.props.data);
         $.ajax({
             method: "get",
             dataType: "json",

+ 0 - 1
js/component/manageCenter/idea/news/news.jsx

@@ -6,7 +6,6 @@ import moment from 'moment';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import {provinceList} from '../../../NewDicProvinceList';
-console.log(provinceList[0].id)
 const Avatar = React.createClass({
     getInitialState() {
         return {

+ 0 - 1
js/component/manageCenter/idea/policy/techPolicyPublishs.jsx

@@ -232,7 +232,6 @@ const Inquiry=React.createClass({
 				deletedIds = rowItem.id;
 			};
 		};
-		console.log(record);
 		this.setState({
 			selectedRowKeys: [],
 		});

+ 31 - 7
js/component/manageCenter/order/content.jsx

@@ -34,7 +34,7 @@ class Content extends Component {
         switch (key) {
             case 'myService':
                 require.ensure([], () => {
-                    const MyService = require('./myOrder/myService').default;
+                    const MyService = require('./myOrder/servicesOrder/myService').default;
                     this.setState({
                         component: <MyService />
                     });
@@ -42,7 +42,7 @@ class Content extends Component {
                 break;
             case 'serviceManage':
                 require.ensure([], () => {
-                    const ServiceManage = require('./departmentOrder/serviceManage').default;
+                    const ServiceManage = require('./departmentOrder/servicesOrder/serviceManage').default;
                     this.setState({
                         component: <ServiceManage />
                     });
@@ -50,7 +50,7 @@ class Content extends Component {
                 break;
             case 'public':
                 require.ensure([], () => {
-                    const PublicOrder = require('./orderManagement/publicOrder').default;
+                    const PublicOrder = require('./orderManagement/publicOrder/publicOrder').default;
                     this.setState({
                         component: <PublicOrder />
                     });
@@ -58,7 +58,7 @@ class Content extends Component {
                 break;
             case 'approved':
                 require.ensure([], () => {
-                    const ApproveOrder = require('./orderManagement/approveOrder').default;
+                    const ApproveOrder = require('./orderManagement/approveOrder/approveOrder').default;
                     this.setState({
                         component: <ApproveOrder />
                     });
@@ -66,7 +66,7 @@ class Content extends Component {
                 break;
             case 'mySettlement':
                 require.ensure([], () => {
-                    const MySettlement = require('./settlementOrder/mySettlement').default;
+                    const MySettlement = require('./settlementOrder/mySettlement/mySettlement').default;
                     this.setState({
                         component: <MySettlement />
                     });
@@ -74,7 +74,7 @@ class Content extends Component {
                 break;    
            	case 'settlementManage':
                 require.ensure([], () => {
-                    const SettlementManage = require('./settlementOrder/settlementManagement').default;
+                    const SettlementManage = require('./settlementOrder/settlementManage/settlementManagement').default;
                     this.setState({
                         component: <SettlementManage />
                     });
@@ -82,7 +82,31 @@ class Content extends Component {
                 break;
             case 'myBill':
                 require.ensure([], () => {
-                    const MyBill = require('./flowSettlement/myBill.jsx').default;
+                    const MyBill = require('./flowSettlement/myBill/myBill.jsx').default;
+                    this.setState({
+                        component: <MyBill />
+                    });
+                });
+                break;    
+            case 'billManage':
+                require.ensure([], () => {
+                    const MyBill = require('./flowSettlement/billManage/myBill.jsx').default;
+                    this.setState({
+                        component: <MyBill />
+                    });
+                });
+                break; 
+            case 'billQuery':
+                require.ensure([], () => {
+                    const MyBill = require('./flowSettlement/billQuery/myBill.jsx').default;
+                    this.setState({
+                        component: <MyBill />
+                    });
+                });
+                break; 
+            case 'billManagement':
+                require.ensure([], () => {
+                    const MyBill = require('./flowSettlement/billManagement/myBill.jsx').default;
                     this.setState({
                         component: <MyBill />
                     });

+ 0 - 12
js/component/manageCenter/order/departmentOrder/serviceManage.jsx

@@ -1,12 +0,0 @@
-import React from 'react';
-import '../userMangagement.less';
-
-const ServiceManage=React.createClass({
-	render(){
-		return(
-			<div className='user-content'>部门订单-科技服务订单</div>
-		)
-	}
-});
-
-export default ServiceManage;

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 614 - 264
js/component/manageCenter/order/myOrder/addService.jsx


+ 547 - 0
js/component/manageCenter/order/departmentOrder/servicesOrder/serviceManage.jsx

@@ -0,0 +1,547 @@
+import React from 'react';
+import ReactDom from 'react-dom';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Checkbox ,Modal, Upload ,Popconfirm} from 'antd';
+import NewService from "./addService.jsx";
+import moment from 'moment';
+import '../../userMangagement.less';
+import {intentProgress,transactionProgress,contractProgress,projectProgress,orderType, orderStage, orderState,paymentState, projectState,orderChannel, approvedState, lock,paymentMethod,transactionChannel} from '../../../../dataDic.js';
+import {getProjectState,getOrderType,getOrderStage,getOrderState,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel} from '../../../../tools.js';
+
+const ServiceManage=Form.create()(React.createClass({
+	loadData(pageNo,depart) {
+        this.state.data = [];
+        this.setState({
+            loading: true
+        });
+        let departArr=depart!=undefined?depart:this.state.departmentArr;
+        let depIdList=[];
+        if(this.state.departmenttSearch=='all'||this.state.departmenttSearch==undefined){
+        	departArr.map(function(item){
+        		depIdList.push(item.id)
+        	})
+        }
+        depIdList.shift();
+        let depNoList=depIdList.join(',')
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/order/listDepServiceOrder',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                buyerName:this.state.customerName,
+                depIds:this.state.departmenttSearch=='all'||this.state.departmenttSearch==undefined?depNoList:this.state.departmenttSearch,//部门
+                salesmanName:this.state.orderPersonSearch,//负责人
+                startDate: this.state.releaseDate[0],
+				endDate: this.state.releaseDate[1],
+				projectStage:this.state.projectProgress,
+				liquidationStatus:this.state.settlementState, //结算
+				orderStatus:this.state.orderStatusSearch,
+				orderChannel:this.state.orderChannel,
+				intention:this.state.intentOrder?1:0,
+				formal:this.state.formalOrder?1:0
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    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,
+	                         id: thisdata.id,
+	                         orderNo: thisdata.orderNo,//订单编号
+	                         orderType:thisdata.orderType,//订单类型
+	                         orderStatus:thisdata.orderStatus,
+	                         liquidationStatus:thisdata.liquidationStatus,
+	                         createTime:thisdata.createTime,
+	                         buyerName:thisdata.buyerName,
+	                         signTotalAmount:thisdata.signTotalAmount,
+	                         projectStage:thisdata.projectStage,
+	                         approval:thisdata.approval,
+	                         orderChannel:thisdata.orderChannel,
+	                         salesmanName:thisdata.salesmanName,
+	                         active:thisdata.active,
+	                         departmentName:thisdata.departmentName,
+	                         salesmanName:thisdata.salesmanName,
+	                         financeName:thisdata.financeName,
+	                         technicianName:thisdata.technicianName,
+                        });
+                    };
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                };
+                if(!data.data.list.length){
+					this.state.pagination.current=0
+					this.state.pagination.total=0
+				}
+                this.setState({
+                	pageNo:pageNo,
+                    dataSource: theArr,
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[],
+                    signBillVisible:false
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/order/selectMyDeps",
+			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,
+							depNo:item.depNo
+						})
+					})
+				}
+				theArr.unshift({
+					id:'all',
+					name:'所有部门'
+				})
+				this.setState({
+					departmentArr:theArr,
+				})
+				this.loadData('1',theArr);
+			}.bind(this),
+			}).always(function() {
+				this.setState({
+					loading: false
+				});
+			}.bind(this));
+	},
+    getInitialState() {
+        return {
+        	datauser:{},
+            selectedRowKeys: [],
+            releaseDate: [],
+            signBillState:false,
+            signBillVisible:false,
+            selectedRows: [],
+            searchMore: true,
+            loading: false,
+            intentOrder:true,
+            formalOrder:true,
+            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: 'orderNo',
+                    key: 'orderNo'
+                }, {
+                    title: '订单类型',
+                    dataIndex: 'orderType',
+                    key: 'orderType',
+                    render:text=>{return getOrderType(text)}
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'createTime',
+                    key: 'createTime'
+                },{
+                    title: '订单客户',
+                    dataIndex: 'buyerName',
+                    key: 'buyerName',
+                    render:(text)=>{
+                    	return (text.length>9?text.substr(0,9)+'...':text)
+                    }
+                }, {
+                    title: '实际下单金额',
+                    dataIndex: 'signTotalAmount',
+                    key: 'signTotalAmount'
+                },{
+                    title: '结算状态',
+                    dataIndex: 'liquidationStatus',
+                    key: 'liquidationStatus',
+                    render:text=>{return getPaymentState(text)}
+                },{
+                    title: '项目状态',
+                    dataIndex: 'projectStage',
+                    key: 'projectStage',
+                    render:text=>{return getProjectState(text)}
+                }, {
+                    title: '是否特批',
+                    dataIndex: 'approval',
+                    key: 'approval',
+                    render:text=>{return text?'已特批':'未特批'}
+                },{
+                    title: '订单渠道',
+                    dataIndex: 'orderChannel',
+                    key: 'orderChannel',
+                    render:text=>{return getOrderChannel(text)}
+                },{
+                    title: '部门机构',
+                    dataIndex: 'departmentName',
+                    key: 'departmentName'
+                },{
+                    title: '订单负责人',
+                    dataIndex: 'salesmanName',
+                    key: 'salesmanName'
+                },
+                {
+                    title: '财务负责人',
+                    dataIndex: 'financeName',
+                    key: 'financeName'
+                },
+                {
+                    title: '项目负责人',
+                    dataIndex: 'technicianName',
+                    key: 'technicianName'
+                },
+                {
+                    title: '操作',
+                    dataIndex: 'active',
+                    key: 'active',
+                    render: (text, record, index) => {
+						return <div>
+							{text.confirmIntention&&<Popconfirm title={'请确认您是否受理来自【'+record.buyerName+'】发起的服务意向订单?'} onConfirm={(e)=>{this.admissibleOrderOk(record)}} onCancel={(e)=>{this.admissibleOrderCancel(record)}} okText="同意" cancelText="拒绝">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">受理意向</Button>                 
+							</Popconfirm>}
+							{text.applySign&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.signBill(record)}} type="primary">签单</Button> }                
+							{text.applyForCancel&&<Popconfirm title={'请确认您是否取消客户【'+record.buyerName+'】的服务订单,订单取消将导致业务终止!'} onConfirm={(e)=>{this.cancelOrder(record)}} okText="确认" cancelText="取消">
+								<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">取消订单</Button>                 
+							</Popconfirm>}
+							{text.applyRevoke&&<Popconfirm title={'请确认您是否作废客户【'+record.buyerName+'】的服务订单,订单作废将导致订单失效!'} onConfirm={(e)=>{this.scrapOrder(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">作废</Button>                 
+							</Popconfirm>}
+							{text.applyLock &&<Popconfirm title={'请确认您是否锁定客户【'+record.buyerName+'】的服务订单,订单锁定将导致订单暂停!'} onConfirm={(e)=>{this.lockOrder(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">锁定<Icon type="lock" /></Button>                 
+							</Popconfirm>}
+							{text.applyUnLock&&<Popconfirm title={'请确认您是否解锁客户【'+record.buyerName+'】的服务订单,订单解锁将导致订单正常!'} onConfirm={(e)=>{this.unlockOrder(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">解锁<Icon type="unlock" /></Button>                 
+							</Popconfirm>}
+                        </div>
+					}
+                }
+            ],
+            dataSource: [],
+        };
+    },
+    //受理订单
+    admissibleOrderOk(e){
+    	this.admissibleOrder(e,true)
+    },
+    admissibleOrderCancel(e){
+    	this.admissibleOrder(e,false)
+    },
+    admissibleOrder(record,index) {
+        this.setState({
+        	signBillVisible:false,
+            selectedRowKeys: [],
+            loading: true,
+            userDetaile:false
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/order/confirmIntention',
+            data: {
+            	orderNo:record.orderNo,
+            	confirm:index
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功!');
+                this.setState({
+                    loading: false,
+                    showDesc:false
+                });
+            } else {
+                message.warning(data.error[0].message);
+                this.setState({
+                	showDesc:true
+                })
+            };
+            this.loadData(this.state.pageNo);
+        }.bind(this));
+    },
+    //取消订单
+    cancelOrder(e){
+    	this.operation(e,'cancelOrder')
+    },
+    //作废订单
+    scrapOrder(e){
+    	this.operation(e,'scrapOrder')
+    },
+    //锁定订单
+    lockOrder(e){
+    	this.operation(e,'lockOrder')
+    },
+    //解锁订单
+    unlockOrder(e){
+    	this.operation(e,'unlockOrder')
+    },
+    //签单
+    signBill(ids){
+    	this.setState({
+    		uid:ids,
+    		signBillVisible:true
+    	})
+    },
+    componentWillMount() {
+         this.departmentList()
+    },
+    tableRowClick(record, index) {
+    	this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+        	signBillVisible:false,
+        	signBillState:true,
+            showDesc: true
+        });
+    },
+    
+    //列表各种骚操作
+    operation(record,index) {
+    	let api;
+        switch(index){
+        	case 'cancelOrder':  //取消订单
+        		api='/api/quxiaodingdan';
+        		break;
+        	case 'scrapOrder':   //作废订单
+        		api='/api/zuofeidingdan';
+        		break;
+        	case 'lockOrder':    //锁定订单
+        		api='/api/suodingdingdan';
+        		break;
+        	case 'unlockOrder':  //解锁订单
+        		api='/api/jiesuodingdan';
+        		break;
+        	default:
+        	return false;
+        }
+        this.setState({
+            selectedRowKeys: [],
+            loading: true,
+            showDesc:false
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + api,
+            data: {
+            	orderNo:record.orderNo,
+            	confirm:''
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功!');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData(this.state.pageNo);
+        }.bind(this));
+    },
+    addClick() {
+    	this.state.userDetaile=false;
+        this.setState({
+        	signBillVisible:false,
+            showDesc: true
+        });
+    },
+    closeDesc(e, s) {
+    	this.state.userDetaile=false;
+        this.state.showDesc = e;
+        if (s) {
+            this.loadData(this.state.pageNo);
+        };
+    },
+    searchSwitch() {
+		this.setState({
+			signBillVisible:false,
+			searchMore: !this.state.searchMore
+		});
+	},
+    search() {
+    	this.setState({
+    		signBillVisible:false
+    	})
+        this.loadData();
+    },
+    reset() {
+    	this.setState({
+    		signBillVisible:false
+    	})
+    	this.state.customerName = '';
+    	this.state.orderPersonSearch = '';
+    	this.state.departmenttSearch = undefined;
+    	this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+		this.state.projectProgress = undefined;
+		this.state.settlementState = undefined;
+		this.state.orderStatusSearch = undefined;
+		this.state.orderChannel = undefined;
+		this.state.formalOrder = true;
+		this.state.intentOrder = true;
+        this.loadData();       
+    },
+    render() {
+    	const FormItem = Form.Item;
+    	const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+        const rowSelection = {
+            selectedRowKeys: this.state.selectedRowKeys,
+            onChange: (selectedRowKeys, selectedRows) => {
+	                this.setState({
+	                    selectedRows: selectedRows.slice(-1),
+	                    selectedRowKeys: selectedRowKeys.slice(-1)
+	                }); 
+            },
+            onSelectAll: (selected, selectedRows, changeRows) => {
+			   this.setState({
+			   		selectedRowKeys:[]
+			   })
+			},
+        };
+        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 style={{fontSize:'16px'}}>部门科技服务订单</span>	
+	                <div className="user-search">
+	                    <Input placeholder="客户名称" style={{width:'150px'}}
+	                        value={this.state.customerName}
+	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
+	                    <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 }); }} /> 
+		                <Select placeholder="部门机构" style={{width:'150px',marginLeft:'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>
+	                    <Input placeholder="订单负责人" style={{width:'150px'}}
+	                        value={this.state.orderPersonSearch}
+	                        onChange={(e) => { this.setState({ orderPersonSearch: e.target.value }); }} />
+	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索<Icon type="search" /></Button>
+	                    <Button onClick={this.reset}>重置 <Icon type="reload" /></Button>
+	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
+	                </div>
+	                <div className='clearfix' style={{marginTop:'5px'}}>
+	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>   
+	                  		<Checkbox checked={this.state.intentOrder} onChange={(e)=>{this.setState({intentOrder:!this.state.intentOrder})}}>意向订单</Checkbox>
+	                  		<Checkbox checked={this.state.formalOrder} onChange={(e)=>{this.setState({formalOrder:!this.state.formalOrder})}}>正式订单</Checkbox>
+	                  		<Select placeholder="订单状态"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderStatusSearch}
+	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
+	                            {
+                                    orderState.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="结算状态"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.settlementState}
+	                            onChange={(e) => { this.setState({ settlementState: e }) }}>
+	                            {
+                                    paymentState.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="项目进度"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.projectProgress}
+	                            onChange={(e) => { this.setState({ projectProgress: e }) }}>
+	                            {
+                                    projectState.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="订单渠道"
+	                            style={{ width: 150 }}
+	                            value={this.state.orderChannel}
+	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            {
+                                    orderChannel.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                    </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} />
+	                    </Spin>
+	                </div>
+	                <NewService
+	                	uid={this.state.uid}
+	                	signBillVisible={this.state.signBillVisible}
+	                    signBillState={this.state.signBillState}
+	                	operation={this.operation}
+	                	admissibleOrder={this.admissibleOrder}
+	                    userDetaile={this.state.userDetaile}
+	                    datauser={this.state.datauser}
+	                    showDesc={this.state.showDesc}
+	                    closeDesc={this.closeDesc} />
+	            </div >
+            </div>
+        );
+    }
+}));
+
+export default ServiceManage;
+

+ 348 - 0
js/component/manageCenter/order/flowSettlement/billManage/myBill.jsx

@@ -0,0 +1,348 @@
+import React from 'react';
+import ReactDom from 'react-dom';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, Modal, Upload ,Popconfirm,Checkbox} from 'antd';
+import MyBillDetaile from "./myBillDetaile.jsx";
+import moment from 'moment';
+import '../../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress,getTransactionChannel,getTransactionProject} from '../../../../tools.js';
+
+const MyBill=Form.create()(React.createClass({
+	loadData(pageNo) {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/order/queryAllBill',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                payerName:this.state.draweeName,//付款人名称
+                depId:this.state.departmenttSearch,//部门
+                confirmSign:this.state.confirmSignSearch,//流水确认
+                payeeName:this.state.payeeName,//收款人名称
+                deleteSign:this.state.term,//是否有效
+                orderNo:this.state.orderNumber,//订单编号
+                salesmanName:this.state.orderLeader,//订单负责人
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    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,
+	                         billNo: thisdata.billNo,
+	                         transactionAmount:thisdata.transactionAmount,
+	                         createTime:thisdata.createTime, 
+	                         transactionAmount:thisdata.transactionAmount,
+	                         payerName:thisdata.payerName,
+	                         payeeName:thisdata.payeeName,
+	                         transactionSubject:thisdata.transactionSubject,
+	                         transactionChannel:thisdata.transactionChannel,
+	                         financialPayNo:thisdata.financialPayNo,
+	                         financialPayTime:thisdata.financialPayTime,
+	                         orderNo:thisdata.orderNo,
+	                         departmentName:thisdata.departmentName,
+	                         salesmanName:thisdata.salesmanName,
+	                         financeName:thisdata.financeName,
+	                         confirmSign:thisdata.confirmSign,
+	                         deleteSign:thisdata.deleteSign,
+	                         confirmTime:thisdata.confirmTime
+                        });
+                    };
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                };
+                if(!data.data.list.length){
+					this.state.pagination.current=0
+					this.state.pagination.total=0
+				}
+                this.setState({
+                	pageNo:pageNo,
+                    dataSource: theArr,
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			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));
+	},
+    getInitialState() {
+        return {
+        	datauser:{},
+            selectedRowKeys: [],
+            selectedRows: [],
+            searchMore: true,
+            departmentArr:[],
+            loading: false,
+            visible:false,
+            showDesc: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: 'billNo',
+                    key: 'billNo'
+                }, {
+                    title: '平台流水时间',
+                    dataIndex: 'createTime',
+                    key: 'createTime'
+                }, {
+                    title: '流水金额',
+                    dataIndex: 'transactionAmount',
+                    key: 'transactionAmount'
+                },{
+                    title: '付款人名称',
+                    dataIndex: 'payerName',
+                    key: 'payerName'
+                }, {
+                    title: '收款人名称',
+                    dataIndex: 'payeeName',
+                    key: 'payeeName'
+                },
+                {
+                    title: '流水科目',
+                    dataIndex: 'transactionSubject',
+                    key: 'transactionSubject',
+                    render:(text)=>{return getTransactionProject(text) }
+                }, {
+                    title: '流水渠道',
+                    dataIndex: 'transactionChannel',
+                    key: 'transactionChannel',
+                    render:(text)=>{return getTransactionChannel(text) }
+                },{
+                    title: '财务流水号',
+                    dataIndex: 'financialPayNo',
+                    key: 'financialPayNo',
+                }, {
+                    title: '财务流水时间',
+                    dataIndex: 'financialPayTime',
+                    key: 'financialPayTime',
+                }, {
+                    title: '流水确认',
+                    dataIndex: 'confirmSign',
+                    key: 'confirmSign',
+                    render:(text)=>{return text?'已确认':'待确认' }
+                },{
+                    title: '确认时间',
+                    dataIndex: 'confirmTime',
+                    key: 'confirmTime',
+                },{
+                    title: '订单编号',
+                    dataIndex: 'orderNo',
+                    key: 'orderNo',
+                },{
+                    title: '订单负责人',
+                    dataIndex: 'salesmanName',
+                    key: 'salesmanName',
+                },{
+                    title: '是否有效',
+                    dataIndex: 'deleteSign',
+                    key: 'deleteSign',
+                    render:(text)=>{return text?'有效':'作废' }
+                },
+            ],
+            dataSource: [],
+        };
+    },
+    //驳回
+    reject(record){
+    	this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+        	rowClick:false,
+            showDesc: true
+        });
+    },
+    componentWillMount() {
+    	this.loadData()
+        this.departmentList();
+    },
+    closeDesc(e, s) {
+    	this.state.userDetaile=false;
+        this.state.showDesc = e;
+        if (s) {
+            this.loadData(this.state.pageNo);
+        };
+    },
+    searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+    search() {
+        this.loadData();
+    },
+    reset() {
+    	this.state.draweeName='';
+    	this.state.payeeName='';
+		this.state.term = undefined;
+		this.state.orderNumber = '';
+		this.state.confirmSignSearch=undefined;
+		this.state.departmenttSearch = undefined;
+		this.state.orderLeader = '';
+        this.loadData();       
+    },
+    tableRowClick(record, index) {
+    	this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+        	rowClick:true,
+        	signBillState:true,
+            showDesc: true
+        });
+    },
+    render() {
+        const rowSelection = {
+            selectedRowKeys: this.state.selectedRowKeys,
+            onChange: (selectedRowKeys, selectedRows) => {
+	                this.setState({
+	                    selectedRows: selectedRows.slice(-1),
+	                    selectedRowKeys: selectedRowKeys.slice(-1)
+	                }); 
+            },
+            onSelectAll: (selected, selectedRows, changeRows) => {
+			   this.setState({
+			   		selectedRowKeys:[]
+			   })
+			},
+        };
+        let departmentArr = this.state.departmentArr || [];
+        const hasSelected = this.state.selectedRowKeys.length > 0;
+        return (
+            <div className="user-content" >
+                <div className="content-title">
+                	<span style={{fontSize:'16px'}}>部门订单流水查询</span>	
+	                <div className="user-search">
+	                    <Input placeholder="付款人名称" style={{width:'150px'}}
+	                        value={this.state.draweeName}
+	                        onChange={(e) => { this.setState({ draweeName: e.target.value }); }} />
+	                    <Input placeholder="收款人名称" style={{width:'150px'}}
+	                        value={this.state.payeeName}
+	                        onChange={(e) => { this.setState({ payeeName: e.target.value }); }} />    
+                        <Select placeholder="流水确认"
+	                        style={{ width: 150 ,marginRight:'10px'}}
+	                        value={this.state.confirmSignSearch}
+	                        onChange={(e) => { this.setState({ confirmSignSearch: e }) }}>
+	                        <Select.Option value='0'>待确认</Select.Option>
+	                        <Select.Option value='1'>已确认</Select.Option>
+                  		</Select>
+                  		<Select placeholder="是否有效"
+	                        style={{ width: 150 ,marginRight:'10px'}}
+	                        value={this.state.term}
+	                        onChange={(e) => { this.setState({ term: e }) }}>
+	                        <Select.Option value='0'>作废</Select.Option>
+	                        <Select.Option value='1'>有效</Select.Option>
+                  		</Select>
+	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
+	                    <Button onClick={this.reset}>重置</Button>
+	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
+	                </div>
+	                <div className='clearfix' style={{marginTop:'5px'}}>
+	                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
+	                  		<Input placeholder="订单编号" style={{width:'150px'}}
+		                        value={this.state.orderNumber}
+		                        onChange={(e) => { this.setState({ orderNumber: e.target.value }); }} />
+		                    <Select placeholder="订单部门"
+	                            style={{ width: 150 ,marginRight:'10px',marginLeft:'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> 
+		                    <Input placeholder="订单负责人" style={{width:'150px',marginBottom:'10px'}}
+		                        value={this.state.orderLeader}
+		                        onChange={(e) => { this.setState({ orderLeader: e.target.value }); }} />    
+	                    </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}
+                            />
+	                    </Spin>
+	                </div>
+	                <MyBillDetaile
+	                	rowClick={this.state.rowClick}
+	                    userDetaile={this.state.userDetaile}
+	                    datauser={this.state.datauser}
+	                    showDesc={this.state.showDesc}
+	                    closeDesc={this.closeDesc} />
+	            </div >
+            </div>
+        );
+    }
+}));
+
+export default MyBill;
+

+ 478 - 0
js/component/manageCenter/order/flowSettlement/billManage/myBillDetaile.jsx

@@ -0,0 +1,478 @@
+import React from 'react';
+import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,DatePicker} from 'antd';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import '../../userMangagement.less';
+import {} from '../../../../dataDic.js';
+import {getOrderType ,getOrderChannel , getOrderState ,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
+
+
+const MyBillDetaile = Form.create()(React.createClass({
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+			seeOrderVisible:false
+		};
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+			this.setState({
+				loading:true
+			})
+	    	$.ajax({
+	            method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/order/selectBillDetail',
+	            data: {
+	              billNo: record.billNo
+	            },
+	            success: function (data) {
+	                let thisData = data.data;                
+	                if (!thisData) {
+	                    if (data.error && data.error.length) {
+	                        message.warning(data.error[0].message);
+	                    };
+	                    thisData = {};
+	                };
+	                this.setState({
+	                	orderList:thisData,
+						billNoId:record.billNo,
+	                });                  
+	            }.bind(this),
+	       }).always(function () {
+	            this.setState({            	
+	                loading: false
+            });
+        }.bind(this));  
+       }
+    },
+    //保存确认流水
+    handleSubmit(state){
+    	if(!this.state.financialPayNo){
+        	message.warning('请输入财务流水号');
+        	return false;
+        };
+        if(this.state.selTime==undefined){
+        	message.warning('请选择财务流水时间');
+        	return false;
+        };
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/confrimBill',
+			data: {
+				confirm:state?'1':'0',
+				billNo:this.state.billNoId,
+				orderNo:this.props.datauser.orderNo,
+				financialPayNo:this.state.financialPayNo,
+				financialPayTime:this.state.selTime,
+				remarks:this.state.remarks
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('已确认!');
+				this.handleOk()
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+    },
+    //时间选择
+    selTime(e,index){
+    	this.setState({
+    		financialPayTime:e,
+    		selTime:index
+    	})
+    },
+    //确认流水
+    toVoidCancel(){
+    	this.handleSubmit(true)
+    },
+    //作废流水
+    toVoid(){
+    	this.handleSubmit(false)
+    },
+	handleOk(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false, true);
+	},
+	handleCancel(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false);
+	},
+	componentWillMount() {
+		
+	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//查看订单
+	seeOrder(){
+		this.setState({
+			seeOrderVisible:true
+		})
+		this.seeOrderList()
+	},
+	seeOrderCancel(){
+		this.setState({
+			seeOrderVisible:false
+		})	
+	},
+	seeOrderList(){
+		this.state.lookOrderList=[];
+    	$.ajax({
+            method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
+            data: {
+              orderNo: this.props.datauser.orderNo
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                this.setState({
+					id:thisData.id,
+					lookOrderList:thisData,
+                });
+            }.bind(this),
+       }).always(function () {
+            this.setState({            	
+                loading: false
+            });
+        }.bind(this));  
+	},
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.visible = nextProps.showDesc;
+		if(nextProps.userDetaile && nextProps.showDesc ) {
+			this.loaduser(nextProps.datauser);
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		const orderDetaiel=this.state.orderList || [];
+		const seeOrderDetaiel=this.state.lookOrderList || [];
+		return(
+			<div>
+            <Modal maskClosable={false} visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    title='流水详情'                     
+                    footer=''
+                    className="admin-desc-content">
+		            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}>
+		                <Spin spinning={this.state.loading}>
+	                        <div className="clearfix">
+	                            <div className="clearfix">
+		                       		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="平台流水号" >
+			                            <span>{orderDetaiel.billNo}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="平台流水时间" >  
+			                            <span>{orderDetaiel.createTime}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水金额" >  
+			                            <span>{orderDetaiel.transactionAmount}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水科目" >  
+			                            <span>{getTransactionProject(orderDetaiel.transactionSubject)}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水状态" >  
+			                            <span>{orderDetaiel.confirmSign?'已确认':'待确认'}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="付款人名称" >  
+			                            <span>{orderDetaiel.payerName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="收款人名称" >  
+			                            <span>{orderDetaiel.payeeName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="交易渠道" >    
+		                            	<span>{getTransactionChannel(orderDetaiel.transactionChannel)}</span>
+				                    </FormItem>
+				                    <div className='clearfix'>
+							        	<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="附言" >
+							        		<span>{orderDetaiel.postscript}</span>
+								        </FormItem>
+							        </div>
+				                    <div className='clearfix'>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >   
+				                            <span>{orderDetaiel.orderNo}</span>
+				                            <Button style={{float:'right'}} onClick={this.seeOrder}>查看订单</Button>
+					                    </FormItem>
+					               	</div>    
+				                    <div className='clearfix'>
+							        	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >   
+				                            <span>{orderDetaiel.salesmanName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >   
+				                            <span>{orderDetaiel.financeName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="流水确认时间" >   
+				                            <span>{orderDetaiel.confirmTime}</span>
+			                    		</FormItem>
+		                    		</div>
+		                    		{!this.props.rowClick?<div className='clearfix'>
+				                        <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水号" >   
+				                            <Input value={this.state.financialPayNo}  style={{width:'240px'}} placeholder="请输入财务流水号"
+				                                 onChange={(e)=>{this.setState({financialPayNo:e.target.value})}} required="required" />
+									        <span className="mandatory">*</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水时间" >   
+				                            <DatePicker
+				                              style={{marginTop:'0',width:'200px',height:'32px'}}
+										      showTime
+										      format="YYYY-MM-DD HH:mm:ss"
+										      placeholder="选择时间"
+										      value={this.state.financialPayTime}
+										      onChange={(e,time)=>{this.selTime(e,time)}}
+										    />
+									        <span className="mandatory">*</span>
+			                    		</FormItem>
+			                    	</div>:<div className='clearfix'>
+				                        <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水号" >   
+				                            <span>{orderDetaiel.financialPayNo}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水时间" >   
+				                            <span>{orderDetaiel.financialPayTime}</span>
+			                    		</FormItem>
+			                    	</div>}
+			                    	{!this.props.rowClick?<div className='clearfix'>
+			                    		<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="财务备注" >
+								                <Input type="textarea" placeholder="请输入财务备注" rows={4}  value={this.state.remarks} 
+									    			onChange={(e)=>{this.setState({remarks:e.target.value})}}/>			                      
+								        </FormItem>
+								    </div>:<div className='clearfix'>
+			                    		<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="财务备注" >
+								               <span>{orderDetaiel.remarks}</span>		                      
+								        </FormItem>
+								    </div>} 
+								    {!this.props.rowClick?<div className='btnSave'>
+							            <Button className="setSave" type="primary" onClick={this.toVoidCancel}>确认流水</Button> 
+							            <Button className="toVoid" type="danger" onClick={this.toVoid}>作废流水</Button> 
+							        	<Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
+							        </div>:''}
+		                        </div>
+		                    </div>
+		                </Spin>
+		            </Form >
+		        </Modal>
+		        <Modal maskClosable={false} visible={this.state.seeOrderVisible}
+                        onOk={this.seeOrderCancel} onCancel={this.seeOrderCancel}
+                        width='1000px'
+                        title= '查看订单'                 
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	  	<div className="clearfix">
+			                       		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >
+				                            <span>{seeOrderDetaiel.orderNo}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="下单时间" >  
+				                            <span>{seeOrderDetaiel.createTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="客户名称" >  
+				                            <span>{seeOrderDetaiel.buyerName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单类型" >  
+				                            <span>{getOrderType(seeOrderDetaiel.orderType)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单渠道" >  
+				                            <span>{getOrderChannel(seeOrderDetaiel.orderChannel)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单状态" >  
+				                            <span>{getOrderState(seeOrderDetaiel.orderStatus)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="已收款项" >  
+				                            <span>{seeOrderDetaiel.actuallyTotalAmount}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="结算状态" >  
+				                            <span>{getPaymentState(seeOrderDetaiel.liquidationStatus)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价订单金额" >    
+			                            	<span>{seeOrderDetaiel.orderAmount}</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价首款金额" >   
+				                            <span>{seeOrderDetaiel.firstPayment}</span>
+					                    </FormItem>
+					                    <div className='clearfix'>
+								        	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签订单金额" >   
+					                            <span>{seeOrderDetaiel.signTotalAmount}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签首款金额" >   
+					                            <span>{seeOrderDetaiel.signFirstPayment}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="特批立项" >   
+					                            <span>{getApprovedState(seeOrderDetaiel.approval)}</span>
+				                    		</FormItem>
+											<div className="clearfix">
+												<FormItem
+							                        labelCol={{ span: 4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="合同扫描件" >
+						                            <Upload className="demandDetailShow-upload"
+						                                listType="customer_sys_file"
+						                                fileList={this.state.orgCodeUrl}
+						                                onPreview={(file) => {
+						                                    this.setState({
+						                                        previewImage: file.url || file.thumbUrl,
+						                                        previewVisible: true,
+						                                    });
+						                                }} >
+						                            </Upload>
+						                            <Modal maskClosable={false} footer={null}
+						                                visible={this.state.previewVisible}
+						                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+						                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+						                            </Modal>
+						                        </FormItem>    
+					                        </div>
+					                        <div className='clearfix'>
+									        	<FormItem
+										            labelCol={{ span: 4 }}
+										            wrapperCol={{ span: 16 }}
+										            label="订单留言" >
+									        		<span>{seeOrderDetaiel.orderRemarks}</span>
+										        </FormItem>
+									        </div>
+								        </div>
+			                        </div>
+			                        <div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >  
+				                            <span>{seeOrderDetaiel.salesmanName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="意向时间" >  
+				                            <span>{seeOrderDetaiel.createTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="签单时间" >  
+				                            <span>{seeOrderDetaiel.signTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >  
+				                            <span>{seeOrderDetaiel.financeName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="首付时间" >  
+				                            <span>{seeOrderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目负责人" >  
+				                            <span>{seeOrderDetaiel.technicianName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="立项时间" >  
+				                            <span>{seeOrderDetaiel.setUpTime}</span>
+			                    		</FormItem>
+		                    		</div>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+    	    </div>
+		)
+	}
+}));
+
+export default MyBillDetaile;

+ 138 - 93
js/component/manageCenter/order/flowSettlement/myBill.jsx

@@ -5,13 +5,12 @@ import $ from 'jquery/src/ajax';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, Modal, Upload ,Popconfirm,Checkbox} from 'antd';
 import MyBillDetaile from "./myBillDetaile.jsx";
 import moment from 'moment';
-import '../userMangagement.less';
-import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
-import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../tools.js';
+import '../../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress,getTransactionChannel,getTransactionProject} from '../../../../tools.js';
 
 const MyBill=Form.create()(React.createClass({
 	loadData(pageNo) {
-        this.state.data = [];
         this.setState({
             loading: true
         });
@@ -19,16 +18,17 @@ const MyBill=Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/roles',
+            url: globalConfig.context + '/api/admin/order/queryAllBill',
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                draweeName:this.state.draweeName,//付款人名称
-                payeeName:this.state.payeeName,//付款人名称
-                term:this.state.term,//是否有效
-                orderNumber:this.state.orderNumber,//订单编号
-                orderDepartment:this.state.orderDepartment,//订单部门
-                orderLeader:this.state.orderLeader,//订单负责人
+                payerName:this.state.draweeName,//付款人名称
+                depId:this.state.departmenttSearch,//部门
+                confirmSign:this.state.confirmSignSearch,//流水确认
+                payeeName:this.state.payeeName,//收款人名称
+                deleteSign:this.state.term,//是否有效
+                orderNo:this.state.orderNumber,//订单编号
+                salesmanName:this.state.orderLeader,//订单负责人
             },
             success: function (data) {
                 let theArr = [];
@@ -41,10 +41,23 @@ const MyBill=Form.create()(React.createClass({
                         let thisdata = data.data.list[i];
                         theArr.push({
                              key: i,
-	                         id: thisdata.id,
-	                         roleName: thisdata.roleName,
-	                         creater:thisdata.creater,
-	                         createTime:thisdata.createTimez,
+	                         billNo: thisdata.billNo,
+	                         transactionAmount:thisdata.transactionAmount,
+	                         createTime:thisdata.createTime, 
+	                         transactionAmount:thisdata.transactionAmount,
+	                         payerName:thisdata.payerName,
+	                         payeeName:thisdata.payeeName,
+	                         transactionSubject:thisdata.transactionSubject,
+	                         transactionChannel:thisdata.transactionChannel,
+	                         financialPayNo:thisdata.financialPayNo,
+	                         financialPayTime:thisdata.financialPayTime,
+	                         orderNo:thisdata.orderNo,
+	                         departmentName:thisdata.departmentName,
+	                         salesmanName:thisdata.salesmanName,
+	                         financeName:thisdata.financeName,
+	                         confirmSign:thisdata.confirmSign,
+	                         deleteSign:thisdata.deleteSign,
+	                         confirmTime:thisdata.confirmTime
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -55,6 +68,7 @@ const MyBill=Form.create()(React.createClass({
 					this.state.pagination.total=0
 				}
                 this.setState({
+                	pageNo:pageNo,
                     dataSource: theArr,
                     pagination: this.state.pagination,
                     selectedRowKeys:[]
@@ -66,12 +80,53 @@ const MyBill=Form.create()(React.createClass({
             });
         }.bind(this));
     },
+    //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			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));
+	},
     getInitialState() {
         return {
         	datauser:{},
             selectedRowKeys: [],
             selectedRows: [],
             searchMore: true,
+            departmentArr:[],
             loading: false,
             visible:false,
             showDesc:false,
@@ -90,69 +145,65 @@ const MyBill=Form.create()(React.createClass({
             columns: [
                 {
                     title: '平台流水号',
-                    dataIndex: 'roleName',
-                    key: 'roleName'
+                    dataIndex: 'billNo',
+                    key: 'billNo'
                 }, {
                     title: '平台流水时间',
-                    dataIndex: 'creater',
-                    key: 'creater'
+                    dataIndex: 'createTime',
+                    key: 'createTime'
                 }, {
                     title: '流水金额',
-                    dataIndex: 'creater7',
-                    key: 'creater7'
+                    dataIndex: 'transactionAmount',
+                    key: 'transactionAmount'
                 },{
                     title: '付款人名称',
-                    dataIndex: 'roleName1',
-                    key: 'roleName1'
+                    dataIndex: 'payerName',
+                    key: 'payerName'
                 }, {
                     title: '收款人名称',
-                    dataIndex: 'c',
-                    key: 'c'
+                    dataIndex: 'payeeName',
+                    key: 'payeeName'
                 },
                 {
                     title: '流水科目',
-                    dataIndex: 'creater1',
-                    key: 'creater1'
+                    dataIndex: 'transactionSubject',
+                    key: 'transactionSubject',
+                    render:(text)=>{return getTransactionProject(text) }
                 }, {
-                    title: '流水方式',
-                    dataIndex: 'createTime1',
-                    key: 'createTime1',
-                    render:(text)=>{return getIntentProgress(text) }
+                    title: '流水渠道',
+                    dataIndex: 'transactionChannel',
+                    key: 'transactionChannel',
+                    render:(text)=>{return getTransactionChannel(text) }
                 },{
                     title: '财务流水号',
-                    dataIndex: 'roleName2',
-                    key: 'roleName2',
-                    render:(text)=>{return getTransactionProgress(text) }
+                    dataIndex: 'financialPayNo',
+                    key: 'financialPayNo',
                 }, {
                     title: '财务流水时间',
-                    dataIndex: 'creater2',
-                    key: 'creater2',
-                    render:(text)=>{return getContractProgress(text) }
+                    dataIndex: 'financialPayTime',
+                    key: 'financialPayTime',
                 }, {
                     title: '流水确认',
-                    dataIndex: 'creatu',
-                    key: 'creatu',
-                    render:(text)=>{return getProjectProgress(text) }
+                    dataIndex: 'confirmSign',
+                    key: 'confirmSign',
+                    render:(text)=>{return text?'已确认':'待确认' }
                 },{
                     title: '确认时间',
-                    dataIndex: 'cre',
-                    key: 'cre',
-                    render:(text)=>{return getProjectProgress(text) }
+                    dataIndex: 'confirmTime',
+                    key: 'confirmTime',
                 },{
                     title: '订单编号',
-                    dataIndex: 'crea1tu',
-                    key: 'crea1tu',
-                    render:(text)=>{return getProjectProgress(text) }
+                    dataIndex: 'orderNo',
+                    key: 'orderNo',
                 },{
                     title: '订单负责人',
-                    dataIndex: 'c2re',
-                    key: 'c2re',
-                    render:(text)=>{return getProjectProgress(text) }
+                    dataIndex: 'salesmanName',
+                    key: 'salesmanName',
                 },{
                     title: '是否有效',
-                    dataIndex: 'c22re',
-                    key: 'c22re',
-                    render:(text)=>{return getProjectProgress(text) }
+                    dataIndex: 'deleteSign',
+                    key: 'deleteSign',
+                    render:(text)=>{return text?'有效':'作废' }
                 },
                 {
                     title: '操作',
@@ -160,8 +211,7 @@ const MyBill=Form.create()(React.createClass({
                     key: 'operation',
                     render: (text, record, index) => {
 						return <div>
-								    <Button style={{marginRight:'5px'}} type="danger" onClick={(e) =>{this.reject(record) }}>作废</Button>                 
-								    <Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{this.reject(record) }}>确认</Button>                 
+								   {!record.confirmSign&&<Button style={{marginRight:'5px'}} onClick={(e) =>{e.stopPropagation(),this.reject(record) }}>编辑</Button>}                 
                         	   </div>
 					}
                 }
@@ -169,36 +219,24 @@ const MyBill=Form.create()(React.createClass({
             dataSource: [],
         };
     },
-    //操作分配
-    confirmDelet(index){
-    	this.setState({
-    		userDetaile:false,
-    	});
-    	this.contactList(1,index.id)
-    },
     //驳回
     reject(record){
     	this.state.userDetaile=true;
         this.state.datauser = record;
         this.setState({
+        	rowClick:false,
             showDesc: true
         });
     },
     componentWillMount() {
-        this.loadData();
+    	this.loadData()
+        this.departmentList();
     },
-//  tableRowClick(record, index) {
-//  	this.state.userDetaile=true;
-//      this.state.datauser = record;
-//      this.setState({
-//          showDesc: true
-//      });
-//  },
     closeDesc(e, s) {
     	this.state.userDetaile=false;
         this.state.showDesc = e;
         if (s) {
-            this.loadData();
+            this.loadData(this.state.pageNo);
         };
     },
     searchSwitch() {
@@ -209,24 +247,25 @@ const MyBill=Form.create()(React.createClass({
     search() {
         this.loadData();
     },
-    //分配时搜索
-    searchOrder() {
-        this.contactList();
-    },
-    //分配时重置
-    resetOrder() {
-        this.contactList();
-    },
     reset() {
     	this.state.draweeName='';
     	this.state.payeeName='';
-		this.state.pipelining = undefined;
 		this.state.term = undefined;
 		this.state.orderNumber = '';
-		this.state.orderDepartment = '';
+		this.state.confirmSignSearch=undefined;
+		this.state.departmenttSearch = undefined;
 		this.state.orderLeader = '';
         this.loadData();       
     },
+    tableRowClick(record, index) {
+    	this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+        	rowClick:true,
+        	signBillState:true,
+            showDesc: true
+        });
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -242,6 +281,7 @@ const MyBill=Form.create()(React.createClass({
 			   })
 			},
         };
+        let departmentArr = this.state.departmentArr || [];
         const hasSelected = this.state.selectedRowKeys.length > 0;
         return (
             <div className="user-content" >
@@ -256,19 +296,16 @@ const MyBill=Form.create()(React.createClass({
 	                        onChange={(e) => { this.setState({ payeeName: e.target.value }); }} />    
                         <Select placeholder="流水确认"
 	                        style={{ width: 150 ,marginRight:'10px'}}
-	                        value={this.state.pipelining}
-	                        onChange={(e) => { this.setState({ pipelining: e }) }}>
-	                        {
-	                            lvl.map(function (item) {
-	                                    return <Select.Option key={item.value} >{item.key}</Select.Option>
-	                            })
-	                        }
+	                        value={this.state.confirmSignSearch}
+	                        onChange={(e) => { this.setState({ confirmSignSearch: e }) }}>
+	                        <Select.Option value='0'>待确认</Select.Option>
+	                        <Select.Option value='1'>已确认</Select.Option>
                   		</Select>
                   		<Select placeholder="是否有效"
 	                        style={{ width: 150 ,marginRight:'10px'}}
 	                        value={this.state.term}
 	                        onChange={(e) => { this.setState({ term: e }) }}>
-	                        <Select.Option value='0'>无效</Select.Option>
+	                        <Select.Option value='0'>作废</Select.Option>
 	                        <Select.Option value='1'>有效</Select.Option>
                   		</Select>
 	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
@@ -280,10 +317,17 @@ const MyBill=Form.create()(React.createClass({
 	                  		<Input placeholder="订单编号" style={{width:'150px'}}
 		                        value={this.state.orderNumber}
 		                        onChange={(e) => { this.setState({ orderNumber: e.target.value }); }} />
-		                    <Input placeholder="订单部门" style={{width:'150px',marginLeft:'10px',marginRight:'10px'}}
-		                        value={this.state.orderDepartment}
-		                        onChange={(e) => { this.setState({ orderDepartment: e.target.value }); }} />
-		                    <Input placeholder="订单负责人" style={{width:'150px'}}
+		                    <Select placeholder="订单部门"
+	                            style={{ width: 150 ,marginRight:'10px',marginLeft:'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> 
+		                    <Input placeholder="订单负责人" style={{width:'150px',marginBottom:'10px'}}
 		                        value={this.state.orderLeader}
 		                        onChange={(e) => { this.setState({ orderLeader: e.target.value }); }} />    
 	                    </div>
@@ -294,11 +338,12 @@ const MyBill=Form.create()(React.createClass({
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}
+	                            onRowClick={this.tableRowClick}
                             />
 	                    </Spin>
 	                </div>
 	                <MyBillDetaile
-	                	confirmDelet={this.confirmDelet}
+	                	rowClick={this.state.rowClick}
 	                    userDetaile={this.state.userDetaile}
 	                    datauser={this.state.datauser}
 	                    showDesc={this.state.showDesc}

+ 476 - 0
js/component/manageCenter/order/flowSettlement/billManagement/myBillDetaile.jsx

@@ -0,0 +1,476 @@
+import React from 'react';
+import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,DatePicker} from 'antd';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import '../../userMangagement.less';
+import {} from '../../../../dataDic.js';
+import {getOrderType ,getOrderChannel , getOrderState ,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
+
+
+const MyBillDetaile = Form.create()(React.createClass({
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+			seeOrderVisible:false
+		};
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+			this.setState({
+				loading:true
+			})
+	    	$.ajax({
+	            method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/order/selectBillDetail',
+	            data: {
+	              billNo: record.billNo
+	            },
+	            success: function (data) {
+	                let thisData = data.data;                
+	                if (!thisData) {
+	                    if (data.error && data.error.length) {
+	                        message.warning(data.error[0].message);
+	                    };
+	                    thisData = {};
+	                };
+	                this.setState({
+	                	orderList:thisData,
+	                	financialPayNo:thisData.financialPayNo,
+	                	financialPayTime:thisData.financialPayTime,
+	                	remarks:thisData.remarks,
+						billNoId:record.billNo,
+	                });                  
+	            }.bind(this),
+	       }).always(function () {
+	            this.setState({            	
+	                loading: false
+            });
+        }.bind(this));  
+       }
+    },
+    //保存确认流水
+    handleSubmit(state){
+    	if(!this.state.financialPayNo){
+        	message.warning('请输入财务流水号');
+        	return false;
+        };
+        if(this.state.selTime==undefined){
+        	message.warning('请选择财务流水时间');
+        	return false;
+        };
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/updateBill',
+			data: {
+				confirm:state?'1':'0',
+				billNo:this.state.billNoId,
+				orderNo:this.props.datauser.orderNo,
+				financialPayNo:this.state.financialPayNo,
+				financialPayTime:this.state.selTime,
+				remarks:this.state.remarks
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('已确认!');
+				this.handleOk()
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+    },
+    //时间选择
+    selTime(e,index){
+    	this.setState({
+    		financialPayTime:e,
+    		selTime:index
+    	})
+    },
+    //确认流水
+    toVoidCancel(){
+    	this.handleSubmit(true)
+    },
+	handleOk(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false, true);
+	},
+	handleCancel(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false);
+	},
+	componentWillMount() {
+		
+	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//查看订单
+	seeOrder(){
+		this.setState({
+			seeOrderVisible:true
+		})
+		this.seeOrderList()
+	},
+	seeOrderCancel(){
+		this.setState({
+			seeOrderVisible:false
+		})	
+	},
+	seeOrderList(){
+		this.state.lookOrderList=[];
+    	$.ajax({
+            method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
+            data: {
+              orderNo: this.props.datauser.orderNo
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                this.setState({
+					id:thisData.id,
+					lookOrderList:thisData,
+                });
+            }.bind(this),
+       }).always(function () {
+            this.setState({            	
+                loading: false
+            });
+        }.bind(this));  
+	},
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.visible = nextProps.showDesc;
+		if(nextProps.userDetaile && nextProps.showDesc ) {
+			this.loaduser(nextProps.datauser);
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		const orderDetaiel=this.state.orderList || [];
+		const seeOrderDetaiel=this.state.lookOrderList || [];
+		return(
+			<div>
+            <Modal maskClosable={false} visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    title='流水详情'                     
+                    footer=''
+                    className="admin-desc-content">
+		            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}>
+		                <Spin spinning={this.state.loading}>
+	                        <div className="clearfix">
+	                            <div className="clearfix">
+		                       		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="平台流水号" >
+			                            <span>{orderDetaiel.billNo}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="平台流水时间" >  
+			                            <span>{orderDetaiel.createTime}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水金额" >  
+			                            <span>{orderDetaiel.transactionAmount}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水科目" >  
+			                            <span>{getTransactionProject(orderDetaiel.transactionSubject)}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水状态" >  
+			                            <span>{orderDetaiel.confirmSign?'已确认':'待确认'}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="付款人名称" >  
+			                            <span>{orderDetaiel.payerName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="收款人名称" >  
+			                            <span>{orderDetaiel.payeeName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="交易渠道" >    
+		                            	<span>{getTransactionChannel(orderDetaiel.transactionChannel)}</span>
+				                    </FormItem>
+				                    <div className='clearfix'>
+							        	<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="附言" >
+							        		<span>{orderDetaiel.postscript}</span>
+								        </FormItem>
+							        </div>
+				                    <div className='clearfix'>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >   
+				                            <span>{orderDetaiel.orderNo}</span>
+				                            <Button style={{float:'right'}} onClick={this.seeOrder}>查看订单</Button>
+					                    </FormItem>
+					               	</div>    
+				                    <div className='clearfix'>
+							        	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >   
+				                            <span>{orderDetaiel.salesmanName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >   
+				                            <span>{orderDetaiel.financeName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="流水确认时间" >   
+				                            <span>{orderDetaiel.confirmTime}</span>
+			                    		</FormItem>
+		                    		</div>
+		                    		{!this.props.rowClick?<div className='clearfix'>
+				                        <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水号" >   
+				                            <Input value={this.state.financialPayNo}  style={{width:'240px'}} placeholder="请输入财务流水号"
+				                                 onChange={(e)=>{this.setState({financialPayNo:e.target.value})}} required="required" />
+									        <span className="mandatory">*</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水时间" >   
+				                            <DatePicker
+				                              style={{marginTop:'0',width:'200px',height:'32px'}}
+										      showTime
+										      format="YYYY-MM-DD HH:mm:ss"
+										      placeholder="选择时间"
+										      value={this.state.financialPayTime}
+										      onChange={(e,time)=>{this.selTime(e,time)}}
+										    />
+									        <span className="mandatory">*</span>
+			                    		</FormItem>
+			                    	</div>:<div className='clearfix'>
+				                        <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水号" >   
+				                            <span>{orderDetaiel.financialPayNo}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水时间" >   
+				                            <span>{orderDetaiel.financialPayTime}</span>
+			                    		</FormItem>
+			                    	</div>}
+			                    	{!this.props.rowClick?<div className='clearfix'>
+			                    		<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="财务备注" >
+								                <Input type="textarea" placeholder="请输入财务备注" rows={4}  value={this.state.remarks} 
+									    			onChange={(e)=>{this.setState({remarks:e.target.value})}}/>			                      
+								        </FormItem>
+								    </div>:<div className='clearfix'>
+			                    		<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="财务备注" >
+								               <span>{orderDetaiel.remarks}</span>		                      
+								        </FormItem>
+								    </div>} 
+								    {!this.props.rowClick?<div className='btnSave'>
+							            <Button className="setSave" type="primary" onClick={this.toVoidCancel}>确认流水</Button> 
+							        	<Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
+							        </div>:''}
+		                        </div>
+		                    </div>
+		                </Spin>
+		            </Form >
+		        </Modal>
+		        <Modal maskClosable={false} visible={this.state.seeOrderVisible}
+                        onOk={this.seeOrderCancel} onCancel={this.seeOrderCancel}
+                        width='1000px'
+                        title= '查看订单'                 
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	  	<div className="clearfix">
+			                       		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >
+				                            <span>{seeOrderDetaiel.orderNo}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="下单时间" >  
+				                            <span>{seeOrderDetaiel.createTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="客户名称" >  
+				                            <span>{seeOrderDetaiel.buyerName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单类型" >  
+				                            <span>{getOrderType(seeOrderDetaiel.orderType)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单渠道" >  
+				                            <span>{getOrderChannel(seeOrderDetaiel.orderChannel)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单状态" >  
+				                            <span>{getOrderState(seeOrderDetaiel.orderStatus)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="已收款项" >  
+				                            <span>{seeOrderDetaiel.actuallyTotalAmount}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="结算状态" >  
+				                            <span>{getPaymentState(seeOrderDetaiel.liquidationStatus)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价订单金额" >    
+			                            	<span>{seeOrderDetaiel.orderAmount}</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价首款金额" >   
+				                            <span>{seeOrderDetaiel.firstPayment}</span>
+					                    </FormItem>
+					                    <div className='clearfix'>
+								        	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签订单金额" >   
+					                            <span>{seeOrderDetaiel.signTotalAmount}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签首款金额" >   
+					                            <span>{seeOrderDetaiel.signFirstPayment}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="特批立项" >   
+					                            <span>{getApprovedState(seeOrderDetaiel.approval)}</span>
+				                    		</FormItem>
+											<div className="clearfix">
+												<FormItem
+							                        labelCol={{ span: 4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="合同扫描件" >
+						                            <Upload className="demandDetailShow-upload"
+						                                listType="customer_sys_file"
+						                                fileList={this.state.orgCodeUrl}
+						                                onPreview={(file) => {
+						                                    this.setState({
+						                                        previewImage: file.url || file.thumbUrl,
+						                                        previewVisible: true,
+						                                    });
+						                                }} >
+						                            </Upload>
+						                            <Modal maskClosable={false} footer={null}
+						                                visible={this.state.previewVisible}
+						                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+						                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+						                            </Modal>
+						                        </FormItem>    
+					                        </div>
+					                        <div className='clearfix'>
+									        	<FormItem
+										            labelCol={{ span: 4 }}
+										            wrapperCol={{ span: 16 }}
+										            label="订单留言" >
+									        		<span>{seeOrderDetaiel.orderRemarks}</span>
+										        </FormItem>
+									        </div>
+								        </div>
+			                        </div>
+			                        <div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >  
+				                            <span>{seeOrderDetaiel.salesmanName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="意向时间" >  
+				                            <span>{seeOrderDetaiel.createTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="签单时间" >  
+				                            <span>{seeOrderDetaiel.signTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >  
+				                            <span>{seeOrderDetaiel.financeName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="首付时间" >  
+				                            <span>{seeOrderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目负责人" >  
+				                            <span>{seeOrderDetaiel.technicianName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="立项时间" >  
+				                            <span>{seeOrderDetaiel.setUpTime}</span>
+			                    		</FormItem>
+		                    		</div>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+    	    </div>
+		)
+	}
+}));
+
+export default MyBillDetaile;

+ 348 - 0
js/component/manageCenter/order/flowSettlement/billQuery/myBill.jsx

@@ -0,0 +1,348 @@
+import React from 'react';
+import ReactDom from 'react-dom';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, Modal, Upload ,Popconfirm,Checkbox} from 'antd';
+import MyBillDetaile from "./myBillDetaile.jsx";
+import moment from 'moment';
+import '../../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress,getTransactionChannel,getTransactionProject} from '../../../../tools.js';
+
+const MyBill=Form.create()(React.createClass({
+	loadData(pageNo) {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/order/queryMyBill',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                payerName:this.state.draweeName,//付款人名称
+                depId:this.state.departmenttSearch,//部门
+                confirmSign:this.state.confirmSignSearch,//流水确认
+                payeeName:this.state.payeeName,//收款人名称
+                deleteSign:this.state.term,//是否有效
+                orderNo:this.state.orderNumber,//订单编号
+                salesmanName:this.state.orderLeader,//订单负责人
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    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,
+	                         billNo: thisdata.billNo,
+	                         transactionAmount:thisdata.transactionAmount,
+	                         createTime:thisdata.createTime, 
+	                         transactionAmount:thisdata.transactionAmount,
+	                         payerName:thisdata.payerName,
+	                         payeeName:thisdata.payeeName,
+	                         transactionSubject:thisdata.transactionSubject,
+	                         transactionChannel:thisdata.transactionChannel,
+	                         financialPayNo:thisdata.financialPayNo,
+	                         financialPayTime:thisdata.financialPayTime,
+	                         orderNo:thisdata.orderNo,
+	                         departmentName:thisdata.departmentName,
+	                         salesmanName:thisdata.salesmanName,
+	                         financeName:thisdata.financeName,
+	                         confirmSign:thisdata.confirmSign,
+	                         deleteSign:thisdata.deleteSign,
+	                         confirmTime:thisdata.confirmTime
+                        });
+                    };
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                };
+                if(!data.data.list.length){
+					this.state.pagination.current=0
+					this.state.pagination.total=0
+				}
+                this.setState({
+                	pageNo:pageNo,
+                    dataSource: theArr,
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			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));
+	},
+    getInitialState() {
+        return {
+        	datauser:{},
+            selectedRowKeys: [],
+            selectedRows: [],
+            searchMore: true,
+            departmentArr:[],
+            loading: false,
+            visible:false,
+            showDesc: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: 'billNo',
+                    key: 'billNo'
+                }, {
+                    title: '平台流水时间',
+                    dataIndex: 'createTime',
+                    key: 'createTime'
+                }, {
+                    title: '流水金额',
+                    dataIndex: 'transactionAmount',
+                    key: 'transactionAmount'
+                },{
+                    title: '付款人名称',
+                    dataIndex: 'payerName',
+                    key: 'payerName'
+                }, {
+                    title: '收款人名称',
+                    dataIndex: 'payeeName',
+                    key: 'payeeName'
+                },
+                {
+                    title: '流水科目',
+                    dataIndex: 'transactionSubject',
+                    key: 'transactionSubject',
+                    render:(text)=>{return getTransactionProject(text) }
+                }, {
+                    title: '流水渠道',
+                    dataIndex: 'transactionChannel',
+                    key: 'transactionChannel',
+                    render:(text)=>{return getTransactionChannel(text) }
+                },{
+                    title: '财务流水号',
+                    dataIndex: 'financialPayNo',
+                    key: 'financialPayNo',
+                }, {
+                    title: '财务流水时间',
+                    dataIndex: 'financialPayTime',
+                    key: 'financialPayTime',
+                }, {
+                    title: '流水确认',
+                    dataIndex: 'confirmSign',
+                    key: 'confirmSign',
+                    render:(text)=>{return text?'已确认':'待确认' }
+                },{
+                    title: '确认时间',
+                    dataIndex: 'confirmTime',
+                    key: 'confirmTime',
+                },{
+                    title: '订单编号',
+                    dataIndex: 'orderNo',
+                    key: 'orderNo',
+                },{
+                    title: '订单负责人',
+                    dataIndex: 'salesmanName',
+                    key: 'salesmanName',
+                },{
+                    title: '是否有效',
+                    dataIndex: 'deleteSign',
+                    key: 'deleteSign',
+                    render:(text)=>{return text?'有效':'作废' }
+                },
+            ],
+            dataSource: [],
+        };
+    },
+    //驳回
+    reject(record){
+    	this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+        	rowClick:false,
+            showDesc: true
+        });
+    },
+    componentWillMount() {
+    	this.loadData()
+        this.departmentList();
+    },
+    closeDesc(e, s) {
+    	this.state.userDetaile=false;
+        this.state.showDesc = e;
+        if (s) {
+            this.loadData(this.state.pageNo);
+        };
+    },
+    searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+    search() {
+        this.loadData();
+    },
+    reset() {
+    	this.state.draweeName='';
+    	this.state.payeeName='';
+		this.state.term = undefined;
+		this.state.orderNumber = '';
+		this.state.confirmSignSearch=undefined;
+		this.state.departmenttSearch = undefined;
+		this.state.orderLeader = '';
+        this.loadData();       
+    },
+    tableRowClick(record, index) {
+    	this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+        	rowClick:true,
+        	signBillState:true,
+            showDesc: true
+        });
+    },
+    render() {
+        const rowSelection = {
+            selectedRowKeys: this.state.selectedRowKeys,
+            onChange: (selectedRowKeys, selectedRows) => {
+	                this.setState({
+	                    selectedRows: selectedRows.slice(-1),
+	                    selectedRowKeys: selectedRowKeys.slice(-1)
+	                }); 
+            },
+            onSelectAll: (selected, selectedRows, changeRows) => {
+			   this.setState({
+			   		selectedRowKeys:[]
+			   })
+			},
+        };
+        let departmentArr = this.state.departmentArr || [];
+        const hasSelected = this.state.selectedRowKeys.length > 0;
+        return (
+            <div className="user-content" >
+                <div className="content-title">
+                	<span style={{fontSize:'16px'}}>结算流水查询</span>	
+	                <div className="user-search">
+	                    <Input placeholder="付款人名称" style={{width:'150px'}}
+	                        value={this.state.draweeName}
+	                        onChange={(e) => { this.setState({ draweeName: e.target.value }); }} />
+	                    <Input placeholder="收款人名称" style={{width:'150px'}}
+	                        value={this.state.payeeName}
+	                        onChange={(e) => { this.setState({ payeeName: e.target.value }); }} />    
+                        <Select placeholder="流水确认"
+	                        style={{ width: 150 ,marginRight:'10px'}}
+	                        value={this.state.confirmSignSearch}
+	                        onChange={(e) => { this.setState({ confirmSignSearch: e }) }}>
+	                        <Select.Option value='0'>待确认</Select.Option>
+	                        <Select.Option value='1'>已确认</Select.Option>
+                  		</Select>
+                  		<Select placeholder="是否有效"
+	                        style={{ width: 150 ,marginRight:'10px'}}
+	                        value={this.state.term}
+	                        onChange={(e) => { this.setState({ term: e }) }}>
+	                        <Select.Option value='0'>作废</Select.Option>
+	                        <Select.Option value='1'>有效</Select.Option>
+                  		</Select>
+	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
+	                    <Button onClick={this.reset}>重置</Button>
+	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
+	                </div>
+	                <div className='clearfix' style={{marginTop:'5px'}}>
+	                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
+	                  		<Input placeholder="订单编号" style={{width:'150px'}}
+		                        value={this.state.orderNumber}
+		                        onChange={(e) => { this.setState({ orderNumber: e.target.value }); }} />
+		                    <Select placeholder="订单部门"
+	                            style={{ width: 150 ,marginRight:'10px',marginLeft:'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> 
+		                    <Input placeholder="订单负责人" style={{width:'150px',marginBottom:'10px'}}
+		                        value={this.state.orderLeader}
+		                        onChange={(e) => { this.setState({ orderLeader: e.target.value }); }} />    
+	                    </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}
+                            />
+	                    </Spin>
+	                </div>
+	                <MyBillDetaile
+	                	rowClick={this.state.rowClick}
+	                    userDetaile={this.state.userDetaile}
+	                    datauser={this.state.datauser}
+	                    showDesc={this.state.showDesc}
+	                    closeDesc={this.closeDesc} />
+	            </div >
+            </div>
+        );
+    }
+}));
+
+export default MyBill;
+

+ 478 - 0
js/component/manageCenter/order/flowSettlement/billQuery/myBillDetaile.jsx

@@ -0,0 +1,478 @@
+import React from 'react';
+import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,DatePicker} from 'antd';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import '../../userMangagement.less';
+import {} from '../../../../dataDic.js';
+import {getOrderType ,getOrderChannel , getOrderState ,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
+
+
+const MyBillDetaile = Form.create()(React.createClass({
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+			seeOrderVisible:false
+		};
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+			this.setState({
+				loading:true
+			})
+	    	$.ajax({
+	            method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/order/selectBillDetail',
+	            data: {
+	              billNo: record.billNo
+	            },
+	            success: function (data) {
+	                let thisData = data.data;                
+	                if (!thisData) {
+	                    if (data.error && data.error.length) {
+	                        message.warning(data.error[0].message);
+	                    };
+	                    thisData = {};
+	                };
+	                this.setState({
+	                	orderList:thisData,
+						billNoId:record.billNo,
+	                });                  
+	            }.bind(this),
+	       }).always(function () {
+	            this.setState({            	
+	                loading: false
+            });
+        }.bind(this));  
+       }
+    },
+    //保存确认流水
+    handleSubmit(state){
+    	if(!this.state.financialPayNo){
+        	message.warning('请输入财务流水号');
+        	return false;
+        };
+        if(this.state.selTime==undefined){
+        	message.warning('请选择财务流水时间');
+        	return false;
+        };
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/confrimBill',
+			data: {
+				confirm:state?'1':'0',
+				billNo:this.state.billNoId,
+				orderNo:this.props.datauser.orderNo,
+				financialPayNo:this.state.financialPayNo,
+				financialPayTime:this.state.selTime,
+				remarks:this.state.remarks
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('已确认!');
+				this.handleOk()
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+    },
+    //时间选择
+    selTime(e,index){
+    	this.setState({
+    		financialPayTime:e,
+    		selTime:index
+    	})
+    },
+    //确认流水
+    toVoidCancel(){
+    	this.handleSubmit(true)
+    },
+    //作废流水
+    toVoid(){
+    	this.handleSubmit(false)
+    },
+	handleOk(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false, true);
+	},
+	handleCancel(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false);
+	},
+	componentWillMount() {
+		
+	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//查看订单
+	seeOrder(){
+		this.setState({
+			seeOrderVisible:true
+		})
+		this.seeOrderList()
+	},
+	seeOrderCancel(){
+		this.setState({
+			seeOrderVisible:false
+		})	
+	},
+	seeOrderList(){
+		this.state.lookOrderList=[];
+    	$.ajax({
+            method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
+            data: {
+              orderNo: this.props.datauser.orderNo
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                this.setState({
+					id:thisData.id,
+					lookOrderList:thisData,
+                });
+            }.bind(this),
+       }).always(function () {
+            this.setState({            	
+                loading: false
+            });
+        }.bind(this));  
+	},
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.visible = nextProps.showDesc;
+		if(nextProps.userDetaile && nextProps.showDesc ) {
+			this.loaduser(nextProps.datauser);
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		const orderDetaiel=this.state.orderList || [];
+		const seeOrderDetaiel=this.state.lookOrderList || [];
+		return(
+			<div>
+            <Modal maskClosable={false} visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    title='流水详情'                     
+                    footer=''
+                    className="admin-desc-content">
+		            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}>
+		                <Spin spinning={this.state.loading}>
+	                        <div className="clearfix">
+	                            <div className="clearfix">
+		                       		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="平台流水号" >
+			                            <span>{orderDetaiel.billNo}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="平台流水时间" >  
+			                            <span>{orderDetaiel.createTime}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水金额" >  
+			                            <span>{orderDetaiel.transactionAmount}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水科目" >  
+			                            <span>{getTransactionProject(orderDetaiel.transactionSubject)}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水状态" >  
+			                            <span>{orderDetaiel.confirmSign?'已确认':'待确认'}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="付款人名称" >  
+			                            <span>{orderDetaiel.payerName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="收款人名称" >  
+			                            <span>{orderDetaiel.payeeName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="交易渠道" >    
+		                            	<span>{getTransactionChannel(orderDetaiel.transactionChannel)}</span>
+				                    </FormItem>
+				                    <div className='clearfix'>
+							        	<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="附言" >
+							        		<span>{orderDetaiel.postscript}</span>
+								        </FormItem>
+							        </div>
+				                    <div className='clearfix'>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >   
+				                            <span>{orderDetaiel.orderNo}</span>
+				                            <Button style={{float:'right'}} onClick={this.seeOrder}>查看订单</Button>
+					                    </FormItem>
+					               	</div>    
+				                    <div className='clearfix'>
+							        	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >   
+				                            <span>{orderDetaiel.salesmanName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >   
+				                            <span>{orderDetaiel.financeName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="流水确认时间" >   
+				                            <span>{orderDetaiel.confirmTime}</span>
+			                    		</FormItem>
+		                    		</div>
+		                    		{!this.props.rowClick?<div className='clearfix'>
+				                        <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水号" >   
+				                            <Input value={this.state.financialPayNo}  style={{width:'240px'}} placeholder="请输入财务流水号"
+				                                 onChange={(e)=>{this.setState({financialPayNo:e.target.value})}} required="required" />
+									        <span className="mandatory">*</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水时间" >   
+				                            <DatePicker
+				                              style={{marginTop:'0',width:'200px',height:'32px'}}
+										      showTime
+										      format="YYYY-MM-DD HH:mm:ss"
+										      placeholder="选择时间"
+										      value={this.state.financialPayTime}
+										      onChange={(e,time)=>{this.selTime(e,time)}}
+										    />
+									        <span className="mandatory">*</span>
+			                    		</FormItem>
+			                    	</div>:<div className='clearfix'>
+				                        <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水号" >   
+				                            <span>{orderDetaiel.financialPayNo}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水时间" >   
+				                            <span>{orderDetaiel.financialPayTime}</span>
+			                    		</FormItem>
+			                    	</div>}
+			                    	{!this.props.rowClick?<div className='clearfix'>
+			                    		<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="财务备注" >
+								                <Input type="textarea" placeholder="请输入财务备注" rows={4}  value={this.state.remarks} 
+									    			onChange={(e)=>{this.setState({remarks:e.target.value})}}/>			                      
+								        </FormItem>
+								    </div>:<div className='clearfix'>
+			                    		<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="财务备注" >
+								               <span>{orderDetaiel.remarks}</span>		                      
+								        </FormItem>
+								    </div>} 
+								    {!this.props.rowClick?<div className='btnSave'>
+							            <Button className="setSave" type="primary" onClick={this.toVoidCancel}>确认流水</Button> 
+							            <Button className="toVoid" type="danger" onClick={this.toVoid}>作废流水</Button> 
+							        	<Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
+							        </div>:''}
+		                        </div>
+		                    </div>
+		                </Spin>
+		            </Form >
+		        </Modal>
+		        <Modal maskClosable={false} visible={this.state.seeOrderVisible}
+                        onOk={this.seeOrderCancel} onCancel={this.seeOrderCancel}
+                        width='1000px'
+                        title= '查看订单'                 
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	  	<div className="clearfix">
+			                       		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >
+				                            <span>{seeOrderDetaiel.orderNo}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="下单时间" >  
+				                            <span>{seeOrderDetaiel.createTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="客户名称" >  
+				                            <span>{seeOrderDetaiel.buyerName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单类型" >  
+				                            <span>{getOrderType(seeOrderDetaiel.orderType)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单渠道" >  
+				                            <span>{getOrderChannel(seeOrderDetaiel.orderChannel)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单状态" >  
+				                            <span>{getOrderState(seeOrderDetaiel.orderStatus)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="已收款项" >  
+				                            <span>{seeOrderDetaiel.actuallyTotalAmount}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="结算状态" >  
+				                            <span>{getPaymentState(seeOrderDetaiel.liquidationStatus)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价订单金额" >    
+			                            	<span>{seeOrderDetaiel.orderAmount}</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价首款金额" >   
+				                            <span>{seeOrderDetaiel.firstPayment}</span>
+					                    </FormItem>
+					                    <div className='clearfix'>
+								        	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签订单金额" >   
+					                            <span>{seeOrderDetaiel.signTotalAmount}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签首款金额" >   
+					                            <span>{seeOrderDetaiel.signFirstPayment}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="特批立项" >   
+					                            <span>{getApprovedState(seeOrderDetaiel.approval)}</span>
+				                    		</FormItem>
+											<div className="clearfix">
+												<FormItem
+							                        labelCol={{ span: 4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="合同扫描件" >
+						                            <Upload className="demandDetailShow-upload"
+						                                listType="customer_sys_file"
+						                                fileList={this.state.orgCodeUrl}
+						                                onPreview={(file) => {
+						                                    this.setState({
+						                                        previewImage: file.url || file.thumbUrl,
+						                                        previewVisible: true,
+						                                    });
+						                                }} >
+						                            </Upload>
+						                            <Modal maskClosable={false} footer={null}
+						                                visible={this.state.previewVisible}
+						                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+						                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+						                            </Modal>
+						                        </FormItem>    
+					                        </div>
+					                        <div className='clearfix'>
+									        	<FormItem
+										            labelCol={{ span: 4 }}
+										            wrapperCol={{ span: 16 }}
+										            label="订单留言" >
+									        		<span>{seeOrderDetaiel.orderRemarks}</span>
+										        </FormItem>
+									        </div>
+								        </div>
+			                        </div>
+			                        <div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >  
+				                            <span>{seeOrderDetaiel.salesmanName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="意向时间" >  
+				                            <span>{seeOrderDetaiel.createTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="签单时间" >  
+				                            <span>{seeOrderDetaiel.signTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >  
+				                            <span>{seeOrderDetaiel.financeName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="首付时间" >  
+				                            <span>{seeOrderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目负责人" >  
+				                            <span>{seeOrderDetaiel.technicianName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="立项时间" >  
+				                            <span>{seeOrderDetaiel.setUpTime}</span>
+			                    		</FormItem>
+		                    		</div>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+    	    </div>
+		)
+	}
+}));
+
+export default MyBillDetaile;

+ 358 - 0
js/component/manageCenter/order/flowSettlement/myBill/myBill.jsx

@@ -0,0 +1,358 @@
+import React from 'react';
+import ReactDom from 'react-dom';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, Modal, Upload ,Popconfirm,Checkbox} from 'antd';
+import MyBillDetaile from "./myBillDetaile.jsx";
+import moment from 'moment';
+import '../../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress,getTransactionChannel,getTransactionProject} from '../../../../tools.js';
+
+const MyBill=Form.create()(React.createClass({
+	loadData(pageNo) {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/order/listMyBill',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                payerName:this.state.draweeName,//付款人名称
+                depId:this.state.departmenttSearch,//部门
+                confirmSign:this.state.confirmSignSearch,//流水确认
+                payeeName:this.state.payeeName,//收款人名称
+                deleteSign:this.state.term,//是否有效
+                orderNo:this.state.orderNumber,//订单编号
+                salesmanName:this.state.orderLeader,//订单负责人
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    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,
+	                         billNo: thisdata.billNo,
+	                         transactionAmount:thisdata.transactionAmount,
+	                         createTime:thisdata.createTime, 
+	                         transactionAmount:thisdata.transactionAmount,
+	                         payerName:thisdata.payerName,
+	                         payeeName:thisdata.payeeName,
+	                         transactionSubject:thisdata.transactionSubject,
+	                         transactionChannel:thisdata.transactionChannel,
+	                         financialPayNo:thisdata.financialPayNo,
+	                         financialPayTime:thisdata.financialPayTime,
+	                         orderNo:thisdata.orderNo,
+	                         departmentName:thisdata.departmentName,
+	                         salesmanName:thisdata.salesmanName,
+	                         financeName:thisdata.financeName,
+	                         confirmSign:thisdata.confirmSign,
+	                         deleteSign:thisdata.deleteSign,
+	                         confirmTime:thisdata.confirmTime
+                        });
+                    };
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                };
+                if(!data.data.list.length){
+					this.state.pagination.current=0
+					this.state.pagination.total=0
+				}
+                this.setState({
+                	pageNo:pageNo,
+                    dataSource: theArr,
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			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));
+	},
+    getInitialState() {
+        return {
+        	datauser:{},
+            selectedRowKeys: [],
+            selectedRows: [],
+            searchMore: true,
+            departmentArr:[],
+            loading: false,
+            visible:false,
+            showDesc: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: 'billNo',
+                    key: 'billNo'
+                }, {
+                    title: '平台流水时间',
+                    dataIndex: 'createTime',
+                    key: 'createTime'
+                }, {
+                    title: '流水金额',
+                    dataIndex: 'transactionAmount',
+                    key: 'transactionAmount'
+                },{
+                    title: '付款人名称',
+                    dataIndex: 'payerName',
+                    key: 'payerName'
+                }, {
+                    title: '收款人名称',
+                    dataIndex: 'payeeName',
+                    key: 'payeeName'
+                },
+                {
+                    title: '流水科目',
+                    dataIndex: 'transactionSubject',
+                    key: 'transactionSubject',
+                    render:(text)=>{return getTransactionProject(text) }
+                }, {
+                    title: '流水渠道',
+                    dataIndex: 'transactionChannel',
+                    key: 'transactionChannel',
+                    render:(text)=>{return getTransactionChannel(text) }
+                },{
+                    title: '财务流水号',
+                    dataIndex: 'financialPayNo',
+                    key: 'financialPayNo',
+                }, {
+                    title: '财务流水时间',
+                    dataIndex: 'financialPayTime',
+                    key: 'financialPayTime',
+                }, {
+                    title: '流水确认',
+                    dataIndex: 'confirmSign',
+                    key: 'confirmSign',
+                    render:(text)=>{return text?'已确认':'待确认' }
+                },{
+                    title: '确认时间',
+                    dataIndex: 'confirmTime',
+                    key: 'confirmTime',
+                },{
+                    title: '订单编号',
+                    dataIndex: 'orderNo',
+                    key: 'orderNo',
+                },{
+                    title: '订单负责人',
+                    dataIndex: 'salesmanName',
+                    key: 'salesmanName',
+                },{
+                    title: '是否有效',
+                    dataIndex: 'deleteSign',
+                    key: 'deleteSign',
+                    render:(text)=>{return text?'有效':'作废' }
+                },
+                {
+                    title: '操作',
+                    dataIndex: 'operation',
+                    key: 'operation',
+                    render: (text, record, index) => {
+						return <div>
+								   {!record.confirmSign&&<Button style={{marginRight:'5px'}} onClick={(e) =>{e.stopPropagation(),this.reject(record) }}>确认/作废</Button>}                 
+                        	   </div>
+					}
+                }
+            ],
+            dataSource: [],
+        };
+    },
+    //驳回
+    reject(record){
+    	this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+        	rowClick:false,
+            showDesc: true
+        });
+    },
+    componentWillMount() {
+    	this.loadData()
+        this.departmentList();
+    },
+    closeDesc(e, s) {
+    	this.state.userDetaile=false;
+        this.state.showDesc = e;
+        if (s) {
+            this.loadData(this.state.pageNo);
+        };
+    },
+    searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+    search() {
+        this.loadData();
+    },
+    reset() {
+    	this.state.draweeName='';
+    	this.state.payeeName='';
+		this.state.term = undefined;
+		this.state.orderNumber = '';
+		this.state.confirmSignSearch=undefined;
+		this.state.departmenttSearch = undefined;
+		this.state.orderLeader = '';
+        this.loadData();       
+    },
+    tableRowClick(record, index) {
+    	this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+        	rowClick:true,
+        	signBillState:true,
+            showDesc: true
+        });
+    },
+    render() {
+        const rowSelection = {
+            selectedRowKeys: this.state.selectedRowKeys,
+            onChange: (selectedRowKeys, selectedRows) => {
+	                this.setState({
+	                    selectedRows: selectedRows.slice(-1),
+	                    selectedRowKeys: selectedRowKeys.slice(-1)
+	                }); 
+            },
+            onSelectAll: (selected, selectedRows, changeRows) => {
+			   this.setState({
+			   		selectedRowKeys:[]
+			   })
+			},
+        };
+        let departmentArr = this.state.departmentArr || [];
+        const hasSelected = this.state.selectedRowKeys.length > 0;
+        return (
+            <div className="user-content" >
+                <div className="content-title">
+                	<span style={{fontSize:'16px'}}>我的结算流水</span>	
+	                <div className="user-search">
+	                    <Input placeholder="付款人名称" style={{width:'150px'}}
+	                        value={this.state.draweeName}
+	                        onChange={(e) => { this.setState({ draweeName: e.target.value }); }} />
+	                    <Input placeholder="收款人名称" style={{width:'150px'}}
+	                        value={this.state.payeeName}
+	                        onChange={(e) => { this.setState({ payeeName: e.target.value }); }} />    
+                        <Select placeholder="流水确认"
+	                        style={{ width: 150 ,marginRight:'10px'}}
+	                        value={this.state.confirmSignSearch}
+	                        onChange={(e) => { this.setState({ confirmSignSearch: e }) }}>
+	                        <Select.Option value='0'>待确认</Select.Option>
+	                        <Select.Option value='1'>已确认</Select.Option>
+                  		</Select>
+                  		<Select placeholder="是否有效"
+	                        style={{ width: 150 ,marginRight:'10px'}}
+	                        value={this.state.term}
+	                        onChange={(e) => { this.setState({ term: e }) }}>
+	                        <Select.Option value='0'>作废</Select.Option>
+	                        <Select.Option value='1'>有效</Select.Option>
+                  		</Select>
+	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
+	                    <Button onClick={this.reset}>重置</Button>
+	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
+	                </div>
+	                <div className='clearfix' style={{marginTop:'5px'}}>
+	                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
+	                  		<Input placeholder="订单编号" style={{width:'150px'}}
+		                        value={this.state.orderNumber}
+		                        onChange={(e) => { this.setState({ orderNumber: e.target.value }); }} />
+		                    <Select placeholder="订单部门"
+	                            style={{ width: 150 ,marginRight:'10px',marginLeft:'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> 
+		                    <Input placeholder="订单负责人" style={{width:'150px',marginBottom:'10px'}}
+		                        value={this.state.orderLeader}
+		                        onChange={(e) => { this.setState({ orderLeader: e.target.value }); }} />    
+	                    </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}
+                            />
+	                    </Spin>
+	                </div>
+	                <MyBillDetaile
+	                	rowClick={this.state.rowClick}
+	                    userDetaile={this.state.userDetaile}
+	                    datauser={this.state.datauser}
+	                    showDesc={this.state.showDesc}
+	                    closeDesc={this.closeDesc} />
+	            </div >
+            </div>
+        );
+    }
+}));
+
+export default MyBill;
+

+ 478 - 0
js/component/manageCenter/order/flowSettlement/myBill/myBillDetaile.jsx

@@ -0,0 +1,478 @@
+import React from 'react';
+import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,DatePicker} from 'antd';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import '../../userMangagement.less';
+import {} from '../../../../dataDic.js';
+import {getOrderType ,getOrderChannel , getOrderState ,getPaymentState ,getApprovedState,getTransactionChannel,getTransactionProject  } from '../../../../tools.js';
+
+
+const MyBillDetaile = Form.create()(React.createClass({
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+			seeOrderVisible:false
+		};
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+			this.setState({
+				loading:true
+			})
+	    	$.ajax({
+	            method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/order/selectBillDetail',
+	            data: {
+	              billNo: record.billNo
+	            },
+	            success: function (data) {
+	                let thisData = data.data;                
+	                if (!thisData) {
+	                    if (data.error && data.error.length) {
+	                        message.warning(data.error[0].message);
+	                    };
+	                    thisData = {};
+	                };
+	                this.setState({
+	                	orderList:thisData,
+						billNoId:record.billNo,
+	                });                  
+	            }.bind(this),
+	       }).always(function () {
+	            this.setState({            	
+	                loading: false
+            });
+        }.bind(this));  
+       }
+    },
+    //保存确认流水
+    handleSubmit(state){
+    	if(!this.state.financialPayNo){
+        	message.warning('请输入财务流水号');
+        	return false;
+        };
+        if(this.state.selTime==undefined){
+        	message.warning('请选择财务流水时间');
+        	return false;
+        };
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/confrimBill',
+			data: {
+				confirm:state?'1':'0',
+				billNo:this.state.billNoId,
+				orderNo:this.props.datauser.orderNo,
+				financialPayNo:this.state.financialPayNo,
+				financialPayTime:this.state.selTime,
+				remarks:this.state.remarks
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('已确认!');
+				this.handleOk()
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+    },
+    //时间选择
+    selTime(e,index){
+    	this.setState({
+    		financialPayTime:e,
+    		selTime:index
+    	})
+    },
+    //确认流水
+    toVoidCancel(){
+    	this.handleSubmit(true)
+    },
+    //作废流水
+    toVoid(){
+    	this.handleSubmit(false)
+    },
+	handleOk(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false, true);
+	},
+	handleCancel(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false);
+	},
+	componentWillMount() {
+		
+	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//查看订单
+	seeOrder(){
+		this.setState({
+			seeOrderVisible:true
+		})
+		this.seeOrderList()
+	},
+	seeOrderCancel(){
+		this.setState({
+			seeOrderVisible:false
+		})	
+	},
+	seeOrderList(){
+		this.state.lookOrderList=[];
+    	$.ajax({
+            method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
+            data: {
+              orderNo: this.props.datauser.orderNo
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                this.setState({
+					id:thisData.id,
+					lookOrderList:thisData,
+                });
+            }.bind(this),
+       }).always(function () {
+            this.setState({            	
+                loading: false
+            });
+        }.bind(this));  
+	},
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.visible = nextProps.showDesc;
+		if(nextProps.userDetaile && nextProps.showDesc ) {
+			this.loaduser(nextProps.datauser);
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		const orderDetaiel=this.state.orderList || [];
+		const seeOrderDetaiel=this.state.lookOrderList || [];
+		return(
+			<div>
+            <Modal maskClosable={false} visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    title='流水详情'                     
+                    footer=''
+                    className="admin-desc-content">
+		            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}>
+		                <Spin spinning={this.state.loading}>
+	                        <div className="clearfix">
+	                            <div className="clearfix">
+		                       		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="平台流水号" >
+			                            <span>{orderDetaiel.billNo}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="平台流水时间" >  
+			                            <span>{orderDetaiel.createTime}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水金额" >  
+			                            <span>{orderDetaiel.transactionAmount}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水科目" >  
+			                            <span>{getTransactionProject(orderDetaiel.transactionSubject)}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="流水状态" >  
+			                            <span>{orderDetaiel.confirmSign?'已确认':'待确认'}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="付款人名称" >  
+			                            <span>{orderDetaiel.payerName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="收款人名称" >  
+			                            <span>{orderDetaiel.payeeName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="交易渠道" >    
+		                            	<span>{getTransactionChannel(orderDetaiel.transactionChannel)}</span>
+				                    </FormItem>
+				                    <div className='clearfix'>
+							        	<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="附言" >
+							        		<span>{orderDetaiel.postscript}</span>
+								        </FormItem>
+							        </div>
+				                    <div className='clearfix'>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >   
+				                            <span>{orderDetaiel.orderNo}</span>
+				                            <Button style={{float:'right'}} onClick={this.seeOrder}>查看订单</Button>
+					                    </FormItem>
+					               	</div>    
+				                    <div className='clearfix'>
+							        	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >   
+				                            <span>{orderDetaiel.salesmanName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >   
+				                            <span>{orderDetaiel.financeName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="流水确认时间" >   
+				                            <span>{orderDetaiel.confirmTime}</span>
+			                    		</FormItem>
+		                    		</div>
+		                    		{!this.props.rowClick?<div className='clearfix'>
+				                        <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水号" >   
+				                            <Input value={this.state.financialPayNo}  style={{width:'240px'}} placeholder="请输入财务流水号"
+				                                 onChange={(e)=>{this.setState({financialPayNo:e.target.value})}} required="required" />
+									        <span className="mandatory">*</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水时间" >   
+				                            <DatePicker
+				                              style={{marginTop:'0',width:'200px',height:'32px'}}
+										      showTime
+										      format="YYYY-MM-DD HH:mm:ss"
+										      placeholder="选择时间"
+										      value={this.state.financialPayTime}
+										      onChange={(e,time)=>{this.selTime(e,time)}}
+										    />
+									        <span className="mandatory">*</span>
+			                    		</FormItem>
+			                    	</div>:<div className='clearfix'>
+				                        <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水号" >   
+				                            <span>{orderDetaiel.financialPayNo}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务流水时间" >   
+				                            <span>{orderDetaiel.financialPayTime}</span>
+			                    		</FormItem>
+			                    	</div>}
+			                    	{!this.props.rowClick?<div className='clearfix'>
+			                    		<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="财务备注" >
+								                <Input type="textarea" placeholder="请输入财务备注" rows={4}  value={this.state.remarks} 
+									    			onChange={(e)=>{this.setState({remarks:e.target.value})}}/>			                      
+								        </FormItem>
+								    </div>:<div className='clearfix'>
+			                    		<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="财务备注" >
+								               <span>{orderDetaiel.remarks}</span>		                      
+								        </FormItem>
+								    </div>} 
+								    {!this.props.rowClick?<div className='btnSave'>
+							            <Button className="setSave" type="primary" onClick={this.toVoidCancel}>确认流水</Button> 
+							            <Button className="toVoid" type="danger" onClick={this.toVoid}>作废流水</Button> 
+							        	<Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
+							        </div>:''}
+		                        </div>
+		                    </div>
+		                </Spin>
+		            </Form >
+		        </Modal>
+		        <Modal maskClosable={false} visible={this.state.seeOrderVisible}
+                        onOk={this.seeOrderCancel} onCancel={this.seeOrderCancel}
+                        width='1000px'
+                        title= '查看订单'                 
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	  	<div className="clearfix">
+			                       		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >
+				                            <span>{seeOrderDetaiel.orderNo}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="下单时间" >  
+				                            <span>{seeOrderDetaiel.createTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="客户名称" >  
+				                            <span>{seeOrderDetaiel.buyerName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单类型" >  
+				                            <span>{getOrderType(seeOrderDetaiel.orderType)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单渠道" >  
+				                            <span>{getOrderChannel(seeOrderDetaiel.orderChannel)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单状态" >  
+				                            <span>{getOrderState(seeOrderDetaiel.orderStatus)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="已收款项" >  
+				                            <span>{seeOrderDetaiel.actuallyTotalAmount}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="结算状态" >  
+				                            <span>{getPaymentState(seeOrderDetaiel.liquidationStatus)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价订单金额" >    
+			                            	<span>{seeOrderDetaiel.orderAmount}</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价首款金额" >   
+				                            <span>{seeOrderDetaiel.firstPayment}</span>
+					                    </FormItem>
+					                    <div className='clearfix'>
+								        	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签订单金额" >   
+					                            <span>{seeOrderDetaiel.signTotalAmount}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签首款金额" >   
+					                            <span>{seeOrderDetaiel.signFirstPayment}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="特批立项" >   
+					                            <span>{getApprovedState(seeOrderDetaiel.approval)}</span>
+				                    		</FormItem>
+											<div className="clearfix">
+												<FormItem
+							                        labelCol={{ span: 4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="合同扫描件" >
+						                            <Upload className="demandDetailShow-upload"
+						                                listType="customer_sys_file"
+						                                fileList={this.state.orgCodeUrl}
+						                                onPreview={(file) => {
+						                                    this.setState({
+						                                        previewImage: file.url || file.thumbUrl,
+						                                        previewVisible: true,
+						                                    });
+						                                }} >
+						                            </Upload>
+						                            <Modal maskClosable={false} footer={null}
+						                                visible={this.state.previewVisible}
+						                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+						                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+						                            </Modal>
+						                        </FormItem>    
+					                        </div>
+					                        <div className='clearfix'>
+									        	<FormItem
+										            labelCol={{ span: 4 }}
+										            wrapperCol={{ span: 16 }}
+										            label="订单留言" >
+									        		<span>{seeOrderDetaiel.orderRemarks}</span>
+										        </FormItem>
+									        </div>
+								        </div>
+			                        </div>
+			                        <div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >  
+				                            <span>{seeOrderDetaiel.salesmanName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="意向时间" >  
+				                            <span>{seeOrderDetaiel.createTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="签单时间" >  
+				                            <span>{seeOrderDetaiel.signTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >  
+				                            <span>{seeOrderDetaiel.financeName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="首付时间" >  
+				                            <span>{seeOrderDetaiel.createTimez}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目负责人" >  
+				                            <span>{seeOrderDetaiel.technicianName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="立项时间" >  
+				                            <span>{seeOrderDetaiel.setUpTime}</span>
+			                    		</FormItem>
+		                    		</div>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+    	    </div>
+		)
+	}
+}));
+
+export default MyBillDetaile;

+ 0 - 293
js/component/manageCenter/order/flowSettlement/myBillDetaile.jsx

@@ -1,293 +0,0 @@
-import React from 'react';
-import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,DatePicker} from 'antd';
-import ajax from 'jquery/src/ajax/xhr.js';
-import $ from 'jquery/src/ajax';
-import '../userMangagement.less';
-import {lvl} from '../../../dataDic.js';
-
-
-const MyBillDetaile = Form.create()(React.createClass({
-	getInitialState() {
-		return {
-			loading: false,
-			visible: false,
-		};
-	},
-	//查看基本详情基本信息
-    loaduser(record){
-    	if(record){
-    	$.ajax({
-            method: "post",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + '/api/admin/role/rolePermission',
-            data: {
-              id: record.id
-            },
-            success: function (data) {
-                let thisData = data.data;                
-                if (!thisData) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                    thisData = {};
-                };
-                
-                this.setState({
-                	orderList:thisData[0],
-					ids:record.id,
-                });                  
-            }.bind(this),
-       }).always(function () {
-            this.setState({            	
-                loading: false
-            });
-        }.bind(this));  
-       }
-    },
-    //保存确认流水
-    handleSubmit(e){
-    	e.preventDefault();
-    	console.log(this.state.selTime)
-        if(this.state.selTime==undefined){
-        	message.warning('请选择财务流水时间');
-        	return false;
-        };
-		this.props.form.validateFields((err, values) => {
-			if(!err) {
-				this.setState({
-					loading: true
-				});
-				$.ajax({
-					method: "POST",
-					dataType: "json",
-					crossDomain: false,
-					url: globalConfig.context + 'api/baocun',
-					data: {
-						time:this.state.selTime
-					}
-				}).done(function(data) {
-					this.setState({
-						loading: false
-					});
-					if(!data.error.length) {
-						message.success('已确认!');
-						this.handleOk()
-					} else {
-						message.warning(data.error[0].message);
-					}
-				}.bind(this));
-			}
-		});
-    },
-    //时间选择
-    selTime(e,index){
-    	this.setState({
-    		selectTime:e,
-    		selTime:index
-    	})
-    },
-    //作废流水
-    toVoid(){
-    	if(!this.props.datauser.id){
-    		return false;
-    	}
-    	this.setState({
-			loading: true
-		});
-		$.ajax({
-			method: "POST",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + 'api/zuofei',
-			data: {
-				id:this.props.datauser.id
-			}
-		}).done(function(data) {
-			this.setState({
-				loading: false
-			});
-			if(!data.error.length) {
-				message.success('已作废!');
-				this.handleOk()
-			} else {
-				message.warning(data.error[0].message);
-			}
-		}.bind(this));
-    },
-	handleOk(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false, true);
-	},
-	handleCancel(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false);
-	},
-	componentWillMount() {
-		
-	},
-	nextCancel() {
-		this.setState({
-			addnextVisible: false
-		})
-	},
-	componentWillReceiveProps(nextProps) { //props改变时触发
-		this.state.visible = nextProps.showDesc;
-		if(nextProps.userDetaile && nextProps.showDesc ) {
-			if(nextProps.datauser && nextProps.datauser.id ) {
-				this.loaduser(nextProps.datauser);
-			}
-		}
-	},
-	render() {
-		const FormItem = Form.Item
-		const formItemLayout = {
-			labelCol: { span: 8 },
-			wrapperCol: { span: 14 },
-		};
-		const orderDetaiel=this.state.orderList || [];
-		return(
-			<div>
-            <Modal maskClosable={false} visible={this.state.visible}
-                    onOk={this.handleOk} onCancel={this.handleCancel}
-                    width='1000px'
-                    title='编辑订单'                     
-                    footer=''
-                    className="admin-desc-content">
-		            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} onSubmit={this.handleSubmit}>
-		                <Spin spinning={this.state.loading}>
-	                        <div className="clearfix">
-	                            <div className="clearfix">
-		                       		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="平台流水号" >
-			                            <span>{orderDetaiel.rname}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="平台流水时间" >  
-			                            <span>{orderDetaiel.createTimez}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="流水金额" >  
-			                            <span>{orderDetaiel.rname}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="流水科目" >  
-			                            <span>{orderDetaiel.rname}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="流水状态" >  
-			                            <span>{orderDetaiel.rname}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="付款人名称" >  
-			                            <span>{orderDetaiel.rname}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="收款人名称" >  
-			                            <span>{orderDetaiel.rname}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="交易方式" >  
-			                            <span>{orderDetaiel.rname}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="交易渠道" >    
-		                            	<span>{orderDetaiel.roleName}</span>
-				                    </FormItem>
-				                    <div className='clearfix'>
-							        	<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="附言" >
-							        		<span>{orderDetaiel.roleName}</span>
-								        </FormItem>
-							        </div>
-				                    <div className='clearfix'>
-					                    <FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单编号" >   
-				                            <span>{orderDetaiel.roleName}</span>
-					                    </FormItem>
-					               	</div>    
-				                    <div className='clearfix'>
-							        	<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人" >   
-				                            <span>{orderDetaiel.roleName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="下单时间" >   
-				                            <span>{orderDetaiel.roleName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人" >   
-				                            <span>{orderDetaiel.roleName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="流水确认时间" >   
-				                            <span>{orderDetaiel.roleName}</span>
-			                    		</FormItem>
-		                    		</div>
-		                    		<div className='clearfix'>
-				                        <FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务流水号" >   
-				                            <Input value={this.state.timet}  style={{width:'240px'}} placeholder="请输入财务流水号"
-				                                 onChange={(e)=>{this.setState({timet:e.target.value})}} required="required" />
-									        <span className="mandatory">*</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务流水时间" >   
-				                            <DatePicker
-				                              style={{marginTop:'0',width:'200px',height:'32px'}}
-										      showTime
-										      format="YYYY-MM-DD HH:mm:ss"
-										      placeholder="选择时间"
-										      value={this.state.selectTime}
-										      onChange={(e,time)=>{this.selTime(e,time)}}
-										    />
-									        <span className="mandatory">*</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div className='clearfix'>
-			                    		<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="财务备注" >
-								                <Input type="textarea" placeholder="请输入财务备注" rows={4}  value={this.state.introduction} 
-									    			onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
-								        </FormItem>
-								    </div> 
-								    <div className='btnSave'>
-							            <Button className="setSave" type="primary" htmlType="submit">确认流水</Button> 
-							            <Button className="toVoid" type="danger" onClick={this.toVoid}>作废流水</Button> 
-							        	<Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
-							        </div>
-		                        </div>
-		                    </div>
-		                </Spin>
-		            </Form >
-		        </Modal>
-    	    </div>
-		)
-	}
-}));
-
-export default MyBillDetaile;

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1340 - 0
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx


+ 198 - 103
js/component/manageCenter/order/myOrder/myService.jsx

@@ -5,9 +5,9 @@ import $ from 'jquery/src/ajax';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Checkbox ,Modal, Upload ,Popconfirm} from 'antd';
 import NewService from "./addService.jsx";
 import moment from 'moment';
-import '../userMangagement.less';
-import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
-import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress,splitUrl} from '../../../tools.js';
+import '../../userMangagement.less';
+import {intentProgress,transactionProgress,contractProgress,projectProgress,orderType, orderStage, orderState,paymentState, projectState,orderChannel, approvedState, lock,paymentMethod,transactionChannel} from '../../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getProjectState,getContractProgress,getProjectProgress,splitUrl,getOrderType,getOrderStage,getOrderState,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel} from '../../../../tools.js';
 
 const MyService=Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -19,22 +19,19 @@ const MyService=Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/roles',
+            url: globalConfig.context + '/api/admin/order/listServiceOrder',
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                customerName:this.state.customerName,
+                buyerName:this.state.customerName,
                 startDate: this.state.releaseDate[0],
 				endDate: this.state.releaseDate[1],
-				transactionProgress:this.state.transactionProgress,
-				contractProgress:this.state.contractProgress,
-				projectProgress:this.state.projectProgress,
-				settlementState:this.state.settlementState,
-				orderStatus:this.state.orderStatus,
-				approved:this.state.approved,
-				orderChannel:this.state.orderChannel,
-				intentOrder:this.state.intentOrder?'1':'0',
-				formalOrder:this.state.formalOrder?'1':'0'
+				projectStage:this.state.projectProgress,
+				liquidationStatus:this.state.settlementState, //结算
+				orderStatus:this.state.orderStatusSearch,
+				orderChannel:this.state.orderChannelSearch,
+				intention:this.state.intentOrder?1:0,
+				formal:this.state.formalOrder?1:0
             },
             success: function (data) {
                 let theArr = [];
@@ -48,9 +45,18 @@ const MyService=Form.create()(React.createClass({
                         theArr.push({
                              key: i,
 	                         id: thisdata.id,
-	                         roleName: thisdata.roleName,
-	                         creater:thisdata.creater,
-	                         createTime:thisdata.createTimez,
+	                         orderNo: thisdata.orderNo,//订单编号
+	                         orderType:thisdata.orderType,//订单类型
+	                         orderStatus:thisdata.orderStatus,
+	                         liquidationStatus:thisdata.liquidationStatus,
+	                         createTime:thisdata.createTime,
+	                         buyerName:thisdata.buyerName,
+	                         signTotalAmount:thisdata.signTotalAmount,
+	                         projectStage:thisdata.projectStage,
+	                         approval:thisdata.approval,
+	                         orderChannel:thisdata.orderChannel,
+	                         salesmanName:thisdata.salesmanName,
+	                         active:thisdata.active,
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -61,9 +67,11 @@ const MyService=Form.create()(React.createClass({
 					this.state.pagination.total=0
 				}
                 this.setState({
+                	pageNo:pageNo,
                     dataSource: theArr,
                     pagination: this.state.pagination,
-                    selectedRowKeys:[]
+                    selectedRowKeys:[],
+                    signBillVisible:false
                 });
             }.bind(this),
         }).always(function () {
@@ -82,8 +90,8 @@ const MyService=Form.create()(React.createClass({
             selectedRows: [],
             searchMore: true,
             loading: false,
-            intentOrder:false,
-            formalOrder:false,
+            intentOrder:true,
+            formalOrder:true,
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -99,82 +107,78 @@ const MyService=Form.create()(React.createClass({
             columns: [
                 {
                     title: '订单编号',
-                    dataIndex: 'roleName',
-                    key: 'roleName'
+                    dataIndex: 'orderNo',
+                    key: 'orderNo'
                 }, {
                     title: '订单类型',
-                    dataIndex: 'creater',
-                    key: 'creater'
+                    dataIndex: 'orderType',
+                    key: 'orderType',
+                    render:text=>{return getOrderType(text)}
                 }, {
                     title: '下单时间',
-                    dataIndex: 'creater7',
-                    key: 'creater7'
+                    dataIndex: 'createTime',
+                    key: 'createTime'
                 },{
                     title: '订单客户',
-                    dataIndex: 'roleName1',
-                    key: 'roleName1'
+                    dataIndex: 'buyerName',
+                    key: 'buyerName'
                 }, {
                     title: '实际下单金额',
-                    dataIndex: 'creater1',
-                    key: 'creater1'
-                }, {
-                    title: '意向进度',
-                    dataIndex: 'createTime1',
-                    key: 'createTime1',
-                    render:(text)=>{return getIntentProgress(text) }
-                },{
-                    title: '交易进度',
-                    dataIndex: 'roleName2',
-                    key: 'roleName2',
-                    render:(text)=>{return getTransactionProgress(text) }
-                }, {
-                    title: '合同进度',
-                    dataIndex: 'creater2',
-                    key: 'creater2',
-                    render:(text)=>{return getContractProgress(text) }
-                }, {
-                    title: '项目进度',
-                    dataIndex: 'creatu',
-                    key: 'creatu',
-                    render:(text)=>{return getProjectProgress(text) }
+                    dataIndex: 'signTotalAmount',
+                    key: 'signTotalAmount'
                 },{
                     title: '结算状态',
-                    dataIndex: 'roleName3',
-                    key: 'roleName3'
+                    dataIndex: 'liquidationStatus',
+                    key: 'liquidationStatus',
+                    render:text=>{return getPaymentState(text)}
                 }, {
                     title: '订单状态',
-                    dataIndex: 'creater3',
-                    key: 'creater3'
+                    dataIndex: 'orderStatus',
+                    key: 'orderStatus',
+                    render:text=>{return getOrderState(text)}
+                }, {
+                    title: '项目状态',
+                    dataIndex: 'projectStage',
+                    key: 'projectStage',
+                    render:text=>{return getProjectState(text)}
                 }, {
                     title: '是否特批',
-                    dataIndex: 'creat',
-                    key: 'creat'
+                    dataIndex: 'approval',
+                    key: 'approval',
+                    render:text=>{return text?'已特批':'未特批'}
                 },{
                     title: '订单渠道',
-                    dataIndex: 'cre',
-                    key: 'cre'
+                    dataIndex: 'orderChannel',
+                    key: 'orderChannel',
+                    render:text=>{return getOrderChannel(text)}
                 },{
+                    title: '财务负责人',
+                    dataIndex: 'salesmanName',
+                    key: 'salesmanName'
+                },
+                {
                     title: '操作',
-                    dataIndex: 'ccc',
-                    key: 'ccc',
+                    dataIndex: 'active',
+                    key: 'active',
                     render: (text, record, index) => {
 						return <div>
-							<Popconfirm title={'请确认您是否受理来自【'+record.roleName+'】发起的服务意向订单?'} onConfirm={(e)=>{this.admissibleOrder(record)}} okText="确认" cancelText="取消">
+							{text.confirmIntention&&<Popconfirm title={'请确认您是否受理来自【'+record.buyerName+'】发起的服务意向订单?'} onConfirm={(e)=>{this.admissibleOrderOk(record)}} onCancel={(e)=>{this.admissibleOrderCancel(record)}} okText="同意" cancelText="拒绝">
 							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">受理意向</Button>                 
-							</Popconfirm>
-							<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.signBill(record)}} type="primary">签单</Button>                 
-							<Popconfirm title={'请确认您是否取消客户【'+record.roleName+'】的服务订单,订单取消将导致业务终止!'} onConfirm={(e)=>{this.cancelOrder(record)}} okText="确认" cancelText="取消">
-							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">取消订单</Button>                 
-							</Popconfirm>
-							<Popconfirm title={'请确认您是否作废客户【'+record.roleName+'】的服务订单,订单作废将导致订单失效!'} onConfirm={(e)=>{this.scrapOrder(record)}} okText="确认" cancelText="取消">
+							</Popconfirm>}
+							{text.applySign&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.signBill(record)}} type="primary">签单</Button> }                
+							{text.applyForCancel&&<Popconfirm title={'请确认您是否取消客户【'+record.buyerName+'】的服务订单,订单取消将导致业务终止!'} onConfirm={(e)=>{this.cancelOrder(record)}} okText="确认" cancelText="取消">
+								<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">取消订单</Button>                 
+							</Popconfirm>}
+							{text.applyRevoke&&<Popconfirm title={'请确认您是否作废客户【'+record.buyerName+'】的服务订单,订单作废将导致订单失效!'} onConfirm={(e)=>{this.scrapOrder(record)}} okText="确认" cancelText="取消">
 							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">作废</Button>                 
-							</Popconfirm>
-							<Popconfirm title={'请确认您是否锁定客户【'+record.roleName+'】的服务订单,订单锁定将导致订单暂停!'} onConfirm={(e)=>{this.lockOrder(record)}} okText="确认" cancelText="取消">
+							</Popconfirm>}
+							{text.applyLock &&<Popconfirm title={'请确认您是否锁定客户【'+record.buyerName+'】的服务订单,订单锁定将导致订单暂停!'} onConfirm={(e)=>{this.lockOrder(record)}} okText="确认" cancelText="取消">
 							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">锁定<Icon type="lock" /></Button>                 
-							</Popconfirm>
-							<Popconfirm title={'请确认您是否解锁客户【'+record.roleName+'】的服务订单,订单解锁将导致订单正常!'} onConfirm={(e)=>{this.unlockOrder(record)}} okText="确认" cancelText="取消">
+							</Popconfirm>}
+							{text.applyUnLock&&<Popconfirm title={'请确认您是否解锁客户【'+record.buyerName+'】的服务订单,订单解锁将导致订单正常!'} onConfirm={(e)=>{this.unlockOrder(record)}} okText="确认" cancelText="取消">
 							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">解锁<Icon type="unlock" /></Button>                 
-							</Popconfirm>
+							</Popconfirm>}
+							{record.liquidationStatus<=1?<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.paymentMoney(record)}} type="primary">支付</Button>:''}             
                         </div>
 					}
                 }
@@ -182,9 +186,90 @@ const MyService=Form.create()(React.createClass({
             dataSource: [],
         };
     },
+     //支付
+    paymentMoney(record){
+    	this.setState({
+    		kid:record.orderNo,
+    		payment:'',
+    		paymentVisible:true
+    	})
+    },
+    paymentCancel(){
+    	this.setState({
+    		paymentVisible:false
+    	})
+    },
+    //支付保存
+    payment(){
+    	if(!this.state.payment){
+    		message.warning('请输入支付金额!');
+    		return;
+    	};
+    	this.setState({
+            selectedRowKeys: [],
+            loading: true,
+            showDesc:false
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/order/testPay',
+            data: {
+            	orderNo:this.state.kid,
+            	payAmount:this.state.payment
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('支付成功!');
+                this.paymentCancel();
+                this.loadData(this.state.pageNo);
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+        }.bind(this));
+    },
     //受理订单
-    admissibleOrder(e){
-    	this.operation(e,'admissibleOrder')
+    admissibleOrderOk(e){
+    	this.admissibleOrder(e,true)
+    },
+    admissibleOrderCancel(e){
+    	this.admissibleOrder(e,false)
+    },
+    admissibleOrder(record,index) {
+        this.setState({
+        	signBillVisible:false,
+            selectedRowKeys: [],
+            loading: true,
+            userDetaile:false
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/order/confirmIntention',
+            data: {
+            	orderNo:record.orderNo,
+            	confirm:index
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功!');
+                this.setState({
+                    loading: false,
+                    showDesc:false
+                });
+            } else {
+                message.warning(data.error[0].message);
+                this.setState({
+                	showDesc:true
+                })
+            };
+            this.loadData(this.state.pageNo);
+        }.bind(this));
     },
     //取消订单
     cancelOrder(e){
@@ -225,9 +310,6 @@ const MyService=Form.create()(React.createClass({
     operation(record,index) {
     	let api;
         switch(index){
-        	case 'admissibleOrder':  //受理意向
-        		api='/api/shoulidingdan';
-        		break;
         	case 'cancelOrder':  //取消订单
         		api='/api/quxiaodingdan';
         		break;
@@ -254,7 +336,8 @@ const MyService=Form.create()(React.createClass({
             crossDomain: false,
             url: globalConfig.context + api,
             data: {
-            	id:record.id
+            	orderNo:record.orderNo,
+            	confirm:''
             }
         }).done(function (data) {
             if (!data.error.length) {
@@ -265,7 +348,7 @@ const MyService=Form.create()(React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.pageNo);
         }.bind(this));
     },
     addClick() {
@@ -279,7 +362,7 @@ const MyService=Form.create()(React.createClass({
     	this.state.userDetaile=false;
         this.state.showDesc = e;
         if (s) {
-            this.loadData();
+            this.loadData(this.state.pageNo);
         };
     },
     searchSwitch() {
@@ -301,15 +384,12 @@ const MyService=Form.create()(React.createClass({
     	this.state.customerName='';
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
-		this.state.transactionProgress = undefined;
-		this.state.contractProgress = undefined;
 		this.state.projectProgress = undefined;
 		this.state.settlementState = undefined;
-		this.state.orderStatus = undefined;
-		this.state.approved = undefined;
-		this.state.orderChannel = undefined;
-		this.state.formalOrder=false;
-		this.state.intentOrder=false;
+		this.state.orderStatusSearch = undefined;
+		this.state.orderChannelSearch = undefined;
+		this.state.formalOrder=true;
+		this.state.intentOrder=true;
         this.loadData();       
     },
     render() {
@@ -337,7 +417,7 @@ const MyService=Form.create()(React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                	<span style={{fontSize:'16px'}}>我的订单</span>	
+                	<span style={{fontSize:'16px'}}>我的科技服务订单</span>	
 	                <div className="user-search">
 	                    <Input placeholder="客户名称" style={{width:'150px'}}
 	                        value={this.state.customerName}
@@ -357,10 +437,10 @@ const MyService=Form.create()(React.createClass({
 	                  		<Checkbox checked={this.state.formalOrder} onChange={(e)=>{this.setState({formalOrder:!this.state.formalOrder})}}>正式订单</Checkbox>
 	                  		<Select placeholder="订单状态"
 	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.orderStatus}
-	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            value={this.state.orderStatusSearch}
+	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
 	                            {
-                                    lvl.map(function (item) {
+                                    orderState.map(function (item) {
                                             return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }
@@ -370,7 +450,7 @@ const MyService=Form.create()(React.createClass({
 	                            value={this.state.settlementState}
 	                            onChange={(e) => { this.setState({ settlementState: e }) }}>
 	                            {
-                                    lvl.map(function (item) {
+                                    paymentState.map(function (item) {
                                             return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }
@@ -380,24 +460,17 @@ const MyService=Form.create()(React.createClass({
 	                            value={this.state.projectProgress}
 	                            onChange={(e) => { this.setState({ projectProgress: e }) }}>
 	                            {
-                                    projectProgress.map(function (item) {
+                                    projectState.map(function (item) {
                                             return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }
 	                        </Select>
-	                        <Select placeholder="是否特批"
-	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.approved}
-	                            onChange={(e) => { this.setState({ approved: e }) }}>
-	                            <Select.Option value="0" >未特批</Select.Option>
-	                            <Select.Option value="1" >已特批</Select.Option>
-	                        </Select>
 	                        <Select placeholder="订单渠道"
 	                            style={{ width: 150 }}
-	                            value={this.state.orderChannel}
-	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            value={this.state.orderChannelSearch}
+	                            onChange={(e) => { this.setState({ orderChannelSearch: e }) }}>
 	                            {
-                                    lvl.map(function (item) {
+                                    orderChannel.map(function (item) {
                                             return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }
@@ -418,11 +491,33 @@ const MyService=Form.create()(React.createClass({
 	                	signBillVisible={this.state.signBillVisible}
 	                    signBillState={this.state.signBillState}
 	                	operation={this.operation}
+	                	admissibleOrder={this.admissibleOrder}
 	                    userDetaile={this.state.userDetaile}
 	                    datauser={this.state.datauser}
 	                    showDesc={this.state.showDesc}
 	                    closeDesc={this.closeDesc} />
 	            </div >
+	             <Modal maskClosable={false} visible={this.state.paymentVisible}
+                        onOk={this.paymentCancel} onCancel={this.paymentCancel}
+                        width='550px'
+                        title='支付详情'                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	    <FormItem className="half-middle"
+			                            {...formItemLayout}
+			                            label="支付金额" >
+		                    			<Input value={this.state.payment} onChange={(e)=>{this.setState({payment:e.target.value})}} style={{width:'220px'}} />
+		                    			<span className="mandatory">*</span>
+			                    	</FormItem>
+			                    	<Button type="primary" onClick={this.payment}>支付</Button>
+			                    	<Button onClick={this.paymentCancel}>取消</Button>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
             </div>
         );
     }

+ 3 - 3
js/component/manageCenter/order/orderManagement/approveOrder.jsx

@@ -5,9 +5,9 @@ import $ from 'jquery/src/ajax';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload ,Popconfirm,Checkbox} from 'antd';
 import ApproveOrderDetaile from "./approveOrderDetaile.jsx";
 import moment from 'moment';
-import '../userMangagement.less';
-import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
-import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../tools.js';
+import '../../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../../tools.js';
 
 const ApproveOrder=Form.create()(React.createClass({
 	loadData(pageNo) {

+ 2 - 2
js/component/manageCenter/order/orderManagement/approveOrderDetaile.jsx

@@ -2,8 +2,8 @@ import React from 'react';
 import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import '../userMangagement.less';
-import {lvl} from '../../../dataDic.js';
+import '../../userMangagement.less';
+import {lvl} from '../../../../dataDic.js';
 
 //图片组件
 const PicturesWall = React.createClass({

+ 60 - 52
js/component/manageCenter/order/orderManagement/publicOrder.jsx

@@ -5,9 +5,9 @@ import $ from 'jquery/src/ajax';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload ,Popconfirm} from 'antd';
 import PublicOrderDetaile from "./publicOrderDetaile.jsx";
 import moment from 'moment';
-import '../userMangagement.less';
-import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
-import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../tools.js';
+import '../../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress,orderState,orderChannel,orderType} from '../../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress,getOrderState,getOrderChannel} from '../../../../tools.js';
 const PublicOrder=Form.create()(React.createClass({
 	loadData(pageNo) {
         this.state.data = [];
@@ -22,16 +22,17 @@ const PublicOrder=Form.create()(React.createClass({
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                customerName:this.state.customerName,
+                customerName:this.state.customerNameSearch,
                 startDate: this.state.releaseDate[0],
 				endDate: this.state.releaseDate[1],
-				transactionProgress:this.state.transactionProgress,
-				contractProgress:this.state.contractProgress,
-				projectProgress:this.state.projectProgress,
+				transactionProgress:this.state.transactionProgressSearch,
+				contractProgress:this.state.contractProgressSearch,
+				projectProgress:this.state.projectProgressSearch,
 				settlementState:this.state.settlementState,
-				orderStatus:this.state.orderStatus,
-				approved:this.state.approved,
-				orderChannel:this.state.orderChannel
+				orderStatus:this.state.orderStatusSearch,
+				approved:this.state.approvedSearch,
+				orderChannel:this.state.orderChannelSearch,
+				orderType:this.state.orderTypeSearch
             },
             success: function (data) {
                 let theArr = [];
@@ -45,9 +46,14 @@ const PublicOrder=Form.create()(React.createClass({
                         theArr.push({
                              key: i,
 	                         id: thisdata.id,
-	                         roleName: thisdata.roleName,
-	                         creater:thisdata.creater,
-	                         createTime:thisdata.createTimez,
+	                         orderNo: thisdata.orderNo,
+	                         orderType:thisdata.orderType,
+	                         createTime:thisdata.createTime,
+	                         buyerName: thisdata.buyerName,
+	                         signTotalAmount:thisdata.signTotalAmount,
+	                         orderChannel: thisdata.orderChannel,
+	                         orderStatus:thisdata.orderStatus,
+	                         liquidationStatus:thisdata.liquidationStatus,
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -58,6 +64,7 @@ const PublicOrder=Form.create()(React.createClass({
 					this.state.pagination.total=0
 				}
                 this.setState({
+                	pageNos:pageNo,
                     dataSource: theArr,
                     pagination: this.state.pagination,
                     selectedRowKeys:[]
@@ -107,20 +114,20 @@ const PublicOrder=Form.create()(React.createClass({
             columns: [
                 {
                     title: '订单编号',
-                    dataIndex: 'roleName',
-                    key: 'roleName'
+                    dataIndex: 'orderNo',
+                    key: 'orderNo'
                 }, {
                     title: '订单类型',
-                    dataIndex: 'creater',
-                    key: 'creater'
+                    dataIndex: 'orderType',
+                    key: 'orderType'
                 }, {
                     title: '下单时间',
-                    dataIndex: 'creater7',
-                    key: 'creater7'
+                    dataIndex: 'createTime',
+                    key: 'createTime'
                 },{
                     title: '订单客户',
-                    dataIndex: 'roleName1',
-                    key: 'roleName1'
+                    dataIndex: 'buyerName',
+                    key: 'buyerName'
                 }, {
                     title: '订单金额',
                     dataIndex: 'c',
@@ -128,8 +135,8 @@ const PublicOrder=Form.create()(React.createClass({
                 },
                 {
                     title: '实际下单金额',
-                    dataIndex: 'creater1',
-                    key: 'creater1'
+                    dataIndex: 'signTotalAmount',
+                    key: 'signTotalAmount'
                 }, {
                     title: '意向进度',
                     dataIndex: 'createTime1',
@@ -142,19 +149,19 @@ const PublicOrder=Form.create()(React.createClass({
                     render:(text)=>{return getTransactionProgress(text) }
                 }, {
                     title: '结算状态',
-                    dataIndex: 'creater2',
-                    key: 'creater2',
+                    dataIndex: 'liquidationStatus',
+                    key: 'liquidationStatus',
                     render:(text)=>{return getContractProgress(text) }
                 }, {
                     title: '订单状态',
-                    dataIndex: 'creatu',
-                    key: 'creatu',
-                    render:(text)=>{return getProjectProgress(text) }
+                    dataIndex: 'orderStatus',
+                    key: 'orderStatus',
+                    render:(text)=>{return getOrderState(text) }
                 },{
                     title: '订单渠道',
-                    dataIndex: 'cre',
-                    key: 'cre',
-                    render:(text)=>{return getProjectProgress(text) }
+                    dataIndex: 'corderChannelre',
+                    key: 'orderChannel',
+                    render:(text)=>{return getOrderChannel(text) }
                 },{
                     title: '操作',
                     dataIndex: 'operation',
@@ -292,7 +299,7 @@ const PublicOrder=Form.create()(React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.pageNos);
         }.bind(this));
     },
     componentWillMount() {
@@ -309,7 +316,7 @@ const PublicOrder=Form.create()(React.createClass({
     	this.state.userDetaile=false;
         this.state.showDesc = e;
         if (s) {
-            this.loadData();
+            this.loadData(this.state.pageNos);
         };
     },
     searchSwitch() {
@@ -329,16 +336,17 @@ const PublicOrder=Form.create()(React.createClass({
         this.contactList();
     },
     reset() {
-    	this.state.customerName='';
+    	this.state.customerNameSearch='';
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
-		this.state.transactionProgress = undefined;
-		this.state.contractProgress = undefined;
-		this.state.projectProgress = undefined;
-		this.state.settlementState = undefined;
-		this.state.orderStatus = undefined;
-		this.state.approved = undefined;
-		this.state.orderChannel = undefined;
+		this.state.transactionProgressSearch = undefined;
+		this.state.contractProgressSearch = undefined;
+		this.state.projectProgressSearch = undefined;
+		this.state.settlementStateSearch = undefined;
+		this.state.orderStatusSearch = undefined;
+		this.state.approvedSearch = undefined;
+		this.state.orderChannelSearch = undefined;
+		this.state.orderTypeSearch=undefined;
         this.loadData();       
     },
     render() {
@@ -364,8 +372,8 @@ const PublicOrder=Form.create()(React.createClass({
                 	<span style={{fontSize:'16px'}}>公共订单</span>	
 	                <div className="user-search">
 	                    <Input placeholder="客户名称" style={{width:'150px'}}
-	                        value={this.state.customerName}
-	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
+	                        value={this.state.customerNameSearch}
+	                        onChange={(e) => { this.setState({ customerNameSearch: e.target.value }); }} />
 	                    <RangePicker
 		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
@@ -378,30 +386,30 @@ const PublicOrder=Form.create()(React.createClass({
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
 	                        <Select placeholder="订单状态"
 	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.orderStatus}
-	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            value={this.state.orderStatusSearch}
+	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
 	                            {
-                                    lvl.map(function (item) {
+                                    orderState.map(function (item) {
                                             return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }
 	                        </Select>
 	                        <Select placeholder="订单渠道"
 	                            style={{ width: 150,marginRight:'10px' }}
-	                            value={this.state.orderChannel}
-	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            value={this.state.orderChannelSearch}
+	                            onChange={(e) => { this.setState({ orderChannelSearch: e }) }}>
 	                            {
-                                    lvl.map(function (item) {
+                                    orderChannel.map(function (item) {
                                             return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }
 	                        </Select>
 	                        <Select placeholder="订单类型"
 	                            style={{ width: 150 }}
-	                            value={this.state.orderChannel}
-	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            value={this.state.orderTypeSearch}
+	                            onChange={(e) => { this.setState({ orderTypeSearch: e }) }}>
 	                            {
-                                    lvl.map(function (item) {
+                                    orderType.map(function (item) {
                                             return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }

+ 120 - 174
js/component/manageCenter/order/orderManagement/publicOrderDetaile.jsx

@@ -2,8 +2,8 @@ import React from 'react';
 import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import '../userMangagement.less';
-import {lvl} from '../../../dataDic.js';
+import '../../userMangagement.less';
+import {lvl} from '../../../../dataDic.js';
 
 //图片组件
 const PicturesWall = React.createClass({
@@ -59,16 +59,18 @@ const PicturesWall = React.createClass({
 });
 
 const ApproveDetaile = Form.create()(React.createClass({
-	loadData() {
+	loadData(record) {
+        this.state.data = [];
         this.setState({
             loading: true
         });
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/roles',
+            url: globalConfig.context + '/api/admin/order/getOrderCommodity',
             data: {
+            	orderNo:record?record.orderNo:this.props.datauser.orderNo
             },
             success: function (data) {
                 let theArr = [];
@@ -77,10 +79,22 @@ const ApproveDetaile = Form.create()(React.createClass({
                         message.warning(data.error[0].message);
                     };
                 } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
+                    for (let i = 0; i < data.data.length; i++) {
+                        let thisdata = data.data[i];
                         theArr.push({
                              key: i,
+                             id:thisdata.id,
+                             orderNo:thisdata.orderNo,
+                             commodityName:thisdata.commodityName,
+                             commodityType:thisdata.commodityType,
+                             commodityMode:thisdata.commodityMode,
+                             commodityQuantity:thisdata.commodityQuantity,
+                             commodityPrice:thisdata.commodityPrice,
+                             discountPrice:thisdata.discountPrice,
+                             commodityFirstPayment:thisdata.commodityFirstPayment,
+                             createTimes:thisdata.createTimes,
+                             discountFirstPayment:thisdata.discountFirstPayment,
+                             remarks:thisdata.remarks,
                         });
                     };
                    }
@@ -105,103 +119,53 @@ const ApproveDetaile = Form.create()(React.createClass({
 			columns: [
 				{
                     title: '业务项目名称',
-                    dataIndex: 'roleName',
-                    key: 'roleName'
+                    dataIndex: 'commodityName',
+                    key: 'commodityName'
                 }, {
                     title: '项目类别',
-                    dataIndex: 'creater1',
-                    key: 'creater1'
+                    dataIndex: 'commodityType',
+                    key: 'commodityType',
+                    render:(text)=>{
+                    	return (getOrderType(text))
+                    }
                 },{
                     title: '项目数量',
-                    dataIndex: 'roleName2',
-                    key: 'roleName2'
+                    dataIndex: 'commodityQuantity',
+                    key: 'commodityQuantity'
                 }, {
                     title: '服务市价',
-                    dataIndex: 'creater2',
-                    key: 'creater2'
+                    dataIndex: 'commodityPrice',
+                    key: 'commodityPrice'
                 }, {
                     title: '实签价格',
-                    dataIndex: 'roleName3',
-                    key: 'roleName3'
+                    dataIndex: 'discountPrice',
+                    key: 'discountPrice'
                 }, {
                     title: '下单时间',
-                    dataIndex: 'creater4',
-                    key: 'creater4'
+                    dataIndex: 'createTimes',
+                    key: 'createTimes'
                 }, {
                     title: '项目说明',
-                    dataIndex: 'roleName5',
-                    key: 'roleName5'
+                    dataIndex: 'remarks',
+                    key: 'remarks',
+					render:(text)=>{
+						return (text&&text.length>8?text.substr(0,8)+'…':text)
+					}
                 }
 			]
 		};
 	},
-	 //主管初始加载(自动补全)
-	supervisor(e){ 
-		$.ajax({
-            method: "post",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/selectName",
-            data:{
-            	name:e
-            },
-            success: function (data) {                	  
-				       let thedata=data.data;
-				    if (!thedata) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };	
-                    thedata = {}; 
-              }; 
-					this.setState({
-						customerArr:thedata,	
-                    });
-				}.bind(this),
-			}).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));  
-	},
-	//上级主管输入框失去焦点是判断客户是否存在
-	selectAuto(value,options){
-		this.setState({
-			auto:value
-		})
-	},
-	blurChange(e){
-		let theType;
-		let contactLists=this.state.customerArr||[];
-			if (e) {
-            contactLists.map(function (item) {
-                if (item.name == e.toString()) {
-                    theType=item.id
-                }
-           });     
-   	    }
-		this.setState({
-			theTypes:theType
-		})
-	},
-	//值改变时请求客户名称
-	httpChange(e){
-		if(e.length>=1){
-			this.supervisor(e); 
-		}	
-		this.setState({
-			auto:e
-		})
-	},
 	//查看基本详情基本信息
     loaduser(record){
     	if(record){
+    	this.state.orderList=[]
     	$.ajax({
-            method: "post",
+            method: "get",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context + '/api/admin/role/rolePermission',
+			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
             data: {
-              id: record.id
+              orderNo: record.orderNo
             },
             success: function (data) {
                 let thisData = data.data;                
@@ -211,17 +175,20 @@ const ApproveDetaile = Form.create()(React.createClass({
                     };
                     thisData = {};
                 };
-                let idList=[];
-                thisData.map(function(item){
-                	idList.push(
-                		item.pid
-                	)
-                })
                 this.setState({
-					ids:record.id,
-                	roleName:thisData[0].rname,
-                	checkedKeys:idList,	
-                });                  
+					id:thisData.id,
+					orderList:thisData,
+					orderAmount:thisData.orderAmount,
+					firstPayment:thisData.firstPayment,
+					signTotalAmount:thisData.signTotalAmount,
+					signFirstPayment:thisData.signFirstPayment,
+					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
+					orderRemarks:thisData.orderRemarks,
+                    orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
+               		//签单
+               		orderNo:thisData.orderNo,//订单编号
+               		buyerName:thisData.buyerName,
+                });
             }.bind(this),
        }).always(function () {
             this.setState({            	
@@ -247,47 +214,11 @@ const ApproveDetaile = Form.create()(React.createClass({
 			addnextVisible: false
 		})
 	},
-	//查看订单明细
-	orderDetails(record){
-		if(record){
-	    	$.ajax({
-	            method: "post",
-				dataType: "json",
-				crossDomain: false,
-				url: globalConfig.context + '/api/admin/role/rolePermission',
-	            data: {
-	              id: record.id
-	            },
-	            success: function (data) {
-	                let thisData = data.data;                
-	                if (!thisData) {
-	                    if (data.error && data.error.length) {
-	                        message.warning(data.error[0].message);
-	                    };
-	                    thisData = {};
-	                };
-	                let idList=[];
-	                thisData.map(function(item){
-	                	idList.push(
-	                		item.pid
-	                	)
-	                })
-	                this.setState({
-						ids:record.id,
-	                });                  
-	            }.bind(this),
-	       }).always(function () {
-	            this.setState({            	
-	                loading: false
-	            });
-	        }.bind(this));  
-	    }
-	},
 	tableRowClick(record, index) {
-        this.setState({
+       this.setState({
+        	editFw:record,
         	addnextVisible:true,
         });
-        this.orderDetails(record)
     },
 	componentWillMount() {
 		
@@ -297,7 +228,7 @@ const ApproveDetaile = Form.create()(React.createClass({
 		if(nextProps.userDetaile && nextProps.showDesc ) {
 			if(nextProps.datauser && nextProps.datauser.id ) {
 				this.loaduser(nextProps.datauser);
-				this.loadData();
+				this.loadData(nextProps.datauser);
 			}
 		}
 	},
@@ -307,17 +238,14 @@ const ApproveDetaile = Form.create()(React.createClass({
 			labelCol: { span: 8 },
 			wrapperCol: { span: 14 },
 		};
+		const editFws=this.state.editFw;
 		const orderDetaiel=this.state.orderList || [];
-		const dataSources=this.state.customerArr || [];
-        const options = dataSources.map((group,index) =>
-				      <Option key={index} value={group.name}>{group.name}</Option>
-				     )
 		return(
 			<div>
             <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.handleOk} onCancel={this.handleCancel}
                         width='1000px'
-                        title='编辑订单'                     
+                        title='查看订单详情'                     
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} >
@@ -327,7 +255,7 @@ const ApproveDetaile = Form.create()(React.createClass({
 			                       		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="订单编号" >
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.orderNo}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -337,58 +265,58 @@ const ApproveDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="客户名称" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.buyerName}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="订单类型" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.orderType}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="订单渠道" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.orderChannel}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="订单状态" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.orderType}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="已收款项" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.actuallyTotalAmount}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="结算状态" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.liquidationStatus}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价订单金额" >    
-			                            	<span>{orderDetaiel.roleName}</span>
+			                            	<span>{orderDetaiel.orderAmount}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价首款金额" >   
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.firstPayment}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签订单金额" >   
-					                            <span>{orderDetaiel.roleName}</span>
+					                            <span>{orderDetaiel.signTotalAmount}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签首款金额" >   
-					                            <span>{orderDetaiel.roleName}</span>
+					                            <span>{orderDetaiel.signFirstPayment}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="特批立项" >   
-					                            <span>{orderDetaiel.roleName}</span>
+					                            <span>{orderDetaiel.approval}</span>
 				                    		</FormItem>
 											<div className="clearfix">
 												<FormItem
@@ -417,7 +345,7 @@ const ApproveDetaile = Form.create()(React.createClass({
 										            labelCol={{ span: 4 }}
 										            wrapperCol={{ span: 16 }}
 										            label="订单留言" >
-									        		<span>{orderDetaiel.roleName}</span>
+									        		<span>{orderDetaiel.orderRemarks}</span>
 										        </FormItem>
 									        </div>
 								        </div>
@@ -426,24 +354,24 @@ const ApproveDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="订单负责人" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.salesmanName}</span>
 			                    		</FormItem>
 			                    	</div>
 			                    	<div className='clearfix'>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="意向时间" >  
-				                            <span>{orderDetaiel.createTimez}</span>
+				                            <span>{orderDetaiel.createTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="签单时间" >  
-				                            <span>{orderDetaiel.createTimez}</span>
+				                            <span>{orderDetaiel.signTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="财务负责人" >  
-				                            <span>{orderDetaiel.createTimez}</span>
+				                            <span>{orderDetaiel.financeName}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -453,12 +381,12 @@ const ApproveDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="项目负责人" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.technicianName}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="立项时间" >  
-				                            <span>{orderDetaiel.createTimez}</span>
+				                            <span>{orderDetaiel.setUpTime}</span>
 			                    		</FormItem>
 		                    		</div>
 					                <div>
@@ -486,31 +414,49 @@ const ApproveDetaile = Form.create()(React.createClass({
 			            <Form layout="horizontal" id="demand-form">
 			                <Spin spinning={this.state.loading}>
 		                        <div className="clearfix">
-	                        	    <FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="服务名称" >
-			                    			<span>{this.state.aaa}</span>
+	                        	   <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="服务名称" >
+		                    			<span>{editFws.commodityName}</span>
 			                    	</FormItem>
-			                    	<FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="市场价格" >
-			                    			<span>{this.state.aaa}</span>
+			                    	<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="市场价格" >
+		                    			<span>{editFws.commodityPrice}</span>
 			                    	</FormItem>
-			                    	<FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="实签价格" >
-			                    			<span>{this.state.aaa}</span>
+			                    	<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="实签价格" >
+		                    			<span>{editFws.discountPrice}</span>
 			                    	</FormItem>
-			                    	<FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="服务数量" >
-			                    			<span>{this.state.aaa}</span>
+			                    	<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="服务数量" >
+		                    			<span>{editFws.commodityQuantity}</span>
 			                    	</FormItem>
-			                    	<FormItem className="half-middle"
-				                            {...formItemLayout}
+			                    	 <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="商品规格" >   
+		                                <span>{editFws.commodityMode}</span>    
+				                    </FormItem>
+				                    <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="市场首付金额" >   
+		                                <span>{editFws.commodityFirstPayment}</span>    
+				                    </FormItem>
+				                    <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="签单首付金额" >   
+		                                <span>{editFws.discountFirstPayment}</span>    
+				                    </FormItem>
+				                    <div className='clearfix'>
+				                    	<FormItem 
+				                            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
 				                            label="服务说明" >
-			                    			<span>{this.state.aaa}</span>
-			                    	</FormItem>
+			                    			<span>{editFws.remarks}</span>
+				                    	</FormItem>
+			                    	</div>
 		                        </div>
 			                </Spin>
 			            </Form >

+ 124 - 93
js/component/manageCenter/order/settlementOrder/mySettlement.jsx

@@ -1,3 +1,4 @@
+"use strict";
 import React from 'react';
 import ReactDom from 'react-dom';
 import ajax from 'jquery/src/ajax/xhr.js';
@@ -5,12 +6,12 @@ import $ from 'jquery/src/ajax';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload ,Popconfirm} from 'antd';
 import MySettlementDetaile from "./mySettlementDetaile.jsx";
 import moment from 'moment';
-import '../userMangagement.less';
-import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
-import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../tools.js';
+import '../../userMangagement.less';
+import {paymentState ,orderChannel} from '../../../../dataDic.js';
+import {getProjectState,getOrderChannel,getOrderType,getOrderState,getPaymentState} from '../../../../tools.js';
 
 const MySettlement=Form.create()(React.createClass({
-	loadData(pageNo) {
+	loadData(pageNo,depart) {
         this.state.data = [];
         this.setState({
             loading: true
@@ -19,20 +20,17 @@ const MySettlement=Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/roles',
+            url: globalConfig.context + '/api/admin/order/listMySettlement',
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                customerName:this.state.customerName,
+                buyerName:this.state.buyerNameSearch,
+                depId:this.state.departmenttSearch,//部门
+                salesmanName:this.state.salesmanNameSearch,//负责人
                 startDate: this.state.releaseDate[0],
 				endDate: this.state.releaseDate[1],
-				transactionProgress:this.state.transactionProgress,
-				contractProgress:this.state.contractProgress,
-				projectProgress:this.state.projectProgress,
-				settlementState:this.state.settlementState,
-				orderStatus:this.state.orderStatus,
-				approved:this.state.approved,
-				orderChannel:this.state.orderChannel,
+				liquidationStatus:this.state.liquidationStatusSearch, //结算
+				approval:this.state.orderChannelSearch,//特批
             },
             success: function (data) {
                 let theArr = [];
@@ -46,9 +44,22 @@ const MySettlement=Form.create()(React.createClass({
                         theArr.push({
                              key: i,
 	                         id: thisdata.id,
-	                         roleName: thisdata.roleName,
-	                         creater:thisdata.creater,
-	                         createTime:thisdata.createTimez,
+	                         orderNo: thisdata.orderNo,//订单编号
+	                         orderType:thisdata.orderType,//订单类型
+	                         orderStatus:thisdata.orderStatus,
+	                         liquidationStatus:thisdata.liquidationStatus,
+	                         createTime:thisdata.createTime,
+	                         buyerName:thisdata.buyerName,
+	                         signTotalAmount:thisdata.signTotalAmount,
+	                         projectStage:thisdata.projectStage,
+	                         approval:thisdata.approval,
+	                         orderChannel:thisdata.orderChannel,
+	                         salesmanName:thisdata.salesmanName,
+	                         active:thisdata.active,
+	                         departmentName:thisdata.departmentName,
+	                         salesmanName:thisdata.salesmanName,
+	                         financeName:thisdata.financeName,
+	                         technicianName:thisdata.technicianName,
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -59,9 +70,11 @@ const MySettlement=Form.create()(React.createClass({
 					this.state.pagination.total=0
 				}
                 this.setState({
+                	pageNo:pageNo,
                     dataSource: theArr,
                     pagination: this.state.pagination,
-                    selectedRowKeys:[]
+                    selectedRowKeys:[],
+                    signBillVisible:false
                 });
             }.bind(this),
         }).always(function () {
@@ -70,15 +83,56 @@ const MySettlement=Form.create()(React.createClass({
             });
         }.bind(this));
     },
+    //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			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,
+				})
+				this.loadData('1',theArr);
+			}.bind(this),
+			}).always(function() {
+				this.setState({
+					loading: false
+				});
+			}.bind(this));
+	},
     getInitialState() {
         return {
         	datauser:{},
             selectedRowKeys: [],
             releaseDate: [],
+            departmentArr:[],
             selectedRows: [],
             searchMore: true,
             loading: false,
-            distributionVisible:false,
             visible:false,
             showDesc:false,
             pagination: {
@@ -93,65 +147,55 @@ const MySettlement=Form.create()(React.createClass({
                     return '共' + total + '条数据';
                 }
             },
-            distributionPagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
-                pageSize: 10,
-                onChange: function (page) {
-                    this.contactList(page);
-                }.bind(this),
-                showTotal: function (total) {
-                    return '共' + total + '条数据';
-                }
-            },
             columns: [
                 {
                     title: '订单编号',
-                    dataIndex: 'roleName',
-                    key: 'roleName'
+                    dataIndex: 'orderNo',
+                    key: 'orderNo'
                 }, {
                     title: '订单类型',
-                    dataIndex: 'creater',
-                    key: 'creater'
+                    dataIndex: 'orderType',
+                    key: 'orderType',
+                    render:text=>{return getOrderType(text)}
                 }, {
                     title: '下单时间',
-                    dataIndex: 'creater7',
-                    key: 'creater7'
+                    dataIndex: 'createTime',
+                    key: 'createTime'
                 },{
                     title: '订单客户',
-                    dataIndex: 'roleName1',
-                    key: 'roleName1'
-                },
-                {
+                    dataIndex: 'buyerName',
+                    key: 'buyerName',
+                    render:(text)=>{
+                    	return (text.length>9?text.substr(0,9)+'...':text)
+                    }
+                }, {
                     title: '实际下单金额',
-                    dataIndex: 'creater1',
-                    key: 'creater1'
+                    dataIndex: 'signTotalAmount',
+                    key: 'signTotalAmount'
                 }, {
                     title: '订单状态',
-                    dataIndex: 'createTime1',
-                    key: 'createTime1',
-                    render:(text)=>{return getIntentProgress(text) }
+                    dataIndex: 'orderStatus',
+                    key: 'orderStatus',
+                    render:(text)=>{return getOrderState(text) }
                 },{
                     title: '项目进度',
-                    dataIndex: 'roleName2',
-                    key: 'roleName2',
-                    render:(text)=>{return getTransactionProgress(text) }
+                    dataIndex: 'projectStage',
+                    key: 'projectStage',
+                    render:(text)=>{return getProjectState(text) }
                 }, {
                     title: '结算状态',
-                    dataIndex: 'creater2',
-                    key: 'creater2',
-                    render:(text)=>{return getContractProgress(text) }
+                    dataIndex: 'liquidationStatus',
+                    key: 'liquidationStatus',
+                    render:text=>{return getPaymentState(text)}
                 },{
                     title: '是否特批',
-                    dataIndex: 'creater77',
-                    key: 'creater77',
-                    render:(text)=>{return getContractProgress(text) }
+                   dataIndex: 'approval',
+                    key: 'approval',
+                    render:text=>{return text?'已特批':'未特批'}
                 },{
                     title: '订单负责人',
-                    dataIndex: 'creater9',
-                    key: 'creater9',
-                    render:(text)=>{return getContractProgress(text) }
+                    dataIndex: 'salesmanName',
+                    key: 'salesmanName',
                 }
             ],
             dataSource: [],
@@ -199,7 +243,7 @@ const MySettlement=Form.create()(React.createClass({
         }.bind(this));
     },
     componentWillMount() {
-        this.loadData();
+        this.departmentList();
     },
     tableRowClick(record, index) {
     	this.state.userDetaile=true;
@@ -232,14 +276,13 @@ const MySettlement=Form.create()(React.createClass({
         this.contactList();
     },
     reset() {
-    	this.state.customerName='';
+    	this.state.buyerNameSearch='';
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
-		this.state.transactionProgress = undefined;
-		this.state.contractProgress = undefined;
-		this.state.projectProgress = undefined;
-		this.state.settlementState = undefined;
-		this.state.orderStatus = undefined;
+		this.state.orderChannelSearch = undefined;
+		this.state.liquidationStatusSearch = undefined;
+		this.state.salesmanNameSearch = undefined;
+		this.state.departmenttSearch = undefined;
 		this.state.approved = undefined;
 		this.state.orderChannel = undefined;
         this.loadData();       
@@ -259,6 +302,7 @@ const MySettlement=Form.create()(React.createClass({
 			   })
 			},
         };
+        let departmentArr = this.state.departmentArr || [];
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
         return (
@@ -267,60 +311,47 @@ const MySettlement=Form.create()(React.createClass({
                 	<span style={{fontSize:'16px'}}>我的结算订单</span>	
 	                <div className="user-search">
 	                    <Input placeholder="客户名称" style={{width:'150px'}}
-	                        value={this.state.customerName}
-	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
+	                        value={this.state.buyerNameSearch}
+	                        onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
 	                    <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 }); }} /> 
                         <Select placeholder="部门机构"
 	                        style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
-	                        value={this.state.orderStatus}
-	                        onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                        value={this.state.departmenttSearch}
+	                        onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
 	                        {
-	                            lvl.map(function (item) {
-	                                    return <Select.Option key={item.value} >{item.key}</Select.Option>
+	                            departmentArr.map(function (item) {
+	                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
 	                            })
 	                        }
                   		</Select>
                   		<Input placeholder="订单负责人" style={{width:'150px'}}
-	                        value={this.state.customerName}
-	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
+	                        value={this.state.salesmanNameSearch}
+	                        onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />
 	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
 	                    <Button onClick={this.reset}>重置</Button>
 	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
 	                </div>
 	                <div className='clearfix' style={{marginTop:'5px'}}>
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
-	                        <Select placeholder="订单状态"
-	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.orderStatus}
-	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
-	                            {
-                                    lvl.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
 	                        <Select placeholder="结算状态"
 	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.orderStatus}
-	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            value={this.state.liquidationStatusSearch}
+	                            onChange={(e) => { this.setState({ liquidationStatusSearch: e }) }}>
 	                            {
-                                    lvl.map(function (item) {
+                                    paymentState.map(function (item) {
                                             return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }
 	                        </Select>
-	                        <Select placeholder="订单渠道"
+	                        <Select placeholder="是否特批"
 	                            style={{ width: 150,marginRight:'10px' }}
-	                            value={this.state.orderChannel}
-	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
-	                            {
-                                    lvl.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
+	                            value={this.state.orderChannelSearch}
+	                            onChange={(e) => { this.setState({ orderChannelSearch: e }) }}>
+	                            <Select.Option value='0'>未特批</Select.Option>
+	                            <Select.Option value='1'>已特批</Select.Option>
 	                        </Select>
 	                    </div>
 	                </div>

+ 263 - 176
js/component/manageCenter/order/settlementOrder/managementDetaile.jsx

@@ -2,9 +2,8 @@ import React from 'react';
 import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import '../userMangagement.less';
-import {lvl} from '../../../dataDic.js';
-
+import '../../userMangagement.less';
+import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType} from '../../../../tools.js';
 //图片组件
 const PicturesWall = React.createClass({
     getInitialState() {
@@ -58,17 +57,19 @@ const PicturesWall = React.createClass({
     }
 });
 
-const ManagementDetaile = Form.create()(React.createClass({
-	loadData() {
+const MySettlementDetaile = Form.create()(React.createClass({
+	loadData(record) {
+        this.state.data = [];
         this.setState({
             loading: true
         });
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/roles',
+            url: globalConfig.context + '/api/admin/order/getOrderCommodity',
             data: {
+            	orderNo:record?record.orderNo:this.props.datauser.orderNo
             },
             success: function (data) {
                 let theArr = [];
@@ -77,10 +78,22 @@ const ManagementDetaile = Form.create()(React.createClass({
                         message.warning(data.error[0].message);
                     };
                 } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
+                    for (let i = 0; i < data.data.length; i++) {
+                        let thisdata = data.data[i];
                         theArr.push({
                              key: i,
+                             id:thisdata.id,
+                             orderNo:thisdata.orderNo,
+                             commodityName:thisdata.commodityName,
+                             commodityType:thisdata.commodityType,
+                             commodityMode:thisdata.commodityMode,
+                             commodityQuantity:thisdata.commodityQuantity,
+                             commodityPrice:thisdata.commodityPrice,
+                             discountPrice:thisdata.discountPrice,
+                             commodityFirstPayment:thisdata.commodityFirstPayment,
+                             createTimes:thisdata.createTimes,
+                             discountFirstPayment:thisdata.discountFirstPayment,
+                             remarks:thisdata.remarks,
                         });
                     };
                    }
@@ -95,55 +108,150 @@ const ManagementDetaile = Form.create()(React.createClass({
             });
         }.bind(this));
     },
+    //查看流失。项目列表
+    lookSee(state) {
+    	this.state.lookSource=[];
+        this.setState({
+            loading: true
+        });
+        let api=state?'/api/xiangmu':'/api/liushui'
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + api,
+            data: {
+            	orderNo:this.props.datauser.orderNo
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    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,
+                             commodityName:thisdata.commodityName,
+                             commodityType:thisdata.commodityType,
+                             commodityMode:thisdata.commodityMode,
+                             commodityQuantity:thisdata.commodityQuantity,
+                             commodityPrice:thisdata.commodityPrice,
+                             discountPrice:thisdata.discountPrice,
+                             commodityFirstPayment:thisdata.commodityFirstPayment,
+                             createTimes:thisdata.createTimes,
+                             discountFirstPayment:thisdata.discountFirstPayment,
+                             remarks:thisdata.remarks,
+                        });
+                    };
+                   }
+                this.setState({
+                    lookSource: theArr,
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
 	getInitialState() {
 		return {
 			loading: false,
 			visible: false,
+			contractState:false,
 			orgCodeUrl:[],
 			checkedKeys: [],
 			columns: [
 				{
                     title: '业务项目名称',
-                    dataIndex: 'roleName',
-                    key: 'roleName'
+                    dataIndex: 'commodityName',
+                    key: 'commodityName'
                 }, {
                     title: '项目类别',
-                    dataIndex: 'creater1',
-                    key: 'creater1'
+                    dataIndex: 'commodityType',
+                    key: 'commodityType',
+                    render:(text)=>{
+                    	return (getOrderType(text))
+                    }
                 },{
                     title: '项目数量',
-                    dataIndex: 'roleName2',
-                    key: 'roleName2'
+                    dataIndex: 'commodityQuantity',
+                    key: 'commodityQuantity'
                 }, {
                     title: '服务市价',
-                    dataIndex: 'creater2',
-                    key: 'creater2'
+                    dataIndex: 'commodityPrice',
+                    key: 'commodityPrice'
                 }, {
                     title: '实签价格',
-                    dataIndex: 'roleName3',
-                    key: 'roleName3'
+                    dataIndex: 'discountPrice',
+                    key: 'discountPrice'
                 }, {
                     title: '下单时间',
-                    dataIndex: 'creater4',
-                    key: 'creater4'
+                    dataIndex: 'createTimes',
+                    key: 'createTimes'
                 }, {
                     title: '项目说明',
-                    dataIndex: 'roleName5',
-                    key: 'roleName5'
+                    dataIndex: 'remarks',
+                    key: 'remarks',
+					render:(text)=>{
+						return (text&&text.length>8?text.substr(0,8)+'…':text)
+					}
                 }
+			],
+			projectList:[
+				{
+                    title: '项目名称',
+                    dataIndex: 'commodityName',
+                    key: 'commodityName'
+                }, {
+                    title: '项目类别',
+                    dataIndex: 'commodityType',
+                    key: 'commodityType',
+                    render:(text)=>{
+                    	return (getOrderType(text))
+                    }
+                },{
+                    title: '项目数量',
+                    dataIndex: 'commodityQuantity',
+                    key: 'commodityQuantity'
+                },
+			],
+			flowList:[
+				{
+                    title: '流水名称',
+                    dataIndex: 'commodityName',
+                    key: 'commodityName'
+                }, {
+                    title: '流水类别',
+                    dataIndex: 'commodityType',
+                    key: 'commodityType',
+                    render:(text)=>{
+                    	return (getOrderType(text))
+                    }
+                },{
+                    title: '流水数量',
+                    dataIndex: 'commodityQuantity',
+                    key: 'commodityQuantity'
+                },
 			]
 		};
 	},
 	//查看基本详情基本信息
     loaduser(record){
     	if(record){
+    	this.state.orderList=[]
     	$.ajax({
-            method: "post",
+            method: "get",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context + '/api/admin/role/rolePermission',
+			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
             data: {
-              id: record.id
+              orderNo: record.orderNo
             },
             success: function (data) {
                 let thisData = data.data;                
@@ -153,17 +261,20 @@ const ManagementDetaile = Form.create()(React.createClass({
                     };
                     thisData = {};
                 };
-                let idList=[];
-                thisData.map(function(item){
-                	idList.push(
-                		item.pid
-                	)
-                })
                 this.setState({
-					ids:record.id,
-                	roleName:thisData[0].rname,
-                	checkedKeys:idList,	
-                });                  
+					id:thisData.id,
+					orderList:thisData,
+					orderAmount:thisData.orderAmount,
+					firstPayment:thisData.firstPayment,
+					signTotalAmount:thisData.signTotalAmount,
+					signFirstPayment:thisData.signFirstPayment,
+					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
+					orderRemarks:thisData.orderRemarks,
+                    orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
+               		//签单
+               		orderNo:thisData.orderNo,//订单编号
+               		buyerName:thisData.buyerName,
+                });
             }.bind(this),
        }).always(function () {
             this.setState({            	
@@ -184,98 +295,45 @@ const ManagementDetaile = Form.create()(React.createClass({
 		});
 		this.props.closeDesc(false);
 	},
+	componentWillMount() {
+		
+	},
 	nextCancel() {
 		this.setState({
 			addnextVisible: false
 		})
 	},
-	//查看订单明细
-	orderDetails(record){
-		if(record){
-	    	$.ajax({
-	            method: "post",
-				dataType: "json",
-				crossDomain: false,
-				url: globalConfig.context + '/api/admin/role/rolePermission',
-	            data: {
-	              id: record.id
-	            },
-	            success: function (data) {
-	                let thisData = data.data;                
-	                if (!thisData) {
-	                    if (data.error && data.error.length) {
-	                        message.warning(data.error[0].message);
-	                    };
-	                    thisData = {};
-	                };
-	                let idList=[];
-	                thisData.map(function(item){
-	                	idList.push(
-	                		item.pid
-	                	)
-	                })
-	                this.setState({
-						ids:record.id,
-	                });                  
-	            }.bind(this),
-	       }).always(function () {
-	            this.setState({            	
-	                loading: false
-	            });
-	        }.bind(this));  
-	    }
+	//查看项目、查看流水
+	lookProject(){
+		this.setState({
+			lookState:true,
+			lookVisible:true,
+		})
+		this.lookSee(true)
 	},
-	//保存编辑
-	//新建订单、编辑订单保存
-	handleSubmit(e) {
-		e.preventDefault();
-//      if(this.state.orderType==undefined){
-//      	message.warning('请选择财务负责人');
-//      	return false;
-//      };
-		this.props.form.validateFields((err, values) => {
-			if(!err) {
-				this.setState({
-					loading: true
-				});
-				$.ajax({
-					method: "POST",
-					dataType: "json",
-					crossDomain: false,
-					url: globalConfig.context + 'api/baocuncaiwu',
-					data: {
-						id:this.props.datauser.id
-					}
-				}).done(function(data) {
-					this.setState({
-						loading: false
-					});
-					if(!data.error.length) {
-						message.success('保存成功!');
-						this.handleOk()
-					} else {
-						message.warning(data.error[0].message);
-					}
-				}.bind(this));
-			}
-		});
+	lookflow(){
+		this.setState({
+			lookState:false,
+			lookVisible:true,
+		})
+		this.lookSee(false)
+	},
+	lookCancel(){
+		this.setState({
+			lookVisible:false
+		})
 	},
 	tableRowClick(record, index) {
-        this.setState({
+       this.setState({
+        	editFw:record,
         	addnextVisible:true,
         });
-        this.orderDetails(record)
     },
-	componentWillMount() {
-		
-	},
 	componentWillReceiveProps(nextProps) { //props改变时触发
 		this.state.visible = nextProps.showDesc;
 		if(nextProps.userDetaile && nextProps.showDesc ) {
-			if(nextProps.datauser && nextProps.datauser.id ) {
-				this.loaduser(nextProps.datauser);
-				this.loadData();
-			}
+			this.loaduser(nextProps.datauser);
+			this.loadData(nextProps.datauser);
 		}
 	},
 	render() {
@@ -284,88 +342,85 @@ const ManagementDetaile = Form.create()(React.createClass({
 			labelCol: { span: 8 },
 			wrapperCol: { span: 14 },
 		};
+		const editFws=this.state.editFw || [];
 		const orderDetaiel=this.state.orderList || [];
-		const dataSources=this.state.customerArr || [];
-        const options = dataSources.map((group,index) =>
-				      <Option key={index} value={group.name}>{group.name}</Option>
-				     )
 		return(
 			<div>
             <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.handleOk} onCancel={this.handleCancel}
                         width='1000px'
-                        title='编辑订单'                     
+                        title='查看订单详情'                     
                         footer=''
                         className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} onSubmit={this.handleSubmit} >
+			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} >
 			                <Spin spinning={this.state.loading}>
 		                        <div className="clearfix">
 		                            <div className="clearfix">
 			                       		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="订单编号" >
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.orderNo}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="下单时间" >  
-				                            <span>{orderDetaiel.createTimez}</span>
+				                            <span>{orderDetaiel.createTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="客户名称" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.buyerName}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="订单类型" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{getOrderType(orderDetaiel.orderType)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="订单渠道" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="订单状态" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{getOrderState(orderDetaiel.orderStatus)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="已收款项" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.actuallyTotalAmount}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="结算状态" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价订单金额" >    
-			                            	<span>{orderDetaiel.roleName}</span>
+			                            	<span>{orderDetaiel.orderAmount}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="市价首款金额" >   
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.firstPayment}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签订单金额" >   
-					                            <span>{orderDetaiel.roleName}</span>
+					                            <span>{orderDetaiel.signTotalAmount}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="实签首款金额" >   
-					                            <span>{orderDetaiel.roleName}</span>
+					                            <span>{orderDetaiel.signFirstPayment}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="特批立项" >   
-					                            <span>{orderDetaiel.roleName}</span>
+					                            <span>{getApprovedState(orderDetaiel.approval)}</span>
 				                    		</FormItem>
 											<div className="clearfix">
 												<FormItem
@@ -394,7 +449,7 @@ const ManagementDetaile = Form.create()(React.createClass({
 										            labelCol={{ span: 4 }}
 										            wrapperCol={{ span: 16 }}
 										            label="订单留言" >
-									        		<span>{orderDetaiel.roleName}</span>
+									        		<span>{orderDetaiel.orderRemarks}</span>
 										        </FormItem>
 									        </div>
 								        </div>
@@ -403,35 +458,25 @@ const ManagementDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="订单负责人" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.salesmanName}</span>
 			                    		</FormItem>
 			                    	</div>
 			                    	<div className='clearfix'>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="意向时间" >  
-				                            <span>{orderDetaiel.createTimez}</span>
+				                            <span>{orderDetaiel.createTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="签单时间" >  
-				                            <span>{orderDetaiel.createTimez}</span>
+				                            <span>{orderDetaiel.signTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="财务负责人" >  
-									        {this.props.editState?
-									        <Select placeholder="请选择财务负责人"
-						                            style={{ width: 150 }}
-						                            value={this.state.orderStatus}
-						                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
-						                            {
-					                                    lvl.map(function (item) {
-					                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-					                                    })
-					                                }
-						                    </Select>:
-						                    <span>{orderDetaiel.createTimez}</span>}
+				                            <span>{orderDetaiel.financeName}</span>
+				                            <Button onClick={this.lookflow} style={{float:'right'}}>查看流水</Button>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
@@ -441,12 +486,13 @@ const ManagementDetaile = Form.create()(React.createClass({
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="项目负责人" >  
-				                            <span>{orderDetaiel.roleName}</span>
+				                            <span>{orderDetaiel.technicianName}</span>
+				                            <Button onClick={this.lookProject} style={{float:'right'}}>查看项目</Button>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="立项时间" >  
-				                            <span>{orderDetaiel.createTimez}</span>
+				                            <span>{orderDetaiel.setUpTime}</span>
 			                    		</FormItem>
 		                    		</div>
 					                <div>
@@ -461,10 +507,6 @@ const ManagementDetaile = Form.create()(React.createClass({
 					                            />
 					                    </Spin>
 						            </div>
-						            {this.props.editState?<div className='clearfix' style={{marginTop:'20px'}}>
-						            	 <Button className="setSave" type="primary" htmlType="submit">保存</Button> 
-				                         <Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
-						            </div>:''}
 			                    </div>
 			                </Spin>
 			            </Form >
@@ -478,31 +520,76 @@ const ManagementDetaile = Form.create()(React.createClass({
 			            <Form layout="horizontal" id="demand-form">
 			                <Spin spinning={this.state.loading}>
 		                        <div className="clearfix">
-	                        	    <FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="服务名称" >
-			                    			<span>{this.state.aaa}</span>
+	                        	   <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="服务名称" >
+		                    			<span>{editFws.commodityName}</span>
 			                    	</FormItem>
-			                    	<FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="市场价格" >
-			                    			<span>{this.state.aaa}</span>
+			                    	<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="市场价格" >
+		                    			<span>{editFws.commodityPrice}</span>
 			                    	</FormItem>
-			                    	<FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="实签价格" >
-			                    			<span>{this.state.aaa}</span>
+			                    	<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="实签价格" >
+		                    			<span>{editFws.discountPrice}</span>
 			                    	</FormItem>
-			                    	<FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="服务数量" >
-			                    			<span>{this.state.aaa}</span>
+			                    	<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="服务数量" >
+		                    			<span>{editFws.commodityQuantity}</span>
 			                    	</FormItem>
-			                    	<FormItem className="half-middle"
-				                            {...formItemLayout}
+			                    	 <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="商品规格" >   
+		                                <span>{editFws.commodityMode}</span>    
+				                    </FormItem>
+				                    <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="市场首付金额" >   
+		                                <span>{editFws.commodityFirstPayment}</span>    
+				                    </FormItem>
+				                    <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="签单首付金额" >   
+		                                <span>{editFws.discountFirstPayment}</span>    
+				                    </FormItem>
+				                    <div className='clearfix'>
+				                    	<FormItem 
+				                            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
 				                            label="服务说明" >
-			                    			<span>{this.state.aaa}</span>
-			                    	</FormItem>
+			                    			<span>{editFws.remarks}</span>
+				                    	</FormItem>
+			                    	</div>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+			         <Modal maskClosable={false} visible={this.state.lookVisible}
+                        onOk={this.lookCancel} onCancel={this.lookCancel}
+                        width='550px'
+                        title= {this.state.lookState?'查看项目':'查看流水'}                    
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	   {this.state.lookState?
+	                        	   		<div>
+	                        	   			<Table columns={this.state.projectList}
+						                           dataSource={this.state.lookSource}
+						                           pagination={false}
+				                             />
+	                        	   		
+	                        	   		</div>:
+	                        	   		<div>
+	                        	   			<Table columns={this.state.flowList}
+						                           dataSource={this.state.lookSource}
+						                           pagination={false}
+				                             />
+	                        	   		</div>}
 		                        </div>
 			                </Spin>
 			            </Form >
@@ -512,4 +599,4 @@ const ManagementDetaile = Form.create()(React.createClass({
 	}
 }));
 
-export default ManagementDetaile;
+export default MySettlementDetaile;

+ 0 - 462
js/component/manageCenter/order/settlementOrder/mySettlementDetaile.jsx

@@ -1,462 +0,0 @@
-import React from 'react';
-import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
-import ajax from 'jquery/src/ajax/xhr.js';
-import $ from 'jquery/src/ajax';
-import '../userMangagement.less';
-import {lvl} from '../../../dataDic.js';
-
-//图片组件
-const PicturesWall = React.createClass({
-    getInitialState() {
-        return {
-            previewVisible: false,
-            previewImage: '',
-            fileList: [],
-        }
-    },
-    handleCancel() {
-        this.setState({ previewVisible: false })
-    },
-    handlePreview(file) {
-        this.setState({
-            previewImage: file.url || file.thumbUrl,
-            previewVisible: true,
-        });
-    },
-    handleChange(info) {
-        let fileList = info.fileList;
-        this.setState({ fileList });
-        this.props.fileList(fileList);
-    },
-    componentWillReceiveProps(nextProps) {
-        this.state.fileList = nextProps.pictureUrl; 
-    },
-    render() {
-        const { previewVisible, previewImage, fileList } = this.state;
-        const uploadButton = (
-            <div>
-                <Icon type="plus" />
-                <div className="ant-upload-text">点击上传</div>
-            </div>
-        );
-        return (
-            <div style={{display:"inline-block"}}>
-                <Upload
-                    action={globalConfig.context + "/api/admin/superviser/uploadAdminImg"}
-                    data={{ 'sign': this.props.pictureSign }}
-                    listType="picture-card"
-                    fileList={fileList}
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {fileList.length >= 4 ? null : uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
-            </div>
-        );
-    }
-});
-
-const MySettlementDetaile = Form.create()(React.createClass({
-	loadData() {
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "post",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/roles',
-            data: {
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    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,
-                        });
-                    };
-                   }
-                this.setState({
-                    dataSource: theArr,
-                    pagination: false,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
-	getInitialState() {
-		return {
-			loading: false,
-			visible: false,
-			contractState:false,
-			orgCodeUrl:[],
-			checkedKeys: [],
-			columns: [
-				{
-                    title: '业务项目名称',
-                    dataIndex: 'roleName',
-                    key: 'roleName'
-                }, {
-                    title: '项目类别',
-                    dataIndex: 'creater1',
-                    key: 'creater1'
-                },{
-                    title: '项目数量',
-                    dataIndex: 'roleName2',
-                    key: 'roleName2'
-                }, {
-                    title: '服务市价',
-                    dataIndex: 'creater2',
-                    key: 'creater2'
-                }, {
-                    title: '实签价格',
-                    dataIndex: 'roleName3',
-                    key: 'roleName3'
-                }, {
-                    title: '下单时间',
-                    dataIndex: 'creater4',
-                    key: 'creater4'
-                }, {
-                    title: '项目说明',
-                    dataIndex: 'roleName5',
-                    key: 'roleName5'
-                }
-			]
-		};
-	},
-	//查看基本详情基本信息
-    loaduser(record){
-    	if(record){
-    	$.ajax({
-            method: "post",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + '/api/admin/role/rolePermission',
-            data: {
-              id: record.id
-            },
-            success: function (data) {
-                let thisData = data.data;                
-                if (!thisData) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                    thisData = {};
-                };
-                let idList=[];
-                thisData.map(function(item){
-                	idList.push(
-                		item.pid
-                	)
-                })
-                this.setState({
-					ids:record.id,
-                	roleName:thisData[0].rname,
-                	checkedKeys:idList,	
-                });                  
-            }.bind(this),
-       }).always(function () {
-            this.setState({            	
-                loading: false
-            });
-        }.bind(this));  
-       }
-    },
-	handleOk(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false, true);
-	},
-	handleCancel(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false);
-	},
-	componentWillMount() {
-		
-	},
-	nextCancel() {
-		this.setState({
-			addnextVisible: false
-		})
-	},
-	//查看订单明细
-	orderDetails(record){
-		if(record){
-	    	$.ajax({
-	            method: "post",
-				dataType: "json",
-				crossDomain: false,
-				url: globalConfig.context + '/api/admin/role/rolePermission',
-	            data: {
-	              id: record.id
-	            },
-	            success: function (data) {
-	                let thisData = data.data;                
-	                if (!thisData) {
-	                    if (data.error && data.error.length) {
-	                        message.warning(data.error[0].message);
-	                    };
-	                    thisData = {};
-	                };
-	                let idList=[];
-	                thisData.map(function(item){
-	                	idList.push(
-	                		item.pid
-	                	)
-	                })
-	                this.setState({
-						ids:record.id,
-	                });                  
-	            }.bind(this),
-	       }).always(function () {
-	            this.setState({            	
-	                loading: false
-	            });
-	        }.bind(this));  
-	    }
-	},
-	tableRowClick(record, index) {
-        this.setState({
-        	addnextVisible:true,
-        });
-        this.orderDetails(record)
-    },
-	componentWillReceiveProps(nextProps) { //props改变时触发
-		this.state.visible = nextProps.showDesc;
-		if(nextProps.userDetaile && nextProps.showDesc ) {
-			if(nextProps.datauser && nextProps.datauser.id ) {
-				this.loaduser(nextProps.datauser);
-				this.loadData();
-			}
-		}
-	},
-	render() {
-		const FormItem = Form.Item
-		const formItemLayout = {
-			labelCol: { span: 8 },
-			wrapperCol: { span: 14 },
-		};
-		const orderDetaiel=this.state.orderList || [];
-		return(
-			<div>
-            <Modal maskClosable={false} visible={this.state.visible}
-                    onOk={this.handleOk} onCancel={this.handleCancel}
-                    width='1000px'
-                    title='编辑订单'                     
-                    footer=''
-                    className="admin-desc-content">
-		            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} >
-		                <Spin spinning={this.state.loading}>
-	                        <div className="clearfix">
-	                            <div className="clearfix">
-		                       		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="订单编号" >
-			                            <span>{orderDetaiel.roleName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="下单时间" >  
-			                            <span>{orderDetaiel.createTimez}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="客户名称" >  
-			                            <span>{orderDetaiel.roleName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="订单类型" >  
-			                            <span>{orderDetaiel.roleName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="订单渠道" >  
-			                            <span>{orderDetaiel.roleName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="订单状态" >  
-			                            <span>{orderDetaiel.roleName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="已收款项" >  
-			                            <span>{orderDetaiel.roleName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="结算状态" >  
-			                            <span>{orderDetaiel.roleName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="市价订单金额" >    
-		                            	<span>{orderDetaiel.roleName}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="市价首款金额" >   
-			                            <span>{orderDetaiel.roleName}</span>
-				                    </FormItem>
-				                    <div className='clearfix'>
-							        	<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="实签订单金额" >   
-				                            <span>{orderDetaiel.roleName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="实签首款金额" >   
-				                            <span>{orderDetaiel.roleName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="特批立项" >   
-				                            <span>{orderDetaiel.roleName}</span>
-			                    		</FormItem>
-										<div className="clearfix">
-											<FormItem
-						                        labelCol={{ span: 4 }}
-						                        wrapperCol={{ span: 18 }}
-						                        label="合同扫描件" >
-					                            <Upload className="demandDetailShow-upload"
-					                                listType="customer_sys_file"
-					                                fileList={this.state.orgCodeUrl}
-					                                onPreview={(file) => {
-					                                    this.setState({
-					                                        previewImage: file.url || file.thumbUrl,
-					                                        previewVisible: true,
-					                                    });
-					                                }} >
-					                            </Upload>
-					                            <Modal maskClosable={false} footer={null}
-					                                visible={this.state.previewVisible}
-					                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-					                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
-					                            </Modal>
-					                        </FormItem>    
-				                        </div>
-				                        <div className='clearfix'>
-								        	<FormItem
-									            labelCol={{ span: 4 }}
-									            wrapperCol={{ span: 16 }}
-									            label="订单留言" >
-								        		<span>{orderDetaiel.roleName}</span>
-									        </FormItem>
-								        </div>
-							        </div>
-		                        </div>
-		                        <div className='clearfix'>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="订单负责人" >  
-			                            <span>{orderDetaiel.roleName}</span>
-		                    		</FormItem>
-		                    	</div>
-		                    	<div className='clearfix'>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="意向时间" >  
-			                            <span>{orderDetaiel.createTimez}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单时间" >  
-			                            <span>{orderDetaiel.createTimez}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="财务负责人" >  
-			                            <span>{orderDetaiel.createTimez}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="首付时间" >  
-			                            <span>{orderDetaiel.createTimez}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="项目负责人" >  
-			                            <span>{orderDetaiel.roleName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="立项时间" >  
-			                            <span>{orderDetaiel.createTimez}</span>
-		                    		</FormItem>
-	                    		</div>
-				                <div>
-				                	<span style={{marginLeft:'50px',fontSize:'20px'}}>订单明细</span>
-				                </div>
-				                <div className="patent-table">
-				                    <Spin spinning={this.state.loading}>
-				                        <Table columns={this.state.columns}
-				                            dataSource={this.state.dataSource}
-				                            pagination={this.state.pagination}
-				                            onRowClick={this.tableRowClick} 
-				                            />
-				                    </Spin>
-					            </div>
-		                    </div>
-		                </Spin>
-		            </Form >
-		        </Modal>
-		        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='550px'
-                        title='查看订单明细服务'                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-	                        	    <FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="服务名称" >
-			                    			<span>{this.state.aaa}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="市场价格" >
-			                    			<span>{this.state.aaa}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="实签价格" >
-			                    			<span>{this.state.aaa}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="服务数量" >
-			                    			<span>{this.state.aaa}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-middle"
-				                            {...formItemLayout}
-				                            label="服务说明" >
-			                    			<span>{this.state.aaa}</span>
-			                    	</FormItem>
-		                        </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-    	    </div>
-		)
-	}
-}));
-
-export default MySettlementDetaile;

+ 599 - 0
js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx

@@ -0,0 +1,599 @@
+import React from 'react';
+import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import '../../userMangagement.less';
+import {lvl} from '../../../../dataDic.js';
+import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType} from '../../../../tools.js';
+
+//图片组件
+const PicturesWall = React.createClass({
+    getInitialState() {
+        return {
+            previewVisible: false,
+            previewImage: '',
+            fileList: [],
+        }
+    },
+    handleCancel() {
+        this.setState({ previewVisible: false })
+    },
+    handlePreview(file) {
+        this.setState({
+            previewImage: file.url || file.thumbUrl,
+            previewVisible: true,
+        });
+    },
+    handleChange(info) {
+        let fileList = info.fileList;
+        this.setState({ fileList });
+        this.props.fileList(fileList);
+    },
+    componentWillReceiveProps(nextProps) {
+        this.state.fileList = nextProps.pictureUrl; 
+    },
+    render() {
+        const { previewVisible, previewImage, fileList } = this.state;
+        const uploadButton = (
+            <div>
+                <Icon type="plus" />
+                <div className="ant-upload-text">点击上传</div>
+            </div>
+        );
+        return (
+            <div style={{display:"inline-block"}}>
+                <Upload
+                    action={globalConfig.context + "/api/admin/superviser/uploadAdminImg"}
+                    data={{ 'sign': this.props.pictureSign }}
+                    listType="picture-card"
+                    fileList={fileList}
+                    onPreview={this.handlePreview}
+                    onChange={this.handleChange} >
+                    {fileList.length >= 4 ? null : uploadButton}
+                </Upload>
+                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
+                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
+                </Modal>
+            </div>
+        );
+    }
+});
+
+const ManagementDetaile = Form.create()(React.createClass({
+	loadData(record) {
+        this.state.data = [];
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/order/getOrderCommodity',
+            data: {
+            	orderNo:record?record.orderNo:this.props.datauser.orderNo
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    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,
+                             commodityName:thisdata.commodityName,
+                             commodityType:thisdata.commodityType,
+                             commodityMode:thisdata.commodityMode,
+                             commodityQuantity:thisdata.commodityQuantity,
+                             commodityPrice:thisdata.commodityPrice,
+                             discountPrice:thisdata.discountPrice,
+                             commodityFirstPayment:thisdata.commodityFirstPayment,
+                             createTimes:thisdata.createTimes,
+                             discountFirstPayment:thisdata.discountFirstPayment,
+                             remarks:thisdata.remarks,
+                        });
+                    };
+                   }
+                this.setState({
+                    dataSource: theArr,
+                    pagination: false,
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    //查看流失。项目列表
+    lookSee(state) {
+    	this.state.lookSource=[];
+        this.setState({
+            loading: true
+        });
+        let api=state?'/api/xiangmu':'/api/liushui'
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + api,
+            data: {
+            	orderNo:this.props.datauser.orderNo
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    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,
+                             commodityName:thisdata.commodityName,
+                             commodityType:thisdata.commodityType,
+                             commodityMode:thisdata.commodityMode,
+                             commodityQuantity:thisdata.commodityQuantity,
+                             commodityPrice:thisdata.commodityPrice,
+                             discountPrice:thisdata.discountPrice,
+                             commodityFirstPayment:thisdata.commodityFirstPayment,
+                             createTimes:thisdata.createTimes,
+                             discountFirstPayment:thisdata.discountFirstPayment,
+                             remarks:thisdata.remarks,
+                        });
+                    };
+                   }
+                this.setState({
+                    lookSource: theArr,
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+			lookState:true,
+			orgCodeUrl:[],
+			checkedKeys: [],
+			columns: [
+				{
+                    title: '业务项目名称',
+                    dataIndex: 'commodityName',
+                    key: 'commodityName'
+                }, {
+                    title: '项目类别',
+                    dataIndex: 'commodityType',
+                    key: 'commodityType',
+                    render:(text)=>{
+                    	return (getOrderType(text))
+                    }
+                },{
+                    title: '项目数量',
+                    dataIndex: 'commodityQuantity',
+                    key: 'commodityQuantity'
+                }, {
+                    title: '服务市价',
+                    dataIndex: 'commodityPrice',
+                    key: 'commodityPrice'
+                }, {
+                    title: '实签价格',
+                    dataIndex: 'discountPrice',
+                    key: 'discountPrice'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'createTimes',
+                    key: 'createTimes'
+                }, {
+                    title: '项目说明',
+                    dataIndex: 'remarks',
+                    key: 'remarks',
+					render:(text)=>{
+						return (text&&text.length>8?text.substr(0,8)+'…':text)
+					}
+                }
+			],
+			projectList:[
+				{
+                    title: '项目名称',
+                    dataIndex: 'commodityName',
+                    key: 'commodityName'
+                }, {
+                    title: '项目类别',
+                    dataIndex: 'commodityType',
+                    key: 'commodityType',
+                    render:(text)=>{
+                    	return (getOrderType(text))
+                    }
+                },{
+                    title: '项目数量',
+                    dataIndex: 'commodityQuantity',
+                    key: 'commodityQuantity'
+                },
+			],
+			flowList:[
+				{
+                    title: '流水名称',
+                    dataIndex: 'commodityName',
+                    key: 'commodityName'
+                }, {
+                    title: '流水类别',
+                    dataIndex: 'commodityType',
+                    key: 'commodityType',
+                    render:(text)=>{
+                    	return (getOrderType(text))
+                    }
+                },{
+                    title: '流水数量',
+                    dataIndex: 'commodityQuantity',
+                    key: 'commodityQuantity'
+                },
+			]
+		};
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+    	this.state.orderList=[]
+    	$.ajax({
+            method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
+            data: {
+              orderNo: record.orderNo
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                this.setState({
+					id:thisData.id,
+					orderList:thisData,
+					orderAmount:thisData.orderAmount,
+					firstPayment:thisData.firstPayment,
+					signTotalAmount:thisData.signTotalAmount,
+					signFirstPayment:thisData.signFirstPayment,
+					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
+					orderRemarks:thisData.orderRemarks,
+                    orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
+               		//签单
+               		orderNo:thisData.orderNo,//订单编号
+               		buyerName:thisData.buyerName,
+                });
+            }.bind(this),
+       }).always(function () {
+            this.setState({            	
+                loading: false
+            });
+        }.bind(this));  
+       }
+    },
+	handleOk(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false, true);
+	},
+	handleCancel(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false);
+	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//查看项目、查看流水
+	lookProject(){
+		this.setState({
+			lookState:true,
+			lookVisible:true,
+		})
+		this.lookSee(true)
+	},
+	lookflow(){
+		this.setState({
+			lookState:false,
+			lookVisible:true,
+		})
+		this.lookSee(false)
+	},
+	lookCancel(){
+		this.setState({
+			lookVisible:false
+		})
+	},
+	tableRowClick(record, index) {
+       this.setState({
+        	editFw:record,
+        	addnextVisible:true,
+        });
+    },
+	componentWillMount() {
+		
+	},
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.visible = nextProps.showDesc;
+		if(nextProps.userDetaile && nextProps.showDesc ) {
+			this.loaduser(nextProps.datauser);
+			this.loadData(nextProps.datauser);
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		const editFws=this.state.editFw || [];
+		const orderDetaiel=this.state.orderList || [];
+		return(
+			<div>
+            <Modal maskClosable={false} visible={this.state.visible}
+                        onOk={this.handleOk} onCancel={this.handleCancel}
+                        width='1000px'
+                        title='订单详情'                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}  >
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+		                            <div className="clearfix">
+			                       		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单编号" >
+				                            <span>{orderDetaiel.orderNo}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="下单时间" >  
+				                            <span>{orderDetaiel.createTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="客户名称" >  
+				                            <span>{orderDetaiel.buyerName}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单类型" >  
+				                            <span>{getOrderType(orderDetaiel.orderType)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单渠道" >  
+				                            <span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单状态" >  
+				                            <span>{getOrderState(orderDetaiel.orderStatus)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="已收款项" >  
+				                            <span>{orderDetaiel.actuallyTotalAmount}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="结算状态" >  
+				                            <span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价订单金额" >    
+			                            	<span>{orderDetaiel.orderAmount}</span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="市价首款金额" >   
+				                            <span>{orderDetaiel.firstPayment}</span>
+					                    </FormItem>
+					                    <div className='clearfix'>
+								        	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签订单金额" >   
+					                            <span>{orderDetaiel.signTotalAmount}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="实签首款金额" >   
+					                            <span>{orderDetaiel.signFirstPayment}</span>
+				                    		</FormItem>
+				                    		<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="特批立项" >   
+					                            <span>{getApprovedState(orderDetaiel.approval)}</span>
+				                    		</FormItem>
+											<div className="clearfix">
+												<FormItem
+							                        labelCol={{ span: 4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="合同扫描件" >
+						                            <Upload className="demandDetailShow-upload"
+						                                listType="customer_sys_file"
+						                                fileList={this.state.orgCodeUrl}
+						                                onPreview={(file) => {
+						                                    this.setState({
+						                                        previewImage: file.url || file.thumbUrl,
+						                                        previewVisible: true,
+						                                    });
+						                                }} >
+						                            </Upload>
+						                            <Modal maskClosable={false} footer={null}
+						                                visible={this.state.previewVisible}
+						                                onCancel={() => { this.setState({ previewVisible: false }) }}>
+						                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
+						                            </Modal>
+						                        </FormItem>    
+					                        </div>
+					                        <div className='clearfix'>
+									        	<FormItem
+										            labelCol={{ span: 4 }}
+										            wrapperCol={{ span: 16 }}
+										            label="订单留言" >
+									        		<span>{orderDetaiel.orderRemarks}</span>
+										        </FormItem>
+									        </div>
+								        </div>
+			                        </div>
+			                        <div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="订单负责人" >  
+				                            <span>{orderDetaiel.salesmanName}</span>
+			                    		</FormItem>
+			                    	</div>
+			                    	<div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="意向时间" >  
+				                            <span>{orderDetaiel.createTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="签单时间" >  
+				                            <span>{orderDetaiel.signTime}</span>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="财务负责人" >  
+						                    <span>{orderDetaiel.financeName}</span>
+						                    <Button onClick={this.lookflow} style={{float:'right'}}>查看流水</Button>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="项目负责人" >  
+				                            <span>{orderDetaiel.technicianName}</span>
+				                            <Button onClick={this.lookProject} style={{float:'right'}}>查看项目</Button>
+			                    		</FormItem>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="立项时间" >  
+				                            <span>{orderDetaiel.setUpTime}</span>
+			                    		</FormItem>
+		                    		</div>
+					                <div>
+					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>订单明细</span>
+					                </div>
+					                <div className="patent-table">
+					                    <Spin spinning={this.state.loading}>
+					                        <Table columns={this.state.columns}
+					                            dataSource={this.state.dataSource}
+					                            pagination={this.state.pagination}
+					                            onRowClick={this.tableRowClick} 
+					                            />
+					                    </Spin>
+						            </div>
+			                    </div>
+			                </Spin>
+			            </Form >
+			        </Modal> 
+			        <Modal maskClosable={false} visible={this.state.addnextVisible}
+                        onOk={this.nextCancel} onCancel={this.nextCancel}
+                        width='550px'
+                        title='查看订单明细服务'                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	   <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="服务名称" >
+		                    			<span>{editFws.commodityName}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="市场价格" >
+		                    			<span>{editFws.commodityPrice}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="实签价格" >
+		                    			<span>{editFws.discountPrice}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="服务数量" >
+		                    			<span>{editFws.commodityQuantity}</span>
+			                    	</FormItem>
+			                    	 <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="商品规格" >   
+		                                <span>{editFws.commodityMode}</span>    
+				                    </FormItem>
+				                    <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="市场首付金额" >   
+		                                <span>{editFws.commodityFirstPayment}</span>    
+				                    </FormItem>
+				                    <FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="签单首付金额" >   
+		                                <span>{editFws.discountFirstPayment}</span>    
+				                    </FormItem>
+				                    <div className='clearfix'>
+				                    	<FormItem 
+				                            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+				                            label="服务说明" >
+			                    			<span>{editFws.remarks}</span>
+				                    	</FormItem>
+			                    	</div>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+			        <Modal maskClosable={false} visible={this.state.lookVisible}
+                        onOk={this.lookCancel} onCancel={this.lookCancel}
+                        width='550px'
+                        title= {this.state.lookState?'查看项目':'查看流水'}                    
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	   {this.state.lookState?
+	                        	   		<div>
+	                        	   			<Table columns={this.state.projectList}
+						                           dataSource={this.state.lookSource}
+						                           pagination={false}
+				                             />
+	                        	   		
+	                        	   		</div>:
+	                        	   		<div>
+	                        	   			<Table columns={this.state.flowList}
+						                           dataSource={this.state.lookSource}
+						                           pagination={false}
+				                             />
+	                        	   		</div>}
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+    	    </div>
+		)
+	}
+}));
+
+export default ManagementDetaile;

+ 199 - 143
js/component/manageCenter/order/settlementOrder/settlementManagement.jsx

@@ -1,3 +1,4 @@
+"use strict";
 import React from 'react';
 import ReactDom from 'react-dom';
 import ajax from 'jquery/src/ajax/xhr.js';
@@ -5,35 +6,42 @@ import $ from 'jquery/src/ajax';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload ,Popconfirm} from 'antd';
 import ManagementDetaile from "./managementDetaile.jsx";
 import moment from 'moment';
-import '../userMangagement.less';
-import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
-import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../tools.js';
+import '../../userMangagement.less';
+import {orderState,orderChannel,orderType} from '../../../../dataDic.js';
+import {getProjectState,getOrderChannel,getOrderType,getOrderState,getPaymentState} from '../../../../tools.js';
 
-console.log(adminData.name)
 const SettlementManage=Form.create()(React.createClass({
-	loadData(pageNo) {
+	loadData(pageNo,depart) {
         this.state.data = [];
         this.setState({
             loading: true
         });
+        let departArr=depart!=undefined?depart:this.state.departmentArr;
+        let depIdList=[];
+        if(this.state.departmenttSearch==undefined){
+        	departArr.map(function(item){
+        		depIdList.push(item.id)
+        	})
+        }
+        let depNoList=depIdList.join(',');
         $.ajax({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/roles',
+            url: globalConfig.context + '/api/admin/order/listAllSettlement',
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                customerName:this.state.customerName,
+                buyerName:this.state.buyerNameSearch,
+                depIds:this.state.departmenttSearch==undefined?depNoList:this.state.departmenttSearch,//部门
+                salesmanName:this.state.salesmanNameSearch,//负责人
                 startDate: this.state.releaseDate[0],
 				endDate: this.state.releaseDate[1],
-				transactionProgress:this.state.transactionProgress,
-				contractProgress:this.state.contractProgress,
-				projectProgress:this.state.projectProgress,
-				settlementState:this.state.settlementState,
-				orderStatus:this.state.orderStatus,
-				approved:this.state.approved,
-				orderChannel:this.state.orderChannel
+				liquidationStatus:this.state.liquidationStatusSearch, //结算
+				orderStatus:this.state.orderStatusSearch,
+				orderChannel:this.state.orderChannelSearch,
+				financeName:this.state.financeNameSearch,
+				orderType:this.state.orderTypeSearch
             },
             success: function (data) {
                 let theArr = [];
@@ -47,9 +55,22 @@ const SettlementManage=Form.create()(React.createClass({
                         theArr.push({
                              key: i,
 	                         id: thisdata.id,
-	                         roleName: thisdata.roleName,
-	                         creater:thisdata.creater,
-	                         createTime:thisdata.createTimez,
+	                         orderNo: thisdata.orderNo,//订单编号
+	                         orderType:thisdata.orderType,//订单类型
+	                         orderStatus:thisdata.orderStatus,
+	                         liquidationStatus:thisdata.liquidationStatus,
+	                         createTime:thisdata.createTime,
+	                         buyerName:thisdata.buyerName,
+	                         signTotalAmount:thisdata.signTotalAmount,
+	                         projectStage:thisdata.projectStage,
+	                         approval:thisdata.approval,
+	                         orderChannel:thisdata.orderChannel,
+	                         salesmanName:thisdata.salesmanName,
+	                         active:thisdata.active,
+	                         departmentName:thisdata.departmentName,
+	                         salesmanName:thisdata.salesmanName,
+	                         financeName:thisdata.financeName,
+	                         technicianName:thisdata.technicianName,
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -60,9 +81,11 @@ const SettlementManage=Form.create()(React.createClass({
 					this.state.pagination.total=0
 				}
                 this.setState({
+                	pageNo:pageNo,
                     dataSource: theArr,
                     pagination: this.state.pagination,
-                    selectedRowKeys:[]
+                    selectedRowKeys:[],
+                    signBillVisible:false
                 });
             }.bind(this),
         }).always(function () {
@@ -71,15 +94,56 @@ const SettlementManage=Form.create()(React.createClass({
             });
         }.bind(this));
     },
+    //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			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,
+				})
+				this.loadData('1',theArr);
+			}.bind(this),
+			}).always(function() {
+				this.setState({
+					loading: false
+				});
+			}.bind(this));
+	},
     getInitialState() {
         return {
         	datauser:{},
             selectedRowKeys: [],
             releaseDate: [],
             selectedRows: [],
+            departmentArr:[],
             searchMore: true,
             loading: false,
-            editState:false,
             distributionVisible:false,
             visible:false,
             showDesc:false,
@@ -110,74 +174,71 @@ const SettlementManage=Form.create()(React.createClass({
             columns: [
                 {
                     title: '订单编号',
-                    dataIndex: 'roleName',
-                    key: 'roleName'
+                    dataIndex: 'orderNo',
+                    key: 'orderNo'
                 }, {
                     title: '订单类型',
-                    dataIndex: 'creater',
-                    key: 'creater'
+                    dataIndex: 'orderType',
+                    key: 'orderType',
+                    render:text=>{return getOrderType(text)}
                 }, {
                     title: '下单时间',
-                    dataIndex: 'creater7',
-                    key: 'creater7'
+                    dataIndex: 'createTime',
+                    key: 'createTime'
                 },{
                     title: '订单客户',
-                    dataIndex: 'roleName1',
-                    key: 'roleName1'
+                    dataIndex: 'buyerName',
+                    key: 'buyerName',
+                    render:(text)=>{
+                    	return (text.length>9?text.substr(0,9)+'...':text)
+                    }
                 }, {
                     title: '实际下单金额',
-                    dataIndex: 'creater1',
-                    key: 'creater1'
+                    dataIndex: 'signTotalAmount',
+                    key: 'signTotalAmount'
                 }, {
                     title: '订单状态',
-                    dataIndex: 'createTime1',
-                    key: 'createTime1',
-                    render:(text)=>{return getIntentProgress(text) }
+                    dataIndex: 'orderStatus',
+                    key: 'orderStatus',
+                    render:(text)=>{return getOrderState(text) }
                 },{
                     title: '结算状态',
-                    dataIndex: 'roleName2',
-                    key: 'roleName2',
-                    render:(text)=>{return getTransactionProgress(text) }
+                    dataIndex: 'liquidationStatus',
+                    key: 'liquidationStatus',
+                    render:text=>{return getPaymentState(text)}
                 }, {
                     title: '项目状态',
-                    dataIndex: 'creater2',
-                    key: 'creater2',
-                    render:(text)=>{return getContractProgress(text) }
+                    dataIndex: 'projectStage',
+                    key: 'projectStage',
+                    render:text=>{return getProjectState(text)}
                 }, {
                     title: '是否特批',
-                    dataIndex: 'creatu',
-                    key: 'creatu',
-                    render:(text)=>{return getProjectProgress(text) }
+                   dataIndex: 'approval',
+                    key: 'approval',
+                    render:text=>{return text?'已特批':'未特批'}
                 },{
                     title: '订单部门',
-                    dataIndex: 'cre1',
-                    key: 'cre1',
-                    render:(text)=>{return getProjectProgress(text) }
+                    dataIndex: 'departmentName',
+                    key: 'departmentName',
                 },{
                     title: '订单负责人',
-                    dataIndex: 'cre2',
-                    key: 'cre2',
-                    render:(text)=>{return getProjectProgress(text) }
+                    dataIndex: 'salesmanName',
+                    key: 'salesmanName',
                 },{
                     title: '财务负责人',
-                    dataIndex: 'cre3',
-                    key: 'cre3',
-                    render:(text)=>{return getProjectProgress(text) }
+                    dataIndex: 'financeName',
+                    key: 'financeName',
                 },{
                     title: '项目负责人',
-                    dataIndex: 'cre4',
-                    key: 'cre4',
-                    render:(text)=>{return getProjectProgress(text) }
+                    dataIndex: 'technicianName',
+                    key: 'technicianName',
                 },{
                     title: '操作',
                     dataIndex: 'operation',
                     key: 'operation',
                     render: (text, record, index) => {
 						return <div>
-							    	<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">派单</Button>                 
-                        	   		<Popconfirm title={'订单结算编辑用于特殊情况下处理订单结算状态,请慎用!'} onConfirm={(e)=>{this.edit(record)}} okText="知悉,去编辑" cancelText="暂不编辑">
-									    <Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation() }}>编辑</Button>                 
-									</Popconfirm>
+							    	{!record.financeName&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">派单</Button>}                
                         	   </div>
 					}
                 }
@@ -185,31 +246,31 @@ const SettlementManage=Form.create()(React.createClass({
             userList:[
             	{
                     title: '用户编号',
-                    dataIndex: 'roleName',
-                    key: 'roleName'
+                    dataIndex: 'userNo',
+                    key: 'userNo'
                 }, {
                     title: '用户姓名',
-                    dataIndex: 'creater',
-                    key: 'creater'
+                    dataIndex: 'name',
+                    key: 'name'
                 },{
                     title: '部门机构',
-                    dataIndex: 'roleName1',
-                    key: 'roleName1'
+                    dataIndex: 'departmentName',
+                    key: 'departmentName'
                 }, {
                     title: '职务',
-                    dataIndex: 'creater1',
-                    key: 'creater1'
+                    dataIndex: 'position',
+                    key: 'position'
                 },{
                     title: '联系手机',
-                    dataIndex: 'roleName2',
-                    key: 'roleName2'
+                    dataIndex: 'mobile',
+                    key: 'mobile'
                 }, {
                     title: '操作',
                     dataIndex: 'abc',
                     key: 'abc',
                     render:(text,record,index)=>{
                     	return (
-                    	    <Popconfirm title={'您确认将此订单 【'+ record.roleName+'】 分配给【'+record.roleName+'-'+record.roleName+'】进行业务跟进?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
+                    	    <Popconfirm title={'您确认将订单 【'+ this.state.orderNot+'】 分配给【'+record.departmentName+'-'+record.name+'】进行业务跟进?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
 							    <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
 							</Popconfirm>
 							)
@@ -222,10 +283,10 @@ const SettlementManage=Form.create()(React.createClass({
     //操作分配
     confirmDelet(index){
     	this.setState({
+    		orderNot:index.orderNo,
     		userDetaile:false,
     		distributionVisible:true
     	});
-    	this.contactList(1,index.id)
     },
     distributionCancel(){
     	this.setState({
@@ -238,15 +299,17 @@ const SettlementManage=Form.create()(React.createClass({
     	})
     },
     //分配对象列表
-    contactList(pageNo,orderId){
+    contactList(pageNo){
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/roles',
+            url: globalConfig.context + '/api/admin/superviser/adminList',
             data: {
                 pageNo: pageNo || 1,
-                pageSize: this.state.distributionPagination.pageSize,
+                pageSize: 99,
+                departmentId:this.state.departmenttList,
+                name:this.state.financeNameSearch,
             },
             success: function (data) {
                 let theArr = [];
@@ -260,22 +323,20 @@ const SettlementManage=Form.create()(React.createClass({
                         theArr.push({
                              key: i,
 	                         id: thisdata.id,
-	                         roleName: thisdata.roleName,
-	                         creater:thisdata.creater,
-	                         createTime:thisdata.createTimez,
-	                         uid:orderId,
+	                         userNo: thisdata.userNo,
+	                         name:thisdata.name,
+	                         departmentName:thisdata.departmentName,
+	                         departmentId:thisdata.departmentId,
+	                         position:thisdata.position,
+	                         mobile:thisdata.mobile,
                         });
                     };
-                    this.state.distributionPagination.current = data.data.pageNo;
-                    this.state.distributionPagination.total = data.data.totalCount;
+                  
                 };
-                if(!data.data.list.length){
-					this.state.distributionPagination.current=0
-					this.state.distributionPagination.total=0
-				}
+               
                 this.setState({
                     distributionList: theArr,
-                    pagination: this.state.distributionPagination,
+                    pagination:false,
                 });
             }.bind(this),
         }).always(function () {
@@ -293,14 +354,14 @@ const SettlementManage=Form.create()(React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "",
+            url: globalConfig.context + "/api/admin/order/distributionOrder",
             data: {
-            	id:record.id,
-            	uid:record.uid
+            	orderNo:this.state.orderNot,
+            	financeId:record.id
             }
         }).done(function (data) {
             if (!data.error.length) {
-                message.success('分配成功');
+                message.success('分派成功!');
                 this.setState({
                     loading: false,
                 });
@@ -308,26 +369,16 @@ const SettlementManage=Form.create()(React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.pageNo);
         }.bind(this));
     },
-    //取编辑
-    edit(record){
-    	this.setState({
-            showDesc: true,
-            userDetaile:true,
-            datauser:record,
-            editState:true
-        });
-    },
     componentWillMount() {
-        this.loadData();
+        this.departmentList();
     },
     tableRowClick(record, index) {
     	this.state.userDetaile=true;
         this.state.datauser = record;
         this.setState({
-        	editState:false,
             showDesc: true
         });
     },
@@ -335,7 +386,7 @@ const SettlementManage=Form.create()(React.createClass({
     	this.state.userDetaile=false;
         this.state.showDesc = e;
         if (s) {
-            this.loadData();
+            this.loadData(this.state.pageNo);
         };
     },
     searchSwitch() {
@@ -352,19 +403,24 @@ const SettlementManage=Form.create()(React.createClass({
     },
     //分配时重置
     resetOrder() {
-        this.contactList();
+    	this.setState({
+    		departmenttList:undefined,
+    		financeNameSearch:''
+    	})
     },
     reset() {
-    	this.state.customerName='';
+    	this.state.buyerNameSearch='';
+    	this.state.financeNameSearch='';
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
-		this.state.transactionProgress = undefined;
-		this.state.contractProgress = undefined;
-		this.state.projectProgress = undefined;
-		this.state.settlementState = undefined;
-		this.state.orderStatus = undefined;
+		this.state.orderChannelSearch = undefined;
+		this.state.liquidationStatusSearch = undefined;
+		this.state.orderStatusSearch = undefined;
+		this.state.salesmanNameSearch = undefined;
+		this.state.departmenttSearch = undefined;
 		this.state.approved = undefined;
-		this.state.orderChannel = undefined;
+		this.state.orderChannelSearch = undefined;
+		this.state.orderTypeSearch = undefined;
         this.loadData();       
     },
     render() {
@@ -382,6 +438,7 @@ const SettlementManage=Form.create()(React.createClass({
 			   })
 			},
         };
+        let departmentArr = this.state.departmentArr || [];
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
         return (
@@ -390,35 +447,28 @@ const SettlementManage=Form.create()(React.createClass({
                 	<span style={{fontSize:'16px'}}>结算订单管理</span>	
 	                <div className="user-search">
 	                    <Input placeholder="客户名称" style={{width:'150px'}}
-	                        value={this.state.customerName}
-	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
+	                        value={this.state.buyerNameSearch}
+	                        onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
 	                    <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 }); }} /> 
 		                <Select placeholder="订单部门"
 	                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
-	                            value={this.state.orderStatus}
-	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            value={this.state.departmenttSearch}
+	                            onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
 	                            {
-                                    lvl.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    departmentArr.map(function (item) {
+                                            return <Select.Option key={item.id} >{item.name}</Select.Option>
                                     })
                                 }
 	                    </Select> 
 	                    <Input placeholder="订单负责人" style={{width:'150px'}}
-	                        value={this.state.customerName}
-	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
-	                    <Select placeholder="财务负责人"
-	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.orderStatus}
-	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
-	                            {
-                                    lvl.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                    </Select>     
+	                        value={this.state.salesmanNameSearch}
+	                        onChange={(e) => { this.setState({ salesmanNameSearch: e.target.value }); }} />
+	                    <Input placeholder="财务负责人" style={{width:'150px'}}
+	                        value={this.state.financeNameSearch}
+	                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />  
 	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
 	                    <Button onClick={this.reset}>重置</Button>
 	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
@@ -427,30 +477,30 @@ const SettlementManage=Form.create()(React.createClass({
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
 	                        <Select placeholder="订单状态"
 	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.orderStatus}
-	                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+	                            value={this.state.orderStatusSearch}
+	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
 	                            {
-                                    lvl.map(function (item) {
+                                    orderState.map(function (item) {
                                             return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }
 	                        </Select>
 	                        <Select placeholder="订单渠道"
 	                            style={{ width: 150,marginRight:'10px' }}
-	                            value={this.state.orderChannel}
-	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            value={this.state.orderChannelSearch}
+	                            onChange={(e) => { this.setState({ orderChannelSearch: e }) }}>
 	                            {
-                                    lvl.map(function (item) {
+                                    orderChannel.map(function (item) {
                                             return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }
 	                        </Select>
 	                        <Select placeholder="订单类型"
 	                            style={{ width: 150 }}
-	                            value={this.state.orderChannel}
-	                            onChange={(e) => { this.setState({ orderChannel: e }) }}>
+	                            value={this.state.orderTypeSearch}
+	                            onChange={(e) => { this.setState({ orderTypeSearch: e }) }}>
 	                            {
-                                    lvl.map(function (item) {
+                                    orderType.map(function (item) {
                                             return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }
@@ -467,7 +517,6 @@ const SettlementManage=Form.create()(React.createClass({
 	                    </Spin>
 	                </div>
 	                <ManagementDetaile
-	                	editState={this.state.editState}
 	                	confirmDelet={this.confirmDelet}
 	                    userDetaile={this.state.userDetaile}
 	                    datauser={this.state.datauser}
@@ -483,12 +532,19 @@ const SettlementManage=Form.create()(React.createClass({
 			            <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
 			                <Spin spinning={this.state.loading}>
 			                	<div>
-			                		<Input placeholder="部门名称" style={{width:'150px'}}
-				                        value={this.state.customerName}
-				                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
+			                		<Select placeholder="订单部门"
+				                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
+				                            value={this.state.departmenttList}
+				                            onChange={(e) => { this.setState({ departmenttList: e }) }}>
+				                            {
+			                                    departmentArr.map(function (item) {
+			                                            return <Select.Option key={item.id} >{item.name}</Select.Option>
+			                                    })
+			                                }
+				                    </Select>
 				                    <Input placeholder="财务负责人" style={{width:'150px',marginLeft:'10px'}}
-				                        value={this.state.customerName}
-				                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />  
+				                        value={this.state.financeNameSearch}
+				                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />  
 				                    <Button type="primary" onClick={this.searchOrder} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
 	                    			<Button onClick={this.resetOrder}>重置</Button>
 			                	</div>
@@ -496,7 +552,7 @@ const SettlementManage=Form.create()(React.createClass({
 				                    <Spin spinning={this.state.loading}>
 				                        <Table columns={this.state.userList}
 				                            dataSource={this.state.distributionList}
-				                            pagination={this.state.distributionPagination}
+				                            pagination={false}
 				                             />
 				                    </Spin>
 				                </div>

+ 0 - 2
js/component/manageCenter/servicesManage/contract/contract.jsx

@@ -397,7 +397,6 @@ const Contract = React.createClass({
                     };	
                     thedata = {}; 
                }; 
-               console.log(thedata)
 					this.setState({
 						customerArr:thedata,	
                     });
@@ -439,7 +438,6 @@ const Contract = React.createClass({
 	},
 	//获取联系人下拉框
 	getNewWoman(ids) { 
-		  console.log(ids);
          $.ajax({
                 method: "get",
                 dataType: "json",

+ 27 - 23
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx

@@ -6,13 +6,14 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 import MySettlementDetaile from "./projectManageDetaile.jsx";
 import moment from 'moment';
 import '../userMangagement.less';
-import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../../dataDic.js';
-import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../../tools.js';
+import {intentProgress,transactionProgress,contractProgress,projectProgress,projectState} from '../../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress,getProjectState} from '../../../../tools.js';
 
 const ProjectOrder=Form.create()(React.createClass({
 	loadData(pageNo) {
         this.state.data = [];
         this.setState({
+        	pageNo:pageNo,
             loading: true
         });
         $.ajax({
@@ -50,6 +51,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                         roleName: thisdata.roleName,
 	                         creater:thisdata.creater,
 	                         createTime:thisdata.createTimez,
+	                         pages:pageNo
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -80,6 +82,7 @@ const ProjectOrder=Form.create()(React.createClass({
             searchMore: true,
             releaseDate: [],
             releaseDateOrder:[],
+            projectState:false,
             newProject:false,
             loading: false,
             KnotState:true,
@@ -227,7 +230,7 @@ const ProjectOrder=Form.create()(React.createClass({
 			method: "POST",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context +'/api/zuofei ,
+			url: globalConfig.context +'/api/zuofei',
 			data: {
 				id:record.id,
 			}
@@ -237,7 +240,7 @@ const ProjectOrder=Form.create()(React.createClass({
 			});
 			if(!data.error.length) {
 				message.success('操作成功!');
-				this.loadData();			
+				this.loadData(this.state.pageNo);			
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -260,20 +263,19 @@ const ProjectOrder=Form.create()(React.createClass({
     	this.setState({
     		newProject:false,
     		Kid:record.id,
-    		KnotState:true,
     		signBillVisible:true
     	})
-    	this.editData(record,1)
+    	this.editData(record)
     },
-    //
+    //项目管理
     Knot(record){
-    	this.setState({
-    		newProject:false,
-    		Kid:record.id,
-    		KnotState:false,
-    		signBillVisible:true
-    	})
-    	this.editData(record,0)
+    	this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+        	projectState:true,
+        	newProject:false,
+            showDesc: true
+        });
     },
     noProject(){
     	this.setState({
@@ -281,13 +283,12 @@ const ProjectOrder=Form.create()(React.createClass({
     	})
     },
     //立项。结项前数据获取
-    editData(xhr,state){
-    	let api =state?'api/lixiang-shuju':'api/jiexiang-shuju';
+    editData(xhr){
     	$.ajax({
 			method: "POST",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context + '/api/1313',
+			url: globalConfig.context + 'api/lixiang-shuju',
 			data: {
 				id:xhr.id,
 			},
@@ -328,7 +329,7 @@ const ProjectOrder=Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('操作成功!');
 				this.noProject();
-				this.loadData();			
+				this.loadData(this.state.pageNo);			
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -338,11 +339,12 @@ const ProjectOrder=Form.create()(React.createClass({
     	this.state.userDetaile=false;
         this.state.showDesc = e;
         if (s) {
-            this.loadData();
+            this.loadData(this.state.pageNo);
         };
     },
     searchSwitch() {
 		this.setState({
+			newProject:false,
 			searchMore: !this.state.searchMore
 		});
 	},
@@ -353,6 +355,7 @@ const ProjectOrder=Form.create()(React.createClass({
         this.state.userDetaile=true;
         this.state.datauser = record;
         this.setState({
+        	projectState:false,
         	newProject:false,
             showDesc: true
         });
@@ -418,7 +421,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                            value={this.state.orderDepartmentSearch}
 	                            onChange={(e) => { this.setState({ orderDepartmentSearch: e }) }}>
 	                            {
-                                    lvl.map(function (item) {
+                                    projectState.map(function (item) {
                                             return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }
@@ -469,6 +472,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                    </Spin>
 	                </div>
 	                <MySettlementDetaile
+	                	projectState={this.state.projectState}
 	                    newProject={this.state.newProject}
 	                    userDetaile={this.state.userDetaile}
 	                    datauser={this.state.datauser}
@@ -478,7 +482,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	            <Modal maskClosable={false} visible={this.state.signBillVisible}
                         onOk={this.noProject} onCancel={this.noProject}
                         width='800px'
-                        title={this.state.KnotState?'项目立项':'项目结项'}                   
+                        title='项目立项'                  
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={this.projectSubmit} id="demand-form">
@@ -496,14 +500,14 @@ const ProjectOrder=Form.create()(React.createClass({
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label={this.state.KnotState?"立项时间":'结项时间'}>   
+					                            label="立项时间">   
 				                                   <span></span>
 					                    </FormItem>
 						                <div className='clearfix'>
 								        	<FormItem
 									            labelCol={{ span: 4 }}
 									            wrapperCol={{ span: 16 }}
-									            label={this.state.KnotState?"立项说明":'结项说明'} >
+									            label="立项说明" >
 									                <Input type="textarea" placeholder="请输入备注" rows={4}  value={this.state.introduction} 
 										    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
 									        </FormItem>

+ 669 - 118
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -3,7 +3,8 @@ import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../userMangagement.less';
-import {lvl} from '../../../../dataDic.js';
+import {orderType} from '../../../../dataDic.js';
+import {getOrderType} from '../../../../tools.js';
 
 const MySettlementDetaile = Form.create()(React.createClass({
 	loadData() {
@@ -34,7 +35,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
                    }
                 this.setState({
                     dataSource: theArr,
-                    pagination: false,
                 });
             }.bind(this),
         }).always(function () {
@@ -49,27 +49,62 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			visible: false,
 			contractState:false,
 			projectVisible:false,
+			selectedRowKey:[],
+			orderSelect:false,
 			orgCodeUrl:[],
 			checkedKeys: [],
+			pagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.loadData(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
+            //派单
+            distributionPagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.contactList(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return '共' + total + '条数据';
+                }
+            },
 			columns: [
 				{
-                    title: '业务项目名称',
+                    title: '任务名称',
                     dataIndex: 'roleName',
                     key: 'roleName'
                 }, {
-                    title: '项目类别',
+                    title: '业务类别',
                     dataIndex: 'creater1',
                     key: 'creater1'
                 },{
-                    title: '项目数量',
+                    title: '任务数量',
                     dataIndex: 'roleName2',
                     key: 'roleName2'
                 }, {
-                    title: '下单时间',
+                    title: '任务负责人',
                     dataIndex: 'creater4',
                     key: 'creater4'
                 }, {
-                    title: '项目说明',
+                    title: '任务状态',
+                    dataIndex: 'roleName22',
+                    key: 'roleName22'
+                }, {
+                    title: '是否锁定',
+                    dataIndex: 'creater41',
+                    key: 'creater41'
+                },{
+                    title: '任务说明',
                     dataIndex: 'roleName5',
                     key: 'roleName5',
                     render:(text) => {
@@ -77,10 +112,153 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     		 text?text.substr(0,6)+'...':''
                     	)
                     }
+                },{
+                	title: '操作',
+                    dataIndex: 'rrtk',
+                    key: 'rrtk',
+                    render:(text,record,index)=>{
+                    	return (
+                    		<div>
+								<Popconfirm title={'您将作废项目任务 【'+record.name+'】,系统将自动同步作废项目资料单,请确认!'} onConfirm={(e)=>{this.voidOperation(record)}} okText="确认" cancelText="取消">
+							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">作废</Button>                 
+								</Popconfirm>
+							   	<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">派单</Button>                 
+								<Popconfirm title={'您将锁定项目任务【'+record.name+'】,系统将自动同步锁定项目资料单,请确认!'} onConfirm={(e)=>{this.lockOperation(record)}} okText="确认" cancelText="取消">
+							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">锁定</Button>                 
+								</Popconfirm>
+							</div>
+							)
+                    }
                 }
-			]
+			],
+			//选择订单
+			columnOrder: [
+				{
+                    title: '订单编号',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '项目类别',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                },{
+                    title: '项目数量',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater4',
+                    key: 'creater4'
+                },{
+                	title: '操作',
+                    dataIndex: 'rrt',
+                    key: 'rrt',
+                    render:(text,record,index)=>{
+                    	return (
+                    		<div>
+								<Popconfirm title={'是否选择订单 【'+record.name+'】'} onConfirm={(e)=>{this.listSelect(record)}} okText="确认" cancelText="取消">
+							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">选择</Button>                 
+								</Popconfirm>
+							</div>
+							)
+                    }
+                }
+			],
+			userList:[
+            	{
+                    title: '用户编号',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '用户姓名',
+                    dataIndex: 'creater',
+                    key: 'creater'
+                },{
+                    title: '部门机构',
+                    dataIndex: 'roleName1',
+                    key: 'roleName1'
+                }, {
+                    title: '职务',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                },{
+                    title: '联系手机',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2'
+                }, {
+                    title: '操作',
+                    dataIndex: 'abc',
+                    key: 'abc',
+                    render:(text,record,index)=>{
+                    	return (
+                    	    <Popconfirm title={'您确认将此订单 【'+ record.roleName+'】 分配给【'+record.roleName+'-'+record.roleName+'】进行业务跟进?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
+							</Popconfirm>
+							)
+                    }
+                }
+            ],
 		};
 	},
+	//选定订单
+	listSelect(record){
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +'/api/zuofei',
+			data: {
+				id:record.id,
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.orderOk();
+				this.addOrderDetaiel(record)		
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));		
+	},
+	addOrderDetaiel(record){
+		this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/xiangqing',
+            data: {
+            	id:record.id
+            },
+            success: function (data) {
+                let theArr =[];
+                if (!data.data) {
+                    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;
+                        this.setState({
+		                    key: i,
+		                });
+                    };
+                   }
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+	},
 	//查看基本详情基本信息
     loaduser(record){
     	if(record){
@@ -112,6 +290,41 @@ const MySettlementDetaile = Form.create()(React.createClass({
         }.bind(this));  
        }
     },
+    //作废
+    voidOperation(e){
+    	this.unlock(e,true)
+    },
+    //锁定
+    lockOperation(e){
+    	this.unlock(e,false)
+    },
+    unlock(record,state){
+    	this.setState({
+            loading: true
+        });
+        let api=state?'/api/zuofei':'/api/suoding'
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + api,
+            data: {
+            	id:this.props.datauser.id,
+            	uid:record.id
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功');
+                this.setState({
+                    loading: false,
+                });
+                this.loadData();
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
     //订单编辑保存
 	handleOk(e) {
 		this.setState({
@@ -138,6 +351,17 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		});
 		this.props.closeDesc(false);
 	},
+	//选定订单
+	orderOk() {
+		this.setState({
+			orderSelect: false,
+		});
+	},
+	SelectOrder(){
+		this.setState({
+			orderSelect: true,
+		});
+	},
 	componentWillMount() {
 		
 	},
@@ -251,8 +475,200 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			}
 		});
 	},
+	//派单
+	//操作分配
+    confirmDelet(index){
+    	this.setState({
+    		userDetaile:false,
+    		distributionVisible:true
+    	});
+    	this.contactList(1,index.id)
+    },
+    distributionCancel(){
+    	this.setState({
+    		distributionVisible:false
+    	})
+    },
+    distributionOk(){
+    	this.setState({
+    		distributionVisible:false
+    	})
+    },
+    //分配对象列表
+    contactList(pageNo,orderId){
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/roles',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.distributionPagination.pageSize,
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    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,
+	                         id: thisdata.id,
+	                         roleName: thisdata.roleName,
+	                         creater:thisdata.creater,
+	                         createTime:thisdata.createTimez,
+	                         uid:orderId,
+                        });
+                    };
+                    this.state.distributionPagination.current = data.data.pageNo;
+                    this.state.distributionPagination.total = data.data.totalCount;
+                };
+                if(!data.data.list.length){
+					this.state.distributionPagination.current=0
+					this.state.distributionPagination.total=0
+				}
+                this.setState({
+                    distributionList: theArr,
+                    pagination: this.state.distributionPagination,
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    //选定对象
+    confirmSelect(record){
+    	this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/paidan",
+            data: {
+            	id:this.props.datauser.id,
+            	uid:record.id
+            }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('分派成功');
+                this.setState({
+                    loading: false,
+                });
+                this.distributionOk();
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+    //添加任务
+    addTask(){
+    	this.setState({
+    		addTaskState:true,
+        	addnextVisible:true,
+        });
+    },
+    //任务新建、编辑保存
+	taskSumbit(e) {
+		e.preventDefault();
+//      if(!this.state.customerName&&!this.state.autoId){
+//      	message.warning('请输入客户名称');
+//      	return false;
+//      };
+		this.props.form.validateFields((err, values) => {
+			if(!err) {
+				this.setState({
+					loading: true
+				});
+				let api=this.state.addTaskState?'/api/tianjia':'/api/admin/order/bianji';
+				$.ajax({
+					method: "POST",
+					dataType: "json",
+					crossDomain: false,
+					url: globalConfig.context + api,
+					data: this.state.addTaskState?{
+						id:'tianjia'
+					}:{
+						id:'bianji'
+					}
+				}).done(function(data) {
+					this.setState({
+						loading: false
+					});
+					if(!data.error.length) {
+						message.success('保存成功!');
+						this.nextCancel();
+						this.loadData();
+					} else {
+						message.warning(data.error[0].message);
+					}
+				}.bind(this));
+			}
+		});
+	},
+	//任务项目各种骚操作
+	unlock(){ //解锁
+		this.removeList('1')
+	},
+	lock(){ //锁定
+		this.removeList('2')
+	},
+	removeItem(){ //撤项
+		this.removeList('3')
+	},
+	Knot(){ //结项
+		this.removeList('4')
+	},
+	removeList(e){
+		if(!e) return false;
+		this.setState({
+			loading: true
+		});
+		let api='';
+		switch (e){
+			case '1': //解锁
+			  api='/api/jiesuo' 
+			break;
+			case '2': //锁定
+			  api='/api/suoding'
+			break;
+			case '3': //撤项
+			  api='/api/chexiang'
+			break;
+			case '4': //结项
+			  api='/api/jiexiang'
+			break;
+		};
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + api,
+			data: {
+				id:this.props.datauser.id
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.handleOk()
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
 	tableRowClick(record, index) {
         this.setState({
+        	addTaskState:false,
         	addnextVisible:true,
         });
         this.orderDetails(record)
@@ -273,13 +689,28 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			labelCol: { span: 8 },
 			wrapperCol: { span: 14 },
 		};
+		const rowSelection = {
+            selectedRowKey: this.state.selectedRowKey,
+            onChange: (selectedRowKey, selectedRows) => {
+	                this.setState({
+	                    selectedRows: selectedRows.slice(-1),
+	                    selectedRowKey: selectedRowKey.slice(-1)
+	                }); 
+            },
+            onSelectAll: (selected, selectedRows, changeRows) => {
+			   this.setState({
+			   		selectedRowKey:[]
+			   })
+			},
+        };
+        const hasSelected = this.state.selectedRowKey.length > 0;
 		const orderDetaiel=this.state.orderList || [];
 		return(
 			<div>
             <Modal maskClosable={false} visible={this.state.visible}
                     onOk={this.handleOk} onCancel={this.handleCancel}
                     width='1000px'
-                    title='编辑订单'                     
+                    title={this.props.projectState?'项目管理':'编辑订单' }                    
                     footer=''
                     className="admin-desc-content">
 		            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} onSubmit={this.handleSubmit}>
@@ -288,163 +719,232 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	                            <div className="clearfix">
 		                       		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="订单编号" >
+			                            label="订单关联" >
 			                            <span>{orderDetaiel.roleName}</span>
+			                            <Button type='primary' onClick={this.seeOrder} style={{float:'right'}}>查看订单</Button>
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="下单时间" >  
+			                            label="项目编号" >  
 			                            <span>{orderDetaiel.createTimez}</span>
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="客户名称" >  
 			                            <span>{orderDetaiel.roleName}</span>
+			                            <Button type='primary' onClick={this.seeOrder} style={{float:'right'}}>查看联系人</Button>
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="订单类型" >  
+			                            label="项目类型" >  
 			                            <span>{orderDetaiel.roleName}</span>
 		                    		</FormItem>
+		                    		{!this.props.projectState?<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="项目负责人" >  
+			                            <Input value={this.state.ordesss} onChange={(e)=>{this.setState({ordesss:e.target.value})}} style={{width:'240px'}}/>
+			                            <span className="mandatory">*</span>
+		                    		</FormItem>:
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="订单渠道" >  
+			                            label="项目负责人" >  
 			                            <span>{orderDetaiel.roleName}</span>
-		                    		</FormItem>
+		                    		</FormItem>}
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="订单状态" >  
+			                            label="项目状态" >  
 			                            <span>{orderDetaiel.roleName}</span>
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="已收款项" >  
+			                            label="是否锁定" >  
 			                            <span>{orderDetaiel.roleName}</span>
 		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="结算状态" >  
+			                            label="立项时间" >  
 			                            <span>{orderDetaiel.roleName}</span>
 		                    		</FormItem>
-				                    <div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="特批立项" >  
-				                            <Select placeholder="选择特批立项类型"
-					                            style={{ width:'240px'}}
-					                            value={this.state.orderType}
-					                            onChange={(e) => { this.setState({ orderType: e }) }}>
-					                            <Select.Option value='0'>不特批</Select.Option>
-					                            <Select.Option value='1'>申请特批</Select.Option>
-					                            <Select.Option value='2'>特批通过</Select.Option>
-					                            <Select.Option value='3'>特批驳回</Select.Option>
-					                        </Select>
-				                    		<span className="mandatory">*</span>
-			                    		</FormItem>
-			                    	</div>
 			                        <div className='clearfix'>
 							        	<FormItem
 								            labelCol={{ span: 4 }}
 								            wrapperCol={{ span: 16 }}
-								            label="订单留言" >
-							        		 <Input type="textarea" placeholder="请输入订单留言" rows={4}  value={this.state.introduction} 
-													onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+								            label="立项说明" >
+							        		 <span>{orderDetaiel.roleName}</span>			                      
 								        </FormItem>
 							        </div>
 		                        </div>
 		                        <div className='clearfix'>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="订单负责人" >  
+			                            label="结项日期" >  
 			                            <span>{orderDetaiel.roleName}</span>
 		                    		</FormItem>
 		                    	</div>
 		                    	<div className='clearfix'>
+							        	<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="结项说明" >
+							        		<span>{orderDetaiel.roleName}</span>			                      
+								        </FormItem>
+							        </div>
+		                    	<div className='clearfix'>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="意向时间" >  
-			                            <span>{orderDetaiel.createTimez}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单时间" >  
-			                            <span>{orderDetaiel.createTimez}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="财务负责人" >  
-			                            <span>{orderDetaiel.createTimez}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="首付时间" >  
-			                            <span>{orderDetaiel.createTimez}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="项目负责人" >  
-			                            <span>{orderDetaiel.roleName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="立项时间" >  
+			                            label="是否作废" >  
 			                            <span>{orderDetaiel.createTimez}</span>
 		                    		</FormItem>
 	                    		</div>
 				                <div>
-				                	<span style={{marginLeft:'50px',fontSize:'20px'}}>订单明细</span>
+				                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目任务</span>
+				                	{!this.props.projectState&&<Button type='primary' onClick={this.addTask} style={{float:'right',marginRight:'100px'}}>添加任务</Button>}
 				                </div>
 				                <div className="patent-table">
 				                    <Spin spinning={this.state.loading}>
 				                        <Table columns={this.state.columns}
 				                            dataSource={this.state.dataSource}
-				                            pagination={this.state.pagination}
+				                            pagination={false}
 				                            onRowClick={this.tableRowClick} 
 				                            />
 				                    </Spin>
 					            </div>
-					            <div style={{marginTop:'30px',paddingLeft:'100px'}}>
+					            {!this.props.projectState?<div style={{marginTop:'30px',paddingLeft:'100px'}}>
 						            <Button className="setSave" type="primary" htmlType="submit" style={{marginRight:'50px'}}>保存</Button>  
 						            <Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
-					            </div>
+					            </div>:
+					            <div style={{marginTop:'30px',paddingLeft:'100px'}}>
+					            	<Button type="primary" onClick={this.removeItem}>撤项</Button>  
+						            <Button type="primary" onClick={this.Knot} style={{margin:'15px'}}>结项</Button>
+						            <Button type="danger" onClick={this.lock}>锁定</Button>
+						            <Button type="primary" onClick={this.unlock} style={{margin:'15px'}}>解锁</Button>
+						            <Button type="ghost" onClick={this.handleCancel}>返回</Button>
+					            </div>}
 		                    </div>
 		                </Spin>
 		            </Form >
 		        </Modal>
 		        <Modal maskClosable={false} visible={this.state.addnextVisible}
                         onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='550px'
-                        title='查看订单明细服务'                     
+                        width='800px'
+                        title={this.state.addTaskState?'添加任务':'编辑任务'}                
                         footer=''
                         className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
+			            <Form layout="horizontal" id="demand-form" onSubmit={this.taskSumbit}>
 			                <Spin spinning={this.state.loading}>
+		                        {this.state.addTaskState?<div className="clearfix">
+	                        	    <FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="服务名称分类" >
+			                    			<Select placeholder="选择服务项目分类"
+					                            style={{ width: 200 ,marginRight:'10px'}}
+					                            value={this.state.orderStatus}
+					                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+					                            {
+				                                    orderType.map(function (item) {
+				                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                    })
+				                                }
+					                        </Select>
+					                        <span className="mandatory">*</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="服务项目名称" >
+					                    	<Input value={this.state.leibie}  style={{ width: 200 }} placeholder="输入服务项目名称"
+					                    			onChange={(e)=>{this.setState({leibie:e.target.value})}}/>
+			                    			<span className="mandatory">*</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="数量" >
+					                    	<Input value={this.state.leibie} style={{ width: 200 }} placeholder="输入数量"
+					                    			onChange={(e)=>{this.setState({leibie:e.target.value})}}/>
+			                    			<span className="mandatory">*</span>
+			                    	</FormItem>
+			                    	<div className='clearfix'>
+							        	<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="任务说明" >
+								                <Input type="textarea" placeholder="请输入订单留言" rows={4}  value={this.state.introduction} 
+									    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+								        </FormItem>
+							        </div>
+		                        </div>:
 		                        <div className="clearfix">
-	                        	    <FormItem className="half-middle"
+		                        	<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="服务名称" >
-			                    			<span>{this.state.aaa}</span>
+				                            label="项目编号" >
+			                    			<span>{this.state.bianhao}</span>
 			                    	</FormItem>
-			                    	<FormItem className="half-middle"
+			                    	<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="项目类别" >
-			                    			<span>{this.state.aaa}</span>
+				                            label="任务编号" >
+			                    			<span>{this.state.bianhao}</span>
 			                    	</FormItem>
-			                    	<FormItem className="half-middle"
+		                        	<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="项目数量" >
-			                    			<span>{this.state.aaa}</span>
+				                            label="服务名称分类" >
+			                    			<Select placeholder="选择服务项目分类"
+					                            style={{ width: 200 ,marginRight:'10px'}}
+					                            value={this.state.orderStatus}
+					                            onChange={(e) => { this.setState({ orderStatus: e }) }}>
+					                            {
+				                                    orderType.map(function (item) {
+				                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                    })
+				                                }
+					                        </Select>
+					                        <span className="mandatory">*</span>
 			                    	</FormItem>
-			                    	<FormItem className="half-middle"
+			                    	<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="下单时间" >
-			                    			<span>{this.state.aaa}</span>
+				                            label="服务项目名称" >
+					                    	<Input value={this.state.leibie}  style={{ width: 200 }} placeholder="输入服务项目名称"
+					                    			onChange={(e)=>{this.setState({leibie:e.target.value})}}/>
+			                    			<span className="mandatory">*</span>
 			                    	</FormItem>
-			                    	<FormItem className="half-middle"
+			                    	<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="服务说明" >
-			                    			<span>{this.state.aaa}</span>
+				                            label="任务状态" >
+					                    	<span>{this.state.bianhao}</span>
 			                    	</FormItem>
+			                    	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="是否锁定" >
+					                    	<span>{this.state.bianhao}</span>
+			                    	</FormItem>
+			                    	<div className='clearfix'>
+							        	<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="任务说明" >
+								                <Input type="textarea" placeholder="请输入订单留言" rows={4}  value={this.state.introduction} 
+									    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+								        </FormItem>
+							        </div>
+							        <div className='clearfix'>
+							        	<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="派单人" >
+					                    	<span>{this.state.bianhao}</span>
+				                    	</FormItem>
+				                    	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="派单时间" >
+						                    	<span>{this.state.bianhao}</span>
+				                    	</FormItem>
+				                    	<FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="资料负责人" >
+						                    	<span>{this.state.bianhao}</span>
+				                    	</FormItem>
+							        </div>
+		                        </div>}
+		                        <div className="clearfix" style={{marginBottom:'20px'}}>
+				                    <Button className="setSave" type="primary" htmlType="submit">保存</Button>  
+	                                <Button className="cancel" type="ghost" onClick={this.nextCancel}>返回</Button>
 		                        </div>
 			                </Spin>
 			            </Form >
@@ -455,7 +955,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	                    title='创建订单'                     
 	                    footer=''
 	                    className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} onSubmit={this.addProjectSubmit}>
+			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} >
 			                <Spin spinning={this.state.loading}>
 			                        <div className="clearfix">
 			                        	<div>
@@ -464,37 +964,40 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					                            label="订单关联" > 
 					                            <span>{this.state.roleName}</span>
 						                    </FormItem>
+						                    <Button type='primary' onClick={this.SelectOrder}>选定</Button>
 					                    </div>
-					                    <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="订单状态" > 
-					                            <span>{this.state.roleName}</span>
-						                </FormItem>
-					                    <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="订单时间" > 
-					                            <span>{this.state.roleName}</span>
-						                </FormItem>
-					                    <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="结算状态" > 
-					                            <span>{this.state.roleName}</span>
-						                </FormItem>
-					                    <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="是否特批" > 
-					                            <span>{this.state.roleName}</span>
-						                </FormItem>
-						                <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="订单类型" > 
-					                            <span>{this.state.roleName}</span>
-						                </FormItem>
-						                <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="订单负责人" > 
-					                            <span>{this.state.roleName}</span>
-						                </FormItem>
+					                    <div className='clearfix'>
+						                    <FormItem className="half-item"
+						                            {...formItemLayout}
+						                            label="订单状态" > 
+						                            <span>{this.state.roleName}</span>
+							                </FormItem>
+						                    <FormItem className="half-item"
+						                            {...formItemLayout}
+						                            label="订单时间" > 
+						                            <span>{this.state.roleName}</span>
+							                </FormItem>
+						                    <FormItem className="half-item"
+						                            {...formItemLayout}
+						                            label="结算状态" > 
+						                            <span>{this.state.roleName}</span>
+							                </FormItem>
+						                    <FormItem className="half-item"
+						                            {...formItemLayout}
+						                            label="是否特批" > 
+						                            <span>{this.state.roleName}</span>
+							                </FormItem>
+							                <FormItem className="half-item"
+						                            {...formItemLayout}
+						                            label="订单类型" > 
+						                            <span>{this.state.roleName}</span>
+							                </FormItem>
+							                <FormItem className="half-item"
+						                            {...formItemLayout}
+						                            label="订单负责人" > 
+						                            <span>{this.state.roleName}</span>
+							                </FormItem>
+							            </div>
 						                <div className='clearfix'>
 							                <FormItem className="half-item"
 					                            {...formItemLayout}
@@ -511,7 +1014,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 						                            value={this.state.projectType}
 						                            onChange={(e) => { this.setState({ projectType: e }) }}>
 						                            {
-					                                    lvl.map(function (item) {
+					                                    orderType.map(function (item) {
 					                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 					                                    })
 					                                }
@@ -544,7 +1047,55 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                    </FormItem> 
 	                        </Spin>
 			            </Form >
-			        </Modal>  
+			        </Modal> 
+			        <Modal maskClosable={false} visible={this.state.orderSelect}
+	                    onOk={this.orderOk} onCancel={this.orderOk}
+	                    width='800px'
+	                    title='选择关联订单'                     
+	                    footer=''
+	                    className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}>
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+		                        	<div className="clearfix">
+		                        		<Table columns={this.state.columnOrder}
+				                            dataSource={this.state.dataOrder}
+				                            pagination={this.state.pagination}
+				                            />
+		                        	</div>
+			        			</div>
+				        	</Spin>
+				        </Form>
+			        </Modal>
+			        <Modal maskClosable={false} visible={this.state.distributionVisible}
+                        onOk={this.distributionOk} onCancel={this.distributionCancel}
+                        width='800px'
+                        title='分派财务订单'                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} >
+			                <Spin spinning={this.state.loading}>
+			                	<div>
+			                		<Input placeholder="部门名称" style={{width:'150px'}}
+				                        value={this.state.customerName}
+				                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
+				                    <Input placeholder="财务负责人" style={{width:'150px',marginLeft:'10px'}}
+				                        value={this.state.customerName}
+				                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />  
+				                    <Button type="primary" onClick={this.searchOrder} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
+	                    			<Button onClick={this.resetOrder}>重置</Button>
+			                	</div>
+			                	 <div className="patent-table" style={{marginTop:'10px'}}>
+				                    <Spin spinning={this.state.loading}>
+				                        <Table columns={this.state.userList}
+				                            dataSource={this.state.distributionList}
+				                            pagination={this.state.distributionPagination}
+				                             />
+				                    </Spin>
+				                </div>
+			                </Spin>
+			            </Form>
+			    </Modal>
     	    </div>
 		)
 	}

+ 0 - 2
js/component/manageCenter/set/business/businessCategory.jsx

@@ -537,8 +537,6 @@ const BusinessCategory=Form.create()(React.createClass({
                 upSort=rowItem.sort;
             };
         };
-        console.log(upSort);
-        console.log(deletedIds);
         this.setState({
             selectedRowKeys: [],
             loading: deletedIds.length > 0

+ 14 - 2
js/component/manageCenter/set/business/businessProject.jsx

@@ -441,6 +441,7 @@ const BusinessProject=Form.create()(React.createClass({
 		            	cid:superText,//项目业务品类
 		            	bname:this.state.editName,//业务项目名称
 		            	price:this.state.editPrice,//市场价
+		            	firstPayment:this.state.firstPayment,//首付金额
 		            	offset:offsetText,//最低折扣
 		            	activityPrice:this.state.editActivityPrice,//活动价
 		            	activityFlag:this.state.editActivityFlag,//活动生效标识
@@ -534,6 +535,7 @@ const BusinessProject=Form.create()(React.createClass({
                          editCity: thisdata.city,//市
                          editDistrict: thisdata.district,//区
                          editPrice: thisdata.price,//市场价
+                         firstPayment:thisdata.firstPayment,//首付金额
                          editActivityPrice: thisdata.activityPrice,//活动价
                          editOffset: thisdata.offset,//最低折扣
                          editMemberPrice: thisdata.memberPrice,//会员价
@@ -548,7 +550,6 @@ const BusinessProject=Form.create()(React.createClass({
                          editBoutique:thisdata.boutique,//是否精品
                          orgCodeUrl: thisdata.minLogo ? splitUrl(thisdata.minLogo, ',', globalConfig.avatarHost + '/upload') : [],
 						 cditCompanyLogoUrl: thisdata.maxLogo ? splitUrl(thisdata.maxLogo, ',', globalConfig.avatarHost + '/upload') : [],
-					
                     }); 
                 };
                 this.setState({
@@ -561,6 +562,7 @@ const BusinessProject=Form.create()(React.createClass({
                      editCity: thisdata.city,//市
                      editDistrict: thisdata.district,//区
                      editPrice: thisdata.price,//市场价
+                     firstPayment:thisdata.firstPayment,
                      editActivityPrice: thisdata.activityPrice,//活动价
                      editOffset: thisdata.offset,//最低折扣
                      editMemberPrice: thisdata.memberPrice,//会员价
@@ -1427,7 +1429,17 @@ const BusinessProject=Form.create()(React.createClass({
 					                         label="市场价"
 				                            >
 			                                <Input placeholder="市场价" value={this.state.editPrice} style={{width:'94%'}}
-						    				onChange={(e)=>{this.setState({editPrice:e.target.value})}}/>
+						    				onChange={(e)=>{this.setState({editPrice:e.target.value})}} required="required"/>
+						    				<span style={{color:'red',marginLeft:'5px'}}>*</span>
+						                 </FormItem>
+						                 <FormItem className="half-item"
+					                    	labelCol={{ span: 4 }}
+					                        wrapperCol={{ span: 12 }}
+					                         label="首付金额"
+				                            >
+			                                <Input placeholder="市场价" value={this.state.firstPayment} style={{width:'94%'}}
+						    				onChange={(e)=>{this.setState({firstPayment:e.target.value})}} required="required"/>
+						    				<span style={{color:'red',marginLeft:'5px'}}>*</span>
 						                 </FormItem>
 						                 <FormItem className="half-item"
 					                    	labelCol={{ span: 4 }}

+ 0 - 1
js/component/manageCenter/set/userManagementS/user.jsx

@@ -310,7 +310,6 @@ const User = Form.create()(React.createClass({
 				rolesId=rowItem.rolesId
 			};
 		};
-		console.log(rolesId)
 			this.setState({
 				selectedRowKeys: [],
 				loading: true

+ 145 - 2
js/component/tools.js

@@ -64,7 +64,8 @@ import {
     intentProgress,
     transactionProgress,
     contractProgress,
-    projectProgress
+    projectProgress,
+    orderType, orderStage, orderState,paymentState, orderChannel, approvedState, lock,paymentMethod,transactionChannel,projectState,transactionProject
 } from './dataDic.js';
 
 import { provinceList} from './NewDicProvinceList.js';
@@ -1116,5 +1117,147 @@ module.exports = {
             return theType;
         }
 	},
-	
+	//订单类型
+	getOrderType:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            orderType.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//订单阶段
+	getOrderStage:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            orderStage.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//订单状态o
+	getOrderState:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            orderState.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//付款状态
+	getPaymentState:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            paymentState.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//订单渠道
+	getOrderChannel:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            orderChannel.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//特批状态
+	getApprovedState:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            approvedState.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//锁定或废除
+	getLock:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            lock.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//支付方式
+	getPaymentMethod:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            paymentMethod.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//交易渠道  transactionProject
+	getTransactionChannel:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            transactionChannel.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//交易科目  
+	getTransactionProject:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            transactionProject.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//项目状态
+	getProjectState:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            projectState.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
 }