Browse Source

财务管理优化

liting2017 6 years ago
parent
commit
3aefd2cc29

+ 13 - 3
js/component/manageCenter/financialManage/distribute/receivable.jsx

@@ -1,8 +1,9 @@
 import React from 'react';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import { Form, Button, Input, Select, Spin,InputNumber, message, Modal } from 'antd';
+import { Form, Button, Input, Select, Spin,InputNumber, message, Modal ,DatePicker} from 'antd';
 import {transactionProject,transactionChannel} from '@/dataDic.js';
+import moment from 'moment';
 
 const Receivable=React.createClass({
     loadData(record) {
@@ -77,6 +78,7 @@ const Receivable=React.createClass({
                 transactionSubject: this.state.transactionProject,
                 transactionChannel: this.state.transactionChannel,
                 financialPayNo:this.state.financialPayNo,
+                financialPayTimes:this.state.financialPayTimes,
                 remarks:this.state.remarks
             }
         }).done(function (data) {
@@ -109,6 +111,7 @@ const Receivable=React.createClass({
             settlementAmount:undefined,
             transactionChannel:undefined,
             financialPayNo:'',
+            financialPayTimes:undefined,
             remarks:''
         })
     },
@@ -121,6 +124,8 @@ const Receivable=React.createClass({
             transactionProject:undefined,
             settlementAmount:undefined,
             transactionChannel:undefined,
+            financialPayNo:'',
+            financialPayTimes:undefined,
             remarks:''
         })
     },
@@ -129,7 +134,7 @@ const Receivable=React.createClass({
         const { getFieldDecorator,getFieldsValue } = this.props.form;
         const FormItem = Form.Item;
         const formItemLayout = {
-            labelCol: { span: 10 },
+            labelCol: { span: 8 },
             wrapperCol: { span: 12 },
 		};
         return (
@@ -189,7 +194,12 @@ const Receivable=React.createClass({
                                             onChange={(e) => { this.setState({ financialPayNo: e.target.value }); }} />  
                                                         
                                     </FormItem>
-                                    <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 16 }} label="备注">
+                                    <FormItem className="half-item" {...formItemLayout} label="财务流水时间">
+                                        <DatePicker
+                                            value={this.state.financialPayTimes ? moment(this.state.financialPayTimes) : null}
+                                            onChange={(data, dataString) => { this.setState({ financialPayTimes: dataString }); }} />
+                                    </FormItem>
+                                    <FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 16 }} label="备注">
                                         <Input
                                             type="textarea"
                                             rows={4}

+ 3 - 3
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -17,10 +17,10 @@ const ShouKuang = React.createClass({
             loading: true
         });
         $.ajax({
-            method: "get",
+            method: "post",
             dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/financial/financeList",
+            crossDomain: false,     ///api/admin/financial/financeList
+            url: globalConfig.context + "/api/admin/order/listAllSettlement", 
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,