liting2017 7 years ago
parent
commit
708a2fbbdd

+ 13 - 2
js/component/manageCenter/achievement/techAchievement.jsx

@@ -12,7 +12,6 @@ import BatchImport from './batchImport';
 const AchievementList = React.createClass({
     loadData(pageNo, apiUrl) {
         this.state.data = [];
-       
       if(this.state.serialNumber&&isNaN(this.state.serialNumber)){
      	message.warning('请输入正确的编号格式');
       	return false;
@@ -40,7 +39,9 @@ const AchievementList = React.createClass({
                 releaseStatus: this.state.releaseStatus ? Number(this.state.releaseStatus) : undefined, //是否发布(0--未发布,1--已发布)
                 auditStatus: this.state.auditStatus,
                 boutique:this.state.boutique,
-                hot:this.state.hot
+                hot:this.state.hot,
+                createDateStartDate: this.state.releaseDateS[0],
+                createDateEndDate: this.state.releaseDateS[1],
             },
             success: function (data) {
                 let theArr = [];
@@ -94,6 +95,7 @@ const AchievementList = React.createClass({
             searchType: 0,
             validityPeriodDate: [],
             releaseDate: [],
+            releaseDateS: [],
             selectedRowKeys: [],
             selectedRows: [],
             loading: false,
@@ -208,6 +210,7 @@ const AchievementList = React.createClass({
             this.state.searchName = undefined;
             this.state.searchType = 0;
             this.state.releaseDate = [];
+            this.state.releaseDateS = [];
             this.loadData(null, nextProps['data-listApiUrl']);
         };
     },
@@ -274,6 +277,7 @@ const AchievementList = React.createClass({
         this.state.auditStatus = undefined;
         this.state.searchName = undefined;
         this.state.releaseDate = [];
+        this.state.releaseDateS = [];
         this.state.boutique = '';
         this.state.hot='' ;
         this.loadData();       
@@ -382,11 +386,18 @@ const AchievementList = React.createClass({
                             <Select.Option value="0" >未发布</Select.Option>
                             <Select.Option value="1" >已发布</Select.Option>
                         </Select>
+                        <div style={{marginTop:'10px'}}>
                         <span>发布时间 :</span>
                         <RangePicker
                             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 style={{marginLeft:'5px'}}>录入时间 :</span>
+                        <RangePicker
+                            value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
+                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
+                            onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
+                    	</div>
                     </div>
                 </div>
                 <div className="patent-table">

+ 11 - 1
js/component/manageCenter/demand/techDemand.jsx

@@ -39,6 +39,8 @@ const DemandList = React.createClass({
                 validityPeriodEndDate: this.state.validityPeriodDate[1],
                 releaseDateStartDate: this.state.releaseDate[0],
                 releaseDateEndDate: this.state.releaseDate[1],
+                createDateStartDate: this.state.releaseDateS[0],
+                createDateEndDate: this.state.releaseDateS[1],
                 auditStatus: this.state.auditStatus,
                 boutique:this.state.boutique,
                 hot:this.state.hot,
@@ -80,7 +82,7 @@ const DemandList = React.createClass({
                             boutique: thisdata.boutique,
                             hot: thisdata.hot,
                             techBrokerId:thisdata.techBrokerId,
-                            CreateTimeFormattedDate: thisdata.CreateTimeFormattedDate,
+                            createTimeFormattedDate: thisdata.createTimeFormattedDate,
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -103,6 +105,7 @@ const DemandList = React.createClass({
             searchType: 0,               
             validityPeriodDate: [],
             releaseDate: [],
+            releaseDateS: [],
             selectedRowKeys: [],
             selectedRows: [],
             loading: false,
@@ -326,6 +329,7 @@ const DemandList = React.createClass({
             this.state.auditStatus = undefined;
             this.state.validityPeriodDate = [];
             this.state.releaseDate = [];
+            this.state.releaseDateS = [];
             this.loadData(null, nextProps['data-listApiUrl']);
         };
     },
@@ -397,6 +401,7 @@ const DemandList = React.createClass({
         this.state.auditStatus = undefined;
         this.state.validityPeriodDate = [];
         this.state.releaseDate = [];
+        this.state.releaseDateS = [];
         this.loadData();
     },
     searchSwitch() {
@@ -533,6 +538,11 @@ const DemandList = 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 style={{ marginLeft: '10px' }}>录入时间 : </span>
+	                        <RangePicker
+	                            value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
+	                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
+	                            onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
                         </div>
                     </div>
                 </div>

+ 1 - 8
js/component/manageCenter/set/userManagementS/user.jsx

@@ -119,11 +119,7 @@ const User=Form.create()(React.createClass({
                     dataIndex: 'boutique',
                     key: 'boutique',
                 },
-                 {
-                    title: '联系手机',
-                    dataIndex: 'mobile',
-                    key: 'mobile',
-                },
+                
                 {
                     title: '上级主管姓名',
                     dataIndex: 'province',
@@ -366,9 +362,6 @@ const User=Form.create()(React.createClass({
                        		<Input placeholder="登录用户名" style={{width:'150px'}}
 		                        value={this.state.signNameSearch}
 		                        onChange={(e) => { this.setState({ signNameSearch: e.target.value }); }} />
-	                        <Input placeholder="联系手机" style={{width:'150px',margin:'0 15px'}}
-		                        value={this.state.mobileSearch}
-		                        onChange={(e) => { this.setState({ mobileSearch: e.target.value }); }} />
 	                        <Input placeholder="上级主管名称" style={{width:'150px'}}
 		                        value={this.state.proNameSearch}
 		                        onChange={(e) => { this.setState({ proNameSearch: e.target.value }); }} />