Browse Source

用户端接口更改

yee 8 years ago
parent
commit
b498769e75

+ 2 - 1
js/component/account/set/ablt.jsx

@@ -99,6 +99,7 @@ const Base = React.createClass({
             success: function (data) {
             success: function (data) {
                 if (data.data) {
                 if (data.data) {
                     this.setState({
                     this.setState({
+                        id: data.data.id || null,
                         abltArr: data.data.abilityLabel ? data.data.abilityLabel.split(",") : [],
                         abltArr: data.data.abilityLabel ? data.data.abilityLabel.split(",") : [],
                         intellectRight: data.data.intellectRight,
                         intellectRight: data.data.intellectRight,
                         scienceAchievement: data.data.scienceAchievement,
                         scienceAchievement: data.data.scienceAchievement,
@@ -127,12 +128,12 @@ const Base = React.createClass({
             crossDomain: false,
             crossDomain: false,
             url: globalConfig.context + "/api/user/userAbility",
             url: globalConfig.context + "/api/user/userAbility",
             data: {
             data: {
+                'id': this.state.id,
                 'abilityLabel': theTags,
                 'abilityLabel': theTags,
                 "intellectRight": this.state.intellectRight,
                 "intellectRight": this.state.intellectRight,
                 "scienceAchievement": this.state.scienceAchievement,
                 "scienceAchievement": this.state.scienceAchievement,
                 "researchInnovation": this.state.researchInnovation,
                 "researchInnovation": this.state.researchInnovation,
                 "personnel": this.state.personnel
                 "personnel": this.state.personnel
-
             }
             }
         }).done(function (data) {
         }).done(function (data) {
             if (!data.error.length) {
             if (!data.error.length) {

+ 2 - 0
js/component/account/set/base.jsx

@@ -90,6 +90,7 @@ const BaseFrom = Form.create()(React.createClass({
                         d.setYear(parseInt(data.data.dateOfBirthYear));
                         d.setYear(parseInt(data.data.dateOfBirthYear));
                     };
                     };
                     this.setState({
                     this.setState({
+                        id: data.data.id || null,
                         username: data.data.username,
                         username: data.data.username,
                         sex: data.data.sex,
                         sex: data.data.sex,
                         birth: d,
                         birth: d,
@@ -126,6 +127,7 @@ const BaseFrom = Form.create()(React.createClass({
                     crossDomain: false,
                     crossDomain: false,
                     url: globalConfig.context + "/api/user/userIndentity",
                     url: globalConfig.context + "/api/user/userIndentity",
                     data: {
                     data: {
+                        "id": this.state.id,
                         "username": values.username,
                         "username": values.username,
                         "sex": values.sex,
                         "sex": values.sex,
                         "dateOfBirthYear": values.birth ? values.birth._d.getFullYear() : undefined,
                         "dateOfBirthYear": values.birth ? values.birth._d.getFullYear() : undefined,

+ 28 - 46
js/component/account/set/company.jsx

@@ -4,28 +4,9 @@ import './person.less';
 import ajax from 'jquery/src/ajax/xhr.js'
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 
 
-import { addressInit, splitUrl, } from '../../tools.js';
+import { addressInit, splitUrl, getBase64, beforeUpload } from '../../tools.js';
 import { eduLevelList, zizhiArr, schoolArr } from '../../dataDic.js';
 import { eduLevelList, zizhiArr, schoolArr } from '../../dataDic.js';
 
 
-
-function getBase64(img, callback) {
-    const reader = new FileReader();
-    reader.addEventListener('load', () => callback(reader.result));
-    reader.readAsDataURL(img);
-};
-
-function beforeUpload(file) {
-    const isJPG = file.type === 'image/jpeg';
-    if (!isJPG) {
-        message.error('You can only upload JPG file!');
-    }
-    const isLt2M = file.size / 1024 / 1024 < 2;
-    if (!isLt2M) {
-        message.error('Image must smaller than 2MB!');
-    }
-    return isJPG && isLt2M;
-};
-
 class Avatar extends React.Component {
 class Avatar extends React.Component {
     constructor(props) {
     constructor(props) {
         super(props);
         super(props);
@@ -135,12 +116,13 @@ const PersonFrom = Form.create()(React.createClass({
             dataType: "json",
             dataType: "json",
             url: globalConfig.context + "/api/user/member",
             url: globalConfig.context + "/api/user/member",
             success: function (data) {
             success: function (data) {
-
                 if (data.data && data.data.info && data.data.pro) {
                 if (data.data && data.data.info && data.data.pro) {
                     addressInit('cmbProvince', 'cmbCity', 'cmbArea',
                     addressInit('cmbProvince', 'cmbCity', 'cmbArea',
                         data.data.info.locationProvince, data.data.info.locationCity, data.data.info.locationArea);
                         data.data.info.locationProvince, data.data.info.locationCity, data.data.info.locationArea);
                     let theArr = splitUrl(data.data.info.publicityPictureUrl, ',', globalConfig.avatarHost + '/upload');
                     let theArr = splitUrl(data.data.info.publicityPictureUrl, ',', globalConfig.avatarHost + '/upload');
                     this.setState({
                     this.setState({
+                        iid: data.data.info.id,
+                        pid: data.data.pro.id,
                         idttType: data.data.info.identityType,
                         idttType: data.data.info.identityType,
                         unitName: data.data.info.companyName,
                         unitName: data.data.info.companyName,
                         unitNumber: data.data.info.unitSize,
                         unitNumber: data.data.info.unitSize,
@@ -173,9 +155,7 @@ const PersonFrom = Form.create()(React.createClass({
     getInitialState() {
     getInitialState() {
         return {
         return {
             loading: false,
             loading: false,
-
             idttType: '企业',
             idttType: '企业',
-
             companyDis: 'block',
             companyDis: 'block',
             schoolDis: 'none',
             schoolDis: 'none',
             resDis: 'none',
             resDis: 'none',
@@ -215,29 +195,31 @@ const PersonFrom = Form.create()(React.createClass({
                     crossDomain: false,
                     crossDomain: false,
                     url: globalConfig.context + "/api/user/orgPro",
                     url: globalConfig.context + "/api/user/orgPro",
                     data: {
                     data: {
-                        "info.identityType": values.identityType,
-                        "info.companyName": values.unitName,
-                        "info.locationProvince": cmbP,
-                        "info.locationCity": cmbC,
-                        "info.locationArea": cmbA,
-                        "info.unitSize": values.unitNumber,
-                        "info.companyIntroduction": values.unitIntro,
-                        "info.homeUnit": values.unitFrom,
-                        "info.logoUrl": this.state.companyLogoUrl,
-                        "info.publicityPictureUrl": lifePhotoUrl,
-                        "pro.qualification": values.qiyezizhi,
-                        "pro.turnover": values.turnover,
-                        "pro.collegeAttribute": values.schoolProp,
-                        "pro.collegeEstablishTime": values.schoolTime,
-                        "pro.academician": values.aca,
-                        "pro.doctoralTutor": values.PhDTutor,
-                        "pro.masterTutor": values.MSTutor,
-                        "pro.otherExpert": values.otherExperts,
-                        "pro.nationalLab": values.StateKeyLab,
-                        "pro.educationLab": values.EduKeyLab,
-                        "pro.enterpriseCenter": values.ComCenter,
-                        "pro.otherCenter": values.otherCenter,
-                        "pro.institutionEstablishTime": values.resTime
+                        "iid":this.state.iid,
+                        "pid":this.state.pid,
+                        "identityType": values.identityType,
+                        "companyName": values.unitName,
+                        "locationProvince": cmbP,
+                        "locationCity": cmbC,
+                        "locationArea": cmbA,
+                        "unitSize": values.unitNumber,
+                        "companyIntroduction": values.unitIntro,
+                        "homeUnit": values.unitFrom,
+                        "logoUrl": this.state.companyLogoUrl,
+                        "publicityPictureUrl": lifePhotoUrl,
+                        "qualification": values.qiyezizhi,
+                        "turnover": values.turnover,
+                        "collegeAttribute": values.schoolProp,
+                        "collegeEstablishTime": values.schoolTime,
+                        "academician": values.aca,
+                        "doctoralTutor": values.PhDTutor,
+                        "masterTutor": values.MSTutor,
+                        "otherExpert": values.otherExperts,
+                        "nationalLab": values.StateKeyLab,
+                        "educationLab": values.EduKeyLab,
+                        "enterpriseCenter": values.ComCenter,
+                        "otherCenter": values.otherCenter,
+                        "institutionEstablishTime": values.resTime
                     }
                     }
                 }).done(function (data) {
                 }).done(function (data) {
                     if (!data.error.length) {
                     if (!data.error.length) {

+ 2 - 0
js/component/account/set/edu.jsx

@@ -82,6 +82,7 @@ const EduFrom = Form.create()(React.createClass({
             success: function (data) {
             success: function (data) {
                 if (data.data) {
                 if (data.data) {
                     this.setState({
                     this.setState({
+                        id:data.data.id,
                         edulvl: data.data.education,
                         edulvl: data.data.education,
                         eduPfs: [parseInt(data.data.majorCategory), parseInt(data.data.majorName)],
                         eduPfs: [parseInt(data.data.majorCategory), parseInt(data.data.majorName)],
                         schoolname: data.data.graduateSchool,
                         schoolname: data.data.graduateSchool,
@@ -118,6 +119,7 @@ const EduFrom = Form.create()(React.createClass({
                     crossDomain: false,
                     crossDomain: false,
                     url: globalConfig.context + "/api/user/userEdu",
                     url: globalConfig.context + "/api/user/userEdu",
                     data: {
                     data: {
+                        "id":this.state.id,
                         "education": values.edulvl,
                         "education": values.edulvl,
                         "majorCategory": this.state.eduPfsA,
                         "majorCategory": this.state.eduPfsA,
                         "majorName": this.state.eduPfsB,
                         "majorName": this.state.eduPfsB,

+ 2 - 0
js/component/account/set/group.jsx

@@ -22,6 +22,7 @@ const BaseFrom = Form.create()(React.createClass({
             success: function (data) {
             success: function (data) {
                 if (data.data) {
                 if (data.data) {
                     this.setState({
                     this.setState({
+                        id:data.data.id,
                         fixedTel: data.data.fixedTel,
                         fixedTel: data.data.fixedTel,
                         firstContacts: data.data.firstContacts,
                         firstContacts: data.data.firstContacts,
                         firstMobile: data.data.firstMobile,
                         firstMobile: data.data.firstMobile,
@@ -63,6 +64,7 @@ const BaseFrom = Form.create()(React.createClass({
                     crossDomain: false,
                     crossDomain: false,
                     url: globalConfig.context + "/api/user/orgIdentity",
                     url: globalConfig.context + "/api/user/orgIdentity",
                     data: {
                     data: {
+                        "id":this.state.id,
                         "firstContacts": values.firstContacts,
                         "firstContacts": values.firstContacts,
                         "firstMobile": values.firstMobile,
                         "firstMobile": values.firstMobile,
                         "secondContacts": values.secondContacts,
                         "secondContacts": values.secondContacts,

+ 3 - 19
js/component/account/set/person.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import React from 'react';
 import { Input, Button, Form, Select, Radio, Upload, Icon, Spin, message, Modal } from 'antd';
 import { Input, Button, Form, Select, Radio, Upload, Icon, Spin, message, Modal } from 'antd';
 import './person.less';
 import './person.less';
-import { addressInit, splitUrl } from '../../tools.js';
+import { addressInit, splitUrl, getBase64, beforeUpload } from '../../tools.js';
 import ajax from 'jquery/src/ajax/xhr.js'
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 
 
@@ -9,24 +9,6 @@ const FormItem = Form.Item;
 const Option = Select.Option;
 const Option = Select.Option;
 const RadioGroup = Radio.Group;
 const RadioGroup = Radio.Group;
 
 
-function getBase64(img, callback) {
-    const reader = new FileReader();
-    reader.addEventListener('load', () => callback(reader.result));
-    reader.readAsDataURL(img);
-};
-
-function beforeUpload(file) {
-    const isJPG = file.type === 'image/jpeg';
-    if (!isJPG) {
-        message.error('You can only upload JPG file!');
-    }
-    const isLt2M = file.size / 1024 / 1024 < 2;
-    if (!isLt2M) {
-        message.error('Image must smaller than 2MB!');
-    }
-    return isJPG && isLt2M;
-};
-
 class Avatar extends React.Component {
 class Avatar extends React.Component {
     constructor(props) {
     constructor(props) {
         super(props);
         super(props);
@@ -141,6 +123,7 @@ const PersonFrom = Form.create()(React.createClass({
                         data.data.residenceProvince, data.data.residenceCity, data.data.residenceArea);
                         data.data.residenceProvince, data.data.residenceCity, data.data.residenceArea);
                     let theArr = splitUrl(data.data.lifePhotoUrl, ',', globalConfig.avatarHost + '/upload');
                     let theArr = splitUrl(data.data.lifePhotoUrl, ',', globalConfig.avatarHost + '/upload');
                     this.setState({
                     this.setState({
+                        id: data.data.id,
                         nickname: data.data.nickname,
                         nickname: data.data.nickname,
                         cmbP: data.data.residenceProvince,
                         cmbP: data.data.residenceProvince,
                         cmbC: data.data.residenceCity,
                         cmbC: data.data.residenceCity,
@@ -191,6 +174,7 @@ const PersonFrom = Form.create()(React.createClass({
                     crossDomain: false,
                     crossDomain: false,
                     url: globalConfig.context + "/api/user/userInfo",
                     url: globalConfig.context + "/api/user/userInfo",
                     data: {
                     data: {
+                        "id": this.state.id,
                         "nickname": values.nickname,
                         "nickname": values.nickname,
                         "residenceProvince": cmbP,
                         "residenceProvince": cmbP,
                         "residenceCity": cmbC,
                         "residenceCity": cmbC,

+ 5 - 20
js/component/account/set/pfs.jsx

@@ -5,30 +5,13 @@ import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 
 
 import YearSelect from '../../yearSelect.jsx';
 import YearSelect from '../../yearSelect.jsx';
+import { getBase64, beforeUpload } from '../../tools.js';
 import { jingli_yuanxiao, jingli_shehui, chengjiu_yuanxiao, chengjiu_shehui } from '../../dataDic.js';
 import { jingli_yuanxiao, jingli_shehui, chengjiu_yuanxiao, chengjiu_shehui } from '../../dataDic.js';
 
 
 const FormItem = Form.Item;
 const FormItem = Form.Item;
 const RadioButton = Radio.Button;
 const RadioButton = Radio.Button;
 const RadioGroup = Radio.Group;
 const RadioGroup = Radio.Group;
 
 
-function getBase64(img, callback) {
-    const reader = new FileReader();
-    reader.addEventListener('load', () => callback(reader.result));
-    reader.readAsDataURL(img);
-};
-
-function beforeUpload(file) {
-    const isJPG = file.type === 'image/jpeg';
-    if (!isJPG) {
-        message.error('You can only upload JPG file!');
-    }
-    const isLt2M = file.size / 1024 / 1024 < 2;
-    if (!isLt2M) {
-        message.error('Image must smaller than 2MB!');
-    }
-    return isJPG && isLt2M;
-};
-
 class Avatar extends React.Component {
 class Avatar extends React.Component {
     constructor(props) {
     constructor(props) {
         super(props);
         super(props);
@@ -82,6 +65,7 @@ const PfsFrom = Form.create()(React.createClass({
             success: function (data) {
             success: function (data) {
                 if (data.data) {
                 if (data.data) {
                     this.setState({
                     this.setState({
+                        id: data.data.id,
                         lingyu: data.data.engagedField,
                         lingyu: data.data.engagedField,
                         gongling: data.data.workingAge,
                         gongling: data.data.workingAge,
                         zhichengname: data.data.professionalTitle,
                         zhichengname: data.data.professionalTitle,
@@ -122,6 +106,7 @@ const PfsFrom = Form.create()(React.createClass({
                     crossDomain: false,
                     crossDomain: false,
                     url: globalConfig.context + "/api/user/userCareer",
                     url: globalConfig.context + "/api/user/userCareer",
                     data: {
                     data: {
+                        "id": this.state.id,
                         "engagedField": values.lingyu,
                         "engagedField": values.lingyu,
                         "workingAge": values.gongling,
                         "workingAge": values.gongling,
                         "professionalTitle": values.zhichengname,
                         "professionalTitle": values.zhichengname,
@@ -246,7 +231,7 @@ const PfsFrom = Form.create()(React.createClass({
                     hasFeedback
                     hasFeedback
                 >
                 >
                     {getFieldDecorator('zhichengPic')(
                     {getFieldDecorator('zhichengPic')(
-                        <Avatar name="zhichengPic" urlData={this.zhichengPic} picUrl={this.state.zhichengPicUrl}/>
+                        <Avatar name="zhichengPic" urlData={this.zhichengPic} picUrl={this.state.zhichengPicUrl} />
                     )}
                     )}
                 </FormItem>
                 </FormItem>
                 <div className="set-explain">
                 <div className="set-explain">
@@ -279,7 +264,7 @@ const PfsFrom = Form.create()(React.createClass({
                     hasFeedback
                     hasFeedback
                 >
                 >
                     {getFieldDecorator('zigePic')(
                     {getFieldDecorator('zigePic')(
-                        <Avatar name="zigePic" urlData={this.zigePic} picUrl={this.state.zigePicUrl}/>
+                        <Avatar name="zigePic" urlData={this.zigePic} picUrl={this.state.zigePicUrl} />
                     )}
                     )}
                 </FormItem>
                 </FormItem>
                 <div className="set-explain">
                 <div className="set-explain">

+ 2 - 0
js/component/account/set/tech.jsx

@@ -25,6 +25,7 @@ const TechFrom = Form.create()(React.createClass({
             success: function (data) {
             success: function (data) {
                 if (data.data) {
                 if (data.data) {
                     this.setState({
                     this.setState({
+                        id:data.data.id,
                         techpeople: data.data.technicalPeopleNum,
                         techpeople: data.data.technicalPeopleNum,
                         techzoneArr: data.data.searchAreaCategory ? data.data.searchAreaCategory.split(",") : [],
                         techzoneArr: data.data.searchAreaCategory ? data.data.searchAreaCategory.split(",") : [],
                         haveskill: data.data.specialty ? data.data.specialty.split(",") : []
                         haveskill: data.data.specialty ? data.data.specialty.split(",") : []
@@ -51,6 +52,7 @@ const TechFrom = Form.create()(React.createClass({
                     crossDomain: false,
                     crossDomain: false,
                     url: globalConfig.context + "/api/user/orgTech",
                     url: globalConfig.context + "/api/user/orgTech",
                     data: {
                     data: {
+                        "id":this.state.id,
                         "technicalPeopleNum": values.techpeople,
                         "technicalPeopleNum": values.techpeople,
                         "searchAreaCategory": searchArea,
                         "searchAreaCategory": searchArea,
                         "specialty": specialty
                         "specialty": specialty

+ 10 - 8
js/component/manageCenter/servicesManage/copyright/comPatentAdd.jsx

@@ -17,8 +17,11 @@ const PatentAddFrom = Form.create()(React.createClass({
             },
             },
             success: function (data) {
             success: function (data) {
                 let theOption = [];
                 let theOption = [];
-                if (data.error.length || !data.data) {
-                    return;
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                        return;
+                    };
                 };
                 };
                 for (let item in data.data) {
                 for (let item in data.data) {
                     let theData = data.data[item];
                     let theData = data.data[item];
@@ -138,14 +141,13 @@ const PatentAddFrom = Form.create()(React.createClass({
                     )}
                     )}
                 </FormItem>
                 </FormItem>
                 <FormItem
                 <FormItem
-                    labelCol={{ span: 0 }}
-                    wrapperCol={{ span: 18 }}
+                    {...formItemLayout}
+                    label="是否加急"
                 >
                 >
-                    <span>是否加急:</span>
                     {getFieldDecorator('inUrgent')(
                     {getFieldDecorator('inUrgent')(
                         <Select
                         <Select
                             placeholder="请选择加急时间"
                             placeholder="请选择加急时间"
-                            style={{ width: 120 }}>
+                            style={{ width: 200 }}>
                             <Select.Option value="0">不加急(45个工作日)</Select.Option>
                             <Select.Option value="0">不加急(45个工作日)</Select.Option>
                             <Select.Option value="3">3个工作日</Select.Option>
                             <Select.Option value="3">3个工作日</Select.Option>
                             <Select.Option value="5">5个工作日</Select.Option>
                             <Select.Option value="5">5个工作日</Select.Option>
@@ -164,7 +166,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                     {getFieldDecorator('principal')(
                     {getFieldDecorator('principal')(
                         <Select placeholder="请选择咨询师" style={{ width: 200 }}
                         <Select placeholder="请选择咨询师" style={{ width: 200 }}
                             onSelect={(e, n) => { this.setState({ principal: e }); }}>
                             onSelect={(e, n) => { this.setState({ principal: e }); }}>
-                            {this.props.authorOption}
+                            {this.props.consultantOption}
                         </Select>
                         </Select>
                     )}
                     )}
                 </FormItem>
                 </FormItem>
@@ -226,7 +228,7 @@ const PatentAdd = React.createClass({
                             closeModal={this.handleCancel}
                             closeModal={this.handleCancel}
                             okClick={() => { this.props.closeAdd(false, true) }}
                             okClick={() => { this.props.closeAdd(false, true) }}
                             companyOption={this.props.companyOption}
                             companyOption={this.props.companyOption}
-                            authorOption={this.props.authorOption} />
+                            consultantOption={this.props.consultantOption} />
                     </Modal>
                     </Modal>
                 </Spin>
                 </Spin>
             </div>
             </div>

+ 38 - 4
js/component/manageCenter/servicesManage/copyright/copyright.jsx

@@ -88,9 +88,12 @@ const copyright = React.createClass({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
             crossDomain: false,
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/getConsultant",
+            url: globalConfig.context + "/api/admin/copyright/getPrincipal",
             success: function (data) {
             success: function (data) {
-                if (data.error.length || !data.data) {
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
                     return;
                     return;
                 };
                 };
                 let _me = this;
                 let _me = this;
@@ -106,6 +109,35 @@ const copyright = React.createClass({
             });
             });
         }.bind(this));
         }.bind(this));
     },
     },
+    getConsultant() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/copyright/getConsultant",
+            success: function (data) {
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                    return;
+                };
+                let _me = this;
+                for (var item in data.data) {
+                    _me.state.consultantOption.push(
+                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
+                    )
+                };
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
     getCompanyList() {
     getCompanyList() {
         this.setState({
         this.setState({
             loading: true
             loading: true
@@ -139,6 +171,7 @@ const copyright = React.createClass({
             stateOption: [],
             stateOption: [],
             companyOption: [],
             companyOption: [],
             authorOption: [],
             authorOption: [],
+            consultantOption:[],
             data: [],
             data: [],
             selectedRowKeys: [],
             selectedRowKeys: [],
             selectedRows: [],
             selectedRows: [],
@@ -187,7 +220,7 @@ const copyright = React.createClass({
                     title: '派单信息',
                     title: '派单信息',
                     dataIndex: 'workIssue',
                     dataIndex: 'workIssue',
                     key: 'workIssue',
                     key: 'workIssue',
-                    width:'25%'
+                    width: '25%'
                 }, {
                 }, {
                     title: '软著名称',
                     title: '软著名称',
                     dataIndex: 'copyrightName',
                     dataIndex: 'copyrightName',
@@ -266,6 +299,7 @@ const copyright = React.createClass({
         this.loadData();
         this.loadData();
         this.getAuthorList();
         this.getAuthorList();
         this.getCompanyList();
         this.getCompanyList();
+        this.getConsultant();
     },
     },
     tableRowClick(record, index) {
     tableRowClick(record, index) {
         this.state.RowData = record;
         this.state.RowData = record;
@@ -359,7 +393,7 @@ const copyright = React.createClass({
                         <span>软著申请管理</span>
                         <span>软著申请管理</span>
                         <PatentAdd
                         <PatentAdd
                             companyOption={this.state.companyOption}
                             companyOption={this.state.companyOption}
-                            authorOption={this.state.authorOption}
+                            consultantOption={this.state.consultantOption}
                             onClick={this.addClick}
                             onClick={this.addClick}
                             closeAdd={this.closeAdd} />
                             closeAdd={this.closeAdd} />
                     </div>
                     </div>

+ 5 - 2
js/component/manageCenter/servicesManage/highTech/highTechApply.jsx

@@ -767,9 +767,12 @@ const Cognizance = React.createClass({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
             crossDomain: false,
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/getConsultant",
+            url: globalConfig.context + "/api/admin/getPrincipal",
             success: function (data) {
             success: function (data) {
-                if (data.error.length || !data.data) {
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
                     return;
                     return;
                 };
                 };
                 let _me = this;
                 let _me = this;

+ 1 - 1
js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx

@@ -98,7 +98,7 @@ const PatentDesc = React.createClass({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
             crossDomain: false,
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/getConsultant"
+            url: globalConfig.context + "/api/admin/patent/getPrincipal"
         }), $.ajax({
         }), $.ajax({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",

+ 36 - 33
js/component/manageCenter/servicesManage/patent/comprehensive.jsx

@@ -227,7 +227,7 @@ const Patent = React.createClass({
             )
             )
         });
         });
         this.loadData();
         this.loadData();
-        //this.getAuthorList();
+        this.getAuthorList();
         this.getCompanyList();
         this.getCompanyList();
     },
     },
     tableRowClick(record, index) {
     tableRowClick(record, index) {
@@ -308,6 +308,32 @@ const Patent = React.createClass({
                 break;
                 break;
         }
         }
     },
     },
+    getAuthorList() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/patent/getAuthor",
+            success: function (data) {
+                if (data.error.length || !data.data) {
+                    return;
+                };
+                let _me = this;
+                for (var item in data.data) {
+                    _me.state.authorOption.push(
+                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
+                    )
+                };
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
     delectRow() {
     delectRow() {
         let deletedIds = [];
         let deletedIds = [];
         for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
         for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
@@ -386,13 +412,13 @@ const Patent = React.createClass({
                     <PatentAdd closeDesc={this.closeDesc} />
                     <PatentAdd closeDesc={this.closeDesc} />
                 </div>
                 </div>
                 <div className="patent-query">
                 <div className="patent-query">
-                    <Select placeholder="请选择" value={this.state.searchKey} style={{ width: 200 }} onChange={(e) => { this.setState({ searchKey: e, searchValue: '' }); }}>
+                    <Select placeholder="请选择" value={this.state.searchKey} style={{ width: 160 }} onChange={(e) => { this.setState({ searchKey: e, searchValue: '' }); }}>
                         <Select.Option value="patentNumber">专利号</Select.Option>
                         <Select.Option value="patentNumber">专利号</Select.Option>
                         <Select.Option value="serialNumber">编号</Select.Option>
                         <Select.Option value="serialNumber">编号</Select.Option>
                         <Select.Option value="patentName">专利名称</Select.Option>
                         <Select.Option value="patentName">专利名称</Select.Option>
                     </Select>
                     </Select>
-                    <Input value={this.state.searchValue} onChange={this.searchSelect} />
-                    <Select placeholder="专利状态" value={this.state.patentState} style={{ width: 200 }} onChange={(e) => { this.setState({ patentState: e }); }}>{this.state.patentStateOption}</Select>
+                    <Input value={this.state.searchValue} style={{ width: 160 }} onChange={this.searchSelect} />
+                    <Select placeholder="专利状态" value={this.state.patentState} style={{ width: 160 }} onChange={(e) => { this.setState({ patentState: e }); }}>{this.state.patentStateOption}</Select>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <Button onClick={this.reset}>重置</Button>
@@ -413,6 +439,11 @@ const Patent = React.createClass({
                                 onChange={(e) => { this.state.province = e }}>
                                 onChange={(e) => { this.state.province = e }}>
                                 {this.state.provinceOption}
                                 {this.state.provinceOption}
                             </Select>
                             </Select>
+                            <Select placeholder="选择撰写人"
+                                style={{ width: 200 }}
+                                onChange={(e) => { this.state.author = e }}>
+                                {this.state.authorOption}
+                            </Select>
                             <Select placeholder="选择公司"
                             <Select placeholder="选择公司"
                                 style={{ width: 200 }}
                                 style={{ width: 200 }}
                                 showSearch
                                 showSearch
@@ -438,32 +469,4 @@ const Patent = React.createClass({
     }
     }
 });
 });
 
 
-export default Patent;
-
-//<Select placeholder="选择撰写人" style={{ width: 200 }} onChange={(e) => { this.state.author = e }}>{this.state.authorOption}</Select>
-    // getAuthorList() {
-    //     this.setState({
-    //         loading: true
-    //     });
-    //     $.ajax({
-    //         method: "get",
-    //         dataType: "json",
-    //         crossDomain: false,
-    //         url: globalConfig.context + "/api/admin/getAdmin",
-    //         success: function (data) {
-    //             if (data.error.length || !data.data) {
-    //                 return;
-    //             };
-    //             let _me = this;
-    //             for (var item in data.data) {
-    //                 _me.state.authorOption.push(
-    //                     <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
-    //                 )
-    //             };
-    //         }.bind(this),
-    //     }).always(function () {
-    //         this.setState({
-    //             loading: false
-    //         });
-    //     }.bind(this));
-    // },
+export default Patent;

+ 1 - 2
js/component/manageCenter/servicesManage/technology/applyAdd.jsx

@@ -149,7 +149,6 @@ const ApplyAdd = React.createClass({
                                 {this.state.contactsOption}
                                 {this.state.contactsOption}
                             </Select>
                             </Select>
                         </div>
                         </div>
-
                     </div>
                     </div>
                     <div className="clearfix">
                     <div className="clearfix">
                         <div className="half-item">
                         <div className="half-item">
@@ -209,7 +208,7 @@ const ApplyAdd = React.createClass({
                             <span className="item-title">选择咨询师:  </span>
                             <span className="item-title">选择咨询师:  </span>
                             <Select placeholder="请选择咨询师" style={{ width: 200 }}
                             <Select placeholder="请选择咨询师" style={{ width: 200 }}
                                 onSelect={(e, n) => { this.state.consultant = e }}>
                                 onSelect={(e, n) => { this.state.consultant = e }}>
-                                {this.props.authorOption}
+                                {this.props.consultantOption}
                             </Select>
                             </Select>
                         </div>
                         </div>
                     </div>
                     </div>

+ 37 - 5
js/component/manageCenter/servicesManage/technology/applyManage.jsx

@@ -84,9 +84,12 @@ const ApplyManage = React.createClass({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
             crossDomain: false,
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/getConsultant",
+            url: globalConfig.context + "/api/admin/techproject/getPrincipal",
             success: function (data) {
             success: function (data) {
-                if (data.error.length || !data.data) {
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
                     return;
                     return;
                 };
                 };
                 let _me = this;
                 let _me = this;
@@ -102,6 +105,35 @@ const ApplyManage = React.createClass({
             });
             });
         }.bind(this));
         }.bind(this));
     },
     },
+    getConsultant() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/techproject/getConsultant",
+            success: function (data) {
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    return;
+                };
+                let _me = this;
+                for (var item in data.data) {
+                    _me.state.consultantOption.push(
+                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
+                    )
+                };
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
     getCompanyList() {
     getCompanyList() {
         this.setState({
         this.setState({
             loading: true
             loading: true
@@ -140,6 +172,7 @@ const ApplyManage = React.createClass({
             companyOption: [],
             companyOption: [],
             companyAddOption: [],
             companyAddOption: [],
             authorOption: [],
             authorOption: [],
+            consultantOption:[],
             selectedRows: [],
             selectedRows: [],
             selectedRowKeys: [],
             selectedRowKeys: [],
             loading: false,
             loading: false,
@@ -226,6 +259,7 @@ const ApplyManage = React.createClass({
         this.loadData();
         this.loadData();
         this.getAuthorList();
         this.getAuthorList();
         this.getCompanyList();
         this.getCompanyList();
+        this.getConsultant();
     },
     },
     tableRowClick(record, index) {
     tableRowClick(record, index) {
         this.state.RowData = record;
         this.state.RowData = record;
@@ -308,7 +342,6 @@ const ApplyManage = React.createClass({
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-
                 <div className="foster-query">
                 <div className="foster-query">
                     <Select placeholder="选择省份"
                     <Select placeholder="选择省份"
                         style={{ width: 200 }}
                         style={{ width: 200 }}
@@ -332,7 +365,6 @@ const ApplyManage = React.createClass({
                         disabled={!hasSelected}
                         disabled={!hasSelected}
                         onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                         onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                 </div>
                 </div>
-
                 <div className="patent-table">
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
                     <Spin spinning={this.state.loading}>
                         <Table columns={this.state.columns}
                         <Table columns={this.state.columns}
@@ -348,7 +380,7 @@ const ApplyManage = React.createClass({
                     showDesc={this.state.showDesc}
                     showDesc={this.state.showDesc}
                     closeDesc={this.closeDesc} />
                     closeDesc={this.closeDesc} />
                 <ApplyAdd
                 <ApplyAdd
-                    authorOption={this.state.authorOption}
+                    consultantOption={this.state.consultantOption}
                     companyAddOption={this.state.companyAddOption}
                     companyAddOption={this.state.companyAddOption}
                     showAdd={this.state.showAdd}
                     showAdd={this.state.showAdd}
                     closeAdd={this.closeAdd} />
                     closeAdd={this.closeAdd} />

+ 1 - 35
js/component/manageCenter/set/member.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
 import React from 'react';
-import { Table, Button, Spin, message, Popconfirm, Icon } from 'antd';
+import { Table, Button, Spin, message, Icon } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js'
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 import TheModal from './modal.jsx';
 import TheModal from './modal.jsx';
@@ -98,29 +98,6 @@ const Member = React.createClass({
             this.loadData();
             this.loadData();
         }
         }
     },
     },
-    resetPwd(e) {
-        this.setState({
-            loading: true
-        })
-        $.ajax({
-            type: 'post',
-            url: globalConfig.context + "/api/admin/resetPwd",
-            dataType: "json",
-            data: {
-                id: e.id
-            }
-        }).done((res) => {
-            if (res.error.length) {
-                message.error(res.error[0].message);
-            } else {
-                message.success("密码重置成功");
-            }
-        }).always(() => {
-            this.setState({
-                loading: false
-            })
-        });
-    },
     render() {
     render() {
         const columns = [{
         const columns = [{
             title: '编号',
             title: '编号',
@@ -146,17 +123,6 @@ const Member = React.createClass({
             title: '创建时间',
             title: '创建时间',
             dataIndex: 'createTimeFormattedDate',
             dataIndex: 'createTimeFormattedDate',
             key: 'createTimeFormattedDate'
             key: 'createTimeFormattedDate'
-        }, {
-            title: '操作',
-            dataIndex: 'act',
-            key: 'act',
-            render: (text, record, index) => {
-                return <Popconfirm title={"用户" + record.name + "的密码将会重置为123456,确认操作?"} onConfirm={this.resetPwd.bind(null, record)} okText="确认" cancelText="取消" placement="topRight">
-                    <Button>重置密码</Button>
-                </Popconfirm>
-            },
-            width: '15%'
-            //onCellClick: () => { return; }
         }];
         }];
         return (
         return (
             <Spin spinning={this.state.loading}>
             <Spin spinning={this.state.loading}>

+ 40 - 7
js/component/manageCenter/set/modal.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
 import React from 'react';
-import { Modal, Input, Spin, Switch, Select, Message } from 'antd';
+import { Modal, Input, Spin, Switch, Select, message, Popconfirm, Button } from 'antd';
 import { provinceArr } from '../../dataDic.js';
 import { provinceArr } from '../../dataDic.js';
 import { companySearch } from '../../tools.js';
 import { companySearch } from '../../tools.js';
 import ajax from 'jquery/src/ajax/xhr.js';
 import ajax from 'jquery/src/ajax/xhr.js';
@@ -18,14 +18,14 @@ export default class TheModal extends React.Component {
                 'name': this.state.name,
                 'name': this.state.name,
                 'email': this.state.email,
                 'email': this.state.email,
                 'mobile': this.state.mobile,
                 'mobile': this.state.mobile,
-                'province':this.state.province,
+                'province': this.state.province,
                 'roles': this.state.bindroles
                 'roles': this.state.bindroles
             }
             }
         }).done((res) => {
         }).done((res) => {
             if (res.error.length) {
             if (res.error.length) {
-                Message.error(res.error[0].message);
+                message.error(res.error[0].message);
             } else {
             } else {
-                Message.success("保存成功");
+                message.success("保存成功");
                 this.setState({
                 this.setState({
                     visible: false,
                     visible: false,
                 });
                 });
@@ -95,9 +95,31 @@ export default class TheModal extends React.Component {
         };
         };
         this.setState(nextState)
         this.setState(nextState)
     }
     }
-
+    resetPwd(e) {
+        this.setState({
+            loading: true
+        })
+        $.ajax({
+            type: 'post',
+            url: globalConfig.context + "/api/admin/resetPwd",
+            dataType: "json",
+            data: {
+                id: this.state.id
+            }
+        }).done((res) => {
+            if (res.error && res.error.length) {
+                message.error(res.error[0].message);
+            } else {
+                message.success("密码重置成功");
+            }
+        }).always(() => {
+            this.setState({
+                loading: false
+            })
+        });
+    }
     getRolesSelection() {
     getRolesSelection() {
-        if (this.state.id > 1) {
+        if (this.state.id !== '1') {
             return <li>
             return <li>
                 <span className='modal-text'>角色</span>
                 <span className='modal-text'>角色</span>
                 <Select
                 <Select
@@ -135,7 +157,7 @@ export default class TheModal extends React.Component {
         return (
         return (
             <div className="modal" >
             <div className="modal" >
                 <Spin spinning={this.state.loading} >
                 <Spin spinning={this.state.loading} >
-                    <Modal title="用户编辑"
+                    <Modal title="角色管理"
                         closable={false}
                         closable={false}
                         visible={this.state.visible}
                         visible={this.state.visible}
                         onOk={this.postData.bind(this)}
                         onOk={this.postData.bind(this)}
@@ -166,6 +188,17 @@ export default class TheModal extends React.Component {
                                 <Input value={this.state.email} onChange={(e) => { this.state.email = e.target.value; this.setState({ email: this.state.email }); }} />
                                 <Input value={this.state.email} onChange={(e) => { this.state.email = e.target.value; this.setState({ email: this.state.email }); }} />
                             </li>
                             </li>
                             {this.getRolesSelection()}
                             {this.getRolesSelection()}
+                            <li>
+                                <span></span>
+                                <Popconfirm
+                                    title={"用户 [ " + this.state.name + " ] 的密码将会重置为123456,确认操作?"}
+                                    onConfirm={this.resetPwd.bind(this)}
+                                    okText="确认"
+                                    cancelText="取消"
+                                    placement="topLeft">
+                                    <Button>重置密码</Button>
+                                </Popconfirm>
+                            </li>
                         </ul>
                         </ul>
                     </Modal>
                     </Modal>
                 </Spin>
                 </Spin>

+ 3 - 2
js/component/manageCenter/set/role.jsx

@@ -204,10 +204,11 @@ const Role = React.createClass({
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const hasSelected = this.state.selectedRowKeys.length > 0;
         return (
         return (
             <Spin spinning={this.state.loading}>
             <Spin spinning={this.state.loading}>
-                <Modal title="用户编辑"
+                <Modal title="角色编辑"
                     closable={false}
                     closable={false}
                     visible={this.state.visible}
                     visible={this.state.visible}
                     onOk={this.save}
                     onOk={this.save}
+                    width={1000}
                     onCancel={this.handleCancel}>
                     onCancel={this.handleCancel}>
                     <ul className="modal-content">
                     <ul className="modal-content">
                         <li>
                         <li>
@@ -223,7 +224,7 @@ const Role = React.createClass({
                             <span className='modal-text'>权限</span>
                             <span className='modal-text'>权限</span>
                             <Select
                             <Select
                                 multiple
                                 multiple
-                                style={{ width: '76%' }}
+                                style={{ width: '80%' }}
                                 placeholder="选择绑定权限"
                                 placeholder="选择绑定权限"
                                 disabled={!this.state.modelRecord.id}
                                 disabled={!this.state.modelRecord.id}
                                 filterOption={(input, option) => { return option.props.children.indexOf(input) >= 0 }}
                                 filterOption={(input, option) => { return option.props.children.indexOf(input) >= 0 }}