浏览代码

Accept Merge Request #7 v1.0.2版本更新 : (master -> test)

Merge Request: v1.0.2版本更新
Created By: @seirios
Accepted By: @seirios
URL: https://coding.net/t/aft/p/AFT-WEB/git/merge/7
seirios 8 年之前
父节点
当前提交
ee6fdb7571

二进制
image/adminBackground.jpg


+ 1 - 1
js/component/account/bottom.less

@@ -2,7 +2,7 @@
         width: 100%;
         color: #d5e4f7;
         background: #212831;
-        position: absolute;
+        position: fixed;
         bottom: 0;
         left: 0;
         z-index: 1;

+ 3 - 1
js/component/account/leftTab.less

@@ -2,9 +2,11 @@
     .account-left {
         width: 16%;
         height: 100%;
-        padding-top: 40px;
+        margin-top: 40px;
+        padding-bottom: 50px;
         float: left;
         border-right: none;
+        overflow-y: auto;
         //background: #e8f2fc;
         .ant-menu-submenu {
             .ant-menu-submenu-title {

+ 12 - 11
js/component/account/services/orgTechCenter.jsx

@@ -25,9 +25,9 @@ const CenterListDescFrom = Form.create()(React.createClass({
                     data: {
                         id: this.props.data.id,
                         projectName: values.projectName,
-                        projectTime: values.projectTime.format("YYYY-MM-DD"),
+                        projectTimeFormattedDate: values.projectTimeFormattedDate.format("YYYY-MM-DD"),
                         institution: values.institution,
-                        termTime: values.termTime.format("YYYY-MM-DD"),
+                        termTimeFormattedDate: values.termTimeFormattedDate.format("YYYY-MM-DD"),
                         protocolUrl: this.state.protocolUrl
                     }
                 }).done(function (data) {
@@ -105,8 +105,9 @@ const CenterListDescFrom = Form.create()(React.createClass({
                     <Upload
                         name="ratepay"
                         action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': this.props.year + 'protocol' }}
+                        data={{ 'sign': 'protocol' }}
                         beforeUpload={beforeUploadFile}
+                        showUploadList={false}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
                                 console.log(info.file, info.fileList);
@@ -124,8 +125,9 @@ const CenterListDescFrom = Form.create()(React.createClass({
                             }
                         }}
                     >
-                        <Button><Icon type="upload" /> 上传文件 </Button>
+                        <Button><Icon type="upload" /> 上传研发费用台账 </Button>
                     </Upload>
+                    <p style={{ marginTop: '10px' }}>{theData.protocolUrl ? <a onClick={downloadFile.bind(null, theData.protocolUrl, theData.protocolDownloadFileName)}>{theData.protocolDownloadFileName}</a> : <span>未上传!</span>}</p>
                 </div>
                 <FormItem style={{ marginTop: '20px' }}>
                     <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
@@ -246,8 +248,9 @@ const CenterList = React.createClass({
                     cid: thisdata.cid,
                     projectTimeFormattedDate: thisdata.projectTimeFormattedDate,
                     projectName: thisdata.projectName,
-                    protocolDownloadFileName:thisdata.protocolDownloadFileName,
+                    protocolDownloadFileName: thisdata.protocolDownloadFileName,
                     protocolUrl: thisdata.protocolUrl,
+                    protocol: [thisdata.protocolUrl, thisdata.protocolDownloadFileName],
                     institution: thisdata.institution,
                     termTimeFormattedDate: thisdata.termTimeFormattedDate
 
@@ -301,12 +304,10 @@ const CenterList = React.createClass({
                     key: 'institution'
                 }, {
                     title: '协议附件',
-                    dataIndex: 'protocolUrl',
-                    key: 'protocolUrl',
+                    dataIndex: 'protocol',
+                    key: 'protocol',
                     render: (text) => {
-                        <a href="" onClick={() => {
-                            window.open(globalConfig.context + "/techservice/patent/downloadFile?path=" + text + "&sign=" + "type")
-                        }}></a>
+                        return <a onClick={downloadFile.bind(null, text[0], text[1])}>{text[1]}</a>
                     }
                 }
             ],
@@ -329,7 +330,7 @@ const CenterList = React.createClass({
             if (rowItem.id) {
                 deletedIds.push(rowItem.id)
             }
-        }
+        };
         this.setState({
             selectedRowKeys: [],
             loading: deletedIds.length > 0

+ 1 - 1
js/component/account/services/techProduct.less

@@ -1,7 +1,7 @@
 .user-content {
     .clearfix {
         >.orgTech-item {
-            width: 60%;
+            width: 80%;
             display: inline-block;
             >span {
                 margin-right: 10px;

+ 115 - 30
js/component/account/set/company.jsx

@@ -139,6 +139,7 @@ const PersonFrom = Form.create()(React.createClass({
                         unitNumber: data.data.info.unitSize,
                         unitIntro: data.data.info.companyIntroduction,
                         unitFrom: data.data.info.homeUnit,
+                        publicityPictureUrl: data.data.info.publicityPictureUrl,
                         companyLifePicList: theArr,
                         qiyezizhi: data.data.pro.qualification,
                         turnover: data.data.pro.turnover,
@@ -189,12 +190,14 @@ const PersonFrom = Form.create()(React.createClass({
             let cmbC = document.getElementById('cmbCity').value;
             let cmbA = document.getElementById('cmbArea').value;
             //
-            let leftPicArr = [];
-            this.state.companyLifePicObj.map(function (item) {
-                leftPicArr.push(item.response.data);
-            });
-            let lifePhotoUrl = leftPicArr.join(",");
-
+            let lifePhotoUrl = this.state.publicityPictureUrl;
+            if (this.state.companyLifePicObj.length) {
+                let leftPicArr = [];
+                this.state.companyLifePicObj.map(function (item) {
+                    leftPicArr.push(item.response.data);
+                });
+                lifePhotoUrl = leftPicArr.join(",");
+            };
             if (!err) {
                 this.props.spinState(true);
 
@@ -218,14 +221,14 @@ const PersonFrom = Form.create()(React.createClass({
                         "pro.turnover": values.turnover,
                         "pro.collegeAttribute": values.schoolProp,
                         "pro.collegeEstablishTime": values.schoolTime,
-                        "pro.academician": this.state.aca,
-                        "pro.doctoralTutor": this.state.PhDTutor,
-                        "pro.masterTutor": this.state.MSTutor,
-                        "pro.otherExpert": this.state.otherExperts,
-                        "pro.nationalLab": this.state.StateKeyLab,
-                        "pro.educationLab": this.state.EduKeyLab,
-                        "pro.enterpriseCenter": this.state.ComCenter,
-                        "pro.otherCenter": this.state.otherCenter,
+                        "pro.academician": values.aca,
+                        "pro.doctoralTutor": values.PhDTutor,
+                        "pro.masterTutor": values.MSTutor,
+                        "pro.otherExpert": values.otherExperts,
+                        "pro.nationalLab": values.StateKeyLab,
+                        "pro.educationLab": values.EduKeyLab,
+                        "pro.enterpriseCenter": values.ComCenter,
+                        "pro.otherCenter": values.otherCenter,
                         "pro.institutionEstablishTime": values.resTime
                     }
                 }).done(function (data) {
@@ -413,22 +416,104 @@ const PersonFrom = Form.create()(React.createClass({
                         )}
                     <span>年</span>
                 </FormItem>
-                <FormItem style={{ 'display': this.state.schoolDis }}
-                    labelCol={{ span: 3 }}
-                    wrapperCol={{ span: 21, offset: 3 }}
-                    label=""
-                >
-                    <div className="school-props clearfix">
-                        <div><span>院士:</span><InputNumber value={this.state.aca} onChange={function (e) { this.setState({ aca: e }) }.bind(this)} />人</div>
-                        <div><span>博士生导师:</span><InputNumber value={this.state.PhDTutor} onChange={function (e) { this.setState({ PhDTutor: e }) }.bind(this)} />人</div>
-                        <div><span>硕士生导师:</span><InputNumber value={this.state.MSTutor} onChange={function (e) { this.setState({ MSTutor: e }) }.bind(this)} />人</div>
-                        <div><span>其他专家:</span><InputNumber value={this.state.otherExperts} onChange={function (e) { this.setState({ otherExperts: e }) }.bind(this)} />人</div>
-                        <div><span>国家级重点实验室:</span><InputNumber value={this.state.StateKeyLab} onChange={function (e) { this.setState({ StateKeyLab: e }) }.bind(this)} />所</div>
-                        <div><span>教育部重点实验室:</span><InputNumber value={this.state.EduKeyLab} onChange={function (e) { this.setState({ EduKeyLab: e }) }.bind(this)} />所</div>
-                        <div><span>企业共建研究中心:</span><InputNumber value={this.state.ComCenter} onChange={function (e) { this.setState({ ComCenter: e }) }.bind(this)} />所</div>
-                        <div><span>其他研究中心:</span><InputNumber value={this.state.otherCenter} onChange={function (e) { this.setState({ otherCenter: e }) }.bind(this)} />所</div>
-                    </div>
-                </FormItem>
+                <div className="school-props clearfix" style={{ 'display': this.state.schoolDis }}>
+                    <FormItem
+                        labelCol={{ span: 10 }}
+                        wrapperCol={{ span: 12 }}
+                        label="院士"
+                    >
+                        {getFieldDecorator('aca', {
+                            initialValue: this.state.aca
+                        })(
+                            <InputNumber />
+                            )}
+                        <span>人</span>
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 10 }}
+                        wrapperCol={{ span: 12 }}
+                        label="博士生导师"
+                    >
+                        {getFieldDecorator('PhDTutor', {
+                            initialValue: this.state.PhDTutor
+                        })(
+                            <InputNumber />
+                            )}
+                        <span>人</span>
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 10 }}
+                        wrapperCol={{ span: 12 }}
+                        label="硕士生导师"
+                    >
+                        {getFieldDecorator('MSTutor', {
+                            initialValue: this.state.MSTutor
+                        })(
+                            <InputNumber />
+                            )}
+                        <span>人</span>
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 10 }}
+                        wrapperCol={{ span: 12 }}
+                        label="其他专家"
+                    >
+                        {getFieldDecorator('otherExperts', {
+                            initialValue: this.state.otherExperts
+                        })(
+                            <InputNumber />
+                            )}
+                        <span>人</span>
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 10 }}
+                        wrapperCol={{ span: 12 }}
+                        label="国家级重点实验室"
+                    >
+                        {getFieldDecorator('StateKeyLab', {
+                            initialValue: this.state.StateKeyLab
+                        })(
+                            <InputNumber />
+                            )}
+                        <span>所</span>
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 10 }}
+                        wrapperCol={{ span: 12 }}
+                        label="教育部重点实验室"
+                    >
+                        {getFieldDecorator('EduKeyLab', {
+                            initialValue: this.state.EduKeyLab
+                        })(
+                            <InputNumber />
+                            )}
+                        <span>所</span>
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 10 }}
+                        wrapperCol={{ span: 12 }}
+                        label="企业共建研究中心"
+                    >
+                        {getFieldDecorator('ComCenter', {
+                            initialValue: this.state.ComCenter
+                        })(
+                            <InputNumber />
+                            )}
+                        <span>所</span>
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 10 }}
+                        wrapperCol={{ span: 12 }}
+                        label="其他研究中心"
+                    >
+                        {getFieldDecorator('otherCenter', {
+                            initialValue: this.state.otherCenter
+                        })(
+                            <InputNumber />
+                            )}
+                        <span>所</span>
+                    </FormItem>
+                </div>
                 <FormItem style={{ 'display': this.state.resDis }}
                     {...formItemLayout}
                     label="创办时间"

+ 4 - 6
js/component/account/set/person.less

@@ -41,13 +41,9 @@
             }
         }
         .school-props {
-            > div {
+            >div {
                 float: left;
                 width: 50%;
-                span {
-                    display: inline-block;
-                    width: 45%;
-                }
             }
         }
     }
@@ -69,7 +65,9 @@
         font-size: 28px;
         color: #999;
     }
-    #cmbProvince,#cmbCity,#cmbArea {
+    #cmbProvince,
+    #cmbCity,
+    #cmbArea {
         border-radius: 4px;
     }
 }

+ 3 - 1
js/component/manageCenter/leftTab.less

@@ -2,9 +2,11 @@
     .account-left {
         width: 16%;
         height: 100%;
-        padding-top: 40px;
+        margin-top: 40px;
+        padding-bottom: 50px;
         float: left;
         border-right: none;
+        overflow-y: auto;
         //background: #e8f2fc;
         .ant-menu-submenu {
             .ant-menu-submenu-title {

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/HighTechApply.jsx

@@ -308,7 +308,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
                         wrapperCol={{ span: 24 }}
                     >
                         {getFieldDecorator('accident', {
-                            rules: [{ required: true, message: '此项为必填项!' }],
+                            rules: [{ type: 'number', required: true, message: '此项为必填项!' }],
                             initialValue: theData.accident
                         })(
                             <Radio.Group>

+ 8 - 6
js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Icon, Form, Button, Input, Spin, Table, message, Modal, Upload, DatePicker } from 'antd';
 import './techProduct.less';
-import { beforeUploadFile } from '../../../../tools.js';
+import { beforeUploadFile, downloadFile } from '../../../../tools.js';
 import moment from 'moment';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
@@ -106,8 +106,9 @@ const CenterListDescFrom = Form.create()(React.createClass({
                     <Upload
                         name="ratepay"
                         action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': this.props.year + 'protocol' }}
+                        data={{ 'sign': 'protocol' }}
                         beforeUpload={beforeUploadFile}
+                        showUploadList={false}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
                                 console.log(info.file, info.fileList);
@@ -125,8 +126,9 @@ const CenterListDescFrom = Form.create()(React.createClass({
                             }
                         }}
                     >
-                        <Button><Icon type="upload" /> 上传文件 </Button>
+                        <Button><Icon type="upload" /> 上传研发费用台账 </Button>
                     </Upload>
+                    <p style={{ marginTop: '10px' }}>{theData.protocolUrl ? <a onClick={downloadFile.bind(null, theData.protocolUrl, theData.protocolDownloadFileName)}>{theData.protocolDownloadFileName}</a> : <span>未上传!</span>}</p>
                 </div>
                 <FormItem style={{ marginTop: '20px' }}>
                     <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
@@ -250,7 +252,9 @@ const CenterList = React.createClass({
                     cid: thisdata.cid,
                     projectTimeFormattedDate: thisdata.projectTimeFormattedDate,
                     projectName: thisdata.projectName,
+                    protocolDownloadFileName: thisdata.protocolDownloadFileName,
                     protocolUrl: thisdata.protocolUrl,
+                    protocol: [thisdata.protocolUrl, thisdata.protocolDownloadFileName],
                     institution: thisdata.institution,
                     termTimeFormattedDate: thisdata.termTimeFormattedDate
                 });
@@ -306,9 +310,7 @@ const CenterList = React.createClass({
                     dataIndex: 'protocolUrl',
                     key: 'protocolUrl',
                     render: (text) => {
-                        <a href="" onClick={() => {
-                            window.open(globalConfig.context + "/techservice/patent/downloadFile?path=" + text + "&sign=" + "type")
-                        }}></a>
+                        return <a onClick={downloadFile.bind(null, text[0], text[1])}>{text[1]}</a>
                     }
                 }
             ],

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.less

@@ -2,7 +2,7 @@
     padding: 0px;
     .clearfix {
         >.orgTech-item {
-            width: 60%;
+            width: 80%;
             display: inline-block;
             >span {
                 margin-right: 10px;

+ 1 - 1
js/component/manageCenter/userManage/orgCertify.jsx

@@ -113,7 +113,7 @@ const OrgCertify = Form.create()(React.createClass({
                         bankCardNumber: values.bankCardNumber,
 
                         validationAmount: values.validationAmount, //打款金额
-                        paymentDateFormattedDate: values.paymentDateFormattedDate.format("YYYY-MM-DD"),
+                        paymentDateFormattedDate: values.paymentDateFormattedDate ? values.paymentDateFormattedDate.format("YYYY-MM-DD") : undefined,
                         auditStatus: values.auditStatus,
                         process: values.process
                     }

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

@@ -45,7 +45,8 @@ const OrgList = React.createClass({
                         number: thisdata.number,
                         auditStatus: thisdata.auditStatus,
                         createTimeFormattedDate: thisdata.createTimeFormattedDate,
-                        adminName:thisdata.adminName
+                        adminName: thisdata.adminName,
+                        unitName: thisdata.unitName
                     });
                 };
                 this.state.pagination.current = data.data.pageNo;
@@ -89,6 +90,10 @@ const OrgList = React.createClass({
                     dataIndex: 'mobile',
                     key: 'mobile',
                 }, {
+                    title: '公司名称',
+                    dataIndex: 'unitName',
+                    key: 'unitName',
+                }, {
                     title: '认证状态',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',

+ 1 - 1
js/component/manageCenter/userManage/userDesc.jsx

@@ -98,7 +98,7 @@ const UserForm = Form.create()(React.createClass({
                         bankCardNumber: values.bankCardNumber,
                         amountMoney: values.amountMoney,
                         auditStatus: values.auditStatus,
-                        paymentDateFormattedDate: values.paymentDateFormattedDate.format("YYYY-MM-DD"),
+                        paymentDateFormattedDate: values.paymentDateFormattedDate ? values.paymentDateFormattedDate.format("YYYY-MM-DD") : undefined,
                         process: values.process
                     }
                 }).done(function (data) {

+ 1 - 1
package.json

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