liting2017 il y a 7 ans
Parent
commit
df27888737
25 fichiers modifiés avec 3522 ajouts et 1458 suppressions
  1. 20 1
      js/component/manageCenter/customer/content.jsx
  2. 0 37
      js/component/manageCenter/customer/customerData/companyCustomer.jsx
  3. 6 43
      js/component/manageCenter/customer/customerData/myClient.jsx
  4. 1 275
      js/component/manageCenter/customer/customerManagement/expertManage.jsx
  5. 3 240
      js/component/manageCenter/customer/customerManagement/organizationManages.jsx
  6. 11 275
      js/component/manageCenter/customer/customerManagement/personalManages.jsx
  7. 2 203
      js/component/manageCenter/customer/customerManagement/publicManages.jsx
  8. 1 275
      js/component/manageCenter/customer/customerManagement/publicManagesOne.jsx
  9. 1 1
      js/component/manageCenter/customer/customerService/businessManges.jsx
  10. 35 8
      js/component/manageCenter/customer/customerService/myBusiness.jsx
  11. 4 5
      js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx
  12. 437 0
      js/component/manageCenter/customer/individualCustomer/myReject.jsx
  13. 396 0
      js/component/manageCenter/customer/individualCustomer/myRejectOne.jsx
  14. 442 0
      js/component/manageCenter/customer/reviewed/enteringAudit.jsx
  15. 402 0
      js/component/manageCenter/customer/reviewed/enteringAuditOne.jsx
  16. 1 1
      js/component/manageCenter/customer/reviewed/identityAudits.jsx
  17. 5 4
      js/component/manageCenter/order/myOrder/addService.jsx
  18. 1 1
      js/component/manageCenter/order/userMangagement.less
  19. 5 2
      js/component/manageCenter/servicesManage/projectOrder/content.jsx
  20. 135 71
      js/component/manageCenter/servicesManage/projectOrder/projectOrder.jsx
  21. 52 13
      js/component/manageCenter/servicesManage/projectOrder/projectOrderDetaile.jsx
  22. 525 0
      js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx
  23. 553 0
      js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx
  24. 481 0
      package-lock.json
  25. 3 3
      webpack.config.js

+ 20 - 1
js/component/manageCenter/customer/content.jsx

@@ -58,6 +58,16 @@ class Content extends Component {
                     });
                 });
                 break; 
+            //我的被拒绝客户
+            case 'myReject':
+                require.ensure([], () => {
+                    const MyReject = require('./individualCustomer/myReject').default;
+                    this.setState({
+                        component: <MyReject />                      
+                      
+                    });
+                });
+                break; 
             //个人客户查询
             case 'personalQuery':
                 require.ensure([], () => {
@@ -112,7 +122,7 @@ class Content extends Component {
 	                });
           	    });
           	    break;
-          	//实名认证
+          	//实名认证审核
           	case 'identityAudit':
                 require.ensure([], () => {
 	                const IdentityAudits = require('./reviewed/identityAudits').default;
@@ -121,6 +131,15 @@ class Content extends Component {
 	                });
           	    });
           	    break;
+          	//客户录入审核
+          	case 'enteringAudit':
+                require.ensure([], () => {
+	                const EnteringAudit = require('./reviewed/enteringAudit').default;
+	                this.setState({
+	                    component:<EnteringAudit />,	                    	                  
+	                });
+          	    });
+          	    break;
           	//专家发布
           	case 'expertPublish':
                 require.ensure([], () => {

+ 0 - 37
js/component/manageCenter/customer/customerData/companyCustomer.jsx

@@ -477,12 +477,6 @@ const PublicCustomer = Form.create()(React.createClass({
 					key: 'adminName',
 				},
 				{
-					title: '业务认证',
-					dataIndex: 'businessAudit',
-					key: 'businessAudit',
-					render: text => { return getCertification(text) }
-				},
-				{
 					title: '实名认证',
 					dataIndex: 'auditStatus',
 					key: 'auditStatus',
@@ -506,18 +500,6 @@ const PublicCustomer = Form.create()(React.createClass({
 					dataIndex: 'international',
 					key: 'international',
 					render: text => { return getWhether(text) }
-				},
-				{
-					title: '会员等级',
-					dataIndex: 'lvl',
-					key: 'lvl',
-					render: text => { return getLvl(text) }
-				},
-				{
-					title: '会员状态',
-					dataIndex: 'currentMemberStatus',
-					key: 'currentMemberStatus',
-					render: text => { return getCurrentMember(text) }
 				}
 			],
 			data: [],
@@ -1250,13 +1232,6 @@ const PublicCustomer = Form.create()(React.createClass({
 	                            {this.state.intentionalOption}
 	                        </Select>
 	                        <span>认证:</span>
-	                        <Select placeholder="业务认证"
-	                            style={{ width: 100 }}
-	                            value={this.state.serviceCertificationSearch}
-	                            onChange={(e) => { this.setState({ serviceCertificationSearch: e }) }}>
-	                            <Select.Option value="0" >未认证</Select.Option>
-	                            <Select.Option value="1" >已认证</Select.Option>
-	                        </Select>
 	                        <Select placeholder="实名认证"
 	                            style={{ width: 100 }}
 	                            value={this.state.userCertificationSearch}
@@ -1292,18 +1267,6 @@ const PublicCustomer = Form.create()(React.createClass({
 	                            <Select.Option value="1" >是</Select.Option>
 	                        </Select>
 	                        <span>会员:</span>
-	                        <Select placeholder="会员等级"
-	                            style={{ width: 100 }}
-	                            value={this.state.lvlSearch}
-	                            onChange={(e) => { this.setState({ lvlSearch: e }) }}>
-	                            {this.state.lvlArrOption}
-	                        </Select> 
-	                        <Select placeholder="会员状态"
-	                            style={{ width: 100 }}
-	                            value={this.state.currentMemberStatusSearch}
-	                            onChange={(e) => { this.setState({ currentMemberStatusSearch: e }) }}>
-	                            {this.state.currentMemberArrOption}
-	                        </Select>
 	                        <Select placeholder="社会性质"
 	                            style={{ width: 100 }}
 	                            value={this.state.societyTagSearch}

+ 6 - 43
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -534,12 +534,6 @@ const MyClient = Form.create()(React.createClass({
 					key: 'createTime',
 				},
 				{
-					title: '业务认证',
-					dataIndex: 'businessAudit',
-					key: 'businessAudit',
-					render: text => { return getCertification(text) }
-				},
-				{
 					title: '实名认证',
 					dataIndex: 'auditStatus',
 					key: 'auditStatus',
@@ -565,18 +559,6 @@ const MyClient = Form.create()(React.createClass({
 					render: text => { return getWhether(text) }
 				},
 				{
-					title: '会员等级',
-					dataIndex: 'lvl',
-					key: 'lvl',
-					render: text => { return getLvl(text) }
-				},
-				{
-					title: '会员状态',
-					dataIndex: 'currentMemberStatus',
-					key: 'currentMemberStatus',
-					render: text => { return getCurrentMember(text) }
-				},
-				{
 					title: '账户状态',
 					dataIndex: 'status',
 					key: 'status',
@@ -1049,8 +1031,8 @@ const MyClient = Form.create()(React.createClass({
 						postalAddress: this.state.postalAddress,
 						contactsFixedTel: this.state.contactsFixedTel,
 						contactsFax: this.state.contactsFax,
-						registeredCapital: this.state.registeredCapital,
-						enterpriseScale: this.state.enterpriseScale,
+						registeredCapital: this.state.registeredCapital?this.state.registeredCapital:0,
+						enterpriseScale: this.state.enterpriseScale?this.state.enterpriseScale:0,
 						legalPerson: this.state.legalPerson,
 						legalPersonIdCard: this.state.legalPersonIdCard,
 						legalPersonTel: this.state.legalPersonTel,
@@ -1063,12 +1045,12 @@ const MyClient = Form.create()(React.createClass({
 						orgCode: this.state.orgCode,
 						businessScope: this.state.businessScope,
 						introduction: this.state.introduction,
-						companyLogoUrl: thecompanyLogoUrl,
-						orgCodeUrl: theorgCodeUrl,
+						companyLogoUrl: thecompanyLogoUrl!=0?thecompanyLogoUrl:'',
+						orgCodeUrl: theorgCodeUrl!=0?theorgCodeUrl:'',
 						investment: this.state.investment,
 						businessAudit: this.state.businessAudit,
 						auditStatus: this.state.auditStatus
-					}
+				    }
 				}).done(function(data) {
 					this.setState({
 						loading: false
@@ -2133,13 +2115,6 @@ const MyClient = Form.create()(React.createClass({
 	                            {this.state.intentionalOption}
 	                        </Select>
 	                        <span>认证:</span>
-	                        <Select placeholder="业务认证"
-	                            style={{ width: 100 }}
-	                            value={this.state.serviceCertificationSearch}
-	                            onChange={(e) => { this.setState({ serviceCertificationSearch: e }) }}>
-	                            <Select.Option value="0" >未认证</Select.Option>
-	                            <Select.Option value="1" >已认证</Select.Option>
-	                        </Select>
 	                        <Select placeholder="实名认证"
 	                            style={{ width: 100 }}
 	                            value={this.state.userCertificationSearch}
@@ -2182,19 +2157,7 @@ const MyClient = Form.create()(React.createClass({
 	                            <Select.Option value="0" >否</Select.Option>
 	                            <Select.Option value="1" >是</Select.Option>
 	                        </Select>
-	                        <Select placeholder="会员等级"
-	                            style={{ width: 100 }}
-	                            value={this.state.lvlSearch}
-	                            onChange={(e) => { this.setState({ lvlSearch: e }) }}>
-	                            {this.state.lvlArrOption}
-	                        </Select>  
-	                        <Select placeholder="会员状态"
-	                            style={{ width: 100 }}
-	                            value={this.state.currentMemberStatusSearch}
-	                            onChange={(e) => { this.setState({ currentMemberStatusSearch: e }) }}>
-	                            {this.state.currentMemberArrOption}
-	                        </Select>
-	                        <Select placeholder="社会性质"
+	                       	<Select placeholder="社会性质"
 	                            style={{ width: 100 }}
 	                            value={this.state.societyTagSearch}
 	                            onChange={(e) => { this.setState({ societyTagSearch: e }) }}>

+ 1 - 275
js/component/manageCenter/customer/customerManagement/expertManage.jsx

@@ -1974,14 +1974,6 @@ const QueryCustomer = Form.create()(React.createClass({
 	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
-                    <span style={{marginRight:'10px'}}>客户类型:</span>
-                    <Select placeholder="选择客户类型"
-                        style={{ width: 100 }}
-                        value={this.state.shareTypeSearch}
-                        onChange={(e) => { this.setState({ shareTypeSearch: e }) }}>
-                        <Select.Option value="" >所有客户</Select.Option>
-                        <Select.Option value="1" >公共客户</Select.Option>
-                    </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>                                    					
 					{adminData.isSuperAdmin?<Button type='danger' style={{marginRight:'10px' ,marginLeft:'10px',display:adminData.isSuperAdmin?'inline-block':'none'}}
@@ -2072,7 +2064,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			        >				    
 					     <Tabs onChange={this.callback} activeKey={this.state.callnub}>
 						    <TabPane tab="基本信息" key="1">
-						        {adminData.isSuperAdmin?<Form horizontal onSubmit={this.newSubmit} id="demand-form">
+						        <Form horizontal onSubmit={this.newSubmit} id="demand-form">
 					                <Spin spinning={this.state.loading}>
 						               	<div className="clearfix" >
 					                    	<FormItem className="half-item"
@@ -2317,273 +2309,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                        <Button className="set-submit" type="ghost" onClick={this.detailsModal}>取消</Button>
 					                    </div>		                	
 								    </Spin>
-								</Form>:
-								<Form horizontal  id="demand-form">
-								    <Spin spinning={this.state.loading}>
-						               	<div className="clearfix" >
-					                    	<FormItem className="half-item"
-							                    {...formItemLayout}
-							                    label="客户姓名"
-						                        >
-					                    	    <span>{theInformation.identifyName}</span>
-						                    </FormItem>
-					                    </div>
-					                    <div className="clearfix" >
-					                    	<FormItem className="half-item" 
-					                         {...formItemLayout}
-					                        label="行业"
-					                         > 
-				                                <span>{getIndustryType(this.state.industry)}</span>
-					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
-					                           {...formItemLayout}
-					                           label="社会属性"
-					                           > 
-					                           <span>{getSocialAttribute(theInformation.societyTag)}</span>
-					                   		 </FormItem>
-					                   		 <FormItem className="half-item"
-						                   			 {...formItemLayout}
-							                           label="业务认证"
-						                   		>
-									                <span>{parseInt(this.state.businessAudit)?'已认证':'未认证'}</span>
-									            </FormItem>
-									            <FormItem className="half-item" 
-									            	{...formItemLayout}
-							                        label="实名认证"
-									            >
-							                        <span>{getAuditStatus(this.state.auditStatus)}</span> 
-									            </FormItem>
-					                   		 <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="专家"
-								                > 
-								                  <span>{parseInt(this.state.expert)?'是':'否'}</span> 
-								            </FormItem>
-								            <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="明星"
-								                > 
-								                  <span>{parseInt(this.state.celebrity)?'是':'否'}</span> 
-								            </FormItem>
-								            <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="会员"
-								            > 
-								                  <span>{parseInt(this.state.isMember)?'是':'否'}</span> 
-								             </FormItem>
-								             <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="咨询师"
-								            > 
-								                  <span>{parseInt(this.state.consultant)?'是':'否'}</span> 
-								             </FormItem>
-								             <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="国际化"
-								            >   	
-								                  <span>{parseInt(this.state.international)?'是':'否'}</span> 
-								             </FormItem>
-					                   		 <FormItem className="half-item" 
-						                           {...formItemLayout}
-						                           label="性别"
-						                         > 
-								                  <span>{this.state.sex}</span> 
-					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
-						                           {...formItemLayout}
-						                           label="出生日期"
-					                          > 
-					                           	 <span>{this.state.yearMonth}</span>
-						                     </FormItem>
-						                     <FormItem className="half-item" 
-							                    	{...formItemLayout}
-							                        label="身份证号码"
-					                           	 >
-						                            <span>{theInformation.legalPersonIdCard}</span>
-						                     </FormItem>
-						                     <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="主要联系人"
-					                           	 >
-						                         <span>{theInformation.contacts}</span>
-						                     </FormItem>
-						                     <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="主要联系人号码"
-					                           	 >	                          
-						                         <span>{theInformation.contactMobile}</span>
-						                     </FormItem>
-						                     
-					                        <FormItem className="half-item" 
-					                           {...formItemLayout}
-					                           label="省-市-区"
-					                          > 
-					                           <span>{this.state.proviceCityArea}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-									                {...formItemLayout}
-							                        label="投资机构"
-									                > 
-									                <span>{this.state.investment?'是':'否'}</span>
-								            </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="职称名字"
-					                           	 >
-						                        <span>{this.state.professionalTitle}</span>                    
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="就业单位"
-					                           	 >
-						                        <span>{this.state.workUnit}</span>       
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="学历"
-					                           	 >
-						                    		 <span>{this.state.education}</span> 
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="毕业院校"
-					                           	 >
-						                    		 <span>{this.state.graduateSchool}</span> 
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="专业类别"
-					                           	 >
-						                   		 <span>{this.state.majorCategory}</span> 
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="职业资格"
-					                           	 >
-						                   	    <span>{this.state.qualification}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="通信地址"
-						                            >
-						                             <span>{theInformation.postalAddress}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="手机号码"
-						                            >
-						                             <span>{theInformation.modile}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                        label="客户传真"
-						                            >
-						                             <span>{theInformation.contactsFax}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="固定电话"
-						                            >
-						                            <span>{theInformation.contactsFixedTel}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="客户QQ"
-						                            >
-						                             <span>{theInformation.qq}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="电子邮箱"
-						                            >
-						                              <span>{theInformation.email}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-								                    	 {...formItemLayout}
-								                         label="咨询费用"
-							                            >
-						                   		<span>{theInformation.consultationPrice}</span>
-							                    </FormItem>
-						                    <div className='clearfix'>
-							                    <FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="客户简介" >
-							                        <span>{theInformation.introduction}</span>
-							                    </FormItem>
-						                    </div>
-						                     <div className="clearfix pictures">
-						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginLeft:'60px'}}
-							                        labelCol={{ span: 8 }}
-							                        wrapperCol={{ span: 10 }}
-							                        label="身份证正面" >
-							                        <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.orgCodeUrl}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.orgCodeUrl || ''} />
-							                            </Modal>
-							                        </div>      
-						                        </FormItem>
-						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px'}}
-							                        labelCol={{ span: 8 }}
-							                        wrapperCol={{ span: 10 }}
-							                        label="身份证反面" > 
-							                         <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.companyLogoUrl}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.companyLogoUrl || ''} />
-							                            </Modal>
-							                        </div>     
-							                    </FormItem>
-							                    <FormItem style={{display:'inline-block' ,width:'350px',marginTop:'20px'}}
-							                        labelCol={{ span: 8 }}
-							                        wrapperCol={{ span: 10 }}
-							                        label="客户照片" > 
-							                         <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.companyLogoUrls}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.companyLogoUrls || ''} />
-							                            </Modal>
-							                        </div>          
-							                    </FormItem>
-							                </div> 
-					                    </div>		                	
-								    </Spin>
 								</Form>
-								}
 							</TabPane>
 						    <TabPane tab="联系人信息" key="2">
 						        <div className="clearfix" style={{display:adminData.isSuperAdmin?'block':'none'}}>

+ 3 - 240
js/component/manageCenter/customer/customerManagement/organizationManages.jsx

@@ -534,12 +534,6 @@ const PublicCustomer = Form.create()(React.createClass({
 					key: 'adminName',
 				},
 				{
-					title: '业务认证',
-					dataIndex: 'businessAudit',
-					key: 'businessAudit',
-					render: text => { return getCertification(text) }
-				},
-				{
 					title: '实名认证',
 					dataIndex: 'auditStatus',
 					key: 'auditStatus',
@@ -563,18 +557,6 @@ const PublicCustomer = Form.create()(React.createClass({
 					dataIndex: 'international',
 					key: 'international',
 					render: text => { return getWhether(text) }
-				},
-				{
-					title: '会员等级',
-					dataIndex: 'lvl',
-					key: 'lvl',
-					render: text => { return getLvl(text) }
-				},
-				{
-					title: '会员状态',
-					dataIndex: 'currentMemberStatus',
-					key: 'currentMemberStatus',
-					render: text => { return getCurrentMember(text) }
 				}
 			],
 			data: [],
@@ -2031,14 +2013,6 @@ const PublicCustomer = Form.create()(React.createClass({
 	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
-                     <span style={{marginRight:'10px'}}>客户类型:</span>
-	                        <Select placeholder="选择客户类型"
-	                            style={{ width: 100 }}
-	                            value={this.state.shareTypeSearch}
-	                            onChange={(e) => { this.setState({ shareTypeSearch: e }) }}>
-	                            <Select.Option value="" >所有客户</Select.Option>
-	                            <Select.Option value="1" >公共客户</Select.Option>
-	                        </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>                                         				
 					{adminData.isSuperAdmin?<Button type='danger' style={{marginRight:'10px' ,marginLeft:'10px',display:adminData.isSuperAdmin?'inline-block':'none'}}
@@ -2066,13 +2040,7 @@ const PublicCustomer = Form.create()(React.createClass({
 	                            {this.state.intentionalOption}
 	                        </Select>
 	                        <span>认证:</span>
-	                        <Select placeholder="业务认证"
-	                            style={{ width: 100 }}
-	                            value={this.state.serviceCertificationSearch}
-	                            onChange={(e) => { this.setState({ serviceCertificationSearch: e }) }}>
-	                            <Select.Option value="0" >未认证</Select.Option>
-	                            <Select.Option value="1" >已认证</Select.Option>
-	                        </Select>
+	                        
 	                        <Select placeholder="实名认证"
 	                            style={{ width: 100 }}
 	                            value={this.state.userCertificationSearch}
@@ -2108,18 +2076,6 @@ const PublicCustomer = Form.create()(React.createClass({
 	                            <Select.Option value="1" >是</Select.Option>
 	                        </Select>
 	                        <span>会员:</span>
-	                        <Select placeholder="会员等级"
-	                            style={{ width: 100 }}
-	                            value={this.state.lvlSearch}
-	                            onChange={(e) => { this.setState({ lvlSearch: e }) }}>
-	                            {this.state.lvlArrOption}
-	                        </Select> 
-	                        <Select placeholder="会员状态"
-	                            style={{ width: 100 }}
-	                            value={this.state.currentMemberStatusSearch}
-	                            onChange={(e) => { this.setState({ currentMemberStatusSearch: e }) }}>
-	                            {this.state.currentMemberArrOption}
-	                        </Select>
 	                        <Select placeholder="社会性质"
 	                            style={{ width: 100 }}
 	                            value={this.state.societyTagSearch}
@@ -2154,7 +2110,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			        >				    
 					     <Tabs defaultActiveKey="1" onChange={this.callback} activeKey={this.state.callnub}>
 						    <TabPane tab="基本信息" key="1">
-						        {adminData.isSuperAdmin?<Form horizontal onSubmit={this.newSubmit} id="demand-form">
+						        <Form horizontal onSubmit={this.newSubmit} id="demand-form">
 					                <Spin spinning={this.state.loading}>
 						               	<div className="clearfix" style={{paddingLeft:'60px'}}>
 					                    	<FormItem className="half-item"
@@ -2391,200 +2347,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					                        <Button className="set-submit" type="ghost" onClick={this.detailsModal}>取消</Button>
 					                    </div>		                	
 								    </Spin>
-								</Form>	:<Form horizontal id="demand-form">
-					                <Spin spinning={this.state.loading}>
-						               	<div className="clearfix" style={{paddingLeft:'60px'}}>
-					                    	<FormItem className="half-item"
-							                    labelCol={{ span: 4 }}
-							                    wrapperCol={{ span: 18 }}
-							                    label="客户名称"
-						                        >
-						                        <span>{theInformation.identifyName}</span>
-						                    </FormItem>
-					                    </div>
-					                    <div className="clearfix" style={{paddingLeft:'60px'}}>
-					                    	<FormItem className="half-item" 
-						                         labelCol={{ span: 4 }}
-						                         wrapperCol={{ span: 18 }}
-						                        label="行业"
-						                         > 
-				                             <span>{getIndustry(String(theInformation.industry))}</span>     
-					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
-						                           labelCol={{ span: 4 }}
-						                            wrapperCol={{ span: 18 }}
-						                           label="社会属性"
-						                         > 
-						                       <span>{getSocialAttribute(theInformation.societyTag)}</span>  
-					                   		 </FormItem>
-					                         <FormItem className="half-item" 
-					                           labelCol={{ span: 4 }}
-					                           wrapperCol={{ span: 18 }}
-					                           label="省-市-区"
-					                          > 
-						                  		<span>{this.state.proviceCityArea}</span>
-						                  </FormItem>
-						                   <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                         label="通信地址"
-						                            >
-						                            <span>{theInformation.postalAddress}</span>  
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                         label="固定电话"
-						                            >
-						                            <span>{theInformation.contactsFixedTel}</span>              
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="客户传真"
-						                            >
-						                            <span>{theInformation.contactsFax}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="注册资本"
-						                            >
-						                            <span>{theInformation.registeredCapital}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="单位规模"
-						                            >
-						                            <span>{theInformation.enterpriseScale}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="法人名称"
-						                            >
-						                             <span>{theInformation.legalPerson}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="身份证号码"
-						                            >
-						                            <span>{theInformation.legalPersonIdCard}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="法人电话"
-						                            >
-						                            <span>{theInformation.legalPersonTel}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="电子邮箱"
-						                            >
-						                            <span>{theInformation.legalPersonEmail}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-				                   		   		labelCol={{ span: 4 }}
-					                            wrapperCol={{ span: 18 }}
-					                            label="投资机构"
-					                   		    >
-								                <span>{this.state.investment?'是':'否'}</span>
-								            </FormItem>
-					                   		<FormItem className="half-item"
-				                   		   		labelCol={{ span: 4 }}
-					                            wrapperCol={{ span: 18 }}
-					                            label="高新"
-					                   		    >
-								                <span>{this.state.highTechZone?'是':'否'}</span>
-								            </FormItem>
-					                   	     <FormItem className="half-item"
-				                   		   		labelCol={{ span: 4 }}
-					                            wrapperCol={{ span: 18 }}
-					                            label="上市"
-					                   		    >
-								                   <span>{this.state.listed?'是':'否'}</span>
-										     </FormItem>
-										     <FormItem className="half-item"
-				                   		   		labelCol={{ span: 4 }}
-					                            wrapperCol={{ span: 18 }}
-					                            label="国际化"
-					                   		    >
-								                   <span>{this.state.international?'是':'否'}</span>
-										     </FormItem>
-					                   		 <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="机构代码"
-						                            >
-						                            <span>{theInformation.orgCode}</span>
-						                    </FormItem>
-						                    <div className="clearfix pictures">
-						                        <FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="机构证(PIC)" >
-							                        <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.orgCodeUrl}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.orgCodeUrl || ''} />
-							                            </Modal>
-							                        </div>     
-						                        </FormItem>
-						                        <FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="单位logo" > 
-							                        <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.companyLogoUrl}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.companyLogoUrl || ''} />
-							                            </Modal>
-							                        </div> 
-							                    </FormItem>
-							                </div>
-							                <div className="clearfix">
-							                    <FormItem
-						                        labelCol={{ span: 2 }}
-						                        wrapperCol={{ span: 18 }}
-						                        label="业务范围" >
-						                         <span>{theInformation.businessScope}</span>
-							                    </FormItem>
-							                    <FormItem
-							                        labelCol={{ span: 2 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="单位简介" >
-							                        <span>{theInformation.introduction}</span>
-							                    </FormItem>
-						                    </div> 
-					                    </div>		                	
-								    </Spin>
-								</Form>}	
+								</Form>	
 							</TabPane>
 						    <TabPane tab="联系人信息" key="2">
 						        <div className="clearfix" >

+ 11 - 275
js/component/manageCenter/customer/customerManagement/personalManages.jsx

@@ -1974,14 +1974,6 @@ const QueryCustomer = Form.create()(React.createClass({
 	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
-                    <span style={{marginRight:'10px'}}>客户类型:</span>
-                    <Select placeholder="选择客户类型"
-                        style={{ width: 100 }}
-                        value={this.state.shareTypeSearch}
-                        onChange={(e) => { this.setState({ shareTypeSearch: e }) }}>
-                        <Select.Option value="" >所有客户</Select.Option>
-                        <Select.Option value="1" >公共客户</Select.Option>
-                    </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>                                    					
 					{adminData.isSuperAdmin?<Button type='danger' style={{marginRight:'10px' ,marginLeft:'10px',display:adminData.isSuperAdmin?'inline-block':'none'}}
@@ -2088,7 +2080,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			        >				    
 					     <Tabs onChange={this.callback} activeKey={this.state.callnub}>
 						    <TabPane tab="基本信息" key="1">
-						        {adminData.isSuperAdmin?<Form horizontal onSubmit={this.newSubmit} id="demand-form">
+						        <Form horizontal onSubmit={this.newSubmit} id="demand-form">
 					                <Spin spinning={this.state.loading}>
 						               	<div className="clearfix" >
 					                    	<FormItem className="half-item"
@@ -2296,6 +2288,16 @@ const QueryCustomer = Form.create()(React.createClass({
 								                        <Radio value={1}>是</Radio>
 								                  </Radio.Group>
 								            </FormItem>
+								            <FormItem className="half-item"
+								                {...formItemLayout}
+						                        label="明星"
+								                > 
+						                   		 <Radio.Group value={this.state.expert} onChange={(e) => {
+								                        this.setState({ expert:  e.target.value })
+								                    }}>
+								                        <Radio value={2}>是</Radio>
+								                  </Radio.Group>
+								            </FormItem>
 					                   	</div>
 						                   <div className="clearfix pictures">
 						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginLeft:'60px'}}
@@ -2333,273 +2335,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                        <Button className="set-submit" type="ghost" onClick={this.detailsModal}>取消</Button>
 					                    </div>		                	
 								    </Spin>
-								</Form>:
-								<Form horizontal  id="demand-form">
-								    <Spin spinning={this.state.loading}>
-						               	<div className="clearfix" >
-					                    	<FormItem className="half-item"
-							                    {...formItemLayout}
-							                    label="客户姓名"
-						                        >
-					                    	    <span>{theInformation.identifyName}</span>
-						                    </FormItem>
-					                    </div>
-					                    <div className="clearfix" >
-					                    	<FormItem className="half-item" 
-					                         {...formItemLayout}
-					                        label="行业"
-					                         > 
-				                                <span>{getIndustryType(this.state.industry)}</span>
-					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
-					                           {...formItemLayout}
-					                           label="社会属性"
-					                           > 
-					                           <span>{getSocialAttribute(theInformation.societyTag)}</span>
-					                   		 </FormItem>
-					                   		 <FormItem className="half-item"
-						                   			 {...formItemLayout}
-							                           label="业务认证"
-						                   		>
-									                <span>{parseInt(this.state.businessAudit)?'已认证':'未认证'}</span>
-									            </FormItem>
-									            <FormItem className="half-item" 
-									            	{...formItemLayout}
-							                        label="实名认证"
-									            >
-							                        <span>{getAuditStatus(this.state.auditStatus)}</span> 
-									            </FormItem>
-					                   		 <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="专家"
-								                > 
-								                  <span>{parseInt(this.state.expert)?'是':'否'}</span> 
-								            </FormItem>
-								            <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="明星"
-								                > 
-								                  <span>{parseInt(this.state.celebrity)?'是':'否'}</span> 
-								            </FormItem>
-								            <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="会员"
-								            > 
-								                  <span>{parseInt(this.state.isMember)?'是':'否'}</span> 
-								             </FormItem>
-								             <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="咨询师"
-								            > 
-								                  <span>{parseInt(this.state.consultant)?'是':'否'}</span> 
-								             </FormItem>
-								             <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="国际化"
-								            >   	
-								                  <span>{parseInt(this.state.international)?'是':'否'}</span> 
-								             </FormItem>
-					                   		 <FormItem className="half-item" 
-						                           {...formItemLayout}
-						                           label="性别"
-						                         > 
-								                  <span>{this.state.sex}</span> 
-					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
-						                           {...formItemLayout}
-						                           label="出生日期"
-					                          > 
-					                           	 <span>{this.state.yearMonth}</span>
-						                     </FormItem>
-						                     <FormItem className="half-item" 
-							                    	{...formItemLayout}
-							                        label="身份证号码"
-					                           	 >
-						                            <span>{theInformation.legalPersonIdCard}</span>
-						                     </FormItem>
-						                     <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="主要联系人"
-					                           	 >
-						                         <span>{theInformation.contacts}</span>
-						                     </FormItem>
-						                     <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="主要联系人号码"
-					                           	 >	                          
-						                         <span>{theInformation.contactMobile}</span>
-						                     </FormItem>
-						                     
-					                        <FormItem className="half-item" 
-					                           {...formItemLayout}
-					                           label="省-市-区"
-					                          > 
-					                           <span>{this.state.proviceCityArea}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-									                {...formItemLayout}
-							                        label="投资机构"
-									                > 
-									                <span>{this.state.investment?'是':'否'}</span>
-								            </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="职称名字"
-					                           	 >
-						                        <span>{this.state.professionalTitle}</span>                    
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="就业单位"
-					                           	 >
-						                        <span>{this.state.workUnit}</span>       
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="学历"
-					                           	 >
-						                    		 <span>{this.state.education}</span> 
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="毕业院校"
-					                           	 >
-						                    		 <span>{this.state.graduateSchool}</span> 
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="专业类别"
-					                           	 >
-						                   		 <span>{this.state.majorCategory}</span> 
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="职业资格"
-					                           	 >
-						                   	    <span>{this.state.qualification}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="通信地址"
-						                            >
-						                             <span>{theInformation.postalAddress}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="手机号码"
-						                            >
-						                             <span>{theInformation.modile}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                        label="客户传真"
-						                            >
-						                             <span>{theInformation.contactsFax}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="固定电话"
-						                            >
-						                            <span>{theInformation.contactsFixedTel}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="客户QQ"
-						                            >
-						                             <span>{theInformation.qq}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="电子邮箱"
-						                            >
-						                              <span>{theInformation.email}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-								                    	 {...formItemLayout}
-								                         label="咨询费用"
-							                            >
-						                   		<span>{theInformation.consultationPrice}</span>
-							                    </FormItem>
-						                    <div className='clearfix'>
-							                    <FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="客户简介" >
-							                        <span>{theInformation.introduction}</span>
-							                    </FormItem>
-						                    </div>
-						                     <div className="clearfix pictures">
-						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginLeft:'60px'}}
-							                        labelCol={{ span: 8 }}
-							                        wrapperCol={{ span: 10 }}
-							                        label="身份证正面" >
-							                        <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.orgCodeUrl}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.orgCodeUrl || ''} />
-							                            </Modal>
-							                        </div>      
-						                        </FormItem>
-						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px'}}
-							                        labelCol={{ span: 8 }}
-							                        wrapperCol={{ span: 10 }}
-							                        label="身份证反面" > 
-							                         <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.companyLogoUrl}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.companyLogoUrl || ''} />
-							                            </Modal>
-							                        </div>     
-							                    </FormItem>
-							                    <FormItem style={{display:'inline-block' ,width:'350px',marginTop:'20px'}}
-							                        labelCol={{ span: 8 }}
-							                        wrapperCol={{ span: 10 }}
-							                        label="客户照片" > 
-							                         <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.companyLogoUrls}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.companyLogoUrls || ''} />
-							                            </Modal>
-							                        </div>          
-							                    </FormItem>
-							                </div> 
-					                    </div>		                	
-								    </Spin>
 								</Form>
-								}
 							</TabPane>
 						    <TabPane tab="联系人信息" key="2">
 						        <div className="clearfix" style={{display:adminData.isSuperAdmin?'block':'none'}}>

+ 2 - 203
js/component/manageCenter/customer/customerManagement/publicManages.jsx

@@ -2093,14 +2093,6 @@ const PublicCustomer = Form.create()(React.createClass({
 	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
-                     <span style={{marginRight:'10px'}}>客户类型:</span>
-	                        <Select placeholder="选择客户类型"
-	                            style={{ width: 100 }}
-	                            value={this.state.shareTypeSearch}
-	                            onChange={(e) => { this.setState({ shareTypeSearch: e }) }}>
-	                            <Select.Option value="" >所有客户</Select.Option>
-	                            <Select.Option value="1" >公共客户</Select.Option>
-	                        </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>                                         				
 							
@@ -2213,7 +2205,7 @@ const PublicCustomer = Form.create()(React.createClass({
 			        >				    
 					     <Tabs defaultActiveKey="1" onChange={this.callback} activeKey={this.state.callnub}>
 						    <TabPane tab="基本信息" key="1">
-						        {adminData.isSuperAdmin?<Form horizontal onSubmit={this.newSubmit} id="demand-form">
+						        <Form horizontal onSubmit={this.newSubmit} id="demand-form">
 					                <Spin spinning={this.state.loading}>
 						               	<div className="clearfix" style={{paddingLeft:'60px'}}>
 					                    	<FormItem className="half-item"
@@ -2446,200 +2438,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					                        <Button className="set-submit" type="ghost" onClick={this.detailsModal}>取消</Button>
 					                    </div>		                	
 								    </Spin>
-								</Form>	:<Form horizontal id="demand-form">
-					                <Spin spinning={this.state.loading}>
-						               	<div className="clearfix" style={{paddingLeft:'60px'}}>
-					                    	<FormItem className="half-item"
-							                    labelCol={{ span: 4 }}
-							                    wrapperCol={{ span: 18 }}
-							                    label="客户名称"
-						                        >
-						                        <span>{theInformation.identifyName}</span>
-						                    </FormItem>
-					                    </div>
-					                    <div className="clearfix" style={{paddingLeft:'60px'}}>
-					                    	<FormItem className="half-item" 
-						                         labelCol={{ span: 4 }}
-						                         wrapperCol={{ span: 18 }}
-						                        label="行业"
-						                         > 
-				                             <span>{getIndustry(String(theInformation.industry))}</span>     
-					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
-						                           labelCol={{ span: 4 }}
-						                            wrapperCol={{ span: 18 }}
-						                           label="社会属性"
-						                         > 
-						                       <span>{getSocialAttribute(theInformation.societyTag)}</span>  
-					                   		 </FormItem>
-					                         <FormItem className="half-item" 
-					                           labelCol={{ span: 4 }}
-					                           wrapperCol={{ span: 18 }}
-					                           label="省-市-区"
-					                          > 
-						                  		<span>{this.state.proviceCityArea}</span>
-						                  </FormItem>
-						                   <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                         label="通信地址"
-						                            >
-						                            <span>{theInformation.postalAddress}</span>  
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                         label="固定电话"
-						                            >
-						                            <span>{theInformation.contactsFixedTel}</span>              
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="客户传真"
-						                            >
-						                            <span>{theInformation.contactsFax}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="注册资本"
-						                            >
-						                            <span>{theInformation.registeredCapital}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="单位规模"
-						                            >
-						                            <span>{theInformation.enterpriseScale}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="法人名称"
-						                            >
-						                             <span>{theInformation.legalPerson}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="身份证号码"
-						                            >
-						                            <span>{theInformation.legalPersonIdCard}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="法人电话"
-						                            >
-						                            <span>{theInformation.legalPersonTel}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="电子邮箱"
-						                            >
-						                            <span>{theInformation.legalPersonEmail}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-				                   		   		labelCol={{ span: 4 }}
-					                            wrapperCol={{ span: 18 }}
-					                            label="投资机构"
-					                   		    >
-								                <span>{this.state.investment?'是':'否'}</span>
-								            </FormItem>
-					                   		<FormItem className="half-item"
-				                   		   		labelCol={{ span: 4 }}
-					                            wrapperCol={{ span: 18 }}
-					                            label="高新"
-					                   		    >
-								                <span>{this.state.highTechZone?'是':'否'}</span>
-								            </FormItem>
-					                   	     <FormItem className="half-item"
-				                   		   		labelCol={{ span: 4 }}
-					                            wrapperCol={{ span: 18 }}
-					                            label="上市"
-					                   		    >
-								                   <span>{this.state.listed?'是':'否'}</span>
-										     </FormItem>
-										     <FormItem className="half-item"
-				                   		   		labelCol={{ span: 4 }}
-					                            wrapperCol={{ span: 18 }}
-					                            label="国际化"
-					                   		    >
-								                   <span>{this.state.international?'是':'否'}</span>
-										     </FormItem>
-					                   		 <FormItem className="half-item"
-							                    	labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="机构代码"
-						                            >
-						                            <span>{theInformation.orgCode}</span>
-						                    </FormItem>
-						                    <div className="clearfix pictures">
-						                        <FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="机构证(PIC)" >
-							                        <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.orgCodeUrl}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.orgCodeUrl || ''} />
-							                            </Modal>
-							                        </div>     
-						                        </FormItem>
-						                        <FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="单位logo" > 
-							                        <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.companyLogoUrl}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.companyLogoUrl || ''} />
-							                            </Modal>
-							                        </div> 
-							                    </FormItem>
-							                </div>
-							                <div className="clearfix">
-							                    <FormItem
-						                        labelCol={{ span: 2 }}
-						                        wrapperCol={{ span: 18 }}
-						                        label="业务范围" >
-						                         <span>{theInformation.businessScope}</span>
-							                    </FormItem>
-							                    <FormItem
-							                        labelCol={{ span: 2 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="单位简介" >
-							                        <span>{theInformation.introduction}</span>
-							                    </FormItem>
-						                    </div> 
-					                    </div>		                	
-								    </Spin>
-								</Form>}	
+								</Form>		
 							</TabPane>
 						    <TabPane tab="联系人信息" key="2">
 						        <div className="clearfix" >

+ 1 - 275
js/component/manageCenter/customer/customerManagement/publicManagesOne.jsx

@@ -2035,14 +2035,6 @@ const QueryCustomer = Form.create()(React.createClass({
 	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
-                    <span style={{marginRight:'10px'}}>客户类型:</span>
-                    <Select placeholder="选择客户类型"
-                        style={{ width: 100 }}
-                        value={this.state.shareTypeSearch}
-                        onChange={(e) => { this.setState({ shareTypeSearch: e }) }}>
-                        <Select.Option value="" >所有客户</Select.Option>
-                        <Select.Option value="1" >公共客户</Select.Option>
-                    </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>                                    					
 					 
@@ -2146,7 +2138,7 @@ const QueryCustomer = Form.create()(React.createClass({
 			        >				    
 					     <Tabs onChange={this.callback} activeKey={this.state.callnub}>
 						    <TabPane tab="基本信息" key="1">
-						        {adminData.isSuperAdmin?<Form horizontal onSubmit={this.newSubmit} id="demand-form">
+						        <Form horizontal onSubmit={this.newSubmit} id="demand-form">
 					                <Spin spinning={this.state.loading}>
 						               	<div className="clearfix" >
 					                    	<FormItem className="half-item"
@@ -2390,273 +2382,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                        <Button className="set-submit" type="ghost" onClick={this.detailsModal}>取消</Button>
 					                    </div>		                	
 								    </Spin>
-								</Form>:
-								<Form horizontal  id="demand-form">
-								    <Spin spinning={this.state.loading}>
-						               	<div className="clearfix" >
-					                    	<FormItem className="half-item"
-							                    {...formItemLayout}
-							                    label="客户姓名"
-						                        >
-					                    	    <span>{theInformation.identifyName}</span>
-						                    </FormItem>
-					                    </div>
-					                    <div className="clearfix" >
-					                    	<FormItem className="half-item" 
-					                         {...formItemLayout}
-					                        label="行业"
-					                         > 
-				                                <span>{getIndustryType(this.state.industry)}</span>
-					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
-					                           {...formItemLayout}
-					                           label="社会属性"
-					                           > 
-					                           <span>{getSocialAttribute(theInformation.societyTag)}</span>
-					                   		 </FormItem>
-					                   		 <FormItem className="half-item"
-						                   			 {...formItemLayout}
-							                           label="业务认证"
-						                   		>
-									                <span>{parseInt(this.state.businessAudit)?'已认证':'未认证'}</span>
-									            </FormItem>
-									            <FormItem className="half-item" 
-									            	{...formItemLayout}
-							                        label="实名认证"
-									            >
-							                        <span>{getAuditStatus(this.state.auditStatus)}</span> 
-									            </FormItem>
-					                   		 <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="专家"
-								                > 
-								                  <span>{parseInt(this.state.expert)?'是':'否'}</span> 
-								            </FormItem>
-								            <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="明星"
-								                > 
-								                  <span>{parseInt(this.state.celebrity)?'是':'否'}</span> 
-								            </FormItem>
-								            <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="会员"
-								            > 
-								                  <span>{parseInt(this.state.isMember)?'是':'否'}</span> 
-								             </FormItem>
-								             <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="咨询师"
-								            > 
-								                  <span>{parseInt(this.state.consultant)?'是':'否'}</span> 
-								             </FormItem>
-								             <FormItem className="half-item"
-								                {...formItemLayout}
-						                        label="国际化"
-								            >   	
-								                  <span>{parseInt(this.state.international)?'是':'否'}</span> 
-								             </FormItem>
-					                   		 <FormItem className="half-item" 
-						                           {...formItemLayout}
-						                           label="性别"
-						                         > 
-								                  <span>{this.state.sex}</span> 
-					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
-						                           {...formItemLayout}
-						                           label="出生日期"
-					                          > 
-					                           	 <span>{this.state.yearMonth}</span>
-						                     </FormItem>
-						                     <FormItem className="half-item" 
-							                    	{...formItemLayout}
-							                        label="身份证号码"
-					                           	 >
-						                            <span>{theInformation.legalPersonIdCard}</span>
-						                     </FormItem>
-						                     <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="主要联系人"
-					                           	 >
-						                         <span>{theInformation.contacts}</span>
-						                     </FormItem>
-						                     <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="主要联系人号码"
-					                           	 >	                          
-						                         <span>{theInformation.contactMobile}</span>
-						                     </FormItem>
-						                     
-					                        <FormItem className="half-item" 
-					                           {...formItemLayout}
-					                           label="省-市-区"
-					                          > 
-					                           <span>{this.state.proviceCityArea}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-									                {...formItemLayout}
-							                        label="投资机构"
-									                > 
-									                <span>{this.state.investment?'是':'否'}</span>
-								            </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="职称名字"
-					                           	 >
-						                        <span>{this.state.professionalTitle}</span>                    
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="就业单位"
-					                           	 >
-						                        <span>{this.state.workUnit}</span>       
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="学历"
-					                           	 >
-						                    		 <span>{this.state.education}</span> 
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="毕业院校"
-					                           	 >
-						                    		 <span>{this.state.graduateSchool}</span> 
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="专业类别"
-					                           	 >
-						                   		 <span>{this.state.majorCategory}</span> 
-						                    </FormItem>
-						                    <FormItem className="half-item" 
-							                    	 {...formItemLayout}
-							                        label="职业资格"
-					                           	 >
-						                   	    <span>{this.state.qualification}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="通信地址"
-						                            >
-						                             <span>{theInformation.postalAddress}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="手机号码"
-						                            >
-						                             <span>{theInformation.modile}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                        label="客户传真"
-						                            >
-						                             <span>{theInformation.contactsFax}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="固定电话"
-						                            >
-						                            <span>{theInformation.contactsFixedTel}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="客户QQ"
-						                            >
-						                             <span>{theInformation.qq}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-							                    	{...formItemLayout}
-							                         label="电子邮箱"
-						                            >
-						                              <span>{theInformation.email}</span>
-						                    </FormItem>
-						                    <FormItem className="half-item"
-								                    	 {...formItemLayout}
-								                         label="咨询费用"
-							                            >
-						                   		<span>{theInformation.consultationPrice}</span>
-							                    </FormItem>
-						                    <div className='clearfix'>
-							                    <FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="客户简介" >
-							                        <span>{theInformation.introduction}</span>
-							                    </FormItem>
-						                    </div>
-						                     <div className="clearfix pictures">
-						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginLeft:'60px'}}
-							                        labelCol={{ span: 8 }}
-							                        wrapperCol={{ span: 10 }}
-							                        label="身份证正面" >
-							                        <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.orgCodeUrl}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.orgCodeUrl || ''} />
-							                            </Modal>
-							                        </div>      
-						                        </FormItem>
-						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px'}}
-							                        labelCol={{ span: 8 }}
-							                        wrapperCol={{ span: 10 }}
-							                        label="身份证反面" > 
-							                         <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.companyLogoUrl}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.companyLogoUrl || ''} />
-							                            </Modal>
-							                        </div>     
-							                    </FormItem>
-							                    <FormItem style={{display:'inline-block' ,width:'350px',marginTop:'20px'}}
-							                        labelCol={{ span: 8 }}
-							                        wrapperCol={{ span: 10 }}
-							                        label="客户照片" > 
-							                         <div className="clearfix">
-							                            <Upload className="demandDetailShow-upload"
-							                                listType="picture-card"
-							                                fileList={this.state.companyLogoUrls}
-							                                onPreview={(file) => {
-							                                    this.setState({
-							                                        previewImage: file.url || file.thumbUrl,
-							                                        previewVisible: true,
-							                                    });
-							                                }} >
-							                            </Upload>
-							                            <Modal maskClosable={false} footer={null}
-							                                visible={this.state.previewVisible}
-							                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-							                                <img alt="" style={{ width: '100%' }} src={this.state.companyLogoUrls || ''} />
-							                            </Modal>
-							                        </div>          
-							                    </FormItem>
-							                </div> 
-					                    </div>		                	
-								    </Spin>
 								</Form>
-								}
 							</TabPane>
 						    <TabPane tab="联系人信息" key="2">
 						        <div className="clearfix" style={{display:adminData.isSuperAdmin?'block':'none'}}>

+ 1 - 1
js/component/manageCenter/customer/customerService/businessManges.jsx

@@ -20,7 +20,7 @@ const MyBusiness = Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,          
-            url:globalConfig.context + '/api/admin/customer/listBusiness',
+            url:globalConfig.context + '/api/admin/customer/listManageBusiness',
             data: { 				
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,               

+ 35 - 8
js/component/manageCenter/customer/customerService/myBusiness.jsx

@@ -354,13 +354,15 @@ const MyBusiness = Form.create()(React.createClass({
         this.state.followSituation='0';
         this.state.customerStatus='0';
         this.state.contactType=undefined;
+        this.state.superior=''; 
         this.state.remarks='';
         this.state.result='';
         this.state.keys=false;
         this.state.lastName=undefined;
         this.addTime(); 
         this.setState({
-            showDesc: true,           
+            showDesc: true,   
+           
         });       
     },
     
@@ -805,6 +807,9 @@ const MyBusiness = Form.create()(React.createClass({
 			if(e.length>=2){
 				this.customerList(e); 
 			}	
+			this.setState({
+			superior:e
+		})
 		},
 		//选择值时值匹配及联系人函数加载
 		autoChange(e){
@@ -817,11 +822,32 @@ const MyBusiness = Form.create()(React.createClass({
 	                }
 	           });     
 	   		}	
+	   		console.log(theType);
 			this.setState({
 				  khId:theType
 			})
 			this.getNewWoman(theType) 	 
 		},
+		//上级主管输入框失去焦点是判断客户是否存在
+		selectAuto(value,options){
+			console.log(value);
+			console.log(options);
+			let theType='';
+			let contactLists=this.state.customerArr||[];
+				if (value) {
+	            contactLists.map(function (item) {
+	                if (item.name == value.toString()) {
+	                    theType = item.id;
+	                }
+	           });     
+	   		}	
+	   		console.log(theType);
+			this.setState({
+				superior:value,
+				khId:theType
+			})
+			this.getNewWoman(theType) ;
+		},
 		//客户输入框失去焦点是判断客户是否存在
 		blurChange(e){
 			let theType='';
@@ -833,7 +859,7 @@ const MyBusiness = Form.create()(React.createClass({
 	                }
 	           });     
 	   		}
-			
+			console.log(theType);
 			this.setState({
 				theTypes:theType
 			})
@@ -1190,16 +1216,17 @@ const MyBusiness = Form.create()(React.createClass({
 											        style={{ width: '200px' }}
 											        dataSource={options}
 											        placeholder="输入名称"
-											        optionLabelProp="value"
+											        value={this.state.superior}
 											        onChange={this.httpChange}
-											        onSelect={this.autoChange}
 											        filterOption={true}
 											        onBlur={this.blurChange}
+											        onSelect={this.selectAuto}
+											        filterOption={true}
+											       
 											      >
-											        <Input style={{width:'200px'}}/>
-											      </AutoComplete>
-			    			    				  <span style={{color:'red'}}> *</span>
-											      
+											        <Input/>
+											      </AutoComplete> 
+											      <span className="mandatory">*</span>      
 							                </FormItem>
 			    			    	    </div>
 						            </div>

+ 4 - 5
js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx

@@ -1130,7 +1130,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 						consultant: this.state.consultant,
 						international: this.state.international,
 						fixedTel: this.state.fixedTel,
-						consultationPrice:this.state.consultationPrice,
+						consultationPrice:this.state.consultationPrice?this.state.consultationPrice:0,
 						qq: this.state.qq,
 						contacts: this.state.contacts,
 						contactMobile: this.state.contactMobile,
@@ -1139,10 +1139,9 @@ const IndividualCustomer = Form.create()(React.createClass({
 						isMember: this.state.isMember,
 						postalAddress: this.state.postalAddress,
 						introduction: this.state.introduction,
-						positiveIdUrl: thecompanyLogoUrl,
-						oppositeIdUrl: thecompanyLogoUrls,
-						headPortraitUrl: theorgCodeUrl,
-
+						positiveIdUrl: thecompanyLogoUrl.length!=0?thecompanyLogoUrl:'',
+						oppositeIdUrl: thecompanyLogoUrls!=0?thecompanyLogoUrls:'',
+						headPortraitUrl: theorgCodeUrl!=0?theorgCodeUrl:'',
 						investment: this.state.investment,
 						professionalTitle: this.state.professionalTitle,
 						workUnit: this.state.workUnit,

+ 437 - 0
js/component/manageCenter/customer/individualCustomer/myReject.jsx

@@ -0,0 +1,437 @@
+import React from 'react';
+import { Radio, Icon, Button, Cascader, Input, Select, Tabs, Spin, Popconfirm, Table, Switch, message, DatePicker, Modal, Upload, Form, Row, Col } from 'antd';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import moment from 'moment';
+import './myClient.less';
+import QueryCustomer from './myRejectOne.jsx';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
+const { Column, ColumnGroup } = Table;
+const TabPane = Tabs.TabPane;
+const monthFormat = 'YYYY/MM';
+import CustomerDetail from './myClientDesc.jsx';
+import { socialAttribute, industry, auditStatusL, newFollow, lvl, currentMember, statuslist, customerStatus, intentionalService } from '../../../dataDic.js';
+import { getSocialAttribute, splitUrl,getAuditStatus, getCompanyIntention, getStatuslist, getContactType, getIndustryType, getfllowSituation, beforeUploadFile, getWhether, getcustomerStatue, getfllowSituationOn, getCertification, getcustomerTyp, getLvl, getCurrentMember, getprovince } from '../../../tools.js';
+const PublicCustomer = Form.create()(React.createClass({
+	loadData(pageNo) {
+		this.state.data = [];
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/customer/findEnteringAuditIsNo',
+			data: {
+				pageNo: pageNo || 1,
+				pageSize: this.state.pagination.pageSize,
+				name: this.state.nameSearch,//客户名称
+				adminName:this.state.adminName,//营销员名称
+			},
+			success: function(data) {
+				let theArr = [];
+				let thisdata;
+				if(data.error.length || 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++) {
+						thisdata = data.data.list[i];
+						theArr.push({
+							key: i,
+							id: thisdata.uid,
+							name: thisdata.name,
+							createTime: thisdata.createTime,
+							adminName: thisdata.adminName,
+							contactMobile: thisdata.contactMobile,
+							auditOpinion:thisdata.auditOpinion,
+						});
+					};
+					this.state.pagination.current = data.data.pageNo;
+				    this.state.pagination.total = data.data.totalCount;
+				};
+				if(!data.data.list.length){
+					this.state.pagination.current=0;
+					this.state.pagination.total=0;
+				}
+				this.setState({
+					
+					dataSource: theArr,
+					pagination: this.state.pagination,
+					selectedRowKeys:[]
+				});
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
+
+	//点击出现函数
+	setModal2VisibleOk(e) {
+		this.setState({
+			modal2Visible: true
+		});
+
+	},
+	//点击消失函数
+	setModal2Visiblecancel(e) {
+		this.setState({
+			modal2Visible: false
+		});
+	},
+	getPictureUrl(e) {
+		this.setState({ pictureUrl: e });
+	},
+
+	handleOk(e) {
+		this.setState({
+			visible: false,
+		});
+	},
+	handleCancel(e) {
+		this.setState({
+			visible: false,
+		});
+	},
+	getInitialState() {
+		return {
+			addressSearch: [],
+			orgCodeUrl: [],
+			companyLogoUrl: [],
+			visible: false,
+			searchMore: true,
+			releaseDate: [],
+			releaseDate: [],
+			selectedRowKeys: [],
+			selectedRowKey: [],
+			selectedRows: [],
+			loading: false,
+			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: 'name',
+					key: 'name',
+				}, {
+					title: '联系电话',
+					dataIndex: 'contactMobile',
+					key: 'contactMobile',
+				},
+				{
+					title: '营销员',
+					dataIndex: 'adminName',
+					key: 'adminName',
+				},
+				{
+					title: '创建时间',
+					dataIndex: 'createTime',
+					key: 'createTime',
+				},
+				{
+					title: '拒绝原因',
+					dataIndex: 'auditOpinion',
+					key: 'auditOpinion',
+				}
+			],
+			dataSource: [],
+		};
+	},
+	 //审核通过
+    examineCancel(record){
+    	let api=0;
+    	this.examine(api,record);
+    },
+	 //审核不通过
+    examineOK(record){
+    	let api=1;
+    	this.examine(api,record);
+    },
+    examine(api,record) {
+        this.setState({
+            selectedRowKeys: [],
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+            data: {
+                id:record.id,
+                auditStatus:api,
+                auditOpinion:this.state.auditOpinion,
+             }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+	componentWillMount() {
+		this.loadData();
+	},
+	//审核实名认证不通过功能
+	auditRows(e) {
+		e.preventDefault();	
+		$.ajax({
+			url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+			method: 'post',
+			data: {
+				id:this.state.id,
+                auditOpinion:this.state.auditOpinion,
+                auditStatus:2,
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.detailsModal()
+				this.loadData();
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	//审核实名认证通过功能
+	auditRowse(e) {
+		e.preventDefault();	
+		$.ajax({
+			url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+			method: 'post',
+			data: {
+				id:this.state.id,
+                auditOpinion:this.state.auditOpinion,
+                auditStatus:1,
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.detailsModal()
+				this.loadData();
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	search() {
+		this.loadData();
+	},
+	reset() {
+		this.state.nameSearch = '';
+		this.state.adminName=''
+		this.loadData();
+	},
+	searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+	//整行点击
+//	tableRowClick(record, index) {
+//		this.state.RowData = record;
+//		this.detailsModalOk(record);
+//		this.setState({
+//			name:record.name,
+//			id:record.id,
+//		})
+//	},
+	detailsModalOk(e) {
+		this.setState({ 
+			modal5Visible: true 
+		}); //需要一个请求数据
+	},
+	detailsModal(e){
+		this.setState({ 
+			modal5Visible: false 
+		});
+	},
+
+	componentWillReceiveProps(nextProps) {
+		if(!this.props.visible && nextProps.visible) {
+			if(nextProps.data && nextProps.data.id) {
+				this.loadData(nextProps.data.id, nextProps.detailApiUrl);
+			};
+			this.state.data = {};
+			this.state.companyLogoUrl = [];
+			this.state.orgCodeUrl = [];
+			this.loadData(null);
+
+		};
+	},
+	render() {
+		const FormItem = Form.Item
+		const rowSelection = {
+			selectedRowKeys: this.state.selectedRowKeys,
+			onChange: (selectedRowKeys, selectedRows) => {
+				this.setState({
+					selectedRows: selectedRows.slice(-1),
+					selectedRowKeys: selectedRowKeys.slice(-1)
+				});
+			},
+			onSelect: (recordt, selected, selectedRows) => {
+				this.setState({
+					recordt: recordt.id
+				})
+			},
+		};
+		const rowSelections = {
+			selectedRowKeys: this.state.selectedRowKey,
+			onChange: (selectedRowKey, selectedRow) => {
+				this.setState({
+					selectedRow: selectedRow.slice(-1),
+					selectedRowKey: selectedRowKey.slice(-1)
+				});
+			},
+			onSelect: (records, selected, selectedRow) => {
+				this.setState({
+					selectedRow: selectedRow.slice(-1),
+					records: records.id,
+				})
+			},
+
+		};
+		const hasSelected = this.state.selectedRowKeys.length > 0;
+		const { RangePicker } = DatePicker;
+		const { getFieldDecorator } = this.props.form;
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		//const theDatak = this.state.datak || {};
+		const theInformation = this.state.dataInformation || {}
+		const contactsOption = "";
+		const formItemLayput = {
+			labelCol: { span: 10 },
+			wrapperCol: { span: 14 },
+		};
+		const contacts = this.state.contacts || '';
+		return(
+			<div className="user-content" >
+                <div className="content-title">                  
+                    <span>我的被拒绝客户</span>
+                </div>
+                <div className="user-search">                    
+                    <Input placeholder="客户名称"
+                        value={this.state.nameSearch}
+                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
+                    <Input placeholder="营销员"
+                        value={this.state.adminName}
+                        onChange={(e) => { this.setState({ adminName: e.target.value }); }} /> 
+                    <Button type="primary" onClick={this.search}>搜索</Button>
+                    <Button onClick={this.reset}>重置</Button>                                         				
+				</div>                                               
+                <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                        <Table columns={this.state.columns}
+                            dataSource={this.state.dataSource}    
+                            rowSelection={rowSelection}
+                            pagination={this.state.pagination} 
+                            onRowClick={this.tableRowClick}
+                           />
+                    </Spin>
+                </div> 
+                <Modal	
+				      className="customeDetails"				      
+			          title="单位客户资料审核"
+			          width='500px'
+			          visible={this.state.modal5Visible}
+			          onOk={this.detailsModal}
+			          onCancel={this.detailsModal}
+			          footer=''
+			        >				    
+					<Form horizontal onSubmit={this.auditRows} id="add-form">
+		                <Spin spinning={this.state.loading}>
+		                    <div className="clearfix">
+		                    	<FormItem 
+			                            labelCol={{ span: 6 }}
+			                        	wrapperCol={{ span: 15 }}
+			                            label="客户名称" >
+		                                <span>{this.state.name}</span>
+			                    </FormItem>
+		                    </div>
+		                    <div className="clearfix">
+	                   		    <FormItem
+			                        labelCol={{ span: 6 }}
+			                        wrapperCol={{ span: 15 }}
+			                        label="审核意见" >					                        
+			                        <Input type="textarea" rows={4} placeholder="审核意见" value={this.state.auditOpinion}
+                       				 	onChange={(e) => { this.setState({ auditOpinion: e.target.value }) }} style={{width:'95%'}}/>					                           
+			                    </FormItem>
+			                </div>    
+		                    <FormItem wrapperCol={{ span: 25, offset: 4 }}>
+		                        <Button className="set-submit" type="primary" onClick={this.auditRowse}>审核通过</Button> 
+		                        <Button className="set-submit" type="primary" htmlType="submit" style={{marginLeft:'30px'}}>审核不通过</Button>  
+		                        <Button className="set-submit" type="ghost" onClick={this.detailsModal} style={{marginLeft:'30px'}}>取消</Button>
+		                    </FormItem> 
+		                </Spin>
+		            </Form >                          
+				</Modal>
+          </div >
+		);
+	}
+}));
+
+//const Tablees=Form.create()(React.createClass({
+//	//详情tab切换数据处理
+//	callbacks(e) {
+//		this.setState({
+//			callnubs: e,
+//		})
+//		if(e == '1') {
+//			
+//		}
+//		if(e == '2') {
+//			
+//		}
+//		
+//	},
+//	getInitialState() {
+//		return {
+//			callnubs: "1",
+//		}
+//	},
+//	render() {
+//		return(
+//			<div className="clearfix" style={{marginTop:'0px',marginLeft:'20px'}}>
+//			    <Tabs onChange={this.callbacks} type="card" activeKey={this.state.callnubs} style={{paddingLeft:'15px',paddingRight:'15px',marginRight:'20px'}}>
+//			         <TabPane tab="个人客户" key="1" >
+//			         	<QueryCustomer />
+//			         </TabPane>
+//					 <TabPane tab="单位客户" key="2">
+//					 	<PublicCustomer />
+//					 </TabPane>
+//			    </Tabs>
+//			</div>
+//		);
+//	}
+//}));
+export default PublicCustomer;
+
+
+
+

+ 396 - 0
js/component/manageCenter/customer/individualCustomer/myRejectOne.jsx

@@ -0,0 +1,396 @@
+import React from 'react';
+import { Radio, Icon, Button, Cascader, Input, Select, Tabs, Spin, Popconfirm, Table, Switch, message, DatePicker, Modal, Upload, Form, Row, Col } from 'antd';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import moment from 'moment';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
+const { Column, ColumnGroup } = Table;
+const TabPane = Tabs.TabPane;
+const monthFormat = 'YYYY/MM';
+import CustomerDetail from './myClientDesc.jsx';
+import { socialAttribute, industry, auditStatusL, newFollow, lvl, currentMember, statuslist, customerStatus, intentionalService } from '../../../dataDic.js';
+import { getSocialAttribute, splitUrl,getAuditStatus, getCompanyIntention, getStatuslist, getContactType, getIndustryType, getfllowSituation, beforeUploadFile, getWhether, getcustomerStatue, getfllowSituationOn, getCertification, getcustomerTyp, getLvl, getCurrentMember, getprovince } from '../../../tools.js';
+
+const QueryCustomer = Form.create()(React.createClass({
+	loadData(pageNo) {
+		this.state.data = [];
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/customer/findEnteringAuditIsNo',
+			data: {
+				pageNo: pageNo || 1,
+				pageSize: this.state.pagination.pageSize,
+				name: this.state.nameSearch,//客户名称
+				adminName:this.state.adminName,//营销员名称
+			},
+			success: function(data) {
+				let theArr = [];
+				let thisdata;
+				if(data.error.length || 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++) {
+						thisdata = data.data.list[i];
+						theArr.push({
+							key: i,
+							id: thisdata.uid,
+							name: thisdata.name,
+							createTime: thisdata.createTime,
+							adminName: thisdata.adminName,
+							contactMobile: thisdata.contactMobile,
+							auditOpinion: thisdata.auditOpinion,
+						});
+					};
+					this.state.pagination.current = data.data.pageNo;
+				    this.state.pagination.total = data.data.totalCount;
+				};
+				if(!data.data.list.length){
+					this.state.pagination.current=0;
+					this.state.pagination.total=0;
+				}
+				this.setState({
+					dataSource: theArr,
+					pagination: this.state.pagination,
+					selectedRowKeys:[]
+				});
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
+
+	//点击出现函数
+	setModal2VisibleOk(e) {
+		this.setState({
+			modal2Visible: true
+		});
+
+	},
+	//点击消失函数
+	setModal2Visiblecancel(e) {
+		this.setState({
+			modal2Visible: false
+		});
+	},
+	getPictureUrl(e) {
+		this.setState({ pictureUrl: e });
+	},
+
+	handleOk(e) {
+		this.setState({
+			visible: false,
+		});
+	},
+	handleCancel(e) {
+		this.setState({
+			visible: false,
+		});
+	},
+	getInitialState() {
+		return {
+			addressSearch: [],
+			orgCodeUrl: [],
+			companyLogoUrl: [],
+			visible: false,
+			searchMore: true,
+			releaseDate: [],
+			releaseDate: [],
+			selectedRowKeys: [],
+			selectedRowKey: [],
+			selectedRows: [],
+			loading: false,
+			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: 'name',
+					key: 'name',
+				}, {
+					title: '联系电话',
+					dataIndex: 'contactMobile',
+					key: 'contactMobile',
+				},
+				{
+					title: '营销员',
+					dataIndex: 'adminName',
+					key: 'adminName',
+				},
+				{
+					title: '创建时间',
+					dataIndex: 'createTime',
+					key: 'createTime',
+				},
+				{
+					title: '拒绝原因',
+					dataIndex: 'auditOpinion',
+					key: 'auditOpinion',
+				}
+			],
+			dataSource: [],
+		};
+	},
+	 //审核不通过
+    examineCancel(record){
+    	let api=2;
+    	this.examine(api,record);
+    },
+	 //审核通过
+    examineOK(record){
+    	let api=1;
+    	this.examine(api,record);
+    },
+    examine(api,record) {
+        this.setState({
+            selectedRowKeys: [],
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+            data: {
+                id:record.id,
+                auditStatus:api,
+                auditOpinion:this.state.auditOpinion,
+             }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+	componentWillMount() {
+		this.loadData();
+	},
+	//审核实名认证不通过功能
+	auditRows(e) {
+		e.preventDefault();	
+		$.ajax({
+			url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+			method: 'post',
+			data: {
+				id:this.state.id,
+                auditOpinion:this.state.auditOpinion,
+                auditStatus:2,
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.detailsModal()
+				this.loadData();
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	//审核实名认证通过功能
+	auditRowse(e) {
+		e.preventDefault();	
+		$.ajax({
+			url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+			method: 'post',
+			data: {
+				id:this.state.id,
+                auditOpinion:this.state.auditOpinion,
+                auditStatus:1,
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.detailsModal()
+				this.loadData();
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	search() {
+		this.loadData();
+	},
+	reset() {
+		this.state.nameSearch = '';
+		this.state.adminName=''
+		this.loadData();
+	},
+	searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+	//整行点击
+//	tableRowClick(record, index) {
+//		this.state.RowData = record;
+//		this.detailsModalOk(record);
+//		this.setState({
+//			name:record.name,
+//			id:record.id,
+//		})
+//	},
+	detailsModalOk(e) {
+		this.setState({ 
+			modal5Visible: true 
+		}); //需要一个请求数据
+	},
+	detailsModal(e){
+		this.setState({ 
+			modal5Visible: false 
+		});
+	},
+	componentWillReceiveProps(nextProps) {
+		if(!this.props.visible && nextProps.visible) {
+			if(nextProps.data && nextProps.data.id) {
+				this.loadData(nextProps.data.id, nextProps.detailApiUrl);
+			};
+			this.state.data = {};
+			this.state.companyLogoUrl = [];
+			this.state.orgCodeUrl = [];
+			this.loadData(null);
+
+		};
+	},
+	render() {
+		const FormItem = Form.Item
+		const rowSelection = {
+			selectedRowKeys: this.state.selectedRowKeys,
+			onChange: (selectedRowKeys, selectedRows) => {
+				this.setState({
+					selectedRows: selectedRows.slice(-1),
+					selectedRowKeys: selectedRowKeys.slice(-1)
+				});
+			},
+			onSelect: (recordt, selected, selectedRows) => {
+				this.setState({
+					recordt: recordt.id
+				})
+			},
+		};
+		const rowSelections = {
+			selectedRowKeys: this.state.selectedRowKey,
+			onChange: (selectedRowKey, selectedRow) => {
+				this.setState({
+					selectedRow: selectedRow.slice(-1),
+					selectedRowKey: selectedRowKey.slice(-1)
+				});
+			},
+			onSelect: (records, selected, selectedRow) => {
+				this.setState({
+					selectedRow: selectedRow.slice(-1),
+					records: records.id,
+				})
+			},
+
+		};
+		const hasSelected = this.state.selectedRowKeys.length > 0;
+		const { RangePicker } = DatePicker;
+		const { getFieldDecorator } = this.props.form;
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		//const theDatak = this.state.datak || {};
+		const theInformation = this.state.dataInformation || {}
+		const contactsOption = "";
+		const formItemLayput = {
+			labelCol: { span: 10 },
+			wrapperCol: { span: 14 },
+		};
+		const contacts = this.state.contacts || '';
+		return(
+			<div className="user-content" >
+                <div className="content-title">                  
+                    <span>个人客户资料审核</span>
+                </div>
+                <div className="user-search">                    
+                    <Input placeholder="客户名称"
+                        value={this.state.nameSearch}
+                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
+                    <Input placeholder="营销员"
+                        value={this.state.adminName}
+                        onChange={(e) => { this.setState({ adminName: e.target.value }); }} /> 
+                    <Button type="primary" onClick={this.search}>搜索</Button>
+                    <Button onClick={this.reset}>重置</Button>    
+                </div>                                               
+                <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                        <Table columns={this.state.columns}
+                            dataSource={this.state.dataSource}    
+                            rowSelection={rowSelection}
+                            pagination={this.state.pagination} 
+                            onRowClick={this.tableRowClick}
+                           />
+                    </Spin>
+                </div> 
+                <Modal	
+				      className="customeDetails"				      
+			          title="个人客户资料审核"
+			          width='500px'
+			          visible={this.state.modal5Visible}
+			          onOk={this.detailsModal}
+			          onCancel={this.detailsModal}
+			          footer=''
+			        >				    
+					<Form horizontal onSubmit={this.auditRows} id="add-form">
+		                <Spin spinning={this.state.loading}>
+		                    <div className="clearfix">
+		                    	<FormItem 
+			                            labelCol={{ span: 6 }}
+			                        	wrapperCol={{ span: 15 }}
+			                            label="客户名称" >
+		                                <span>{this.state.name}</span>
+			                    </FormItem>
+		                    </div>
+		                    <div className="clearfix">
+	                   		    <FormItem
+			                        labelCol={{ span: 6 }}
+			                        wrapperCol={{ span: 15 }}
+			                        label="审核意见" >					                        
+			                        <Input type="textarea" rows={4} placeholder="审核意见" value={this.state.auditOpinion}
+                       				 	onChange={(e) => { this.setState({ auditOpinion: e.target.value }) }} style={{width:'95%'}}/>					                           
+			                    </FormItem>
+			                </div>    
+		                    <FormItem wrapperCol={{ span: 25, offset: 4 }}>
+		                        <Button className="set-submit" type="primary" onClick={this.auditRowse}>审核通过</Button> 
+		                        <Button className="set-submit" type="primary" htmlType="submit" style={{marginLeft:'30px'}}>审核不通过</Button>  
+		                        <Button className="set-submit" type="ghost" onClick={this.detailsModal} style={{marginLeft:'30px'}}>取消</Button>
+		                    </FormItem> 
+		                </Spin>
+		            </Form >                     
+				</Modal>
+            </div >
+		);
+	}
+}));
+
+export default QueryCustomer;

+ 442 - 0
js/component/manageCenter/customer/reviewed/enteringAudit.jsx

@@ -0,0 +1,442 @@
+import React from 'react';
+import { Radio, Icon, Button, Cascader, Input, Select, Tabs, Spin, Popconfirm, Table, Switch, message, DatePicker, Modal, Upload, Form, Row, Col } from 'antd';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import moment from 'moment';
+import './myClient.less';
+import QueryCustomer from './enteringAuditOne.jsx';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
+const { Column, ColumnGroup } = Table;
+const TabPane = Tabs.TabPane;
+const monthFormat = 'YYYY/MM';
+import CustomerDetail from './myClientDesc.jsx';
+import { socialAttribute, industry, auditStatusL, newFollow, lvl, currentMember, statuslist, customerStatus, intentionalService } from '../../../dataDic.js';
+import { getSocialAttribute, splitUrl,getAuditStatus, getCompanyIntention, getStatuslist, getContactType, getIndustryType, getfllowSituation, beforeUploadFile, getWhether, getcustomerStatue, getfllowSituationOn, getCertification, getcustomerTyp, getLvl, getCurrentMember, getprovince } from '../../../tools.js';
+const PublicCustomer = Form.create()(React.createClass({
+	loadData(pageNo) {
+		this.state.data = [];
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/customer/findEnteringAudit',
+			data: {
+				pageNo: pageNo || 1,
+				pageSize: this.state.pagination.pageSize,
+				name: this.state.nameSearch,//客户名称
+				adminName:this.state.adminName,//营销员名称
+			},
+			success: function(data) {
+				let theArr = [];
+				let thisdata;
+				if(data.error.length || 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++) {
+						thisdata = data.data.list[i];
+						theArr.push({
+							key: i,
+							id: thisdata.uid,
+							name: thisdata.name,
+							createTime: thisdata.createTime,
+							adminName: thisdata.adminName,
+							contactMobile: thisdata.contactMobile,
+						});
+					};
+					this.state.pagination.current = data.data.pageNo;
+				    this.state.pagination.total = data.data.totalCount;
+				};
+				if(!data.data.list.length){
+					this.state.pagination.current=0;
+					this.state.pagination.total=0;
+				}
+				this.setState({
+					
+					dataSource: theArr,
+					pagination: this.state.pagination,
+					selectedRowKeys:[]
+				});
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
+
+	//点击出现函数
+	setModal2VisibleOk(e) {
+		this.setState({
+			modal2Visible: true
+		});
+
+	},
+	//点击消失函数
+	setModal2Visiblecancel(e) {
+		this.setState({
+			modal2Visible: false
+		});
+	},
+	getPictureUrl(e) {
+		this.setState({ pictureUrl: e });
+	},
+
+	handleOk(e) {
+		this.setState({
+			visible: false,
+		});
+	},
+	handleCancel(e) {
+		this.setState({
+			visible: false,
+		});
+	},
+	getInitialState() {
+		return {
+			addressSearch: [],
+			orgCodeUrl: [],
+			companyLogoUrl: [],
+			visible: false,
+			searchMore: true,
+			releaseDate: [],
+			releaseDate: [],
+			selectedRowKeys: [],
+			selectedRowKey: [],
+			selectedRows: [],
+			loading: false,
+			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: 'name',
+					key: 'name',
+				}, {
+					title: '联系电话',
+					dataIndex: 'contactMobile',
+					key: 'contactMobile',
+				},
+				{
+					title: '营销员',
+					dataIndex: 'adminName',
+					key: 'adminName',
+				},
+				{
+					title: '创建时间',
+					dataIndex: 'createTime',
+					key: 'createTime',
+				}, {
+                    title: '审核操作',
+                    dataIndex: 'ee',
+                    key: 'ee',
+                    render: (text, record, index) => {
+                    	return <div>
+							<Popconfirm title={'请确认通过【'+record.name+'】'} onConfirm={(e)=>{this.examineOK(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">通过</Button>                 
+							</Popconfirm>
+                        </div>
+					}
+                }
+			],
+			dataSource: [],
+		};
+	},
+	 //审核通过
+    examineCancel(record){
+    	let api=0;
+    	this.examine(api,record);
+    },
+	 //审核不通过
+    examineOK(record){
+    	let api=1;
+    	this.examine(api,record);
+    },
+    examine(api,record) {
+        this.setState({
+            selectedRowKeys: [],
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+            data: {
+                id:record.id,
+                auditStatus:api,
+                auditOpinion:this.state.auditOpinion,
+             }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+	componentWillMount() {
+		this.loadData();
+	},
+	//审核实名认证不通过功能
+	auditRows(e) {
+		e.preventDefault();	
+		$.ajax({
+			url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+			method: 'post',
+			data: {
+				id:this.state.id,
+                auditOpinion:this.state.auditOpinion,
+                auditStatus:2,
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.detailsModal()
+				this.loadData();
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	//审核实名认证通过功能
+	auditRowse(e) {
+		e.preventDefault();	
+		$.ajax({
+			url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+			method: 'post',
+			data: {
+				id:this.state.id,
+                auditOpinion:this.state.auditOpinion,
+                auditStatus:1,
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.detailsModal()
+				this.loadData();
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	search() {
+		this.loadData();
+	},
+	reset() {
+		this.state.nameSearch = '';
+		this.state.adminName=''
+		this.loadData();
+	},
+	searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+	//整行点击
+	tableRowClick(record, index) {
+		this.state.RowData = record;
+		this.detailsModalOk(record);
+		this.setState({
+			name:record.name,
+			id:record.id,
+		})
+	},
+	detailsModalOk(e) {
+		this.setState({ 
+			modal5Visible: true 
+		}); //需要一个请求数据
+	},
+	detailsModal(e){
+		this.setState({ 
+			modal5Visible: false 
+		});
+	},
+
+	componentWillReceiveProps(nextProps) {
+		if(!this.props.visible && nextProps.visible) {
+			if(nextProps.data && nextProps.data.id) {
+				this.loadData(nextProps.data.id, nextProps.detailApiUrl);
+			};
+			this.state.data = {};
+			this.state.companyLogoUrl = [];
+			this.state.orgCodeUrl = [];
+			this.loadData(null);
+
+		};
+	},
+	render() {
+		const FormItem = Form.Item
+		const rowSelection = {
+			selectedRowKeys: this.state.selectedRowKeys,
+			onChange: (selectedRowKeys, selectedRows) => {
+				this.setState({
+					selectedRows: selectedRows.slice(-1),
+					selectedRowKeys: selectedRowKeys.slice(-1)
+				});
+			},
+			onSelect: (recordt, selected, selectedRows) => {
+				this.setState({
+					recordt: recordt.id
+				})
+			},
+		};
+		const rowSelections = {
+			selectedRowKeys: this.state.selectedRowKey,
+			onChange: (selectedRowKey, selectedRow) => {
+				this.setState({
+					selectedRow: selectedRow.slice(-1),
+					selectedRowKey: selectedRowKey.slice(-1)
+				});
+			},
+			onSelect: (records, selected, selectedRow) => {
+				this.setState({
+					selectedRow: selectedRow.slice(-1),
+					records: records.id,
+				})
+			},
+
+		};
+		const hasSelected = this.state.selectedRowKeys.length > 0;
+		const { RangePicker } = DatePicker;
+		const { getFieldDecorator } = this.props.form;
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		//const theDatak = this.state.datak || {};
+		const theInformation = this.state.dataInformation || {}
+		const contactsOption = "";
+		const formItemLayput = {
+			labelCol: { span: 10 },
+			wrapperCol: { span: 14 },
+		};
+		const contacts = this.state.contacts || '';
+		return(
+			<div className="user-content" >
+                <div className="content-title">                  
+                    <span>客户资料审核</span>
+                </div>
+                <div className="user-search">                    
+                    <Input placeholder="客户名称"
+                        value={this.state.nameSearch}
+                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
+                    <Input placeholder="营销员"
+                        value={this.state.adminName}
+                        onChange={(e) => { this.setState({ adminName: e.target.value }); }} /> 
+                    <Button type="primary" onClick={this.search}>搜索</Button>
+                    <Button onClick={this.reset}>重置</Button>                                         				
+				</div>                                               
+                <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                        <Table columns={this.state.columns}
+                            dataSource={this.state.dataSource}    
+                            rowSelection={rowSelection}
+                            pagination={this.state.pagination} 
+                            onRowClick={this.tableRowClick}
+                           />
+                    </Spin>
+                </div> 
+                <Modal	
+				      className="customeDetails"				      
+			          title="客户资料审核"
+			          width='500px'
+			          visible={this.state.modal5Visible}
+			          onOk={this.detailsModal}
+			          onCancel={this.detailsModal}
+			          footer=''
+			        >				    
+					<Form horizontal onSubmit={this.auditRows} id="add-form">
+		                <Spin spinning={this.state.loading}>
+		                    <div className="clearfix">
+		                    	<FormItem 
+			                            labelCol={{ span: 6 }}
+			                        	wrapperCol={{ span: 15 }}
+			                            label="客户名称" >
+		                                <span>{this.state.name}</span>
+			                    </FormItem>
+		                    </div>
+		                    <div className="clearfix">
+	                   		    <FormItem
+			                        labelCol={{ span: 6 }}
+			                        wrapperCol={{ span: 15 }}
+			                        label="审核意见" >					                        
+			                        <Input type="textarea" rows={4} placeholder="审核意见" value={this.state.auditOpinion}
+                       				 	onChange={(e) => { this.setState({ auditOpinion: e.target.value }) }} style={{width:'95%'}}/>					                           
+			                    </FormItem>
+			                </div>    
+		                    <FormItem wrapperCol={{ span: 25, offset: 4 }}>
+		                        <Button className="set-submit" type="primary" onClick={this.auditRowse}>审核通过</Button> 
+		                        <Button className="set-submit" type="primary" htmlType="submit" style={{marginLeft:'30px'}}>审核不通过</Button>  
+		                        <Button className="set-submit" type="ghost" onClick={this.detailsModal} style={{marginLeft:'30px'}}>取消</Button>
+		                    </FormItem> 
+		                </Spin>
+		            </Form >                          
+				</Modal>
+          </div >
+		);
+	}
+}));
+
+//const Tablees=Form.create()(React.createClass({
+//	//详情tab切换数据处理
+//	callbacks(e) {
+//		this.setState({
+//			callnubs: e,
+//		})
+//		if(e == '1') {
+//			
+//		}
+//		if(e == '2') {
+//			
+//		}
+//		
+//	},
+//	getInitialState() {
+//		return {
+//			callnubs: "1",
+//		}
+//	},
+//	render() {
+//		return(
+//			<div className="clearfix" style={{marginTop:'0px',marginLeft:'20px'}}>
+//			    <Tabs onChange={this.callbacks} type="card" activeKey={this.state.callnubs} style={{paddingLeft:'15px',paddingRight:'15px',marginRight:'20px'}}>
+//			         <TabPane tab="个人客户" key="1" >
+//			         	<QueryCustomer />
+//			         </TabPane>
+//					 <TabPane tab="单位客户" key="2">
+//					 	<PublicCustomer />
+//					 </TabPane>
+//			    </Tabs>
+//			</div>
+//		);
+//	}
+//}));
+export default PublicCustomer;
+
+
+
+

+ 402 - 0
js/component/manageCenter/customer/reviewed/enteringAuditOne.jsx

@@ -0,0 +1,402 @@
+import React from 'react';
+import { Radio, Icon, Button, Cascader, Input, Select, Tabs, Spin, Popconfirm, Table, Switch, message, DatePicker, Modal, Upload, Form, Row, Col } from 'antd';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import moment from 'moment';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
+const { Column, ColumnGroup } = Table;
+const TabPane = Tabs.TabPane;
+const monthFormat = 'YYYY/MM';
+import CustomerDetail from './myClientDesc.jsx';
+import { socialAttribute, industry, auditStatusL, newFollow, lvl, currentMember, statuslist, customerStatus, intentionalService } from '../../../dataDic.js';
+import { getSocialAttribute, splitUrl,getAuditStatus, getCompanyIntention, getStatuslist, getContactType, getIndustryType, getfllowSituation, beforeUploadFile, getWhether, getcustomerStatue, getfllowSituationOn, getCertification, getcustomerTyp, getLvl, getCurrentMember, getprovince } from '../../../tools.js';
+
+const QueryCustomer = Form.create()(React.createClass({
+	loadData(pageNo) {
+		this.state.data = [];
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/customer/findEnteringAudit',
+			data: {
+				pageNo: pageNo || 1,
+				pageSize: this.state.pagination.pageSize,
+				name: this.state.nameSearch,//客户名称
+				adminName:this.state.adminName,//营销员名称
+			},
+			success: function(data) {
+				let theArr = [];
+				let thisdata;
+				if(data.error.length || 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++) {
+						thisdata = data.data.list[i];
+						theArr.push({
+							key: i,
+							id: thisdata.uid,
+							name: thisdata.name,
+							createTime: thisdata.createTime,
+							adminName: thisdata.adminName,
+							contactMobile: thisdata.contactMobile,
+						});
+					};
+					this.state.pagination.current = data.data.pageNo;
+				    this.state.pagination.total = data.data.totalCount;
+				};
+				if(!data.data.list.length){
+					this.state.pagination.current=0;
+					this.state.pagination.total=0;
+				}
+				this.setState({
+					
+					dataSource: theArr,
+					pagination: this.state.pagination,
+					selectedRowKeys:[]
+				});
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
+
+	//点击出现函数
+	setModal2VisibleOk(e) {
+		this.setState({
+			modal2Visible: true
+		});
+
+	},
+	//点击消失函数
+	setModal2Visiblecancel(e) {
+		this.setState({
+			modal2Visible: false
+		});
+	},
+	getPictureUrl(e) {
+		this.setState({ pictureUrl: e });
+	},
+
+	handleOk(e) {
+		this.setState({
+			visible: false,
+		});
+	},
+	handleCancel(e) {
+		this.setState({
+			visible: false,
+		});
+	},
+	getInitialState() {
+		return {
+			addressSearch: [],
+			orgCodeUrl: [],
+			companyLogoUrl: [],
+			visible: false,
+			searchMore: true,
+			releaseDate: [],
+			releaseDate: [],
+			selectedRowKeys: [],
+			selectedRowKey: [],
+			selectedRows: [],
+			loading: false,
+			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: 'name',
+					key: 'name',
+				}, {
+					title: '联系电话',
+					dataIndex: 'contactMobile',
+					key: 'contactMobile',
+				},
+				{
+					title: '营销员',
+					dataIndex: 'adminName',
+					key: 'adminName',
+				},
+				{
+					title: '创建时间',
+					dataIndex: 'createTime',
+					key: 'createTime',
+				}, {
+                    title: '审核操作',
+                    dataIndex: 'ee',
+                    key: 'ee',
+                    render: (text, record, index) => {
+                    	return <div>
+							<Popconfirm title={'请确认通过【'+record.name+'】'} onConfirm={(e)=>{this.examineOK(record)}} okText="确认" cancelText="取消">
+							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">通过</Button>                 
+							</Popconfirm>
+                        </div>
+					}
+                }
+			],
+			dataSource: [],
+		};
+	},
+	 //审核不通过
+    examineCancel(record){
+    	let api=2;
+    	this.examine(api,record);
+    },
+	 //审核通过
+    examineOK(record){
+    	let api=1;
+    	this.examine(api,record);
+    },
+    examine(api,record) {
+        this.setState({
+            selectedRowKeys: [],
+        });
+        $.ajax({
+            method: "POST",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+            data: {
+                id:record.id,
+                auditStatus:api,
+                auditOpinion:this.state.auditOpinion,
+             }
+        }).done(function (data) {
+            if (!data.error.length) {
+                message.success('操作成功');
+                this.setState({
+                    loading: false,
+                });
+            } else {
+                message.warning(data.error[0].message);
+            };
+            this.loadData();
+        }.bind(this));
+    },
+	componentWillMount() {
+		this.loadData();
+	},
+	//审核实名认证不通过功能
+	auditRows(e) {
+		e.preventDefault();	
+		$.ajax({
+			url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+			method: 'post',
+			data: {
+				id:this.state.id,
+                auditOpinion:this.state.auditOpinion,
+                auditStatus:2,
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.detailsModal()
+				this.loadData();
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	//审核实名认证通过功能
+	auditRowse(e) {
+		e.preventDefault();	
+		$.ajax({
+			url: globalConfig.context + '/api/admin/customer/updateEnteringAudit',
+			method: 'post',
+			data: {
+				id:this.state.id,
+                auditOpinion:this.state.auditOpinion,
+                auditStatus:1,
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.detailsModal()
+				this.loadData();
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	search() {
+		this.loadData();
+	},
+	reset() {
+		this.state.nameSearch = '';
+		this.state.adminName=''
+		this.loadData();
+	},
+	searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+	//整行点击
+	tableRowClick(record, index) {
+		this.state.RowData = record;
+		this.detailsModalOk(record);
+		this.setState({
+			name:record.name,
+			id:record.id,
+		})
+	},
+	detailsModalOk(e) {
+		this.setState({ 
+			modal5Visible: true 
+		}); //需要一个请求数据
+	},
+	detailsModal(e){
+		this.setState({ 
+			modal5Visible: false 
+		});
+	},
+	componentWillReceiveProps(nextProps) {
+		if(!this.props.visible && nextProps.visible) {
+			if(nextProps.data && nextProps.data.id) {
+				this.loadData(nextProps.data.id, nextProps.detailApiUrl);
+			};
+			this.state.data = {};
+			this.state.companyLogoUrl = [];
+			this.state.orgCodeUrl = [];
+			this.loadData(null);
+
+		};
+	},
+	render() {
+		const FormItem = Form.Item
+		const rowSelection = {
+			selectedRowKeys: this.state.selectedRowKeys,
+			onChange: (selectedRowKeys, selectedRows) => {
+				this.setState({
+					selectedRows: selectedRows.slice(-1),
+					selectedRowKeys: selectedRowKeys.slice(-1)
+				});
+			},
+			onSelect: (recordt, selected, selectedRows) => {
+				this.setState({
+					recordt: recordt.id
+				})
+			},
+		};
+		const rowSelections = {
+			selectedRowKeys: this.state.selectedRowKey,
+			onChange: (selectedRowKey, selectedRow) => {
+				this.setState({
+					selectedRow: selectedRow.slice(-1),
+					selectedRowKey: selectedRowKey.slice(-1)
+				});
+			},
+			onSelect: (records, selected, selectedRow) => {
+				this.setState({
+					selectedRow: selectedRow.slice(-1),
+					records: records.id,
+				})
+			},
+
+		};
+		const hasSelected = this.state.selectedRowKeys.length > 0;
+		const { RangePicker } = DatePicker;
+		const { getFieldDecorator } = this.props.form;
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		//const theDatak = this.state.datak || {};
+		const theInformation = this.state.dataInformation || {}
+		const contactsOption = "";
+		const formItemLayput = {
+			labelCol: { span: 10 },
+			wrapperCol: { span: 14 },
+		};
+		const contacts = this.state.contacts || '';
+		return(
+			<div className="user-content" >
+                <div className="content-title">                  
+                    <span>个人客户资料审核</span>
+                </div>
+                <div className="user-search">                    
+                    <Input placeholder="客户名称"
+                        value={this.state.nameSearch}
+                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
+                    <Input placeholder="营销员"
+                        value={this.state.adminName}
+                        onChange={(e) => { this.setState({ adminName: e.target.value }); }} /> 
+                    <Button type="primary" onClick={this.search}>搜索</Button>
+                    <Button onClick={this.reset}>重置</Button>    
+                </div>                                               
+                <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                        <Table columns={this.state.columns}
+                            dataSource={this.state.dataSource}    
+                            rowSelection={rowSelection}
+                            pagination={this.state.pagination} 
+                            onRowClick={this.tableRowClick}
+                           />
+                    </Spin>
+                </div> 
+                <Modal	
+				      className="customeDetails"				      
+			          title="个人客户资料审核"
+			          width='500px'
+			          visible={this.state.modal5Visible}
+			          onOk={this.detailsModal}
+			          onCancel={this.detailsModal}
+			          footer=''
+			        >				    
+					<Form horizontal onSubmit={this.auditRows} id="add-form">
+		                <Spin spinning={this.state.loading}>
+		                    <div className="clearfix">
+		                    	<FormItem 
+			                            labelCol={{ span: 6 }}
+			                        	wrapperCol={{ span: 15 }}
+			                            label="客户名称" >
+		                                <span>{this.state.name}</span>
+			                    </FormItem>
+		                    </div>
+		                    <div className="clearfix">
+	                   		    <FormItem
+			                        labelCol={{ span: 6 }}
+			                        wrapperCol={{ span: 15 }}
+			                        label="审核意见" >					                        
+			                        <Input type="textarea" rows={4} placeholder="审核意见" value={this.state.auditOpinion}
+                       				 	onChange={(e) => { this.setState({ auditOpinion: e.target.value }) }} style={{width:'95%'}}/>					                           
+			                    </FormItem>
+			                </div>    
+		                    <FormItem wrapperCol={{ span: 25, offset: 4 }}>
+		                        <Button className="set-submit" type="primary" onClick={this.auditRowse}>审核通过</Button> 
+		                        <Button className="set-submit" type="primary" htmlType="submit" style={{marginLeft:'30px'}}>审核不通过</Button>  
+		                        <Button className="set-submit" type="ghost" onClick={this.detailsModal} style={{marginLeft:'30px'}}>取消</Button>
+		                    </FormItem> 
+		                </Spin>
+		            </Form >                     
+				</Modal>
+            </div >
+		);
+	}
+}));
+
+export default QueryCustomer;

+ 1 - 1
js/component/manageCenter/customer/reviewed/identityAudits.jsx

@@ -12,7 +12,7 @@ const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
 import CustomerDetail from './myClientDesc.jsx';
 import { socialAttribute, industry, auditStatusL, newFollow, lvl, currentMember, statuslist, customerStatus, intentionalService } from '../../../dataDic.js';
-import { getSocialAttribute, splitUrl,getAuditStatus, getCompanyIntention, getStatuslist, getContactType, getIndustryType, getfllowSituation, beforeUploadFile, getWhether, getcustomerStatue, getfllowSituationOn, getCertification, getcustomerTyp, getLvl, getCurrentMember, getprovince } from '../../../tools.js';
+import { getSocialAttribute, splitUrl,getAuditStatus, getCompanyIntention, getStatuslist, getContactType, getIndustryType,getIndustry, getfllowSituation, beforeUploadFile, getWhether, getcustomerStatue, getfllowSituationOn, getCertification, getcustomerTyp, getLvl, getCurrentMember, getprovince } from '../../../tools.js';
 //图片组件
 const PicturesWalls = React.createClass({
 	getInitialState() {

+ 5 - 4
js/component/manageCenter/order/myOrder/addService.jsx

@@ -271,7 +271,8 @@ const NewService = Form.create()(React.createClass({
 	//添加明细
 	addDetailed(){
 		this.setState({
-			name:'',
+			auto:'',
+			autoId:'',
 			url:'',
 			addState:1,
 			addnextVisible: true
@@ -446,7 +447,7 @@ const NewService = Form.create()(React.createClass({
            });     
    	    }
 		this.setState({
-			theTypes:theType
+			autoId:theType
 		})
 	},
 	//值改变时请求客户名称
@@ -567,7 +568,7 @@ const NewService = Form.create()(React.createClass({
 						                    	<FormItem 
 							                            {...formItemLayout}
 							                            label="订单类型" > 
-							                            <Select placeholder="请输入订单类型"
+							                            <Select placeholder="请选择订单类型"
 								                            style={{ width:'240px'}}
 								                            value={this.state.orderType}
 								                            onChange={(e) => { this.setState({ orderType: e }) }}>
@@ -823,7 +824,7 @@ const NewService = Form.create()(React.createClass({
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
 			                <Spin spinning={this.state.loading}>
-			                        {true?<div className="clearfix">
+			                        {this.state.addState?<div className="clearfix">
 				                    	<FormItem className="half-middle"
 				                            {...formItemLayout}
 				                            label="服务名称" >   

+ 1 - 1
js/component/manageCenter/order/userMangagement.less

@@ -79,6 +79,6 @@
 }
 .setSave{margin-right: 10px;margin-left: 150px;}
 .toVoid{float: left;margin-right: 10px;}
-.btnSave{text-align: center;margin-top: 10px;}
+.btnSave{text-align: center;margin-top: 10px;overflow: hidden;}
 .ant-calendar-picker{vertical-align: top;margin-top: 11px;}
 .ant-calendar-picker-input{height: 27px;}

+ 5 - 2
js/component/manageCenter/servicesManage/projectOrder/content.jsx

@@ -1,8 +1,9 @@
 import React from 'react';
 import '../../content.less';
 import LeftTab from '../leftTab.jsx';
-import ProjectOrder from './projectOrder.jsx';
-import Module from '../../module.jsx'
+import ProjectOrder from './orderOrder/projectOrder.jsx';
+import ProjectManage from './projectManagement/projectManage.jsx';
+import Module from '../../module.jsx';
 
 const Content = React.createClass({
     getInitialState() {
@@ -31,6 +32,8 @@ const Content = React.createClass({
                         switch (this.state.leftKey) {
                             case 'myProject':
                                 return <ProjectOrder />;
+                            case 'projectManage':
+                                return <ProjectManage />;
                             default:
                                 return <Module />;  
                         };

+ 135 - 71
js/component/manageCenter/servicesManage/projectOrder/projectOrder.jsx

@@ -5,9 +5,9 @@ import $ from 'jquery/src/ajax';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, Modal, Upload ,Popconfirm} from 'antd';
 import MySettlementDetaile from "./projectOrderDetaile.jsx";
 import moment from 'moment';
-import './userMangagement.less';
-import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../dataDic.js';
-import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../tools.js';
+import '../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../../tools.js';
 
 const ProjectOrder=Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -73,6 +73,7 @@ const ProjectOrder=Form.create()(React.createClass({
             selectedRows: [],
             searchMore: true,
             loading: false,
+            KnotState:true,
             distributionVisible:false,
             visible:false,
             showDesc:false,
@@ -88,18 +89,6 @@ const ProjectOrder=Form.create()(React.createClass({
                     return '共' + total + '条数据';
                 }
             },
-            distributionPagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
-                pageSize: 10,
-                onChange: function (page) {
-                    this.contactList(page);
-                }.bind(this),
-                showTotal: function (total) {
-                    return '共' + total + '条数据';
-                }
-            },
             columns: [
                 {
                     title: '订单编号',
@@ -152,9 +141,10 @@ const ProjectOrder=Form.create()(React.createClass({
                     key: 'rr',
                     render:(text,record,index)=>{
                     	return (
-                    		<Popconfirm title={'您确认将订单【'+record.roleName+'】进行立项,立项后可进行项目管理。'} onConfirm={(e)=>{this.edit(record)}} okText="确定立项" cancelText="暂不立项">
-								<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation() }}>立项</Button>                 
-							</Popconfirm>
+                    		<div>
+								<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation(),this.edit(record) }}>立项</Button>                 
+								<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation(),this.Knot(record)}}>结项</Button>                 
+							</div>
 							)
                     }
                 }
@@ -162,57 +152,86 @@ const ProjectOrder=Form.create()(React.createClass({
             dataSource: [],
         };
     },
-    //操作分配
-    confirmDelet(index){
-    	this.setState({
-    		userDetaile:false,
-    	});
-    	this.contactList(1,index.id)
-    },
-    //驳回
-    reject(record){
-    	let api ='api/bohui'
-    	this.confirmSelect(api,record)
+    componentWillMount() {
+        this.loadData();
     },
-    //确认
-    confirm(record){
-    	let api='api/quren'
-    	this.confirmSelect(api,record)
+    //立项
+    edit(record) {
+    	this.setState({
+    		Kid:record.id,
+    		KnotState:true,
+    		signBillVisible:true
+    	})
+    	this.editData(record,1)
     },
-    confirmSelect(api,record){
+    //结项
+    Knot(record){
     	this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "POST",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + api,
-            data: {
-            	id:record.id,
-            }
-        }).done(function (data) {
-            if (!data.error.length) {
-                message.success('操作成功');
-                this.setState({
-                    loading: false,
-                });
-            } else {
-                message.warning(data.error[0].message);
-            };
-            this.loadData();
-        }.bind(this));
+    		Kid:record.id,
+    		KnotState:false,
+    		signBillVisible:true
+    	})
+    	this.editData(record,0)
     },
-    componentWillMount() {
-        this.loadData();
+    noProject(){
+    	this.setState({
+    		signBillVisible:false
+    	})
     },
-    edit(record) {
-    	this.state.userDetaile=true;
-        this.state.datauser = record;
-        this.setState({
-            showDesc: true
-        });
+    //立项。结项前数据获取
+    editData(xhr,state){
+    	let api =state?'api/lixiang-shuju':'api/jiexiang-shuju';
+    	$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/1313',
+			data: {
+				id:xhr.id,
+			},
+			success: function (data) {
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                } else {
+                   
+                };
+			}.bind(this)},
+    	).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
     },
+    //立项、结项保存操作
+	projectSubmit(e){
+		e.preventDefault();
+		this.setState({
+			loading: true
+		});
+		let api=this.state.KnotState?'/api/admin/lixiang':'/api/admin/jiexiang';
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +api ,
+			data: {
+				id:this.state.Kid,
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.noProject();
+				this.loadData();			
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
     closeDesc(e, s) {
     	this.state.userDetaile=false;
         this.state.showDesc = e;
@@ -228,13 +247,12 @@ const ProjectOrder=Form.create()(React.createClass({
     search() {
         this.loadData();
     },
-    //分配时搜索
-    searchOrder() {
-        this.contactList();
-    },
-    //分配时重置
-    resetOrder() {
-        this.contactList();
+    tableRowClick(record, index) {
+        this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+            showDesc: true
+        });
     },
     reset() {
     	this.state.customerNameSearch='';
@@ -246,6 +264,11 @@ const ProjectOrder=Form.create()(React.createClass({
         this.loadData();       
     },
     render() {
+    	const FormItem = Form.Item;
+    	const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
             onChange: (selectedRowKeys, selectedRows) => {
@@ -316,16 +339,57 @@ const ProjectOrder=Form.create()(React.createClass({
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}
+	                            onRowClick={this.tableRowClick}
 	                            />
 	                    </Spin>
 	                </div>
 	                <MySettlementDetaile
-	                	confirmDelet={this.confirmDelet}
 	                    userDetaile={this.state.userDetaile}
 	                    datauser={this.state.datauser}
 	                    showDesc={this.state.showDesc}
 	                    closeDesc={this.closeDesc} />
 	            </div >
+	            <Modal maskClosable={false} visible={this.state.signBillVisible}
+                        onOk={this.noProject} onCancel={this.noProject}
+                        width='800px'
+                        title={this.state.KnotState?'项目立项':'项目结项'}                   
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" onSubmit={this.projectSubmit} id="demand-form">
+			                <Spin spinning={this.state.loading}>
+			                        <div className="clearfix">
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="项目编号" >   
+				                                   <span></span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="客户名称" >   
+				                                   <span></span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label={this.state.KnotState?"立项时间":'结项时间'}>   
+				                                   <span></span>
+					                    </FormItem>
+						                <div className='clearfix'>
+								        	<FormItem
+									            labelCol={{ span: 4 }}
+									            wrapperCol={{ span: 16 }}
+									            label={this.state.KnotState?"立项说明":'结项说明'} >
+									                <Input type="textarea" placeholder="请输入备注" rows={4}  value={this.state.introduction} 
+										    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+									        </FormItem>
+								        </div>
+				                    </div>
+			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
+			                        <Button className="submitSave" type="primary" htmlType="submit">{this.state.KnotState?"确定立项":'确定结项'}</Button>  
+			                        <Button className="submitSave" type="ghost" onClick={this.noProject}>返回</Button>
+			                    </FormItem> 
+			                </Spin>
+			            </Form >
+			        </Modal>
             </div>
         );
     }

+ 52 - 13
js/component/manageCenter/servicesManage/projectOrder/projectOrderDetaile.jsx

@@ -2,8 +2,8 @@ import React from 'react';
 import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import './userMangagement.less';
-import {lvl} from '../../../dataDic.js';
+import '../userMangagement.less';
+import {lvl} from '../../../../dataDic.js';
 
 const MySettlementDetaile = Form.create()(React.createClass({
 	loadData() {
@@ -99,16 +99,9 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     };
                     thisData = {};
                 };
-                let idList=[];
-                thisData.map(function(item){
-                	idList.push(
-                		item.pid
-                	)
-                })
                 this.setState({
 					ids:record.id,
                 	roleName:thisData[0].rname,
-                	checkedKeys:idList,	
                 });                  
             }.bind(this),
        }).always(function () {
@@ -118,6 +111,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
         }.bind(this));  
        }
     },
+    //编辑保存项目
 	handleOk(e) {
 		this.setState({
 			visible: false,
@@ -130,6 +124,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 		});
 		this.props.closeDesc(false);
 	},
+	
 	componentWillMount() {
 		
 	},
@@ -174,6 +169,36 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	        }.bind(this));  
 	    }
 	},
+	//编辑订单保存
+	handleSubmit(e) {
+		e.preventDefault();
+		this.props.form.validateFields((err, values) => {
+			if(!err) {
+				this.setState({
+					loading: true
+				});
+				$.ajax({
+					method: "POST",
+					dataType: "json",
+					crossDomain: false,
+					url: globalConfig.context + '/api/000',
+					data: {
+						id:this.props.datauser.id
+					}
+				}).done(function(data) {
+					this.setState({
+						loading: false
+					});
+					if(!data.error.length) {
+						message.success('保存成功!');
+						this.handleOk()
+					} else {
+						message.warning(data.error[0].message);
+					}
+				}.bind(this));
+			}
+		});
+	},
 	tableRowClick(record, index) {
         this.setState({
         	addnextVisible:true,
@@ -204,7 +229,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
                     title='编辑订单'                     
                     footer=''
                     className="admin-desc-content">
-		            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} >
+		            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} onSubmit={this.handleSubmit}>
 		                <Spin spinning={this.state.loading}>
 	                        <div className="clearfix">
 	                            <div className="clearfix">
@@ -251,8 +276,17 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                    <div className='clearfix'>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="特批立项" >   
-				                            <span>{orderDetaiel.roleName}</span>
+				                            label="特批立项" >  
+				                            <Select placeholder="选择特批立项类型"
+					                            style={{ width:'240px'}}
+					                            value={this.state.orderType}
+					                            onChange={(e) => { this.setState({ orderType: e }) }}>
+					                            <Select.Option value='0'>不特批</Select.Option>
+					                            <Select.Option value='1'>申请特批</Select.Option>
+					                            <Select.Option value='2'>特批通过</Select.Option>
+					                            <Select.Option value='3'>特批驳回</Select.Option>
+					                        </Select>
+				                    		<span className="mandatory">*</span>
 			                    		</FormItem>
 			                    	</div>
 			                        <div className='clearfix'>
@@ -260,7 +294,8 @@ const MySettlementDetaile = Form.create()(React.createClass({
 								            labelCol={{ span: 4 }}
 								            wrapperCol={{ span: 16 }}
 								            label="订单留言" >
-							        		<span>{orderDetaiel.roleName}</span>
+							        		 <Input type="textarea" placeholder="请输入订单留言" rows={4}  value={this.state.introduction} 
+													onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
 								        </FormItem>
 							        </div>
 		                        </div>
@@ -315,6 +350,10 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				                            />
 				                    </Spin>
 					            </div>
+					            <div style={{marginTop:'30px',paddingLeft:'100px'}}>
+						            <Button className="setSave" type="primary" htmlType="submit" style={{marginRight:'50px'}}>保存</Button>  
+						            <Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
+					            </div>
 		                    </div>
 		                </Spin>
 		            </Form >

+ 525 - 0
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx

@@ -0,0 +1,525 @@
+import React from 'react';
+import ReactDom from 'react-dom';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, Modal, Upload ,Popconfirm,DatePicker} from 'antd';
+import MySettlementDetaile from "./projectManageDetaile.jsx";
+import moment from 'moment';
+import '../userMangagement.less';
+import {lvl,intentProgress,transactionProgress,contractProgress,projectProgress} from '../../../../dataDic.js';
+import {getIntentProgress,getTransactionProgress,getContractProgress,getProjectProgress} from '../../../../tools.js';
+
+const ProjectOrder=Form.create()(React.createClass({
+	loadData(pageNo) {
+        this.state.data = [];
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/roles',
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                startDate: this.state.releaseDate[0],
+				endDate: this.state.releaseDate[1],
+				departmentt:this.state.departmentt,
+				startDateOrder: this.state.releaseDateOrder[0],
+				endDateOrder: this.state.releaseDateOrder[1],
+                customerNameSearch:this.state.customerNameSearch,//客户名称
+                approvedSearch:this.state.approvedSearch, //是否特批
+                orderStatusSearch:this.state.orderStatusSearch, //订单状态
+                orderDepartmentSearch:this.state.orderDepartmentSearch, //订单部门
+                orderLeaderSearch:this.state.orderLeaderSearch,//订单负责人
+                financeLeaderSearch:this.state.financeLeaderSearch,//财务负责人
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    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({
+                             key: i,
+	                         id: thisdata.id,
+	                         roleName: thisdata.roleName,
+	                         creater:thisdata.creater,
+	                         createTime:thisdata.createTimez,
+                        });
+                    };
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                };
+                if(!data.data.list.length){
+					this.state.pagination.current=0
+					this.state.pagination.total=0
+				}
+                this.setState({
+                	newProject:false,
+                    dataSource: theArr,
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getInitialState() {
+        return {
+        	datauser:{},
+            selectedRowKeys: [],
+            selectedRows: [],
+            searchMore: true,
+            releaseDate: [],
+            releaseDateOrder:[],
+            newProject:false,
+            loading: false,
+            KnotState:true,
+            distributionVisible:false,
+            visible:false,
+            showDesc:false,
+            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: 'roleName',
+                    key: 'roleName'
+                },{
+                    title: '立项时间',
+                    dataIndex: 'creater7',
+                    key: 'creater7'
+                },{
+                    title: '客户名称',
+                    dataIndex: 'roleName1',
+                    key: 'roleName1'
+                },
+                {
+                    title: '项目类型',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                }, {
+                    title: '项目负责人',
+                    dataIndex: 'createTime1',
+                    key: 'createTime1',
+                    render:(text)=>{return getIntentProgress(text) }
+                },{
+                    title: '项目状态',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2',
+                    render:(text)=>{return getTransactionProgress(text) }
+                }, {
+                    title: '是否锁定',
+                    dataIndex: 'creater2',
+                    key: 'creater2',
+                    render:(text)=>{return getContractProgress(text) }
+                },{
+                    title: '是否作废',
+                    dataIndex: 'creater77',
+                    key: 'creater77',
+                    render:(text)=>{return getContractProgress(text) }
+                },{
+                    title: '订单编号',
+                    dataIndex: 'creater9',
+                    key: 'creater9',
+                },{
+                    title: '下单时间',
+                    dataIndex: 'creater91',
+                    key: 'creater91',
+                },{
+                    title: '订单状态',
+                    dataIndex: 'creater7700',
+                    key: 'creater7700',
+                    render:(text)=>{return getContractProgress(text) }
+                },{
+                    title: '结算状态',
+                    dataIndex: 'creater922',
+                    key: 'creater922',
+                },{
+                    title: '是否特批',
+                    dataIndex: 'creater9111',
+                    key: 'creater9111',
+                },{
+                	title: '操作',
+                    dataIndex: 'rr',
+                    key: 'rr',
+                    render:(text,record,index)=>{
+                    	return (
+                    		<div>
+								<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation(),this.edit(record) }}>立项</Button>                 
+								<Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation(),this.Knot(record)}}>项目管理</Button>                 
+								<Popconfirm title={'您将作废项目【'+record.roleName+'】,系统将自动同步作废项目任务及项目资料单,请确认'} onConfirm={(e)=>{this.scrapOrder(record)}} okText="确认" cancelText="取消">
+							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">作废</Button>                 
+								</Popconfirm>
+							</div>
+							)
+                    }
+                }
+            ],
+            dataSource: [],
+        };
+    },
+    //部门
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			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,
+							depNo:item.depNo
+						})
+					})
+				}
+				this.setState({
+					departmentArr:theArr,
+				})
+			}.bind(this),
+			}).always(function() {
+				this.setState({
+					loading: false
+				});
+			}.bind(this));
+	},
+	//作废项目
+	scrapOrder(record){
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +'/api/zuofei ,
+			data: {
+				id:record.id,
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.loadData();			
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	//创建项目
+	addClick() {
+        this.setState({
+        	newProject:true,
+        	signBillVisible:false,
+            showDesc: false
+        });
+    },
+    componentWillMount() {
+        this.loadData();
+        this.departmentList()
+    },
+    //立项
+    edit(record) {
+    	this.setState({
+    		newProject:false,
+    		Kid:record.id,
+    		KnotState:true,
+    		signBillVisible:true
+    	})
+    	this.editData(record,1)
+    },
+    //结项
+    Knot(record){
+    	this.setState({
+    		newProject:false,
+    		Kid:record.id,
+    		KnotState:false,
+    		signBillVisible:true
+    	})
+    	this.editData(record,0)
+    },
+    noProject(){
+    	this.setState({
+    		signBillVisible:false
+    	})
+    },
+    //立项。结项前数据获取
+    editData(xhr,state){
+    	let api =state?'api/lixiang-shuju':'api/jiexiang-shuju';
+    	$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/1313',
+			data: {
+				id:xhr.id,
+			},
+			success: function (data) {
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                } else {
+                   
+                };
+			}.bind(this)},
+    	).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    //立项、结项保存操作
+	projectSubmit(e){
+		e.preventDefault();
+		this.setState({
+			loading: true
+		});
+		let api=this.state.KnotState?'/api/admin/lixiang':'/api/admin/jiexiang';
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +api ,
+			data: {
+				id:this.state.Kid,
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('操作成功!');
+				this.noProject();
+				this.loadData();			
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+    closeDesc(e, s) {
+    	this.state.userDetaile=false;
+        this.state.showDesc = e;
+        if (s) {
+            this.loadData();
+        };
+    },
+    searchSwitch() {
+		this.setState({
+			searchMore: !this.state.searchMore
+		});
+	},
+    search() {
+        this.loadData();
+    },
+    tableRowClick(record, index) {
+        this.state.userDetaile=true;
+        this.state.datauser = record;
+        this.setState({
+        	newProject:false,
+            showDesc: true
+        });
+    },
+    reset() {
+    	this.state.customerNameSearch='';
+    	this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+		this.state.releaseDateOrder[0] = undefined;
+		this.state.releaseDateOrder[1] = undefined;
+		this.state.departmentt=undefined;
+		this.state.approvedSearch = undefined;
+		this.state.orderStatusSearch = undefined;
+		this.state.orderDepartmentSearch = undefined;
+		this.state.orderLeaderSearch = '';
+		this.state.financeLeaderSearch = '';
+        this.loadData();       
+    },
+    render() {
+    	const FormItem = Form.Item;
+    	const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		const { RangePicker } = DatePicker;
+        const rowSelection = {
+            selectedRowKeys: this.state.selectedRowKeys,
+            onChange: (selectedRowKeys, selectedRows) => {
+	                this.setState({
+	                    selectedRows: selectedRows.slice(-1),
+	                    selectedRowKeys: selectedRowKeys.slice(-1)
+	                }); 
+            },
+            onSelectAll: (selected, selectedRows, changeRows) => {
+			   this.setState({
+			   		selectedRowKeys:[]
+			   })
+			},
+        };
+        const hasSelected = this.state.selectedRowKeys.length > 0;
+        let departmentArr = this.state.departmentArr || [];
+        return (
+            <div className="user-content" >
+                <div className="content-title">
+                	<span style={{fontSize:'16px'}}>项目管理</span>	
+	                <div className="user-search">
+	                    <Input placeholder="客户名称" style={{width:'150px'}}
+	                        value={this.state.customerNameSearch}
+	                        onChange={(e) => { this.setState({ customerNameSearch: e.target.value }); }} />
+	                    <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 }); }} /> 
+	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
+	                    <Button onClick={this.reset}>重置</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>
+	                </div>
+	                <div className='clearfix' style={{marginTop:'5px'}}>
+	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
+	                        <Select placeholder="项目状态"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderDepartmentSearch}
+	                            onChange={(e) => { this.setState({ orderDepartmentSearch: e }) }}>
+	                            {
+                                    lvl.map(function (item) {
+                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+                                    })
+                                }
+	                        </Select>
+	                        <Select placeholder="是否锁定"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderDepartmentSearch}
+	                            onChange={(e) => { this.setState({ orderDepartmentSearch: e }) }}>
+	                            <Select.Option value='0'>未锁定</Select.Option>
+	                            <Select.Option value='1'>已锁定</Select.Option>
+	                        </Select>
+	                        <Select placeholder="是否作废"
+	                            style={{ width: 150 ,marginRight:'10px'}}
+	                            value={this.state.orderDepartmentSearch}
+	                            onChange={(e) => { this.setState({ orderDepartmentSearch: e }) }}>
+	                            <Select.Option value='0'>未作废</Select.Option>
+	                            <Select.Option value='1'>已作废</Select.Option>
+	                        </Select>
+	                        <Input placeholder="订单编号" style={{width:'150px',margin:'10px'}}
+		                        value={this.state.customerNameSearch}
+		                        onChange={(e) => { this.setState({ customerNameSearch: e.target.value }); }} />
+	                        <Select placeholder="选择部门" style={{width:'150px'}}
+	                            value={this.state.departmentt}
+	                            onChange={(e) => { this.setState({ departmentt: e }) }}>
+	                            {
+	                                departmentArr.map(function (item) {
+	                                        return <Select.Option key={item.depNo} >{item.name}</Select.Option>
+	                                })
+	                            }
+	                        </Select>
+	                        <Input placeholder="订单负责人" style={{width:'150px',margin:'10px'}}
+		                        value={this.state.customerNameSearch}
+		                        onChange={(e) => { this.setState({ customerNameSearch: e.target.value }); }} />
+	                        <RangePicker
+		                        value={[this.state.releaseDateOrder[0] ? moment(this.state.releaseDateOrder[0]) : null,
+		                        this.state.releaseDateOrder[1] ? moment(this.state.releaseDateOrder[1]) : null]}
+		                        onChange={(data, dataString) => { this.setState({ releaseDateOrder: dataString }); }} /> 
+	                    </div>
+	                </div>
+	                <div className="patent-table">
+	                    <Spin spinning={this.state.loading}>
+	                        <Table columns={this.state.columns}
+	                            dataSource={this.state.dataSource}
+	                            rowSelection={rowSelection}
+	                            pagination={this.state.pagination}
+	                            onRowClick={this.tableRowClick}
+	                            />
+	                    </Spin>
+	                </div>
+	                <MySettlementDetaile
+	                    newProject={this.state.newProject}
+	                    userDetaile={this.state.userDetaile}
+	                    datauser={this.state.datauser}
+	                    showDesc={this.state.showDesc}
+	                    closeDesc={this.closeDesc} />
+	            </div >
+	            <Modal maskClosable={false} visible={this.state.signBillVisible}
+                        onOk={this.noProject} onCancel={this.noProject}
+                        width='800px'
+                        title={this.state.KnotState?'项目立项':'项目结项'}                   
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" onSubmit={this.projectSubmit} id="demand-form">
+			                <Spin spinning={this.state.loading}>
+			                        <div className="clearfix">
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="项目编号" >   
+				                                   <span></span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="客户名称" >   
+				                                   <span></span>
+					                    </FormItem>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label={this.state.KnotState?"立项时间":'结项时间'}>   
+				                                   <span></span>
+					                    </FormItem>
+						                <div className='clearfix'>
+								        	<FormItem
+									            labelCol={{ span: 4 }}
+									            wrapperCol={{ span: 16 }}
+									            label={this.state.KnotState?"立项说明":'结项说明'} >
+									                <Input type="textarea" placeholder="请输入备注" rows={4}  value={this.state.introduction} 
+										    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+									        </FormItem>
+								        </div>
+				                    </div>
+			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
+			                        <Button className="submitSave" type="primary" htmlType="submit">{this.state.KnotState?"确定立项":'确定结项'}</Button>  
+			                        <Button className="submitSave" type="ghost" onClick={this.noProject}>返回</Button>
+			                    </FormItem> 
+			                </Spin>
+			            </Form >
+			        </Modal>
+            </div>
+        );
+    }
+}));
+
+export default ProjectOrder;
+

+ 553 - 0
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -0,0 +1,553 @@
+import React from 'react';
+import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+import '../userMangagement.less';
+import {lvl} from '../../../../dataDic.js';
+
+const MySettlementDetaile = Form.create()(React.createClass({
+	loadData() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/roles',
+            data: {
+            },
+            success: function (data) {
+                let theArr =[];
+                if (!data.data) {
+                    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;
+                        theArr.push({
+                             key:i,
+                             roleName5:thisdata[i].id   
+                        });
+                    };
+                   }
+                this.setState({
+                    dataSource: theArr,
+                    pagination: false,
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+	getInitialState() {
+		return {
+			loading: false,
+			visible: false,
+			contractState:false,
+			projectVisible:false,
+			orgCodeUrl:[],
+			checkedKeys: [],
+			columns: [
+				{
+                    title: '业务项目名称',
+                    dataIndex: 'roleName',
+                    key: 'roleName'
+                }, {
+                    title: '项目类别',
+                    dataIndex: 'creater1',
+                    key: 'creater1'
+                },{
+                    title: '项目数量',
+                    dataIndex: 'roleName2',
+                    key: 'roleName2'
+                }, {
+                    title: '下单时间',
+                    dataIndex: 'creater4',
+                    key: 'creater4'
+                }, {
+                    title: '项目说明',
+                    dataIndex: 'roleName5',
+                    key: 'roleName5',
+                    render:(text) => {
+                    	return(
+                    		 text?text.substr(0,6)+'...':''
+                    	)
+                    }
+                }
+			]
+		};
+	},
+	//查看基本详情基本信息
+    loaduser(record){
+    	if(record){
+    	$.ajax({
+            method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/role/rolePermission',
+            data: {
+              id: record.id
+            },
+            success: function (data) {
+                let thisData = data.data;                
+                if (!thisData) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    thisData = {};
+                };
+                this.setState({
+					ids:record.id,
+                	roleName:thisData[0].rname,
+                });                  
+            }.bind(this),
+       }).always(function () {
+            this.setState({            	
+                loading: false
+            });
+        }.bind(this));  
+       }
+    },
+    //订单编辑保存
+	handleOk(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false, true);
+	},
+	handleCancel(e) {
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false);
+	},
+	//新建项目
+	projectOk(e) {
+		this.setState({
+			projectVisible: false,
+		});
+		this.props.closeDesc(false, true);
+	},
+	projectCancel(e) {
+		this.setState({
+			projectVisible: false,
+		});
+		this.props.closeDesc(false);
+	},
+	componentWillMount() {
+		
+	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//查看订单明细
+	orderDetails(record){
+		if(record){
+	    	$.ajax({
+	            method: "post",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/role/rolePermission',
+	            data: {
+	              id: record.id
+	            },
+	            success: function (data) {
+	                let thisData = data.data;                
+	                if (!thisData) {
+	                    if (data.error && data.error.length) {
+	                        message.warning(data.error[0].message);
+	                    };
+	                    thisData = {};
+	                };
+	                let idList=[];
+	                thisData.map(function(item){
+	                	idList.push(
+	                		item.pid
+	                	)
+	                })
+	                this.setState({
+						ids:record.id,
+	                });                  
+	            }.bind(this),
+	       }).always(function () {
+	            this.setState({            	
+	                loading: false
+	            });
+	        }.bind(this));  
+	    }
+	},
+	//创建项目保存
+	admissibleOrder(){
+		if(this.state.Names==''||this.state.Names==null){
+        	message.warning('请输入客户名称');
+        	this.refs.Names.focus()
+        	return false;
+        };
+		if(this.state.projectType==undefined){
+        	message.warning('请选择项目类型');
+        	return false;
+        };
+        if(this.state.pName==''||this.state.pName==null){
+        	message.warning('请输入项目负责人');
+        	this.refs.pName.focus()
+        	return false;
+        };
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/xinjianbaocun',
+			data: {
+				
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('保存成功!');
+				this.projectOk()
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	//编辑订单保存
+	handleSubmit(e) {
+		e.preventDefault();
+		this.props.form.validateFields((err, values) => {
+			if(!err) {
+				this.setState({
+					loading: true
+				});
+				$.ajax({
+					method: "POST",
+					dataType: "json",
+					crossDomain: false,
+					url: globalConfig.context + '/api/000',
+					data: {
+						id:this.props.datauser.id
+					}
+				}).done(function(data) {
+					this.setState({
+						loading: false
+					});
+					if(!data.error.length) {
+						message.success('保存成功!');
+						this.handleOk()
+					} else {
+						message.warning(data.error[0].message);
+					}
+				}.bind(this));
+			}
+		});
+	},
+	tableRowClick(record, index) {
+        this.setState({
+        	addnextVisible:true,
+        });
+        this.orderDetails(record)
+    },
+	componentWillReceiveProps(nextProps) { //props改变时触发
+		this.state.projectVisible = nextProps.newProject;
+		this.state.visible = nextProps.showDesc;
+		if(nextProps.userDetaile && nextProps.showDesc ) {
+			if(nextProps.datauser && nextProps.datauser.id ) {
+				this.loaduser(nextProps.datauser);
+				this.loadData();
+			}
+		}
+	},
+	render() {
+		const FormItem = Form.Item
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		const orderDetaiel=this.state.orderList || [];
+		return(
+			<div>
+            <Modal maskClosable={false} visible={this.state.visible}
+                    onOk={this.handleOk} onCancel={this.handleCancel}
+                    width='1000px'
+                    title='编辑订单'                     
+                    footer=''
+                    className="admin-desc-content">
+		            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} onSubmit={this.handleSubmit}>
+		                <Spin spinning={this.state.loading}>
+	                        <div className="clearfix">
+	                            <div className="clearfix">
+		                       		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单编号" >
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="下单时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="客户名称" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单类型" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单渠道" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单状态" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="已收款项" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="结算状态" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+				                    <div className='clearfix'>
+			                    		<FormItem className="half-item"
+				                            {...formItemLayout}
+				                            label="特批立项" >  
+				                            <Select placeholder="选择特批立项类型"
+					                            style={{ width:'240px'}}
+					                            value={this.state.orderType}
+					                            onChange={(e) => { this.setState({ orderType: e }) }}>
+					                            <Select.Option value='0'>不特批</Select.Option>
+					                            <Select.Option value='1'>申请特批</Select.Option>
+					                            <Select.Option value='2'>特批通过</Select.Option>
+					                            <Select.Option value='3'>特批驳回</Select.Option>
+					                        </Select>
+				                    		<span className="mandatory">*</span>
+			                    		</FormItem>
+			                    	</div>
+			                        <div className='clearfix'>
+							        	<FormItem
+								            labelCol={{ span: 4 }}
+								            wrapperCol={{ span: 16 }}
+								            label="订单留言" >
+							        		 <Input type="textarea" placeholder="请输入订单留言" rows={4}  value={this.state.introduction} 
+													onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+								        </FormItem>
+							        </div>
+		                        </div>
+		                        <div className='clearfix'>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="订单负责人" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    	</div>
+		                    	<div className='clearfix'>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="意向时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="签单时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="财务负责人" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="首付时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="项目负责人" >  
+			                            <span>{orderDetaiel.roleName}</span>
+		                    		</FormItem>
+		                    		<FormItem className="half-item"
+			                            {...formItemLayout}
+			                            label="立项时间" >  
+			                            <span>{orderDetaiel.createTimez}</span>
+		                    		</FormItem>
+	                    		</div>
+				                <div>
+				                	<span style={{marginLeft:'50px',fontSize:'20px'}}>订单明细</span>
+				                </div>
+				                <div className="patent-table">
+				                    <Spin spinning={this.state.loading}>
+				                        <Table columns={this.state.columns}
+				                            dataSource={this.state.dataSource}
+				                            pagination={this.state.pagination}
+				                            onRowClick={this.tableRowClick} 
+				                            />
+				                    </Spin>
+					            </div>
+					            <div style={{marginTop:'30px',paddingLeft:'100px'}}>
+						            <Button className="setSave" type="primary" htmlType="submit" style={{marginRight:'50px'}}>保存</Button>  
+						            <Button className="cancel" type="ghost" onClick={this.handleCancel}>返回</Button>
+					            </div>
+		                    </div>
+		                </Spin>
+		            </Form >
+		        </Modal>
+		        <Modal maskClosable={false} visible={this.state.addnextVisible}
+                        onOk={this.nextCancel} onCancel={this.nextCancel}
+                        width='550px'
+                        title='查看订单明细服务'                     
+                        footer=''
+                        className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form">
+			                <Spin spinning={this.state.loading}>
+		                        <div className="clearfix">
+	                        	    <FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务名称" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="项目类别" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="项目数量" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="下单时间" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+			                    	<FormItem className="half-middle"
+				                            {...formItemLayout}
+				                            label="服务说明" >
+			                    			<span>{this.state.aaa}</span>
+			                    	</FormItem>
+		                        </div>
+			                </Spin>
+			            </Form >
+			        </Modal>
+			        <Modal maskClosable={false} visible={this.state.projectVisible}
+	                    onOk={this.projectOk} onCancel={this.projectCancel}
+	                    width='1000px'
+	                    title='创建订单'                     
+	                    footer=''
+	                    className="admin-desc-content">
+			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}} onSubmit={this.addProjectSubmit}>
+			                <Spin spinning={this.state.loading}>
+			                        <div className="clearfix">
+			                        	<div>
+						                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="订单关联" > 
+					                            <span>{this.state.roleName}</span>
+						                    </FormItem>
+					                    </div>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="订单状态" > 
+					                            <span>{this.state.roleName}</span>
+						                </FormItem>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="订单时间" > 
+					                            <span>{this.state.roleName}</span>
+						                </FormItem>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="结算状态" > 
+					                            <span>{this.state.roleName}</span>
+						                </FormItem>
+					                    <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="是否特批" > 
+					                            <span>{this.state.roleName}</span>
+						                </FormItem>
+						                <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="订单类型" > 
+					                            <span>{this.state.roleName}</span>
+						                </FormItem>
+						                <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="订单负责人" > 
+					                            <span>{this.state.roleName}</span>
+						                </FormItem>
+						                <div className='clearfix'>
+							                <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="客户名称" > 
+					                             <Input placeholder="客户名称" value={this.state.Names} 
+					                                    onChange={(e)=>{this.setState({Names:e.target.value})}} style={{width:'240px'}} ref='Names'/>
+								                   		<span className="mandatory">*</span>
+							                </FormItem>
+							                <FormItem className="half-item"
+					                            {...formItemLayout}
+					                            label="项目类型" > 
+					                            <Select placeholder="请选择项目类型"
+						                            style={{ width:'240px'}}
+						                            value={this.state.projectType}
+						                            onChange={(e) => { this.setState({ projectType: e }) }}>
+						                            {
+					                                    lvl.map(function (item) {
+					                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+					                                    })
+					                                }
+						                        </Select>
+					                    		<span className="mandatory">*</span>
+						                    </FormItem>
+						                    <FormItem className="half-item"
+						                            {...formItemLayout}
+						                            label="项目负责人" > 
+						                             <Input placeholder="请输入项目负责人" value={this.state.pName} 
+						                                    onChange={(e)=>{this.setState({pName:e.target.value})}} style={{width:'240px'}} ref='pName'/>
+									                   		<span className="mandatory">*</span>
+							                </FormItem>
+							                <div className='clearfix'>
+									        	<FormItem
+										            labelCol={{ span: 4 }}
+										            wrapperCol={{ span: 16 }}
+										            label="立项说明" >
+										                <Input type="textarea" placeholder="请输入签单备注" rows={4}  value={this.state.introduction} 
+											    				onChange={(e)=>{this.setState({introduction:e.target.value})}}/>			                      
+										        </FormItem>
+									        </div>
+									    </div>
+				                    </div>
+				                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
+				                     	<Popconfirm title={'系统将依据订单【'+this.props.datauser.roleName+'】自动生成项目任务,是否保存?'} onConfirm={(e)=>{this.admissibleOrder()}} okText="确认" cancelText="取消">
+											<Button className="submitSave" type="primary" htmlType="submit">保存</Button>
+										</Popconfirm>
+				                        <Button className="submitSave" type="ghost" onClick={this.projectCancel}>返回</Button>
+				                    </FormItem> 
+	                        </Spin>
+			            </Form >
+			        </Modal>  
+    	    </div>
+		)
+	}
+}));
+
+export default MySettlementDetaile;

+ 481 - 0
package-lock.json

@@ -3278,10 +3278,41 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
+<<<<<<< HEAD
     "fsevents": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
       "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+=======
+    "function-bind": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npm.taobao.org/function-bind/download/function-bind-1.1.0.tgz",
+      "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E=",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "1.0.2",
+      "resolved": "http://registry.npm.taobao.org/get-caller-file/download/get-caller-file-1.0.2.tgz",
+      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "http://registry.npm.taobao.org/getpass/download/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
       "dev": true,
       "optional": true,
       "requires": {
@@ -3294,7 +3325,108 @@
           "bundled": true,
           "dev": true,
           "optional": true
+<<<<<<< HEAD
         },
+=======
+        }
+      }
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.2.tgz",
+      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "http://registry.npm.taobao.org/glob-base/download/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "requires": {
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "resolved": "http://registry.npm.taobao.org/glob-parent/download/glob-parent-2.0.0.tgz",
+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "dev": true,
+      "requires": {
+        "is-glob": "2.0.1"
+      }
+    },
+    "globals": {
+      "version": "9.18.0",
+      "resolved": "http://registry.npm.taobao.org/globals/download/globals-9.18.0.tgz",
+      "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
+      "dev": true
+    },
+    "globby": {
+      "version": "6.1.0",
+      "resolved": "http://registry.npm.taobao.org/globby/download/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "dev": true,
+      "requires": {
+        "array-union": "1.0.2",
+        "glob": "7.1.2",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "hammerjs": {
+      "version": "2.0.8",
+      "resolved": "http://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
+      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
+    },
+    "handle-thing": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
+      "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
+      "dev": true
+    },
+    "har-schema": {
+      "version": "1.0.5",
+      "resolved": "http://registry.npm.taobao.org/har-schema/download/har-schema-1.0.5.tgz",
+      "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
+      "dev": true,
+      "optional": true
+    },
+    "har-validator": {
+      "version": "4.2.1",
+      "resolved": "http://registry.npm.taobao.org/har-validator/download/har-validator-4.2.1.tgz",
+      "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "ajv": "4.11.8",
+        "har-schema": "1.0.5"
+      },
+      "dependencies": {
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
         "ajv": {
           "version": "4.11.8",
           "bundled": true,
@@ -3304,6 +3436,7 @@
             "co": "4.6.0",
             "json-stable-stringify": "1.0.1"
           }
+<<<<<<< HEAD
         },
         "ansi-regex": {
           "version": "2.1.1",
@@ -4330,6 +4463,8 @@
             "co": "4.6.0",
             "json-stable-stringify": "1.0.1"
           }
+=======
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
         }
       }
     },
@@ -4715,6 +4850,91 @@
         }
       }
     },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
+      "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+      "dev": true,
+      "requires": {
+        "depd": "1.1.1",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.0.3",
+        "statuses": "1.3.1"
+      },
+      "dependencies": {
+        "depd": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+          "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
+          "dev": true
+        },
+        "setprototypeof": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+          "dev": true
+        }
+      }
+    },
+    "http-parser-js": {
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz",
+      "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=",
+      "dev": true
+    },
+    "http-proxy": {
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz",
+      "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "1.2.0",
+        "requires-port": "1.0.0"
+      },
+      "dependencies": {
+        "eventemitter3": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
+          "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
+          "dev": true
+        }
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz",
+      "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
+      "dev": true,
+      "requires": {
+        "http-proxy": "1.16.2",
+        "is-glob": "3.1.0",
+        "lodash": "4.17.4",
+        "micromatch": "2.3.11"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        }
+      }
+    },
     "http-signature": {
       "version": "1.1.1",
       "resolved": "http://registry.npm.taobao.org/http-signature/download/http-signature-1.1.1.tgz",
@@ -4946,6 +5166,57 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
       "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
+<<<<<<< HEAD
+      "dev": true
+    },
+    "is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "6.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "1.0.0",
+        "is-data-descriptor": "1.0.0",
+        "kind-of": "6.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "http://registry.npm.taobao.org/is-dotfile/download/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+=======
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
       "dev": true
     },
     "is-data-descriptor": {
@@ -5914,6 +6185,7 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
       "dev": true
     },
+<<<<<<< HEAD
     "nan": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
@@ -5921,6 +6193,8 @@
       "dev": true,
       "optional": true
     },
+=======
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
     "nanomatch": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.7.tgz",
@@ -6218,6 +6492,88 @@
         }
       }
     },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "0.1.1",
+        "define-property": "0.2.5",
+        "kind-of": "3.2.2"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "0.1.6",
+            "is-data-descriptor": "0.1.4",
+            "kind-of": "5.1.0"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "object-keys": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
+      "dev": true
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+          "dev": true
+        }
+      }
+    },
     "object.omit": {
       "version": "2.0.1",
       "resolved": "http://registry.npm.taobao.org/object.omit/download/object.omit-2.0.1.tgz",
@@ -8706,6 +9062,41 @@
         }
       }
     },
+    "sockjs": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+      "dev": true,
+      "requires": {
+        "faye-websocket": "0.10.0",
+        "uuid": "3.1.0"
+      }
+    },
+    "sockjs-client": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz",
+      "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.8",
+        "eventsource": "0.1.6",
+        "faye-websocket": "0.11.1",
+        "inherits": "2.0.3",
+        "json3": "3.3.2",
+        "url-parse": "1.2.0"
+      },
+      "dependencies": {
+        "faye-websocket": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+          "dev": true,
+          "requires": {
+            "websocket-driver": "0.7.0"
+          }
+        }
+      }
+    },
     "sort-keys": {
       "version": "1.1.2",
       "resolved": "http://registry.npm.taobao.org/sort-keys/download/sort-keys-1.1.2.tgz",
@@ -8912,6 +9303,93 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+<<<<<<< HEAD
+      "dev": true,
+      "requires": {
+        "define-property": "0.2.5",
+        "object-copy": "0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "0.1.6"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.5"
+              }
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.5"
+              }
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "0.1.6",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "0.1.6",
+            "is-data-descriptor": "0.1.4",
+            "kind-of": "5.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+      "dev": true
+    },
+    "stream-browserify": {
+      "version": "2.0.1",
+      "resolved": "http://registry.npm.taobao.org/stream-browserify/download/stream-browserify-2.0.1.tgz",
+      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+=======
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
       "dev": true,
       "requires": {
         "define-property": "0.2.5",
@@ -10075,7 +10553,10 @@
             "anymatch": "2.0.0",
             "async-each": "1.0.1",
             "braces": "2.3.0",
+<<<<<<< HEAD
             "fsevents": "1.1.3",
+=======
+>>>>>>> 7b9c98a54ad5297f0b6e76d0dd5ecbb5579c4974
             "glob-parent": "3.1.0",
             "inherits": "2.0.3",
             "is-binary-path": "1.0.1",

+ 3 - 3
webpack.config.js

@@ -26,12 +26,12 @@ module.exports = (function () {
         new webpack.optimize.CommonsChunkPlugin({
             name: 'vendors'
         }),
-       /* 配置好Dll */
+      /* 配置好Dll */
        new webpack.DllReferencePlugin({
            context: dirVars.staticRootDir, // 指定一个路径作为上下文环境,需要与DllPlugin的context参数保持一致,建议统一设置为项目根目录
            manifest: require('./dll/'+argv.env.deploy+'/manifest.json') // 指定manifest.json
        }),
-	 // copy custom static assets
+	   // 把dll文件复制到打包后的文件中
 		new CopyWebpackPlugin([
 		    {
 		      from: path.resolve('./dll/'+argv.env.deploy),
@@ -39,7 +39,7 @@ module.exports = (function () {
 		      ignore: ['.*']
 		    }
 		]),
-		  // 将 vendor.dll.js 插入HTML里
+		// 将 dll.js 插入HTML里
 		new HtmlWebpackIncludeAssetsPlugin({
 		    assets: [(__dirname, 'dll/dll.js'),(__dirname, 'dll/dll.css')],
 		    append: false