liting2017 6 years ago
parent
commit
b7493985d0

+ 1 - 1
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/businFollow.jsx

@@ -19,7 +19,7 @@ const BusinFollow =React.createClass({
 		this.props.closeBusiness(false);
 	},
 	componentWillReceiveProps(nextProps) {
-		if(nextProps.data.ufbId&&nextProps.businessFollowModul){
+		if(nextProps.businessFollowModul){
 			this.setState({
 				businessFollowModul:true
 			})

+ 14 - 12
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visit.jsx

@@ -64,18 +64,20 @@ const Visit = React.createClass({
 				title: '拜访说明',
 				dataIndex: 'result',
 				key: 'result'
-			}, {
-				title: '操作',
-				dataIndex: 'ttt',
-				key: 'ttt',
-				render: (text, record, index) => {
-					return <div>
-                            {record.readOnly&&<Popconfirm title="是否删除?" onConfirm={(e)=>{this.visitDelet(record)}} okText="删除" cancelText="不删除">
-							    <Button style={{marginRight:'10px',color:'#ffffff',background:'#f00',border:'none'}} onClick={(e)=>{e.stopPropagation()}}>删除</Button>
-							</Popconfirm>}
-                        </div>
-				}
-			}],
+			}
+//			,{
+//				title: '操作',
+//				dataIndex: 'ttt',
+//				key: 'ttt',
+//				render: (text, record, index) => {
+//					return <div>
+//                          {!record.readOnly?<Popconfirm title="是否删除?" onConfirm={(e)=>{this.visitDelet(record)}} okText="删除" cancelText="不删除">
+//							    <Button style={{marginRight:'10px',color:'#ffffff',background:'#f00',border:'none'}} onClick={(e)=>{e.stopPropagation()}}>删除</Button>
+//							</Popconfirm>:''}
+//                      </div>
+//				}
+			//}
+		],
 		}
 	},
 	//拜访记录删除

+ 21 - 15
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visitDetail.jsx

@@ -32,13 +32,16 @@ const VisitDetail = React.createClass({
 					dataIndex: 'followSituation',
 					key: 'followSituation',
 					render: (text, record, index) => {
-						return <Select  placeholder="选择最新进度" value={record.followSituation}  onChange={(e) => { record.followSituation = e; this.setState({ data: this.state.data }); }}>
-                                    {
-                                        newFollow.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                        })
-                                    }
-                               </Select>
+						return <div>
+									{!record.readOnly?<Select  placeholder="选择最新进度" value={record.followSituation}  onChange={(e) => { record.followSituation = e; this.setState({ data: this.state.data }); }}>
+	                                    {
+	                                        newFollow.map(function (item) {
+	                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+	                                        })
+	                                    }
+	                               </Select>:
+	                               <span>{getfllowSituation(text)}</span>}
+                               </div>
 					}
 				}, {
 					title: '最新状态',
@@ -46,13 +49,16 @@ const VisitDetail = React.createClass({
 					dataIndex: 'customerStatus',
 					key: 'customerStatus',
 					render: (text, record, index) => {
-						return <Select value={record.customerStatus} placeholder="选择最新状态" onChange={(e) => { record.customerStatus = e; this.setState({ data: this.state.data }); }}>
-                                    {
-                                        customerStatus.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                        })
-                                    }
-                               </Select>
+						return <div>
+									{!record.readOnly?<Select value={record.customerStatus} placeholder="选择最新状态" onChange={(e) => { record.customerStatus = e; this.setState({ data: this.state.data }); }}>
+	                                    {
+	                                        customerStatus.map(function (item) {
+	                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+	                                        })
+	                                    }
+	                                </Select>:
+	                                <span>{getcustomerStatue(text)}</span>}
+                               </div>
 					}
 				}, {
 					title: '跟进说明',
@@ -94,6 +100,7 @@ const VisitDetail = React.createClass({
 				for(let i = 0; i < data.data.userBusinessList.length; i++) {
 					let thisdata = data.data.userBusinessList[i];
 					theArr.push({
+						readOnly:this.props.followData.readOnly,
 						id: thisdata.ufbId,
 						businessName:thisdata.businessProjectId,
 						businessVarietiesName:thisdata.businessVarietiesName,
@@ -103,7 +110,6 @@ const VisitDetail = React.createClass({
 						remarks: thisdata.remarks,
 					});
 				};
-				console.log(theArr)
 				this.setState({
 					followIds: thedata.followId,
 					contacts: thedata.contacts,