Przeglądaj źródła

奖金增加创建时间

liting2017 6 lat temu
rodzic
commit
b9a1d487dc

+ 14 - 2
js/component/manageCenter/financialManage/bonus/jsBonus.jsx

@@ -67,7 +67,9 @@ const JsBonus = React.createClass({
                 orderNo:this.state.orderNoSearch,
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
-                grantStatus: this.state.grantStatus
+                grantStatus: this.state.grantStatus,
+                startTime1: this.state.createDate[0],
+                endTime1: this.state.createDate[1],
             },
             success: function (data) {
                 let theArr = [];
@@ -122,6 +124,7 @@ const JsBonus = React.createClass({
         return {
             searchMore: true,
             releaseDate: [],
+            createDate:[],
             RowData:{},
             execState:false,
             selectedRowKeys: [],
@@ -288,7 +291,9 @@ const JsBonus = React.createClass({
             targetName: this.state.projectMenSearch,//项目负责人
             startTime: this.state.releaseDate[0],
             endTime: this.state.releaseDate[1],
-            grantStatus: this.state.grantStatus
+            grantStatus: this.state.grantStatus,
+            startTime1: this.state.createDate[0],
+            endTime1: this.state.createDate[1],
         }
         window.location.href=(globalConfig.context+'/api/admin/bonus/exportTechnicianBonusData?'+$.param(data));
     },
@@ -322,6 +327,7 @@ const JsBonus = React.createClass({
         this.state.orderRefundSearch='';
         this.state.projectMenSearch='';
         this.state.releaseDate = [];
+        this.state.createDate=[];
         this.state.orderNoSearch='';
         this.state.grantStatus=undefined;
         this.state.departmenttList=undefined;
@@ -386,6 +392,12 @@ const JsBonus = React.createClass({
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
                             this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
                             onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+                        <span>创建时间 :</span>
+                        <RangePicker
+                            format="YYYY-MM-DD"
+                            value={[this.state.createDate[0] ? moment(this.state.createDate[0]) : null,
+                            this.state.createDate[1] ? moment(this.state.createDate[1]) : null]}
+                            onChange={(data, dataString) => { this.setState({ createDate: dataString }); }} />    
                     </div>
                 </div>
                 <div className="patent-table" id="table">

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

@@ -66,7 +66,9 @@ const YxBonus = React.createClass({
                 orderNo:this.state.orderNoSearch,
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
-                grantStatus:this.state.grantStatus
+                grantStatus:this.state.grantStatus,
+                startTime1: this.state.createDate[0],
+                endTime1: this.state.createDate[1],
             },
             success: function (data) {
                 let theArr = [];
@@ -97,6 +99,7 @@ const YxBonus = React.createClass({
         return {
             searchMore: true,
             releaseDate: [],
+            createDate:[],
             RowData:{},
             execState:false,
             selectedRowKeys: [],
@@ -262,6 +265,8 @@ const YxBonus = React.createClass({
             startTime: this.state.releaseDate[0],
             endTime: this.state.releaseDate[1],
             grantStatus:this.state.grantStatus,
+            startTime1: this.state.createDate[0],
+            endTime1: this.state.createDate[1],
         }
         window.location.href=(globalConfig.context+'/api/admin/bonus/exportSaleBonusData?'+$.param(data));
     },
@@ -304,6 +309,7 @@ const YxBonus = React.createClass({
     reset() {
         this.state.orderRefundSearch='';
         this.state.releaseDate = [];
+        this.state.createDate=[];
         this.state.orderNoSearch='';
         this.state.departmenttList=undefined;
         this.state.grantStatus=undefined
@@ -369,7 +375,12 @@ const YxBonus = React.createClass({
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
                             this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
                             onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-                            
+                        <span>创建时间 :</span>
+                        <RangePicker
+                            format="YYYY-MM-DD"
+                            value={[this.state.createDate[0] ? moment(this.state.createDate[0]) : null,
+                            this.state.createDate[1] ? moment(this.state.createDate[1]) : null]}
+                            onChange={(data, dataString) => { this.setState({ createDate: dataString }); }} />        
                     </div>
                 </div>
                 <div className="patent-table" id="table">