Browse Source

Merge branch 'master' of ssh://git.jishutao.com:55555/jishutao/kede-client

dengzhiguo 6 years ago
parent
commit
a50e704993

+ 2 - 2
js/component/manageCenter/financialManage/bonus/jsBonusDetail.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import ajax from 'jquery/src/ajax/xhr.js';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 import { Form, Spin, message, Modal } from 'antd';
 import { Form, Spin, message, Modal } from 'antd';
-import {getTaskStatus,getProjectStatus,getLiquidationStatus,getJsyPaymentType} from '@/tools.js';
+import {getTaskStatus,getProjectStatus,getLiquidationStatus,getJsyPaymentType,getBonusState} from '@/tools.js';
 
 
 const BonusDetail=React.createClass({
 const BonusDetail=React.createClass({
     getInitialState() {
     getInitialState() {
@@ -84,7 +84,7 @@ const BonusDetail=React.createClass({
                                         <span>{getJsyPaymentType(theData.bonusSubject)}</span>
                                         <span>{getJsyPaymentType(theData.bonusSubject)}</span>
                                     </FormItem>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="发放状态">
                                     <FormItem className="half-item" {...formItemLayout} label="发放状态">
-                                        <span>{theData.grantStatus}</span>
+                                        <span>{getBonusState(theData.grantStatus)}</span>
                                     </FormItem>
                                     </FormItem>
                                 </div>
                                 </div>
 			                </Spin>
 			                </Spin>

+ 7 - 4
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -61,6 +61,7 @@ const PaiDan = React.createClass({
 					this.state.pagination.total=0
 					this.state.pagination.total=0
 				}
 				}
                 this.setState({
                 this.setState({
+                    totalPage:data.data.totalPage,
                     dataSource: theArr,
                     dataSource: theArr,
                     pagination: this.state.pagination
                     pagination: this.state.pagination
                 });
                 });
@@ -76,6 +77,7 @@ const PaiDan = React.createClass({
             searchMore: true,
             searchMore: true,
             assignVisible:false,
             assignVisible:false,
             releaseDate: [],
             releaseDate: [],
+            totalPage:0,
             boHuivisible:false,
             boHuivisible:false,
             selectedRowKeys: [],
             selectedRowKeys: [],
             selectedRows: [],
             selectedRows: [],
@@ -166,12 +168,12 @@ const PaiDan = React.createClass({
     boHuiOk(){
     boHuiOk(){
         this.setState({
         this.setState({
             boHuiVisible:false
             boHuiVisible:false
-        })
-        if((this.state.pagination.total)%10==1){
+        });
+        if((this.state.pagination.current==this.state.totalPage)&&(this.state.pagination.total)%10==1){
             this.loadData((this.state.page)-1);
             this.loadData((this.state.page)-1);
         }else{
         }else{
             this.loadData(this.state.page);
             this.loadData(this.state.page);
-        }
+        };
     },
     },
     boHuiCancel(e){
     boHuiCancel(e){
         this.setState({
         this.setState({
@@ -196,7 +198,7 @@ const PaiDan = React.createClass({
     closeAssign(e, s) {
     closeAssign(e, s) {
         this.state.assignVisible = e;
         this.state.assignVisible = e;
         if (s) {
         if (s) {
-            if((this.state.pagination.total)%10==1){
+            if((this.state.pagination.current==this.state.totalPage)&&(this.state.pagination.total)%10==1){
                 this.loadData((this.state.page)-1);
                 this.loadData((this.state.page)-1);
             }else{
             }else{
                 this.loadData(this.state.page);
                 this.loadData(this.state.page);
@@ -266,6 +268,7 @@ const PaiDan = React.createClass({
                     closeDesc={this.closeDesc.bind(this)}
                     closeDesc={this.closeDesc.bind(this)}
                 />
                 />
                 <Assign
                 <Assign
+                    title='订单'
                     selApi="/api/admin/financial/distributionFinance"
                     selApi="/api/admin/financial/distributionFinance"
                     data={this.state.assignData}
                     data={this.state.assignData}
                     showDesc={this.state.assignVisible}
                     showDesc={this.state.assignVisible}

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

@@ -65,6 +65,7 @@ const ShouKuang = React.createClass({
 					this.state.pagination.total=0
 					this.state.pagination.total=0
 				}
 				}
                 this.setState({
                 this.setState({
+                    totalPage:data.data.totalPage,
                     dataSource: theArr,
                     dataSource: theArr,
                     pagination: this.state.pagination
                     pagination: this.state.pagination
                 });
                 });
@@ -81,6 +82,7 @@ const ShouKuang = React.createClass({
             assignVisible:false,
             assignVisible:false,
             releaseDate: [],
             releaseDate: [],
             assignData:[],
             assignData:[],
+            totalPage:0,
             boHuivisible:false,
             boHuivisible:false,
             selectedRowKeys: [],
             selectedRowKeys: [],
             selectedRows: [],
             selectedRows: [],
@@ -170,7 +172,7 @@ const ShouKuang = React.createClass({
         this.setState({
         this.setState({
             boHuiVisible:false
             boHuiVisible:false
         })
         })
-        if((this.state.pagination.total)%10==1){
+        if((this.state.pagination.current==this.state.totalPage)&&(this.state.pagination.total)%10==1){
             this.loadData((this.state.page)-1);
             this.loadData((this.state.page)-1);
         }else{
         }else{
             this.loadData(this.state.page);
             this.loadData(this.state.page);

+ 6 - 1
js/component/manageCenter/financialManage/distribute/tuiDan.jsx

@@ -51,6 +51,7 @@ const TuiDan = React.createClass({
                             companyName:thisdata.buyName,
                             companyName:thisdata.buyName,
                             buyerName:thisdata.saleName,
                             buyerName:thisdata.saleName,
                             buyerId:'0',
                             buyerId:'0',
+                            refundAmount:thisdata.refundAmount,
                             companyId:thisdata.buyid,
                             companyId:thisdata.buyid,
 		                    orderStatus:thisdata.orderStatus,
 		                    orderStatus:thisdata.orderStatus,
 		                    liquidationStatus:thisdata.liquidationStatus,
 		                    liquidationStatus:thisdata.liquidationStatus,
@@ -67,6 +68,7 @@ const TuiDan = React.createClass({
 					this.state.pagination.total=0
 					this.state.pagination.total=0
 				}
 				}
                 this.setState({
                 this.setState({
+                    totalPage:data.data.totalPage,
                     dataSource: theArr,
                     dataSource: theArr,
                     pagination: this.state.pagination
                     pagination: this.state.pagination
                 });
                 });
@@ -82,6 +84,7 @@ const TuiDan = React.createClass({
             searchMore: true,
             searchMore: true,
             assignVisible:false,
             assignVisible:false,
             releaseDate: [],
             releaseDate: [],
+            totalPage:0,
             assignData:[],
             assignData:[],
             boHuivisible:false,
             boHuivisible:false,
             selectedRowKeys: [],
             selectedRowKeys: [],
@@ -188,8 +191,10 @@ const TuiDan = React.createClass({
         this.state.examineVisible = e;
         this.state.examineVisible = e;
         if (s) {
         if (s) {
             if(nub=='2'){
             if(nub=='2'){
-                if((this.state.pagination.page%10) == '1'){
+                if((this.state.pagination.current==this.state.totalPage)&&(this.state.pagination.total)%10==1){
                     this.loadData(this.state.page-1);
                     this.loadData(this.state.page-1);
+                }else{
+                    this.loadData(this.state.page);
                 }
                 }
             }else{
             }else{
                 this.loadData(this.state.page);
                 this.loadData(this.state.page);

+ 5 - 0
js/component/manageCenter/financialManage/flowWater/departWater.jsx

@@ -66,6 +66,7 @@ const MyWater = React.createClass({
                 payerName:this.state.payerNameSearch,
                 payerName:this.state.payerNameSearch,
                 startTime: this.state.releaseDate[0],
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
                 endTime: this.state.releaseDate[1],
+                orderNo:this.state.orderNo
             },
             },
             success: function (data) {
             success: function (data) {
                 let theArr = [];
                 let theArr = [];
@@ -222,6 +223,7 @@ const MyWater = React.createClass({
     reset() {
     reset() {
         this.state.payeeNameSearch='';
         this.state.payeeNameSearch='';
         this.state.releaseDate = [];
         this.state.releaseDate = [];
+        this.state.orderNo='';
         this.state.payerNameSearch='';
         this.state.payerNameSearch='';
         this.state.departmentId=undefined;
         this.state.departmentId=undefined;
         this.loadData();
         this.loadData();
@@ -259,6 +261,9 @@ const MyWater = React.createClass({
                             })
                             })
                         }
                         }
                     </Select>
                     </Select>
+                    <Input placeholder="订单编号"
+                        value={this.state.orderNo}
+                        onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
                     <Input placeholder="收款方"
                     <Input placeholder="收款方"
                         value={this.state.payeeNameSearch}
                         value={this.state.payeeNameSearch}
                         onChange={(e) => { this.setState({ payeeNameSearch: e.target.value }); }} /> 
                         onChange={(e) => { this.setState({ payeeNameSearch: e.target.value }); }} /> 

+ 5 - 0
js/component/manageCenter/financialManage/flowWater/myWater.jsx

@@ -28,6 +28,7 @@ const MyWater = React.createClass({
                 payerName:this.state.payerNameSearch,
                 payerName:this.state.payerNameSearch,
                 startTime: this.state.releaseDate[0],
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
                 endTime: this.state.releaseDate[1],
+                orderNo:this.state.orderNo
             },
             },
             success: function (data) {
             success: function (data) {
                 let theArr = [];
                 let theArr = [];
@@ -161,6 +162,7 @@ const MyWater = React.createClass({
         this.loadData();
         this.loadData();
     },
     },
     reset() {
     reset() {
+        this.state.orderNo = '';
         this.state.payeeNameSearch='';
         this.state.payeeNameSearch='';
         this.state.releaseDate = [];
         this.state.releaseDate = [];
         this.state.payerNameSearch='';
         this.state.payerNameSearch='';
@@ -188,6 +190,9 @@ const MyWater = React.createClass({
                 <span>我的流水订单</span>
                 <span>我的流水订单</span>
                 </div>
                 </div>
                 <div className="user-search">
                 <div className="user-search">
+                    <Input placeholder="订单编号"
+                        value={this.state.orderNo}
+                        onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
                     <Input placeholder="收款方"
                     <Input placeholder="收款方"
                         value={this.state.payeeNameSearch}
                         value={this.state.payeeNameSearch}
                         onChange={(e) => { this.setState({ payeeNameSearch: e.target.value }); }} /> 
                         onChange={(e) => { this.setState({ payeeNameSearch: e.target.value }); }} /> 

+ 3 - 0
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -255,6 +255,9 @@ const OrderDetail = Form.create()(React.createClass({
                         <FormItem className="half-item" {...formItemLayout} label="是否特批">
                         <FormItem className="half-item" {...formItemLayout} label="是否特批">
 							<span>{getApproval(theData.approval)}</span>
 							<span>{getApproval(theData.approval)}</span>
 						</FormItem>
 						</FormItem>
+                        {this.props.data.orderStatus=='6'&&<FormItem className="half-item" {...formItemLayout} label="已退(万元)">
+							<span>{this.props.data.refundAmount}</span>
+						</FormItem>}
 					</div>
 					</div>
                     <div className="clearfix">
                     <div className="clearfix">
                         <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="合同扫描件">
                         <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="合同扫描件">

+ 5 - 1
js/component/manageCenter/index/contacts/index.jsx

@@ -5,6 +5,7 @@ import moment from 'moment';
 import '@/manageCenter/financialManage/distribute/public.less';
 import '@/manageCenter/financialManage/distribute/public.less';
 import {  Button, Input, Spin, Table, Select, message } from 'antd';
 import {  Button, Input, Spin, Table, Select, message } from 'antd';
 import SelContact from './selContact';
 import SelContact from './selContact';
+import {getPost} from '@/tools';
 
 
 const Contact = React.createClass({
 const Contact = React.createClass({
     departmentList() {
     departmentList() {
@@ -132,7 +133,10 @@ const Contact = React.createClass({
                 },{
                 },{
                     title: '职务',
                     title: '职务',
                     dataIndex: 'position',
                     dataIndex: 'position',
-                    key: 'position'
+                    key: 'position',
+                    render:text=>{
+                        return getPost(text)
+                    }
                 },{
                 },{
                     title: '联系手机',
                     title: '联系手机',
                     dataIndex: 'contactMobile',
                     dataIndex: 'contactMobile',

+ 4 - 1
js/component/manageCenter/index/contacts/selContact.jsx

@@ -2,9 +2,9 @@ import React from 'react';
 import ajax from 'jquery/src/ajax/xhr.js';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 import { Form,Radio, Button, Input, Select, Spin, Table, message, Modal ,Popconfirm} from 'antd';
 import { Form,Radio, Button, Input, Select, Spin, Table, message, Modal ,Popconfirm} from 'antd';
+import {getPost} from '@/tools';
 
 
 const Assign=React.createClass({
 const Assign=React.createClass({
-    
     getInitialState() {
     getInitialState() {
         return {
         return {
             contact:0,
             contact:0,
@@ -45,6 +45,9 @@ const Assign=React.createClass({
                     dataIndex: 'position',
                     dataIndex: 'position',
                     key: 'position',
                     key: 'position',
                     width:150,
                     width:150,
+                    render:text=>{
+                        return getPost(text);
+                    }
                 },{
                 },{
                     title: '联系手机',
                     title: '联系手机',
                     dataIndex: 'contactMobile',
                     dataIndex: 'contactMobile',

+ 1 - 0
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -261,6 +261,7 @@ const PaiDan = React.createClass({
                     closeDesc={this.closeDesc.bind(this)}
                     closeDesc={this.closeDesc.bind(this)}
                 />
                 />
                 <Assign
                 <Assign
+                    title="项目"
                     selApi="/api/admin/financial/distributionFinance"
                     selApi="/api/admin/financial/distributionFinance"
                     data={this.state.assignData}
                     data={this.state.assignData}
                     showDesc={this.state.assignVisible}
                     showDesc={this.state.assignVisible}

+ 1 - 0
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -266,6 +266,7 @@ const Task = React.createClass({
                     closeDesc={this.closeDesc.bind(this)}
                     closeDesc={this.closeDesc.bind(this)}
                 />
                 />
                 <Assign
                 <Assign
+                    title="任务"
                     selApi={this.state.nub?"/api/admin/financial/fenpei":'/api/admin/financial/zhuanjiao'}
                     selApi={this.state.nub?"/api/admin/financial/fenpei":'/api/admin/financial/zhuanjiao'}
                     data={this.state.assignData}
                     data={this.state.assignData}
                     showDesc={this.state.assignVisible}
                     showDesc={this.state.assignVisible}

+ 10 - 5
js/component/manageCenter/publicComponent/assign.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import ajax from 'jquery/src/ajax/xhr.js';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 import { Form,Radio, Button, Input, Select, Spin, Table, message, Modal ,Popconfirm} from 'antd';
 import { Form,Radio, Button, Input, Select, Spin, Table, message, Modal ,Popconfirm} from 'antd';
+import {getPost} from '@/tools'; 
 
 
 const Assign=React.createClass({
 const Assign=React.createClass({
     departmentList() {
     departmentList() {
@@ -45,7 +46,7 @@ const Assign=React.createClass({
 	},
 	},
     getInitialState() {
     getInitialState() {
         return {
         return {
-            contact:0,
+            contact:1,
             selectedRows: [],
             selectedRows: [],
             searchMore: true,
             searchMore: true,
             loading: false,
             loading: false,
@@ -81,7 +82,10 @@ const Assign=React.createClass({
                     title: '职务',
                     title: '职务',
                     dataIndex: 'position',
                     dataIndex: 'position',
                     key: 'position',
                     key: 'position',
-                    width:100
+                    width:100,
+                    render:text=>{
+                        return getPost(text)
+                    }
                 },{
                 },{
                     title: '联系手机',
                     title: '联系手机',
                     dataIndex: 'contactMobile',
                     dataIndex: 'contactMobile',
@@ -94,7 +98,7 @@ const Assign=React.createClass({
                     width:100,
                     width:100,
                     render:(text,record,index)=>{
                     render:(text,record,index)=>{
                     	return (
                     	return (
-                                <Popconfirm title={'您确认将(订单/任务/项目) 【'+this.props.data.orderNo+'】 分配给【'+record.departmentName+'-'+record.name+'】?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
+                                <Popconfirm title={'您确认将'+this.props.title+' 【'+this.props.data.orderNo+'】 分配给【'+record.departmentName+'-'+record.name+'】?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
                                     <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
                                     <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
                                 </Popconfirm>
                                 </Popconfirm>
 							)
 							)
@@ -214,10 +218,11 @@ const Assign=React.createClass({
     componentWillReceiveProps(nextProps) {
     componentWillReceiveProps(nextProps) {
         this.state.visible=nextProps.showDesc;
         this.state.visible=nextProps.showDesc;
         if(nextProps.showDesc){
         if(nextProps.showDesc){
-            this.departmentList();
+            this.contactList();
+            this.departmentList()
         }
         }
         this.setState({
         this.setState({
-            contact:0
+            contact:1
         })
         })
     },
     },
     render() {
     render() {

+ 0 - 1
js/component/manageCenter/topTab.jsx

@@ -356,7 +356,6 @@ const UserModal = React.createClass({
                 pwd: this.state.pwd
                 pwd: this.state.pwd
             }
             }
         }).always(function (data) {
         }).always(function (data) {
-        	 console.log(data);
             if (data.error && data.error.length) {
             if (data.error && data.error.length) {
                 message.warning(data.error[0].message);
                 message.warning(data.error[0].message);
             } else {
             } else {