liting2017 6 years ago
parent
commit
6ef22fb9ed
2 changed files with 6 additions and 4 deletions
  1. 4 2
      js/component/manageCenter/statistics/order/index.jsx
  2. 2 2
      webpack.config.js

+ 4 - 2
js/component/manageCenter/statistics/order/index.jsx

@@ -51,6 +51,7 @@ const Order = React.createClass({
             page:pageNo,
             loading: true
         });
+        let orderN = Number(this.state.orderType);
         let time = new Date(),
             year = time.getFullYear(),
             month = time.getMonth()+1,
@@ -66,7 +67,7 @@ const Order = React.createClass({
                 pageSize:this.state.pagination.pageSize,
                 saleName: this.state.signName,//客户名称
                 departmentId:this.state.departmenttList,
-                type:this.state.orderType>='0'?Number(this.state.orderType)+1:'',
+                type:orderN>=0?orderN+1:'',
                 month: mon1||Number((year+''+month)),
                 month1: mon2||Number((month+1>12?year+1:year)+''+(month+1>12?'01':month+1)),
             },
@@ -191,6 +192,7 @@ const Order = React.createClass({
     },
     //导出exec
     exec(){
+        let orderN = Number(this.state.orderType);
         let time = new Date(),
             year = time.getFullYear(),
             month = time.getMonth()+1,
@@ -199,7 +201,7 @@ const Order = React.createClass({
         let data = {
             departmentId:this.state.departmentId,
             saleName: this.state.signName,
-            type:this.state.orderType>='0'?Number(this.state.orderType)+1:'',
+            type:orderN>=0?orderN+1:'',
             month: mon1||Number((year+''+month)),
             month1: mon2||Number((month+1>12?year+1:year)+''+(month+1>12?'01':month+1)),
         }

+ 2 - 2
webpack.config.js

@@ -304,7 +304,7 @@ module.exports = (function () {
     }
 
     //let staticHost = 'http://afts.hnzhiming.com';
-    let staticHost = 'http://192.168.0.190';
+    let staticHost = 'http://192.168.0.188';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://static.kedexinxi.com';
@@ -343,7 +343,7 @@ module.exports = (function () {
         // }
         devServer: {
             disableHostCheck: true,
-            host: '192.168.0.190',
+            host: '192.168.0.188',
             port: 80,
             allowedHosts: ['127.0.0.1','192.168.0.20','192.168.0.99'],
             headers: {