Browse Source

v1.0.25 update

yee 7 years ago
parent
commit
f55b022504

+ 5 - 1
js/component/account/services/patent.jsx

@@ -43,7 +43,7 @@ const Patent = React.createClass({
                         number: thisdata.serialNumber,
                         number: thisdata.serialNumber,
                         patentNum: thisdata.patentNumber,
                         patentNum: thisdata.patentNumber,
                         patentName: thisdata.patentName,
                         patentName: thisdata.patentName,
-                        patentType: getPatentType(thisdata.patentCatagory),
+                        patentCatagory: thisdata.patentCatagory ? getPatentType(thisdata.patentCatagory) : '',
                         patentState: getPatentState(thisdata.patentState),
                         patentState: getPatentState(thisdata.patentState),
                         patentField: thisdata.patentField,
                         patentField: thisdata.patentField,
                         patentDes: thisdata.patentDes,
                         patentDes: thisdata.patentDes,
@@ -121,6 +121,10 @@ const Patent = React.createClass({
                     dataIndex: 'patentName',
                     dataIndex: 'patentName',
                     key: 'patentName',
                     key: 'patentName',
                 }, {
                 }, {
+                    title: '专利类型',
+                    dataIndex: 'patentCatagory',
+                    key: 'patentCatagory',
+                }, {
                     title: '专利状态',
                     title: '专利状态',
                     dataIndex: 'patentState',
                     dataIndex: 'patentState',
                     key: 'patentState',
                     key: 'patentState',

+ 34 - 7
js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx

@@ -32,7 +32,7 @@ class Avatar extends React.Component {
         this.setState({ fileList: info.fileList.slice(-1) });
         this.setState({ fileList: info.fileList.slice(-1) });
     }
     }
     componentWillReceiveProps(nextProps) {
     componentWillReceiveProps(nextProps) {
-        if ( !this.props.visible && nextProps.visible) {
+        if (!this.props.visible && nextProps.visible) {
             this.state.fileList = [];
             this.state.fileList = [];
         };
         };
     }
     }
@@ -107,7 +107,12 @@ const PatentDesc = React.createClass({
             crossDomain: false,
             crossDomain: false,
             url: globalConfig.context + "/api/admin/patent/lastYearTax",
             url: globalConfig.context + "/api/admin/patent/lastYearTax",
             data: { "uid": uid || this.props.data.uid, "sign": "last_year_ratepay" }
             data: { "uid": uid || this.props.data.uid, "sign": "last_year_ratepay" }
-        })).done((data1, data2, data3) => {
+        }), $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/patent/getAuthor"
+        })).done((data1, data2, data3, data4) => {
             let _me = this;
             let _me = this;
             if (!data1[0].data) {
             if (!data1[0].data) {
                 if (data1[0].error.length) {
                 if (data1[0].error.length) {
@@ -127,6 +132,7 @@ const PatentDesc = React.createClass({
                 this.state.patentState = data1[0].data.patentState;
                 this.state.patentState = data1[0].data.patentState;
                 this.state.patentField = data1[0].data.patentField;
                 this.state.patentField = data1[0].data.patentField;
                 this.state.contacts = data1[0].data.contacts;
                 this.state.contacts = data1[0].data.contacts;
+                this.state.author = data1[0].data.author;
                 this.state.uid = data1[0].data.uid;
                 this.state.uid = data1[0].data.uid;
                 this.state.id = data1[0].data.id;
                 this.state.id = data1[0].data.id;
             };
             };
@@ -156,6 +162,21 @@ const PatentDesc = React.createClass({
             } else {
             } else {
                 this.state.lastYearTaxReportId = data3[0].data.id
                 this.state.lastYearTaxReportId = data3[0].data.id
             };
             };
+            let theArr = [];
+            if (!data4[0].data) {
+                if (data4[0].error.length) {
+                    message.warning(data4[0].error[0].message);
+                };
+            } else {
+                for (var item in data4[0].data) {
+                    theArr.push(
+                        <Select.Option value={item} key={item}>{data4[0].data[item]}</Select.Option>
+                    )
+                };
+                this.setState({
+                    authorOption: theArr
+                });
+            };
         }).always(function () {
         }).always(function () {
             this.setState({
             this.setState({
                 loading: false
                 loading: false
@@ -239,7 +260,8 @@ const PatentDesc = React.createClass({
                 "state": this.state.patentStateAdd,
                 "state": this.state.patentStateAdd,
                 "recordTimeFormattedDate": this.state.recordTime,
                 "recordTimeFormattedDate": this.state.recordTime,
                 "principal": this.state.adminName,
                 "principal": this.state.adminName,
-                "comment": this.state.comment
+                "comment": this.state.comment,
+                "author": this.state.author
             }
             }
         }).done(function (data) {
         }).done(function (data) {
             if (data.error && !data.error.length) {
             if (data.error && !data.error.length) {
@@ -313,10 +335,6 @@ const PatentDesc = React.createClass({
                             className="patent-desc-content">
                             className="patent-desc-content">
                             <div>
                             <div>
                                 <p className="widthHalf"><span>公司名称:</span>{theData.unitName}</p>
                                 <p className="widthHalf"><span>公司名称:</span>{theData.unitName}</p>
-                                <p className="widthHalf"><span>公司组织机构代码:</span>{theData.orgCode}</p>
-                            </div>
-                            <div>
-                                <p className="widthHalf"><span>公司地址:</span>{theData.postalAddress}</p>
                                 <div className="widthHalf">
                                 <div className="widthHalf">
                                     <span>联系人:</span>
                                     <span>联系人:</span>
                                     <Select placeholder="选择联系人"
                                     <Select placeholder="选择联系人"
@@ -500,6 +518,15 @@ const PatentDesc = React.createClass({
                                 <Avatar visible={this.state.visible} urlData={this.getPatentCertificateUrl} name='patent_certificate' uid={theData.uid} id={theData.id} />
                                 <Avatar visible={this.state.visible} urlData={this.getPatentCertificateUrl} name='patent_certificate' uid={theData.uid} id={theData.id} />
                             </div>
                             </div>
                             <div className="avatar-text"><span>专利稿件上传</span><span>授权通知书上传</span><span>专利证书上传</span></div>
                             <div className="avatar-text"><span>专利稿件上传</span><span>授权通知书上传</span><span>专利证书上传</span></div>
+                            <div className="widthHalf">
+                                <span>撰写人:</span>
+                                <Select
+                                    style={{ width: 150 }}
+                                    value={this.state.author}
+                                    onChange={(e) => { this.setState({ author: e }); }} >
+                                    {this.state.authorOption}
+                                </Select>
+                            </div>
                         </Modal>
                         </Modal>
                     </Spin>
                     </Spin>
                 </div>
                 </div>

+ 8 - 4
js/component/manageCenter/servicesManage/patent/comprehensive.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import React from 'react';
 import { Icon, Button, Input, Select, Spin, Table, Switch, DatePicker, message, Upload, Modal } from 'antd';
 import { Icon, Button, Input, Select, Spin, Table, Switch, DatePicker, message, Upload, Modal } from 'antd';
 import { patentTypeList, patentStateList, provinceArr } from '../../../dataDic.js';
 import { patentTypeList, patentStateList, provinceArr } from '../../../dataDic.js';
-import { getTime, getPatentState, beforeUploadFile, companySearch, getSearchUrl } from '../../../tools.js';
+import { getTime, getPatentState, beforeUploadFile, companySearch, getSearchUrl,getPatentType } 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';
 import moment from 'moment';
 import moment from 'moment';
@@ -50,7 +50,7 @@ const Patent = React.createClass({
                         patentNumber: thisdata.patentNumber || '',
                         patentNumber: thisdata.patentNumber || '',
                         unitName: thisdata.unitName || '',
                         unitName: thisdata.unitName || '',
                         patentName: thisdata.patentName || '',
                         patentName: thisdata.patentName || '',
-                        patentCatagory: thisdata.patentCatagory || '0',
+                        patentCatagory: thisdata.patentCatagory ? getPatentType(thisdata.patentCatagory) : '',
                         patentState: thisdata.patentState || '0',
                         patentState: thisdata.patentState || '0',
                         patentField: thisdata.patentField || '0',
                         patentField: thisdata.patentField || '0',
                         patentDes: thisdata.patentDes || '',
                         patentDes: thisdata.patentDes || '',
@@ -88,7 +88,7 @@ const Patent = React.createClass({
                         office: thisdata.office, //事务所
                         office: thisdata.office, //事务所
                         principal: thisdata.principal, //负责人
                         principal: thisdata.principal, //负责人
                         founder: thisdata.founder, //创建人
                         founder: thisdata.founder, //创建人
-                        techPrincipal:thisdata.techPrincipal //技术员
+                        techPrincipal: thisdata.techPrincipal //技术员
                     });
                     });
                 };
                 };
                 this.state.pagination.current = data.data.pageNo;
                 this.state.pagination.current = data.data.pageNo;
@@ -220,6 +220,10 @@ const Patent = React.createClass({
                     dataIndex: 'patentName',
                     dataIndex: 'patentName',
                     key: 'patentName',
                     key: 'patentName',
                 }, {
                 }, {
+                    title: '专利类型',
+                    dataIndex: 'patentCatagory',
+                    key: 'patentCatagory',
+                }, {
                     title: '专利状态',
                     title: '专利状态',
                     dataIndex: 'patentState',
                     dataIndex: 'patentState',
                     key: 'patentState',
                     key: 'patentState',
@@ -243,7 +247,7 @@ const Patent = React.createClass({
                     title: '创建人',
                     title: '创建人',
                     dataIndex: 'founder',
                     dataIndex: 'founder',
                     key: 'founder'
                     key: 'founder'
-                },{
+                }, {
                     title: '技术员',
                     title: '技术员',
                     dataIndex: 'techPrincipal',
                     dataIndex: 'techPrincipal',
                     key: 'techPrincipal',
                     key: 'techPrincipal',

+ 1 - 0
js/component/manageCenter/servicesManage/technology/applyChange.jsx

@@ -474,6 +474,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                                     };
                                     };
                                     this.state.approvalUrl = info.file.response.data;
                                     this.state.approvalUrl = info.file.response.data;
                                 } else if (info.file.status === 'error') {
                                 } else if (info.file.status === 'error') {
+                                    debugger
                                     message.error(`${info.file.name} 文件上传失败。`);
                                     message.error(`${info.file.name} 文件上传失败。`);
                                 }
                                 }
                                 this.setState({ fileList: info.fileList.slice(-1) });
                                 this.setState({ fileList: info.fileList.slice(-1) });

+ 1 - 1
js/component/manageCenter/servicesManage/technology/websiteManage.jsx

@@ -70,7 +70,7 @@ const Cognizance = React.createClass({
             success: function (data) {
             success: function (data) {
                 if (!data.data) {
                 if (!data.data) {
                     if (data.error && data.error.length) {
                     if (data.error && data.error.length) {
-                        message.warning(data.error[0]);
+                        message.warning(data.error[0].message);
                     };
                     };
                     return;
                     return;
                 };
                 };

+ 20 - 8
js/component/manageCenter/topTab.jsx

@@ -47,16 +47,20 @@ const MessageModal = React.createClass({
                     title: '类型',
                     title: '类型',
                     dataIndex: 'noticeType',
                     dataIndex: 'noticeType',
                     key: 'noticeType',
                     key: 'noticeType',
-                    render: (text) => {
-                        switch (text[0]) {
+                    render: (text, record) => {
+                        switch (text) {
                             case 1:
                             case 1:
-                                return <a href={globalConfig.context + "/admin/servicesManage/patent.html?rid=" + text[1] + "&uid=" + text[2] + "#comprehensive"}> 专利申请管理 </a>;
+                                return <a href={globalConfig.context + "/admin/servicesManage/patent.html?rid=" + record.rid + "&uid=" + record.uid + "#comprehensive"}> {record.noticeTypeName} </a>;
                             case 3:
                             case 3:
-                                return <a href={globalConfig.context + "/admin/servicesManage/copyright.html?rid=" + text[1] + "&uid=" + text[2] + "#copyright"}> 软著申请管理 </a>;
+                                return <a href={globalConfig.context + "/admin/servicesManage/copyright.html?rid=" + record.rid + "&uid=" + record.uid + "#copyright"}> {record.noticeTypeName} </a>;
                             case 2:
                             case 2:
-                                return <a href={globalConfig.context + "/admin/servicesManage/highTech.html?rid=" + text[1] + "&uid=" + text[2] + "&year=" + text[3] + "#highTechApply"}> 高企认定管理 </a>;
+                                return <a href={globalConfig.context + "/admin/servicesManage/highTech.html?rid=" + record.rid + "&uid=" + record.uid + "&year=" + record.year + "#highTechApply"}> {record.noticeTypeName} </a>;
                             case 4:
                             case 4:
-                                return <a href={globalConfig.context + "/admin/servicesManage/technology.html?rid=" + text[1] + "&uid=" + text[2] + "#applyManage"}> 科技项目申报管理 </a>;
+                                return <a href={globalConfig.context + "/admin/servicesManage/technology.html?rid=" + record.rid + "&uid=" + record.uid + "#applyManage"}> {record.noticeTypeName} </a>;
+                            case 5:
+                                return <a href={globalConfig.context + "/admin/userManage.html?uid=" + record.uid + "&type=0" + (window.showUserList ? "#userList" : "#customerList")}> {record.noticeTypeName} </a>;
+                            case 6:
+                                return <a href={globalConfig.context + "/admin/userManage.html?uid=" + record.uid + "&type=1" + (window.showOrgList ? "#orgList" : "#customerList")}> {record.noticeTypeName} </a >;
                         }
                         }
                     }
                     }
                 }, {
                 }, {
@@ -107,8 +111,12 @@ const MessageModal = React.createClass({
                 this.state.data.push({
                 this.state.data.push({
                     key: i + 1,
                     key: i + 1,
                     id: thisdata.id,
                     id: thisdata.id,
+                    rid: thisdata.rid,
+                    uid: thisdata.uid,
                     aid: thisdata.aid,
                     aid: thisdata.aid,
-                    noticeType: [thisdata.noticeType, thisdata.rid, thisdata.uid, thisdata.year],
+                    noticeType: thisdata.noticeType,
+                    year: thisdata.year,
+                    noticeTypeName: thisdata.noticeTypeName,
                     content: thisdata.content,
                     content: thisdata.content,
                     createTime: thisdata.createTime,
                     createTime: thisdata.createTime,
                     createTimeFormattedDate: thisdata.createTimeFormattedDate,
                     createTimeFormattedDate: thisdata.createTimeFormattedDate,
@@ -155,8 +163,12 @@ const MessageModal = React.createClass({
                 this.state.data.push({
                 this.state.data.push({
                     key: i + 1,
                     key: i + 1,
                     id: thisdata.id,
                     id: thisdata.id,
+                    rid: thisdata.rid,
+                    uid: thisdata.uid,
                     aid: thisdata.aid,
                     aid: thisdata.aid,
-                    noticeType: [thisdata.noticeType, thisdata.rid, thisdata.uid, thisdata.year],
+                    noticeType: thisdata.noticeType,
+                    year: thisdata.year,
+                    noticeTypeName: thisdata.noticeTypeName,
                     content: thisdata.content,
                     content: thisdata.content,
                     createTime: thisdata.createTime,
                     createTime: thisdata.createTime,
                     createTimeFormattedDate: thisdata.createTimeFormattedDate,
                     createTimeFormattedDate: thisdata.createTimeFormattedDate,

+ 12 - 1
js/component/manageCenter/userManage/customerList.jsx

@@ -7,7 +7,7 @@ import './userList.less';
 import OrgDesc from './orgDesc.jsx';
 import OrgDesc from './orgDesc.jsx';
 import UserDesc from './userDesc.jsx';
 import UserDesc from './userDesc.jsx';
 import { auditStatusList } from '../../dataDic.js';
 import { auditStatusList } from '../../dataDic.js';
-import { getAuditState } from '../../tools.js';
+import { getAuditState, getSearchUrl } from '../../tools.js';
 
 
 const OrgAdd = React.createClass({
 const OrgAdd = React.createClass({
     getInitialState() {
     getInitialState() {
@@ -272,6 +272,17 @@ const CustomerList = React.createClass({
     },
     },
     componentWillMount() {
     componentWillMount() {
         this.loadData();
         this.loadData();
+        if (window.location.search) {
+            let theArr = getSearchUrl(window.location.search);
+            if (theArr.length > 1) {
+                let theObj = {};
+                theObj.id = theArr[0];
+                theObj.type = theArr[1];
+                if (theObj.id != 'null' && theObj.type != 'null') {
+                    this.tableRowClick(theObj);
+                };
+            };
+        };
     },
     },
     tableRowClick(record, index) {
     tableRowClick(record, index) {
         this.state.RowData = record;
         this.state.RowData = record;

+ 45 - 9
js/component/manageCenter/userManage/orgDesc.jsx

@@ -90,7 +90,7 @@ const OrgCertify = Form.create()(React.createClass({
             });
             });
         }.bind(this));
         }.bind(this));
     },
     },
-    getAuthorList() {
+    getAccountManagerList() {
         this.setState({
         this.setState({
             loading: true
             loading: true
         });
         });
@@ -98,7 +98,7 @@ const OrgCertify = Form.create()(React.createClass({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
             crossDomain: false,
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/getPrincipal",
+            url: globalConfig.context + "/api/admin/userCertify/accountManager",
             success: function (data) {
             success: function (data) {
                 let theArr = [];
                 let theArr = [];
                 if (!data.data) {
                 if (!data.data) {
@@ -113,8 +113,41 @@ const OrgCertify = Form.create()(React.createClass({
                     )
                     )
                 };
                 };
                 this.setState({
                 this.setState({
-                    authorOption: theArr,
-                    authorList: data.data
+                    accountManagerOption: theArr,
+                    accountManagerList: data.data
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getTechnicianList() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/userCertify/technician",
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    return;
+                };
+                for (var item in data.data) {
+                    theArr.push(
+                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
+                    )
+                };
+                this.setState({
+                    technicianOption: theArr,
+                    technicianList: data.data
                 });
                 });
             }.bind(this),
             }.bind(this),
         }).always(function () {
         }).always(function () {
@@ -219,7 +252,10 @@ const OrgCertify = Form.create()(React.createClass({
             );
             );
         });
         });
         this.loadData(this.props.uid);
         this.loadData(this.props.uid);
-        this.getAuthorList();
+        if (window.showAuditStatus) {
+            this.getAccountManagerList();
+            this.getTechnicianList();
+        };
     },
     },
     componentWillReceiveProps(nextProps) {
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
         if (!this.props.visible && nextProps.visible) {
@@ -580,13 +616,13 @@ const OrgCertify = Form.create()(React.createClass({
                                 {...formItemLayout}
                                 {...formItemLayout}
                                 label="业务员"
                                 label="业务员"
                             >
                             >
-                                <span>{this.state.authorList ? this.state.authorList[this.state.aid] : ''}</span>
+                                <span>{this.state.technicianList ? this.state.technicianList[this.state.aid] : ''}</span>
                             </FormItem>
                             </FormItem>
                             <FormItem
                             <FormItem
                                 {...formItemLayout}
                                 {...formItemLayout}
                                 label="客户经理"
                                 label="客户经理"
                             >
                             >
-                                <span>{this.state.authorList ? this.state.authorList[this.state.mid] : ''}</span>
+                                <span>{this.state.accountManagerList ? this.state.accountManagerList[this.state.mid] : ''}</span>
                             </FormItem>
                             </FormItem>
                         </div>
                         </div>
                         <div style={{ display: window.showAuditStatus ? 'block' : 'none' }}>
                         <div style={{ display: window.showAuditStatus ? 'block' : 'none' }}>
@@ -615,7 +651,7 @@ const OrgCertify = Form.create()(React.createClass({
                                     initialValue: this.state.aid
                                     initialValue: this.state.aid
                                 })(
                                 })(
                                     <Select placeholder="选择一个业务员" style={{ width: 200 }}>
                                     <Select placeholder="选择一个业务员" style={{ width: 200 }}>
-                                        {this.state.authorOption}
+                                        {this.state.technicianOption}
                                     </Select>
                                     </Select>
                                     )}
                                     )}
                             </FormItem>
                             </FormItem>
@@ -627,7 +663,7 @@ const OrgCertify = Form.create()(React.createClass({
                                     initialValue: this.state.mid
                                     initialValue: this.state.mid
                                 })(
                                 })(
                                     <Select placeholder="选择一个客户经理" style={{ width: 200 }}>
                                     <Select placeholder="选择一个客户经理" style={{ width: 200 }}>
-                                        {this.state.authorOption}
+                                        {this.state.accountManagerOption}
                                     </Select>
                                     </Select>
                                     )}
                                     )}
                             </FormItem>
                             </FormItem>

+ 12 - 1
js/component/manageCenter/userManage/orgList.jsx

@@ -6,7 +6,7 @@ import moment from 'moment';
 import './userList.less';
 import './userList.less';
 import OrgDesc from './orgDesc.jsx';
 import OrgDesc from './orgDesc.jsx';
 import { auditStatusList } from '../../dataDic.js';
 import { auditStatusList } from '../../dataDic.js';
-import { getAuditState } from '../../tools.js';
+import { getAuditState, getSearchUrl } from '../../tools.js';
 
 
 const OrgAdd = React.createClass({
 const OrgAdd = React.createClass({
     getInitialState() {
     getInitialState() {
@@ -200,6 +200,17 @@ const OrgList = React.createClass({
     },
     },
     componentWillMount() {
     componentWillMount() {
         this.loadData();
         this.loadData();
+        if (window.location.search) {
+            let theArr = getSearchUrl(window.location.search);
+            if (theArr.length > 1) {
+                let theObj = {};
+                theObj.id = theArr[0];
+                theObj.type = theArr[1];
+                if (theObj.id != 'null' && theObj.type != 'null') {
+                    this.tableRowClick(theObj);
+                };
+            };
+        };
     },
     },
     tableRowClick(record, index) {
     tableRowClick(record, index) {
         this.state.RowData = record;
         this.state.RowData = record;

+ 45 - 9
js/component/manageCenter/userManage/userDesc.jsx

@@ -70,7 +70,7 @@ const UserForm = Form.create()(React.createClass({
             });
             });
         }.bind(this));
         }.bind(this));
     },
     },
-    getAuthorList() {
+    getAccountManagerList() {
         this.setState({
         this.setState({
             loading: true
             loading: true
         });
         });
@@ -78,7 +78,7 @@ const UserForm = Form.create()(React.createClass({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
             crossDomain: false,
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/getPrincipal",
+            url: globalConfig.context + "/api/admin/userCertify/accountManager",
             success: function (data) {
             success: function (data) {
                 let theArr = [];
                 let theArr = [];
                 if (!data.data) {
                 if (!data.data) {
@@ -93,8 +93,41 @@ const UserForm = Form.create()(React.createClass({
                     )
                     )
                 };
                 };
                 this.setState({
                 this.setState({
-                    authorOption: theArr,
-                    authorList: data.data
+                    accountManagerOption: theArr,
+                    accountManagerList: data.data
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
+    getTechnicianList() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/userCertify/technician",
+            success: function (data) {
+                let theArr = [];
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                    return;
+                };
+                for (var item in data.data) {
+                    theArr.push(
+                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
+                    )
+                };
+                this.setState({
+                    technicianOption: theArr,
+                    technicianList: data.data
                 });
                 });
             }.bind(this),
             }.bind(this),
         }).always(function () {
         }).always(function () {
@@ -160,7 +193,10 @@ const UserForm = Form.create()(React.createClass({
     },
     },
     componentWillMount() {
     componentWillMount() {
         this.loadData(this.props.uid);
         this.loadData(this.props.uid);
-        this.getAuthorList();
+        if (window.showAuditStatus) {
+            this.getAccountManagerList();
+            this.getTechnicianList();
+        };
     },
     },
     componentWillReceiveProps(nextProps) {
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
         if (!this.props.visible && nextProps.visible) {
@@ -313,13 +349,13 @@ const UserForm = Form.create()(React.createClass({
                         {...formItemLayout}
                         {...formItemLayout}
                         label="业务员"
                         label="业务员"
                     >
                     >
-                        <span>{this.state.authorList ? this.state.authorList[this.state.aid] : ''}</span>
+                        <span>{this.state.technicianList ? this.state.technicianList[this.state.aid] : ''}</span>
                     </FormItem>
                     </FormItem>
                     <FormItem
                     <FormItem
                         {...formItemLayout}
                         {...formItemLayout}
                         label="客户经理"
                         label="客户经理"
                     >
                     >
-                        <span>{this.state.authorList ? this.state.authorList[this.state.mid] : ''}</span>
+                        <span>{this.state.accountManagerList ? this.state.accountManagerList[this.state.mid] : ''}</span>
                     </FormItem>
                     </FormItem>
                 </div>
                 </div>
                 <div style={{ display: window.showAuditStatus ? 'block' : 'none' }}>
                 <div style={{ display: window.showAuditStatus ? 'block' : 'none' }}>
@@ -348,7 +384,7 @@ const UserForm = Form.create()(React.createClass({
                             initialValue: this.state.aid
                             initialValue: this.state.aid
                         })(
                         })(
                             <Select placeholder="选择一个业务员" style={{ width: 200 }}>
                             <Select placeholder="选择一个业务员" style={{ width: 200 }}>
-                                {this.state.authorOption}
+                                {this.state.technicianOption}
                             </Select>
                             </Select>
                             )}
                             )}
                     </FormItem>
                     </FormItem>
@@ -360,7 +396,7 @@ const UserForm = Form.create()(React.createClass({
                             initialValue: this.state.mid
                             initialValue: this.state.mid
                         })(
                         })(
                             <Select placeholder="选择一个客户经理" style={{ width: 200 }}>
                             <Select placeholder="选择一个客户经理" style={{ width: 200 }}>
-                                {this.state.authorOption}
+                                {this.state.accountManagerOption}
                             </Select>
                             </Select>
                             )}
                             )}
                     </FormItem>
                     </FormItem>

+ 12 - 1
js/component/manageCenter/userManage/userList.jsx

@@ -6,7 +6,7 @@ import moment from 'moment';
 import './userList.less';
 import './userList.less';
 import UserDesc from './userDesc.jsx';
 import UserDesc from './userDesc.jsx';
 import { auditStatusList } from '../../dataDic.js';
 import { auditStatusList } from '../../dataDic.js';
-import { getAuditState } from '../../tools.js';
+import { getAuditState, getSearchUrl } from '../../tools.js';
 
 
 const OrgAdd = React.createClass({
 const OrgAdd = React.createClass({
     getInitialState() {
     getInitialState() {
@@ -187,6 +187,17 @@ const UserList = React.createClass({
     },
     },
     componentWillMount() {
     componentWillMount() {
         this.loadData();
         this.loadData();
+        if (window.location.search) {
+            let theArr = getSearchUrl(window.location.search);
+            if (theArr.length > 1) {
+                let theObj = {};
+                theObj.id = theArr[0];
+                theObj.type = theArr[1];
+                if (theObj.id != 'null' && theObj.type != 'null') {
+                    this.tableRowClick(theObj);
+                };
+            };
+        };
     },
     },
     tableRowClick(record, index) {
     tableRowClick(record, index) {
         this.state.RowData = record;
         this.state.RowData = record;

+ 4 - 4
js/component/tools.js

@@ -166,8 +166,8 @@ module.exports = {
         if (e && !t) {
         if (e && !t) {
             var d = new Date(e);
             var d = new Date(e);
             d = d.getFullYear() + "-" +
             d = d.getFullYear() + "-" +
-                ((d.getMonth() + 1) < 9 ? '0' + (d.getMonth() + 1) : (d.getMonth() + 1)) + "-" +
-                (d.getDate() < 9 ? '0' + d.getDate() : d.getDate()) + " ";
+                ((d.getMonth() + 1) < 10 ? '0' + (d.getMonth() + 1) : (d.getMonth() + 1)) + "-" +
+                (d.getDate() < 10 ? '0' + d.getDate() : d.getDate()) + " ";
             // + (d.getHours() < 10 ? "0" + d.getHours() : d.getHours()) + ":" +
             // + (d.getHours() < 10 ? "0" + d.getHours() : d.getHours()) + ":" +
             // (d.getMinutes() < 10 ? "0" + d.getMinutes() : d.getMinutes()) + ":" +
             // (d.getMinutes() < 10 ? "0" + d.getMinutes() : d.getMinutes()) + ":" +
             // (d.getSeconds() < 10 ? "0" + d.getSeconds() : d.getSeconds());
             // (d.getSeconds() < 10 ? "0" + d.getSeconds() : d.getSeconds());
@@ -178,8 +178,8 @@ module.exports = {
             d2 = d2.setMonth(d1.getMonth() + t);
             d2 = d2.setMonth(d1.getMonth() + t);
             d2 = new Date(d2)
             d2 = new Date(d2)
             d2 = d2.getFullYear() + "-" +
             d2 = d2.getFullYear() + "-" +
-                ((d2.getMonth() + 1) < 9 ? '0' + (d2.getMonth() + 1) : (d2.getMonth() + 1)) + "-" +
-                (d2.getDate() < 9 ? '0' + d2.getDate() : d2.getDate()) + " ";
+                ((d2.getMonth() + 1) < 10 ? '0' + (d2.getMonth() + 1) : (d2.getMonth() + 1)) + "-" +
+                (d2.getDate() < 10 ? '0' + d2.getDate() : d2.getDate()) + " ";
             return d2;
             return d2;
         } else {
         } else {
             return '';
             return '';

+ 1 - 1
package.json

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