liting2017 7 years ago
parent
commit
028776df92

+ 3 - 10
js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx

@@ -174,9 +174,6 @@ const NewService = Form.create()(React.createClass({
                     title: '平台流水号',
                     dataIndex: 'billNo',
                     key: 'billNo',
-                    render:(text)=>{
-                    	return text&&text.substr(0,9)+'…'
-                    }
                 }, {
                     title: '平台流水时间',
                     dataIndex: 'createTime',
@@ -1023,9 +1020,7 @@ const NewService = Form.create()(React.createClass({
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="市场价格" >   
-				                                    <Input placeholder="输入市场价格" value={this.state.commodityPrice} style={{width:'200px'}}
-				                                    onChange={(e)=>{this.setState({commodityPrice:e.target.value})}} ref='commodityPrice'/>
-				                                <span className="mandatory">*</span>    
+				                                <span>{this.state.commodityPrice}</span>    
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
@@ -1044,9 +1039,7 @@ const NewService = Form.create()(React.createClass({
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="市场首付金额" >   
-				                                    <Input placeholder="请输入市场首付金额" value={this.state.commodityFirstPayment} style={{width:'200px'}}
-				                                    onChange={(e)=>{this.setState({commodityFirstPayment:e.target.value})}} ref='commodityFirstPayment'/>
-				                                <span className="mandatory">*</span>    
+				                                <span>{this.state.commodityFirstPayment}</span>  
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
@@ -1229,7 +1222,7 @@ const NewService = Form.create()(React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1200px'
+                        width='1300px'
                         title= '查看流水'                   
                         footer=''
                         className="admin-desc-content">

+ 6 - 25
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -174,9 +174,6 @@ const NewService = Form.create()(React.createClass({
                     title: '平台流水号',
                     dataIndex: 'billNo',
                     key: 'billNo',
-                    render:(text)=>{
-                    	return text&&text.substr(0,9)+'…'
-                    }
                 }, {
                     title: '平台流水时间',
                     dataIndex: 'createTime',
@@ -296,7 +293,6 @@ const NewService = Form.create()(React.createClass({
 	},
 	//查看基本详情基本信息
     loaduser(record){
-    	if(record){
     	this.state.orderList=[]
     	$.ajax({
             method: "get",
@@ -304,7 +300,7 @@ const NewService = Form.create()(React.createClass({
 			crossDomain: false,
 			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
             data: {
-              orderNo: record.orderNo
+              orderNo:record?record.orderNo:this.props.datauser.orderNo
             },
             success: function (data) {
                 let thisData = data.data;                
@@ -334,7 +330,6 @@ const NewService = Form.create()(React.createClass({
                 loading: false
             });
         }.bind(this));  
-       }
     },
 	handleOk(e) {
 		this.setState({
@@ -367,10 +362,11 @@ const NewService = Form.create()(React.createClass({
                 this.setState({
                     loading: false,
                 });
+                this.loaduser()
+            	this.loadData();
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
         }.bind(this));
     },
 	//添加明细
@@ -1145,9 +1141,7 @@ const NewService = Form.create()(React.createClass({
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="市场价格" >   
-				                                    <Input placeholder="输入市场价格" value={this.state.commodityPrice} style={{width:'200px'}}
-				                                    onChange={(e)=>{this.setState({commodityPrice:e.target.value})}} ref='commodityPrice'/>
-				                                <span className="mandatory">*</span>    
+				                                <span>{this.state.commodityPrice}</span>    
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
@@ -1166,9 +1160,7 @@ const NewService = Form.create()(React.createClass({
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="市场首付金额" >   
-				                                    <Input placeholder="请输入市场首付金额" value={this.state.commodityFirstPayment} style={{width:'200px'}}
-				                                    onChange={(e)=>{this.setState({commodityFirstPayment:e.target.value})}} ref='commodityFirstPayment'/>
-				                                <span className="mandatory">*</span>    
+				                                <span>{this.state.commodityFirstPayment}</span>    
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
@@ -1177,12 +1169,6 @@ const NewService = Form.create()(React.createClass({
 				                                    onChange={(e)=>{this.setState({discountFirstPayment:e.target.value})}} ref='discountFirstPayment'/>
 				                                <span className="mandatory">*</span>    
 					                    </FormItem>
-					                    <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="商品规格" >   
-				                                    <Input placeholder="请输入实签价格" value={this.state.commodityMode} style={{width:'200px'}}
-				                                    onChange={(e)=>{this.setState({commodityMode:e.target.value})}} />
-					                    </FormItem>
 					                    <div className='clearfix'>
 						                    <FormItem 
 						                            labelCol={{ span: 4 }}
@@ -1218,11 +1204,6 @@ const NewService = Form.create()(React.createClass({
 					                            label="服务数量" >
 				                    			<span>{editFws.commodityQuantity}</span>
 				                    	</FormItem>
-				                    	 <FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="商品规格" >   
-				                                <span>{editFws.commodityMode}</span>    
-					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="市场首付金额" >   
@@ -1350,7 +1331,7 @@ const NewService = Form.create()(React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1200px'
+                        width='1300px'
                         title= '查看流水'                    
                         footer=''
                         className="admin-desc-content">

+ 1 - 4
js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx

@@ -158,9 +158,6 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
                     title: '平台流水号',
                     dataIndex: 'billNo',
                     key: 'billNo',
-                    render:(text)=>{
-                    	return text&&text.substr(0,9)+'…'
-                    }
                 }, {
                     title: '平台流水时间',
                     dataIndex: 'createTime',
@@ -573,7 +570,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1200px'
+                        width='1300px'
                         title= '查看流水'                   
                         footer=''
                         className="admin-desc-content">

+ 1 - 4
js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx

@@ -157,9 +157,6 @@ const ApproveDetaile = Form.create()(React.createClass({
                     title: '平台流水号',
                     dataIndex: 'billNo',
                     key: 'billNo',
-                    render:(text)=>{
-                    	return text&&text.substr(0,9)+'…'
-                    }
                 }, {
                     title: '平台流水时间',
                     dataIndex: 'createTime',
@@ -572,7 +569,7 @@ const ApproveDetaile = Form.create()(React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1200px'
+                        width='1300px'
                         title= '查看流水'                   
                         footer=''
                         className="admin-desc-content">

+ 46 - 31
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx

@@ -3,7 +3,7 @@ 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 {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType} from '../../../../tools.js';
+import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
 //图片组件
 const PicturesWall = React.createClass({
     getInitialState() {
@@ -152,41 +152,56 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					}
                 }
 			],
-			projectList:[
+			flowList:[
 				{
-                    title: '项目名称',
-                    dataIndex: 'commodityName',
-                    key: 'commodityName'
+                    title: '平台流水号',
+                    dataIndex: 'billNo',
+                    key: 'billNo',
                 }, {
-                    title: '项目类别',
-                    dataIndex: 'commodityType',
-                    key: 'commodityType',
-                    render:(text)=>{
-                    	return (getOrderType(text))
-                    }
+                    title: '平台流水时间',
+                    dataIndex: 'createTime',
+                    key: 'createTime'
+                }, {
+                    title: '流水金额',
+                    dataIndex: 'transactionAmount',
+                    key: 'transactionAmount'
                 },{
-                    title: '项目数量',
-                    dataIndex: 'commodityQuantity',
-                    key: 'commodityQuantity'
+                    title: '付款人名称',
+                    dataIndex: 'payerName',
+                    key: 'payerName'
+                }, {
+                    title: '收款人名称',
+                    dataIndex: 'payeeName',
+                    key: 'payeeName'
                 },
-			],
-			flowList:[
-				{
-                    title: '流水名称',
-                    dataIndex: 'commodityName',
-                    key: 'commodityName'
+                {
+                    title: '流水科目',
+                    dataIndex: 'transactionSubject',
+                    key: 'transactionSubject',
+                    render:(text)=>{return getTransactionProject(text) }
                 }, {
-                    title: '流水类别',
-                    dataIndex: 'commodityType',
-                    key: 'commodityType',
-                    render:(text)=>{
-                    	return (getOrderType(text))
-                    }
+                    title: '流水渠道',
+                    dataIndex: 'transactionChannel',
+                    key: 'transactionChannel',
+                    render:(text)=>{return getTransactionChannel(text) }
                 },{
-                    title: '流水数量',
-                    dataIndex: 'commodityQuantity',
-                    key: 'commodityQuantity'
-                },
+                    title: '财务流水号',
+                    dataIndex: 'financialPayNo',
+                    key: 'financialPayNo',
+                }, {
+                    title: '财务流水时间',
+                    dataIndex: 'financialPayTime',
+                    key: 'financialPayTime',
+                }, {
+                    title: '流水确认',
+                    dataIndex: 'confirmSign',
+                    key: 'confirmSign',
+                    render:(text)=>{return text?'已确认':'待确认' }
+                },{
+                    title: '确认时间',
+                    dataIndex: 'confirmTime',
+                    key: 'confirmTime',
+                }
 			]
 		};
 	},
@@ -559,7 +574,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			        </Modal>
 			         <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1200px'
+                        width='1300px'
                         title= '查看流水'                   
                         footer=''
                         className="admin-desc-content">

+ 1 - 4
js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx

@@ -158,9 +158,6 @@ const ManagementDetaile = Form.create()(React.createClass({
                     title: '平台流水号',
                     dataIndex: 'billNo',
                     key: 'billNo',
-                    render:(text)=>{
-                    	return text&&text.substr(0,9)+'…'
-                    }
                 }, {
                     title: '平台流水时间',
                     dataIndex: 'createTime',
@@ -573,7 +570,7 @@ const ManagementDetaile = Form.create()(React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1200px'
+                        width='1300px'
                         title= '查看流水'                   
                         footer=''
                         className="admin-desc-content">

+ 4 - 35
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrder.jsx

@@ -208,9 +208,11 @@ const ProjectOrder=Form.create()(React.createClass({
     //立项
     edit(record) {
     	this.setState({
+    		signComment:'',
+    		orderNo:record.orderNo,
+    		buyerName:record.buyerName,
     		signBillVisible:true
     	})
-    	this.editData(record)
     },
    
     noProject(){
@@ -218,39 +220,6 @@ const ProjectOrder=Form.create()(React.createClass({
     		signBillVisible:false
     	})
     },
-    //立项。结项前数据获取
-    editData(xhr){
-    	$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context +'/api/admin/techproject/toSetUpProject',
-			data: {
-				orderNo:xhr.orderNo,
-				buyerName:xhr.buyerName
-			},
-			success: function (data) {
-				let theData=data.data;
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                   this.setState({
-                   		uid:theData.id,
-                   		orderNo:theData.orderNo,
-                   		buyerName:theData.buyerName,
-                   		signDate:theData.signDate,
-                   		signComment:''
-                   })
-                };
-			}.bind(this)},
-    	).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
     //立项、结项保存操作
 	projectSubmit(e){
 		e.preventDefault();
@@ -399,7 +368,7 @@ const ProjectOrder=Form.create()(React.createClass({
 			                        <div className="clearfix">
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="项目编号" >   
+					                            label="订单编号" >   
 				                                   <span>{this.state.orderNo}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"

+ 1 - 4
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx

@@ -105,9 +105,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     title: '平台流水号',
                     dataIndex: 'billNo',
                     key: 'billNo',
-                    render:(text)=>{
-                    	return text&&text.substr(0,9)+'…'
-                    }
                 }, {
                     title: '平台流水时间',
                     dataIndex: 'createTime',
@@ -520,7 +517,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1200px'
+                        width='1300px'
                         title= '查看流水'                   
                         footer=''
                         className="admin-desc-content">

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

@@ -463,7 +463,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	             <Modal maskClosable={false} visible={this.state.signBillVisible}
                         onOk={this.noProject} onCancel={this.noProject}
                         width='800px'
-                        title='项目项'                  
+                        title='项目项'                  
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={this.projectSubmit} id="demand-form">
@@ -483,14 +483,14 @@ const ProjectOrder=Form.create()(React.createClass({
 								        	<FormItem
 									            labelCol={{ span: 4 }}
 									            wrapperCol={{ span: 16 }}
-									            label="项说明" >
+									            label="项说明" >
 									                <Input type="textarea" placeholder="请输入备注" rows={4}  value={this.state.signComment} 
 										    				onChange={(e)=>{this.setState({signComment:e.target.value})}}/>			                      
 									        </FormItem>
 								        </div>
 				                    </div>
 			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-			                        <Button className="submitSave" type="primary" htmlType="submit">确定项</Button>  
+			                        <Button className="submitSave" type="primary" htmlType="submit">确定项</Button>  
 			                        <Button className="submitSave" type="ghost" onClick={this.noProject}>返回</Button>
 			                    </FormItem> 
 			                </Spin>

+ 4 - 0
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -398,6 +398,10 @@ const MySettlementDetaile = Form.create()(React.createClass({
        		message.warning('请选择项目负责人');
        		return false;
        };
+       if(this.state.signComment&&this.state.signComment.length>45){
+       		message.warning('项目说明字数不能超过45字');
+       		return false;
+       };
 		this.setState({
 			loading: true
 		});