yee 7 年之前
父節點
當前提交
c408fdb436

+ 6 - 2
js/component/manageCenter/demand/techDemandDesc.jsx

@@ -295,12 +295,16 @@ const DemandDetailShow = Form.create()(React.createClass({
     },
     componentWillMount() {
         this.loadData(this.props.data.id, this.props.detailApiUrl);
-        this.getContactsList(this.props.data.employerId);
+        if (this.props.data.employerId) {
+            this.getContactsList(this.props.data.employerId);
+        };
     },
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
             this.loadData(nextProps.data.id, nextProps.detailApiUrl);
-            this.getContactsList(nextProps.data.employerId);
+            if (nextProps.data.employerId) {
+                this.getContactsList(nextProps.data.employerId);
+            };
             this.props.form.resetFields();
         };
     },

+ 1 - 1
js/component/manageCenter/index/content.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Spin, Button, Tabs, Table } from 'antd';
+import { Spin, Button, Tabs, Table, message } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 

+ 1 - 1
js/component/manageCenter/servicesManage/contract/contractDetail.jsx

@@ -505,7 +505,7 @@ const ContractDetailForm = Form.create()(React.createClass({
                         "cid": this.props.data.id,
                         "comment": values.comment,
                         "status": values.status,
-                        "recordTimeFormattedDate": values.recordTime.format("YYYY-MM-DD HH:mm:ss"),
+                        "recordTimeFormattedDate": values.recordTime ? values.recordTime.format("YYYY-MM-DD HH:mm:ss") : null,
                         "principals": values.principals //流转分发人
                     }
                 }).done(function (data) {

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

@@ -97,8 +97,9 @@ const CompanyDetail = Form.create()(React.createClass({
                 };
                 return;
             };
-            data.data.map(function (item) {
+            data.data.map(function (item, i) {
                 theTableData.push({
+                    key: i,
                     id: item.id,
                     uid: item.uid,
                     type: item.type,
@@ -136,8 +137,9 @@ const CompanyDetail = Form.create()(React.createClass({
                 };
                 return;
             };
-            data.data.map(function (item) {
+            data.data.map(function (item, i) {
                 theTableData.push({
+                    key: i,
                     id: item.id,
                     uid: item.uid,
                     type: item.type,

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

@@ -26,7 +26,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                 this.state.data = {};
             } else { this.state.data = data.data };
         }).always(function () {
-            this.props.spinState(true);
+            this.props.spinState(false);
         }.bind(this));
     },
     getInitialState() {
@@ -49,7 +49,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                 <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
             )
         });
-        if (this.props.data.id && this.props.data.type && this.props.data.type) {
+        if (this.props.data.id && this.props.data.type != undefined && this.props.data.type != null) {
             this.loadData();
         };
     },
@@ -91,7 +91,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
     },
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
-            if (nextProps.data.id) {
+            if (nextProps.data.id && nextProps.data.type != undefined && nextProps.data.type != null) {
                 this.loadData(nextProps.data.id, nextProps.data.type);
             };
             this.state.data = {};

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

@@ -72,7 +72,7 @@ const CustomerSearch = React.createClass({
                     </Col>
                     <Col span={1}></Col>
                     <Col span={2}>
-                        <Select style={{ width: 100 }}
+                        <Select
                             value={this.state.searchType}
                             onChange={(e) => { this.setState({ searchType: e }) }} >
                             <Select.Option value="0">个人用户</Select.Option>

+ 1 - 4
js/component/manageCenter/userManage/orgDesc.jsx

@@ -899,10 +899,7 @@ const OrgCertify = Form.create()(React.createClass({
                             label="上年度纳税报表" >
                             <div className="idcard-img clearfix">
                                 {this.state.lastYearTaxReportUrl ? <div>
-                                    <div className="idcard-imgbox">
-                                        <img src={globalConfig.context + '/open/writeImage?path=' + this.state.lastYearTaxReportUrl} alt="点击查看大图"
-                                            onClick={(e) => { window.open(e.target.src) }} />
-                                    </div>
+                                    <a onClick={newDownloadFile.bind(null, this.state.lastYearTaxReportId, "last_year_ratepay", "/api/admin/patent/downloadRatepay")}>上年度纳税报表</a>
                                 </div> : <div>
                                         <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传</p>
                                     </div>}

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

@@ -267,7 +267,7 @@ const LoginContent = Form.create()(React.createClass({
                                 )}
                         </FormItem>
                         <FormItem {...tailFormItemLayout}>
-                            <Button type="primary" htmlType="submit" size="large">提 交</Button>
+                            <Button disabled={!this.props.form.getFieldValue('agreement')} type="primary" htmlType="submit" size="large">提 交</Button>
                         </FormItem>
                     </Form>
                     <div className="account-right">

+ 1 - 1
js/component/sign/groupAccount.jsx

@@ -281,7 +281,7 @@ const Group = Form.create()(React.createClass({
                                 )}
                         </FormItem>
                         <FormItem {...tailFormItemLayout}>
-                            <Button type="primary" htmlType="submit" size="large">提 交</Button>
+                            <Button disabled={!this.props.form.getFieldValue('agreement')} type="primary" htmlType="submit" size="large">提 交</Button>
                         </FormItem>
                     </Form>
                     <Modal showDesc={this.state.showDesc} closeModal={this.closeModal} />

+ 1 - 1
js/component/sign/modal.jsx

@@ -14,7 +14,7 @@ const TheModal = React.createClass({
     },
     render() {
         return (
-            <Modal title="免责声明 DISCLAIMER" style={{ width: 1000, height: 600 }}
+            <Modal title="免责声明 DISCLAIMER" width={1000}
                 visible={this.state.visible}
                 onCancel={() => { this.props.closeModal() }}
                 footer={null}>