dengzhiguo 7 gadi atpakaļ
vecāks
revīzija
789e8da226

+ 14 - 28
js/component/dataDic.js

@@ -1055,72 +1055,58 @@ module.exports = {
     intentionalService:[
         {
             value: "0",
-            key: "高企认定"
+            key: "发明专利"
         }, {
             value: "1",
-            key: "软件著作权"
+            key: "实用型新型专利"
         },
         {
             value: "2",
-            key: "发明专利"
+            key: "外观专利"
         },
         {
             value: "3",
-            key: "实用型新型专利"
+            key: "软件著作权"
         }, {
             value: "4",
-            key: "软件著作权"
+            key: "知识产权贯标"
         },
         {
             value: "5",
-            key: "外观专利"
+            key: "高企认定"
         },
          {
             value: "6",
-            key: "科技需求"
-        }, {
-            value: "7",
-            key: "科技成果"
-        },
-        {
-            value: "8",
-            key: "科技项目"
+            key: "技术成果"
         }
     ],
     //意向服务反
     intentionalServiceOn:[
         {
-            value: "高企认定",
+            value: "发明专利",
             key: "0"
         }, {
-            value: "软件著作权",
+            value: "实用型新型专利",
             key: "1"
         },
         {
-            value: "发明专利",
+            value: "外观专利",
             key: "2"
         },
         {
-            value: "实用型新型专利",
+            value: "软件著作权",
             key: "3"
         }, {
-            value: "软件著作权",
+            value: "知识产权贯标",
             key: "4"
         },
         {
-            value: "外观专利",
+            value: "高企认定",
             key: "5"
         },
          {
-            value: "科技需求",
+            value: "技术成果",
             key: "6"
-        }, {
-            value: "科技成果",
-            key: "7"
-        },
-        {
-            value: "科技项目",
-            key: "8"
         }
     ],
     //客户标签

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 803 - 561
js/component/manageCenter/customer/myClient.jsx


+ 20 - 18
js/component/manageCenter/customer/myClientDesc.jsx

@@ -797,7 +797,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     data: {
                         id: this.props.data.id, //编号
                         customerTyp :values.customerTyp ,//客户信息  1                       
-                        createTime: values.createTime ? values.createTime.format('YYYY-MM-DD') : undefined,//时间 1\                    
+                       // createTime: values.createTime ? values.createTime.format('YYYY-MM-DD') : undefined,//时间 1\                    
                         companyIntention: this.props.data.companyIntention,
                         companyName: values.companyName,//公司名称  1
                         companyIndustry: values.companyIndustry,//公司行业  
@@ -818,7 +818,9 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         depatrment: values.depatrment,//部门             1
                         email: values.email,//邮箱     1                   
                        	shareTyp:0,
-                                                     
+                        followDates:(values.createTime ? values.createTime.format('YYYY-MM-DD'):undefined)+" "+(values.createTim ? values.createTim.format('YYYY:MM:DD'):undefined),//时间,
+                        primaryFlg:0,
+
                     }
                 }).done(function (data) {
                     this.state.auditStatus = 0;
@@ -868,6 +870,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
             labelCol: { span: 8 },
             wrapperCol: { span: 14 },
         };
+        const { RangePicker } = DatePicker;
         return (
             <Form horizontal onSubmit={this.handleSubmit} id="demand-form">
                 <Spin spinning={this.state.loading}>
@@ -887,26 +890,25 @@ const AchievementDetailForm = Form.create()(React.createClass({
 		                </FormItem>
                     	<div className="clearfix" style={{marginLeft:'40px',marginBottom:'20px',color:'#000000'}}>基本资料:</div>	                    	                       
                         <div>	                    	
-		                 {/*  <FormItem className="half-item"
-	                            {...formItemLayout}
-	                            label="录入时间" >
-	                            {getFieldDecorator('createTime', {
+		                <FormItem className="half-item"
+                            {...formItemLayout}
+                            label="录入时间" >
+                            {getFieldDecorator('createTime', {
+                                initialValue: theData.createTime ? moment(theData.createTime) : null
+                            })(
+                                <DatePicker />
+                                )}	 
+                            {getFieldDecorator('createTim', {
 	                                initialValue: theData.createTime ? moment(theData.createTime) : null
 	                            })(
-	                                <DatePicker />
-	                               
-	                                )}	                            
-	                        </FormItem>  */} 
-	                    {/*      <FormItem className="half-item" style={{marginLeft:'-160px'}}
+	                            <TimePicker />      
+	                        )}	   
+	                    </FormItem> 
+	                {/*    <FormItem className="half-item" style={{marginLeft:'-160px'}}
 	                            {...formItemLayout}
 	                            label="" >
-	                            {getFieldDecorator('createTim', {
-	                                initialValue: theData.createTime ? moment(theData.createTime) : null
-	                            })(
-	                                <TimePicker />
-	                               
-	                                )}	                            
-	                        </FormItem> */} 
+	                                                        
+	                    </FormItem> */}
 	                        <FormItem className="half-item"
 	                            {...formItemLayout}
 	                            label="跟单人" >

+ 71 - 43
js/component/manageCenter/customer/publicCustomer.jsx

@@ -7,7 +7,21 @@ import './myClient.less';
 import { orderStatusList,cityArr,customerStatus } from '../../dataDic.js';
 import { beforeUploadFile,getOrderStatus, getSearchUrl,getcustomerTyp,getcityArr,getcustomerStatue,getCompanyIntention,getfllowSituation,getsex} from '../../tools.js';
 
-
+const data = [{
+		  companyName   : '公司名称',
+		  _followSituation : 'John Brown',
+		  _companyIntention: 32,
+		  
+		}, {
+		  companyName: '跟单人',
+		  _followSituation: 'Jim Green',
+		  _companyIntention: 42,	 
+		}, {
+		  companyName: '时间',
+		  _followSituation: 'Joe Black',
+		  _companyIntention: 32,
+		 
+	}];
 const AchievementDetail = React.createClass({
     getInitialState () {
         return {
@@ -117,74 +131,76 @@ const AchievementDetail = React.createClass({
                         title="客户详情"
                         className="demand-order-content">
                         <Spin spinning={this.state.loading}>                        	
-                            <Row>
-                                <Col span={2}>客户类型:</Col>
+                            <Row style={{marginLeft:'100px'}}>
+                                <Col span={3}>客户类型:</Col>
                                 <Col span={10}>{getcustomerTyp(theData.customerTyp)}</Col>
-                                <Col span={2}>编号:</Col>
+                                <Col span={3}>编号:</Col>
                                 <Col span={10}>{theData.id}</Col>
                             </Row>
-                            <Row>
-                                <Col span={2}>录入时间:</Col>
+                            <Row style={{marginLeft:'100px'}}>
+                                <Col span={3}>录入时间:</Col>
                                 <Col span={10}>{theData.createTime}</Col>
-                                <Col span={2}>跟单人:</Col>
+                                <Col span={3}>跟单人:</Col>
                                 <Col span={10}>{theData.ownerId}</Col>
                             </Row>
-                            <Row>基本资料:</Row>
-                            <Row>
-                                <Col span={2}>公司名称:</Col>
+                            <Row style={{marginLeft:'50px'}}>基本资料:</Row>
+                            <Row style={{marginLeft:'100px'}}>
+                                <Col span={3}>公司名称:</Col>
                                 <Col span={10}>{theData.companyName}</Col>
-                                <Col span={2}>公司行业:</Col>
+                                <Col span={3}>公司行业:</Col>
                                 <Col span={10}>{theData.companyIndustry}</Col>
                             </Row>
-                            <Row>
-                                <Col span={2}>意向服务:</Col>
+                            <Row style={{marginLeft:'100px'}}>
+                                <Col span={3}>意向服务:</Col>
                                 <Col span={10}>{getCompanyIntention(theData.companyIntention)}</Col>
-                                <Col span={2}>地区:</Col>
+                                <Col span={3}>地区:</Col>
                                 <Col span={10}>{getcityArr(theData.province)}</Col>
                             </Row>
-                            <Row>
-                                <Col span={2}>最新跟进:</Col>
+                            <Row style={{marginLeft:'100px'}}>
+                                <Col span={3}>最新跟进:</Col>
                                 <Col span={10}>{getfllowSituation(theData.followSituation)}</Col>
-                                <Col span={2}>客户状态:</Col>
+                                <Col span={3}>客户状态:</Col>
                                 <Col span={10}>{getcustomerStatue(theData.customerStatus)}</Col>
                             </Row>
-                            <Row>
-                                <Col span={2}>详细地址:</Col>                                
+                            <Row style={{marginLeft:'100px'}}>
+                                <Col span={3}>详细地址:</Col>                                
                                 <Col span={10}>{theData.adress}</Col>
-                                <Col span={2}>备注:</Col>
+                            </Row>
+                            <Row style={{marginLeft:'100px'}}>   
+                                <Col span={3}>备注:</Col>
                                 <Col span={10}>{theData.remark}</Col>
                             </Row>
-                            <Row>联系资料:</Row>
-                            <Row>
-                                <Col span={2}>姓名:</Col>
+                            <Row style={{marginLeft:'50px'}}>联系资料:</Row>
+                            <Row style={{marginLeft:'100px'}}> 
+                                <Col span={3}>姓名:</Col>
                                 <Col span={10}>{theData.contactName}</Col>
-                                <Col span={2}>性别:</Col>
+                                <Col span={3}>性别:</Col>
                                 <Col span={10}>{getsex(theData.sex)}</Col>
                             </Row>
-                            <Row>
-                                <Col span={2}>手机号码:</Col>
+                            <Row style={{marginLeft:'100px'}}>
+                                <Col span={3}>手机号码:</Col>
                                 <Col span={10}>{theData.telNum}</Col>
-                                <Col span={2}>座机号:</Col>
+                                <Col span={3}>座机号:</Col>
                                 <Col span={10}>{theData.mobile}</Col>
                             </Row>
-                            <Row>
-                                <Col span={2}>QQ号码:</Col>
+                            <Row style={{marginLeft:'100px'}}>
+                                <Col span={3}>QQ号码:</Col>
                                 <Col span={10}>{theData.qq}</Col>
-                                <Col span={2}>邮箱号:</Col>
+                                <Col span={3}>邮箱号:</Col>
                                 <Col span={10}>{theData.email}</Col>
                             </Row>
-                            <Row>
-                                <Col span={2}>微信:</Col>                                
+                            <Row style={{marginLeft:'100px'}}>
+                                <Col span={3}>微信:</Col>                                
                                 <Col span={10}>{theData.wechat}</Col>
-                                <Col span={2}>部门:</Col>
+                                <Col span={3}>部门:</Col>
                                 <Col span={10}>{theData.department}</Col>
                             </Row>
-                            <Row> 
-                                <Col span={2}>职位:</Col>
+                            <Row style={{marginLeft:'100px'}}> 
+                                <Col span={3}>职位:</Col>
                                 <Col span={10}>{theData.customerPosition}</Col>
                             </Row>                               
-                            <Row>
-                                <Col span={2}></Col>
+                            <Row style={{marginLeft:'100px'}}>
+                                <Col span={3}></Col>
                                 <Col span={20}>
                                     <Button style={{ marginRight: '20px' }} type="primary" onClick={this.handleSubmit}>领取</Button>                                    
                                     <Button className="set-submit" type="ghost" onClick={this.handleCancel}>取消</Button>
@@ -410,14 +426,26 @@ const AchievementOrderList = React.createClass({
                 </div>
                 <div className="user-search">                    
                     <Input placeholder="公司名称"
-                        value={this.state.companyName}
-                        onChange={(e) => { this.setState({ companyName: e.target.value }); }} /> 
+                        value={this.state.customerName}
+                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} /> 
                     <Select placeholder="客户类型" style={{ width: 120 }}
-                            value={this.state.customerTyp }
-                            onChange={(e) => { this.setState({ customerTyp : e }) }}>
+                            value={this.state.shareTyp }
+                            onChange={(e) => { this.setState({ shareTyp : e }) }}>
                             <Select.Option value="0" >个人客户</Select.Option>
                             <Select.Option value="1" >公司客户</Select.Option>
-                    </Select>                                        
+                    </Select>     
+                    <Select placeholder="意向服务"
+                            style={{ width: 160 }}
+                            value={this.state.companyIntention}
+                            onChange={(e) => { this.setState({ companyIntention: e }) }}>
+                            {this.state.intentionalOption}
+                    </Select>
+                    <Select placeholder="跟进进度"
+                            style={{ width: 160 }}
+                            value={this.state.followSituation}
+                            onChange={(e) => { this.setState({ followSituation: e }) }}>
+                            {this.state.newOption}
+                    </Select>
                     <Select placeholder="地区"
                             style={{ width: 160 }}
                             value={this.state.province}
@@ -430,7 +458,7 @@ const AchievementOrderList = React.createClass({
                             {this.state.customerStatuarr}
                     </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>                    
+                    <Button onClick={this.reset}>重置</Button>                                                       
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                     	<Input placeholder="跟单人" style={{width:'140px',marginRight:'10px'}}

+ 17 - 16
template/template.html

@@ -7,22 +7,23 @@
         <%= htmlWebpackPlugin.options.title %>
     </title>
     <script>
-        // window.userData = {
-        //     mobile: "13600000000",
-        //     nickname: "Lina",
-        //     number: "80000",
-        //     type: "0",
-        //     email: "test@aft.com",
-        //     createTime: "123456789000",
-        //     lvl: "0"
-        // };
-        // window.adminData = {};
-        // window.globalConfig = {
-        //     context: "//aft.hnzhiming.com:8080/aft",
-        //     staticHost: "//aft.hnzhiming.com",
-        //     uploadPath: "/data/wwwroot/aft/upload",
-        //     uploadPrivatePath: "/data/upload"
-        // };
+//         window.userData = {
+//             mobile: "13600000000",
+//             nickname: "Lina",
+//             number: "80000",
+//             type: "0",
+//             email: "test@aft.com",
+//             createTime: "123456789000",
+//             lvl: "0"
+//         };
+//         window.adminData = {};
+//         window.globalConfig = {
+//             //context: "//aft.hnzhiming.com:8080/aft",
+//             context: "//127.0.0.1:8080/aft",
+//             staticHost: "//aft.hnzhiming.com",
+//             uploadPath: "/data/wwwroot/aft/upload",
+//             uploadPrivatePath: "/data/upload"
+//         };
     </script>
 </head>