liting2017 7 years ago
parent
commit
b6309c4dad

+ 1 - 68
js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx

@@ -178,7 +178,6 @@ const MyService=Form.create()(React.createClass({
 							{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>}
-							{record.liquidationStatus<=1?<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.paymentMoney(record)}} type="primary">支付</Button>:''}             
                         </div>
 					}
                 }
@@ -186,52 +185,7 @@ 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));
-    },
+    
     //受理订单
     admissibleOrderOk(e){
     	this.admissibleOrder(e,true)
@@ -480,27 +434,6 @@ const MyService=Form.create()(React.createClass({
 	                    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>
         );
     }

+ 75 - 0
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlement.jsx

@@ -196,11 +196,66 @@ const MySettlement=Form.create()(React.createClass({
                     title: '订单负责人',
                     dataIndex: 'salesmanName',
                     key: 'salesmanName',
+                },{
+                	title: '测试用操作',
+                    dataIndex: 'zhifu',
+                    key: 'zhifu',
+                    render:(text,record)=>{
+						return 	<Button onClick={(e) =>{ e.stopPropagation(),this.paymentMoney(record)}} type="primary">支付</Button>            
+                    	
+                    }
                 }
             ],
             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));
+    },
     //操作分配
     confirmDelet(index){
     	this.setState({
@@ -371,6 +426,26 @@ const MySettlement=Form.create()(React.createClass({
 	                    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">
+	                        	    <Form.Item className="half-middle"
+			                            label="支付金额" >
+		                    			<Input value={this.state.payment} onChange={(e)=>{this.setState({payment:e.target.value})}} style={{width:'220px'}} />
+		                    			<span className="mandatory">*</span>
+			                    	</Form.Item>
+			                    	<Button type="primary" onClick={this.payment} style={{marginTop:'35px',marginRight:'10px'}}>支付</Button>
+			                    	<Button onClick={this.paymentCancel}>取消</Button>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
             </div>
         );
     }