dengzhiguo 7 years ago
parent
commit
857326b9e3

+ 12 - 0
js/component/manageCenter/demand/techDemand.jsx

@@ -80,6 +80,8 @@ const DemandList = React.createClass({
                             releaseDateFormattedDate: thisdata.releaseDateFormattedDate,
                             auditStatus: thisdata.auditStatus,
                             boutique: thisdata.boutique,
+                            urgentMoney:thisdata.urgentMoney,
+                            urgentDays:thisdata.urgentDays,
                             hot: thisdata.hot,
                             techBrokerId:thisdata.techBrokerId,
                             createTimeFormattedDate: thisdata.createTimeFormattedDate,
@@ -178,6 +180,14 @@ const DemandList = React.createClass({
                     dataIndex: 'theName',
                     key: 'theName',
                 }, {
+                    title: '加急天数',
+                    dataIndex: 'urgentDays',
+                    key: 'urgentDays',
+                }, {
+                    title: '加急报酬(万)',
+                    dataIndex: 'urgentMoney',
+                    key: 'urgentMoney',
+                }, {
                     title: '审核状态',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',
@@ -334,6 +344,8 @@ const DemandList = React.createClass({
         };
     },
     tableRowClick(record, index) {
+    	console.log(record);
+    	console.log(index);
         this.state.RowData = record;
         this.setState({
             showDesc: true

+ 34 - 1
js/component/manageCenter/demand/techDemandDesc.jsx

@@ -419,7 +419,7 @@ const DemandDetailShow = Form.create()(React.createClass({
                     {this.state.switchValue ? <div>
                         <FormItem className="half-item"
                             {...formItemLayout}
-                            label="雇主名称" >
+                            label="雇主名称333" >
                             <span>{theData.employerName}</span>
                         </FormItem>
                         <FormItem className="half-item"
@@ -491,6 +491,16 @@ const DemandDetailShow = Form.create()(React.createClass({
                             <span>{theData.releaseDateFormattedDate}</span>
                         </FormItem>
                     </div>
+                    <FormItem className="half-item"
+                        {...formItemLayout}
+                        label="加急天数" >
+                        <span>{theData.urgentDays}</span>
+                    </FormItem>
+                    <FormItem className="half-item"
+                        {...formItemLayout}
+                        label="加急报酬" >
+                        <span>{theData.urgentMoney}</span>
+                    </FormItem>
                     <div className="clearfix">
                         <FormItem className="half-item"
                             {...formItemLayout}
@@ -891,6 +901,8 @@ const DemandDetailForm = Form.create()(React.createClass({
                         contacts: !this.state.switchValue ? values.contacts : null,
                         //自定义
                         employerName: this.state.switchValue ? values.employerName : null,
+                        urgentDays: this.state.switchValue ? values.urgentDays : null,
+                        urgentMoney: this.state.switchValue ? values.urgentMoney : null,
                         employerAddress: this.state.switchValue ? values.employerAddress : null,
                         employerContactsMobile: this.state.switchValue ? values.employerContactsMobile : null,
                         employerContactsMailbox: this.state.switchValue ? values.employerContactsMailbox : null,
@@ -1207,6 +1219,26 @@ const DemandDetailForm = Form.create()(React.createClass({
                             <Cascader style={{ width: 300 }} options={IndustryObject} placeholder="请选择一个行业" />
                             )}
                     </FormItem>
+                    <FormItem className="half-item"
+                            {...formItemLayout}
+                            label="加急天数" >
+                            {getFieldDecorator('urgentDays', {
+                                initialValue: theData.urgentDays
+                            })(
+                                <Input style={{width:'95%'}}/>
+                                )}
+                            <span>天</span>
+                        </FormItem>
+                        <FormItem className="half-item"
+                            {...formItemLayout}
+                            label="加急报酬" >
+                            {getFieldDecorator('urgentMoney', {
+                                initialValue: theData.urgentMoney
+                            })(
+                                <Input  style={{width:'95%'}}/>
+                                )}
+                            <span>万</span>
+                        </FormItem>
                     <div className="clearfix">
                         <FormItem className="half-item"
                             {...formItemLayout}
@@ -1547,6 +1579,7 @@ const DemandDetail = React.createClass({
         }.bind(this));
     },
     tableRowClick(record, index) {
+    	
         window.open(globalConfig.context + '/portal/detail/achievementDetail.html?id=' + record.id + '&type=' + record.ownerType);
     },
     handleCancel(e) {

+ 2 - 1
js/component/manageCenter/set/business/businessProject.jsx

@@ -414,7 +414,8 @@ const BusinessProject=Form.create()(React.createClass({
 		    	let pro='';
 		        let city='';
 		        let dis='';
-		       	if(this.state.ProvinceCity==undefined){
+		        console.log(this.state.ProvinceCity);
+		       	if(this.state.ProvinceCity==undefined||this.state.ProvinceCity.length==0){
 		       		message.warning('请选择项目有效范围');
 		    		return false;
 		       	}else{

+ 13 - 8
js/component/manageCenter/set/messagePush/jitaoMessage.jsx

@@ -114,7 +114,7 @@ const JitaoMessage=Form.create()(React.createClass({
 			method: "post",
 			dataType: "json",
 			crossDomain: false,
-			url: globalConfig.context + '/api/admin/customer/listPrivatePersonalCustomer',
+			url: globalConfig.context + '/api/admin/customer/listAllPersonalCustomer',
 			data: {
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
@@ -725,6 +725,7 @@ const JitaoMessage=Form.create()(React.createClass({
         	visible: false,
             data: [],
             callnub:'0',
+            sendType:'0',
             showAdd: false,
             showDesc: false,
             expandedKeys: [],
@@ -740,7 +741,7 @@ const JitaoMessage=Form.create()(React.createClass({
                 showQuickJumper: true,
                 pageSize: 10,
                 onChange: function (page) {
-                    this.loadData(page,0);
+                    this.loadData(page,this.state.sendType);
                 }.bind(this),
                 showTotal: function (total) {
                     return '共' + total + '条数据';
@@ -1620,6 +1621,7 @@ const JitaoMessage=Form.create()(React.createClass({
 			this.setState({
 				bianjiMore: false,
 				selectedRowKeys:[],
+				sendType:'0',
 			})
 			this.loadData(1,0);
 		}
@@ -1627,6 +1629,7 @@ const JitaoMessage=Form.create()(React.createClass({
 			this.setState({
 				bianjiMore: true,
 				selectedRowKeys:[],
+				sendType:'1',
 			})
 			this.loadData(1,1);
 		}
@@ -1664,10 +1667,12 @@ const JitaoMessage=Form.create()(React.createClass({
 			this.zhengceLoadData();
 			this.setState({ visible12: true })
 		}
-		this.xiaoxiReset();
+		
+		
 	},
 	changeContent(e){
 		this.xiaoxiReset();
+		
 	},
 	//切换创建系统消息中的指定发送对象
 	selectObjects(e) {
@@ -1999,7 +2004,7 @@ const JitaoMessage=Form.create()(React.createClass({
     	this.state.selectedRowKeys=[];
     },
     rowReset1(){
-    	this.state.selectedRowKeys1=[];
+    	this.state.selectedRowKeys=[];
     },
     //散户
     sanhuSubmit(e){
@@ -2064,7 +2069,7 @@ const JitaoMessage=Form.create()(React.createClass({
     	e.preventDefault();
     	this.xiaoxiReset();
     	this.setState({
-    		xiaoxi:this.state.selectedRowKeys1
+    		xiaoxi:this.state.selectedRowKeys
     	});
     	this.rowReset1();
     	this.handleCancel6();
@@ -2106,11 +2111,11 @@ const JitaoMessage=Form.create()(React.createClass({
 			},
         };
         const rowSelectiones = {
-            selectedRowKeys1: this.state.selectedRowKeys,
+            selectedRowKeys: this.state.selectedRowKeys,
             onChange: (selectedRowKeys, selectedRows) => {
                 this.setState({
                     selectedRows: selectedRows,
-                    selectedRowKeys1: selectedRowKeys
+                    selectedRowKeys: selectedRowKeys
                 });
             },
             onSelect: (recordt, selected, selectedRows) => {
@@ -2459,7 +2464,7 @@ const JitaoMessage=Form.create()(React.createClass({
 	                         <Form horizontal onSubmit={this.xiaoxiSubmit} id="add-form">
 				                <Spin spinning={this.state.loading}>
 				                	<div className="user-search">
-					                    <Input placeholder="公司名称" style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
+					                    <Input placeholder="名称" style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
 					                        value={this.state.nameSearch}
 					                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
                     					<Select placeholder="国际" style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}

+ 4 - 1
js/component/manageCenter/set/messagePush/systemMessage.jsx

@@ -353,6 +353,7 @@ const SystemMessage=Form.create()(React.createClass({
             sanhu:[],
             objText:[],
             callnub:'0',
+            sendType:'0',
             showAdd: false,
             showDesc: false,
             expandedKeys: [],
@@ -368,7 +369,7 @@ const SystemMessage=Form.create()(React.createClass({
                 showQuickJumper: true,
                 pageSize: 10,
                 onChange: function (page) {
-                    this.loadData(page);
+                    this.loadData(page,this.state.sendType);
                 }.bind(this),
                 showTotal: function (total) {
                     return '共' + total + '条数据';
@@ -975,6 +976,7 @@ const SystemMessage=Form.create()(React.createClass({
 			this.setState({
 				bianjiMore: false,
 				selectedRowKeys:[],
+				sendType:0,
 			})
 			this.loadData(1,0);
 		}
@@ -982,6 +984,7 @@ const SystemMessage=Form.create()(React.createClass({
 			this.setState({
 				bianjiMore: true,
 				selectedRowKeys:[],
+				sendType:1,
 			})
 			this.loadData(1,1);
 		}