Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT-WEB

yee 8 years ago
parent
commit
64163aff58

+ 8 - 10
js/component/account/services/patent.jsx

@@ -14,19 +14,17 @@ const Patent = React.createClass({
         this.setState({
             loading: true
         });
+        let page = pageNo || 1,
+        pageSize = this.state.pagination.pageSize,
+        patentNumber = this.state.searchNum || '',
+        patentName = this.state.searchName || '',
+        patentCatagory = this.state.searchType || '',
+        patentState = this.state.searchState || '';
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/clientApplyList",
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                patentNumber: this.state.searchNum,
-                patentName: this.state.searchName,
-                patentCatagory: this.state.searchType,
-                patentState: this.state.searchState
-            },
+            url: globalConfig.context + "/techservice/patent/clientApplyList?pageNo=" + page + "&pageSize=" + pageSize + "&patentNumber=" + patentNumber + "&patentName=" + patentName + "&patentCatagory=" + patentCatagory + "&patentState=" + patentState,
             success: function (data) {
                 if (!data.data) {
                     if (data.error && data.error.length) {

+ 1 - 1
js/component/account/services/patentAdd.jsx

@@ -205,7 +205,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                         <Button><Icon type="upload" /> 上传专利代理委托书 </Button>
                     </Upload>
                     <p style={{ paddingLeft: '10px', marginTop: '10px' }}>
-                        <a onClick={() => { window.open(globalConfig.context + "/open/downloadTemplateFile?sign=patent_prory_statement") }}>专利代理委托书模板下载</a>
+                        <a onClick={() => { window.open(globalConfig.context + "/techservice/patent/downloadTemplateFile?sign=patent_prory_statement") }}>专利代理委托书模板下载</a>
                     </p>
                 </div>
                 <FormItem style={{ marginTop: '20px' }}>

+ 7 - 10
js/component/account/services/patentDesc.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Icon, Modal, message, Spin, Timeline, Button } from 'antd';
-import { getPatentType, getPatentState, getTime, getPatentField, downloadFile, getStepList } from '../../tools.js';
+import { getPatentType, getPatentState, getTime, getPatentField, newDownloadFile, getStepList } from '../../tools.js';
 import './patent.less';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
@@ -26,13 +26,10 @@ const PatentDesc = React.createClass({
     },
     getPatentInfo(thepid) {
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/clientPatentInfo",
-            data: {
-                pid: thepid
-            },
+            url: globalConfig.context + "/techservice/patent/clientPatentInfo?pid=" + thepid,
             success: function (data) {
                 let thisData = data.data;
                 if (!thisData) {
@@ -116,26 +113,26 @@ const PatentDesc = React.createClass({
                                 <span>专利相关材料:</span>
                                 {theData.patentWritingUrl !== null && theData.patentWritingUrl !== undefined && theData.patentWritingUrl !== '' ?
                                     <p className="download-file">
-                                        <a onClick={downloadFile.bind(this, theData.patentWritingUrl, theData.patentWritingDownloadFileName)}>{theData.patentWritingDownloadFileName}</a>
+                                        <a onClick={newDownloadFile.bind(this, theData.id, 'patent_writing', '/techservice/patent/download')}>{theData.patentWritingDownloadFileName}</a>
                                         {theData.confirmState == 0 ? <Button onClick={this.confirmButton}>确认稿件</Button> : <span></span>}
                                     </p> :
                                     <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />专利稿件未上传</p>
                                 }
                                 {theData.authorizationNoticeUrl !== null && theData.authorizationNoticeUrl !== undefined && theData.authorizationNoticeUrl !== '' ?
                                     <p className="download-file">
-                                        <a onClick={downloadFile.bind(this, theData.authorizationNoticeUrl, theData.authorizationNoticeDownloadFileName)}>{theData.authorizationNoticeDownloadFileName}</a>
+                                        <a onClick={newDownloadFile.bind(this, theData.id, 'authorization_notice', '/techservice/patent/download')}>{theData.authorizationNoticeDownloadFileName}</a>
                                     </p> :
                                     <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />授权通知书未上传</p>
                                 }
                                 {theData.patentCertificateUrl !== null && theData.patentCertificateUrl !== undefined && theData.patentCertificateUrl !== '' ?
                                     <p className="download-file">
-                                        <a onClick={downloadFile.bind(this, theData.patentCertificateUrl, theData.patentCertificateDownloadFileName)}>{theData.patentCertificateDownloadFileName}</a>
+                                        <a onClick={newDownloadFile.bind(this, theData.id, 'patent_certificate', '/techservice/patent/download')}>{theData.patentCertificateDownloadFileName}</a>
                                     </p> :
                                     <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />专利证书未上传</p>
                                 }
                                 {theData.patentProryStatementUrl !== null && theData.patentProryStatementUrl !== undefined && theData.patentProryStatementUrl !== '' ?
                                     <p className="download-file">
-                                        <a onClick={downloadFile.bind(this, theData.patentProryStatementUrl, theData.patentProryStatementDownloadFileName)}>{theData.patentProryStatementDownloadFileName}</a>
+                                        <a onClick={newDownloadFile.bind(this, theData.id, 'patent_prory_statement', '/techservice/patent/download')}>{theData.patentProryStatementDownloadFileName}</a>
                                     </p> :
                                     <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />专利代理委托书未上传</p>
                                 }

+ 3 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx

@@ -106,7 +106,7 @@ const CenterListDescFrom = Form.create()(React.createClass({
                     <Upload
                         name="ratepay"
                         action={globalConfig.context + "/api/admin/uploadProtocol"}
-                        data={{ 'sign': 'protocol','cid': this.props.data.cid }}
+                        data={{ 'sign': 'protocol','uid': this.props.uid }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {
@@ -182,6 +182,7 @@ const CenterListDesc = React.createClass({
                     >
                         <CenterListDescFrom
                             cid={this.props.cid}
+                            uid={this.props.uid}
                             data={this.props.data}
                             spinState={this.spinChange}
                             closeModal={this.handleCancel}
@@ -510,6 +511,7 @@ const CenterList = React.createClass({
                 </div>
                 <CenterListDesc
                     cid={this.state.cid}
+                    uid={this.props.data.uid}
                     data={this.state.RowData}
                     showDesc={this.state.showDesc}
                     closeDesc={this.closeDesc} />

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

@@ -19,7 +19,7 @@ const ApplyManage = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admintechproject/listTechProject",
+            url: globalConfig.context + "/api/admin/techproject/listTechProject",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,

+ 2 - 5
js/component/tools.js

@@ -340,14 +340,11 @@ module.exports = {
     getStepList(pid,url) {
         let stepList = [];
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             cache: false,
-            url: globalConfig.context + url,
-            data: {
-                pid: pid
-            },
+            url: globalConfig.context + url + "?pid=" + pid,
             success: function (data) {
                 if (!data.data) {
                     if (data.error && data.error.length ) {