Browse Source

科技项目申报接口变更

wubb 8 years ago
parent
commit
5bc98147b8

+ 17 - 5
js/component/dataDic.js

@@ -4234,19 +4234,31 @@ module.exports = {
             key: "申请"
         },{
             value: "1",
-            key: "单"
+            key: "单"
         },{
             value: "2",
-            key: "受理"
+            key: "派单"
         },{
             value: "3",
-            key: "审批通过"
+            key: "流转"
         },{
             value: "4",
-            key: "审批不通过"
+            key: "材料提交"
         },{
             value: "5",
-            key: "项目批复"
+            key: "受理"
+        },{
+            value: "6",
+            key: "审批通过"
+        },{
+            value: "7",
+            key: "审批不通过"
+        },{
+            value: "8",
+            key: "已结款"
+        },{
+            value: "9",
+            key: "撤销"
         }
     ],
     copyrightStateList:[

+ 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;

+ 3 - 0
js/component/tools.js

@@ -305,6 +305,9 @@ 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)
     },