Browse Source

财务管理接口联调

liting2017 6 years ago
parent
commit
5939186bb3

+ 4 - 4
js/component/manageCenter/financialManage/bonus/bonusDetail.jsx

@@ -62,16 +62,16 @@ const BonusDetail=React.createClass({
                                     <FormItem className="half-item" {...formItemLayout} label="客户名称">
                                         <span>{theData.buyerName}</span>
                                     </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="签单金额">
+                                    <FormItem className="half-item" {...formItemLayout} label="签单金额(万元)">
                                         <span>{theData.transactionAmount}</span>
                                     </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="首付款">
+                                    <FormItem className="half-item" {...formItemLayout} label="首付款(万元)">
                                         <span>{theData.name}</span>
                                     </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="已收">
+                                    <FormItem className="half-item" {...formItemLayout} label="已收(万元)">
                                         <span>{theData.liquidationStatus}</span>
                                     </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="已退">
+                                    <FormItem className="half-item" {...formItemLayout} label="已退(万元)">
                                         <span>{theData.orderNo}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="订单状态">

+ 18 - 3
js/component/manageCenter/financialManage/bonus/jsBonus.jsx

@@ -90,7 +90,7 @@ const JsBonus = React.createClass({
 		                    approval:thisdata.approval,
 		                    creater:thisdata.creater,
                             createTime:thisdata.createTime?(new Date(thisdata.createTime)).toLocaleString():'',
-                            signTime:thisdata.releaseDate?(new Date(thisdata.releaseDate)).toLocaleString():''
+                            signTime:thisdata.signTime?(new Date(thisdata.signTime)).toLocaleString():''
                         });
                     };
                 }
@@ -270,7 +270,22 @@ const JsBonus = React.createClass({
     },
     //导出
     exportExec(){
-        window.open(globalConfig.context + '/api/user/achievement/downloadTemplate?sign=achievement_template')
+        let departmentName='',
+        depart =this.state.departmentArr || [];
+        depart.map(item=>{
+            if(this.state.departmentId==item.id){
+                departmentName=item.name;
+                return;
+            }
+        });
+        let data = {
+            departmentId:this.state.departmentId,
+            departmentName:departmentName,
+            ownerName: this.state.nameSearch,//订单负责人
+            startDate: this.state.releaseDate[0],
+            endDate: this.state.releaseDate[1],
+        }
+        window.location.href=(globalConfig.context+'/api/admin/financial/exportBillData?'+$.param(data));
     },
     //保存发放状态
     boHuiSubmit(e){
@@ -348,7 +363,7 @@ const JsBonus = React.createClass({
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <div style={{float:'right'}}>
-                       <Button onClick={this.exportExec}>导出</Button>
+                       <Button onClick={this.exportExec}>导出exec</Button>
                     </div>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>

+ 17 - 2
js/component/manageCenter/financialManage/bonus/yxBonus.jsx

@@ -268,7 +268,22 @@ const YxBonus = React.createClass({
     },
     //导出
     exportExec(){
-        window.open(globalConfig.context + '/api/user/achievement/downloadTemplate?sign=achievement_template')
+        let departmentName='',
+        depart =this.state.departmentArr || [];
+        depart.map(item=>{
+            if(this.state.departmentId==item.id){
+                departmentName=item.name;
+                return;
+            }
+        });
+        let data = {
+            departmentId:this.state.departmentId,
+            departmentName:departmentName,
+            ownerName: this.state.nameSearch,//订单负责人
+            startDate: this.state.releaseDate[0],
+            endDate: this.state.releaseDate[1],
+        }
+        window.location.href=(globalConfig.context+'/api/admin/financial/exportBillData?'+$.param(data));
     },
     //保存发放状态
     boHuiSubmit(e){
@@ -348,7 +363,7 @@ const YxBonus = React.createClass({
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <div style={{float:'right'}}>
-                       <Button onClick={this.exportExec}>导出</Button>
+                       <Button onClick={this.exportExec}>导出exec</Button>
                     </div>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>

+ 12 - 5
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -49,8 +49,8 @@ const PaiDan = React.createClass({
                             signTotalAmount:thisdata.signTotalAmount,
                             buyerName:thisdata.buyerName,
                             sellerName:thisdata.sellerName,
-                            createTime:thisdata.createTime,
-                            signTime:thisdata.signTime
+                            createTime:thisdata.createTime?new Date(thisdata.createTime).toLocaleString():'',
+                            signTime:thisdata.signTime,
                         });
                     };
                 }
@@ -187,13 +187,21 @@ const PaiDan = React.createClass({
     closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
-            this.loadData(this.state.page);
+            if((this.state.total)%10==1){
+                this.loadData((this.state.page)-1);
+            }else{
+                this.loadData(this.state.page);
+            }
         };
     },
     closeAssign(e, s) {
         this.state.assignVisible = e;
         if (s) {
-            this.loadData(this.state.page);
+            if((this.state.total)%10==1){
+                this.loadData((this.state.page)-1);
+            }else{
+                this.loadData(this.state.page);
+            }
         };
     },
     search() {
@@ -257,7 +265,6 @@ const PaiDan = React.createClass({
         };
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
-        const hasSelect = this.state.selectedRowKeys.length;
         return ( <div className="user-content">
             <div className="content-title">
                     <span>派单管理</span>

+ 9 - 42
js/component/manageCenter/financialManage/distribute/receivable.jsx

@@ -6,37 +6,6 @@ import {transactionProject,transactionChannel} from '@/dataDic.js';
 import moment from 'moment';
 
 const Receivable=React.createClass({
-    loadData(record) {
-        this.state.data = [];
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/financial/selectOneOrderAllRefundFlow',
-            data: {
-            	orderNo:record?record.orderNo:this.props.data.orderNo
-            },
-            success: function (data) {
-                let thisdata = data.data;
-                if (!thisdata.length) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    this.setState({
-                        data:thisdata,
-                    });
-                }
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
     getInitialState() {
         return {
             loading: false,
@@ -63,15 +32,16 @@ const Receivable=React.createClass({
         this.setState({
             loading: true
         });
+        let data = this.props.data || {};
         $.ajax({
             method: "post",
             dataType: "json",
             async:true,
             url:  globalConfig.context + this.props.api,
             data: {
-                orderNo: this.state.data.orderNo,
-                payeeId:this.state.data.payeeId,
-                payerId:this.state.data.payerId,
+                orderNo: data.orderNo,
+                payeeId:data.companyId,
+                payerId:data.buyerId,
                 transactionAmount: this.state.settlementAmount,
                 transactionSubject: this.state.transactionProject,
                 transactionChannel: this.state.transactionChannel,
@@ -115,9 +85,6 @@ const Receivable=React.createClass({
     },
     componentWillReceiveProps(nextProps) {
         this.state.visible=nextProps.showDesc;
-        if(nextProps.data.orderNo){
-            this.loadData(nextProps.data);
-        }
         this.setState({
             transactionProject:undefined,
             settlementAmount:undefined,
@@ -128,7 +95,7 @@ const Receivable=React.createClass({
         })
     },
     render() {
-        const theData = this.state.data || {};
+        const theData = this.props.data || {};
         const FormItem = Form.Item;
         const formItemLayout = {
             labelCol: { span: 8 },
@@ -146,10 +113,10 @@ const Receivable=React.createClass({
 			                <Spin spinning={this.state.loading}>
                                 <div className="clearfix">
                                     <FormItem className="half-item" {...formItemLayout} label="付款方">
-                                        <span>{theData.payerName}</span>
+                                        <span>{theData.buyerName}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="收款方">
-                                        <span>{theData.payeeName}</span>
+                                        <span>{theData.companyName}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label={<span><strong style={{color:'#f00'}}>*</strong>金额</span>}>
                                         <InputNumber min={0} max={9999} placeholder="金额" 
@@ -210,8 +177,8 @@ const Receivable=React.createClass({
                                             }}
                                         />
                                     </FormItem>
-                                    <FormItem wrapperCol={{ span: 12, offset:5 }}>  
-                                        <Button type="primary" htmlType="submit"  style={{marginRight:20}}>确认</Button>
+                                    <FormItem wrapperCol={{ span: 12, offset:4 }}>  
+                                        <Button type="primary" htmlType="submit"  style={{marginRight:30}}>确认</Button>
                                         <Button type="default" onClick={()=>{this.onCancel()}}>取消</Button>
                                     </FormItem>  
                                 </div>

+ 16 - 12
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -45,12 +45,16 @@ const ShouKuang = React.createClass({
 		                    orderNo: thisdata.orderNo,
 		                    orderType:thisdata.orderType,
 		                    orderStatus:thisdata.orderStatus,
-		                    sellerName:thisdata.processStatus,
+		                    sellerName:thisdata.sellerName,
 		                    liquidationStatus:thisdata.liquidationStatus,
 		                    approval:thisdata.approval,
 		                    buyerName:thisdata.buyerName,
                             actuallyTotalAmount:thisdata.actuallyTotalAmount,
-                            signTime:thisdata.releaseDate?(new Date(thisdata.releaseDate)).toLocaleString():''
+                            signTime:thisdata.signTime?(new Date(thisdata.signTime)).toLocaleString():'',
+                            companyId:thisdata.companyId,
+                            companyName:thisdata.companyName,
+                            buyerId:thisdata.buyerId,
+                            buyerName:thisdata.buyerName
                         });
                     };
                 }
@@ -105,7 +109,7 @@ const ShouKuang = React.createClass({
                     key: 'signTime',
                 },
                 {
-                    title: '已收款',
+                    title: '已收款(万元)',
                     dataIndex: 'actuallyTotalAmount',
                     key: 'actuallyTotalAmount',
                 },
@@ -137,8 +141,8 @@ const ShouKuang = React.createClass({
                     key: 'caouzo',
                     render:(text,recard)=>{
                         return <div>
-                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>添加收款记录</Button>
-                            <Button type="danger" onClick={(e)=>{e.stopPropagation(),this.reject(recard)}}>驳回</Button>
+                            {recard.liquidationStatus<2&&<Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>添加收款记录</Button>}
+                            {!(recard.actuallyTotalAmount&&Number(recard.actuallyTotalAmount)>0)&&<Button type="danger" onClick={(e)=>{e.stopPropagation(),this.reject(recard)}}>驳回</Button>}
                         </div>
                     }
                 }
@@ -166,7 +170,11 @@ const ShouKuang = React.createClass({
         this.setState({
             boHuiVisible:false
         })
-        this.loadData(this.state.page);
+        if((this.state.total)%10==1){
+            this.loadData((this.state.page)-1);
+        }else{
+            this.loadData(this.state.page);
+        }
     },
     boHuiCancel(e){
         this.setState({
@@ -227,13 +235,9 @@ const ShouKuang = React.createClass({
             if (!data.error.length) {
                 message.success('驳回成功!');
                 this.setState({
-                    loading: false
+                    loading: false,
                 });
-                if((this.state.total)%10==1){
-                    this.loadData((this.state.page)-1);
-                }else{
-                    this.loadData(this.state.page);
-                }
+                this.boHuiOk();
             } else {
                 message.warning(data.error[0].message);
             };

+ 28 - 6
js/component/manageCenter/financialManage/flowWater/departWater.jsx

@@ -54,10 +54,10 @@ const MyWater = React.createClass({
             loading: true
         });
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/order/listAllSettlement",
+            url: globalConfig.context + "/api/admin/financial/deptBillList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
@@ -85,7 +85,7 @@ const MyWater = React.createClass({
 		                    payerName:thisdata.payerName,
 		                    transactionSubject:thisdata.transactionSubject,
 		                    transactionChannel:thisdata.transactionChannel,
-                            financialPayTimes:thisdata.createTime?(new Date(thisdata.createTime)).toLocaleString():'',
+                            financialPayTimes:thisdata.financialPayTimes?(new Date(thisdata.financialPayTimes)).toLocaleString():'',
                             financialPayNo:thisdata.financialPayNo,
 		                    createrName:thisdata.createrName,
 		                    saleName:thisdata.saleName,
@@ -131,12 +131,12 @@ const MyWater = React.createClass({
             },
             columns: [
                 {
-                    title: '平台流水号',
+                    title: '平台流水号',
                     dataIndex: 'billNo',
                     key: 'billNo',   
                 },
                 {
-                    title: '金额',
+                    title: '金额(万元)',
                     dataIndex: 'transactionAmount',
                     key: 'transactionAmount',
                 },
@@ -179,6 +179,26 @@ const MyWater = React.createClass({
             searchTime: [,]
         }
     },
+    //导出exec
+    export(){
+        let departmentName='',
+        depart =this.state.departmentArr || [];
+        depart.map(item=>{
+            if(this.state.departmentId==item.id){
+                departmentName=item.name;
+                return;
+            }
+        });
+        let data = {
+            departmentId:this.state.departmentId,
+            departmentName:departmentName,
+            payeeName: this.state.payeeNameSearch,
+            payerName:this.state.payerNameSearch,
+            startTime: this.state.releaseDate[0],
+            endTime: this.state.releaseDate[1],
+        }
+        window.location.href=(globalConfig.context+'/api/admin/financial/exportBillData?'+$.param(data));
+    },
     componentWillMount() {
         this.loadData();
         this.departmentList();
@@ -190,6 +210,7 @@ const MyWater = React.createClass({
         });
     },
     closeDesc(e, s) {
+        this.state.RowData={};
         this.state.showDesc = e;
         if (s) {
             this.loadData(this.state.page);
@@ -246,9 +267,10 @@ const MyWater = React.createClass({
                         onChange={(e) => { this.setState({ payerNameSearch: e.target.value }); }} />  
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
+                    <Button style={{float:"right"}} onClick={this.export}>导出exec</Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                        <span>订单时间 :</span>
+                        <span>流水时间 :</span>
                         <RangePicker
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
                             this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}

+ 1 - 1
js/component/manageCenter/financialManage/flowWater/myWater.jsx

@@ -4,7 +4,7 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import '../distribute/public.less';
 import {  Button, Input, Spin, Table, Switch, message, DatePicker } from 'antd';
-import {getTransactionChannel,getTransactionProject} from '@/tools';
+import {getTransactionProject} from '@/tools';
 import WaterDesc from './waterDetail';
 
 const MyWater = React.createClass({

+ 3 - 8
js/component/manageCenter/financialManage/flowWater/waterDetail.jsx

@@ -25,14 +25,9 @@ const WaterDetail=React.createClass({
                         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,
-                             data:thisdata,
-                             orderNo:thisdata.orderNo,
-                        });
-                    };
+                    this.setState({
+                        data:data.data,
+                    })
                    }
             }.bind(this),
         }).always(function () {

+ 1 - 1
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -232,7 +232,7 @@ const OrderDetail = Form.create()(React.createClass({
 							<span>{theData.orderNo}</span>
 						</FormItem>
                         <FormItem className="half-item" {...formItemLayout} label="签单时间">
-							<span>{theData.signDate}</span>
+							<span>{theData.signTime?new Date(theData.signTime).toLocaleString():''}</span>
 						</FormItem>
                         <FormItem className="half-item" {...formItemLayout} label="客户名称">
 							<span>{theData.userName}</span>

+ 1 - 1
js/component/manageCenter/publicComponent/assign.jsx

@@ -174,7 +174,7 @@ const Assign=React.createClass({
             url: globalConfig.context +this.props.selApi,
             data: {
             	orderNo:this.props.data.orderNo,
-                financeId:record.id,    //财务专员id
+                financeId:record.id,    //分配人物id
                 approval:this.props.data.approval   //是否特批
             }
         }).done(function (data) {