liting2017 6 years ago
parent
commit
912e2621fa

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

@@ -77,7 +77,7 @@ const Examine=React.createClass({
             });
             if (!data.error.length) {
                 message.success('操作成功!');
-                this.onShow();
+                this.onShow(index);
             } else {
                 message.warning(data.error[0].message);
             }
@@ -89,11 +89,11 @@ const Examine=React.createClass({
         })
         this.props.closeDesc(false,false);
     },
-    onShow() {
+    onShow(index) {
 		this.setState({
 			visible: false,
 		});
-		this.props.closeDesc(false, true);
+		this.props.closeDesc(false, true,index);
 	},
     componentWillMount() {
         this.setState({

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

@@ -167,7 +167,7 @@ const PaiDan = React.createClass({
         this.setState({
             boHuiVisible:false
         })
-        if((this.state.total)%10==1){
+        if((this.state.pagination.total)%10==1){
             this.loadData((this.state.page)-1);
         }else{
             this.loadData(this.state.page);
@@ -190,17 +190,13 @@ const PaiDan = React.createClass({
     closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
-            if((this.state.total)%10==1){
-                this.loadData((this.state.page)-1);
-            }else{
-                this.loadData(this.state.page);
-            }
+            this.loadData(this.state.page);
         };
     },
     closeAssign(e, s) {
         this.state.assignVisible = e;
         if (s) {
-            if((this.state.total)%10==1){
+            if((this.state.pagination.total)%10==1){
                 this.loadData((this.state.page)-1);
             }else{
                 this.loadData(this.state.page);

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

@@ -170,7 +170,7 @@ const ShouKuang = React.createClass({
         this.setState({
             boHuiVisible:false
         })
-        if((this.state.total)%10==1){
+        if((this.state.pagination.total)%10==1){
             this.loadData((this.state.page)-1);
         }else{
             this.loadData(this.state.page);

+ 8 - 2
js/component/manageCenter/financialManage/distribute/tuiDan.jsx

@@ -183,11 +183,17 @@ const TuiDan = React.createClass({
             showDesc: true,
         });
     },
-    closeExamine(e, s) {
+    closeExamine(e, s,nub) {
         this.state.examineData={};
         this.state.examineVisible = e;
         if (s) {
-            this.loadData(this.state.page);
+            if(nub=='2'){
+                if((this.state.pagination.page%10) == '1'){
+                    this.loadData(this.state.page-1);
+                }
+            }else{
+                this.loadData(this.state.page);
+            }
         };
     },
     closeDesc(e, s) {

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

@@ -144,17 +144,11 @@ const MyWater = React.createClass({
                     title: '收款方',
                     dataIndex: 'payeeName',
                     key: 'payeeName',
-                    // render:(text,recard)=>{
-                    //     return (recard.transactionAmount&&Number(recard.transactionAmount)<0)?recard.payerName:text
-                    // }
                 }, 
                 {
                     title: '付款方',
                     dataIndex: 'payerName',
                     key: 'payerName',
-                    // render:(text,recard)=>{
-                    //     return (recard.transactionAmount&&Number(recard.transactionAmount)<0)?recard.payeeName:text
-                    // }
                 },
                 {
                     title: '流水科目',

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

@@ -106,17 +106,11 @@ const MyWater = React.createClass({
                     title: '收款方',
                     dataIndex: 'payeeName',
                     key: 'payeeName',
-                    // render:(text,recard)=>{
-                    //     return (recard.transactionAmount&&Number(recard.transactionAmount)<0)?recard.payerName:text
-                    // }
                 }, 
                 {
                     title: '付款方',
                     dataIndex: 'payerName',
                     key: 'payerName',
-                    // render:(text,recard)=>{
-                    //     return (recard.transactionAmount&&Number(recard.transactionAmount)<0)?recard.payeeName:text
-                    // }
                 },
                 {
                     title: '流水科目',