yee 8 lat temu
rodzic
commit
53f3c37925

+ 1 - 1
js/component/account/topTab.jsx

@@ -27,7 +27,7 @@ const TopTab = React.createClass({
             <div className="account-top" >
                 <div className="acc-top-user">
                     <span className="acc-top-user-name">欢迎您, {userData.nickname || userData.number || this.state.username} <a onClick={this.logOut}>[ 退出 ]</a></span>
-                    <span className="acc-top-user-toindex"><a href={userData.type == 1 ? globalConfig.context + "/user/groupCertify.html" : globalConfig.context + "/user/certify.html" }>实名认证</a>&nbsp;&nbsp;&nbsp;<a href={globalConfig.context + "/user/index.html"}>返回首页</a></span>
+                    <span className="acc-top-user-toindex"><a href={userData.type == 1 ? globalConfig.context + "/user/groupCertify.html" : globalConfig.context + "/user/certify.html"}>实名认证</a>&nbsp;&nbsp;&nbsp;<a href={globalConfig.avatarHost + "/html/index.html"}>返回首页</a></span>
                 </div>
                 <div className="acc-index">
                     <div className="acc-index-imgbox">

+ 2 - 2
js/component/certify/top.jsx

@@ -12,8 +12,8 @@ const LoginTop = React.createClass({
                     <div className="certify-text">
                         <span className="text">实名认证</span>
                         <span className="alink">
-                            <a href="./index.html">返回首页</a>
-                            <a href="./account/index">尊敬的{ userData.nickname || userData.number || this.state.username}</a>
+                            <a href={globalConfig.avatarHost + "/html/index.html"}>返回首页</a>
+                            <a href="./account/index">尊敬的{userData.nickname || userData.number || this.state.username}</a>
                             <a href="./login.html">退出</a>
                             <a href="./index.html">交易管理中心</a>
                             <a href="./index.html">消息</a>

+ 1 - 1
js/component/groupCertify/top.jsx

@@ -13,7 +13,7 @@ const LoginTop = React.createClass({
                     <div className="certify-text">
                         <span className="text">实名认证</span>
                         <span className="alink">
-                            <a href="./index.html">返回首页</a>
+                            <a href={globalConfig.avatarHost + "/html/index.html"}>返回首页</a>
                             <a href="./account/index.html">尊敬的{userData.nickname || userData.number || this.state.username}</a>
                             <a href="./login.html">退出</a>
                             <a href="./index.html">交易管理中心</a>

+ 1 - 1
js/component/login/loginTop.jsx

@@ -12,7 +12,7 @@ const LoginTop = React.createClass({
                     </div>
                     <div className="logo-text">
                         <span>科技交易认知计算平台</span>
-                        <span className="back"><a href="./index.html">返回首页</a></span>
+                        <span className="back"><a href={globalConfig.avatarHost + "/html/index.html"}>返回首页</a></span>
                     </div>
                 </div>
             </div>

+ 1 - 1
js/component/manageCenter/servicesManage/copyright/comPatentAdd.jsx

@@ -8,7 +8,7 @@ import $ from 'jquery/src/ajax';
 const PatentAddFrom = Form.create()(React.createClass({
     getContactsList(theUid) {
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + "/api/admin/getContacts",

+ 1 - 1
js/component/manageCenter/servicesManage/copyright/comPatentChange.jsx

@@ -4,7 +4,7 @@ import './comprehensive.less';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { copyrightStateList } from '../../../dataDic.js';
-import { getCopyrightState, getTime, copyrightDownloadFile, beforeUploadFile } from '../../../tools.js';
+import { getCopyrightState, getTime, copyrightDownloadFile, beforeUploadFile, getInUrgentTime } from '../../../tools.js';
 
 const CopyrightDescForm = Form.create()(React.createClass({
     getInitialState() {

+ 2 - 1
js/component/manageCenter/servicesManage/copyright/copyright.jsx

@@ -114,7 +114,7 @@ const copyright = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getUnitNames",
+            url: globalConfig.context + "/api/admin/getUnitNames",
             success: function (data) {
                 if (data.error.length || !data.data) {
                     return;
@@ -187,6 +187,7 @@ const copyright = React.createClass({
                     title: '派单信息',
                     dataIndex: 'workIssue',
                     key: 'workIssue',
+                    width:'25%'
                 }, {
                     title: '软著名称',
                     dataIndex: 'copyrightName',

+ 8 - 12
js/component/manageCenter/servicesManage/highTech/highTechApply.jsx

@@ -523,7 +523,7 @@ const CognizanceAdd = React.createClass({
     },
     getContactsList(theUid) {
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + "/api/admin/getContacts",
@@ -767,7 +767,7 @@ const Cognizance = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getAdmin",
+            url: globalConfig.context + "/api/admin/getConsultant",
             success: function (data) {
                 if (data.error.length || !data.data) {
                     return;
@@ -793,7 +793,7 @@ const Cognizance = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getUnitNames",
+            url: globalConfig.context + "/api/admin/getUnitNames",
             success: function (data) {
                 if (data.error.length || !data.data) {
                     return;
@@ -978,6 +978,8 @@ const Cognizance = React.createClass({
             <div className="foster-content" >
                 <div className="content-title">
                     <span>高企申请管理</span>
+                    <Button style={{ background: "#ea0862", border: "none", color: "#fff", float: 'right' }}
+                        onClick={this.addClick}>添加新申请<Icon type="plus" /></Button>
                 </div>
                 <div className="foster-query">
                     <Select placeholder="选择省份"
@@ -998,15 +1000,9 @@ const Cognizance = React.createClass({
                     </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
-                </div>
-                <div className="foster-query">
-                    <div>
-                        <Button style={{ background: "#ea0862", border: "none", color: "#fff" }}
-                            onClick={this.addClick}>添加<Icon type="plus" /></Button>
-                        <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                            disabled={!hasSelected}
-                            onClick={this.delectRow}>删除<Icon type="minus" /></Button>
-                    </div>
+                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
+                        disabled={!hasSelected}
+                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>

+ 61 - 11
js/component/manageCenter/servicesManage/patent/comPatentAdd.jsx

@@ -49,7 +49,7 @@ const PatentAddFrom = Form.create()(React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getUnitNames",
+            url: globalConfig.context + "/api/admin/getUnitNames",
             success: function (data) {
                 if (data.error.length || !data.data) {
                     return;
@@ -67,6 +67,32 @@ const PatentAddFrom = Form.create()(React.createClass({
             });
         }.bind(this));
     },
+    getContactsList(theUid) {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/getContacts",
+            data: {
+                uid: theUid || this.state.uid
+            },
+            success: function (data) {
+                let theOption = [];
+                if (data.error.length || !data.data) {
+                    return;
+                };
+                for (let item in data.data) {
+                    let theData = data.data[item];
+                    theOption.push(
+                        <Select.Option value={item} key={theData}>{theData}</Select.Option>
+                    );
+                };
+                this.setState({
+                    contactsOption: theOption
+                });
+            }.bind(this),
+        });
+    },
     getInitialState() {
         return {
             loading: false,
@@ -82,10 +108,6 @@ const PatentAddFrom = Form.create()(React.createClass({
     },
     handleSubmit(e) {
         e.preventDefault();
-        if (!this.state.companyName || this.state.companyName === "") {
-            message.warning('请先选择公司!');
-            return;
-        };
         this.props.form.validateFields((err, values) => {
             if (!err) {
                 this.props.spinState(true);
@@ -95,7 +117,8 @@ const PatentAddFrom = Form.create()(React.createClass({
                     crossDomain: false,
                     url: globalConfig.context + "/api/admin/patent/apply",
                     data: {
-                        'uid': this.state.companyName,
+                        'uid': values.companyName,
+                        'contacts': values.contacts,
                         'firstInventorIdNumber': values.firstInventorID,
                         'firstInventorName': values.firstInventorName,
                         'patentDes': values.intro,
@@ -155,11 +178,38 @@ const PatentAddFrom = Form.create()(React.createClass({
         const _me = this;
         return (
             <Form horizontal onSubmit={this.handleSubmit} className="person-form">
-                <Select placeholder="选择公司"
-                    showSearch
-                    filterOption={companySearch}
-                    onChange={(e) => { this.setState({ companyName: e }); }}
-                    showSearch={true} style={{ width: 200 }} >{this.state.companyOption}</Select>
+                <FormItem
+                    {...formItemLayout}
+                    label="申请公司"
+                >
+                    {getFieldDecorator('companyName', {
+                        rules: [{ required: true, message: '请选择一个公司!' }],
+                        initialValue: this.state.companyName || null
+
+                    })(
+                        <Select placeholder="选择公司"
+                            showSearch
+                            filterOption={companySearch}
+                            onChange={(e) => { this.setState({ companyName: e }); this.getContactsList(e); }}
+                            showSearch={true} style={{ width: 200 }} >
+                            {this.state.companyOption}
+                        </Select>
+                        )}
+                </FormItem>
+                <FormItem
+                    {...formItemLayout}
+                    label="联系人"
+                >
+                    {getFieldDecorator('contacts', {
+                        rules: [{ required: true, message: '请选择一个联系人!' }],
+                        initialValue: this.state.contacts || null
+                    })(
+                        <Select placeholder="选择联系人"
+                            style={{ width: 200 }} >
+                            {this.state.contactsOption}
+                        </Select>
+                        )}
+                </FormItem>
                 <FormItem
                     labelCol={{ span: 24 }}
                     wrapperCol={{ span: 18 }}

+ 38 - 2
js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx

@@ -111,7 +111,7 @@ const PatentDesc = React.createClass({
                 return;
             };
             this.state.data = data1[0].data;
-
+            this.state.contacts = data1[0].data.contacts;
             if (data2[0].error.length) {
                 message.warning(data2[0].error[0].message);
                 return;
@@ -156,6 +156,32 @@ const PatentDesc = React.createClass({
             });
         }.bind(this));
     },
+    getContactsList(theUid) {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/getContacts",
+            data: {
+                uid: theUid || this.state.uid
+            },
+            success: function (data) {
+                let theOption = [];
+                if (data.error.length || !data.data) {
+                    return;
+                };
+                for (let item in data.data) {
+                    let theData = data.data[item];
+                    theOption.push(
+                        <Select.Option value={item} key={theData}>{theData}</Select.Option>
+                    );
+                };
+                this.setState({
+                    contactsOption: theOption
+                });
+            }.bind(this),
+        });
+    },
     getOption() {
         let _me = this;
         _me.state.patentTypeOption = [];
@@ -192,6 +218,7 @@ const PatentDesc = React.createClass({
                 "patentCatagory": this.state.data.patentCatagory,
                 "patentField": this.state.patentField,
                 "patentDes": this.state.patentDes,
+                "contacts": this.state.contacts,
                 "patentWritingUrl": this.state.patentWritingUrl,
                 "authorizationNoticeUrl": this.state.authorizationNoticeUrl,
                 "patentCertificateUrl": this.state.patentCertificateUrl,
@@ -243,6 +270,7 @@ const PatentDesc = React.createClass({
             this.state.patentState = String(nextProps.data.patentState);
             this.state.patentField = String(nextProps.data.patentField);
             this.loadData();
+            this.getContactsList(nextProps.data.uid);
         };
         this.state.visible = nextProps.showDesc;
     },
@@ -284,7 +312,15 @@ const PatentDesc = React.createClass({
                             </div>
                             <div>
                                 <p className="widthHalf"><span>公司地址:</span>{companyAddress}</p>
-                                <p className="widthHalf"><span className="three2eight">联系人</span>:{theData.companyContacts}</p>
+                                <div className="widthHalf">
+                                    <span className="three2eight">联系人:</span>
+                                    <Select placeholder="选择联系人"
+                                        style={{ width: 200 }}
+                                        value={this.state.contacts}
+                                        onChange={(e) => { this.setState({ contacts: e }); }} >
+                                        {this.state.contactsOption}
+                                    </Select>
+                                </div>
                             </div>
                             <div>
                                 <p className="widthHalf"><span className="two2four">编号</span>:{theData.serialNumber}</p>

+ 46 - 54
js/component/manageCenter/servicesManage/patent/comprehensive.jsx

@@ -10,21 +10,6 @@ import PatentDesc from './comPatentDesc.jsx';
 
 const Patent = React.createClass({
     loadData(pageNo) {
-        let page = pageNo || 1,
-        pageSize = this.state.pagination.pageSize,
-        serialNumber = this.state.number,
-        patentNumber = this.state.patentNumber,
-        patentName = this.state.patentName,
-        //office: 事务所,
-        locationProvince = this.state.province,
-        unitName = this.state.unitName,
-        patentCatagory = this.state.patentType,
-        patentState = this.state.patentState,
-        createTime = this.state.createTime,
-        patentApplicationDate = this.state.startTime,
-        authorizedDate = this.state.endTime,
-        author = this.state.author;
-
         this.state.data = [];
         this.setState({
             loading: true
@@ -33,7 +18,22 @@ const Patent = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/patent/patentList?pageNo=" + page + "&pageSize=" + pageSize + "&serialNumber=" + serialNumber + "&patentNumber=" + patentNumber + "&patentName=" + patentName + "&locationProvince=" + locationProvince + "&unitName=" + unitName + "&patentCatagory=" + patentCatagory + "&patentState=" + patentState + "&createTime=" + createTime + "&patentApplicationDate=" + patentApplicationDate + "&authorizedDate=" + authorizedDate + "&author=" + author,
+            url: globalConfig.context + "/api/admin/patent/patentList",
+            data: {
+                page: pageNo || 1,
+                pageSize: this.state.pagination.pageSize || null,
+                serialNumber: this.state.number || null,
+                patentNumber: this.state.patentNumber || null,
+                patentName: this.state.patentName || null,
+                locationProvince: this.state.province || null,
+                unitName: this.state.unitName || null,
+                patentCatagory: this.state.patentType || null,
+                patentState: this.state.patentState || null,
+                createTime: this.state.createTime || null,
+                patentApplicationDate: this.state.startTime || null,
+                authorizedDate: this.state.endTime || null,
+                author: this.state.author
+            },
             success: function (data) {
                 if (data.error.length || !data.data || !data.data.list) {
                     message.warning(data.error[0].message);
@@ -102,32 +102,6 @@ const Patent = React.createClass({
             });
         }.bind(this));
     },
-    getAuthorList() {
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/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));
-    },
     getCompanyList() {
         this.setState({
             loading: true
@@ -156,18 +130,9 @@ const Patent = React.createClass({
     },
     getInitialState() {
         return {
-            number: '',
-            patentNumber: '',
-            //office: 事务所,
-            province: '',
-            unitName: '',
-            patentType: '',
-            patentName: '',
-            patentState: '',
             createTime: [],
             endTime: [],
             startTime: [],
-            author: '',
             patentTypeOption: [],
             patentStateOption: [],
             companyOption: [],
@@ -260,7 +225,7 @@ const Patent = React.createClass({
             )
         });
         this.loadData();
-        this.getAuthorList();
+        //this.getAuthorList();
         this.getCompanyList();
     },
     tableRowClick(record, index) {
@@ -401,7 +366,6 @@ const Patent = React.createClass({
                                 onChange={(e) => { this.state.province = e }}>
                                 {this.state.provinceOption}
                             </Select>
-                            <Select placeholder="选择撰写人" style={{ width: 200 }} onChange={(e) => { this.state.author = e }}>{this.state.authorOption}</Select>
                             <Select placeholder="选择公司"
                                 style={{ width: 200 }}
                                 showSearch
@@ -426,4 +390,32 @@ const Patent = React.createClass({
     }
 });
 
-export default Patent;
+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));
+    // },

+ 26 - 23
js/component/manageCenter/servicesManage/technology/applyManage.jsx

@@ -33,16 +33,16 @@ const ApplyManage = React.createClass({
                 }
                 for (let i = 0; i < data.data.list.length; i++) {
                     let thisdata = data.data.list[i];
-                    switch (thisdata.contacts){
-                    	case 1:
-                    		thisdata.contacts = thisdata.firstContacts;
-                    		break;
-                    	case 2:
-                    		thisdata.contacts = thisdata.secondContacts;
-                    		break;
-                    	case 3:
-                    		thisdata.contacts = thisdata.thirdContacts;
-                    		break;
+                    switch (thisdata.contacts) {
+                        case 1:
+                            thisdata.contacts = thisdata.firstContacts;
+                            break;
+                        case 2:
+                            thisdata.contacts = thisdata.secondContacts;
+                            break;
+                        case 3:
+                            thisdata.contacts = thisdata.thirdContacts;
+                            break;
                     }
                     this.state.data.push({
                         key: i,
@@ -110,9 +110,12 @@ const ApplyManage = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getUnitNames",
+            url: globalConfig.context + "/api/admin/getUnitNames",
             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;
                 };
                 let _me = this;
@@ -179,7 +182,7 @@ const ApplyManage = React.createClass({
                     title: '项目类型',
                     dataIndex: 'projectCatagory',
                     key: 'projectCatagory'
-                },{
+                }, {
                     title: '技术领域',
                     dataIndex: 'techField',
                     key: 'techField'
@@ -188,7 +191,7 @@ const ApplyManage = React.createClass({
                     dataIndex: 'state',
                     key: 'state',
                     render: text => { return getTechnologyState(text) },
-                },{
+                }, {
                     title: '派单日',
                     dataIndex: 'createTime',
                     key: 'createTime'
@@ -299,13 +302,13 @@ const ApplyManage = React.createClass({
                 <div className="content-title">
                     <span>科技项目申报管理</span>
                     <div className="foster-query" style={{ float: "right" }}>
-	                    <div>
-	                        <Button style={{ background: "#ea0862", border: "none", color: "#fff" }}
-	                            onClick={this.addClick}>申请新科技项目<Icon type="plus" /></Button>
-	                    </div>
-	                </div>
+                        <div>
+                            <Button style={{ background: "#ea0862", border: "none", color: "#fff" }}
+                                onClick={this.addClick}>申请新科技项目<Icon type="plus" /></Button>
+                        </div>
+                    </div>
                 </div>
-                
+
                 <div className="foster-query">
                     <Select placeholder="选择省份"
                         style={{ width: 200 }}
@@ -326,10 +329,10 @@ const ApplyManage = React.createClass({
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
                     <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                            disabled={!hasSelected}
-                            onClick={this.delectRow}>删除<Icon type="minus" /></Button>
+                        disabled={!hasSelected}
+                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                 </div>
-                
+
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
                         <Table columns={this.state.columns}

+ 1 - 0
js/component/manageCenter/set/role.jsx

@@ -226,6 +226,7 @@ const Role = React.createClass({
                                 style={{ width: '76%' }}
                                 placeholder="选择绑定权限"
                                 disabled={!this.state.modelRecord.id}
+                                filterOption={(input, option) => { return option.props.children.indexOf(input) >= 0 }}
                                 value={this.state.modelRecord.permissions}
                                 onChange={(pids) => {
                                     this.state.modelRecord.permissions = pids;

+ 1 - 1
js/component/manageCenter/topTab.jsx

@@ -404,7 +404,7 @@ const TopTab = React.createClass({
             <div className="account-top" >
                 <div className="acc-top-user">
                     <span className="acc-top-user-name">欢迎您 , {adminData.name || adminData.mobile ? <a onClick={() => { this.setState({ userModalShow: true }); }}> {adminData.name || adminData.mobile} </a> : <a onClick={this.logOut}>{this.state.username}</a>} <a onClick={this.logOut}>[ 退出 ]</a></span>
-                    <span className="acc-top-user-toindex"><a href={globalConfig.context + "/admin/index.html"}>返回首页</a></span>
+                    <span className="acc-top-user-toindex"><a href={globalConfig.avatarHost + "/html/index.html"}>返回首页</a></span>
                     <a onClick={() => { this.setState({ messageModalShow: true }); }} className="user-badge">
                         <Icon type="mail" />
                         {(() => {