dengzhiguo 6 years ago
parent
commit
26ccc6f779

+ 16 - 9
js/component/manageCenter/customer/NEW/crm/crm.jsx

@@ -116,6 +116,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 							name: thisdata.name,//用户名称
 							diqu: diqu,//省市区
 							industry: thisdata.industry,//行业
+							dataGrade:thisdata.dataGrade?(thisdata.dataGrade*100).toFixed(2)+"%":"",//是否完善render:(text)=>{return ((text*100).toFixed(2)+"%") }
 							contacts: thisdata.contacts,//联系人
 							contactMobile: thisdata.contactMobile,//联系人电话
 							createTime: thisdata.createTime,//行业
@@ -368,17 +369,23 @@ const IntentionCustomer = Form.create()(React.createClass({
 					title: '联系人',
 					dataIndex: 'contacts',
 					key: 'contacts',
+				},{
+					title: '联系电话',
+					dataIndex: 'contactMobile',
+					key: 'contactMobile',
+				},
+				{
+					title: '资料完整度',
+					dataIndex: 'dataGrade',
+					key: 'dataGrade',
+					
 				},
 				{
 					title: '行业',
 					dataIndex: 'industry',
 					key: 'industry'
 				},
-				{
-					title: '联系电话',
-					dataIndex: 'contactMobile',
-					key: 'contactMobile',
-				},
+				
 				{
 					title: '创建时间',
 					dataIndex: 'createTime',
@@ -1341,11 +1348,11 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
-                    <Select placeholder="选择资料质量" style={{ width: 120 }}
+                    <Select placeholder="资料是否完善" style={{ width: 120 }}
                         value={this.state.dataGrade}
                         onChange={(e) => { this.setState({ dataGrade: e }) }}>
-                        <Select.Option value="0" >有效资料</Select.Option>
-                        <Select.Option value="1" >优质资料</Select.Option>
+                        <Select.Option value="0" >未完善</Select.Option>
+                        <Select.Option value="1" >已完善</Select.Option>
                     </Select>
                     <Select placeholder="是否面谈客户" style={{ width: 120 }}
                         value={this.state.follow}
@@ -1697,7 +1704,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					       </div>
 					    </TabPane>
 					    <TabPane tab="知识产权列表" key="1">
-					    	<Button type="primary" className="addButton" onClick={this.addClick}>发布成果<Icon type="plus" /></Button>
+					    	<Button type="primary" className="addButton" onClick={this.addClick}>发布知识产权<Icon type="plus" /></Button>
 				    		<Spin spinning={this.state.loading}>
 			                    <Table columns={this.state.columnsDate}
 			                        dataSource={this.state.dataSourceDate}

+ 20 - 8
js/component/manageCenter/customer/NEW/crm/crmAll.jsx

@@ -110,6 +110,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 							diqu: diqu,//省市区
 							industry: thisdata.industry,//行业
 							contacts: thisdata.contacts,//联系人
+							iname: thisdata.iname,//客户资料所属人
+							dataGrade:thisdata.dataGrade?(thisdata.dataGrade*100).toFixed(2)+"%":"",//资料完整度
 							contactMobile: thisdata.contactMobile,//联系人电话
 							createTime: thisdata.createTime,//行业
 						});
@@ -348,17 +350,27 @@ const IntentionCustomer = Form.create()(React.createClass({
 					title: '联系人',
 					dataIndex: 'contacts',
 					key: 'contacts',
+				},{
+					title: '联系电话',
+					dataIndex: 'contactMobile',
+					key: 'contactMobile',
+				},
+				{
+					title: '资料完整度',
+					dataIndex: 'dataGrade',
+					key: 'dataGrade',
+					
+				}, {
+					title: '客户资料所属人',
+					dataIndex: 'iname',
+					key: 'iname',
 				},
 				{
 					title: '行业',
 					dataIndex: 'industry',
 					key: 'industry'
 				},
-				{
-					title: '联系电话',
-					dataIndex: 'contactMobile',
-					key: 'contactMobile',
-				},
+				
 				{
 					title: '创建时间',
 					dataIndex: 'createTime',
@@ -941,11 +953,11 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
-                    <Select placeholder="选择资料质量" style={{ width: 120 }}
+                    <Select placeholder="资料是否完善" style={{ width: 120 }}
                         value={this.state.dataGrade}
                         onChange={(e) => { this.setState({ dataGrade: e }) }}>
-                        <Select.Option value="0" >有效资料</Select.Option>
-                        <Select.Option value="1" >优质资料</Select.Option>
+                        <Select.Option value="0" >未完善</Select.Option>
+                        <Select.Option value="1" >已完善</Select.Option>
                     </Select>
                     <RangePicker style={{marginRight:'10px'}}
                         value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,

+ 22 - 0
js/component/manageCenter/order/orderStatistics/orderStatistics.jsx

@@ -579,6 +579,26 @@ const DiurnalStatistics = React.createClass({
 				     
 				}
 			},{
+				title: '任务说明',
+				fixed:false,
+				width:200,
+				dataIndex: 'taskComment',
+				key: 'taskComment',
+				render:(text,record)=>{
+				     if(!record.theNumber){
+				     	return text
+				     }else{
+				     	return {
+				     		children: text,
+      						props: {
+      							colSpan:0
+      						},
+				     	}
+				     	
+				     }
+				     
+				}
+			},{
 				title: '公示状态',
 				fixed:false,
 				dataIndex: 'publishStatus',
@@ -646,6 +666,8 @@ const DiurnalStatistics = React.createClass({
 	},
 	reset() {
 		this.state.superId = undefined;//部门机构清零
+		this.state.taskStatus= undefined;//任务状态
+		this.state.publishStatus= undefined;//公示状态
 		this.loadData(0)
 		this.setState({
 			order:"false",