Browse Source

合并代码

liting2017 6 years ago
parent
commit
adf9402354

+ 6 - 6
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -168,7 +168,11 @@ const PaiDan = 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({
@@ -235,11 +239,7 @@ const PaiDan = React.createClass({
         }).done(function (data) {
             if (!data.error.length) {
                 message.success('驳回成功!');
-                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);
             };

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

@@ -197,6 +197,10 @@ const MyWater = React.createClass({
             startTime: this.state.releaseDate[0],
             endTime: this.state.releaseDate[1],
         }
+        if((data.departmentId||data.payeeName||data.payerName||data.startTime||data.endTime)&&!this.state.dataSource.length){
+            message.warning('暂无数据.');
+            return ;
+        }
         window.location.href=(globalConfig.context+'/api/admin/financial/exportBillData?'+$.param(data));
     },
     componentWillMount() {