yee 8 yıl önce
ebeveyn
işleme
797da9978c
29 değiştirilmiş dosya ile 168 ekleme ve 170 silme
  1. BIN
      AFT-WEB-master修改接口前备份.zip
  2. 3 3
      js/component/manageCenter/servicesManage/highTech/fosterDesc/achievement.jsx
  3. 4 4
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx
  4. 4 4
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activityCostList.jsx
  5. 3 3
      js/component/manageCenter/servicesManage/highTech/fosterDesc/finance.jsx
  6. 4 4
      js/component/manageCenter/servicesManage/highTech/fosterDesc/honorList.jsx
  7. 4 4
      js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx
  8. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectual.jsx
  9. 2 2
      js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectualDesc.jsx
  10. 11 13
      js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx
  11. 3 3
      js/component/manageCenter/servicesManage/highTech/fosterDesc/ratepay.jsx
  12. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/standard.jsx
  13. 3 3
      js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.jsx
  14. 8 9
      js/component/manageCenter/servicesManage/patent/applyFee.jsx
  15. 1 1
      js/component/manageCenter/servicesManage/patent/applyFeeDesc.jsx
  16. 4 4
      js/component/manageCenter/servicesManage/patent/comPatentAdd.jsx
  17. 52 43
      js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx
  18. 21 21
      js/component/manageCenter/servicesManage/patent/comprehensive.jsx
  19. 2 1
      js/component/manageCenter/servicesManage/patent/correction.jsx
  20. 2 1
      js/component/manageCenter/servicesManage/patent/correctionDesc.jsx
  21. 4 6
      js/component/manageCenter/servicesManage/patent/express.jsx
  22. 1 1
      js/component/manageCenter/servicesManage/patent/expressDesc.jsx
  23. 8 8
      js/component/manageCenter/servicesManage/patent/payment.jsx
  24. 3 2
      js/component/manageCenter/servicesManage/patent/paymentDesc.jsx
  25. 4 10
      js/component/manageCenter/servicesManage/technology/applyAdd.jsx
  26. 9 16
      js/component/manageCenter/servicesManage/technology/applyChange.jsx
  27. 0 1
      js/component/manageCenter/servicesManage/technology/applyManage.jsx
  28. 0 1
      js/component/manageCenter/servicesManage/technology/websiteManage.jsx
  29. 6 0
      js/component/tools.js

BIN
AFT-WEB-master修改接口前备份.zip


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

@@ -161,8 +161,8 @@ const AchievementDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': 'achievement' }}
+                        action={globalConfig.context + "/api/admin/uploadAchievement"}
+                        data={{ 'sign': 'achievement','uid': this.props.uid }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {
@@ -389,7 +389,7 @@ const Achievement = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteAchievement",
+            url: globalConfig.context + "/api/admin/deleteAchievement",
             data: {
                 ids: deletedIds
             }

+ 4 - 4
js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx

@@ -276,8 +276,8 @@ const ActivityDesc = React.createClass({
                         <div style={{ width: '50%' }}>
                             <Upload
                                 name="ratepay"
-                                action={globalConfig.context + "/techservice/cognizance/upload"}
-                                data={{ 'sign': 'proof' }}
+                                action={globalConfig.context + "/api/admin/uploadProof"}
+                                data={{ 'sign': 'proof','uid': this.props.uid }}
                                 beforeUpload={beforeUploadFile}
                                 showUploadList={false}
                                 onChange={(info) => {
@@ -492,10 +492,10 @@ const Activity = React.createClass({
             loading: deletedIds.length > 0
         });
         $.ajax({
-            method: "POST",
+            method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteActivity",
+            url: globalConfig.context + "/api/admin/deleteActivity",
             data: {
                 ids: deletedIds
             }

+ 4 - 4
js/component/manageCenter/servicesManage/highTech/fosterDesc/activityCostList.jsx

@@ -271,8 +271,8 @@ const ActivityDescFrom = Form.create()(React.createClass({
                 <div style={{ width: '50%', marginTop: '20px' }}>
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': 'activity_cost_account' }}
+                        action={globalConfig.context + "/api/admin/uploadActivityCost"}
+                        data={{ 'sign': 'activity_cost_account','uid': this.props.uid }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {
@@ -559,10 +559,10 @@ const Activity = React.createClass({
             loading: deletedIds.length > 0
         });
         $.ajax({
-            method: "POST",
+            method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteActivityCost",
+            url: globalConfig.context + "/api/admin/deleteActivityCost",
             data: {
                 ids: deletedIds
             }

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

@@ -218,8 +218,8 @@ const FinanceDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': 'finance' + ( this.state.year || theData.year ) }}
+                        action={globalConfig.context + "/api/admin/uploadFinance"}
+                        data={{ 'sign': 'finance','year': ( this.state.year || theData.year ),'uid': this.props.uid }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {
@@ -444,7 +444,7 @@ const Finance = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteFinance",
+            url: globalConfig.context + "/api/admin/deleteFinance",
             data: {
                 ids: deletedIds
             }

+ 4 - 4
js/component/manageCenter/servicesManage/highTech/fosterDesc/honorList.jsx

@@ -98,8 +98,8 @@ const HonorListDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': 'achievement' }}
+                        action={globalConfig.context + "/api/admin/uploadHonor"}
+                        data={{ 'sign': 'honor','uid': this.props.uid }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {
@@ -119,7 +119,7 @@ const HonorListDescFrom = Form.create()(React.createClass({
                             }
                         }}
                     >
-                        <Button><Icon type="upload" /> 上传科技成果附件 </Button>
+                        <Button><Icon type="upload" /> 上传企业荣誉附件 </Button>
                     </Upload>
                     <p style={{ marginTop: '10px' }}>{theData.enclosureUrl ? <a onClick={downloadFile.bind(null, theData.enclosureUrl, theData.enclosureDownloadFileName)}>{theData.enclosureDownloadFileName}</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                 </div>
@@ -302,7 +302,7 @@ const HonorList = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteHonor",
+            url: globalConfig.context + "/api/admin/deleteHonor",
             data: {
                 ids: deletedIds
             }

+ 4 - 4
js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx

@@ -451,8 +451,8 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': 'roster_' + (this.state.year || theData.year) }}
+                        action={globalConfig.context + "/api/admin/uploadRoster"}
+                        data={{ 'sign': 'roster','year': (this.state.year || theData.year),'uid': this.props.uid }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {
@@ -479,8 +479,8 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': 'social_security_' + (this.state.year || theData.year) }}
+                        action={globalConfig.context + "/api/admin/uploadSocialSecurity"}
+                        data={{ 'sign': 'social_security','year': (this.state.year || theData.year),'uid': this.props.uid }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {

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

@@ -139,7 +139,7 @@ const Intellectual = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteIntellectual",
+            url: globalConfig.context + "/api/admin/deleteIntellectual",
             data: {
                 ids: deletedIds
             }

+ 2 - 2
js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectualDesc.jsx

@@ -173,8 +173,8 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': 'property_ritht' }}
+                        action={globalConfig.context + "/api/admin/uploadPropertyRight"}
+                        data={{ 'sign': 'property_right','uid': this.props.uid }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {

+ 11 - 13
js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx

@@ -21,7 +21,7 @@ const CenterListDescFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/cognizance/disposeCenterDetail",
+                    url: globalConfig.context + "/api/admin/disposeCenterDetail",
                     data: {
                         id: this.props.data.id,
                         cid: this.props.cid,
@@ -105,8 +105,8 @@ const CenterListDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': 'protocol' }}
+                        action={globalConfig.context + "/api/admin/uploadProtocol"}
+                        data={{ 'sign': 'protocol','cid': this.props.data.cid }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {
@@ -234,16 +234,14 @@ const CenterList = React.createClass({
         this.setState({
             loading: true
         });
+        let page = pageNo || 1,
+        pageSize = this.state.pagination.pageSize,
+        cid = this.state.cid;
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/centerDetail",
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                cid: this.state.cid,
-            }
+            url: globalConfig.context + "/api/admin/centerDetail?pageNo=" + page + "&pageSize=" + pageSize + "&cid=" + cid,
         }).done((data) => {
             if (!data.data || !data.data.list) {
                 if (data.error.length) {
@@ -354,7 +352,7 @@ const CenterList = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteOrgTechCenterDetail",
+            url: globalConfig.context + "/api/admin/deleteOrgTechCenterDetail",
             data: {
                 ids: deletedIds
             }
@@ -462,8 +460,8 @@ const CenterList = React.createClass({
                     <div style={{ margin: '10px 0' }}>
                         <Upload
                             name="ratepay"
-                            action={globalConfig.context + "/techservice/cognizance/upload"}
-                            data={{ 'sign': 'institution' }}
+                            action={globalConfig.context + "/api/admin/uploadInstitution"}
+                            data={{ 'sign': 'institution','uid': this.props.data.uid }}
                             beforeUpload={beforeUploadFile}
                             showUploadList={false}
                             onChange={(info) => {

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

@@ -194,8 +194,8 @@ const RatepayDescFrom = Form.create()(React.createClass({
                 <div className="hrSituation-roster">
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': 'ratepay_' + (this.state.year || theData.year) }}
+                        action={globalConfig.context + "/api/admin/uploadRatepay"}
+                        data={{ 'sign': 'ratepay','year': (this.state.year || theData.year),'uid': this.props.uid }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {
@@ -410,7 +410,7 @@ const Ratepay = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteRatepay",
+            url: globalConfig.context + "/api/admin/deleteRatepay",
             data: {
                 ids: deletedIds
             }

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

@@ -247,7 +247,7 @@ const Standard = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteStandard",
+            url: globalConfig.context + "/api/admin/deleteStandard",
             data: {
                 ids: deletedIds
             }

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

@@ -229,8 +229,8 @@ const TechProductDescFrom = Form.create()(React.createClass({
                 <div style={{ width: '50%' }}>
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': 'tech_product' }}
+                        action={globalConfig.context + "/api/admin/uploadTecProduct"}
+                        data={{ 'sign': 'tech_product','uid': this.props.uid }}
                         beforeUpload={beforeUploadFile}
                         showUploadList={false}
                         onChange={(info) => {
@@ -491,7 +491,7 @@ const TechProduct = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/cognizance/deleteTechProduct",
+            url: globalConfig.context + "/api/admin/deleteTechProduct",
             data: {
                 ids: deletedIds
             }

+ 8 - 9
js/component/manageCenter/servicesManage/patent/applyFee.jsx

@@ -13,17 +13,16 @@ const applyFee = React.createClass({
         this.setState({
             loading: true
         });
+        let page = pageNo || 1,
+        pageSize = this.state.pagination.pageSize,
+        locationProvince = this.state.province,
+        patentApplicationDate = this.state.searchData;
+
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getApplicationFeeList",
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                locationProvince: this.state.province,
-                patentApplicationDate: this.state.searchData
-            },
+            url: globalConfig.context + "/api/admin/patent/getApplicationFeeList?pageNo=" + page + "&pageSize=" + pageSize + "&locationProvince=" + locationProvince + "&patentApplicationDate=" + patentApplicationDate,
             success: function (data) {
                 if (data.error.length || !data.data || !data.data.list) {
                     message.warning(data.error[0].message);
@@ -202,7 +201,7 @@ const applyFee = React.createClass({
         this.loadData();
     },
     exportApply() {
-        window.open(globalConfig.context + "/techservice/patent/exportApplicationFee?locationProvince="
+        window.open(globalConfig.context + "/api/admin/patent/exportApplicationFee?locationProvince="
             + this.state.province + "&patentApplicationDate=" + this.state.searchData);
     },
     render() {

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

@@ -24,7 +24,7 @@ const PatentDesc = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/registerApplicationFee",
+            url: globalConfig.context + "/api/admin/patent/registerApplicationFee",
             data: {
                 cid: this.props.data.cid,
                 applicationFee: this.state.applicationFee,

+ 4 - 4
js/component/manageCenter/servicesManage/patent/comPatentAdd.jsx

@@ -29,8 +29,8 @@ class Avatar extends React.Component {
                 className="avatar-uploader"
                 name="avatar"
                 showUploadList={false}
-                action={globalConfig.context + "/techservice/patent/patentFile"}
-                data={{ 'sign': this.props.name, 'oid': this.props.oid }}
+                action={globalConfig.context + "/api/admin/patent/upload"}
+                data={{ 'sign': this.props.name, 'uid': this.props.oid }}
                 beforeUpload={beforeUpload}
                 onChange={this.handleChange.bind(this)}
             >
@@ -93,7 +93,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/techservice/patent/manageApplyPatent",
+                    url: globalConfig.context + "/api/admin/patent/apply",
                     data: {
                         'uid': this.state.companyName,
                         'firstInventorIdNumber': values.firstInventorID,
@@ -225,7 +225,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                         <Avatar urlData={this.avatarUrl} name='patent_prory_statement' oid={this.state.companyName} />
                     )}
                     <p>
-                        <a onClick={() => { window.open(globalConfig.context + "/open/downloadTemplateFile?sign=patent_prory_statement") }}>模板下载</a>
+                        <a onClick={() => { window.open(globalConfig.context + "/api/admin/patent/downloadTemplateFile?sign=patent_prory_statement") }}>模板下载</a>
                     </p>
                 </FormItem>
                 <FormItem>

+ 52 - 43
js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx

@@ -5,7 +5,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import moment from 'moment';
 import $ from 'jquery/src/ajax';
 import { patentTypeList, patentFieldList, patentStateList } from '../../../dataDic.js';
-import { getBase64, beforeUpload, getPatentState, getTime, downloadFile } from '../../../tools.js';
+import { getBase64, beforeUpload, getPatentState, getTime, newDownloadFile } from '../../../tools.js';
 
 class Avatar extends React.Component {
     constructor(props) {
@@ -35,8 +35,8 @@ class Avatar extends React.Component {
             <Upload className="upload-file"
                 name="avatar"
                 showUploadList={false}
-                action={globalConfig.context + "/techservice/patent/patentFile"}
-                data={{ 'sign': this.props.name, 'oid': this.props.oid }}
+                action={globalConfig.context + "/api/admin/patent/upload"}
+                data={{ 'sign': this.props.name, 'uid': this.props.uid }}
                 beforeUpload={beforeUpload}
                 onChange={this.handleChange.bind(this)}
             >
@@ -85,43 +85,50 @@ const PatentDesc = React.createClass({
             loading: true
         });
         $.when($.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/patentProcess",
-            data: {
-                pid: this.state.xid
-            }
+            url: globalConfig.context + "/api/admin/patent/detail?pid=" + this.state.xid,
+        }), $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/patent/logs?pid=" + this.state.xid,
         }), $.ajax({
             method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + "/techservice/patent/getAdmin"
-        })).done((data1, data2) => {
-            let _me = this;
-            //状态流转table
-            if (data1[0].error && data1[0].error.length) {
+        })).done((data1, data2, data3) => {
+
+            if (data1[0].error.length || !data1[0].data) {
                 message.warning(data1[0].error[0].message);
                 return;
             };
-            this.state.stateTable = [];
-            data1[0].data.map(function (item, i) {
-                _me.state.stateTable.push({
-                    key: i,
-                    recordTimeFormattedDate: item.recordTimeFormattedDate,
-                    status: item.state,
-                    principal: item.principal,
-                    operator: item.operator,
-                    comment: item.comment
-                });
-            });
+            this.state.data = data1[0].data;
+
             if (data2[0].error.length) {
                 message.warning(data2[0].error[0].message);
                 return;
             };
-            for (var item in data2[0].data) {
+            let _me = this;
+            data2[0].data.map(function (item) {
+                _me.state.patentProcessList.push(
+                    <p className="patent-process-list" key={item.id}>
+                        <span>专利状态: {getPatentState(item.state)}</span>
+                        <span>处理时间: {getTime(item.recordTime)}</span>
+                        <span>负责人:{item.principal}</span>
+                        <span>操作人:{item.operator}</span>
+                    </p>
+                )
+            });
+            if (data3[0].error.length) {
+                message.warning(data3[0].error[0].message);
+                return;
+            };
+            for (var item in data3[0].data) {
                 _me.state.adminOption.push(
-                    <Select.Option value={item} key={item}>{data2[0].data[item]}</Select.Option>
+                    <Select.Option value={item} key={item}>{data3[0].data[item]}</Select.Option>
                 )
             };
         }).always(function () {
@@ -164,12 +171,12 @@ const PatentDesc = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/managePatentInfo",
+            url: globalConfig.context + "/api/admin/patent/update",
             data: {
-                "xid": this.state.xid,
+                "id": this.state.xid,
                 "patentNumber": this.state.patentNumber,
                 "patentName": this.state.patentName,
-                "patentCatagory": this.state.patentType,
+                "patentCatagory": this.state.data.patentCatagory,
                 "patentField": this.state.patentField,
                 "patentDes": this.state.patentDes,
                 "patentWritingUrl": this.state.patentWritingUrl,
@@ -219,7 +226,7 @@ const PatentDesc = React.createClass({
             this.state.patentDes = nextProps.data.patentDes;
             this.state.patentName = nextProps.data.patentName;
             this.state.patentNumber = nextProps.data.patentNumber;
-            this.state.patentType = String(nextProps.data.patentType);
+            this.state.patentCatagory = String(nextProps.data.patentCatagory);
             this.state.patentState = String(nextProps.data.patentState);
             this.state.patentField = String(nextProps.data.patentField);
             this.loadData();
@@ -243,8 +250,10 @@ const PatentDesc = React.createClass({
     },
     render() {
         const Step = Steps.Step;
-        const theData = this.props.data;
-        if (this.props.data) {
+        const theData = this.state.data;
+
+        if (this.state.data) {
+            let companyAddress = theData.locationProvince || theData.locationCity || theData.locationArea ? theData.locationProvince + '/' + theData.locationCity + '/' + theData.locationArea : '';
             return (
                 <div className="patent-desc">
                     <Spin spinning={this.state.loading} className='spin-box'>
@@ -258,20 +267,20 @@ const PatentDesc = React.createClass({
                             className="patent-desc-content">
                             <div>
                                 <p className="widthHalf"><span>公司名称:</span>{theData.unitName}</p>
-                                <p className="widthHalf"><span>公司组织机构代码:</span>{theData.companyNum}</p>
+                                <p className="widthHalf"><span>公司组织机构代码:</span>{theData.orgCode}</p>
                             </div>
                             <div>
-                                <p className="widthHalf"><span>公司地址:</span>{theData.companyAddress}</p>
+                                <p className="widthHalf"><span>公司地址:</span>{companyAddress}</p>
                                 <p className="widthHalf"><span className="three2eight">联系人</span>:{theData.companyContacts}</p>
                             </div>
                             <div>
-                                <p className="widthHalf"><span className="two2four">编号</span>:{theData.number}</p>
+                                <p className="widthHalf"><span className="two2four">编号</span>:{theData.serialNumber}</p>
                                 <p className="widthHalf"><span className="seven2eight">申请号/专利号</span>:<Input value={this.state.patentNumber} onChange={(e) => { this.setState({ patentNumber: e.target.value }); }} /></p>
                             </div>
                             <div>
                                 <p className="widthHalf"><span>专利名称:</span><Input value={this.state.patentName} onChange={(e) => { this.setState({ patentName: e.target.value }); }} /></p>
                                 <div className="widthHalf"><span className="four2eight">专利类型</span>:
-                                    <Select value={this.state.patentType} style={{ width: 200 }} onChange={(e) => { this.setState({ patentType: e }); } }>{this.state.patentTypeOption}</Select>
+                                    <Select value={this.state.data.patentCatagory} style={{ width: 200 }} onChange={(e) => { this.setState({ patentCatagory: e }); } }>{this.state.patentTypeOption}</Select>
                                 </div>
                             </div>
                             <div>
@@ -308,7 +317,7 @@ const PatentDesc = React.createClass({
                                 <div>材料管理:
                                     {theData.patentWritingUrl !== null && theData.patentWritingUrl !== undefined && theData.patentWritingUrl !== '' ?
                                     <p className="download-file">
-                                        <a onClick={downloadFile.bind(null, theData.patentWritingUrl, theData.patentWritingDownloadFileName)}>{theData.patentWritingDownloadFileName}</a>
+                                        <a onClick={newDownloadFile.bind(null, this.state.xid, "patent_writing", "/api/admin/patent/download")}>授权通知书</a>
                                         {theData.confirmState == '0' ?
                                             <Button onClick={this.confirmButton}>确认稿件</Button> : <span></span>
                                         }
@@ -317,32 +326,32 @@ const PatentDesc = React.createClass({
                                     }
                                     {theData.authorizationNoticeUrl !== null && theData.authorizationNoticeUrl !== undefined && theData.authorizationNoticeUrl !== '' ?
                                         <p className="download-file">
-                                            <a onClick={downloadFile.bind(null, theData.authorizationNoticeUrl, theData.authorizationNoticeDownloadFileName)}>{theData.authorizationNoticeDownloadFileName}</a>
+                                            <a onClick={newDownloadFile.bind(null, this.state.xid, "authorization_notice", "/api/admin/patent/download")}>授权通知书</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(null, theData.patentCertificateUrl, theData.patentCertificateDownloadFileName)}>{theData.patentCertificateDownloadFileName}</a>
+                                            <a onClick={newDownloadFile.bind(null, this.state.xid, "patent_certificate", "/api/admin/patent/download")}>专利证书</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(null, theData.patentProryStatementUrl, theData.patentProryStatementDownloadFileName)}>{theData.patentProryStatementDownloadFileName}</a>
+                                            <a onClick={newDownloadFile.bind(null, this.state.xid, "patent_prory_statement", "/api/admin/patent/download")}>{theData.patentProryStatementDownloadFileName}</a>
                                         </p> :
                                         <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />专利代理委托书未上传</p>
                                     }
                                     {theData.lastYearTaxReportUrl !== null && theData.lastYearTaxReportUrl !== undefined && theData.lastYearTaxReportUrl !== '' ?
                                         <p className="download-file">
-                                            <a onClick={downloadFile.bind(null, theData.lastYearTaxReportUrl, theData.lastYearTaxReportDownloadFileName)}>{theData.lastYearTaxReportDownloadFileName}</a>
+                                            <a onClick={newDownloadFile.bind(null, theData.lastYearTaxReportUrl, theData.lastYearTaxReportDownloadFileName)}>{theData.lastYearTaxReportDownloadFileName}</a>
                                         </p> :
                                         <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />上年度纳税报表未上传</p>
                                     }
                                 </div>
-                                <Avatar urlData={this.getPatentWritingUrl} name='patent_writing' oid={theData.oid}/>
-                                <Avatar urlData={this.getAuthorizationNoticeUrl} name='authorization_notice' oid={theData.oid}/>
-                                <Avatar urlData={this.getPatentCertificateUrl} name='patent_certificate' oid={theData.oid}/>
+                                <Avatar urlData={this.getPatentWritingUrl} name='patent_writing' uid={theData.uid}/>
+                                <Avatar urlData={this.getAuthorizationNoticeUrl} name='authorization_notice' uid={theData.uid}/>
+                                <Avatar urlData={this.getPatentCertificateUrl} name='patent_certificate' uid={theData.uid}/>
                             </div>
                             <div className="avatar-text"><span>专利稿件上传</span><span>授权通知书上传</span><span>专利证书上传</span></div>
                             <div className="clearfix">

+ 21 - 21
js/component/manageCenter/servicesManage/patent/comprehensive.jsx

@@ -10,31 +10,30 @@ 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
         });
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/managePatentList",
-            data: {
-                pageNo: 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
-            },
+            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,
             success: function (data) {
                 if (data.error.length || !data.data || !data.data.list) {
                     message.warning(data.error[0].message);
@@ -44,8 +43,9 @@ const Patent = React.createClass({
                     let thisdata = data.data.list[i];
                     this.state.data.push({
                         key: i,
-                        pid: thisdata.pid,
+                        pid: thisdata.id,
                         oid: thisdata.oid,
+                        uid: thisdata.uid,
                         number: thisdata.serialNumber || '',
                         patentNumber: thisdata.patentNumber || '',
                         unitName: thisdata.unitName || '',
@@ -296,7 +296,7 @@ const Patent = React.createClass({
         this.loadData();
     },
     exportComposite() {
-        window.open(globalConfig.context + "/techservice/patent/exportComposite" +
+        window.open(globalConfig.context + "/api/admin/patent/exportComposite" +
             "?" + "serialNumber" + "=" + this.state.number +
             "&" + "patentNumber" + "=" + this.state.patentNumber +
             "&" + "patentName" + "=" + this.state.patentName +
@@ -352,7 +352,7 @@ const Patent = React.createClass({
                         <Upload style={{ float: 'right' }}
                             name="ratepay"
                             showUploadList={false}
-                            action={globalConfig.context + "/api/admin/uploadTemplate"}
+                            action={globalConfig.context + "/api/admin/patent/uploadTemplate"}
                             data={{ 'sign': 'patent_prory_statement' }}
                             beforeUpload={beforeUploadFile}
                             onChange={(info) => {

+ 2 - 1
js/component/manageCenter/servicesManage/patent/correction.jsx

@@ -16,7 +16,7 @@ const Correction = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/noticeOfCorrectionList",
+            url: globalConfig.context + "/api/admin/patent/noticeOfCorrectionList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize
@@ -31,6 +31,7 @@ const Correction = React.createClass({
                     this.state.data.push({
                         key: i,
                         pid:thisdata.pid,
+                        uid:thisdata.uid,
                         number: thisdata.serialNumber,
                         patentNumber: thisdata.patentNumber,
                         office: thisdata.office,

+ 2 - 1
js/component/manageCenter/servicesManage/patent/correctionDesc.jsx

@@ -24,9 +24,10 @@ const CorrectionDesc = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/replyConfirm",
+            url: globalConfig.context + "/api/admin/patent/replyConfirm",
             data: {
                 pid: this.props.data.pid,
+                uid: this.props.data.uid,
                 patentState: this.props.data.patentState
             },
             success: function (data) {

+ 4 - 6
js/component/manageCenter/servicesManage/patent/express.jsx

@@ -12,15 +12,13 @@ const Express = React.createClass({
         this.setState({
             loading: true
         });
+        let page = pageNo || 1,
+        pageSize = this.state.pagination.pageSize;
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/getRecieveSendList",
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-            },
+            url: globalConfig.context + "/api/admin/patent/getRecieveSendList?pageNo=" + page + "&pageSize=" + pageSize,
             success: function (data) {
                 if (data.error.length || !data.data || !data.data.list) {
                     message.warning(data.error[0].message);

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

@@ -26,7 +26,7 @@ const ExpressDesc = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/saveRecieveSend",
+            url: globalConfig.context + "/api/admin/patent/saveRecieveSend",
             data: {
                 "rid": this.props.data.rid,
                 "pid": this.props.data.pid,

+ 8 - 8
js/component/manageCenter/servicesManage/patent/payment.jsx

@@ -13,16 +13,15 @@ const Payment = React.createClass({
         this.setState({
             loading: true
         });
+        let page = pageNo || 1,
+        pageSize = this.state.pagination.pageSize,
+        locationProvince = this.state.province;
+
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/managePendingPaymentList",
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                locationProvince: this.state.province,
-            },
+            url: globalConfig.context + "/api/admin/patent/pendingPaymentList?pageNo=" + page + "&pageSize=" + pageSize + "&locationProvince=" + locationProvince,
             success: function (data) {
                 if (data.error.length || !data.data || !data.data.list) {
                     message.warning(data.error[0].message);
@@ -33,6 +32,7 @@ const Payment = React.createClass({
                     this.state.data.push({
                         key: i,
                         cid: thisdata.cid,
+                        uid: thisdata.uid,
                         number: thisdata.serialNumber,
                         province: thisdata.locationProvince,
                         patentNumber: thisdata.patentNumber,
@@ -164,7 +164,7 @@ const Payment = React.createClass({
         this.loadData();
     },
     exportPending() {
-        window.open(globalConfig.context + "/techservice/patent/exportPending?locationProvince=" + this.state.province)
+        window.open(globalConfig.context + "/api/admin/patent/exportPending?locationProvince=" + this.state.province)
     },
     render() {
         return (

+ 3 - 2
js/component/manageCenter/servicesManage/patent/paymentDesc.jsx

@@ -24,9 +24,10 @@ const PatentDesc = React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/techservice/patent/confirmPayment",
+            url: globalConfig.context + "/api/admin/patent/confirmPayment",
             data: {
-                cid : this.props.data.cid
+                cid : this.props.data.cid,
+                uid : this.props.data.uid
             },
             success: function (data) {
                 if ( data.error.length ) {

+ 4 - 10
js/component/manageCenter/servicesManage/technology/applyAdd.jsx

@@ -13,13 +13,10 @@ const ApplyAdd = React.createClass({
     },
     getContactsList(theUid) {
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/getContacts",
-            data: {
-                uid: theUid
-            },
+            url: globalConfig.context + "/api/admin/getContacts?uid=" + theUid,
             success: function (data) {
                 let theOption = [];
                 if (data.error.length || !data.data) {
@@ -37,13 +34,10 @@ const ApplyAdd = React.createClass({
             }.bind(this),
         });
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/user/getDepartment",
-            data: {
-                uid: theUid
-            },
+            url: globalConfig.context + "/api/admintechproject/getDepartment?uid=" + theUid,
             success: function (data) {
                 if (data.error.length || !data.data) {
                     message.warning(data.error[0].message);

+ 9 - 16
js/component/manageCenter/servicesManage/technology/applyChange.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Icon, Form, Button, Input, Select, Spin, Table, DatePicker, message, Modal, Checkbox, Upload } from 'antd';
-import { cognizanceStateList } from '../../../dataDic.js';
-import { getCognizanceState, beforeUpload, beforeUploadFile, downloadFile } from '../../../tools.js';
+import { technologyStateList } from '../../../dataDic.js';
+import { getTechnologyState, beforeUpload, beforeUploadFile, techDownloadFile } from '../../../tools.js';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 
@@ -25,7 +25,6 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                     return;
                 };
                 this.state.data = data.data;
-
                 if (data.data.projectMode == 1) {
                     this.state.projectMode = data.data.projectMode;
                     this.setState({projectModeState:true});
@@ -83,13 +82,10 @@ const ApplyChangeFrom = Form.create()(React.createClass({
             loading: true
         });
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/user/getDepartment",
-            data: {
-                uid: this.props.data.uid,
-            },
+            url: globalConfig.context + "/api/admintechproject/getDepartment?uid=" + this.props.data.uid,
             success: function (data) {
                 this.state.departmentOption = [];
                 if (data.error.length || !data.data) {
@@ -111,13 +107,10 @@ const ApplyChangeFrom = Form.create()(React.createClass({
     },
     getContactsList() {
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/getContacts",
-            data: {
-                uid: this.props.data.uid,
-            },
+            url: globalConfig.context + "/api/admin/getContacts?uid=" + this.props.data.uid,
             success: function (data) {
                 let theOption = [];
                 if (data.error.length || !data.data) {
@@ -150,7 +143,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                 title: '专利状态',
                 dataIndex: 'state',
                 key: 'state',
-                render: (text) => { return getCognizanceState(text) }
+                render: (text) => { return getTechnologyState(text) }
             }, {
                 title: '处理时间',
                 dataIndex: 'recordTime',
@@ -169,7 +162,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
     },
     componentWillMount() {
         let _me = this;
-        cognizanceStateList.map(function (item) {
+        technologyStateList.map(function (item) {
             _me.state.stateOption.push(
                 <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
             )
@@ -423,7 +416,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                         >
                             <Button><Icon type="upload" /> 项目材料上传 </Button>
                         </Upload>
-                        <p style={{ marginTop: '10px' }}>{theData.approvalUrl ? <a onClick={downloadFile.bind(null, theData.approvalUrl, theData.approvalDownloadFileName)}>{theData.approvalDownloadFileName}</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
+                        <p style={{ marginTop: '10px' }}>{theData.approvalUrl ? <a onClick={techDownloadFile.bind(null, "/api/admintechproject/download", this.state.data.id)}>{theData.approvalDownloadFileName}</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                     </div>
                     <div className="form-title">状态流转记录: </div>
                     <Table pagination={false} dataSource={this.state.stateTable} columns={this.state.stateColumns} />

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

@@ -223,7 +223,6 @@ const ApplyManage = React.createClass({
         this.loadData();
         this.getAuthorList();
         this.getCompanyList();
-        //        this.getContactsList();
     },
     tableRowClick(record, index) {
         this.state.RowData = record;

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

@@ -144,7 +144,6 @@ const Cognizance = React.createClass({
         });
         this.loadData();
         this.getCompanyList();
-        //        this.getContactsList();
     },
     tableRowClick(record, index) {
         this.state.RowData = record;

+ 6 - 0
js/component/tools.js

@@ -305,9 +305,15 @@ module.exports = {
     downloadFile: function (path, fileName) {
         window.open(globalConfig.context + '/open/downloadFile?path=' + path + '&fileName=' + fileName)
     },
+    techDownloadFile: function (url, id) {
+        window.open(globalConfig.context + url + '?id=' + id)
+    },
     copyrightDownloadFile: function (id, sign, url) {
         window.open(globalConfig.context + url + '?id=' + id + '&sign=' + sign)
     },
+    newDownloadFile: function (id, sign, url) {
+        window.open(globalConfig.context + url + '?id=' + id + '&sign=' + sign)
+    },
     companySearch(input, option) {
         return option.props.children.indexOf(input) >= 0
     },