Browse Source

企业项目派单查询

HW 5 years ago
parent
commit
88e5ff560d
66 changed files with 2094 additions and 1257 deletions
  1. 2 2
      js/component/dataDic.js
  2. 24 14
      js/component/manageCenter/customer/NEW/crm/crm.jsx
  3. 3 2
      js/component/manageCenter/customer/NEW/intentionCustomer/followDetail.jsx
  4. 3 2
      js/component/manageCenter/customer/NEW/intentionCustomer/followDetail/addContact.jsx
  5. 19 18
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/contactPerson.jsx
  6. 6 5
      js/component/manageCenter/customer/NEW/signCustomer/followDetail.jsx
  7. 2 1
      js/component/manageCenter/customer/NEW/signCustomer/followDetail/addContact.jsx
  8. 18 17
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/contactPerson.jsx
  9. 6 5
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/intentionDetail.jsx
  10. 137 133
      js/component/manageCenter/customer/customerData/companyCustomer.jsx
  11. 157 151
      js/component/manageCenter/customer/customerData/myClient.jsx
  12. 308 304
      js/component/manageCenter/customer/customerService/myBusiness.jsx
  13. 2 1
      js/component/manageCenter/customer/managementFollow/customerFollow/index.jsx
  14. 128 127
      js/component/manageCenter/customer/reviewed/identityAudits.jsx
  15. 3 2
      js/component/manageCenter/financialManage/bonus/jsBonus11.jsx
  16. 9 2
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  17. 3 0
      js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx
  18. 2 1
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  19. 10 9
      js/component/manageCenter/index/content.jsx
  20. 1 2
      js/component/manageCenter/order/orderNew/addService.jsx
  21. 7 0
      js/component/manageCenter/order/orderNew/approveds.jsx
  22. 7 0
      js/component/manageCenter/order/orderNew/billing.jsx
  23. 4 2
      js/component/manageCenter/order/orderNew/changeComponent/changeApply.js
  24. 1 0
      js/component/manageCenter/order/orderNew/chargeback.jsx
  25. 2 1
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  26. 3 2
      js/component/manageCenter/order/orderNew/chooseList.jsx
  27. 2 1
      js/component/manageCenter/order/orderNew/costAuditList/component/orderPaymentModal.js
  28. 25 7
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/index.js
  29. 1 0
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js
  30. 1 0
      js/component/manageCenter/order/orderNew/examine.jsx
  31. 24 7
      js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/index.js
  32. 7 0
      js/component/manageCenter/order/orderNew/inquiry.jsx
  33. 13 21
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  34. 11 9
      js/component/manageCenter/order/orderNew/pressList.jsx
  35. 1 0
      js/component/manageCenter/order/orderNew/reject.jsx
  36. 1 0
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  37. 10 0
      js/component/manageCenter/project/content.jsx
  38. 634 0
      js/component/manageCenter/project/project/enterpriseProjectQuery.jsx
  39. 1 0
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  40. 5 6
      js/component/manageCenter/project/summary/highTech.jsx
  41. 35 35
      js/component/manageCenter/project/summary/highTechConfig.jsx
  42. 1 0
      js/component/manageCenter/project/summary/projecCount.jsx
  43. 2 0
      js/component/manageCenter/project/summary/projectDetails.jsx
  44. 44 19
      js/component/manageCenter/project/task/myTask.jsx
  45. 24 12
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  46. 2 1
      js/component/manageCenter/project/task/newSupplier.js
  47. 3 2
      js/component/manageCenter/project/task/operationPayNode.js
  48. 1 0
      js/component/manageCenter/project/task/patentSchedule.jsx
  49. 2 1
      js/component/manageCenter/project/task/payApplyReject/component/orderPaymentModal.js
  50. 24 7
      js/component/manageCenter/project/task/payApplyReject/detailsModal/index.js
  51. 1 0
      js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js
  52. 3 0
      js/component/manageCenter/project/task/taskQuery.jsx
  53. 57 58
      js/component/manageCenter/set/business/businessCategory.jsx
  54. 10 8
      js/component/manageCenter/set/business/businessProject.jsx
  55. 153 144
      js/component/manageCenter/set/organization/organization.jsx
  56. 2 1
      js/component/manageCenter/set/projectConfigure/addOfficialFeePrice.js
  57. 2 1
      js/component/manageCenter/set/projectConfigure/addPatentPrice.js
  58. 2 1
      js/component/manageCenter/set/projectConfigure/addSoftWritingPrice.js
  59. 13 13
      js/component/manageCenter/set/userManagementS/jurisdiction.jsx
  60. 58 58
      js/component/manageCenter/set/userManagementS/newUser.jsx
  61. 21 17
      js/component/manageCenter/set/userManagementS/roles.jsx
  62. 18 18
      js/component/manageCenter/statistics/order/index.jsx
  63. 1 0
      js/component/manageCenter/statistics/personnel/addPicModal.jsx
  64. 1 0
      js/component/manageCenter/statistics/personnel/bonusList.jsx
  65. 10 6
      js/component/manageCenter/statistics/personnel/personnelAll.jsx
  66. 1 1
      package.json

+ 2 - 2
js/component/dataDic.js

@@ -2972,7 +2972,7 @@ module.exports = {
     },
     {
       value: "8",
-      key: "项目验收",
+      key: "项目验收(专利受理)",
     },
     {
       value: "9",
@@ -3467,4 +3467,4 @@ module.exports = {
       ],
     },
   ],
-};
+};

+ 24 - 14
js/component/manageCenter/customer/NEW/crm/crm.jsx

@@ -554,14 +554,17 @@ const IntentionCustomer = Form.create()(React.createClass({
 			message.warning('标签字数不能超过16个字符')
 			return;
 		}
-		if (inputValue && businessScope.indexOf(inputValue) === -1) {
-			businessScope = [...businessScope, inputValue];
+		let arr = inputValue.split(',');
+		for(let i of arr){
+			if (i && businessScope.indexOf(i) === -1) {
+				businessScope = [...businessScope, i];
+			}
+			this.setState({
+				businessScope,
+				inputVisible: false,
+				inputValue: '',
+			});
 		}
-		this.setState({
-			businessScope,
-			inputVisible: false,
-			inputValue: '',
-		});
 	},
 	handleClose1(removedTag){
 		const salesTarget = this.state.salesTarget.filter(tag => tag !== removedTag);
@@ -584,14 +587,17 @@ const IntentionCustomer = Form.create()(React.createClass({
 			message.warning('标签字数不能超过16个字符')
 			return;
 		}
-		if (inputValue && salesTarget.indexOf(inputValue) === -1) {
-			salesTarget = [...salesTarget, inputValue];
+		let arr = inputValue.split(',');
+		for(let i of arr){
+			if (i && salesTarget.indexOf(i) === -1) {
+				salesTarget = [...salesTarget, i];
+			}
+			this.setState({
+				salesTarget,
+				inputVisible1: false,
+				inputValue1: '',
+			});
 		}
-		this.setState({
-			salesTarget,
-			inputVisible1: false,
-			inputValue1: '',
-		});
 	},
 	componentWillMount() {
 		//城市
@@ -1576,6 +1582,7 @@ const IntentionCustomer = Form.create()(React.createClass({
           </Spin>
         </div>
         <Modal
+		  maskClosable={false}
           className="customeDetails"
           footer=""
           title="客户资料"
@@ -2265,6 +2272,7 @@ const IntentionCustomer = Form.create()(React.createClass({
           </Tabs>
         </Modal>
         <Modal
+		  maskClosable={false}
           className="customeDetails"
           footer=""
           title="项目申请书"
@@ -2294,6 +2302,7 @@ const IntentionCustomer = Form.create()(React.createClass({
           </div>
         </Modal>
         <Modal
+		  maskClosable={false}
           className="customeDetails"
           footer=""
           title="财务资料"
@@ -2392,6 +2401,7 @@ const IntentionCustomer = Form.create()(React.createClass({
           </Form>
         </Modal>
         <Modal
+		  maskClosable={false}
           className="customeDetails"
           footer=""
           title="项目资料"

+ 3 - 2
js/component/manageCenter/customer/NEW/intentionCustomer/followDetail.jsx

@@ -341,7 +341,7 @@ const FollowDetail = React.createClass({
 		let conts = this.state.lastName;
 		contactsId = this.state.contactsIdArr[conts].id;
 		//新增
-		
+
 		$.ajax({
 			method: "post",
 			dataType: "json",
@@ -407,6 +407,7 @@ const FollowDetail = React.createClass({
 		return (
       <div>
         <Modal
+		  maskClosable={false}
           className="customeDetails"
           footer=""
           title="新增客户跟进"
@@ -569,4 +570,4 @@ const FollowDetail = React.createClass({
     );
 	}
 })
-export default FollowDetail;
+export default FollowDetail;

+ 3 - 2
js/component/manageCenter/customer/NEW/intentionCustomer/followDetail/addContact.jsx

@@ -91,12 +91,13 @@ const AddContact = React.createClass({
 				loading:false
 			})
 		};
-		
+
 	},
 	render() {
 		return (
       <div>
         <Modal
+          maskClosable={false}
           footer=""
           width="800px"
           title="新增联系人"
@@ -246,4 +247,4 @@ const AddContact = React.createClass({
     );
 	}
 })
-export default AddContact;
+export default AddContact;

+ 19 - 18
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/contactPerson.jsx

@@ -35,7 +35,7 @@ const ContactPerson = React.createClass({
           dataIndex: "name",
           key: "name",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -43,7 +43,7 @@ const ContactPerson = React.createClass({
           dataIndex: "department",
           key: "department",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -76,7 +76,7 @@ const ContactPerson = React.createClass({
           dataIndex: "mobile",
           key: "mobile",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -84,7 +84,7 @@ const ContactPerson = React.createClass({
           dataIndex: "fixedTel",
           key: "fixedTel",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -92,7 +92,7 @@ const ContactPerson = React.createClass({
           dataIndex: "wechat",
           key: "wechat",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -100,7 +100,7 @@ const ContactPerson = React.createClass({
           dataIndex: "qq",
           key: "qq",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -108,7 +108,7 @@ const ContactPerson = React.createClass({
           dataIndex: "email",
           key: "email",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -116,7 +116,7 @@ const ContactPerson = React.createClass({
           dataIndex: "createTimes",
           key: "createTimes",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -124,7 +124,7 @@ const ContactPerson = React.createClass({
           dataIndex: "aname",
           key: "aname",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -326,8 +326,8 @@ const ContactPerson = React.createClass({
       message.error("请填写姓名");
       return;
     }
-    if(/.*[\u4e00-\u9fa5]+.*$/.test(this.state.nameModal))   {  
-            
+    if(/.*[\u4e00-\u9fa5]+.*$/.test(this.state.nameModal))   {
+
     }else{
       message.error("请填写正确的姓名,且至少包含一个汉字");
       return;
@@ -460,6 +460,7 @@ const ContactPerson = React.createClass({
         </div>
         {/* 新增联系人 */}
         {this.state.addcontactModul ? <Modal
+              maskClosable={false}
               footer=''
               width='800px'
               title="新增联系人"
@@ -467,7 +468,7 @@ const ContactPerson = React.createClass({
               onOk={this.contactSave}
               onCancel={this.addcontactModulcancel}>
               <Form layout="horizontal" onSubmit={this.submitcontactman} id="demand-form">
-              <Spin spinning={this.state.loading}> 											             						               
+              <Spin spinning={this.state.loading}>
                 <Row style={{ paddingLeft:'50px' }}>
                   <Col span={2}><span style={{color:'red'}}>*</span>姓名:</Col>
                       <Col span={8}>
@@ -495,7 +496,7 @@ const ContactPerson = React.createClass({
                   <Row style={{ marginTop: '20px',paddingLeft:'50px' }}>
                       <Col span={2}>微信:</Col>
                         <Col span={8}>
-                          <Input 
+                          <Input
                               onChange={(e) => { this.setState({ wechatModal: e.target.value }) }} />
                       </Col>
                       <Col span={2} style={{ marginLeft: '50px' }}>Q Q:</Col>
@@ -503,16 +504,16 @@ const ContactPerson = React.createClass({
                           <Input
                               onChange={(e) => { this.setState({ qqModal: e.target.value }) }} />
                       </Col>
-                  </Row>	
-                  <Row style={{ marginTop: '20px',paddingLeft:'50px' }}>						                       
+                  </Row>
+                  <Row style={{ marginTop: '20px',paddingLeft:'50px' }}>
                       <Col span={2}>邮箱:</Col>
                       <Col span={8}>
-                          <Input 
+                          <Input
                               onChange={(e) => { this.setState({ emailModal: e.target.value }) }} />
                       </Col>
                       <Col span={2} style={{ marginLeft: '50px' }}>座机:</Col>
                       <Col span={8}>
-                          <Input 
+                          <Input
                               onChange={(e) => { this.setState({ fixedTelModal: e.target.value }) }} />
                       </Col>
                   </Row>
@@ -521,7 +522,7 @@ const ContactPerson = React.createClass({
                     <Button className="set-submit" type="ghost" onClick={this.addcontactModulcancel} id='change_rem'>取消</Button>
                   </Row>
                 </Spin>
-            </Form>   
+            </Form>
 			    </Modal> : <div/>}
       </div>
     );

+ 6 - 5
js/component/manageCenter/customer/NEW/signCustomer/followDetail.jsx

@@ -44,7 +44,7 @@ const FollowDetail = React.createClass({
 					width:120,
 					dataIndex: 'remarks',
 					key: 'remarks',
-					
+
 				}, {
 					title: '操作',
 					width:120,
@@ -92,7 +92,7 @@ const FollowDetail = React.createClass({
 				};
 				//this.deletelist(this.props.followData.id)
 			}.bind(this));
-		
+
 	},
 	//拜访modul函数
 	visitOk(e) {
@@ -189,12 +189,12 @@ const FollowDetail = React.createClass({
 								remarks: thisdata.remarks,
 								uid:thisdata.uid,
 								uids:data.data.uid
-								
+
 							});
 						}
 					};
 				}
-				
+
 				this.setState({
 					contacts: thedata.contacts,
 					uids:data.data.uid,
@@ -328,6 +328,7 @@ const FollowDetail = React.createClass({
 		return (
       <div>
         <Modal
+		  maskClosable={false}
           className="customeDetails"
           footer=""
           title="客户跟进详情"
@@ -473,4 +474,4 @@ const FollowDetail = React.createClass({
     );
 	}
 })
-export default FollowDetail;
+export default FollowDetail;

+ 2 - 1
js/component/manageCenter/customer/NEW/signCustomer/followDetail/addContact.jsx

@@ -96,6 +96,7 @@ const AddContact = React.createClass({
 		return (
       <div>
         <Modal
+          maskClosable={false}
           footer=""
           width="800px"
           title="新增联系人"
@@ -244,4 +245,4 @@ const AddContact = React.createClass({
     );
 	}
 })
-export default AddContact;
+export default AddContact;

+ 18 - 17
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/contactPerson.jsx

@@ -35,7 +35,7 @@ const ContactPerson = React.createClass({
           dataIndex: "name",
           key: "name",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -43,7 +43,7 @@ const ContactPerson = React.createClass({
           dataIndex: "department",
           key: "department",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -76,7 +76,7 @@ const ContactPerson = React.createClass({
           dataIndex: "mobile",
           key: "mobile",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -84,7 +84,7 @@ const ContactPerson = React.createClass({
           dataIndex: "fixedTel",
           key: "fixedTel",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -92,7 +92,7 @@ const ContactPerson = React.createClass({
           dataIndex: "wechat",
           key: "wechat",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -100,7 +100,7 @@ const ContactPerson = React.createClass({
           dataIndex: "qq",
           key: "qq",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -108,7 +108,7 @@ const ContactPerson = React.createClass({
           dataIndex: "email",
           key: "email",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -116,7 +116,7 @@ const ContactPerson = React.createClass({
           dataIndex: "createTimes",
           key: "createTimes",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -124,7 +124,7 @@ const ContactPerson = React.createClass({
           dataIndex: "aname",
           key: "aname",
           render: (text, record, index) => {
-            if(record.id) return <div>{text}</div> 
+            if(record.id) return <div>{text}</div>
           }
         },
         {
@@ -460,15 +460,16 @@ const ContactPerson = React.createClass({
         </div>
         {/* 新增联系人 */}
         <Modal
+              maskClosable={false}
               footer=''
               width='800px'
               title="新增联系人"
               visible={this.state.addcontactModul}
               onOk={this.contactSave}
-              onCancel={this.addcontactModulcancel}						          							          
+              onCancel={this.addcontactModulcancel}
                   >
               <Form layout="horizontal" onSubmit={this.submitcontactman} id="demand-form">
-              <Spin spinning={this.state.loading}> 											             						               
+              <Spin spinning={this.state.loading}>
                 <Row style={{ paddingLeft:'50px' }}>
                   <Col span={2}><span style={{color:'red'}}>*</span>姓名:</Col>
                       <Col span={8}>
@@ -496,7 +497,7 @@ const ContactPerson = React.createClass({
                   <Row style={{ marginTop: '20px',paddingLeft:'50px' }}>
                       <Col span={2}>微信:</Col>
                         <Col span={8}>
-                          <Input 
+                          <Input
                               onChange={(e) => { this.setState({ wechatModal: e.target.value }) }} />
                       </Col>
                       <Col span={2} style={{ marginLeft: '50px' }}>Q Q:</Col>
@@ -504,16 +505,16 @@ const ContactPerson = React.createClass({
                           <Input
                               onChange={(e) => { this.setState({ qqModal: e.target.value }) }} />
                       </Col>
-                  </Row>	
-                  <Row style={{ marginTop: '20px',paddingLeft:'50px' }}>						                       
+                  </Row>
+                  <Row style={{ marginTop: '20px',paddingLeft:'50px' }}>
                       <Col span={2}>邮箱:</Col>
                       <Col span={8}>
-                          <Input 
+                          <Input
                               onChange={(e) => { this.setState({ emailModal: e.target.value }) }} />
                       </Col>
                       <Col span={2} style={{ marginLeft: '50px' }}>座机:</Col>
                       <Col span={8}>
-                          <Input 
+                          <Input
                               onChange={(e) => { this.setState({ fixedTelModal: e.target.value }) }} />
                       </Col>
                   </Row>
@@ -522,7 +523,7 @@ const ContactPerson = React.createClass({
                     <Button className="set-submit" type="ghost" onClick={this.addcontactModulcancel} id='change_rem'>取消</Button>
                   </Row>
                 </Spin>
-            </Form>   
+            </Form>
 			    </Modal>
       </div>
     );

+ 6 - 5
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/intentionDetail.jsx

@@ -6,7 +6,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import ContactPerson from './detail/contactPerson.jsx';  //联系人
 import Account from './detail/account.jsx';  //账户信息
-import Visit from './detail/visit.jsx'; 
+import Visit from './detail/visit.jsx';
 import Business from './detail/business.jsx';
 import LockBusiness from './detail/lockBusiness.jsx';
 import BasicPerson from './detail/basicPerson.jsx';//基本信息
@@ -119,6 +119,7 @@ const IntentionDetail = React.createClass({
           className="customeDetails"
           title="签单客户详情"
           width="1300px"
+		  maskClosable={false}
           visible={this.state.modalVisible}
           onOk={this.detailsModal}
           onCancel={this.detailsModal}
@@ -178,16 +179,16 @@ const IntentionDetail = React.createClass({
 			</TabPane>
             {/*
 							<TabPane tab="业务订单" key="6">
-							     								
+
 							</TabPane>
 							<TabPane tab="技术需求" key="7">
-							     								
+
 							</TabPane>
 							<TabPane tab="技术成果" key="8">
-							     								
+
 							</TabPane>
 							<TabPane tab="技术专家" key="9">
-							     								
+
 							</TabPane>
 							*/}
           </Tabs>

+ 137 - 133
js/component/manageCenter/customer/customerData/companyCustomer.jsx

@@ -80,7 +80,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			data: {
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
-				type: this.state.typeSearch, //名称1   
+				type: this.state.typeSearch, //名称1
 				name: this.state.nameSearch,
 				shareType: this.state.shareTypeSearch,
 				province: (this.state.addressSearch).length ? this.state.addressSearch[0] : this.state.provinceSearch,
@@ -263,7 +263,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					dataIndex: 'remarks',
 					key: 'remarks',
 					render: (text, record, index) => {
-						return adminData.isSuperAdmin ? <Input value={record.remarks} placeholder="跟进说明" 
+						return adminData.isSuperAdmin ? <Input value={record.remarks} placeholder="跟进说明"
 	                             onChange={(e) => { record.remarks = e.target.value; this.setState({ data: this.state.data }); }}
 	                             style={{width:'120px'}}/> : <span>{text}</span>
 					}
@@ -378,7 +378,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					key: 'name',
 					render: (text, record, index) => {
 						return adminData.isSuperAdmin ? <Input value={record.name} placeholder="姓名" key={record.id} required="required"
-	                           onChange={(e) => { record.name = e.target.value; 
+	                           onChange={(e) => { record.name = e.target.value;
 	                           	this.setState({ contactList: this.state.contactList }); }} style={{width:'120px'}}/> : <span>{text}</span>
 					}
 				}, {
@@ -511,7 +511,7 @@ const PublicCustomer = Form.create()(React.createClass({
 		};
 	},
 
-	
+
 	//tab2获取联系人详情
 	contactLists(ids) {
 		this.setState({
@@ -567,7 +567,7 @@ const PublicCustomer = Form.create()(React.createClass({
 		let areaArr= getProvinceList();
 		let Citys=citySelect(areaArr);
 		let Areas=areaSelect(areaArr);
-		this.setState({ 
+		this.setState({
 			City: Citys,
 			Area: Areas
 		});
@@ -612,7 +612,7 @@ const PublicCustomer = Form.create()(React.createClass({
 	reset() {
 		this.state.internationalSearch = undefined;
 		this.state.shareTypeSearch = undefined;
-		this.state.typeSearch = undefined; //名称1   
+		this.state.typeSearch = undefined; //名称1
 		this.state.nameSearch = '';
 		this.state.addressSearch = [];
 		this.state.provinceSearch = undefined;
@@ -650,13 +650,13 @@ const PublicCustomer = Form.create()(React.createClass({
 	VisitRowClick(record, index) {
 		this.state.keys = false;
 		this.state.RowData = record;
-		
+
 		this.setState({
 			selectedRowKeys: [],
 			delectId: record.followId,
 		})
 	},
-	
+
 	//点击整行查看详情
 	//查看基本详情基本信息
 	loadInformation(record) {
@@ -845,7 +845,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
-	
+
 	//点击新增详情
 	newContacts() {
 		this.state.newsex =undefined;
@@ -1039,7 +1039,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			businessFollowModul: false
 		})
 	},
-	
+
 	//详情tab切换数据处理
 	callback(e) {
 		if(e == '1') {
@@ -1073,7 +1073,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			callnub: e,
 		})
 	},
-	
+
 	//tab5业务意向
 	BusinessList(pageNo, uids) {
 		this.setState({
@@ -1184,22 +1184,22 @@ const PublicCustomer = Form.create()(React.createClass({
 		const contacts = this.state.contacts || '';
 		return(
 			<div className="user-content" >
-                <div className="content-title">                  
+                <div className="content-title">
                     <span>单位客户查询</span>
                 </div>
-                <div className="user-search">                    
+                <div className="user-search">
                     <Input placeholder="客户名称"
                         value={this.state.nameSearch}
-                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
+                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
                     <Select placeholder="省"
                             style={{ width: 80 }}
                             value={this.state.provinceSearch}
                             onChange={(e) => {this.setState({ provinceSearch: e});}}>
                             {this.state.Provinces}
-                    </Select> 
-                    <span style={{marginRight:'10px'}}>                   
+                    </Select>
+                    <span style={{marginRight:'10px'}}>
 	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
-    						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
+    						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />
                     </span>
                      <span style={{marginRight:'10px'}}>客户类型:</span>
 	                        <Select placeholder="选择客户类型"
@@ -1210,15 +1210,15 @@ const PublicCustomer = Form.create()(React.createClass({
 	                            <Select.Option value="1" >公共客户</Select.Option>
 	                        </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>                                         				
-							
+                    <Button onClick={this.reset}>重置</Button>
+
 	                <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className='clearfix' style={{marginTop:'5px'}}>
-	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
+	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
 			                <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 }); }} />  
+		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
 	                        <Select placeholder="账户状态"
 	                            style={{ width: 100 }}
 	                            value={this.state.statusSearch}
@@ -1278,28 +1278,29 @@ const PublicCustomer = Form.create()(React.createClass({
                                         })
                                     }
 	                        </Select>
-			            </div>  
+			            </div>
 		            </div>
-                </div>                                               
+                </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
                         <Table columns={this.state.columns}
-                            dataSource={this.state.dataSource}    
+                            dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
-                            pagination={this.state.pagination} 
+                            pagination={this.state.pagination}
                             onRowClick={this.tableRowClick}
                            />
                     </Spin>
-                </div> 
-                <Modal	
-				      className="customeDetails"				      
+                </div>
+                <Modal
+					  maskClosable={false}
+				      className="customeDetails"
 			          title="单位客户详情"
 			          width='1200px'
 			          visible={this.state.modal5Visible}
 			          onOk={this.detailsModal}
 			          onCancel={this.detailsModal}
 			          footer=''
-			        >				    
+			        >
 					     <Tabs defaultActiveKey="1" onChange={this.callback} activeKey={this.state.callnub}>
 						    <TabPane tab="基本信息" key="1">
 						        {adminData.isSuperAdmin?<Form horizontal  id="demand-form">
@@ -1314,7 +1315,7 @@ const PublicCustomer = Form.create()(React.createClass({
 						                    </FormItem>
 					                    </div>
 					                   <div className="clearfix" style={{paddingLeft:'60px'}}>
-					                    	<FormItem className="half-item" 
+					                    	<FormItem className="half-item"
 					                         labelCol={{ span: 4 }}
 					                         wrapperCol={{ span: 18 }}
 					                         label="行业">
@@ -1328,11 +1329,11 @@ const PublicCustomer = Form.create()(React.createClass({
 				                                </Select>
 				                                <span style={{color:'red',marginLeft:'15px'}}>*</span>
 					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
+					                   		 <FormItem className="half-item"
 					                           labelCol={{ span: 4 }}
 					                            wrapperCol={{ span: 18 }}
 					                           label="社会属性"
-					                         > 
+					                         >
 												    <Select placeholder="客户社会属性(必填项)" value={this.state.societyTag} style={{width:'300px'}}
 											    				onChange={(e)=>{this.setState({societyTag:e})}}>
 				                                    {
@@ -1343,13 +1344,13 @@ const PublicCustomer = Form.create()(React.createClass({
 				                                </Select>
 				                                <span style={{color:'red',marginLeft:'15px'}}>*</span>
 					                   		 </FormItem>
-					                         <FormItem className="half-item" 
+					                         <FormItem className="half-item"
 					                           labelCol={{ span: 4 }}
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
-					                          > 
+					                          >
 					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
-    												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />   
+    												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                   </FormItem>
 						                   <FormItem className="half-item"
@@ -1357,7 +1358,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                         label="通信地址"
 						                            >
-						                                <Input placeholder="客户通信地址" value={this.state.postalAddress} 
+						                                <Input placeholder="客户通信地址" value={this.state.postalAddress}
 											    				onChange={(e)=>{this.setState({postalAddress:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1365,7 +1366,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                         label="固定电话"
 						                            >
-						                                <Input placeholder="客户固定电话" value={this.state.contactsFixedTel} 
+						                                <Input placeholder="客户固定电话" value={this.state.contactsFixedTel}
 											    				onChange={(e)=>{this.setState({contactsFixedTel:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1373,7 +1374,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="客户传真"
 						                            >
-						                                <Input placeholder="客户传真" value={this.state.contactsFax} 
+						                                <Input placeholder="客户传真" value={this.state.contactsFax}
 											    				onChange={(e)=>{this.setState({contactsFax:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1381,7 +1382,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="注册资本"
 						                            >
-						                                <Input placeholder="注册资本" value={this.state.registeredCapital} 
+						                                <Input placeholder="注册资本" value={this.state.registeredCapital}
 											    				onChange={(e)=>{this.setState({registeredCapital:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1389,7 +1390,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="单位规模"
 						                            >
-						                                <Input placeholder="单位规模" value={this.state.enterpriseScale} 
+						                                <Input placeholder="单位规模" value={this.state.enterpriseScale}
 											    				onChange={(e)=>{this.setState({enterpriseScale:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1397,7 +1398,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="法人名称"
 						                            >
-						                                <Input placeholder="法人名称" value={this.state.legalPerson} 
+						                                <Input placeholder="法人名称" value={this.state.legalPerson}
 											    				onChange={(e)=>{this.setState({legalPerson:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1405,15 +1406,15 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="身份证号码"
 						                            >
-						                                <Input placeholder="法人身份证号码" value={this.state.legalPersonIdCard} 
+						                                <Input placeholder="法人身份证号码" value={this.state.legalPersonIdCard}
 											    				onChange={(e)=>{this.setState({legalPersonIdCard:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
 							                    	labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
 							                        label="法人电话"
-						                            > 
-						                                <Input placeholder="法人电话" value={this.state.legalPersonTel} 
+						                            >
+						                                <Input placeholder="法人电话" value={this.state.legalPersonTel}
 											    				onChange={(e)=>{this.setState({legalPersonTel:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1421,7 +1422,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="电子邮箱"
 						                            >
-						                                <Input placeholder="法人电子邮箱" value={this.state.legalPersonEmail} 
+						                                <Input placeholder="法人电子邮箱" value={this.state.legalPersonEmail}
 											    				onChange={(e)=>{this.setState({legalPersonEmail:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1429,10 +1430,10 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="机构代码"
 						                            >
-						                                <Input placeholder="社会同意机构代码" value={this.state.orgCode} 
+						                                <Input placeholder="社会同意机构代码" value={this.state.orgCode}
 											    				onChange={(e)=>{this.setState({orgCode:e.target.value})}}/>
 						                    </FormItem>
-								            <FormItem className="half-item" 
+								            <FormItem className="half-item"
 								            	labelCol={{ span: 4 }}
 					                            wrapperCol={{ span: 18 }}
 						                        label="实名认证"
@@ -1460,7 +1461,7 @@ const PublicCustomer = Form.create()(React.createClass({
 									                        <Radio value={1}>已认证</Radio>
 									                  </Radio.Group>:<span>{this.state.businessAudit?'是':'否'}</span>}
 								            </FormItem>
-						                    
+
 					                   		<FormItem className="half-item"
 				                   		   		labelCol={{ span: 4 }}
 					                            wrapperCol={{ span: 18 }}
@@ -1512,31 +1513,31 @@ const PublicCustomer = Form.create()(React.createClass({
 						                        <FormItem
 							                        labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
-							                        label="单位logo" > 
+							                        label="单位logo" >
 							                        <PicturesWall
 							                            pictureSign="logo"
 							                            fileList={this.getCompanyLogoUrl}
 							                            pictureUrl={this.state.companyLogoUrl} />
 							                            <p>图片建议:图片要清晰。</p>
 							                    </FormItem>
-							                </div> 
+							                </div>
 							                <div className="clearfix">
 							                    <FormItem
 						                        labelCol={{ span: 2 }}
 						                        wrapperCol={{ span: 18 }}
 						                        label="业务范围" >
-						                            <Input type="textarea" rows={4} value={this.state.businessScope} 
+						                            <Input type="textarea" rows={4} value={this.state.businessScope}
 											    				onChange={(e)=>{this.setState({businessScope:e.target.value})}}/>
 							                    </FormItem>
 							                    <FormItem
 							                        labelCol={{ span: 2 }}
 							                        wrapperCol={{ span: 18 }}
 							                        label="单位简介" >
-							                            <Input type="textarea" rows={4}  value={this.state.introduction} 
-											    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+							                            <Input type="textarea" rows={4}  value={this.state.introduction}
+											    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>
 							                    </FormItem>
 						                    </div>
-						                </div>		                	
+						                </div>
 								    </Spin>
 								</Form>	:<Form horizontal id="demand-form">
 					                <Spin spinning={this.state.loading}>
@@ -1550,25 +1551,25 @@ const PublicCustomer = Form.create()(React.createClass({
 						                    </FormItem>
 					                    </div>
 					                    <div className="clearfix" style={{paddingLeft:'60px'}}>
-					                    	<FormItem className="half-item" 
+					                    	<FormItem className="half-item"
 						                         labelCol={{ span: 4 }}
 						                         wrapperCol={{ span: 18 }}
 						                        label="行业"
-						                         > 
-				                             <span>{getIndustry(String(theInformation.industry))}</span>     
+						                         >
+				                             <span>{getIndustry(String(theInformation.industry))}</span>
 					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
+					                   		 <FormItem className="half-item"
 						                           labelCol={{ span: 4 }}
 						                            wrapperCol={{ span: 18 }}
 						                           label="社会属性"
-						                         > 
-						                       <span>{getSocialAttribute(theInformation.societyTag)}</span>  
+						                         >
+						                       <span>{getSocialAttribute(theInformation.societyTag)}</span>
 					                   		 </FormItem>
-					                         <FormItem className="half-item" 
+					                         <FormItem className="half-item"
 					                           labelCol={{ span: 4 }}
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
-					                          > 
+					                          >
 						                  		<span>{this.state.proviceCityArea}</span>
 						                  </FormItem>
 						                   <FormItem className="half-item"
@@ -1576,14 +1577,14 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                         label="通信地址"
 						                            >
-						                            <span>{theInformation.postalAddress}</span>  
+						                            <span>{theInformation.postalAddress}</span>
 						                    </FormItem>
 						                    <FormItem className="half-item"
 							                    	labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
 							                         label="固定电话"
 						                            >
-						                            <span>{theInformation.contactsFixedTel}</span>              
+						                            <span>{theInformation.contactsFixedTel}</span>
 						                    </FormItem>
 						                    <FormItem className="half-item"
 							                    	labelCol={{ span: 4 }}
@@ -1690,12 +1691,12 @@ const PublicCustomer = Form.create()(React.createClass({
 							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
 							                                <img alt="" style={{ width: '100%' }} src={this.state.orgCodeUrl || ''} />
 							                            </Modal>
-							                        </div>     
+							                        </div>
 						                        </FormItem>
 						                        <FormItem
 							                        labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
-							                        label="单位logo" > 
+							                        label="单位logo" >
 							                        <div className="clearfix">
 							                            <Upload className="demandDetailShow-upload"
 							                                listType="picture-card"
@@ -1712,7 +1713,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
 							                                <img alt="" style={{ width: '100%' }} src={this.state.companyLogoUrl || ''} />
 							                            </Modal>
-							                        </div> 
+							                        </div>
 							                    </FormItem>
 							                </div>
 							                <div className="clearfix">
@@ -1728,24 +1729,24 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        label="单位简介" >
 							                        <span>{theInformation.introduction}</span>
 							                    </FormItem>
-						                    </div> 
-					                    </div>		                	
+						                    </div>
+					                    </div>
 								    </Spin>
-								</Form>}	
+								</Form>}
 							</TabPane>
 						    <TabPane tab="联系人信息" key="2">
 						       <div className="clearfix">
                     			  <Spin spinning={this.state.loading}>
                     			     <Form horizontal id="demand-form"  >
-								      <Table 
+								      <Table
 						            	 pagination={false}
-						            	 columns={this.state.ContactsLists} 
+						            	 columns={this.state.ContactsLists}
 						            	 dataSource={this.state.contactList}
 						            	 />
 					            	    <div className="clearfix" style={{display:adminData.isSuperAdmin?'inline-block':'none'}}>
 								        </div>
-						            	</Form> 
-								   </Spin> 
+						            	</Form>
+								   </Spin>
 								</div>
 						    </TabPane>
 						    <TabPane tab="账户信息" key="3">
@@ -1762,35 +1763,35 @@ const PublicCustomer = Form.create()(React.createClass({
 							                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="注册用户名" >
-							                         {adminData.isSuperAdmin?<Input value={this.state.nickname} 
+							                         {adminData.isSuperAdmin?<Input value={this.state.nickname}
 							                           onChange={(e) => { this.setState({ nickname: e.target.value }); }} />:<span>{this.state.nickname}</span>}
 							                    </FormItem>
 							                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="注册邮箱" >
-							                         {adminData.isSuperAdmin?<Input value={this.state.email} 
+							                         {adminData.isSuperAdmin?<Input value={this.state.email}
 							                          onChange={(e) => { this.setState({ email: e.target.value }); }} />:<span>{this.state.nickname}</span>}
 							                    </FormItem>
 							                    </div>
 							                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="客户来源" >
-							                            <span>{this.state.source}</span>   
+							                            <span>{this.state.source}</span>
 							                    </FormItem>
 							                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="客户类型" >
-							                            <span>{this.state.type}</span>   
+							                            <span>{this.state.type}</span>
 							                    </FormItem>
 							                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="创建时间" >
-							                            <span>{this.state.createTimes}</span>   
+							                            <span>{this.state.createTimes}</span>
 							                    </FormItem>
-							                    <FormItem className="half-item" 
+							                    <FormItem className="half-item"
 						                           {...formItemLayout}
 						                           label="账户状态"
-						                         > 
+						                         >
 												    {adminData.isSuperAdmin?<Select placeholder="账户状态" value={this.state.status}  onChange={(e) => { this.setState({ status: e }); }} >
 				                                    {
 				                                        statuslist.map(function (item) {
@@ -1803,7 +1804,7 @@ const PublicCustomer = Form.create()(React.createClass({
 										            <FormItem className="half-item"
 										                {...formItemLayout}
 								                        label="会员"
-										            > 
+										            >
 								                   		 {adminData.isSuperAdmin?<Radio.Group value={this.state.isMember} onChange={(e) => {
 										                        this.setState({ isMember:  e.target.value })
 										                    }}>
@@ -1811,10 +1812,10 @@ const PublicCustomer = Form.create()(React.createClass({
 										                        <Radio value={1}>是</Radio>
 										                  </Radio.Group>:<span>{this.state.isMember?'是':'否'}</span>}
 										            </FormItem>
-										            <FormItem className="half-item" 
+										            <FormItem className="half-item"
 								                          {...formItemLayout}
 								                           label="会员等级"
-								                         > 
+								                         >
 													    {adminData.isSuperAdmin?<Select placeholder="客户状态" value={this.state.lvl}  onChange={(e) => { this.setState({ lvl: e }); }} >
 					                                     {
 					                                        lvl.map(function (item) {
@@ -1823,10 +1824,10 @@ const PublicCustomer = Form.create()(React.createClass({
 					                                     }
 					                                   </Select>:<span>{getLvl(this.state.lvl)}</span>}
 							                   		</FormItem>
-							                   		<FormItem className="half-item" 
+							                   		<FormItem className="half-item"
 							                           {...formItemLayout}
 							                           label="会员状态"
-							                         > 
+							                         >
 													    {adminData.isSuperAdmin?<Select placeholder="会员状态" value={this.state.currentMemberStatus}  onChange={(e) => { this.setState({ currentMemberStatus: e }); }} >
 					                                    {
 					                                        currentMember.map(function (item) {
@@ -1839,55 +1840,56 @@ const PublicCustomer = Form.create()(React.createClass({
 									            <div className="clearfix" style={{display:adminData.isSuperAdmin?'inline-block':'none'}}>
 									             </div>
 						    				</Spin>
-						    			</Form>	
+						    			</Form>
 						    		</div>
 						    </TabPane>
 							<TabPane tab="客户拜访" key="4">
 							     <div className="clearfix">
                     			    <Spin spinning={this.state.loading}>
-								      <Table 
+								      <Table
 						            	 pagination={false}
-						            	 columns={this.state.visitsList} 
+						            	 columns={this.state.visitsList}
 						            	 dataSource={this.state.visitArrList}
 						            	 onRowClick={this.VisitRowClick}
 						            	 />
-								    </Spin> 
-								</div>								
-							</TabPane>						
+								    </Spin>
+								</div>
+							</TabPane>
 							<TabPane tab="业务意向" key="5">
 							    <div className="clearfix">
                     			    <Spin spinning={this.state.loading}>
-								      <Table 
+								      <Table
 						            	 pagination={this.state.paginationt}
-						            	 columns={this.state.businessIntentionList} 
+						            	 columns={this.state.businessIntentionList}
 						            	 dataSource={this.state.dataBusiness}
 						            	 />
-								    </Spin> 
-								</div>							
+								    </Spin>
+								</div>
 							</TabPane>
 							<TabPane tab="业务订单" key="6">
-							     								
+
 							</TabPane>
 							<TabPane tab="技术需求" key="7">
-							     								
+
 							</TabPane>
 							<TabPane tab="技术成果" key="8">
-							     								
+
 							</TabPane>
 							<TabPane tab="技术专家" key="9">
-							     								
+
 							</TabPane>
 						</Tabs>
     			</Modal>
-    			<Modal	
+    			<Modal
+					  maskClosable={false}
 				      className="customeDetails"
 				      footer=''
 			          title="拜访详情"
 			          width='1000px'
 			          visible={this.state.visitModul}
 			          onOk={this.visitOk}
-					  onCancel={this.visitCancel}							          							          
-			        >				    
+					  onCancel={this.visitCancel}
+			        >
 					    <Form horizontal id="demand-form" >
 			    			{adminData.isSuperAdmin?<Spin spinning={this.state.loading}>
 			    			   	<div className="clearfix">
@@ -1895,7 +1897,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			                            {...formItemLayout}
 			                            label="拜访方式" >
 			    			   			<Radio.Group value={this.state.contactType} onChange={(e) => {
-										        this.setState({ contactType: e.target.value }) 
+										        this.setState({ contactType: e.target.value })
 						                    }}>
 						                        <Radio value={0}>外出</Radio>
 						                        <Radio value={1}>电话</Radio>
@@ -1958,7 +1960,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					                        labelCol={{ span: 4 }}
 							                wrapperCol={{ span: 16 }}
 					                        label="拜访备注" >
-					                            <Input type="textarea" rows={4} value={this.state.result} 
+					                            <Input type="textarea" rows={4} value={this.state.result}
 					                              onChange={(e)=>{this.setState({result:e.target.value})}}/>
 					                    </FormItem>
 					                </div>
@@ -1966,14 +1968,14 @@ const PublicCustomer = Form.create()(React.createClass({
 					                 	<div style={{fontSize:'18px',marginLeft:'100px',marginTop:'15px',marginBottom:'10px'}}>业务意向<Button  style={{marginLeft:'420px',background:'green',color:'#ffffff'}}>添加新业务</Button></div>
 					                 	<div className="clearfix" style={{paddingLeft:'50px',paddingRight:'50px'}}>
 		                    			    <Spin spinning={this.state.loading}>
-										      <Table 
+										      <Table
 										         rowKey={record => record.id}
 								            	 pagination={false}
-								            	 columns={this.state.intentionList} 
+								            	 columns={this.state.intentionList}
 								            	 dataSource={this.state.data}
 								            	 />
-										    </Spin> 
-										</div>	 
+										    </Spin>
+										</div>
 					                </div>
 			    			   	</div>
 							</Spin>:<Spin spinning={this.state.loading}>
@@ -2020,35 +2022,36 @@ const PublicCustomer = Form.create()(React.createClass({
 					                        labelCol={{ span: 4 }}
 							                wrapperCol={{ span: 16 }}
 					                        label="拜访备注" >
-					                        <span>{this.state.result}</span>      
+					                        <span>{this.state.result}</span>
 					                    </FormItem>
 					                </div>
 					                <div className="clearfix">
 					                 	<div className="clearfix" style={{paddingLeft:'50px',paddingRight:'50px'}}>
 		                    			    <Spin spinning={this.state.loading}>
-										      <Table 
+										      <Table
 										         rowKey={record => record.id}
 								            	 pagination={false}
-								            	 columns={this.state.intentionList} 
+								            	 columns={this.state.intentionList}
 								            	 dataSource={this.state.data}
 								            	 />
-										    </Spin> 
-										</div>	 
+										    </Spin>
+										</div>
 					                </div>
 			    			   	</div>
 					   		</Spin>}
 					    </Form>
-    			</Modal> 
-    			
-			    
-			    <Modal	
+    			</Modal>
+
+
+			    <Modal
+					  maskClosable={false}
 				      footer=''
 			          title="业务意向详情"
 			          width='1000px'
 			          visible={this.state.businessModul}
 			          onOk={this.businessIntentionOk}
-					  onCancel={this.businessIntentionCancel}							          							          
-			        >				    
+					  onCancel={this.businessIntentionCancel}
+			        >
 					    <div className="clearfix">
 			    			<Form horizontal id="demand-form" >
 			    				<Spin spinning={this.state.loading}>
@@ -2095,26 +2098,27 @@ const PublicCustomer = Form.create()(React.createClass({
 			                        	<div style={{fontSize:'18px',lineHeight:'24px',marginBottom:'10px'}}>业务跟进</div>
 			                        	<div className="clearfix">
 		                    			    <Spin spinning={this.state.loading}>
-										      <Table 
+										      <Table
 								            	 pagination={this.state.paginations}
-								            	 columns={this.state.businessFollowList} 
+								            	 columns={this.state.businessFollowList}
 								            	 dataSource={this.state.visitArrList}
 								            	 />
-										    </Spin> 
-										</div>	
+										    </Spin>
+										</div>
 			                        </div>
 				                </Spin>
-							</Form>                  
-						</div>	                    
+							</Form>
+						</div>
     			</Modal>
-    			<Modal	
+    			<Modal
+					  maskClosable={false}
 				      footer=''
 			          title="业务跟进详情"
 			          width='600px'
 			          visible={this.state.businessFollowModul}
 			          onOk={this.businessFollowOk}
-					  onCancel={this.businessFollowCancel}							          							          
-			        >				    
+					  onCancel={this.businessFollowCancel}
+			        >
 					    <div className="clearfix">
 			    			<Form horizontal id="demand-form" >
 			    				<Spin spinning={this.state.loading}>
@@ -2183,7 +2187,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					                            {...formItemLayout}
 					                            label="拜访人" >
 					                        <span>{this.state.adminNames}</span>
-					                    </FormItem> 
+					                    </FormItem>
 					                    <div className="clearfix">
 					                    	<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -2193,11 +2197,11 @@ const PublicCustomer = Form.create()(React.createClass({
 					                    </div>
 			                        </div>
 				                </Spin>
-							</Form>                  
-						</div>	                    
+							</Form>
+						</div>
     			</Modal>
           </div >
 		);
 	}
 }));
-export default PublicCustomer
+export default PublicCustomer

+ 157 - 151
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -80,7 +80,7 @@ const MyClient = Form.create()(React.createClass({
 			data: {
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
-				type: this.state.typeSearch, //名称1   
+				type: this.state.typeSearch, //名称1
 				name: this.state.nameSearch,
 				province: !(this.state.addressSearch).length ? this.state.provinceSearch : this.state.addressSearch[0],
 				city: !(this.state.addressSearch).length ? '' : this.state.addressSearch[1],
@@ -284,7 +284,7 @@ const MyClient = Form.create()(React.createClass({
 					dataIndex: 'remarks',
 					key: 'remarks',
 					render: (text, record, index) => {
-						return <Input value={record.remarks} placeholder="跟进说明" 
+						return <Input value={record.remarks} placeholder="跟进说明"
 	                             onChange={(e) => { record.remarks = e.target.value; this.setState({ data: this.state.data }); }}
 	                             style={{width:'120px'}}/>
 					}
@@ -421,7 +421,7 @@ const MyClient = Form.create()(React.createClass({
 					key: 'name',
 					render: (text, record, index) => {
 						return <Input value={record.name} placeholder="姓名(必填项)" key={record.id} required="required"
-	                           onChange={(e) => { record.name = e.target.value; 
+	                           onChange={(e) => { record.name = e.target.value;
 	                           	this.setState({ contactList: this.state.contactList }); }} style={{width:'120px'}}/>
 					}
 				}, {
@@ -486,7 +486,7 @@ const MyClient = Form.create()(React.createClass({
 					dataIndex: 'dels',
 					key: 'dels',
 					render: (text, record, index) => {
-						return <div>{adminData.isSuperAdmin ? 
+						return <div>{adminData.isSuperAdmin ?
 		                            <Popconfirm title="是否删除?" onConfirm={(e)=>{this.confirmDelet(record)}} okText="删除" cancelText="不删除">
 									    <Button style={{marginRight:'10px',color:'#ffffff',background:'#f00',border:'none'}}>删除</Button>
 									</Popconfirm>
@@ -582,7 +582,7 @@ const MyClient = Form.create()(React.createClass({
 					key: 'abc',
 					render: (text, record, index) => {
 						return <div>
-                            <Button onClick={(e) =>{ e.stopPropagation(), this.visit(record)}} type="primary">拜访</Button>                            							    
+                            <Button onClick={(e) =>{ e.stopPropagation(), this.visit(record)}} type="primary">拜访</Button>
                         </div>
 					}
 				}
@@ -606,7 +606,7 @@ const MyClient = Form.create()(React.createClass({
 			url: globalConfig.context + "/api/admin/customer/updateMainContact",
 			data: {
 				uid:this.state.rowId,
-				ocbId: record.id 
+				ocbId: record.id
 			}
 		}).done(function(data) {
 			if(!data.error.length) {
@@ -744,7 +744,7 @@ const MyClient = Form.create()(React.createClass({
 			crossDomain: false,
 			url: globalConfig.context + "/api/admin/customer/deleteFollow",
 			data: {
-				followId: e.followId, //删除的ID    
+				followId: e.followId, //删除的ID
 			}
 		}).done(function(data) {
 			if(!data.error.length) {
@@ -758,7 +758,7 @@ const MyClient = Form.create()(React.createClass({
 			this.loadVisit();
 		}.bind(this));
 	},
-	//进入修改拜访记录  
+	//进入修改拜访记录
 	visitModify(e) {
 		this.setState({
 			visitModul: true,
@@ -864,7 +864,7 @@ const MyClient = Form.create()(React.createClass({
 			crossDomain: false,
 			url: globalConfig.context + "/api/admin/customer/deleteCustomer",
 			data: {
-				uid: deletedIds, //删除的ID    
+				uid: deletedIds, //删除的ID
 			}
 		}).done(function(data) {
 			if(!data.error.length) {
@@ -946,7 +946,7 @@ const MyClient = Form.create()(React.createClass({
 	reset() {
 		this.state.isMemberSearch = undefined;
 		this.state.internationalSearch = undefined;
-		this.state.typeSearch = undefined; //名称1   
+		this.state.typeSearch = undefined; //名称1
 		this.state.nameSearch = '';
 		this.state.addressSearch = [];
 		this.state.provinceSearch = undefined;
@@ -1833,7 +1833,7 @@ const MyClient = Form.create()(React.createClass({
 				crossDomain: false,
 				url: globalConfig.context + "/api/admin/customer/deleteOneContact",
 				data: {
-					ocbId: e.id, //删除的ID    
+					ocbId: e.id, //删除的ID
 				}
 			}).done(function(data) {
 				if(!data.error.length) {
@@ -1901,7 +1901,7 @@ const MyClient = Form.create()(React.createClass({
 		}.bind(this));
 	},
 	//指定转交人自动补全
-	supervisor(e){ 
+	supervisor(e){
 		$.ajax({
             method: "get",
             dataType: "json",
@@ -1910,23 +1910,23 @@ const MyClient = Form.create()(React.createClass({
             data:{
             	adminName:e
             },
-            success: function (data) {                	  
+            success: function (data) {
 				       let thedata=data.data;
 				    if (!thedata) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
-                    };	
-                    thedata = {}; 
-              }; 
+                    };
+                    thedata = {};
+              };
 					this.setState({
-						customerArr:thedata,	
+						customerArr:thedata,
                     });
 				}.bind(this),
 			}).always(function () {
             this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
 	},
 	//上级主管输入框失去焦点是判断客户是否存在
 	selectAuto(value,options){
@@ -1942,7 +1942,7 @@ const MyClient = Form.create()(React.createClass({
                 if (item.name == e.toString()) {
                     theType = item.id;
                 }
-           });     
+           });
    	    }
 		this.setState({
 			theTypes:theType
@@ -1951,8 +1951,8 @@ const MyClient = Form.create()(React.createClass({
 	//值改变时请求客户名称
 	httpChange(e){
 		if(e.length>=1){
-			this.supervisor(e); 
-		}	
+			this.supervisor(e);
+		}
 		this.setState({
 			auto:e
 		})
@@ -1968,7 +1968,7 @@ const MyClient = Form.create()(React.createClass({
 				let rowItem = this.state.selectedRows[idx];
 				if(rowItem.id) {
 					changeIds = rowItem.id;
-					
+
 				};
 			};
 			$.ajax({
@@ -1978,7 +1978,7 @@ const MyClient = Form.create()(React.createClass({
 				url: globalConfig.context + "/api/admin/customer/transferToOther",
 				data: {
 					uid: changeIds, //这一行数据的ID
-					aid: this.state.theTypes, //指定转交人的ID 
+					aid: this.state.theTypes, //指定转交人的ID
 				}
 			}).done(function(data) {
 				if(!data.error.length) {
@@ -2060,29 +2060,29 @@ const MyClient = Form.create()(React.createClass({
 				     )
 		return(
 			<div className="user-content" >
-                <div className="content-title">                  
+                <div className="content-title">
                     <span>我的单位客户</span>
                 </div>
-                <div className="user-search">                    
+                <div className="user-search">
                     <Input placeholder="客户名称"
                         value={this.state.nameSearch}
-                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
+                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
                     <Select placeholder="省"
                             style={{ width: 80 }}
                             value={this.state.provinceSearch}
                             onChange={(e) => {this.setState({ provinceSearch: e});}}>
                             {this.state.Provinces}
-                    </Select> 
-                    <span style={{marginRight:'10px'}}>                   
+                    </Select>
+                    <span style={{marginRight:'10px'}}>
 	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
-    						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
+    						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />
                     </span>
                     <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>                      
+                    <Button onClick={this.reset}>重置</Button>
                     <Button onClick={() => { window.open(globalConfig.context + '/api/admin/customer/downloadTemplate?type=1') }} style={{display:'none'}}>下载批量导入模板</Button>
-               		<Upload 
+               		<Upload
                		    name="file"
-                        action={globalConfig.context + "/api/admin/customer/uploadExcel"}                            
+                        action={globalConfig.context + "/api/admin/customer/uploadExcel"}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {
@@ -2102,10 +2102,10 @@ const MyClient = Form.create()(React.createClass({
                             };
                         }} >
                         <Button style={{display:'none'}}> 上传批量内容</Button>
-                    </Upload>   
+                    </Upload>
 	               {adminData.isSuperAdmin?<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 							     <Button type="danger" style={{marginLeft:'10px'}}
-	                       			 disabled={!hasSelected} 
+	                       			 disabled={!hasSelected}
 	                       		 >删除<Icon type="minus" />
 	                        </Button>
 	                </Popconfirm>:''
@@ -2126,18 +2126,18 @@ const MyClient = Form.create()(React.createClass({
 				        disabled={!hasSelected}
 				      >
 				        <Input />
-				      </AutoComplete>  
-					<Button type="primary" onClick={this.changeAssigner}  disabled={!hasSelected} >转交</Button>  
+				      </AutoComplete>
+					<Button type="primary" onClick={this.changeAssigner}  disabled={!hasSelected} >转交</Button>
 	                <Button type='primary' disabled={!hasSelected}
                         onClick={this.changeRow}>转为公共客户<Icon /></Button>
 	                <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
-                    <Button type="primary" className="addButton" onClick={this.addClick}>新增客户<Icon type="plus" /></Button> 
+                    <Button type="primary" className="addButton" onClick={this.addClick}>新增客户<Icon type="plus" /></Button>
                     <div className='clearfix' style={{marginTop:'5px'}}>
-	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
+	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
 			                <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 }); }} />    
+		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
 	                        <Select placeholder="账户状态"
 	                            style={{ width: 100 }}
 	                            value={this.state.statusSearch}
@@ -2204,34 +2204,35 @@ const MyClient = Form.create()(React.createClass({
                                         })
                                     }
 	                        </Select>
-			            </div>  
+			            </div>
 		            </div>
-                </div>                                               
+                </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
                         <Table columns={this.state.columns}
-                            dataSource={this.state.dataSource}    
+                            dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
-                            pagination={this.state.pagination} 
+                            pagination={this.state.pagination}
                             onRowClick={this.tableRowClick}
                            />
                     </Spin>
-                </div> 
+                </div>
                 <CustomerDetail
-                    data={this.state.RowData}                                        
+                    data={this.state.RowData}
                     showDesc={this.state.showDesc}
-                    closeDesc={this.closeDesc} 
+                    closeDesc={this.closeDesc}
                     newmodal={this.newmodal}
                     />
-                <Modal	
-				      className="customeDetails"				      
+                <Modal
+					  maskClosable={false}
+				      className="customeDetails"
 			          title="单位客户详情"
 			          width='1300px'
 			          visible={this.state.modal5Visible}
 			          onOk={this.detailsModal}
 			          onCancel={this.detailsModal}
 			          footer=''
-			        >				    
+			        >
 					     <Tabs onChange={this.callback} activeKey={this.state.callnub}>
 						    <TabPane tab="基本信息" key="1">
 						        <Form horizontal onSubmit={this.newSubmit} id="demand-form">
@@ -2246,7 +2247,7 @@ const MyClient = Form.create()(React.createClass({
 						                    </FormItem>
 					                    </div>
 					                    <div className="clearfix" style={{paddingLeft:'60px'}}>
-					                    	<FormItem className="half-item" 
+					                    	<FormItem className="half-item"
 					                         labelCol={{ span: 4 }}
 					                         wrapperCol={{ span: 18 }}
 					                         label="行业">
@@ -2260,11 +2261,11 @@ const MyClient = Form.create()(React.createClass({
 				                                </Select>
 				                                <span style={{color:'red',marginLeft:'15px'}}>*</span>
 					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
+					                   		 <FormItem className="half-item"
 					                           labelCol={{ span: 4 }}
 					                            wrapperCol={{ span: 18 }}
 					                           label="社会属性"
-					                         > 
+					                         >
 												    <Select placeholder="客户社会属性(必填项)" value={this.state.societyTag}  style={{width:'300px'}}
 											    				onChange={(e)=>{this.setState({societyTag:e})}}>
 				                                    {
@@ -2275,11 +2276,11 @@ const MyClient = Form.create()(React.createClass({
 				                                </Select>
 				                                <span style={{color:'red',marginLeft:'15px'}}>*</span>
 					                   		 </FormItem>
-					                         <FormItem className="half-item" 
+					                         <FormItem className="half-item"
 					                           labelCol={{ span: 4 }}
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
-					                          > 
+					                          >
 					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
     												<span style={{color:'red',marginLeft:'15px'}}>*</span>
@@ -2289,7 +2290,7 @@ const MyClient = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                         label="通信地址"
 						                            >
-						                                <Input placeholder="客户通信地址" value={this.state.postalAddress} 
+						                                <Input placeholder="客户通信地址" value={this.state.postalAddress}
 											    				onChange={(e)=>{this.setState({postalAddress:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -2297,7 +2298,7 @@ const MyClient = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                         label="固定电话"
 						                            >
-						                                <Input placeholder="客户固定电话" value={this.state.contactsFixedTel} 
+						                                <Input placeholder="客户固定电话" value={this.state.contactsFixedTel}
 											    				onChange={(e)=>{this.setState({contactsFixedTel:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -2305,7 +2306,7 @@ const MyClient = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="客户传真"
 						                            >
-						                                <Input placeholder="客户传真" value={this.state.contactsFax} 
+						                                <Input placeholder="客户传真" value={this.state.contactsFax}
 											    				onChange={(e)=>{this.setState({contactsFax:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -2329,7 +2330,7 @@ const MyClient = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="法人名称"
 						                            >
-						                                <Input placeholder="法人名称" value={this.state.legalPerson} 
+						                                <Input placeholder="法人名称" value={this.state.legalPerson}
 											    				onChange={(e)=>{this.setState({legalPerson:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -2337,10 +2338,10 @@ const MyClient = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="身份证号码"
 						                            >
-						                                <Input placeholder="法人身份证号码" value={this.state.legalPersonIdCard} 
+						                                <Input placeholder="法人身份证号码" value={this.state.legalPersonIdCard}
 											    				onChange={(e)=>{this.setState({legalPersonIdCard:e.target.value})}}/>
 						                    </FormItem>
-						                    <FormItem className="half-item" 
+						                    <FormItem className="half-item"
 							                    	labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
 							                        label="主要联系人"
@@ -2348,7 +2349,7 @@ const MyClient = Form.create()(React.createClass({
 						                            <Input placeholder="主要联系人" value={this.state.contacts} onChange={(e) => {
 								                        this.setState({ contacts:  e.target.value })}}/>
 						                     </FormItem>
-						                     <FormItem className="half-item" 
+						                     <FormItem className="half-item"
 							                    	labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
 							                        label="主要联系人号码"
@@ -2360,8 +2361,8 @@ const MyClient = Form.create()(React.createClass({
 							                    	labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
 							                        label="法人电话"
-						                            > 
-						                                <Input placeholder="法人电话" value={this.state.legalPersonTel} 
+						                            >
+						                                <Input placeholder="法人电话" value={this.state.legalPersonTel}
 											    				onChange={(e)=>{this.setState({legalPersonTel:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -2369,7 +2370,7 @@ const MyClient = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="电子邮箱"
 						                            >
-						                                <Input placeholder="法人电子邮箱" value={this.state.legalPersonEmail} 
+						                                <Input placeholder="法人电子邮箱" value={this.state.legalPersonEmail}
 											    				onChange={(e)=>{this.setState({legalPersonEmail:e.target.value})}}/>
 						                    </FormItem>
 								            <FormItem className="half-item"
@@ -2377,7 +2378,7 @@ const MyClient = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="机构代码"
 						                            >
-						                                <Input placeholder="社会同意机构代码" value={this.state.orgCode} 
+						                                <Input placeholder="社会同意机构代码" value={this.state.orgCode}
 											    				onChange={(e)=>{this.setState({orgCode:e.target.value})}}/>
 						                    </FormItem>
 								           <div className="clearfix">
@@ -2444,54 +2445,54 @@ const MyClient = Form.create()(React.createClass({
 						                        <FormItem
 							                        labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
-							                        label="单位logo" > 
+							                        label="单位logo" >
 							                        <PicturesWall
 							                            pictureSign="logo"
 							                            fileList={this.getCompanyLogoUrl}
 							                            pictureUrl={this.state.companyLogoUrl} />
 							                            <p>图片建议:图片要清晰。</p>
 							                    </FormItem>
-							                </div> 
+							                </div>
 							                <div className="clearfix">
 							                    <FormItem
 						                        labelCol={{ span: 2 }}
 						                        wrapperCol={{ span: 18 }}
 						                        label="业务范围" >
-						                            <Input type="textarea" rows={4} value={this.state.businessScope} 
+						                            <Input type="textarea" rows={4} value={this.state.businessScope}
 											    				onChange={(e)=>{this.setState({businessScope:e.target.value})}}/>
 							                    </FormItem>
 							                    <FormItem
 							                        labelCol={{ span: 2 }}
 							                        wrapperCol={{ span: 18 }}
 							                        label="单位简介" >
-							                            <Input type="textarea" rows={4}  value={this.state.introduction} 
-											    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+							                            <Input type="textarea" rows={4}  value={this.state.introduction}
+											    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>
 							                    </FormItem>
 						                    </div>
-						                    <Button className="set-submit" type="primary" htmlType="submit" style={{marginLeft:'90px',marginBottom:'30px'}}>保存</Button>  
+						                    <Button className="set-submit" type="primary" htmlType="submit" style={{marginLeft:'90px',marginBottom:'30px'}}>保存</Button>
 					                        <Button className="set-submit" type="ghost" onClick={this.detailsModal}>取消</Button>
-					                    </div>		                	
+					                    </div>
 								    </Spin>
-								</Form>		
+								</Form>
 							</TabPane>
 						    <TabPane tab="联系人信息" key="2">
 						        <div className="clearfix" >
-						            <Button className="ContactsList" type="primary" onClick={this.addcontact}>新增</Button> 
+						            <Button className="ContactsList" type="primary" onClick={this.addcontact}>新增</Button>
 						        </div>
 						       <div className="clearfix">
                     			  <Spin spinning={this.state.loading}>
                     			     <Form horizontal id="demand-form" onSubmit={this.contactSave} >
-								      <Table 
+								      <Table
 						            	 pagination={false}
-						            	 columns={this.state.ContactsLists} 
+						            	 columns={this.state.ContactsLists}
 						            	 dataSource={this.state.contactList}
 						            	 />
 					            	    <div className="clearfix">
-								                <Button  type="primary" htmlType="submit" style={{fontSize:'16px',margin:'20px 25px 40px 120px'}}>保存</Button>  
+								                <Button  type="primary" htmlType="submit" style={{fontSize:'16px',margin:'20px 25px 40px 120px'}}>保存</Button>
 				                                <Button  type="ghost" onClick={this.detailsModal} style={{fontSize:'18px'}}>取消</Button>
 								            </div>
-						            	</Form> 
-								   </Spin> 
+						            	</Form>
+								   </Spin>
 								</div>
 						    </TabPane>
 						    <TabPane tab="账户信息" key="3">
@@ -2508,33 +2509,33 @@ const MyClient = Form.create()(React.createClass({
 							                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="注册用户名" >
-							                         <Input value={this.state.nickname}  onChange={(e) => { this.setState({ nickname: e.target.value }); }} />        
+							                         <Input value={this.state.nickname}  onChange={(e) => { this.setState({ nickname: e.target.value }); }} />
 							                    </FormItem>
 							                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="注册邮箱" >
-							                         <Input value={this.state.email}  onChange={(e) => { this.setState({ email: e.target.value }); }} />        
+							                         <Input value={this.state.email}  onChange={(e) => { this.setState({ email: e.target.value }); }} />
 							                    </FormItem>
 							                    <div className="clearfix">
 								                    <FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="客户来源" >
-								                            <span>{this.state.source}</span>   
+								                            <span>{this.state.source}</span>
 								                    </FormItem>
 								                    <FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="客户类型" >
-								                            <span>{this.state.type}</span>   
+								                            <span>{this.state.type}</span>
 								                    </FormItem>
 								                    <FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="创建时间" >
-								                            <span>{this.state.createTimes}</span>   
+								                            <span>{this.state.createTimes}</span>
 								                    </FormItem>
-								                    <FormItem className="half-item" 
+								                    <FormItem className="half-item"
 							                           {...formItemLayout}
 							                           label="账户状态"
-							                         > 
+							                         >
 													    <Select placeholder="账户状态" value={this.state.status}  onChange={(e) => { this.setState({ status: e }); }} >
 					                                    {
 					                                        statuslist.map(function (item) {
@@ -2548,7 +2549,7 @@ const MyClient = Form.create()(React.createClass({
 										            <FormItem className="half-item"
 										                {...formItemLayout}
 								                        label="会员"
-										            > 
+										            >
 								                   		 <Radio.Group value={this.state.isMember} onChange={(e) => {
 										                        this.setState({ isMember:  e.target.value })
 										                    }}>
@@ -2556,10 +2557,10 @@ const MyClient = Form.create()(React.createClass({
 										                        <Radio value={1}>是</Radio>
 										                  </Radio.Group>
 										            </FormItem>
-										            <FormItem className="half-item" 
+										            <FormItem className="half-item"
 								                          {...formItemLayout}
 								                           label="会员等级"
-								                         > 
+								                         >
 													    <Select placeholder="客户状态" value={this.state.lvl}  onChange={(e) => { this.setState({ lvl: e }); }} >
 					                                     {
 					                                        lvl.map(function (item) {
@@ -2568,10 +2569,10 @@ const MyClient = Form.create()(React.createClass({
 					                                     }
 					                                   </Select>
 							                   		</FormItem>
-							                   		<FormItem className="half-item" 
+							                   		<FormItem className="half-item"
 							                           {...formItemLayout}
 							                           label="会员状态"
-							                         > 
+							                         >
 													    <Select placeholder="会员状态" value={this.state.currentMemberStatus}  onChange={(e) => { this.setState({ currentMemberStatus: e }); }} >
 					                                    {
 					                                        currentMember.map(function (item) {
@@ -2582,59 +2583,60 @@ const MyClient = Form.create()(React.createClass({
 							                   		</FormItem>
 							                   	</div>
 									            <div className="clearfix">
-									                <Button className='saveBtn' type="primary" htmlType="submit">保存</Button>  
+									                <Button className='saveBtn' type="primary" htmlType="submit">保存</Button>
 					                                <Button  type="ghost" onClick={this.detailsModal}>取消</Button>
 									            </div>
 						    				</Spin>
-						    			</Form>	
+						    			</Form>
 						    		</div>
 						    </TabPane>
 							<TabPane tab="客户拜访" key="4">
 							     <div className="clearfix">
                     			    <Spin spinning={this.state.loading}>
-								      <Table 
+								      <Table
 						            	 pagination={false}
-						            	 columns={this.state.visitsList} 
+						            	 columns={this.state.visitsList}
 						            	 dataSource={this.state.visitArrList}
 						            	 onRowClick={this.VisitRowClick}
 						            	 />
-								    </Spin> 
-								</div>								
-							</TabPane>						
+								    </Spin>
+								</div>
+							</TabPane>
 							<TabPane tab="业务意向" key="5">
 							    <div className="clearfix">
                     			    <Spin spinning={this.state.loading}>
-								      <Table 
+								      <Table
 						            	 pagination={this.state.paginationt}
-						            	 columns={this.state.businessIntentionList} 
+						            	 columns={this.state.businessIntentionList}
 						            	 dataSource={this.state.dataBusiness}
 						            	 />
-								    </Spin> 
-								</div>							
+								    </Spin>
+								</div>
 							</TabPane>
 							<TabPane tab="业务订单" key="6">
-							     								
+
 							</TabPane>
 							<TabPane tab="技术需求" key="7">
-							     								
+
 							</TabPane>
 							<TabPane tab="技术成果" key="8">
-							     								
+
 							</TabPane>
 							<TabPane tab="技术专家" key="9">
-							     								
+
 							</TabPane>
 						</Tabs>
     			</Modal>
-    			<Modal	
+    			<Modal
+					  maskClosable={false}
 				      className="customeDetails"
 				      footer=''
 			          title="拜访详情"
 			          width='1000px'
 			          visible={this.state.visitModul}
 			          onOk={this.visitOk}
-					  onCancel={this.visitCancel}							          							          
-			        >				    
+					  onCancel={this.visitCancel}
+			        >
 					    <Form horizontal id="demand-form" onSubmit={this.visitSubmit}>
 			    			<Spin spinning={this.state.loading}>
 			    			   	<div className="clearfix">
@@ -2642,7 +2644,7 @@ const MyClient = Form.create()(React.createClass({
 			                            {...formItemLayout}
 			                            label="拜访方式" >
 			    			   			<Radio.Group value={this.state.contactType} onChange={(e) => {
-										        this.setState({ contactType: e.target.value }) 
+										        this.setState({ contactType: e.target.value })
 						                    }}>
 						                        <Radio value={0}>外出</Radio>
 						                        <Radio value={1}>电话</Radio>
@@ -2705,7 +2707,7 @@ const MyClient = Form.create()(React.createClass({
 					                        labelCol={{ span: 4 }}
 							                wrapperCol={{ span: 16 }}
 					                        label="拜访备注" >
-					                            <Input type="textarea" rows={4} value={this.state.result} 
+					                            <Input type="textarea" rows={4} value={this.state.result}
 					                              onChange={(e)=>{this.setState({result:e.target.value})}}/>
 					                    </FormItem>
 					                </div>
@@ -2713,29 +2715,30 @@ const MyClient = Form.create()(React.createClass({
 					                 	<div style={{fontSize:'18px',marginLeft:'100px',marginTop:'15px',marginBottom:'10px'}}>业务意向<Button onClick={this.addNew} style={{marginLeft:'420px',background:'green',color:'#ffffff'}}>添加新业务</Button></div>
 					                 	<div className="clearfix" style={{paddingLeft:'50px',paddingRight:'50px'}}>
 		                    			    <Spin spinning={this.state.loading}>
-										      <Table 
+										      <Table
 										         rowKey={record => record.id}
 								            	 pagination={false}
-								            	 columns={this.state.intentionList} 
+								            	 columns={this.state.intentionList}
 								            	 dataSource={this.state.data}
 								            	 />
-										    </Spin> 
-										</div>	 
+										    </Spin>
+										</div>
 					                </div>
 			    			   	</div>
 							    <Button  type="primary" size="large" htmlType="submit" style={{margin:'15px  35px 35px 120px'}}>保存</Button>
 					           	<Button  size="large" onClick={this.visitCancel}>取消</Button>
 					   		</Spin>
 					    </Form>
-    			</Modal> 
-    			<Modal	
+    			</Modal>
+    			<Modal
+					  maskClosable={false}
 				      footer=''
 			          title="修改密码"
 			          width='600px'
 			          visible={this.state.passworldModul}
 			          onOk={this.passworldOk}
-					  onCancel={this.passworldCancel}							          							          
-			        >				    
+					  onCancel={this.passworldCancel}
+			        >
 					    <div className="clearfix">
 			    			<Form horizontal id="demand-form" onSubmit={this.passworldSubmit}>
 			    				<Spin spinning={this.state.loading}>
@@ -2743,52 +2746,53 @@ const MyClient = Form.create()(React.createClass({
 				    					<FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="原密码" >
-					                         <Input type="password" value={this.state.companyNamet1}  onChange={(e) => { this.setState({ companyNamet1: e.target.value }); }} required="required" />	
+					                         <Input type="password" value={this.state.companyNamet1}  onChange={(e) => { this.setState({ companyNamet1: e.target.value }); }} required="required" />
 					                    </FormItem>
 				                    </div>
 				                    <div className="clearfix">
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="新密码" >
-					                         <Input type="password" value={this.state.companyName1}  onChange={(e) => { this.setState({ companyName1: e.target.value }); }} required="required" /> 
+					                         <Input type="password" value={this.state.companyName1}  onChange={(e) => { this.setState({ companyName1: e.target.value }); }} required="required" />
 					                    </FormItem>
 				                    </div>
 				                    <div className="clearfix">
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            label="确认密码" >
-					                         <Input type="password" value={this.state.companyNam1}  onChange={(e) => { this.setState({ companyNam1: e.target.value }); }} required="required" /> 
+					                         <Input type="password" value={this.state.companyNam1}  onChange={(e) => { this.setState({ companyNam1: e.target.value }); }} required="required" />
 					                    </FormItem>
 				                    </div>
 				                    <Button  type="primary" size="large" htmlType="submit" style={{margin:'15px  15px 20px 95px'}}>保存</Button>
 			           				<Button  size="large" onClick={this.passworldCancel}>取消</Button>
 				                </Spin>
-							</Form>                  
-						</div>	                    
+							</Form>
+						</div>
     			</Modal>
 			    <Modal
+					  maskClosable={false}
 				      footer=''
 				      width='800px'
 			          title="新增联系人"
 			          visible={this.state.addcontactModul}
 			          onOk={this.addcontactModulOK}
-			          onCancel={this.addcontactModulcancel}						          							          
+			          onCancel={this.addcontactModulcancel}
 						        >
 				        <Form horizontal onSubmit={this.submitcontactman} id="demand-form">
-					      <Spin spinning={this.state.loading}> 											             
-					        <Row>	
-			                    <FormItem 
+					      <Spin spinning={this.state.loading}>
+					        <Row>
+			                    <FormItem
 			                        labelCol={{ span: 3 }}
 			                        wrapperCol={{ span: 14 }}
 			                        label="性别:"  style={{marginRight:'10px',marginTop: '-15px'}}>
 			                        <Radio.Group value={this.state.newsex} onChange={(e) => {
-					                    this.setState({ newsex: e.target.value }) 
+					                    this.setState({ newsex: e.target.value })
 					                    }}>
 					                        <Radio value='男'>男</Radio>
 					                        <Radio value='女'>女</Radio>
 				                    </Radio.Group>
-			                    </FormItem>	
-							</Row>								               
+			                    </FormItem>
+							</Row>
 					        <Row style={{ paddingLeft:'50px' }}>
 		                        <Col span={2}><span style={{color:'red'}}>*</span>姓名:</Col>
                                 <Col span={8}>
@@ -2800,7 +2804,7 @@ const MyClient = Form.create()(React.createClass({
                                     <Input value={this.state.newmobile} required="required"
                                         onChange={(e) => { this.setState({ newmobile: e.target.value }) }} />
                                 </Col>
-                                
+
                             </Row>
 		                    <Row style={{ marginTop: '20px',paddingLeft:'50px' }}>
                                 <Col span={2}>微信:</Col>
@@ -2825,8 +2829,8 @@ const MyClient = Form.create()(React.createClass({
                                     <Input value={this.state.newposition}
                                         onChange={(e) => { this.setState({ newposition: e.target.value }) }} />
                                 </Col>
-                            </Row>	
-                            <Row style={{ marginTop: '20px',paddingLeft:'50px' }}>						                       
+                            </Row>
+                            <Row style={{ marginTop: '20px',paddingLeft:'50px' }}>
                                 <Col span={2}>邮箱:</Col>
                                 <Col span={8}>
                                     <Input value={this.state.newemail}
@@ -2838,16 +2842,17 @@ const MyClient = Form.create()(React.createClass({
 			              <Button className="set-submit" type="ghost" onClick={this.addcontactModulcancel} id='change_rem'>取消</Button>
 			            	</Row>
 			            </Spin>
-			        </Form>   
+			        </Form>
 			    </Modal>
-			    <Modal	
+			    <Modal
+					  maskClosable={false}
 				      footer=''
 			          title="业务意向详情"
 			          width='1000px'
 			          visible={this.state.businessModul}
 			          onOk={this.businessIntentionOk}
-					  onCancel={this.businessIntentionCancel}							          							          
-			        >				    
+					  onCancel={this.businessIntentionCancel}
+			        >
 					    <div className="clearfix">
 			    			<Form horizontal id="demand-form" onSubmit={this.passworldSubmit}>
 			    				<Spin spinning={this.state.loading}>
@@ -2894,26 +2899,27 @@ const MyClient = Form.create()(React.createClass({
 			                        	<div style={{fontSize:'18px',lineHeight:'24px',marginBottom:'10px'}}>业务跟进</div>
 			                        	<div className="clearfix">
 		                    			    <Spin spinning={this.state.loading}>
-										      <Table 
+										      <Table
 								            	 pagination={this.state.paginations}
-								            	 columns={this.state.businessFollowList} 
+								            	 columns={this.state.businessFollowList}
 								            	 dataSource={this.state.visitArrList}
 								            	 />
-										    </Spin> 
-										</div>	
+										    </Spin>
+										</div>
 			                        </div>
 				                </Spin>
-							</Form>                  
-						</div>	                    
+							</Form>
+						</div>
     			</Modal>
-    			<Modal	
+    			<Modal
+					  maskClosable={false}
 				      footer=''
 			          title="业务跟进详情"
 			          width='600px'
 			          visible={this.state.businessFollowModul}
 			          onOk={this.businessFollowOk}
-					  onCancel={this.businessFollowCancel}							          							          
-			        >				    
+					  onCancel={this.businessFollowCancel}
+			        >
 					    <div className="clearfix">
 			    			<Form horizontal id="demand-form" onSubmit={this.passworldSubmit}>
 			    				<Spin spinning={this.state.loading}>
@@ -2982,7 +2988,7 @@ const MyClient = Form.create()(React.createClass({
 					                            {...formItemLayout}
 					                            label="拜访人" >
 					                        <span>{this.state.adminNames}</span>
-					                    </FormItem> 
+					                    </FormItem>
 					                    <div className="clearfix">
 					                    	<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -2992,11 +2998,11 @@ const MyClient = Form.create()(React.createClass({
 					                    </div>
 			                        </div>
 				                </Spin>
-							</Form>                  
-						</div>	                    
+							</Form>
+						</div>
     			</Modal>
           </div >
 		);
 	}
 }));
-export default MyClient;
+export default MyClient;

File diff suppressed because it is too large
+ 308 - 304
js/component/manageCenter/customer/customerService/myBusiness.jsx


+ 2 - 1
js/component/manageCenter/customer/managementFollow/customerFollow/index.jsx

@@ -533,6 +533,7 @@ class CustomerFollow extends Component{
                     contactState={this.state.contactState}
                 />
                 <Modal
+                    maskClosable={false}
                     className="customeDetails"
                     title="指导意见"
                     width='500px'
@@ -587,4 +588,4 @@ class CustomerFollow extends Component{
     }
 }
 
-export default CustomerFollow;
+export default CustomerFollow;

+ 128 - 127
js/component/manageCenter/customer/reviewed/identityAudits.jsx

@@ -82,7 +82,7 @@ const PublicCustomer = Form.create()(React.createClass({
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
 				auditStatus:1,
-				type: this.state.typeSearch, //名称1   
+				type: this.state.typeSearch, //名称1
 				name: this.state.nameSearch,
 				shareType: this.state.shareTypeSearch,
 				province: (this.state.addressSearch).length ? this.state.addressSearch[0] : this.state.provinceSearch,
@@ -91,7 +91,7 @@ const PublicCustomer = Form.create()(React.createClass({
 				status: this.state.statusSearch,
 				industry: this.state.industrySearch,
 				businessAudit: this.state.serviceCertificationSearch,
-				
+
 				currentMemberStatus: this.state.currentMemberStatusSearch,
 				international: this.state.internationalSearch,
 				lvl: this.state.lvlSearch,
@@ -290,7 +290,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					dataIndex: 'remarks',
 					key: 'remarks',
 					render: (text, record, index) => {
-						return adminData.isSuperAdmin ? <Input value={record.remarks} placeholder="跟进说明" 
+						return adminData.isSuperAdmin ? <Input value={record.remarks} placeholder="跟进说明"
 	                             onChange={(e) => { record.remarks = e.target.value; this.setState({ data: this.state.data }); }}
 	                             style={{width:'120px'}}/> : <span>{text}</span>
 					}
@@ -405,7 +405,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					key: 'name',
 					render: (text, record, index) => {
 						return adminData.isSuperAdmin ? <Input value={record.name} placeholder="姓名" key={record.id} required="required"
-	                           onChange={(e) => { record.name = e.target.value; 
+	                           onChange={(e) => { record.name = e.target.value;
 	                           	this.setState({ contactList: this.state.contactList }); }} style={{width:'120px'}}/> : <span>{text}</span>
 					}
 				}, {
@@ -607,10 +607,10 @@ const PublicCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
-	
 
-	
-	//进入修改拜访记录  
+
+
+	//进入修改拜访记录
 	visitModify(e) {
 		this.setState({
 			visitModul: true,
@@ -669,7 +669,7 @@ const PublicCustomer = Form.create()(React.createClass({
 		let areaArr= getProvinceList();
 		let Citys=citySelect(areaArr);
 		let Areas=areaSelect(areaArr);
-		this.setState({ 
+		this.setState({
 			City: Citys,
 			Area: Areas
 		});
@@ -721,7 +721,7 @@ const PublicCustomer = Form.create()(React.createClass({
 		this.setState({
 			selectedRowKeys: [],
 		});
-		
+
 		$.ajax({
 			method: "get",
 			dataType: "json",
@@ -738,7 +738,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					crossDomain: false,
 					url: globalConfig.context + "/api/admin/customer/updateOrganizationCustomer",
 					data: {
-						uid: deletedIds, //审核通过的ID  
+						uid: deletedIds, //审核通过的ID
 						id:thisData.id,
 						auditStatus:5,
 //						expert:rowItem.expert,
@@ -786,7 +786,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					crossDomain: false,
 					url: globalConfig.context + "/api/admin/customer/updatePersonalCustomer",
 					data: {
-						uid: deletedIds, //审核通过的ID  
+						uid: deletedIds, //审核通过的ID
 						id:thisData.id,
 						auditStatus:4,
 					}
@@ -810,14 +810,14 @@ const PublicCustomer = Form.create()(React.createClass({
 	getCompanyLogoUrl(e) {
 		this.setState({ companyLogoUrl: e });
 	},
-	
+
 	search() {
 		this.loadData();
 	},
 	reset() {
 		this.state.internationalSearch = undefined;
 		this.state.shareTypeSearch = undefined;
-		this.state.typeSearch = undefined; //名称1   
+		this.state.typeSearch = undefined; //名称1
 		this.state.nameSearch = '';
 		this.state.addressSearch = [];
 		this.state.provinceSearch = undefined;
@@ -842,7 +842,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			searchMore: !this.state.searchMore
 		});
 	},
-	
+
 	//整行点击
 	tableRowClick(record, index) {
 		this.state.RowData = record;
@@ -862,7 +862,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			delectId: record.followId,
 		})
 	},
-	
+
 	//点击整行查看详情
 	//查看基本详情基本信息
 	loadInformation(record) {
@@ -990,7 +990,7 @@ const PublicCustomer = Form.create()(React.createClass({
 		});
 	},
 	//拜访modul函数
-	
+
 	visitCancel(e) {
 		this.setState({
 			visitModul: false
@@ -1216,7 +1216,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			businessFollowModul: false
 		})
 	},
-	
+
 	//详情tab切换数据处理
 	callback(e) {
 		if(e == '1') {
@@ -1360,22 +1360,22 @@ const PublicCustomer = Form.create()(React.createClass({
 		const contacts = this.state.contacts || '';
 		return(
 			<div className="user-content" >
-                <div className="content-title">                  
+                <div className="content-title">
                     <span>单位客户实名认证</span>
                 </div>
-                <div className="user-search">                    
+                <div className="user-search">
                     <Input placeholder="客户名称"
                         value={this.state.nameSearch}
-                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
+                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
                     <Select placeholder="省"
                             style={{ width: 80 }}
                             value={this.state.provinceSearch}
                             onChange={(e) => {this.setState({ provinceSearch: e});}}>
                             {this.state.Provinces}
-                    </Select> 
-                    <span style={{marginRight:'10px'}}>                   
+                    </Select>
+                    <span style={{marginRight:'10px'}}>
 	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
-    						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
+    						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />
                     </span>
                      <span style={{marginRight:'10px'}}>客户类型:</span>
 	                        <Select placeholder="选择客户类型"
@@ -1386,20 +1386,20 @@ const PublicCustomer = Form.create()(React.createClass({
 	                            <Select.Option value="1" >公共客户</Select.Option>
 	                        </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>                                         				
+                    <Button onClick={this.reset}>重置</Button>
 					{adminData.isSuperAdmin?<Button type='primary' style={{marginRight:'10px' ,marginLeft:'10px',display:adminData.isSuperAdmin?'inline-block':'none'}}
-	                        disabled={!hasSelected} 
+	                        disabled={!hasSelected}
 	                        onClick={this.delectRow}>审核通过</Button>:''}
 					{adminData.isSuperAdmin?<Button type='primary' style={{marginRight:'10px' ,marginLeft:'10px',display:adminData.isSuperAdmin?'inline-block':'none'}}
-	                        disabled={!hasSelected} 
-	                        onClick={this.delectRows}>审核不通过</Button>:''}		
+	                        disabled={!hasSelected}
+	                        onClick={this.delectRows}>审核不通过</Button>:''}
 	                <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className='clearfix' style={{marginTop:'5px'}}>
-	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
+	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
 			                <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 }); }} />  
+		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
 	                        <Select placeholder="账户状态"
 	                            style={{ width: 100 }}
 	                            value={this.state.statusSearch}
@@ -1451,7 +1451,7 @@ const PublicCustomer = Form.create()(React.createClass({
 	                            value={this.state.lvlSearch}
 	                            onChange={(e) => { this.setState({ lvlSearch: e }) }}>
 	                            {this.state.lvlArrOption}
-	                        </Select> 
+	                        </Select>
 	                        <Select placeholder="会员状态"
 	                            style={{ width: 100 }}
 	                            value={this.state.currentMemberStatusSearch}
@@ -1468,28 +1468,29 @@ const PublicCustomer = Form.create()(React.createClass({
                                         })
                                     }
 	                        </Select>
-			            </div>  
+			            </div>
 		            </div>
-                </div>                                               
+                </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
                         <Table columns={this.state.columns}
-                            dataSource={this.state.dataSource}    
+                            dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
-                            pagination={this.state.pagination} 
+                            pagination={this.state.pagination}
                             onRowClick={this.tableRowClick}
                            />
                     </Spin>
-                </div> 
-                <Modal	
-				      className="customeDetails"				      
+                </div>
+                <Modal
+					  maskClosable={false}
+				      className="customeDetails"
 			          title="单位客户详情"
 			          width='1200px'
 			          visible={this.state.modal5Visible}
 			          onOk={this.detailsModal}
 			          onCancel={this.detailsModal}
 			          footer=''
-			        >				    
+			        >
 					     <Tabs defaultActiveKey="1" onChange={this.callback} activeKey={this.state.callnub}>
 						    <TabPane tab="基本信息" key="1">
 						        {adminData.isSuperAdmin?<Form horizontal onSubmit={this.newSubmit} id="demand-form">
@@ -1504,7 +1505,7 @@ const PublicCustomer = Form.create()(React.createClass({
 						                    </FormItem>
 					                    </div>
 					                   <div className="clearfix" style={{paddingLeft:'60px'}}>
-					                    	<FormItem className="half-item" 
+					                    	<FormItem className="half-item"
 					                         labelCol={{ span: 4 }}
 					                         wrapperCol={{ span: 18 }}
 					                         label="行业">
@@ -1518,11 +1519,11 @@ const PublicCustomer = Form.create()(React.createClass({
 				                                </Select>
 				                                <span style={{color:'red',marginLeft:'15px'}}>*</span>
 					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
+					                   		 <FormItem className="half-item"
 					                           labelCol={{ span: 4 }}
 					                            wrapperCol={{ span: 18 }}
 					                           label="社会属性"
-					                         > 
+					                         >
 												    <Select placeholder="客户社会属性(必填项)" value={this.state.societyTag} style={{width:'300px'}}
 											    				onChange={(e)=>{this.setState({societyTag:e})}}>
 				                                    {
@@ -1533,13 +1534,13 @@ const PublicCustomer = Form.create()(React.createClass({
 				                                </Select>
 				                                <span style={{color:'red',marginLeft:'15px'}}>*</span>
 					                   		 </FormItem>
-					                         <FormItem className="half-item" 
+					                         <FormItem className="half-item"
 					                           labelCol={{ span: 4 }}
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
-					                          > 
+					                          >
 					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
-    												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />   
+    												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                   </FormItem>
 						                   <FormItem className="half-item"
@@ -1547,7 +1548,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                         label="通信地址"
 						                            >
-						                                <Input placeholder="客户通信地址" value={this.state.postalAddress} 
+						                                <Input placeholder="客户通信地址" value={this.state.postalAddress}
 											    				onChange={(e)=>{this.setState({postalAddress:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1555,7 +1556,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                         label="固定电话"
 						                            >
-						                                <Input placeholder="客户固定电话" value={this.state.contactsFixedTel} 
+						                                <Input placeholder="客户固定电话" value={this.state.contactsFixedTel}
 											    				onChange={(e)=>{this.setState({contactsFixedTel:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1563,7 +1564,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="客户传真"
 						                            >
-						                                <Input placeholder="客户传真" value={this.state.contactsFax} 
+						                                <Input placeholder="客户传真" value={this.state.contactsFax}
 											    				onChange={(e)=>{this.setState({contactsFax:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1571,7 +1572,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="注册资本"
 						                            >
-						                                <Input placeholder="注册资本" value={this.state.registeredCapital} 
+						                                <Input placeholder="注册资本" value={this.state.registeredCapital}
 											    				onChange={(e)=>{this.setState({registeredCapital:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1579,7 +1580,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="单位规模"
 						                            >
-						                                <Input placeholder="单位规模" value={this.state.enterpriseScale} 
+						                                <Input placeholder="单位规模" value={this.state.enterpriseScale}
 											    				onChange={(e)=>{this.setState({enterpriseScale:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1587,7 +1588,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="法人名称"
 						                            >
-						                                <Input placeholder="法人名称" value={this.state.legalPerson} 
+						                                <Input placeholder="法人名称" value={this.state.legalPerson}
 											    				onChange={(e)=>{this.setState({legalPerson:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1595,15 +1596,15 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="身份证号码"
 						                            >
-						                                <Input placeholder="法人身份证号码" value={this.state.legalPersonIdCard} 
+						                                <Input placeholder="法人身份证号码" value={this.state.legalPersonIdCard}
 											    				onChange={(e)=>{this.setState({legalPersonIdCard:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
 							                    	labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
 							                        label="法人电话"
-						                            > 
-						                                <Input placeholder="法人电话" value={this.state.legalPersonTel} 
+						                            >
+						                                <Input placeholder="法人电话" value={this.state.legalPersonTel}
 											    				onChange={(e)=>{this.setState({legalPersonTel:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1611,7 +1612,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="电子邮箱"
 						                            >
-						                                <Input placeholder="法人电子邮箱" value={this.state.legalPersonEmail} 
+						                                <Input placeholder="法人电子邮箱" value={this.state.legalPersonEmail}
 											    				onChange={(e)=>{this.setState({legalPersonEmail:e.target.value})}}/>
 						                    </FormItem>
 						                    <FormItem className="half-item"
@@ -1619,10 +1620,10 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                        label="机构代码"
 						                            >
-						                                <Input placeholder="社会同意机构代码" value={this.state.orgCode} 
+						                                <Input placeholder="社会同意机构代码" value={this.state.orgCode}
 											    				onChange={(e)=>{this.setState({orgCode:e.target.value})}}/>
 						                    </FormItem>
-								            <FormItem className="half-item" 
+								            <FormItem className="half-item"
 								            	labelCol={{ span: 4 }}
 					                            wrapperCol={{ span: 18 }}
 						                        label="实名认证"
@@ -1650,7 +1651,7 @@ const PublicCustomer = Form.create()(React.createClass({
 									                        <Radio value={1}>已认证</Radio>
 									                  </Radio.Group>:<span>{this.state.businessAudit?'是':'否'}</span>}
 								            </FormItem>
-						                    
+
 					                   		<FormItem className="half-item"
 				                   		   		labelCol={{ span: 4 }}
 					                            wrapperCol={{ span: 18 }}
@@ -1702,31 +1703,31 @@ const PublicCustomer = Form.create()(React.createClass({
 						                        <FormItem
 							                        labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
-							                        label="单位logo" > 
+							                        label="单位logo" >
 							                        <PicturesWalls
 							                            pictureSign="logo"
 							                            fileList={this.getCompanyLogoUrl}
 							                            pictureUrl={this.state.companyLogoUrl} />
 							                            <p>图片建议:图片要清晰。</p>
 							                    </FormItem>
-							                </div> 
+							                </div>
 							                <div className="clearfix">
 							                    <FormItem
 						                        labelCol={{ span: 2 }}
 						                        wrapperCol={{ span: 18 }}
 						                        label="业务范围" >
-						                            <Input type="textarea" rows={4} value={this.state.businessScope} 
+						                            <Input type="textarea" rows={4} value={this.state.businessScope}
 											    				onChange={(e)=>{this.setState({businessScope:e.target.value})}}/>
 							                    </FormItem>
 							                    <FormItem
 							                        labelCol={{ span: 2 }}
 							                        wrapperCol={{ span: 18 }}
 							                        label="单位简介" >
-							                            <Input type="textarea" rows={4}  value={this.state.introduction} 
-											    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+							                            <Input type="textarea" rows={4}  value={this.state.introduction}
+											    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>
 							                    </FormItem>
 						                    </div>
-						                </div>		                	
+						                </div>
 								    </Spin>
 								</Form>	:<Form horizontal id="demand-form">
 					                <Spin spinning={this.state.loading}>
@@ -1740,25 +1741,25 @@ const PublicCustomer = Form.create()(React.createClass({
 						                    </FormItem>
 					                    </div>
 					                    <div className="clearfix" style={{paddingLeft:'60px'}}>
-					                    	<FormItem className="half-item" 
+					                    	<FormItem className="half-item"
 						                         labelCol={{ span: 4 }}
 						                         wrapperCol={{ span: 18 }}
 						                        label="行业"
-						                         > 
-				                             <span>{getIndustry(String(theInformation.industry))}</span>     
+						                         >
+				                             <span>{getIndustry(String(theInformation.industry))}</span>
 					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
+					                   		 <FormItem className="half-item"
 						                           labelCol={{ span: 4 }}
 						                            wrapperCol={{ span: 18 }}
 						                           label="社会属性"
-						                         > 
-						                       <span>{getSocialAttribute(theInformation.societyTag)}</span>  
+						                         >
+						                       <span>{getSocialAttribute(theInformation.societyTag)}</span>
 					                   		 </FormItem>
-					                         <FormItem className="half-item" 
+					                         <FormItem className="half-item"
 					                           labelCol={{ span: 4 }}
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
-					                          > 
+					                          >
 						                  		<span>{this.state.proviceCityArea}</span>
 						                  </FormItem>
 						                   <FormItem className="half-item"
@@ -1766,14 +1767,14 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 18 }}
 							                         label="通信地址"
 						                            >
-						                            <span>{theInformation.postalAddress}</span>  
+						                            <span>{theInformation.postalAddress}</span>
 						                    </FormItem>
 						                    <FormItem className="half-item"
 							                    	labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
 							                         label="固定电话"
 						                            >
-						                            <span>{theInformation.contactsFixedTel}</span>              
+						                            <span>{theInformation.contactsFixedTel}</span>
 						                    </FormItem>
 						                    <FormItem className="half-item"
 							                    	labelCol={{ span: 4 }}
@@ -1880,12 +1881,12 @@ const PublicCustomer = Form.create()(React.createClass({
 							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
 							                                <img alt="" style={{ width: '100%' }} src={this.state.orgCodeUrl || ''} />
 							                            </Modal>
-							                        </div>     
+							                        </div>
 						                        </FormItem>
 						                        <FormItem
 							                        labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
-							                        label="单位logo" > 
+							                        label="单位logo" >
 							                        <div className="clearfix">
 							                            <Upload className="demandDetailShow-upload"
 							                                listType="picture-card"
@@ -1902,7 +1903,7 @@ const PublicCustomer = Form.create()(React.createClass({
 							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
 							                                <img alt="" style={{ width: '100%' }} src={this.state.companyLogoUrl || ''} />
 							                            </Modal>
-							                        </div> 
+							                        </div>
 							                    </FormItem>
 							                </div>
 							                <div className="clearfix">
@@ -1918,24 +1919,24 @@ const PublicCustomer = Form.create()(React.createClass({
 							                        label="单位简介" >
 							                        <span>{theInformation.introduction}</span>
 							                    </FormItem>
-						                    </div> 
-					                    </div>		                	
+						                    </div>
+					                    </div>
 								    </Spin>
-								</Form>}	
+								</Form>}
 							</TabPane>
 						    <TabPane tab="联系人信息" key="2">
 						       <div className="clearfix">
                     			  <Spin spinning={this.state.loading}>
                     			     <Form horizontal id="demand-form"  >
-								      <Table 
+								      <Table
 						            	 pagination={false}
-						            	 columns={this.state.ContactsLists} 
+						            	 columns={this.state.ContactsLists}
 						            	 dataSource={this.state.contactList}
 						            	 />
 					            	    <div className="clearfix" style={{display:adminData.isSuperAdmin?'inline-block':'none'}}>
 								        </div>
-						            	</Form> 
-								   </Spin> 
+						            	</Form>
+								   </Spin>
 								</div>
 						    </TabPane>
 						    <TabPane tab="账户信息" key="3">
@@ -1952,35 +1953,35 @@ const PublicCustomer = Form.create()(React.createClass({
 							                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="注册用户名" >
-							                         {adminData.isSuperAdmin?<Input value={this.state.nickname} 
+							                         {adminData.isSuperAdmin?<Input value={this.state.nickname}
 							                           onChange={(e) => { this.setState({ nickname: e.target.value }); }} />:<span>{this.state.nickname}</span>}
 							                    </FormItem>
 							                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="注册邮箱" >
-							                         {adminData.isSuperAdmin?<Input value={this.state.email} 
+							                         {adminData.isSuperAdmin?<Input value={this.state.email}
 							                          onChange={(e) => { this.setState({ email: e.target.value }); }} />:<span>{this.state.nickname}</span>}
 							                    </FormItem>
 							                    </div>
 							                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="客户来源" >
-							                            <span>{this.state.source}</span>   
+							                            <span>{this.state.source}</span>
 							                    </FormItem>
 							                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="客户类型" >
-							                            <span>{this.state.type}</span>   
+							                            <span>{this.state.type}</span>
 							                    </FormItem>
 							                    <FormItem className="half-item"
 							                            {...formItemLayout}
 							                            label="创建时间" >
-							                            <span>{this.state.createTimes}</span>   
+							                            <span>{this.state.createTimes}</span>
 							                    </FormItem>
-							                    <FormItem className="half-item" 
+							                    <FormItem className="half-item"
 						                           {...formItemLayout}
 						                           label="账户状态"
-						                         > 
+						                         >
 												    {adminData.isSuperAdmin?<Select placeholder="账户状态" value={this.state.status}  onChange={(e) => { this.setState({ status: e }); }} >
 				                                    {
 				                                        statuslist.map(function (item) {
@@ -1993,7 +1994,7 @@ const PublicCustomer = Form.create()(React.createClass({
 										            <FormItem className="half-item"
 										                {...formItemLayout}
 								                        label="会员"
-										            > 
+										            >
 								                   		 {adminData.isSuperAdmin?<Radio.Group value={this.state.isMember} onChange={(e) => {
 										                        this.setState({ isMember:  e.target.value })
 										                    }}>
@@ -2001,10 +2002,10 @@ const PublicCustomer = Form.create()(React.createClass({
 										                        <Radio value={1}>是</Radio>
 										                  </Radio.Group>:<span>{this.state.isMember?'是':'否'}</span>}
 										            </FormItem>
-										            <FormItem className="half-item" 
+										            <FormItem className="half-item"
 								                          {...formItemLayout}
 								                           label="会员等级"
-								                         > 
+								                         >
 													    {adminData.isSuperAdmin?<Select placeholder="客户状态" value={this.state.lvl}  onChange={(e) => { this.setState({ lvl: e }); }} >
 					                                     {
 					                                        lvl.map(function (item) {
@@ -2013,10 +2014,10 @@ const PublicCustomer = Form.create()(React.createClass({
 					                                     }
 					                                   </Select>:<span>{getLvl(this.state.lvl)}</span>}
 							                   		</FormItem>
-							                   		<FormItem className="half-item" 
+							                   		<FormItem className="half-item"
 							                           {...formItemLayout}
 							                           label="会员状态"
-							                         > 
+							                         >
 													    {adminData.isSuperAdmin?<Select placeholder="会员状态" value={this.state.currentMemberStatus}  onChange={(e) => { this.setState({ currentMemberStatus: e }); }} >
 					                                    {
 					                                        currentMember.map(function (item) {
@@ -2029,54 +2030,54 @@ const PublicCustomer = Form.create()(React.createClass({
 									            <div className="clearfix" style={{display:adminData.isSuperAdmin?'inline-block':'none'}}>
 									             </div>
 						    				</Spin>
-						    			</Form>	
+						    			</Form>
 						    		</div>
 						    </TabPane>
 							<TabPane tab="客户拜访" key="4">
 							     <div className="clearfix">
                     			    <Spin spinning={this.state.loading}>
-								      <Table 
+								      <Table
 						            	 pagination={false}
-						            	 columns={this.state.visitsList} 
+						            	 columns={this.state.visitsList}
 						            	 dataSource={this.state.visitArrList}
 						            	 onRowClick={this.VisitRowClick}
 						            	 />
-								    </Spin> 
-								</div>								
-							</TabPane>						
+								    </Spin>
+								</div>
+							</TabPane>
 							<TabPane tab="业务意向" key="5">
 							    <div className="clearfix">
                     			    <Spin spinning={this.state.loading}>
-								      <Table 
+								      <Table
 						            	 pagination={this.state.paginationt}
-						            	 columns={this.state.businessIntentionList} 
+						            	 columns={this.state.businessIntentionList}
 						            	 dataSource={this.state.dataBusiness}
 						            	 />
-								    </Spin> 
-								</div>							
+								    </Spin>
+								</div>
 							</TabPane>
 							<TabPane tab="业务订单" key="6">
-							     								
+
 							</TabPane>
 							<TabPane tab="技术需求" key="7">
-							     								
+
 							</TabPane>
 							<TabPane tab="技术成果" key="8">
-							     								
+
 							</TabPane>
 							<TabPane tab="技术专家" key="9">
-							     								
+
 							</TabPane>
 						</Tabs>
     			</Modal>
-    			<Modal	
+    			<Modal
 				      footer=''
 			          title="业务意向详情"
 			          width='1000px'
 			          visible={this.state.businessModul}
 			          onOk={this.businessIntentionOk}
-					  onCancel={this.businessIntentionCancel}							          							          
-			        >				    
+					  onCancel={this.businessIntentionCancel}
+			        >
 					    <div className="clearfix">
 			    			<Form horizontal id="demand-form">
 			    				<Spin spinning={this.state.loading}>
@@ -2123,26 +2124,26 @@ const PublicCustomer = Form.create()(React.createClass({
 			                        	<div style={{fontSize:'18px',lineHeight:'24px',marginBottom:'10px'}}>业务跟进</div>
 			                        	<div className="clearfix">
 		                    			    <Spin spinning={this.state.loading}>
-										      <Table 
+										      <Table
 								            	 pagination={this.state.paginations}
-								            	 columns={this.state.businessFollowList} 
+								            	 columns={this.state.businessFollowList}
 								            	 dataSource={this.state.visitArrList}
 								            	 />
-										    </Spin> 
-										</div>	
+										    </Spin>
+										</div>
 			                        </div>
 				                </Spin>
-							</Form>                  
-						</div>	                    
+							</Form>
+						</div>
     			</Modal>
-    			<Modal	
+    			<Modal
 				      footer=''
 			          title="业务跟进详情"
 			          width='600px'
 			          visible={this.state.businessFollowModul}
 			          onOk={this.businessFollowOk}
-					  onCancel={this.businessFollowCancel}							          							          
-			        >				    
+					  onCancel={this.businessFollowCancel}
+			        >
 					    <div className="clearfix">
 			    			<Form horizontal id="demand-form" >
 			    				<Spin spinning={this.state.loading}>
@@ -2211,7 +2212,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					                            {...formItemLayout}
 					                            label="拜访人" >
 					                        <span>{this.state.adminNames}</span>
-					                    </FormItem> 
+					                    </FormItem>
 					                    <div className="clearfix">
 					                    	<FormItem className="half-item"
 					                            {...formItemLayout}
@@ -2221,8 +2222,8 @@ const PublicCustomer = Form.create()(React.createClass({
 					                    </div>
 			                        </div>
 				                </Spin>
-							</Form>                  
-						</div>	                    
+							</Form>
+						</div>
     			</Modal>
           </div >
 		);
@@ -2236,12 +2237,12 @@ const Tablees=Form.create()(React.createClass({
 			callnubs: e,
 		})
 		if(e == '1') {
-			
+
 		}
 		if(e == '2') {
-			
+
 		}
-		
+
 	},
 	getInitialState() {
 		return {

+ 3 - 2
js/component/manageCenter/financialManage/bonus/jsBonus11.jsx

@@ -515,6 +515,7 @@ const JsBonus = React.createClass({
           closeDesc={this.closeDesc.bind(this)}
         />
         <Modal
+          maskClosable={false}
           visible={this.state.boHuiVisible}
           width="400px"
           title="发放"
@@ -562,5 +563,5 @@ const JsBonus = React.createClass({
     );
   }
 });
- 
-export default JsBonus;
+
+export default JsBonus;

+ 9 - 2
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -3697,7 +3697,7 @@ const approvedOutsourcing = React.createClass({
 												<FormItem className="half-item"
 												     labelCol={{ span: 8 }}
 												    wrapperCol={{ span: 14 }}
-												    label="上传协议文件" >  
+												    label="上传协议文件" >
 													<Upload header={{authorization: 'authorization-text'}} action={globalConfig.context + "/api/admin/outsourceOrg/uploadOutsourceFile"}
 															data={(e)=>{
 																return {
@@ -3705,7 +3705,7 @@ const approvedOutsourcing = React.createClass({
 																}
 															}}
 															fileList={this.state.attachmentUrl}
-															showUploadList={{showRemoveIcon:false}} 
+															showUploadList={{showRemoveIcon:false}}
 															onPreview={(e)=>{
 																let url = window.location.href.substring(7)
 																window.location.href="http://"+url.substring(0,url.indexOf("/"))+"/api/admin/outsourceOrg//downloadFile?path="+e.response.data
@@ -3869,6 +3869,7 @@ const approvedOutsourcing = React.createClass({
           closeDesc={this.closeAssignX.bind(this)}
         />
         <Modal
+          maskClosable={false}
           visible={this.state.bvisible}
           footer=""
           title="开票历史记录"
@@ -3921,6 +3922,7 @@ const approvedOutsourcing = React.createClass({
           </Spin>
         </Modal>
         <Modal
+          maskClosable={false}
           visible={this.state.cvisible}
           footer=""
           title="详细收款流水"
@@ -3972,6 +3974,7 @@ const approvedOutsourcing = React.createClass({
           </Spin>
         </Modal>
         <Modal
+          maskClosable={false}
           visible={this.state.dvisible}
           footer=""
           title="所有列表信息"
@@ -4027,6 +4030,7 @@ const approvedOutsourcing = React.createClass({
           />
         </Modal>
         <Modal
+          maskClosable={false}
           visible={this.state.timeVisible}
           footer=""
           title="工时详情"
@@ -4086,6 +4090,7 @@ const approvedOutsourcing = React.createClass({
           />
         </Modal>
         <Modal
+          maskClosable={false}
           visible={this.state.cuiVisible}
           footer=""
           title="催款详情"
@@ -4178,6 +4183,7 @@ const approvedOutsourcing = React.createClass({
           </Tabs>
         </Modal>
         <Modal
+          maskClosable={false}
           visible={this.state.proVisible}
           footer=""
           title="项目进度"
@@ -4240,6 +4246,7 @@ const approvedOutsourcing = React.createClass({
         </Modal>
         <Spin spinning={this.state.loading}>
           <Modal
+            maskClosable={false}
             title="审核订单"
             visible={this.state.checkVisible}
             onOk={this.checkOk}

+ 3 - 0
js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx

@@ -669,6 +669,7 @@ const outInvoiceQuery = React.createClass({
           </Spin>
         </div>
         <Modal
+          maskClosable={false}
           visible={this.state.visibleR}
           className="admin-desc-content"
           footer=""
@@ -697,6 +698,7 @@ const outInvoiceQuery = React.createClass({
           </div>
         </Modal>
         {this.state.avisible ? <Modal
+          maskClosable={false}
           className="admin-desc-content"
           footer=""
           title="开具发票申请单"
@@ -975,6 +977,7 @@ const outInvoiceQuery = React.createClass({
           </Form>
         </Modal> : <div/>}
         <Modal
+          maskClosable={false}
           visible={this.state.bvisible}
           footer=""
           title="开票历史记录"

+ 2 - 1
js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx

@@ -1558,7 +1558,7 @@ const outsourcingPaiDan = React.createClass({
                 {/*<div className="clearfix">
 								<FormItem className="half-item"
 								    {...formItemLayout}
-								    label="上传协议文件" >  
+								    label="上传协议文件" >
 									<Upload header={{authorization: 'authorization-text'}} action={globalConfig.context + "/api/admin/outsourceOrg/uploadOutsourceFile"}
 											data={(e)=>{
 												return {
@@ -1659,6 +1659,7 @@ const outsourcingPaiDan = React.createClass({
           width="400px"
           title="驳回备注"
           footer=""
+          maskClosable={false}
           onOk={this.boHuiOk}
           onCancel={this.boHuiCancel}
         >

+ 10 - 9
js/component/manageCenter/index/content.jsx

@@ -54,7 +54,7 @@ const MessageModal = React.createClass({
 //                      <span>{record.noticeTypeName}</span>
 //                          }</div>
 						//return <a href='#' onClick={(e) =>{ e.stopPropagation(),this.setStore(record)}}> {record.noticeTypeName} </a >
-                       return(<span>{record.noticeTypeName}</span>)  
+                       return(<span>{record.noticeTypeName}</span>)
                     }
                 }, {
                     title: '时间',
@@ -103,7 +103,7 @@ const MessageModal = React.createClass({
             crossDomain: false,
             url: globalConfig.context + "/api/admin/selectNavList",
             data: {
-            	
+
             },
             success:function(data){
             	if (!data.data) {
@@ -173,7 +173,7 @@ const MessageModal = React.createClass({
 					if(nub.url.indexOf('servicesManage') != -1) {
 						rid = nub.id;
 					}
-				});	
+				});
 				break;
 			default:
 				rid='';
@@ -398,6 +398,7 @@ const MessageModal = React.createClass({
               </Tabs>
             </Spin>
             <Modal
+              maskClosable={false}
               style={{ position: "relative" }}
               title="消息提醒"
               visible={this.state.newVisible}
@@ -450,25 +451,25 @@ const Content = React.createClass({
                     this.setState({
                         component: <Module />,
                     });
-                });    
+                });
             break;
             default:
             require.ensure([], () => {
                 let Module = require('../module').default;
                 this.setState({
-                    component:<Module />	    
+                    component:<Module />
                 	});
-            }); 
+            });
         }
         window.location.hash=key;
-    }, 
+    },
     componentWillMount() {
         if (window.location.hash) {
             this.getKey((window.location.hash).slice(1));
         } else {
             this.getKey('normal');
         };
-    },    
+    },
     render() {
         return (
             <div className="manage-content">
@@ -540,4 +541,4 @@ export default Content;
 //                                     <TabPane tab="其他" key="2">Content of Tab Pane 2</TabPane>
 //                                 </Tabs>
 //                             </div>
-//                         </div>
+//                         </div>

+ 1 - 2
js/component/manageCenter/order/orderNew/addService.jsx

@@ -933,7 +933,6 @@ const NewService = Form.create()(
                       }}
                     >
                       {arr.map((item) => {
-                        record;
                         return (
                           <Select.Option key={item.value} value={item.value}>
                             {item.key}
@@ -4504,7 +4503,7 @@ const NewService = Form.create()(
                                     }}
                                   >
                                     {/* {tepi.map(function(item) {
-                                      // if(item.key == "特批通过" || item.key == "特批驳回") 
+                                      // if(item.key == "特批通过" || item.key == "特批驳回")
                                       return (
                                         <Select.Option key={item.value}>
                                           {item.key}

+ 7 - 0
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -2261,6 +2261,7 @@ const IntentionCustomer = Form.create()(
               </Spin>
             </div>
             {this.state.visible ? <Modal
+              maskClosable={false}
               className="customeDetails"
               footer=""
               title="订单详情"
@@ -2754,6 +2755,7 @@ const IntentionCustomer = Form.create()(
               </div>
             </Modal> : <div/>}
             {this.state.dvisible ? <Modal
+              maskClosable={false}
               visible={this.state.dvisible}
               footer=""
               title="所有列表信息"
@@ -2809,6 +2811,7 @@ const IntentionCustomer = Form.create()(
               />
             </Modal> : <div/>}
             {this.state.bvisible ? <Modal
+              maskClosable={false}
               visible={this.state.bvisible}
               footer=""
               title="开票历史记录"
@@ -2860,6 +2863,7 @@ const IntentionCustomer = Form.create()(
               </Spin>
             </Modal> : <div/>}
             {this.state.cvisible ? <Modal
+              maskClosable={false}
               visible={this.state.cvisible}
               footer=""
               title="详细收款流水"
@@ -2910,6 +2914,7 @@ const IntentionCustomer = Form.create()(
               </Spin>
             </Modal> : <div/>}
             {this.state.timeVisible ? <Modal
+              maskClosable={false}
               visible={this.state.timeVisible}
               footer=""
               title="工时详情"
@@ -2969,6 +2974,7 @@ const IntentionCustomer = Form.create()(
               />
             </Modal> : <div/>}
             {this.state.cuiVisible ? <Modal
+              maskClosable={false}
               visible={this.state.cuiVisible}
               footer=""
               title="催款详情"
@@ -3028,6 +3034,7 @@ const IntentionCustomer = Form.create()(
               />
             </Modal> : <div/>}
             {this.state.proVisible ? <Modal
+              maskClosable={false}
               visible={this.state.proVisible}
               footer=""
               title="项目详情"

+ 7 - 0
js/component/manageCenter/order/orderNew/billing.jsx

@@ -1912,6 +1912,7 @@ const MyService = Form.create()(
             />
 
             {this.state.avisible ? <Modal
+              maskClosable={false}
               className="admin-desc-content"
               footer=""
               title="开具发票申请单"
@@ -2426,6 +2427,7 @@ const MyService = Form.create()(
               </Form>
             </Modal> : <div/>}
             <Modal
+              maskClosable={false}
               visible={this.state.bvisible}
               footer=""
               title="开票历史记录"
@@ -2459,6 +2461,7 @@ const MyService = Form.create()(
               </Spin>
             </Modal>
             <Modal
+              maskClosable={false}
               visible={this.state.visibleR}
               className="admin-desc-content"
               footer=""
@@ -2474,6 +2477,7 @@ const MyService = Form.create()(
               ></Input.TextArea>
             </Modal>
             <Modal
+              maskClosable={false}
               className="admin-desc-content"
               footer=""
               title="开具发票申请单"
@@ -2988,6 +2992,7 @@ const MyService = Form.create()(
               </Form>
             </Modal>
             <Modal
+              maskClosable={false}
               className="admin-desc-content"
               footer=""
               title="开具发票申请单"
@@ -3335,6 +3340,7 @@ const MyService = Form.create()(
               </Spin>
             </Modal> */}
             <Modal
+              maskClosable={false}
               visible={this.state.cuiVisible}
               footer=""
               title="催款详情"
@@ -3394,6 +3400,7 @@ const MyService = Form.create()(
               />
             </Modal>
             <Modal
+              maskClosable={false}
               visible={this.state.proVisible}
               footer=""
               title="项目进度"

+ 4 - 2
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -1508,7 +1508,7 @@ class ChangeApply extends Component {
     }
   }
   componentWillReceiveProps(nextProps) {
-      
+
     this.state.data = nextProps.orderData;
     this.state.data.oldPrice = nextProps.orderData.totalAmount;
     this.setState({
@@ -1611,7 +1611,7 @@ class ChangeApply extends Component {
       data.forEach((item) => {
         item.key = item.id
       })
-      
+
       let columns = [];
       if (e.list instanceof Array && e.list.length) {
         columns = [
@@ -2203,6 +2203,7 @@ class ChangeApply extends Component {
             </Button>
           </div>
           <Modal
+            maskClosable={false}
             title="修改项目金额及数量"
             visible={this.state.editProVisible}
             onOk={this.submitEditPro}
@@ -2249,6 +2250,7 @@ class ChangeApply extends Component {
             </div>
           </Modal>
           <Modal
+            maskClosable={false}
             title="修改催款节点金额"
             visible={this.state.editCuiVisible}
             onOk={this.submitEditCui}

+ 1 - 0
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -1080,6 +1080,7 @@ const IntentionCustomer = Form.create()(
               </Spin>
             </div>
             {this.state.visible ? <Modal
+              maskClosable={false}
               className="customeDetails"
               footer=""
               title="订单详情"

+ 2 - 1
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -1253,6 +1253,7 @@ const checkOutsourcing = Form.create()(
           </div>
           {this.state.visible ? <Modal
             className="customeDetails"
+            maskClosable={false}
             footer=""
             width="900px"
             visible={this.state.visible}
@@ -1748,7 +1749,7 @@ const checkOutsourcing = Form.create()(
                 {/*<div className="clearfix">
 									<FormItem className="half-item" style={{height:'auto'}}
 									    {...formItemLayout}
-									    label="上传协议文件" >  
+									    label="上传协议文件" >
 										<Upload header={{authorization: 'authorization-text'}} action={globalConfig.context + "/api/admin/outsourceOrg/uploadOutsourceFile"}
 												data={(e)=>{
 													return {

+ 3 - 2
js/component/manageCenter/order/orderNew/chooseList.jsx

@@ -150,7 +150,7 @@ class ChooseList extends Component {
     this.setState({
       flag: !this.state.flag
     })
-    
+
   }
 
   render() {
@@ -162,6 +162,7 @@ class ChooseList extends Component {
           更改表格显示数据
         </Button>
         <Modal
+          maskClosable={false}
           title="更改表格显示数据"
           visible={visible}
           onOk={this.handleOk}
@@ -185,4 +186,4 @@ class ChooseList extends Component {
     );
   }
 }
-export { ChooseList };
+export { ChooseList };

+ 2 - 1
js/component/manageCenter/order/orderNew/costAuditList/component/orderPaymentModal.js

@@ -171,6 +171,7 @@ class OrderPaymentModal extends Component{
     render() {
         return(
             <Modal
+                maskClosable={false}
                 className="customeDetails"
                 footer={false}
                 title="支付记录"
@@ -214,4 +215,4 @@ class OrderPaymentModal extends Component{
     }
 }
 
-export default OrderPaymentModal;
+export default OrderPaymentModal;

+ 25 - 7
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/index.js

@@ -1,5 +1,6 @@
 import React,{Component} from 'react';
-import {Form, message, Modal, Tabs} from "antd";
+import {message, Modal, Tabs} from "antd";
+import { cuiJieDian } from '@/dataDic.js'
 import ProjectOverview from './projectOverview'
 import {splitUrl} from '@/tools'
 import CheckProject from "../../../../components/checkProject";
@@ -18,17 +19,31 @@ class DetailsModal extends Component{
             containOfficialFees:0,//官费缴费情况
         }
         this.visitCancel = this.visitCancel.bind(this);
+        this.getCsortData = this.getCsortData.bind(this);
     }
 
-    componentDidMount() {
+    async componentDidMount() {
         if(this.props.tid){
             this.waiDetail();
             this.thirdTable(this.props.tid);
-            this.payNodeTable(this.props.tid);
-            this.xiangqing(this.props.tid);
+
+            await this.xiangqing(this.props.tid);
+            await this.getCsortData(this.state.sort)
+            await this.payNodeTable(this.props.tid);
         }
     }
 
+    // 获取csort下的数据
+    getCsortData(cSort) {
+        return cuiJieDian.map((item) => {
+            if (item.value == cSort) {
+                this.setState({
+                    paySubject: item.children,
+                })
+            }
+        })
+    }
+
     visitOk(){
         this.setState({
             oldInfor: {}
@@ -176,7 +191,7 @@ class DetailsModal extends Component{
         this.setState({
             loadData: true,
         })
-        $.ajax({
+        return $.ajax({
             method: 'get',
             dataType: 'json',
             crossDomain: false,
@@ -237,7 +252,7 @@ class DetailsModal extends Component{
 
     //订单详情
     xiangqing(id) {
-        $.ajax({
+        return $.ajax({
             method: 'get',
             dataType: 'json',
             crossDomain: false,
@@ -252,8 +267,10 @@ class DetailsModal extends Component{
                         message.warning(data.error[0].message)
                     }
                 } else {
+                    localStorage.setItem('cSort', thisdata.sort);
                     this.setState({
                         orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
+                        sort: thisdata.sort,
                     })
                 }
             }.bind(this),
@@ -269,6 +286,7 @@ class DetailsModal extends Component{
     render() {
         return(
             <Modal
+                maskClosable={false}
                 className="customeDetails"
                 footer=""
                 title=""
@@ -344,4 +362,4 @@ class DetailsModal extends Component{
     }
 }
 
-export default DetailsModal;
+export default DetailsModal;

+ 1 - 0
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -980,6 +980,7 @@ class projectOverview extends Component{
                     </div>
                 </Spin>
                 <Modal
+                    maskClosable={false}
                     width="800px"
                     visible={this.state.visibleA}
                     onCancel={this.visitCancelA}

+ 1 - 0
js/component/manageCenter/order/orderNew/examine.jsx

@@ -1457,6 +1457,7 @@ const IntentionCustomer = Form.create()(
               />
             </Spin>
             {this.state.visible ? <Modal
+              maskClosable={false}
               className="customeDetails"
               footer=""
               width="900px"

+ 24 - 7
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/index.js

@@ -1,5 +1,6 @@
 import React,{Component} from 'react';
-import {Form, message, Modal, Tabs} from "antd";
+import {message, Modal, Tabs} from "antd";
+import { cuiJieDian } from '@/dataDic.js'
 import ProjectOverview from './projectOverview'
 import {splitUrl} from '@/tools'
 import CheckProject from "../../../../components/checkProject";
@@ -20,15 +21,28 @@ class DetailsModal extends Component{
         this.visitCancel = this.visitCancel.bind(this);
     }
 
-    componentDidMount() {
+    async componentDidMount() {
         if(this.props.tid){
             this.waiDetail();
             this.thirdTable(this.props.tid);
-            this.payNodeTable(this.props.tid);
-            this.xiangqing(this.props.tid);
+
+            await this.xiangqing(this.props.tid);
+            await this.getCsortData(this.state.sort)
+            await this.payNodeTable(this.props.tid);
         }
     }
 
+    // 获取csort下的数据
+    getCsortData(cSort) {
+        return cuiJieDian.map((item) => {
+            if (item.value == cSort) {
+                this.setState({
+                    paySubject: item.children,
+                })
+            }
+        })
+    }
+
     visitOk(){
         this.setState({
             oldInfor: {}
@@ -176,7 +190,7 @@ class DetailsModal extends Component{
         this.setState({
             loadData: true,
         })
-        $.ajax({
+        return $.ajax({
             method: 'get',
             dataType: 'json',
             crossDomain: false,
@@ -237,7 +251,7 @@ class DetailsModal extends Component{
 
     //项目详情
     xiangqing(id) {
-        $.ajax({
+       return $.ajax({
             method: 'get',
             dataType: 'json',
             crossDomain: false,
@@ -252,8 +266,10 @@ class DetailsModal extends Component{
                         message.warning(data.error[0].message)
                     }
                 } else {
+                    localStorage.setItem('cSort', thisdata.sort);
                     this.setState({
                         orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
+                        sort: thisdata.sort,
                     })
                 }
             }.bind(this),
@@ -269,6 +285,7 @@ class DetailsModal extends Component{
     render() {
         return(
             <Modal
+                maskClosable={false}
                 className="customeDetails"
                 footer=""
                 title=""
@@ -344,4 +361,4 @@ class DetailsModal extends Component{
     }
 }
 
-export default DetailsModal;
+export default DetailsModal;

+ 7 - 0
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -2444,6 +2444,7 @@ const IntentionCustomer = Form.create()(
             />
 
             <Modal
+              maskClosable={false}
               className="admin-desc-content"
               footer=""
               title="开具发票申请单"
@@ -2957,6 +2958,7 @@ const IntentionCustomer = Form.create()(
               </Form>
             </Modal>
             <Modal
+              maskClosable={false}
               visible={this.state.bvisible}
               footer=""
               title="开票历史记录"
@@ -2990,6 +2992,7 @@ const IntentionCustomer = Form.create()(
               </Spin>
             </Modal>
             <Modal
+              maskClosable={false}
               visible={this.state.visibleR}
               className="admin-desc-content"
               footer=""
@@ -3005,6 +3008,7 @@ const IntentionCustomer = Form.create()(
               ></Input.TextArea>
             </Modal>
             <Modal
+              maskClosable={false}
               className="admin-desc-content"
               footer=""
               title="开具发票申请单"
@@ -3518,6 +3522,7 @@ const IntentionCustomer = Form.create()(
               </Form>
             </Modal>
             <Modal
+              maskClosable={false}
               className="admin-desc-content"
               footer=""
               title="开具发票申请单"
@@ -3865,6 +3870,7 @@ const IntentionCustomer = Form.create()(
               </Spin>
             </Modal> */}
             <Modal
+              maskClosable={false}
               visible={this.state.cuiVisible}
               footer=""
               title="催款详情"
@@ -3924,6 +3930,7 @@ const IntentionCustomer = Form.create()(
               />
             </Modal>
             <Modal
+              maskClosable={false}
               visible={this.state.proVisible}
               footer=""
               title="项目详情"

+ 13 - 21
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -539,6 +539,7 @@ const outsourcingPro = Form.create()(
             }
           } else {
             let thisdata = data.data;
+
             this.setState({
               orderNo: thisdata.orderNo, //订单编号
               contractNo: thisdata.contractNo, //合同编号
@@ -593,7 +594,7 @@ const outsourcingPro = Form.create()(
     },
     //项目详情
     xiangqing1(id) {
-      $.ajax({
+      return $.ajax({
         method: 'get',
         dataType: 'json',
         crossDomain: false,
@@ -608,8 +609,11 @@ const outsourcingPro = Form.create()(
               message.warning(data.error[0].message)
             }
           } else {
+            localStorage.setItem('cSort', thisdata.sort)
             this.setState({
               orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
+              sort: thisdata.sort,
+              cSort: thisdata.sort,
             })
           }
         }.bind(this),
@@ -642,7 +646,6 @@ const outsourcingPro = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              localStorage.setItem('cSort', thisdata.cSort)
               theArr.push({
                 key: i,
                 id: thisdata.id,
@@ -658,24 +661,11 @@ const outsourcingPro = Form.create()(
                 contactsMobile: thisdata.contactsMobile, //联系人电话
                 projectStatus: thisdata.projectStatus, //项目状态
                 splitStatus: thisdata.splitStatus,
-                sort: thisdata.cSort,
-              });
-            }
-            // 获取Csort
-            this.setState({
-              getOrderTaskLoading: true
-            });
-            if(data.data.length > 0){
-              _this.getCsortData(data.data[0].cSort);
-            }else{
-              this.setState({
-                getOrderTaskLoading: false
               });
             }
           }
           this.setState({
             dataSourceX: theArr,
-            cSort: theArr[0].cSort,
           });
         }.bind(this),
       }).always(
@@ -912,13 +902,10 @@ const outsourcingPro = Form.create()(
     },
     // 获取csort下的数据
     getCsortData(cSort) {
-      cuiJieDian.map((item) => {
+      return cuiJieDian.map((item) => {
         if (item.value == cSort) {
           this.setState({
             paySubject: item.children,
-          },()=>{
-            //获取支付节点信息表格
-            this.payNodeTable(this.state.tid);
           })
         }
       })
@@ -983,6 +970,7 @@ const outsourcingPro = Form.create()(
       this.setState({
         payNodeListAjaxObj: ajaxObj
       })
+      return ajaxObj;
     },
     waiDetail() {
       let url = window.location.href.substring(7);
@@ -1071,7 +1059,7 @@ const outsourcingPro = Form.create()(
         orderDtailsAjaxObj: ajaxObj
       })
     },
-    tableRowClick(record) {
+    async tableRowClick(record) {
       this.setState(
         {
           visible: true,
@@ -1088,10 +1076,14 @@ const outsourcingPro = Form.create()(
         }
       );
       this.xiangqing(record.orderNo);
+      await this.xiangqing1(record.tid);
+      // 获取Csort
+      await this.getCsortData(this.state.sort);
+      //获取支付节点信息表格
+      await this.payNodeTable(this.state.tid);
       this.xiangmu(record.orderNo);
       this.jiedian(record.orderNo);
       this.jiedianNew(record.orderNo);
-      this.xiangqing1(record.tid);
       // 获取第三方信息表格
       this.thirdTable(record.tid);
     },

+ 11 - 9
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -287,7 +287,7 @@ const IntentionCustomer = Form.create()(React.createClass({
       dataSources: []
     };
 	},
-	
+
 	//页面加载函数
 	componentWillMount() {
 		this.departmentList();
@@ -306,10 +306,10 @@ const IntentionCustomer = Form.create()(React.createClass({
 			visibles:true,
 		});
 		this.loadDatas(record.id);
-	},	
-	
-    
-	
+	},
+
+
+
 	//新增催款记录
 	examOk(){
 		$.ajax({
@@ -335,7 +335,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					this.loadData();
 					this.resets();
 				};
-				
+
 			}.bind(this),
 		}).always(function() {
 			this.setState({
@@ -343,8 +343,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
-	
-	
+
+
 	//关闭输入理由框
 	noCancel(){
 		this.setState({
@@ -369,7 +369,7 @@ const IntentionCustomer = Form.create()(React.createClass({
     	this.state.departmenttSearch=undefined;
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
-        this.loadData();       
+        this.loadData();
     },
     resets(){
     	this.state.orderNo='';
@@ -622,6 +622,7 @@ const IntentionCustomer = Form.create()(React.createClass({
               />
             </Spin>
           <Modal
+			maskClosable={false}
             className="customeDetails"
             footer=""
             title="新增催款记录"
@@ -703,6 +704,7 @@ const IntentionCustomer = Form.create()(React.createClass({
             </Form>
           </Modal>
           <Modal
+			maskClosable={false}
             className="customeDetails"
             footer=""
             title="催款记录查看"

+ 1 - 0
js/component/manageCenter/order/orderNew/reject.jsx

@@ -2121,6 +2121,7 @@ const IntentionCustomer = Form.create()(
               </Spin>
             </div>
             {this.state.visible ? <Modal
+              maskClosable={false}
               className="customeDetails"
               footer=""
               title="订单详情"

+ 1 - 0
js/component/manageCenter/personnel/personnel/personnelAll.jsx

@@ -868,6 +868,7 @@ const PersonnelAll = React.createClass({
           requestMethod={"post"}
         />
         <Modal
+          maskClosable={false}
           className="customeDetails"
           footer=""
           title="任务详情"

+ 10 - 0
js/component/manageCenter/project/content.jsx

@@ -90,6 +90,16 @@ class Content extends Component {
               });
             });
             break;
+          //企业项目查询
+          case "enterpriseProjectQuery":
+            require.ensure([], () => {
+                const EnterpriseProjectQuery = require("./project/enterpriseProjectQuery")
+                    .default;
+                this.setState({
+                    component: <EnterpriseProjectQuery ApiUrl={""} />
+                });
+            });
+            break;
           //任务查询
           case "taskQuery":
             require.ensure([], () => {

+ 634 - 0
js/component/manageCenter/project/project/enterpriseProjectQuery.jsx

@@ -0,0 +1,634 @@
+import React,{Component} from 'react';
+import {Button, DatePicker, Input, message, Select, Spin, Table, Tabs} from "antd";
+import {ChooseList} from "../../order/orderNew/chooseList";
+import $ from "jquery/src/ajax";
+import {
+    ShowModal
+} from "@/tools";
+import moment from "moment";
+import ProjectDetails from "../summary/projectDetails";
+
+const {TabPane} = Tabs;
+const { RangePicker } = DatePicker;
+const { Option } = Select;
+
+class EnterpriseProjectQuery extends Component{
+    constructor(props) {
+        super(props);
+        this.state={
+            visible: false,
+            dataSource: [],
+            departmentArr: [],
+            page: 1,
+            pagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.loadData(page);
+                }.bind(this),
+                showTotal: function (total) {
+                    return "共" + total + "条数据";
+                },
+            },
+            columns: [
+                {
+                    title: "序号",
+                    dataIndex: "id",
+                    key: "id",
+                },
+                {
+                    title: "派单时间",
+                    dataIndex: "distributionTime",
+                    key: "distributionTime",
+                },
+                {
+                    title: "派单省份",
+                    dataIndex: "province",
+                    key: "province",
+                },
+                {
+                    title: '订单部门',
+                    dataIndex: 'departmentName',
+                    key: 'departmentName',
+                    render:(text)=>{
+                        return (text&&text.length>8?text.substr(0,8)+'...':text)
+                    }
+                },
+                {
+                    title: "营销员",
+                    dataIndex: "salesmanName",
+                    key: "salesmanName",
+                },
+                {
+                    title: "合同编号",
+                    dataIndex: "contractNo",
+                    key: "contractNo",
+                },
+                {
+                    title: "订单编号",
+                    dataIndex: "orderNo",
+                    key: "orderNo",
+                },
+                {
+                    title: "签单客户",
+                    dataIndex: "userName",
+                    key: "userName",
+                },
+                {
+                    title: "项目类型",
+                    dataIndex: "cname",
+                    key: "cname",
+                },
+                {
+                    title: "项目名称",
+                    dataIndex: "pname",
+                    key: "pname",
+                },
+                {
+                    title: "数量",
+                    dataIndex: "commodityQuantity",
+                    key: "commodityQuantity",
+                },
+                {
+                    title: "负责部门",
+                    dataIndex: "techDepName",
+                    key: "techDepName",
+                },
+                {
+                    title: "咨询师/咨询经理",
+                    dataIndex: "techName",
+                    key: "techName",
+                },
+                {
+                    title: "项目状态",
+                    dataIndex: "projectStatus",
+                    key: "projectStatus",
+                    render:(value)=>(
+                        value === 0 ? '未开始':
+                            value === 1 ? '进行中':
+                                value === 2 ? '已暂停':
+                                    value === 3 ? '已驳回(专利、软著项目编写)':
+                                        value === 4 ? '已完成':
+                                            value === 5 ? '项目已完成 已退单':
+                                                value === 6 ? '项目未完成 已退单': ''
+                    )
+                },
+                {
+                    title: "项目金额",
+                    dataIndex: "commodityPrice",
+                    key: "commodityPrice",
+                },
+                {
+                    title: "特别说明",
+                    dataIndex: "specialComment",
+                    key: "specialComment",
+                },
+            ],
+            releaseDate:[],
+            searchOrderNo: '',
+            searchContractNo: '',
+            searchEnterpriseName: '',
+            declarationBatch: '',
+            projectSituation: '',
+            projectAmount: '',
+            depId:'',
+            thchDepId:'',
+            projectType: '',
+            projectStatus: '',
+
+            contactsOption: [],
+            contactsOptionData: [],
+
+            status: 0,
+        }
+        this.changeList = this.changeList.bind(this);
+        this.resetAll = this.resetAll.bind(this);
+    }
+
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    }
+
+    loadData(pageNo) {
+        this.setState({
+            loading: true,
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/statistis/selectTaskList",
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize || 10,
+                startDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[0]: undefined, //开始时间
+                endDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[1]: undefined, //结束时间
+                depId: this.state.depId || undefined,//部门ID
+                thchDepId: this.state.thchDepId || undefined,//责任部门ID
+                projectStatus: this.state.projectStatus || undefined,//项目类别
+                projectType: typeof this.state.projectType === 'number' ? this.state.projectType : undefined,//项目分类
+                orderNo: this.state.searchOrderNo || undefined,//订单编号
+                contractNo: this.state.searchContractNo || undefined,//合同编号
+                userName: this.state.searchEnterpriseName || undefined,//企业名称
+                declarationBatch: this.state.declarationBatch || undefined,//申报批次
+                projectSituation: typeof this.state.projectSituation === 'number' ? this.state.projectSituation : undefined,//项目分类
+                projectAmount: this.state.projectAmount || undefined,//项目金额
+                status: this.state.status,
+            },
+            success: function (data) {
+                ShowModal(this);
+                let theArr = [];
+                if (!data.data || !data.data.list) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                } else {
+                    for (let i = 0; i < data.data.list.length; i++) {
+                        let thisdata = data.data.list[i];
+                        theArr.push(thisdata);
+                    }
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                    if (data.data && data.data.list && !data.data.list.length) {
+                        this.state.pagination.current = 0;
+                        this.state.pagination.total = 0;
+                    }
+                    this.setState({
+                        dataSource: theArr,
+                        page: data.data.pageNo,
+                        pagination: this.state.pagination,
+                    });
+                }
+            }.bind(this),
+        }).always(
+            function () {
+                this.setState({
+                    loading: false,
+                });
+            }.bind(this)
+        );
+    }
+
+    //部门
+    departmentList() {
+        this.setState({
+            departmentListloading: true,
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/organization/selectSuperId",
+            data: {},
+            success: function (data) {
+                let thedata = data.data;
+                let theArr = [];
+                if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                    thedata = {};
+                } else {
+                    thedata.map(function (item, index) {
+                        theArr.push({
+                            key: index,
+                            name: item.name,
+                            id: item.id,
+                        });
+                    });
+                }
+                this.setState({
+                    departmentArr: theArr,
+                });
+            }.bind(this),
+        }).always(
+            function () {
+                this.setState({
+                    departmentListloading: false,
+                });
+            }.bind(this)
+        );
+    }
+
+    resetAll() {
+        this.setState({
+            releaseDate: [],
+            searchOrderNo: '',
+            searchContractNo: '',
+            searchEnterpriseName: '',
+            declarationBatch: '',
+            projectSituation: '',
+            projectAmount: '',
+            projectType: '',
+            depId:'',
+            thchDepId:'',
+            projectStatus:'',
+            status: 0,
+        },()=>{
+            this.loadData();
+        })
+    }
+
+    //项目类别
+    selectSuperId() {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/ProjectSize/getAllCname",
+            data: {
+                flag: 0
+            },
+            success: function(data) {
+                let theArr = [];
+                let thedata = data.data;
+                if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                }
+                for (let i = 0; i < data.data.length; i++) {
+                    let theData = data.data[i];
+                    theArr.push(
+                        <Select.Option value={theData.id} key={theData.cname}>
+                            {theData.cname}
+                        </Select.Option>
+                    );
+                }
+                this.setState({
+                    contactsOption: theArr,
+                    contactsOptionData: data.data,
+                });
+            }.bind(this)
+        }).always(
+
+        );
+    }
+
+    exportPending() {
+        let url = `/api/admin/statistis/exporTaskList?status=${this.state.status}`;
+        let dep = this.state.departmentArr.filter((e)=> e.id === this.state.depId);//订单部门名称
+        let thchDep = this.state.departmentArr.filter((e)=> e.id === this.state.thchDepId); //责任部门名称
+        let option = this.state.contactsOptionData.filter((e)=> e.id === this.state.projectStatus); //项目类别名称
+
+        if(dep.length > 0){url = url+`&depName=${dep[0].name}`;}
+        if(thchDep.length > 0){url = url+`&thchDepName=${thchDep[0].name}`;}
+        if(option.length > 0){url = url+`&projectStatusName=${option[0].cname}`;}
+        if(typeof this.state.projectType === 'number'){url = url+`&projectTypeName=${
+            this.state.projectType === 0? '通用' :
+                this.state.projectType === 1? '专利' :
+                    this.state.projectType === 2? '软著' :
+                        this.state.projectType === 3? '审计' :
+                            this.state.projectType === 4? '双软' :
+                                this.state.projectType === 5? '高新' : ''
+        }`;}
+        let data ={
+            startDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[0]: undefined, //开始时间
+            endDate: this.state.releaseDate.length > 0 ? this.state.releaseDate[1]: undefined, //结束时间
+            depId: this.state.depId || undefined,//部门ID
+            thchDepId: this.state.thchDepId || undefined,//责任部门ID
+            projectStatus: this.state.projectStatus || undefined,//项目类别
+            projectType: typeof this.state.projectType === 'number' ? this.state.projectType : undefined,//项目分类
+            orderNo: this.state.searchOrderNo || undefined,//订单编号
+            contractNo: this.state.searchContractNo || undefined,//合同编号
+            userName: this.state.searchEnterpriseName || undefined,//企业名称
+            declarationBatch: this.state.declarationBatch || undefined,//申报批次
+            projectSituation: typeof this.state.projectSituation === 'number' ? this.state.projectSituation : undefined,//项目情况
+            projectAmount: this.state.projectAmount || undefined,//项目金额
+        }
+
+        for(let key in data){
+            if(data[key]){
+                url = url+`&${key}=${data[key]}`;
+            }
+        }
+        window.open(globalConfig.context +url);
+    }
+
+
+    componentDidMount() {
+        this.departmentList();
+        this.selectSuperId();
+        this.loadData();
+    }
+
+
+    render() {
+        return (
+            <div className="user-content">
+                <div className="content-title">
+                    <span>企业项目派单查询</span>
+                </div>
+                <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
+                    <TabPane tab="搜索" key="1">
+                        <div className="user-search" style={{
+                            marginTop:'10px',
+                            marginLeft:'10px',
+                            marginRight:'10px'
+                        }}>
+                            <Input
+                                placeholder="订单编号"
+                                style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                value={this.state.searchOrderNo}
+                                onChange={e => {
+                                    this.setState({ searchOrderNo: e.target.value });
+                                }}
+                            />
+                            <Input
+                                placeholder="合同编号"
+                                style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                value={this.state.searchContractNo}
+                                onChange={e => {
+                                    this.setState({ searchContractNo: e.target.value });
+                                }}
+                            />
+                            <Input
+                                placeholder="企业名称"
+                                style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                value={this.state.searchEnterpriseName}
+                                onChange={e => {
+                                    this.setState({ searchEnterpriseName: e.target.value });
+                                }}
+                            />
+                            <span style={{display:"inline-block"}}>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目类别 :</span>
+                                <Select
+                                    value={this.state.projectStatus || undefined}
+                                    placeholder="请选择项目类别"
+                                    notFoundContent="未获取到上级品类列表"
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    onChange={(e) => {
+                                        let infor = this.state.contactsOptionData.filter((v)=>v.id === e);
+                                        this.setState({
+                                            projectStatus: e,
+                                        },()=>{
+                                            if(infor[0].cname === '高新' && typeof this.state.projectType !== 'number'){
+                                                this.setState({
+                                                    status: 1,
+                                                })
+                                            }else if (typeof this.state.projectType !== 'number'){
+                                                this.setState({
+                                                    status: 0,
+                                                })
+                                            }
+                                        })
+                                    }}
+                                >
+                                    {this.state.contactsOption}
+                                </Select>
+                            </span>
+                            <span style={{display:"inline-block"}}>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目分类 :</span>
+                                <Select
+                                    value={typeof this.state.projectType === 'number' ? this.state.projectType : undefined}
+                                    placeholder="请选择项目分类"
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    onChange={(e) => {
+                                        this.setState({
+                                            projectType: e,
+                                            status: e === 4 ? 2 : e === 2 ? 3 : e === 1 ? 4 : e === 5 ? 1 : 0,
+                                        })
+                                    }}
+                                >
+                                    {/*0通用 1专利 2软著 3审计 4双软 5高新*/}
+                                    <Option value={0}>通用</Option>
+                                    <Option value={1}>专利</Option>
+                                    <Option value={2}>软著</Option>
+                                    <Option value={3}>审计</Option>
+                                    <Option value={4}>双软</Option>
+                                    <Option value={5}>高新</Option>
+                                    <Option value={6}>商标</Option>
+                                </Select>
+                            </span>
+                            <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
+                                <Spin spinning={this.state.departmentListloading}>
+                                    <span>订单部门:</span>
+                                    <Select
+                                        placeholder="请选择部门"
+                                        style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}
+                                        value={this.state.depId || undefined}
+                                        onChange={e => {
+                                            this.setState({ depId: e });
+                                        }}
+                                    >
+                                        {
+                                            this.state.departmentArr.map(function (item) {
+                                                return <Select.Option key={item.id} value={item.id}>{item.name}</Select.Option>
+                                            })
+                                        }
+                                    </Select>
+                                </Spin>
+                            </span>
+                            <span style={{display: "inline-block",marginRight:'10px',marginBottom:'10px'}}>
+                                <span>负责部门:</span>
+                                <Select
+                                    placeholder="请选择部门"
+                                    style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}
+                                    value={this.state.thchDepId || undefined}
+                                    onChange={e => {
+                                        this.setState({ thchDepId: e });
+                                    }}
+                                >
+                                    {
+                                        this.state.departmentArr.map(function (item) {
+                                            return <Select.Option key={item.id} value={item.id}>{item.name}</Select.Option>
+                                        })
+                                    }
+                                </Select>
+                            </span>
+                            <span style={{display:"inline-block"}}>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>申报批次 :</span>
+                                <Select
+                                    value={this.state.declarationBatch || undefined}
+                                    placeholder="请选择批次"
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    onChange={(e) => {
+                                        this.setState({
+                                            declarationBatch: e,
+                                        });
+                                    }}
+                                >
+                                    <Option value={1}>第一批</Option>
+                                    <Option value={2}>第二批</Option>
+                                    <Option value={3}>第三批</Option>
+                                    <Option value={4}>第四批</Option>
+                                </Select>
+                            </span>
+                            <span style={{display:"inline-block"}}>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目金额 :</span>
+                                <Select
+                                    value={this.state.projectAmount || undefined}
+                                    placeholder="请选择项目金额"
+                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    onChange={(e) => {
+                                        this.setState({
+                                            projectAmount: e,
+                                        });
+                                    }}
+                                >
+                                    <Option value={1}>0~0.5万</Option>
+                                    <Option value={2}>0.5~1万</Option>
+                                    <Option value={3}>1~2万</Option>
+                                    <Option value={4}>2~5万</Option>
+                                    <Option value={5}>5~10万</Option>
+                                    <Option value={6}>10~30万</Option>
+                                    <Option value={7}>30~50万</Option>
+                                    <Option value={8}>50~80万</Option>
+                                    <Option value={9}>80万上</Option>
+                                </Select>
+                            </span>
+                            <span style={{display:"inline-block"}}>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>项目情况 :</span>
+                                <Select
+                                    value={typeof this.state.projectSituation === 'number' ? this.state.projectSituation : undefined}
+                                    placeholder="请选择项目情况"
+                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
+                                    onChange={(e) => {
+                                        this.setState({
+                                            projectSituation: e,
+                                        });
+                                    }}
+                                >
+                                    <Option value={0}>未开始</Option>
+                                    <Option value={1}>进行中</Option>
+                                    <Option value={2}>已暂停</Option>
+                                    <Option value={3}>已驳回(专利、软著项目编写)</Option>
+                                    <Option value={4}>已完成</Option>
+                                    <Option value={5}>项目已完成 已退单</Option>
+                                    <Option value={6}>项目未完成 已退单</Option>
+                                </Select>
+                            </span>
+                            <span style={{display:"inline-block"}}>
+                                <span style={{marginRight:'10px',marginBottom:'10px'}}>派单时间 :</span>
+                                <RangePicker
+                                    style={{marginRight:'10px',marginBottom:'10px'}}
+                                    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>
+                            <Button type="primary" onClick={()=>{this.loadData();}} style={{marginRight:'10px',marginBottom:'10px'}}>搜索</Button>
+                            <Button onClick={this.resetAll} style={{marginRight:'10px',marginBottom:'10px'}}>重置</Button>
+                        </div>
+                    </TabPane>
+                    <TabPane tab="更改表格显示数据" key="2">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={this.state.columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                    <TabPane tab="导出EXCEL" key="3">
+                        <Button type="primary" style={{margin: '10px'}} onClick={this.exportPending}>导出</Button>
+                    </TabPane>
+                </Tabs>
+                <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                        <Table
+                            scroll={{ x: 1200, y: 0 }}
+                            columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
+                            dataSource={this.state.dataSource}
+                            pagination={this.state.pagination}
+                            onRowClick={(record)=>{
+                                this.setState({
+                                    projectdetailsId: record.id,
+                                    projectdetailsOrderNo: record.orderNo,
+                                    pname: record.pname,
+                                    visible: true,
+                                })
+                            }}
+                            bordered
+                            size="middle"
+                        />
+                    </Spin>
+                </div>
+                {this.state.visible ? <ProjectDetails
+                    visible={this.state.visible}
+                    id={this.state.projectdetailsId}
+                    orderNo={this.state.projectdetailsOrderNo}
+                    taskName={this.state.pname}
+                    visitOk={()=>{
+                        this.setState({
+                            visible: false,
+                        });
+                    }}
+                    visitCancel={()=>{
+                        this.setState({
+                            visible: false,
+                        });
+                    }}
+                /> : null}
+            </div>
+        )
+    }
+}
+
+export default EnterpriseProjectQuery;

+ 1 - 0
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -1051,6 +1051,7 @@ const OutsourceTaskAssignment = React.createClass({
         />
         <Modal
           className="customeDetails"
+          maskClosable={false}
           footer=""
           title=""
           width="900px"

+ 5 - 6
js/component/manageCenter/project/summary/highTech.jsx

@@ -492,21 +492,20 @@ class HighTech extends Component{
                                 <Select
                                     value={typeof this.state.projectSituation === 'number' ? this.state.projectSituation : undefined}
                                     placeholder="请选择项目情况"
-                                    style={{ width: 100,marginRight:'10px',marginBottom:'10px' }}
+                                    style={{ width: 200,marginRight:'10px',marginBottom:'10px' }}
                                     onChange={(e) => {
                                         this.setState({
                                             projectSituation: e,
                                         });
                                     }}
                                 >
-                                    {/*0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单*/}
                                     <Option value={0}>未开始</Option>
-                                    <Option value={1}>已开始</Option>
+                                    <Option value={1}>进行中</Option>
                                     <Option value={2}>已暂停</Option>
-                                    <Option value={3}>已驳回</Option>
+                                    <Option value={3}>已驳回(专利、软著项目编写)</Option>
                                     <Option value={4}>已完成</Option>
-                                    <Option value={5}>未完成退单</Option>
-                                    <Option value={6}>已完成退单</Option>
+                                    <Option value={5}>项目已完成 已退单</Option>
+                                    <Option value={6}>项目未完成 已退单</Option>
                                 </Select>
                             </span>
                                 <span style={{display:"inline-block"}}>

+ 35 - 35
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -114,13 +114,13 @@ const highTechColumns =[
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-                value === 0 ? '未开始' :
-                    value === 1 ? '已开始' :
-                        value === 2 ? '已暂停' :
-                            value === 3 ? '已驳回' :
-                                value === 4 ? '已完成' :
-                                    value === 5 ? '未完成退单' :
-                                        value === 6 ? '已完成退单' :''
+            value === 0 ? '未开始':
+                value === 1 ? '进行中':
+                    value === 2 ? '已暂停':
+                        value === 3 ? '已驳回(专利、软著项目编写)':
+                            value === 4 ? '已完成':
+                                value === 5 ? '项目已完成 已退单':
+                                    value === 6 ? '项目未完成 已退单': ''
         )
     },
     {
@@ -228,13 +228,13 @@ const doubleSoft = [
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-            value === 0 ? '未开始' :
-                value === 1 ? '已开始' :
-                    value === 2 ? '已暂停' :
-                        value === 3 ? '已驳回' :
-                            value === 4 ? '已完成' :
-                                value === 5 ? '未完成退单' :
-                                    value === 6 ? '已完成退单' :''
+            value === 0 ? '未开始':
+                value === 1 ? '进行中':
+                    value === 2 ? '已暂停':
+                        value === 3 ? '已驳回(专利、软著项目编写)':
+                            value === 4 ? '已完成':
+                                value === 5 ? '项目已完成 已退单':
+                                    value === 6 ? '项目未完成 已退单': ''
         )
     },
     {
@@ -376,13 +376,13 @@ const softWriting = [
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-            value === 0 ? '未开始' :
-                value === 1 ? '已开始' :
-                    value === 2 ? '已暂停' :
-                        value === 3 ? '已驳回' :
-                            value === 4 ? '已完成' :
-                                value === 5 ? '未完成退单' :
-                                    value === 6 ? '已完成退单' :''
+            value === 0 ? '未开始':
+                value === 1 ? '进行中':
+                    value === 2 ? '已暂停':
+                        value === 3 ? '已驳回(专利、软著项目编写)':
+                            value === 4 ? '已完成':
+                                value === 5 ? '项目已完成 已退单':
+                                    value === 6 ? '项目未完成 已退单': ''
         )
     },
     {
@@ -536,13 +536,13 @@ const patent =[
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-            value === 0 ? '未开始' :
-                value === 1 ? '已开始' :
-                    value === 2 ? '已暂停' :
-                        value === 3 ? '已驳回' :
-                            value === 4 ? '已完成' :
-                                value === 5 ? '未完成退单' :
-                                    value === 6 ? '已完成退单' :''
+            value === 0 ? '未开始':
+                value === 1 ? '进行中':
+                    value === 2 ? '已暂停':
+                        value === 3 ? '已驳回(专利、软著项目编写)':
+                            value === 4 ? '已完成':
+                                value === 5 ? '项目已完成 已退单':
+                                    value === 6 ? '项目未完成 已退单': ''
         )
     },
     {
@@ -637,13 +637,13 @@ const currency = [
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-            value === 0 ? '未开始' :
-                value === 1 ? '已开始' :
-                    value === 2 ? '已暂停' :
-                        value === 3 ? '已驳回' :
-                            value === 4 ? '已完成' :
-                                value === 5 ? '未完成退单' :
-                                    value === 6 ? '已完成退单' :''
+            value === 0 ? '未开始':
+                value === 1 ? '进行中':
+                    value === 2 ? '已暂停':
+                        value === 3 ? '已驳回(专利、软著项目编写)':
+                            value === 4 ? '已完成':
+                                value === 5 ? '项目已完成 已退单':
+                                    value === 6 ? '项目未完成 已退单': ''
         )
     },
     {

+ 1 - 0
js/component/manageCenter/project/summary/projecCount.jsx

@@ -565,6 +565,7 @@ class ProjecCount extends Component{
                     </Spin>
                 </div>
                 {this.state.projectSummary ? <Modal
+                    maskClosable={false}
                     className="customeDetails"
                     footer=""
                     title=""

+ 2 - 0
js/component/manageCenter/project/summary/projectDetails.jsx

@@ -797,6 +797,7 @@ class ProjectDetails extends Component{
     render() {
         return (
             this.props.visible ? <Modal
+                    maskClosable={false}
                     className="customeDetails"
                     footer=""
                     title=""
@@ -844,6 +845,7 @@ class ProjectDetails extends Component{
                                                     操作日志
                                                 </Button>
                                                 {this.state.visibleA ? <Modal
+                                                    maskClosable={false}
                                                     width="800px"
                                                     visible={this.state.visibleA}
                                                     onCancel={()=>{

+ 44 - 19
js/component/manageCenter/project/task/myTask.jsx

@@ -1365,16 +1365,15 @@ const Task = React.createClass({
   },
   // 获取csort下的数据
   getCsortData(cSort) {
-    cuiJieDian.map((item) => {
+    return cuiJieDian.map((item) => {
       if (item.value == cSort) {
-        console.log(item.children)
         this.setState({
           paySubject: item.children,
         })
       }
     })
   },
-  tableRowClick(record) {
+  async tableRowClick(record) {
     this.state.RowData = record
     let str = record.taskName
     let test = str.indexOf('会员')
@@ -1412,7 +1411,9 @@ const Task = React.createClass({
       id:record.id,
       tid:record.id,
     })
-    this.xiangqing(record.id, record.taskName)
+    await this.xiangqing(record.id);
+    // 获取Csort
+    await this.getCsortData(localStorage.getItem('cSort'))
     this.xiangqings(record.orderNo)
     this.xiangmu(record.orderNo)
     this.loaduserss(record)
@@ -1422,8 +1423,6 @@ const Task = React.createClass({
     // this.payNodeTable(record.id);
     //查看外包状态日志
     this.getSelectOutsourceLog(record.id);
-    // 获取Csort
-    this.getCsortData(localStorage.getItem('cSort'))
     this.projectTypeTabContent(record.projectType)
   },
   //点击修改项目详情
@@ -1541,8 +1540,8 @@ const Task = React.createClass({
     )
   },
   //订单详情
-  xiangqing(id) {
-    $.ajax({
+  xiangqing(id){
+    return $.ajax({
       method: 'get',
       dataType: 'json',
       crossDomain: false,
@@ -1557,7 +1556,10 @@ const Task = React.createClass({
             message.warning(data.error[0].message)
           }
         } else {
+          localStorage.setItem('cSort', thisdata.sort)
           this.setState({
+            sort: thisdata.sort,
+            cSort: thisdata.sort,
             id: thisdata.id, //ID
             splitId: thisdata.splitId,//拆分序号
             splitStatus: thisdata.splitStatus,//0未拆分 1已拆分
@@ -1697,7 +1699,6 @@ const Task = React.createClass({
         } else {
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i]
-            localStorage.setItem('cSort', thisdata.cSort)
             theArr.push({
               key: i,
               id: thisdata.id,
@@ -1725,7 +1726,6 @@ const Task = React.createClass({
         this.setState({
           dataSourceX: theArr,
           type: theArr[0].type,
-          cSort: theArr[0].cSort,
         })
       }.bind(this),
     }).always(
@@ -2317,7 +2317,7 @@ const Task = React.createClass({
                 globalConfig.context + '/api/admin/outsourceOrg/outsourceProjectAudit',
             data: data,
           }).done(
-              function (data) {
+              async function (data) {
                 _this.setState({
                   sureOutLoading: false,
                 })
@@ -2327,7 +2327,14 @@ const Task = React.createClass({
                   _this.waiDetail();
                   _this.thirdTable(_this.state.tid);
                   _this.getSelectOutsourceLog(_this.state.tid);
-                  _this.payNodeTable(_this.state.tid)
+                  if(_this.state.paySubject.length === 0 ){
+                    await _this.xiangqing(_this.state.tid);
+                    // 获取Csort
+                    await _this.getCsortData(localStorage.getItem('cSort'))
+                    await _this.payNodeTable(_this.state.tid);
+                  }else{
+                    _this.payNodeTable(_this.state.tid)
+                  }
                 } else {
                   message.warning(data.error[0].message);
                   reject();
@@ -2514,7 +2521,7 @@ const Task = React.createClass({
     })
     this.rizhi()
   },
-  orderChange(key) {
+  async orderChange(key) {
     this.setState({
       activeKey: key,
     })
@@ -2526,7 +2533,14 @@ const Task = React.createClass({
     }else if (key === '2') {
       this.waiDetail();
       this.thirdTable(this.state.tid);
-      this.payNodeTable(this.state.tid);
+      if(this.state.paySubject.length === 0 ){
+        await this.xiangqing(this.state.tid);
+        // 获取Csort
+        await this.getCsortData(localStorage.getItem('cSort'))
+        await this.payNodeTable(this.state.tid);
+      }else{
+        await this.payNodeTable(this.state.tid)
+      }
       this.getSelectOutsourceLog(this.state.tid);
     }else if(key === "1"){
       this.xiangqing(this.state.tid);
@@ -2825,13 +2839,16 @@ const Task = React.createClass({
           let payNodeArr = []
           let thisData = []
           let arr = data.data || []
-          // console.log('this.state.paySubject', this.state.paySubject)
           //对#5283自定义的补充展示
-          this.state.paySubject.push({ key: '自定义', value: '0' })
+          let infor = [...this.state.paySubject];
+          infor.push({ key: '自定义', value: '0' });
+          this.setState({
+            paySubject: infor
+          });
           for (let i = 0; i < arr.length; i++) {
             thisData = arr[i]
             //遍历paySubject,获取当前dunType对应的key
-            this.state.paySubject.map((item) => {
+            infor.map((item) => {
               if (item.value == thisData.dunType) {
                 thisData.dunType = item.key
               }
@@ -2874,6 +2891,7 @@ const Task = React.createClass({
     this.setState({
       selectPaymentNodeAjaxObj: ajaxObj
     })
+    return ajaxObj;
   },
   // 新增第三方供应商信息
   addThirdList() {
@@ -6640,14 +6658,21 @@ const Task = React.createClass({
             supplierList={this.state.PayNodeCompany}
             payNodeInfor={this.state.payNodeInfor}
             thirdUnitPrice={this.state.thirdUnitPrice}
-            onCancel={()=>{
+            onCancel={async ()=>{
               this.setState({
                 PayNodeVisible: false,
                 payNodeInfor: {},
                 ThirdId: '',
                 thirdUnitPrice: '',
               })
-              this.payNodeTable(this.state.tid)
+              if(this.state.paySubject.length === 0 ){
+                await this.xiangqing(this.state.tid);
+                // 获取Csort
+                await this.getCsortData(localStorage.getItem('cSort'))
+                await this.payNodeTable(this.state.tid);
+              }else{
+                await this.payNodeTable(this.state.tid)
+              }
             }}
         /> : <div/>}
         {this.state.projectSituationVisible ? <Modal

+ 24 - 12
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -815,7 +815,7 @@ const MyTaskOutsource = React.createClass({
       "(<span class='ruanzhu'>软著数</span>/<span class='xiazheng'>下证数</span>)"
     );
   },
-  tableRowClick(record) {
+  async tableRowClick(record) {
     this.state.RowData = record;
     let str = record.taskName;
     let test = str.indexOf("会员");
@@ -855,16 +855,15 @@ const MyTaskOutsource = React.createClass({
       id:record.id,
     })
 
-    this.xiangqing(record.id, record.taskName);
     this.xiangqings(record.orderNo);
     this.xiangmu(record.orderNo);
     this.loaduserss(record);
     // 获取第三方信息表格
     this.thirdTable(record.id)
-    //获取支付节点信息表格
-    this.payNodeTable(record.id)
+    await this.xiangqing(record.id);
     // 获取Csort
-    this.getCsortData(localStorage.getItem('cSort'))
+    await this.getCsortData(this.state.sort)
+    await this.payNodeTable(record.id);
     this.projectTypeTabContent(record.projectType)
   },
   //点击修改项目详情
@@ -985,7 +984,7 @@ const MyTaskOutsource = React.createClass({
   },
   //订单详情
   xiangqing(id) {
-    $.ajax({
+    return $.ajax({
       method: "get",
       dataType: "json",
       crossDomain: false,
@@ -1000,8 +999,10 @@ const MyTaskOutsource = React.createClass({
             message.warning(data.error[0].message);
           }
         } else {
+          localStorage.setItem('cSort', thisdata.sort);
           this.setState({
             id: thisdata.id, //ID
+            sort: thisdata.sort,
             orderNo: thisdata.orderNo, //订单编号
             splitId: thisdata.splitId,//拆分序号
             splitStatus: thisdata.splitStatus,//0未拆分 1已拆分
@@ -1426,14 +1427,22 @@ const MyTaskOutsource = React.createClass({
       visibleA: false,
     });
   },
-  callBack(e) {
+  async callBack(e) {
     this.setState({
       modKey: e,
     });
-    if (e == 2) {
-      this.waiDetail()
+    if (e === '2') {
+      this.waiDetail();
+      if(this.state.paySubject.length === 0 ){
+        await this.xiangqing(this.state.tid);
+        // 获取Csort
+        await this.getCsortData(localStorage.getItem('cSort'))
+        await this.payNodeTable(this.state.tid);
+      }else{
+        await this.payNodeTable(this.state.tid)
+      }
     }
-    if (e == 3) {
+    if (e === '3') {
       this.orderDetailData(this.state.orderNo);
       this.xiangmu(this.state.orderNo);
       this.jiedian(this.state.orderNo);
@@ -1876,7 +1885,7 @@ const MyTaskOutsource = React.createClass({
   },
   // 获取csort下的数据
   getCsortData(cSort) {
-    cuiJieDian.map((item) => {
+    return cuiJieDian.map((item) => {
       if (item.value == cSort) {
         this.setState({
           paySubject: item.children,
@@ -3271,6 +3280,7 @@ const MyTaskOutsource = React.createClass({
           footer=""
           title=""
           width="900px"
+          maskClosable={false}
           visible={this.state.visible}
           onOk={this.visitOk}
           onCancel={this.visitCancel}
@@ -5547,6 +5557,7 @@ const MyTaskOutsource = React.createClass({
         />
         <Modal
           title="工时记录"
+          maskClosable={false}
           visible={this.state.timeVisible}
           onCancel={this.timeClose}
           width={800}
@@ -5613,7 +5624,7 @@ const MyTaskOutsource = React.createClass({
             }}/> : <div/>}
         {this.state.PayNodeVisible ? <OperationPayNode
             tid={this.state.tid}
-            cSort={this.state.cSort}
+            cSort={this.state.sort}
             visible={this.state.PayNodeVisible}
             thirdId={this.state.ThirdId}
             thirdInfoList={this.state.thirdInfoList}
@@ -5631,6 +5642,7 @@ const MyTaskOutsource = React.createClass({
             }}
         /> : <div/>}
         {this.state.projectSituationVisible ? <Modal
+            maskClosable={false}
             className="customeDetails"
             footer=""
             title=""

+ 2 - 1
js/component/manageCenter/project/task/newSupplier.js

@@ -247,6 +247,7 @@ class NewSupplier extends Component{
     render() {
         return(
             <Modal
+                maskClosable={false}
                 visible={this.props.visible}
                 onCancel={this.props.onCancel}
                 width={800}
@@ -561,4 +562,4 @@ class NewSupplier extends Component{
     }
 }
 
-export default NewSupplier;
+export default NewSupplier;

+ 3 - 2
js/component/manageCenter/project/task/operationPayNode.js

@@ -136,7 +136,7 @@ class OperationPayNode extends Component{
     // 获取csort下的数据
     getCsortData() {
         cuiJieDian.map((item) => {
-            if (item.value == localStorage.getItem('cSort')) {
+            if (item.value == this.props.cSort) {
                 this.setState({
                     paySubject: item.children,
                 })
@@ -149,6 +149,7 @@ class OperationPayNode extends Component{
         const { payNodeInfor } = this.props;
         return (
             <Modal
+                maskClosable={false}
                 visible={this.props.visible}
                 onCancel={this.props.onCancel}
                 width={800}
@@ -310,4 +311,4 @@ OperationPayNode.defaultProps = {
 }
 
 const WrappedNormalLoginForm = Form.create()(OperationPayNode);
-export default WrappedNormalLoginForm;
+export default WrappedNormalLoginForm;

+ 1 - 0
js/component/manageCenter/project/task/patentSchedule.jsx

@@ -508,6 +508,7 @@ class PatentSchedule extends Component{
                     </Spin>
                 </div>
                 {this.state.visible ? <Modal
+                    maskClosable={false}
                     width="800px"
                     visible={this.state.visible}
                     onCancel={()=>{

+ 2 - 1
js/component/manageCenter/project/task/payApplyReject/component/orderPaymentModal.js

@@ -171,6 +171,7 @@ class OrderPaymentModal extends Component{
     render() {
         return(
             <Modal
+                maskClosable={false}
                 className="customeDetails"
                 footer={false}
                 title="支付记录"
@@ -214,4 +215,4 @@ class OrderPaymentModal extends Component{
     }
 }
 
-export default OrderPaymentModal;
+export default OrderPaymentModal;

+ 24 - 7
js/component/manageCenter/project/task/payApplyReject/detailsModal/index.js

@@ -1,5 +1,6 @@
 import React,{Component} from 'react';
-import {Form, message, Modal, Tabs} from "antd";
+import {message, Modal, Tabs} from "antd";
+import { cuiJieDian } from '@/dataDic.js'
 import ProjectOverview from './projectOverview'
 import {splitUrl} from '@/tools'
 import CheckProject from "../../../../components/checkProject";
@@ -18,17 +19,30 @@ class DetailsModal extends Component{
             containOfficialFees:0,//官费缴费情况
         }
         this.visitCancel = this.visitCancel.bind(this);
+        this.getCsortData = this.getCsortData.bind(this);
     }
 
-    componentDidMount() {
+    async componentDidMount() {
         if(this.props.tid){
             this.waiDetail();
             this.thirdTable(this.props.tid);
-            this.payNodeTable(this.props.tid);
-            this.xiangqing(this.props.tid);
+            await this.xiangqing(this.props.tid);
+            await this.getCsortData(this.state.sort)
+            await this.payNodeTable(this.props.tid);
         }
     }
 
+    // 获取csort下的数据
+    getCsortData(cSort) {
+        return cuiJieDian.map((item) => {
+            if (item.value == cSort) {
+                this.setState({
+                    paySubject: item.children,
+                })
+            }
+        })
+    }
+
     visitOk(){
         this.setState({
             oldInfor: {}
@@ -176,7 +190,7 @@ class DetailsModal extends Component{
         this.setState({
             loadData: true,
         })
-        $.ajax({
+        return $.ajax({
             method: 'get',
             dataType: 'json',
             crossDomain: false,
@@ -237,7 +251,7 @@ class DetailsModal extends Component{
 
     //订单详情
     xiangqing(id) {
-        $.ajax({
+        return $.ajax({
             method: 'get',
             dataType: 'json',
             crossDomain: false,
@@ -252,8 +266,10 @@ class DetailsModal extends Component{
                         message.warning(data.error[0].message)
                     }
                 } else {
+                    localStorage.setItem('cSort', thisdata.sort);
                     this.setState({
                         orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
+                        sort: thisdata.sort,
                     })
                 }
             }.bind(this),
@@ -269,6 +285,7 @@ class DetailsModal extends Component{
     render() {
         return(
             <Modal
+                maskClosable={false}
                 className="customeDetails"
                 footer=""
                 title=""
@@ -343,4 +360,4 @@ class DetailsModal extends Component{
     }
 }
 
-export default DetailsModal;
+export default DetailsModal;

+ 1 - 0
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -1086,6 +1086,7 @@ class projectOverview extends Component{
                     </div>
                 </Spin>
                 <Modal
+                    maskClosable={false}
                     width="800px"
                     visible={this.state.visibleA}
                     onCancel={this.visitCancelA}

+ 3 - 0
js/component/manageCenter/project/task/taskQuery.jsx

@@ -1146,6 +1146,7 @@ const Task = React.createClass({
           footer=""
           title=""
           width="900px"
+          maskClosable={false}
           visible={this.state.visible}
           onOk={this.visitOk}
           onCancel={this.visitCancel}
@@ -1841,6 +1842,7 @@ const Task = React.createClass({
           width="800px"
           title="操作日志"
           footer=""
+          maskClosable={false}
           className="admin-desc-content"
         >
           <div className="patent-table patent-table-center">
@@ -2302,6 +2304,7 @@ const Task = React.createClass({
         </Modal> : <div/>}
         {this.state.visibleA ? <Modal
           width="800px"
+          maskClosable={false}
           visible={this.state.visibleA}
           onCancel={this.visitCancelA}
           title="操作日志"

+ 57 - 58
js/component/manageCenter/set/business/businessCategory.jsx

@@ -33,7 +33,7 @@ const PicturesWall = React.createClass({
         this.props.fileList(fileList);
     },
     componentWillReceiveProps(nextProps) {
-        this.state.fileList = nextProps.pictureUrl; 
+        this.state.fileList = nextProps.pictureUrl;
     },
     render() {
         const { previewVisible, previewImage, fileList } = this.state;
@@ -176,7 +176,7 @@ const BusinessCategory=Form.create()(React.createClass({
        this.selectSuperId();
     },
     //获取上级品类
-    selectSuperId() {  
+    selectSuperId() {
     	this.state.data = []
          $.ajax({
                 method: "get",
@@ -186,15 +186,15 @@ const BusinessCategory=Form.create()(React.createClass({
                 data:{
                   flag:1,
                 },
-                success: function (data) { 
+                success: function (data) {
                 		let theArr = [];
 					    let thedata=data.data;
 					    if (!thedata) {
 		                    if (data.error && data.error.length) {
 		                        message.warning(data.error[0].message);
-		                    };	
-		                    thedata = {}; 
-		              };   
+		                    };
+		                    thedata = {};
+		              };
 					    var contactIds=[];
 				        //for (let item in data.data) {
 				        	for(var i=0;i<data.data.length;i++){
@@ -203,12 +203,12 @@ const BusinessCategory=Form.create()(React.createClass({
 		                        <Select.Option value={i.toString()} key={theData.cname}>{theData.cname}</Select.Option>
 		                    );
 		                };
-						this.setState({	
+						this.setState({
 							SuperArr:thedata,
-		                    contactsOption: theArr, 
+		                    contactsOption: theArr,
 		                    orderStatusOptions:data.data,
 	                    });
-	                    
+
 					}.bind(this),
 				}).always(function () {
 				this.loadData(this.state.ispage);
@@ -219,7 +219,7 @@ const BusinessCategory=Form.create()(React.createClass({
 	},
 	//编辑部门,保存
     edithandleSubmit(e){
-    	e.preventDefault();	
+    	e.preventDefault();
     	//上级组织字典
         let nameText=this.state.SuperArr
         let superText=this.state.editSuperName;
@@ -306,7 +306,7 @@ const BusinessCategory=Form.create()(React.createClass({
                   }
                 }.bind(this)
               );
-		        } 	
+		        }
     		}
     	}else{
     		if(!(superOne==superText)){
@@ -371,9 +371,9 @@ const BusinessCategory=Form.create()(React.createClass({
                   }
                 }.bind(this)
               );
-		        } 
+		        }
     	}
-    },  
+    },
     //整行点击
     tableRowClick(record, index) {
     	this.selectSuperId();
@@ -402,7 +402,7 @@ const BusinessCategory=Form.create()(React.createClass({
                     theArr.push({
                          editId: thisdata.id,//每一条记录的ID
                          editName:thisdata.cname,//品类名称
-                         editStatus:thisdata.status,//品类状态 
+                         editStatus:thisdata.status,//品类状态
                          editSuperName:thisdata.superName,//上级品类
                          editlayer:thisdata.layer,//品类层级
                          editCid: thisdata.cid,//品类编号
@@ -410,12 +410,12 @@ const BusinessCategory=Form.create()(React.createClass({
                          editCreateName:thisdata.createName,//创建人
                          editTime:thisdata.createTimeFormattedDate,//创建时间
                          orgCodeUrl: thisdata.varietiesLogo ? splitUrl(thisdata.varietiesLogo, ',', globalConfig.avatarHost + '/upload') : [],
-                    }); 
+                    });
                 };
                 this.setState({
                 	 editId: thisdata.id,//每一条记录的ID
                      editName:thisdata.cname,//品类名称
-                     editStatus:thisdata.status,//品类状态 
+                     editStatus:thisdata.status,//品类状态
                      editSuperName:thisdata.superName,//上级品类
                      editSuperId:thisdata.superId,//上级品类
                      editlayer:thisdata.layer,//品类层级
@@ -439,7 +439,7 @@ const BusinessCategory=Form.create()(React.createClass({
 	},
     //新增一个品类,保存
     addhandleSubmit(e){
-    	e.preventDefault();	
+    	e.preventDefault();
     	if(!this.state.categoryName){
     		message.warning('请输入品类名称');
     		return false;
@@ -448,11 +448,11 @@ const BusinessCategory=Form.create()(React.createClass({
     		message.warning('请选择上级品类');
     		return false;
     	}
-		this.props.form.validateFields((err, values) => {                                 
+		this.props.form.validateFields((err, values) => {
             if (!err) {
                 this.setState({
                     loading: true
-                }); 
+                });
                 //上级组织字典
                 let nameText=this.state.SuperArr;
                 let superText=nameText[parseInt(this.state.upCategory)].id;
@@ -465,12 +465,12 @@ const BusinessCategory=Form.create()(React.createClass({
                     	cname:this.state.categoryName,//组织名称
                     	superId:superText,//上级组织
                     	}
-                }).done(function (data) { 
+                }).done(function (data) {
                     this.setState({
                         loading: false
                     });
                     if (!data.error.length) {
-                        message.success('新增品类成功!'); 
+                        message.success('新增品类成功!');
                         this.handleCancel();
                         this.selectSuperId();
                     } else {
@@ -647,11 +647,11 @@ const BusinessCategory=Form.create()(React.createClass({
         this.state.layer = undefined;//品类层级清零
         this.state.status = undefined;//品类状态清零
         this.state.superId = undefined;//上级品类清零
-        this.loadData();       
+        this.loadData();
     },
     addReset() {
         this.state.categoryName = '';//品类名称清零
-        this.state.upCategory = undefined;//上级品类清零      
+        this.state.upCategory = undefined;//上级品类清零
     },
     searchSwitch() {
         this.setState({
@@ -689,13 +689,12 @@ const BusinessCategory=Form.create()(React.createClass({
        	const { getFieldDecorator } = this.props.form;
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
-        
+
         return (
             <div className="user-content" >
                 <div className="content-title">
                     <Tabs
                         defaultActiveKey="1"
-                        onChange={this.callback}
                         className="test">
                         <TabPane tab="搜索" key="1">
 	                <div className="user-search">
@@ -712,13 +711,13 @@ const BusinessCategory=Form.create()(React.createClass({
 	                    <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
                         <Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
 						     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px'}}
-	                   			 disabled={!hasSelected} 
+	                   			 disabled={!hasSelected}
 	                    		 >删除<Icon type="minus" />
 	           			     </Button>
 						</Popconfirm>
 						<Popconfirm title="是否停用?" onConfirm={this.blockRow} okText="是" cancelText="否">
 						     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px',display:'none'}}
-	                   			 disabled={!hasSelected} 
+	                   			 disabled={!hasSelected}
 	                    		 >停用<Icon type="minus" />
 	           			     </Button>
 						</Popconfirm>
@@ -743,7 +742,7 @@ const BusinessCategory=Form.create()(React.createClass({
 
                     </div>
                  </TabPane>
-                        <TabPane tab="新增项目" key="2">
+                        <TabPane tab="新增品类" key="2">
                             <Button type="primary" className="addButton" onClick={this.addClick} style={{float:'left',marginRight:'200px',marginLeft:10,marginBottom:10}}>新增品类<Icon type="plus" /></Button>
                             </TabPane>
                         <TabPane tab="品类移动" key="3">
@@ -762,7 +761,7 @@ const BusinessCategory=Form.create()(React.createClass({
                             </div>
                         </TabPane>
 					</Tabs>
-                   
+
                     <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
 	                        <Table size="middle" columns={
@@ -776,12 +775,12 @@ const BusinessCategory=Form.create()(React.createClass({
 	                            onRowClick={this.tableRowClick} />
 	                    </Spin>
 	                </div>
-	             
+
 	                 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.visible}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel}
 	                        width='400px'
-	                        title='新增品类'                       
+	                        title='新增品类'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.addhandleSubmit} id="demand-form">
@@ -797,53 +796,53 @@ const BusinessCategory=Form.create()(React.createClass({
 					                    </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-					                    <FormItem  
+					                    <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="上级品类"
-			                               > 
+			                               >
 			                                <Select placeholder="请选择上级品类" value={this.state.upCategory} onChange={(e)=>{this.setState({upCategory:e})}}
 				                                notFoundContent="未获取到上级品类列表" style={{width:'94%'}} required="required">
 				                                {this.state.contactsOption}
-				                            </Select> 
+				                            </Select>
 				                            <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 			                   		    </FormItem>
 		                   		    </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.handleCancel} style={{marginLeft:'15px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
                 	 </div>
-                	 
+
                 	 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.editvisible}
 	                        onOk={this.checkPatentProcess} onCancel={this.edithandleCancel}
 	                        width='600px'
-	                        title='编辑品类'                       
+	                        title='编辑品类'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.edithandleSubmit} id="demand-form">
 				                <Spin spinning={this.state.loading}>
 				                    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 					                            labelCol={{ span: 7 }}
 					                        	wrapperCol={{ span: 12 }}
 					                            label="品类名称" >
-				                                <Input placeholder="组织名称" value={this.state.editName} 
+				                                <Input placeholder="组织名称" value={this.state.editName}
 				                                onChange={(e)=>{this.setState({editName:e.target.value})}}/>
 					                    </FormItem>
-				                    </div> 
+				                    </div>
 				                    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 				                         	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           	label="品类状态"
-				                         > 
-					                        <Select placeholder="品类状态" value={this.state.editStatus} 
-				                                onChange={(e)=>{this.setState({editStatus:e})}}> 
+				                         >
+					                        <Select placeholder="品类状态" value={this.state.editStatus}
+				                                onChange={(e)=>{this.setState({editStatus:e})}}>
 				                                {
 				                                    categoryState.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -853,19 +852,19 @@ const BusinessCategory=Form.create()(React.createClass({
 				                   		 </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-					                    <FormItem  
+					                    <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="上级品类"
-			                               > 
+			                               >
 			                               <Select placeholder="请选择上级组织" value={this.state.editSuperName} onChange={(e)=>{this.setState({editSuperName:e})}}
 				                                notFoundContent="未获取到上级组织列表">
 				                                {this.state.contactsOption}
-				                            </Select> 
+				                            </Select>
 			                   		    </FormItem>
 		                   		    </div>
 		                   		    <div className="clearfix">
-					                    <FormItem 
+					                    <FormItem
 					                        labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                        label="业务品类图标" >
@@ -877,13 +876,13 @@ const BusinessCategory=Form.create()(React.createClass({
 					                    </FormItem>
 		                   		    </div>
 		                   		    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="品类序号"
 					                        >
 					                        {/* <span>{this.state.editSort}</span> */}
-                                            <Input 
+                                            <Input
                                                 value={this.state.editSort}
                                                 onChange={ (e) => {
                                                     this.setState({
@@ -894,7 +893,7 @@ const BusinessCategory=Form.create()(React.createClass({
 					                    </FormItem>
 					                </div>
 		                   		    <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="品类层级"
@@ -903,7 +902,7 @@ const BusinessCategory=Form.create()(React.createClass({
 					                    </FormItem>
 					                </div>
 					                <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="品类编号"
@@ -912,7 +911,7 @@ const BusinessCategory=Form.create()(React.createClass({
 					                    </FormItem>
 					                </div>
 					                <div className="clearfix" >
-				                    	<FormItem 
+				                    	<FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="创建人"
@@ -921,7 +920,7 @@ const BusinessCategory=Form.create()(React.createClass({
 					                    </FormItem>
 					                </div>
 					                <div className="clearfix">
-				                    	<FormItem 
+				                    	<FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="创建时间"
@@ -930,14 +929,14 @@ const BusinessCategory=Form.create()(React.createClass({
 					                    </FormItem>
 					                </div>
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+				                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 				                        <Button className="set-submit" type="ghost" onClick={this.edithandleCancel} style={{marginLeft:'100px'}}>取消</Button>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
                 	 </div>
-                	 
+
             	</div>
             </div>
         );

+ 10 - 8
js/component/manageCenter/set/business/businessProject.jsx

@@ -466,15 +466,16 @@ const BusinessProject=Form.create()(React.createClass({
 					loading: true
 				});
 				let nameText=this.state.SuperArr
-				let num = 0
-				nameText.forEach((item,index) => {
-					if(item.cname == this.state.editCname) {
-						num = index
-					}
-				})
+				// let num = 0
+				// nameText.forEach((item,index) => {
+				// 	if(item.cname == this.state.editCname) {
+				// 		num = index
+				// 	}
+				// })
 				// let superText=(this.state.editCname.length==1)?nameText[parseInt(this.state.editCname)].id:this.state.editCid;
 				// let superText=nameText[parseInt(this.state.editCname)].id
-				let superText=nameText[parseInt(num)].id
+                let arr = nameText.filter((v,k)=>v.cname === this.state.editCname || String(k) === this.state.editCname)
+				let superText=arr.length ? arr[0].id:"";
 				let isCountry=0;
 		    	let pro='';
 		        let city='';
@@ -1131,7 +1132,6 @@ const BusinessProject=Form.create()(React.createClass({
             <div className="content-title">
               <Tabs
                 defaultActiveKey="1"
-                onChange={this.callback}
                 className="test"
               >
                 <TabPane tab="搜索" key="1">
@@ -1876,6 +1876,7 @@ const BusinessProject=Form.create()(React.createClass({
               </div>
               <div className="patent-desc">
                 <Modal
+                  maskClosable={false}
                   className="customeDetails"
                   title="业务项目"
                   width="1000px"
@@ -1932,6 +1933,7 @@ const BusinessProject=Form.create()(React.createClass({
                                 placeholder="请选择业务品类"
                                 value={this.state.editCname}
                                 onChange={(e) => {
+                                    console.log(e)
                                   this.setState({ editCname: e });
                                 }}
                                 notFoundContent="未获取到业务品类列表"

+ 153 - 144
js/component/manageCenter/set/organization/organization.jsx

@@ -11,6 +11,7 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 import {patternOrganization,conditionOrganization} from '../../../dataDic.js';
 import {getPattern,getCondition} from '../../../tools.js';
 import {ChooseList} from "../../order/orderNew/chooseList";
+const confirm = Modal.confirm;
 
 const {TabPane} = Tabs
 const Organization=Form.create()(React.createClass({
@@ -54,12 +55,12 @@ const Organization=Form.create()(React.createClass({
                     };
                     this.state.pagination.current = data.data.pageNo;
                     this.state.pagination.total = data.data.totalCount;
+                    this.setState({
+                        dataSource: theArr,
+                        page:data.data.pageNo,
+                        pagination: this.state.pagination
+                    });
                 };
-                this.setState({
-                    dataSource: theArr,
-                    page:data.data.pageNo,
-                    pagination: this.state.pagination
-                });
             }.bind(this),
         }).always(function () {
             this.setState({
@@ -163,7 +164,7 @@ const Organization=Form.create()(React.createClass({
 
 					}.bind(this),
 				}).always(function () {
-				this.loadData();
+				this.loadData(this.state.page);
 	            this.setState({
 	                loading: false
 	            });
@@ -187,133 +188,141 @@ const Organization=Form.create()(React.createClass({
     	};
     	let remarksText=(this.state.editRemarks)?this.state.editRemarks:'该组织没有职能说明,请完善!';
     	let isStatus=this.state.editStatus;
+    	let _this = this;
     	if(isStatus==1){
-    		if(confirm('是否要解散该部门?')){
-    			if(!(superOne==superText)){
-		    		if(confirm('上级组织已修改,是否保存?')){
-			        $.ajax({
-                method: "post",
-                dataType: "json",
-                crossDomain: false,
-                url:
-                  globalConfig.context +
-                  "/api/admin/organization/updateOrganization",
-                data: {
-                  name: this.state.editName, //组织名称
-                  type: this.state.editType, //组织类型
-                  managerId: this.state.theTypes
-                    ? this.state.theTypes
-                    : this.state.managerIdOrganizationId, //负责人ID
-                  financeId: this.state.theTypes2
-                    ? this.state.theTypes2
-                    : this.state.financeId, //负责人ID
-                  superId: this.state.editSuperId, //上级组织
-                  status: this.state.editStatus, //组织状态
-                  remarks: remarksText, //组织职能说明
-                  id: this.state.editId, //组织ID
-                  updateOrganization: this.state.updateOrganization,
-                  abbreviation: this.state.abbreviation,
-                }
-              }).done(
-                function(data) {
-                  this.setState({
-                    loading: false
-                  });
-                  if (!data.error.length) {
-                    message.success("保存成功!");
-                    this.edithandleCancel();
-                    this.selectSuperId();
-                  } else {
-                    message.warning(data.error[0].message);
-                  }
-                }.bind(this)
-              );
-			        return false
-		        	}
-		    	}else {
-		        	$.ajax({
-                method: "post",
-                dataType: "json",
-                crossDomain: false,
-                url:
-                  globalConfig.context +
-                  "/api/admin/organization/updateOrganization",
-                data: {
-                  name: this.state.editName, //组织名称
-                  type: this.state.editType, //组织类型
-                  managerId: this.state.theTypes
-                    ? this.state.theTypes
-                    : this.state.managerIdOrganizationId, //负责人ID
-                  financeId: this.state.theTypes2
-                    ? this.state.theTypes2
-                    : this.state.financeId, //负责人ID
-                  superId: oldId, //上级组织
-                  status: this.state.editStatus, //组织状态
-                  remarks: remarksText, //组织职能说明
-                  id: this.state.editId, //组织ID
-                  abbreviation: this.state.abbreviation
+            confirm({
+                title:'是否要解散该部门?',
+                onOk() {
+                    if(!(superOne==superText)){
+                        confirm({
+                            title:'上级组织已修改,是否保存?',
+                            onOk() {
+                                $.ajax({
+                                    method: "post",
+                                    dataType: "json",
+                                    crossDomain: false,
+                                    url:
+                                        globalConfig.context +
+                                        "/api/admin/organization/updateOrganization",
+                                    data: {
+                                        name: _this.state.editName, //组织名称
+                                        type: _this.state.editType, //组织类型
+                                        managerId: _this.state.theTypes
+                                            ? _this.state.theTypes
+                                            : _this.state.managerIdOrganizationId, //负责人ID
+                                        financeId: _this.state.theTypes2
+                                            ? _this.state.theTypes2
+                                            : _this.state.financeId, //负责人ID
+                                        superId: _this.state.editSuperId, //上级组织
+                                        status: _this.state.editStatus, //组织状态
+                                        remarks: remarksText, //组织职能说明
+                                        id: _this.state.editId, //组织ID
+                                        updateOrganization: _this.state.updateOrganization,
+                                        abbreviation: _this.state.abbreviation,
+                                    }
+                                }).done(
+                                    function(data) {
+                                        _this.setState({
+                                            loading: false
+                                        });
+                                        if (!data.error.length) {
+                                            message.success("保存成功!");
+                                            _this.edithandleCancel();
+                                            _this.selectSuperId();
+                                        } else {
+                                            message.warning(data.error[0].message);
+                                        }
+                                    }.bind(_this)
+                                );
+                                return false
+                            }
+                        })
+                    }else {
+                        $.ajax({
+                            method: "post",
+                            dataType: "json",
+                            crossDomain: false,
+                            url:
+                                globalConfig.context +
+                                "/api/admin/organization/updateOrganization",
+                            data: {
+                                name: _this.state.editName, //组织名称
+                                type: _this.state.editType, //组织类型
+                                managerId: _this.state.theTypes
+                                    ? _this.state.theTypes
+                                    : _this.state.managerIdOrganizationId, //负责人ID
+                                financeId: _this.state.theTypes2
+                                    ? _this.state.theTypes2
+                                    : _this.state.financeId, //负责人ID
+                                superId: oldId, //上级组织
+                                status: _this.state.editStatus, //组织状态
+                                remarks: remarksText, //组织职能说明
+                                id: _this.state.editId, //组织ID
+                                abbreviation: _this.state.abbreviation
+                            }
+                        }).done(
+                            function(data) {
+                                _this.setState({
+                                    loading: false
+                                });
+                                if (!data.error.length) {
+                                    message.success("保存成功!");
+                                    _this.edithandleCancel();
+                                    _this.selectSuperId();
+                                } else {
+                                    message.warning(data.error[0].message);
+                                }
+                            }.bind(_this)
+                        );
+                    }
                 }
-              }).done(
-                function(data) {
-                  this.setState({
-                    loading: false
-                  });
-                  if (!data.error.length) {
-                    message.success("保存成功!");
-                    this.edithandleCancel();
-                    this.selectSuperId();
-                  } else {
-                    message.warning(data.error[0].message);
-                  }
-                }.bind(this)
-              );
-		        }
-    		}
+            })
     	}else{
     		if(!(superOne==superText)){
-		    		if(confirm('上级组织已修改,是否保存?')){
-		    		console.log(this.state.editSuperId);
-			        $.ajax({
-                method: "post",
-                dataType: "json",
-                crossDomain: false,
-                url:
-                  globalConfig.context +
-                  "/api/admin/organization/updateOrganization",
-                data: {
-                  name: this.state.editName, //组织名称
-                  type: this.state.editType, //组织类型
-                  managerId: this.state.theTypes
-                    ? this.state.theTypes
-                    : this.state.managerIdOrganizationId, //负责人ID
-                  financeId: this.state.theTypes2
-                    ? this.state.theTypes2
-                    : this.state.financeId, //负责人ID
-                  superId: this.state.editSuperId, //上级组织
-                  status: this.state.editStatus, //组织状态
-                    province: thisdata.province,//省份
-                  remarks: remarksText, //组织职能说明
-                  id: this.state.editId, //组织ID
-                  abbreviation: this.state.abbreviation
-                }
-              }).done(
-                function(data) {
-                  this.setState({
-                    loading: false
-                  });
-                  if (!data.error.length) {
-                    message.success("保存成功!");
-                    this.edithandleCancel();
-                    this.selectSuperId();
-                  } else {
-                    message.warning(data.error[0].message);
-                  }
-                }.bind(this)
-              );
-			        return false
-		        	}
+		    		confirm({
+                        title:'上级组织已修改,是否保存?',
+                        onOk(){
+                            $.ajax({
+                                method: "post",
+                                dataType: "json",
+                                crossDomain: false,
+                                url:
+                                    globalConfig.context +
+                                    "/api/admin/organization/updateOrganization",
+                                data: {
+                                    name: _this.state.editName, //组织名称
+                                    type: _this.state.editType, //组织类型
+                                    managerId: _this.state.theTypes
+                                        ? _this.state.theTypes
+                                        : _this.state.managerIdOrganizationId, //负责人ID
+                                    financeId: _this.state.theTypes2
+                                        ? _this.state.theTypes2
+                                        : _this.state.financeId, //负责人ID
+                                    superId: _this.state.editSuperId, //上级组织
+                                    status: _this.state.editStatus, //组织状态
+                                    province: _this.state.province,//省份
+                                    remarks: remarksText, //组织职能说明
+                                    id: _this.state.editId, //组织ID
+                                    abbreviation: _this.state.abbreviation
+                                }
+                            }).done(
+                                function(data) {
+                                    _this.setState({
+                                        loading: false
+                                    });
+                                    if (!data.error.length) {
+                                        message.success("保存成功!");
+                                        _this.edithandleCancel();
+                                        _this.selectSuperId();
+                                    } else {
+                                        message.warning(data.error[0].message);
+                                    }
+                                }.bind(_this)
+                            );
+                            return false
+                        }
+                    })
 		    	}else {
-		    		console.log(this.state.editSuperId);
 		    		$.ajax({
               method: "post",
               dataType: "json",
@@ -322,34 +331,34 @@ const Organization=Form.create()(React.createClass({
                 globalConfig.context +
                 "/api/admin/organization/updateOrganization",
               data: {
-                name: this.state.editName, //组织名称
-                type: this.state.editType, //组织类型
-                managerId: this.state.theTypes
-                  ? this.state.theTypes
-                  : this.state.managerIdOrganizationId, //负责人ID
-                financeId: this.state.theTypes2
-                  ? this.state.theTypes2
-                  : this.state.financeId, //负责人ID
+                name: _this.state.editName, //组织名称
+                type: _this.state.editType, //组织类型
+                managerId: _this.state.theTypes
+                  ? _this.state.theTypes
+                  : _this.state.managerIdOrganizationId, //负责人ID
+                financeId: _this.state.theTypes2
+                  ? _this.state.theTypes2
+                  : _this.state.financeId, //负责人ID
                 superId: oldId, //上级组织
-                status: this.state.editStatus, //组织状态
+                status: _this.state.editStatus, //组织状态
                 remarks: remarksText, //组织职能说明
-                id: this.state.editId, //组织ID
-                abbreviation: this.state.abbreviation,
-                  province: this.state.province,
+                id: _this.state.editId, //组织ID
+                abbreviation: _this.state.abbreviation,
+                  province: _this.state.province,
               }
             }).done(
               function(data) {
-                this.setState({
+                  _this.setState({
                   loading: false
                 });
                 if (!data.error.length) {
                   message.success("保存成功!");
-                  this.edithandleCancel();
-                  this.selectSuperId();
+                    _this.edithandleCancel();
+                    _this.selectSuperId();
                 } else {
                   message.warning(data.error[0].message);
                 }
-              }.bind(this)
+              }.bind(_this)
             );
 		        }
     	}

+ 2 - 1
js/component/manageCenter/set/projectConfigure/addOfficialFeePrice.js

@@ -51,6 +51,7 @@ class AddOfficialFeePrice extends Component{
         const { getFieldDecorator } = this.props.form;
         return (
             <Modal
+                maskClosable={false}
                 className="customeDetails"
                 title={Object.keys(this.props.infor).length ? "修改" : "新增"}
                 width='350px'
@@ -117,4 +118,4 @@ class AddOfficialFeePrice extends Component{
 }
 
 const WrappedHorizontalLoginForm = Form.create()(AddOfficialFeePrice);
-export default WrappedHorizontalLoginForm
+export default WrappedHorizontalLoginForm

+ 2 - 1
js/component/manageCenter/set/projectConfigure/addPatentPrice.js

@@ -51,6 +51,7 @@ class AddPatentPrice extends Component{
         const { getFieldDecorator } = this.props.form;
         return (
             <Modal
+                maskClosable={false}
                 className="customeDetails"
                 title={Object.keys(this.props.infor).length ? "修改" : "新增"}
                 width='350px'
@@ -121,4 +122,4 @@ class AddPatentPrice extends Component{
 }
 
 const WrappedHorizontalLoginForm = Form.create()(AddPatentPrice);
-export default WrappedHorizontalLoginForm
+export default WrappedHorizontalLoginForm

+ 2 - 1
js/component/manageCenter/set/projectConfigure/addSoftWritingPrice.js

@@ -51,6 +51,7 @@ class AddSoftWritingPrice extends Component{
         const { getFieldDecorator } = this.props.form;
         return (
             <Modal
+                maskClosable={false}
                 className="customeDetails"
                 title={Object.keys(this.props.infor).length ? "修改" : "新增"}
                 width='350px'
@@ -144,4 +145,4 @@ class AddSoftWritingPrice extends Component{
 }
 
 const WrappedHorizontalLoginForm = Form.create()(AddSoftWritingPrice);
-export default WrappedHorizontalLoginForm
+export default WrappedHorizontalLoginForm

+ 13 - 13
js/component/manageCenter/set/userManagementS/jurisdiction.jsx

@@ -240,7 +240,7 @@ const Jurisdiction = Form.create()(React.createClass({
 					<Tabs defaultActiveKey="1" className="test">
 						<TabPane tab="操作" key="1">
 							<div className="user-search">
-								<Button type="primary" onClick={this.handles} style={{marginLeft:'10px',float:'right'}}>测试欠款催发</Button>
+								{/*<Button type="primary" onClick={this.handles} style={{marginLeft:'10px',float:'right'}}>测试欠款催发</Button>*/}
 								<Button type="primary" className="addButton" onClick={this.addClick} style={{marginBottom:'15px'}}>新增权限<Icon type="user"/></Button>
 							</div>
 						</TabPane>
@@ -277,7 +277,7 @@ const Jurisdiction = Form.create()(React.createClass({
 	            <Modal maskClosable={false} visible={this.state.addnextVisible}
                         onOk={this.addNext} onCancel={this.nextCancel}
                         width='600px'
-                        title='新建下级权限模块'                     
+                        title='新建下级权限模块'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
@@ -285,21 +285,21 @@ const Jurisdiction = Form.create()(React.createClass({
 			                        <div className="clearfix">
 				                    	<FormItem className="half-middle"
 					                            {...formItemLayout}
-					                            label="接口名称" >   			                           
+					                            label="接口名称" >
 				                                    <Input placeholder="接口名称" value={this.state.name} style={{width:'230px'}}
 				                                    onChange={(e)=>{this.setState({name:e.target.value})}} required="required"/>
 					                   			<span className="mandatory">*</span>
 					                   </FormItem>
 					                    <FormItem className="half-middle"
 					                            {...formItemLayout}
-					                            label="接口路径" >   
+					                            label="接口路径" >
 				                                    <Input placeholder="接口路径" value={this.state.url} style={{width:'230px'}}
 				                                    onChange={(e)=>{this.setState({url:e.target.value})}} required="required"/>
-					                    		<span className="mandatory">*</span>	
+					                    		<span className="mandatory">*</span>
 					                    </FormItem>
 					                     <FormItem className="half-middle"
 					                            {...formItemLayout}
-					                            label="接口类型" >   
+					                            label="接口类型" >
 			                                    <Select placeholder="选择接口类型" style={{width:'230px'}}
 						                            value={this.state.urlType}
 						                            onChange={(e) => { this.setState({ urlType: e }) }}>
@@ -308,25 +308,25 @@ const Jurisdiction = Form.create()(React.createClass({
 					                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 					                                    })
 					                                }
-							                    </Select> 
-					                    		<span className="mandatory">*</span>	
+							                    </Select>
+					                    		<span className="mandatory">*</span>
 					                    </FormItem>
 			                   		    <FormItem className="half-middle"
 					                            {...formItemLayout}
-					                            label="上级功能模块" >   
+					                            label="上级功能模块" >
 				                                   <span>{this.state.preName}</span>
 					                    </FormItem>
 				                    </div>
 			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
-			                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+			                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 			                        <Button className="set-submit" type="ghost" onClick={this.nextCancel}>取消</Button>
-			                    </FormItem> 
+			                    </FormItem>
 			                </Spin>
 			            </Form >
-			        </Modal>    
+			        </Modal>
             </div>
 		);
 	}
 }));
 
-export default Jurisdiction;
+export default Jurisdiction;

+ 58 - 58
js/component/manageCenter/set/userManagementS/newUser.jsx

@@ -36,7 +36,7 @@ const PicturesWall = React.createClass({
         this.props.fileList(fileList);
     },
     componentWillReceiveProps(nextProps) {
-        this.state.fileList = nextProps.pictureUrl; 
+        this.state.fileList = nextProps.pictureUrl;
     },
     render() {
         const { previewVisible, previewImage, fileList } = this.state;
@@ -71,7 +71,7 @@ const Newuser = Form.create()(React.createClass({
         return {
         	orgCodeUrl:[],
             loading: false,
-            loaduser: {}, 
+            loaduser: {},
             visible:false,
             datauser:[],
             role:[]
@@ -103,13 +103,13 @@ const Newuser = Form.create()(React.createClass({
         	return false;
         };
         if(this.state.contactMobile){
-        	if(!(/^1[1-9][0-9]\d{4,8}$/.test(this.state.contactMobile))){ 
-			  message.warning("不是完整的11位手机号或者正确的手机号前七位"); 
+        	if(!(/^1[1-9][0-9]\d{4,8}$/.test(this.state.contactMobile))){
+			  message.warning("不是完整的11位手机号或者正确的手机号前七位");
 			  this.setState({
                     loading: false
                 });
 			  return false;
-			} 
+			}
         }
         let theorgCodeUrl = [];
         if (this.state.orgCodeUrl.length) {
@@ -148,7 +148,7 @@ const Newuser = Form.create()(React.createClass({
 					entryTime:this.state.selTime
             	})
             }
-        }).done(function (data) { 
+        }).done(function (data) {
             this.setState({
                 loading: false
             });
@@ -161,7 +161,7 @@ const Newuser = Form.create()(React.createClass({
         }.bind(this));
     },
     //主管初始加载(自动补全)
-	supervisor(e){ 
+	supervisor(e){
 		$.ajax({
             method: "post",
             dataType: "json",
@@ -170,23 +170,23 @@ const Newuser = Form.create()(React.createClass({
             data:{
             	name:e
             },
-            success: function (data) {                	  
+            success: function (data) {
 				       let thedata=data.data;
 				    if (!thedata) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
-                    };	
-                    thedata = {}; 
-              }; 
+                    };
+                    thedata = {};
+              };
 					this.setState({
-						customerArr:thedata,	
+						customerArr:thedata,
                     });
 				}.bind(this),
 			}).always(function () {
             this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
 	},
 	//上级主管输入框失去焦点是判断客户是否存在
 	selectAuto(value,options){
@@ -202,7 +202,7 @@ const Newuser = Form.create()(React.createClass({
                 if (item.name == e.toString()) {
                     theType = item.id;
                 }
-           });     
+           });
    	   }
 		this.setState({
 			theName:e,
@@ -212,7 +212,7 @@ const Newuser = Form.create()(React.createClass({
 	//值改变时请求客户名称
 	httpChange(e){
 		if(e.length>=1){
-			this.supervisor(e); 
+			this.supervisor(e);
 		}
 		this.setState({
 			superior:e
@@ -230,7 +230,7 @@ const Newuser = Form.create()(React.createClass({
               id: record.id
             },
             success: function (data) {
-                let thisdata = data.data;                
+                let thisdata = data.data;
                 if (!thisdata) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
@@ -260,13 +260,13 @@ const Newuser = Form.create()(React.createClass({
                 });
             }.bind(this),
        }).always(function () {
-            this.setState({            	
+            this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
        }
     },
-    
+
     //重置密码
     resetPwd() {
         this.setState({
@@ -318,11 +318,11 @@ const Newuser = Form.create()(React.createClass({
         cityArr.map(function (item) {
             cityArrs.push(
                 <Select.Option key={item.value}>{item.key}</Select.Option>
-            )                    
+            )
         });
         this.state.cityOption=cityArrs;
     },
-    componentWillReceiveProps(nextProps) {    	
+    componentWillReceiveProps(nextProps) {
 		if(nextProps.userDetaile&&nextProps.datauser.id){
 			this.loaduser(nextProps.datauser)
 			this.setState({
@@ -345,16 +345,16 @@ const Newuser = Form.create()(React.createClass({
 			this.state.id='';
 			this.state.rolek=[];
 			this.state.entryTime=undefined;
-    	   } 
+    	   }
 		   this.state.visible = nextProps.showDesc;
-		   
+
       },
     render() {
         const FormItem = Form.Item
         const formItemLayout = {
             labelCol: { span: 8 },
             wrapperCol: { span: 14 },
-        };  
+        };
         const dataSources=this.state.customerArr || [];
         const options = dataSources.map((group,index) =>
 				      <Select.Option key={index} value={group.name}>{group.name}</Select.Option>
@@ -367,7 +367,7 @@ const Newuser = Form.create()(React.createClass({
            <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.handleOk} onCancel={this.handleCancel}
                         width='800px'
-                        title={this.props.userDetaile?'用户详情':'新建用户'}                      
+                        title={this.props.userDetaile?'用户详情':'新建用户'}
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form">
@@ -376,7 +376,7 @@ const Newuser = Form.create()(React.createClass({
 			                            <div className="clearfix">
 					                    	<FormItem className="half-item"
 						                            {...formItemLayout}
-						                            label="用户名" >   
+						                            label="用户名" >
 					                                    <Input placeholder="输入登录用户名" value={this.state.mobile}
 					                                    onChange={(e)=>{this.setState({mobile:e.target.value})}} required="required" style={{width:'200px'}}/>
 					                                <span className="mandatory">*</span>
@@ -394,7 +394,7 @@ const Newuser = Form.create()(React.createClass({
 					                     <FormItem className="half-item"
 						                        {...formItemLayout}
 					                           label="用户角色"
-					                         > 
+					                         >
 					                                <Select
                                                         mode="tags"
                                                         tokenSeparators={[',']}
@@ -414,18 +414,18 @@ const Newuser = Form.create()(React.createClass({
 											        </Select>
 					                                <span className="mandatory">*</span>
 			                   		    </FormItem>
-			                   		    
+
 			                   		    <FormItem className="half-item"
 						                        {...formItemLayout}
 					                           label=""
-					                         > 
+					                         >
 					                         <span style={{display:rolst.length>1?'block':'none',color:'red'}}>存在多个角色</span>
 					                    </FormItem>
 			                   		    {this.props.userDetaile?<FormItem className="half-item"
 						                            {...formItemLayout}
-						                            label="用户状态" >   
+						                            label="用户状态" >
 					                                    <Select placeholder="用户状态" value={this.state.status} style={{width:'200px'}}
-												          onChange={(e)=>{this.setState({status:e})}} > 
+												          onChange={(e)=>{this.setState({status:e})}} >
 					                                      	 <Select.Option value="正常" >正常</Select.Option>
 	                           								 <Select.Option value="注销" >注销</Select.Option>
 	                           								 <Select.Option value="锁定" >锁定</Select.Option>
@@ -434,20 +434,20 @@ const Newuser = Form.create()(React.createClass({
 						                </FormItem>:''}
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="用户姓名" >   
+					                            label="用户姓名" >
 				                                    <Input placeholder="请输入用户姓名" style={{width:'200px'}} value={this.state.name}
-					                                    onChange={(e)=>{this.setState({name:e.target.value})}} required="required"/> 
+					                                    onChange={(e)=>{this.setState({name:e.target.value})}} required="required"/>
 				                                    <span className="mandatory">*</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="联系方式" >   
+					                            label="联系方式" >
 				                                    <Input placeholder="请输入手机号" style={{width:'200px'}} value={this.state.contactMobile}
-					                                    onChange={(e)=>{this.setState({contactMobile:e.target.value})}} /> 
-					                    </FormItem> 
+					                                    onChange={(e)=>{this.setState({contactMobile:e.target.value})}} />
+					                    </FormItem>
 					                    {/*<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="入职时间" >   
+				                            label="入职时间" >
 				                            <DatePicker
 				                              style={{marginTop:'0',width:'200px',height:'32px'}}
 										      showTime
@@ -459,7 +459,7 @@ const Newuser = Form.create()(React.createClass({
 			                    		</FormItem>*/}
 					                    {window.adminData.isSuperAdmin?<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="组织部门" >   
+					                            label="组织部门" >
 				                                    <Select placeholder="选择组织部门"
 							                            style={{ width: 200 }}
 							                            value={this.state.departmentId}
@@ -472,11 +472,11 @@ const Newuser = Form.create()(React.createClass({
 							                        </Select>
 				                                    <span className="mandatory">*</span>
 					                    </FormItem>:''}
-					                    <FormItem className="half-item" 
+					                    <FormItem className="half-item"
 					                          {...formItemLayout}
 					                           label="职务"
-					                         > 
-												  <Select placeholder="选择职务" style={{width:'200px'}} value={this.state.duty} onChange={(e)=>{this.setState({duty:e})}}> 
+					                         >
+												  <Select placeholder="选择职务" style={{width:'200px'}} value={this.state.duty} onChange={(e)=>{this.setState({duty:e})}}>
 					                                {
 					                                    post.map(function (item) {
 					                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -484,11 +484,11 @@ const Newuser = Form.create()(React.createClass({
 					                                }
 					                              </Select>
 			                   		    </FormItem>
-			                   		    <FormItem className="half-item" 
+			                   		    <FormItem className="half-item"
 					                          {...formItemLayout}
 					                           label="岗位"
-					                         > 
-												  <Select placeholder="选择岗位" style={{width:'200px'}} value={this.state.position} onChange={(e)=>{this.setState({position:e})}}> 
+					                         >
+												  <Select placeholder="选择岗位" style={{width:'200px'}} value={this.state.position} onChange={(e)=>{this.setState({position:e})}}>
 					                                {
 					                                    station.map(function (item) {
 					                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -498,10 +498,10 @@ const Newuser = Form.create()(React.createClass({
 			                   		    </FormItem>
 					                    <FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="电子邮箱" >   
+					                            label="电子邮箱" >
 				                                    <Input placeholder="请输入邮箱" style={{width:'200px'}} value={this.state.email}
-					                                    onChange={(e)=>{this.setState({email:e.target.value})}} /> 
-					                    </FormItem> 
+					                                    onChange={(e)=>{this.setState({email:e.target.value})}} />
+					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
 				                             label="上级主管"
@@ -522,16 +522,16 @@ const Newuser = Form.create()(React.createClass({
 											        onSelect={this.selectAuto}
 											      >
 											        <Input/>
-											      </AutoComplete> 
+											      </AutoComplete>
 											      <span className="mandatory">*</span>
 							            </FormItem>
 							           {this.props.userDetaile?
 						                    <FormItem className="half-item"
 						                            {...formItemLayout}
-						                            label="用户编号" >   
+						                            label="用户编号" >
 						                            <span>{this.state.userNo}</span>
 						                    </FormItem>
-						                :''} 
+						                :''}
 							            <div className='clearfix'>
 							            	<FormItem className="half-item"
 						                        {...formItemLayout}
@@ -539,7 +539,7 @@ const Newuser = Form.create()(React.createClass({
 												   <Select
 						                                multiple
 						                                style={{width:'500px'}}
-						                                placeholder="选择地区"                               
+						                                placeholder="选择地区"
 						                                filterOption={(input, option) => { return option.props.children.indexOf(input) >= 0 }}
 						                                value={this.state.district}
 						                                onChange={(pids) => {
@@ -551,9 +551,9 @@ const Newuser = Form.create()(React.createClass({
 						                            >
 						                               {this.state.cityOption}
 						                            </Select>
-						                    </FormItem>	
+						                    </FormItem>
 							            </div>
-							            
+
 							             <div className="clearfix pictures">
 						                        <FormItem
 							                        labelCol={{ span: 4 }}
@@ -566,18 +566,18 @@ const Newuser = Form.create()(React.createClass({
 							                            pictureUrl={this.state.orgCodeUrl} />
 							                            <p>图片建议:要清晰。</p>
 						                        </FormItem>
-							                </div> 
+							                </div>
 				                    </div>
 			                    <FormItem wrapperCol={{ span: 12, offset: 4 }}>
-			                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+			                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 			                        <Button className="set-submit" type="ghost" onClick={this.handleCancel}>取消</Button>
-			                    </FormItem> 
+			                    </FormItem>
 			                </Spin>
 			            </Form >
-			        </Modal>    
+			        </Modal>
     	    </div>
         )
     }
 }));
 
-export default Newuser;
+export default Newuser;

+ 21 - 17
js/component/manageCenter/set/userManagementS/roles.jsx

@@ -43,6 +43,9 @@ const Roles=Form.create()(React.createClass({
 	                         createTime:thisdata.createTimez,
                         });
                     };
+                    this.setState({
+                        page: data.data.pageNo
+                    })
                     this.state.pagination.current = data.data.pageNo;
                     this.state.pagination.total = data.data.totalCount;
                 };
@@ -68,6 +71,7 @@ const Roles=Form.create()(React.createClass({
             selectedRowKeys: [],
             selectedRows: [],
             loading: false,
+            page: 1,
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -154,7 +158,7 @@ const Roles=Form.create()(React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            
+
         }.bind(this));
     },
 	 //点击离职资源配置保存
@@ -172,7 +176,7 @@ const Roles=Form.create()(React.createClass({
             data: {
             	rid:this.state.rid,
             	resources:this.state.resources.join(","),
-                
+
             }
         }).done(function (data) {
             if (!data.error.length) {
@@ -184,7 +188,7 @@ const Roles=Form.create()(React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            
+
         }.bind(this));
     },
     componentWillMount() {
@@ -219,7 +223,7 @@ const Roles=Form.create()(React.createClass({
             	data:JSON.stringify(
             		deletedIds
             	)
-                
+
             }
         }).done(function (data) {
             if (!data.error.length) {
@@ -230,7 +234,7 @@ const Roles=Form.create()(React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.page);
         }.bind(this));
     },
     addClick() {
@@ -251,7 +255,7 @@ const Roles=Form.create()(React.createClass({
     },
     reset() {
     	this.state.roleNameSearch='';
-        this.loadData();       
+        this.loadData();
     },
     changeList(arr) {
         const newArr = [];
@@ -273,7 +277,7 @@ const Roles=Form.create()(React.createClass({
 	                this.setState({
 	                    selectedRows: selectedRows.slice(-1),
 	                    selectedRowKeys: selectedRowKeys.slice(-1)
-	                }); 
+	                });
             },
             onSelectAll: (selected, selectedRows, changeRows) => {
 			   this.setState({
@@ -300,7 +304,7 @@ const Roles=Form.create()(React.createClass({
 	                    <Button type="danger"
 	                        disabled={!hasSelected}
 	                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
-	                   
+
                     </div>
                     </TabPane>
                         <TabPane tab="新增用户" key="2">
@@ -341,30 +345,30 @@ const Roles=Form.create()(React.createClass({
                     <Modal maskClosable={false} visible={this.state.visible2}
                         onOk={this.checkResources} onCancel={this.handleCancel2}
                         width='600px'
-                        title='离职转交配置'                       
+                        title='离职转交配置'
                         footer=''
                         className="admin-desc-content">
                          <Form horizontal onSubmit={this.resourcesSubmit} id="add-form">
 			                <Spin spinning={this.state.loading}>
-			                	<FormItem  
+			                	<FormItem
 		                         	labelCol={{ span: 10 }}
 			                        wrapperCol={{ span: 4 }}
 		                           	label="角色名称"
-		                         >    
-									{this.state.name}	                               
+		                         >
+									{this.state.name}
 		                   		 </FormItem>
-			                    <FormItem  
+			                    <FormItem
 		                         	labelCol={{ span: 10 }}
 			                        wrapperCol={{ span: 4 }}
 		                           	label="请选择离职转交配置"
-		                         >    
+		                         >
 	                              <CheckboxGroup options={roleResources} value={this.state.resources} onChange={(e)=>{this.setState({resources:e})}} />
-	                               
+
 		                   		 </FormItem>
 			                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-			                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>  
+			                        <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
 			                        <Button className="set-submit" type="ghost" onClick={this.handleCancel2} style={{marginLeft:'100px'}}>取消</Button>
-			                    </FormItem> 
+			                    </FormItem>
 			                </Spin>
 			            </Form >
                     </Modal>

+ 18 - 18
js/component/manageCenter/statistics/order/index.jsx

@@ -88,7 +88,7 @@ const Order = React.createClass({
                             mid:thisdata.mid,
                             deptName:thisdata.deptName,
                             type:thisdata.type,
-                            saleName:thisdata.saleName,  
+                            saleName:thisdata.saleName,
                             proofCount:thisdata.proofCount,
                             amount:thisdata.amount
                         });
@@ -136,13 +136,13 @@ const Order = React.createClass({
                 {
                     title: '序号',
                     dataIndex: 'id',
-                    key: 'id',  
+                    key: 'id',
                 },
                 {
                     title: '订单部门',
                     dataIndex: 'deptName',
                     key: 'deptName',
-                }, 
+                },
                 {
                     title: '订单类型',
                     dataIndex: 'type',
@@ -277,7 +277,7 @@ const Order = React.createClass({
         }
         window.location.href=(globalConfig.context+'/api/admin/bonus/exportOrderData?'+$.param(data));
     },
-    render() { 
+    render() {
         const { RangePicker } = DatePicker;
         let departmentArr = this.state.departmentArr || [];
         const recard = this.state.recard || {};
@@ -298,7 +298,7 @@ const Order = React.createClass({
                     </Select>
                     <Input placeholder="签单人员"
                         value={this.state.signName}
-                        onChange={(e) => { this.setState({ signName: e.target.value }); }} /> 
+                        onChange={(e) => { this.setState({ signName: e.target.value }); }} />
                     <Select placeholder="订单类型"
                         style={{ width: 150 ,marginRight:10}}
                         value={this.state.orderType}
@@ -308,7 +308,7 @@ const Order = React.createClass({
                                     return <Select.Option key={item.value} >{item.key}</Select.Option>
                             })
                         }
-                    </Select>   
+                    </Select>
                     <span>起止时间 :</span>
                     <RangePicker
                         format="YYYY-MM"
@@ -326,7 +326,7 @@ const Order = React.createClass({
                             showUploadList={false}
                             onChange={(info) => {
                                 if (info.file.status !== 'uploading') {
-                                    
+
                                 }
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {
@@ -344,7 +344,7 @@ const Order = React.createClass({
                         </Upload>*/}
                         <Button type="primary" onClick={this.exec} style={{margin:'0 10px'}}>导出到excel</Button>
                     </div>
-                    
+
                 </div>
                 <div className="patent-table clearfix" id="table">
                     <Spin spinning={this.state.loading}>
@@ -356,29 +356,29 @@ const Order = React.createClass({
                             />
                     </Spin>
                 </div>
-                <Modal visible={this.state.boHuiVisible} 
-                        width="400px" 
+                <Modal maskClosable={false} visible={this.state.boHuiVisible}
+                        width="400px"
                         title='修改单量'
                         footer=''
-                        onOk={this.boHuiOk} 
+                        onOk={this.boHuiOk}
                         onCancel={this.boHuiCancel}
                 >
                     <Form layout="horizontal" onSubmit={this.boHuiSubmit}>
 			                <Spin spinning={this.state.loading}>
                                 <FormItem labelCol={{ span: 8 }} wrapperCol={{ span: 10 }} label={<span><strong style={{color:'#f00'}}>*</strong>单量校对结果</span>}>
-                                    <InputNumber min={0} max={1} placeholder="输入单量" 
+                                    <InputNumber min={0} max={1} placeholder="输入单量"
                                         value={this.state.result}
                                         onChange={(e)=>{this.setState({result:e})}}
                                     />
-                                </FormItem>   
+                                </FormItem>
                                 <FormItem labelCol={{ span: 8 }} wrapperCol={{ span: 10 }} label={<span><strong style={{color:'#f00'}}>*</strong>金额</span>}>
-                                    <InputNumber min={0} max={9999} placeholder="金额" 
+                                    <InputNumber min={0} max={9999} placeholder="金额"
                                         value={this.state.amount}
                                         onChange={(e)=>{this.setState({amount:e})}}
                                     />
                                     <span> 万元</span>
-                                </FormItem> 
-                                <FormItem wrapperCol={{ span: 12, offset:8 }}>  
+                                </FormItem>
+                                <FormItem wrapperCol={{ span: 12, offset:8 }}>
                                     <Button type="primary" htmlType="submit"  style={{marginRight:20}}>修改</Button>
                                     <Button type="default" onClick={()=>{this.boHuiCancel()}}>取消</Button>
                                 </FormItem>
@@ -388,5 +388,5 @@ const Order = React.createClass({
         </div> )
     }
 })
- 
-export default Order;
+
+export default Order;

+ 1 - 0
js/component/manageCenter/statistics/personnel/addPicModal.jsx

@@ -53,6 +53,7 @@ const AddPicModal = React.createClass({
   render() {
     return (
       <Modal
+        maskClosable={false}
         visible={this.props.visible}
         width={400}
         okText={"保存"}

+ 1 - 0
js/component/manageCenter/statistics/personnel/bonusList.jsx

@@ -214,6 +214,7 @@ const BonusList = React.createClass({
           size="small"
         />
         <Modal
+          maskClosable={false}
           visible={this.state.visible}
           footer={null}
           width={600}

+ 10 - 6
js/component/manageCenter/statistics/personnel/personnelAll.jsx

@@ -651,7 +651,7 @@ const PersonnelAll = React.createClass({
     for(let key in data) {
       if(!data[key]) {
         delete data[key]
-        
+
       }
     }
     window.location.href =
@@ -2332,6 +2332,7 @@ const PersonnelAll = React.createClass({
           </Spin>
         </div>
         <Modal
+          maskClosable={false}
           visible={this.state.visible}
           footer={null}
           width={1000}
@@ -2346,10 +2347,9 @@ const PersonnelAll = React.createClass({
                 type="primary"
                 style={{
                   float: "right",
-                  marginTop: 10,
-                  position: "absolute",
-                  top: 30,
-                  right: 15,
+                  position:'absolute',
+                  right: '20px',
+                  top: '63px',
                   zIndex: 1,
                   display: this.state.detailFlag ? "block" : "none"
                 }}
@@ -2376,7 +2376,7 @@ const PersonnelAll = React.createClass({
             </h2>
             <Button
               type="primary"
-              style={{ position: "absolute", top: 25 }}
+              style={{ marginBottom: 15}}
               onClick={(e) => {
                 this.setState({ detailFlag: !this.state.detailFlag });
               }}
@@ -3764,6 +3764,7 @@ const PersonnelAll = React.createClass({
             )}
           </Spin>
           <Modal
+            maskClosable={false}
             visible={this.state.peoVisible}
             onOk={this.checkOk}
             footer={null}
@@ -4115,6 +4116,7 @@ const PersonnelAll = React.createClass({
           </Modal>
         </Modal>
         <Modal
+          maskClosable={false}
           visible={this.state.peoVisible}
           onOk={this.checkOk}
           footer={null}
@@ -4449,6 +4451,7 @@ const PersonnelAll = React.createClass({
           </Spin>
         </Modal>
         <Modal
+          maskClosable={false}
           visible={this.state.stayVisible}
           footer={null}
           width={800}
@@ -4700,6 +4703,7 @@ const PersonnelAll = React.createClass({
           </Spin>
         </Modal>
         <Modal
+          maskClosable={false}
           visible={this.state.phoneVisible}
           footer={null}
           width={800}

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.1.61",
+  "version": "1.1.64",
   "description": "",
   "main": "index.js",
   "scripts": {