Browse Source

增加退款功能

liting2017 7 years ago
parent
commit
fd50d2f313

+ 1 - 1
js/component/dataDic.js

@@ -1953,7 +1953,7 @@ module.exports = {
 	        key: "退款待确认"
 	    }, {
 	        value: "4",
-	        key: "退款已同意"
+	        key: "退款"
 	    }, {
 	        value: "5",
 	        key: "退款已拒绝"

+ 1 - 1
js/component/manageCenter/achievement/content.jsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import '../content.less';
 import LeftTab from '../leftTab';
 import TechAchievement from './techAchievement';
-import {getMenu} from '../publicMenu.jsx'
+import {getMenu} from '../publicMenu.js'
 
 class Content extends Component {
     constructor() {

+ 1 - 1
js/component/manageCenter/customer/content.jsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import '../content.less';
 import LeftTab from '../leftTab';
-import {getMenu} from '../publicMenu.jsx'
+import {getMenu} from '../publicMenu.js'
 
 class Content extends Component {
     constructor() {

+ 1 - 1
js/component/manageCenter/demand/content.jsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import '../content.less';
 import LeftTab from '../leftTab';
 import TechDemand from './techDemand';
-import {getMenu} from '../publicMenu.jsx'
+import {getMenu} from '../publicMenu.js'
 
 class Content extends Component {
     constructor() {

+ 1 - 1
js/component/manageCenter/idea/content.jsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import '../content.less';
 import './content.less';
 import LeftTab from '../leftTab';
-import {getMenu} from '../publicMenu.jsx'
+import {getMenu} from '../publicMenu.js'
 
 class Content extends Component {
     constructor() {

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

@@ -3,7 +3,7 @@ import { Menu, Icon } from 'antd';
 import './leftTab.less';
 const SubMenu = Menu.SubMenu;
 const MenuItemGroup = Menu.ItemGroup;
-import {getMenu} from './publicMenu.jsx'
+import {getMenu} from './publicMenu.js'
 
 const LeftTab = React.createClass({
     getInitialState() {

+ 1 - 1
js/component/manageCenter/operate/content.jsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import '../content.less';
 import './content.less';
 import LeftTab from '../leftTab';
-import {getMenu} from '../publicMenu.jsx'
+import {getMenu} from '../publicMenu.js'
 
 class Content extends Component {
     constructor() {

+ 1 - 1
js/component/manageCenter/order/content.jsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import '../content.less';
 import './content.less';
 import LeftTab from '../leftTab';
-import {getMenu} from '../publicMenu.jsx'
+import {getMenu} from '../publicMenu.js'
 
 
 class Content extends Component {

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

@@ -161,7 +161,7 @@ const NewService = Form.create()(React.createClass({
                     dataIndex: 'ABC',
                     key: 'ABC',
                     render: (text, record, index) => {
-						return <div style={{display:this.props.datauser.active.applySign?'block':'none'}}>
+						return <div style={{display:this.props.datauser.active.applySign||this.state.changeStatus==1?'block':'none'}}>
 								<Popconfirm title="是否删除?" onConfirm={(e)=>{this.delectRow(record)}} okText="是" cancelText="否">
 								    <Button onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>                 
 								</Popconfirm>
@@ -305,6 +305,7 @@ const NewService = Form.create()(React.createClass({
                 this.setState({
 					id:thisData.id,
 					orderList:thisData,
+					changeStatus:thisData.changeStatus,
 					orderAmount:thisData.orderAmount,
 					firstPayment:thisData.firstPayment,
 					signTotalAmount:thisData.signTotalAmount,
@@ -1170,7 +1171,7 @@ const NewService = Form.create()(React.createClass({
 					                    		</div>
 					                    		<div>
 								                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
-								                	{this.props.datauser.active.applySign?<Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px',display:true?'block':'none'}}>添加明细</Button>:''}
+								                	{this.props.datauser.active.applySign||orderDetaiel.changeStatus==1?<Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px',display:true?'block':'none'}}>添加明细</Button>:''}
 								                </div>
 								                <div className="patent-table">
 								                    <Spin spinning={this.state.loading}>

+ 3 - 2
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -170,7 +170,7 @@ const NewService = Form.create()(React.createClass({
                     dataIndex: 'ABC',
                     key: 'ABC',
                     render: (text, record, index) => {
-						return <div style={{display:this.props.datauser.active.applySign?'block':'none'}}>
+						return <div style={{display:this.props.datauser.active.applySign||this.state.changeStatus==1?'block':'none'}}>
 								<Popconfirm title="是否删除?" onConfirm={(e)=>{this.delectRow(record)}} okText="是" cancelText="否">
 								    <Button onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>                 
 								</Popconfirm>
@@ -329,6 +329,7 @@ const NewService = Form.create()(React.createClass({
                 };
                 this.setState({
 					id:thisData.id,
+					changeStatus:thisData.changeStatus,
 					orderList:thisData,
 					orderAmount:thisData.orderAmount,
 					firstPayment:thisData.firstPayment,
@@ -1450,7 +1451,7 @@ const NewService = Form.create()(React.createClass({
 					                    		</div>
 					                    		<div>
 								                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
-								                	{this.props.datauser.active.applySign?<Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加明细</Button>:''}
+								                	{this.props.datauser.active.applySign||orderDetaiel.changeStatus==1?<Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加明细</Button>:''}
 								                </div>
 								                <div className="patent-table">
 								                    <Spin spinning={this.state.loading}>

+ 28 - 12
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlement.jsx

@@ -9,6 +9,8 @@ import moment from 'moment';
 import '../../userMangagement.less';
 import {paymentState ,orderChannel,orderState} from '../../../../dataDic.js';
 import {getProjectState,getOrderChannel,getOrderType,getOrderState,getPaymentState,getApprovedState} from '../../../../tools.js';
+import {setUserContactsList} from '../../../publicMenu.js'
+
 
 const MySettlement=Form.create()(React.createClass({
 	loadData(pageNo,depart) {
@@ -205,10 +207,10 @@ const MySettlement=Form.create()(React.createClass({
                     key: 'zhifu',
                     render:(text,record)=>{
 						return 	<div>
-									<Button onClick={(e) =>{ e.stopPropagation(),this.paymentMoney(record)}} type="dashed">支付</Button>
-							    	<Button style={{marginLeft:'5px',}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">转交</Button>               
+									{record.liquidationStatus<2&&<Button onClick={(e) =>{ e.stopPropagation(),this.paymentMoney(record)}} type="dashed">支付</Button>}
+							    	<Button style={{margin:'0 5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">转交</Button>               
+									{record.liquidationStatus==4&&<Button onClick={(e) =>{ e.stopPropagation(),this.refundMoney(record)}} type="danger">退款</Button>}
 								</div>
-                    			
                     }
                 }
             ],
@@ -250,12 +252,22 @@ const MySettlement=Form.create()(React.createClass({
         };
     },
     //测试用支付
-     //支付
+    //支付
     paymentMoney(record){
     	this.setState({
     		kid:record.orderNo,
     		payment:'',
-    		paymentVisible:true
+    		paymentVisible:true,
+    		paymentMoneyState:true
+    	})
+    },
+    //退款
+    refundMoney(record){
+    	this.setState({
+    		kid:record.orderNo,
+    		payment:'',
+    		paymentVisible:true,
+    		paymentMoneyState:false
     	})
     },
     paymentCancel(){
@@ -266,7 +278,7 @@ const MySettlement=Form.create()(React.createClass({
     //支付保存
     payment(){
     	if(!this.state.payment){
-    		message.warning('请输入支付金额!');
+    		message.warning('请输入金额!');
     		return;
     	};
     	this.setState({
@@ -274,18 +286,22 @@ const MySettlement=Form.create()(React.createClass({
             loading: true,
             showDesc:false
         });
+        let api = this.state.paymentMoneyState?'/api/admin/order/testPay':'/api/admin/order/testRefund';
         $.ajax({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/order/testPay',
-            data: {
+            url: globalConfig.context + api,
+            data: this.state.paymentMoneyState?{
             	orderNo:this.state.kid,
             	payAmount:this.state.payment
+            }:{
+            	orderNo:this.state.kid,
+            	refundAmount:this.state.payment
             }
         }).done(function (data) {
             if (!data.error.length) {
-                message.success('支付成功!');
+                message.success(this.state.paymentMoneyState?'支付成功!':'退款成功!');
                 this.paymentCancel();
                 this.loadData(this.state.pageNo);
                 this.setState({
@@ -545,7 +561,7 @@ const MySettlement=Form.create()(React.createClass({
 	            <Modal maskClosable={false} visible={this.state.paymentVisible}
                         onOk={this.paymentCancel} onCancel={this.paymentCancel}
                         width='600px'
-                        title='支付详情'                     
+                        title= {this.state.paymentMoneyState?'支付详情':'退款详情'}                    
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form">
@@ -554,11 +570,11 @@ const MySettlement=Form.create()(React.createClass({
 	                        	    <Form.Item className="half-middle"
 	                        	    	labelCol={{ span: 8 }}
 										wrapperCol={{ span: 14 }}
-			                            label="支付金额(万元)" >
+			                            label={this.state.paymentMoneyState?"支付金额(万元)":'退款金额'} >
 		                    			<Input value={this.state.payment} onChange={(e)=>{this.setState({payment:e.target.value})}} style={{width:'150px'}} />
 		                    			<span className="mandatory">*</span>
 			                    	</Form.Item>
-			                    	<Button type="primary" onClick={this.payment} style={{marginRight:'20px',marginLeft:'210px'}}>支付</Button>
+			                    	<Button type="primary" onClick={this.payment} style={{marginRight:'20px',marginLeft:'210px'}}>{this.state.paymentMoneyState?'支付':'退款'}</Button>
 			                    	<Button onClick={this.paymentCancel}>取消</Button>
 		                        </div>
 			                </Spin>

+ 2 - 3
js/component/manageCenter/publicMenu.jsx

@@ -1,9 +1,9 @@
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 
-var menuArr=[];
 module.exports={
 	getMenu:function(index){
+		var menuArr=[];
 		$.ajax({
     		method: "get",
             dataType: "json",
@@ -21,10 +21,9 @@ module.exports={
 	                };
 	            };
 	            menuArr=data.data;
-	            return menuArr;
 			}
 		})
 		return menuArr;
-	}	
+	},
 }
 	

+ 1 - 1
js/component/manageCenter/servicesManage/leftTab.jsx

@@ -3,7 +3,7 @@ import { Menu, Icon } from 'antd';
 import '../leftTab.less';
 const SubMenu = Menu.SubMenu;
 const MenuItemGroup = Menu.ItemGroup;
-import {getMenu} from '../publicMenu.jsx'
+import {getMenu} from '../publicMenu.js'
 
 const LeftTab = React.createClass({
     getInitialState() {

+ 1 - 1
js/component/manageCenter/set/content.jsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import '../content.less';
 import './content.less';
 import LeftTab from '../leftTab';
-import {getMenu} from '../publicMenu.jsx'
+import {getMenu} from '../publicMenu.js'
 
 class Content extends Component {
     constructor() {

+ 1 - 1
js/component/manageCenter/userOrder/content.jsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import '../content.less';
 import './content.less';
 import LeftTab from '../leftTab';
-import {getMenu} from '../publicMenu.jsx'
+import {getMenu} from '../publicMenu.js'
 
 class Content extends Component {
     constructor() {

+ 0 - 1
js/component/tools.js

@@ -349,7 +349,6 @@ module.exports = {
         });
         return theArr;
     },
-    
     setUserContactsList(){
         let theOption = [];
         $.ajax({