Browse Source

v1.0.18 update

yee 8 years ago
parent
commit
22c3a8e694

+ 55 - 55
js/component/manageCenter/servicesManage/copyright/comPatentChange.jsx

@@ -106,72 +106,72 @@ const CopyrightDescForm = Form.create()(React.createClass({
         })).done((data1, data2, data3) => {
             let _me = this;
             //状态流转table
+            this.state.stateTable = [];
             if (data1[0].error && data1[0].error.length) {
                 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.status,
-                    principal: item.principal,
-                    operator: item.operator,
-                    comment: item.comment
+            } else {
+                data1[0].data.map(function (item, i) {
+                    _me.state.stateTable.push({
+                        key: i,
+                        recordTimeFormattedDate: item.recordTimeFormattedDate,
+                        status: item.status,
+                        principal: item.principal,
+                        operator: item.operator,
+                        comment: item.comment
+                    });
                 });
-            });
+            };
             //获取联系人
+            this.state.contactsOption = [];
             if (data2[0].error && data2[0].error.length) {
                 message.warning(data2[0].error[0].message);
-                return;
-            };
-            this.state.contactsOption = [];
-            for (let item in data2[0].data) {
-                let theData = data2[0].data[item];
-                _me.state.contactsOption.push(
-                    <Select.Option value={item} key={theData}>{theData}</Select.Option>
-                );
+            } else {
+                for (let item in data2[0].data) {
+                    let theData = data2[0].data[item];
+                    _me.state.contactsOption.push(
+                        <Select.Option value={item} key={theData}>{theData}</Select.Option>
+                    );
+                };
             };
             //获取详细数据
             if (!data3[0].data && data3[0].error && data3[0].error.length) {
                 message.warning(data3[0].error[0].message);
-                return;
+            } else if (data3[0].data) {
+                let detailData = data3[0].data;
+                this.setState({
+                    id: detailData.id,
+                    province: detailData.province,
+                    postalAddress: detailData.postalAddress,
+                    unitName: detailData.unitName,
+                    serialNumber: detailData.serialNumber,
+                    createTime: detailData.createTime,
+                    acceptTime: detailData.acceptTime,
+                    principal: detailData.principal,
+                    contact: detailData.contact,
+                    copyrightName: detailData.copyrightName,
+                    copyrightNumber: detailData.copyrightNumber,
+                    status: detailData.status,
+                    comment: detailData.comment,
+                    workIssue: detailData.workIssue,
+                    outsource: detailData.outsource,
+                    inUrgent: detailData.inUrgent,
+                    authorizedDate: detailData.authorizedDate,
+                    fisrtContact: detailData.fisrtContact,
+                    secondContact: detailData.secondContact,
+                    thirdContact: detailData.thirdContact,
+                    city: detailData.city,
+                    area: detailData.area,
+                    postcode: detailData.postcode,
+                    certificateUrl: detailData.certificateUrl,
+                    applicationUrl: detailData.applicationUrl,
+                    certificateUrlDownloadFileName: detailData.certificateUrlDownloadFileName,
+                    applicationUrlDownloadFileName: detailData.applicationUrlDownloadFileName,
+                    authorizedDateFormattedDate: detailData.authorizedDateFormattedDate,
+                    createTimeFormattedDate: detailData.createTimeFormattedDate,
+                    acceptTimeFormattedDate: detailData.acceptTimeFormattedDate,
+                    expectTime: [detailData.acceptTime, detailData.inUrgent]
+                });
             };
-            let detailData = data3[0].data;
-            this.setState({
-                id: detailData.id,
-                province: detailData.province,
-                postalAddress:detailData.postalAddress,
-                unitName: detailData.unitName,
-                serialNumber: detailData.serialNumber,
-                createTime: detailData.createTime,
-                acceptTime: detailData.acceptTime,
-                principal: detailData.principal,
-                contact: detailData.contact,
-                copyrightName: detailData.copyrightName,
-                copyrightNumber: detailData.copyrightNumber,
-                status: detailData.status,
-                comment: detailData.comment,
-                workIssue: detailData.workIssue,
-                outsource: detailData.outsource,
-                inUrgent: detailData.inUrgent,
-                authorizedDate: detailData.authorizedDate,
-                fisrtContact: detailData.fisrtContact,
-                secondContact: detailData.secondContact,
-                thirdContact: detailData.thirdContact,
-                city: detailData.city,
-                area: detailData.area,
-                postcode: detailData.postcode,
-                certificateUrl: detailData.certificateUrl,
-                applicationUrl: detailData.applicationUrl,
-                certificateUrlDownloadFileName: detailData.certificateUrlDownloadFileName,
-                applicationUrlDownloadFileName: detailData.applicationUrlDownloadFileName,
-                authorizedDateFormattedDate: detailData.authorizedDateFormattedDate,
-                createTimeFormattedDate: detailData.createTimeFormattedDate,
-                acceptTimeFormattedDate: detailData.acceptTimeFormattedDate,
-                expectTime: [detailData.acceptTime, detailData.inUrgent]
-            });
         }).always(function () {
             this.setState({
                 loading: false

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

@@ -320,8 +320,12 @@ const CompanyDetail = Form.create()(React.createClass({
         this.loadLegalData();
         this.loadInfoData();
     },
-    componentWillReceiveProps() {
-
+    componentWillReceiveProps(nextProps) {
+        if (this.props.data.uid !== nextProps.data.uid) {
+            this.loadHumanData(nextProps.data.uid);
+            this.loadLegalData(nextProps.data.uid);
+            this.loadInfoData(nextProps.data.uid);
+        };
     },
     humanRemove() {
         let deletedIds = [];
@@ -389,7 +393,6 @@ const CompanyDetail = Form.create()(React.createClass({
         }).done((res) => {
             if (!res.error.length) {
                 message.success("保存成功");
-                this.loadData();
             } else {
                 message.error(res.error[0].message);
             }
@@ -465,7 +468,6 @@ const CompanyDetail = Form.create()(React.createClass({
         }).done((res) => {
             if (!res.error.length) {
                 message.success("保存成功");
-                this.loadData();
             } else {
                 message.error(res.error[0].message);
             }

+ 0 - 4
js/component/manageCenter/servicesManage/highTech/highTechApply.jsx

@@ -928,10 +928,6 @@ const Cognizance = React.createClass({
                     dataIndex: 'issuingDate',
                     key: 'issuingDate',
                     render: (text) => { return getTime(text, 36) }
-                }, {
-                    title: '负责人',
-                    dataIndex: 'consultant',
-                    key: 'consultant'
                 }
             ],
             dataSource: []

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

@@ -173,8 +173,8 @@ const PatentAddFrom = Form.create()(React.createClass({
         const FormItem = Form.Item;
         const { getFieldDecorator } = this.props.form;
         const formItemLayout = {
-            labelCol: { span: 3 },
-            wrapperCol: { span: 14 },
+            labelCol: { span: 4 },
+            wrapperCol: { span: 18 },
         };
         const _me = this;
         return (
@@ -192,7 +192,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                             showSearch
                             filterOption={companySearch}
                             onChange={(e) => { this.setState({ companyName: e }); this.getContactsList(e); }}
-                            showSearch={true} style={{ width: 200 }} >
+                            showSearch={true} style={{ width: 260 }} >
                             {this.state.companyOption}
                         </Select>
                         )}
@@ -206,7 +206,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                         initialValue: this.state.contacts || null
                     })(
                         <Select placeholder="选择联系人"
-                            style={{ width: 200 }} >
+                            style={{ width: 260 }} >
                             {this.state.contactsOption}
                         </Select>
                         )}
@@ -241,7 +241,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                     label="姓名"
                 >
                     {getFieldDecorator('firstInventorName', {
-                        rules: [{ required: true, message: 'Please input name!' }]
+                        rules: [{ required: true, message: '请输入姓名!' }]
                     })(
                         <Input className="mini-input" />
                         )}
@@ -251,7 +251,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                     label="身份证"
                 >
                     {getFieldDecorator('firstInventorID', {
-                        rules: [{ required: true, message: 'Please input ID!' }]
+                        rules: [{ required: true, message: '请输入身份证号!' }]
                     })(
                         <Input className="mini-input" />
                         )}

+ 47 - 42
js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx

@@ -94,7 +94,7 @@ const PatentDesc = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/patent/logs ",
+            url: globalConfig.context + "/api/admin/patent/logs",
             data: { pid: this.state.xid }
         }), $.ajax({
             method: "get",
@@ -108,58 +108,58 @@ const PatentDesc = React.createClass({
             url: globalConfig.context + "/api/admin/patent/patentStatus"
         })).done((data1, data2, data3, data4) => {
             let _me = this;
-            if (data1[0].error.length || !data1[0].data) {
+            if (data1[0].error.length) {
                 message.warning(data1[0].error[0].message);
-                return;
+            } else {
+                this.state.data = data1[0].data;
+                this.state.patentDes = data1[0].data.patentDes;
+                this.state.patentName = data1[0].data.patentName;
+                this.state.patentNumber = data1[0].data.patentNumber;
+                this.state.office = data1[0].data.office;
+                this.state.patentCatagory = data1[0].data.patentCatagory;
+                this.state.patentState = data1[0].data.patentState;
+                this.state.patentField = data1[0].data.patentField;
+                this.state.contacts = data1[0].data.contacts;
+                this.state.uid = data1[0].data.uid;
+                this.state.id = data1[0].data.id;
             };
-            this.state.data = data1[0].data;
-            this.state.patentDes = data1[0].data.patentDes;
-            this.state.patentName = data1[0].data.patentName;
-            this.state.patentNumber = data1[0].data.patentNumber;
-            this.state.office = data1[0].data.office;
-            this.state.patentCatagory = data1[0].data.patentCatagory;
-            this.state.patentState = data1[0].data.patentState;
-            this.state.patentField = data1[0].data.patentField;
-            this.state.contacts = data1[0].data.contacts;
-            this.state.uid = data1[0].data.uid;
-            this.state.id = data1[0].data.id;
             if (data2[0].error.length) {
                 message.warning(data2[0].error[0].message);
-                return;
-            };
-            _me.state.stateTable = [];
-            data2[0].data.map(function (item) {
-                _me.state.stateTable.push({
-                    comment: item.comment,
-                    id: item.id,
-                    operator: item.operator,
-                    pid: item.pid,
-                    principal: item.principal,
-                    recordTime: item.recordTime,
-                    recordTimeFormattedDate: item.recordTimeFormattedDate,
-                    state: item.state,
+            } else {
+                _me.state.stateTable = [];
+                data2[0].data.map(function (item) {
+                    _me.state.stateTable.push({
+                        comment: item.comment,
+                        id: item.id,
+                        operator: item.operator,
+                        pid: item.pid,
+                        principal: item.principal,
+                        recordTime: item.recordTime,
+                        recordTimeFormattedDate: item.recordTimeFormattedDate,
+                        state: item.state,
+                    });
                 });
-            });
+            };
             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}>{data3[0].data[item]}</Select.Option>
-                )
+            } else {
+                for (var item in data3[0].data) {
+                    _me.state.adminOption.push(
+                        <Select.Option value={item} key={item}>{data3[0].data[item]}</Select.Option>
+                    )
+                };
             };
             if (!data4[0].data) {
                 if (data4[0].error && data4[0].error.length) {
                     message.warning(data4[0].error[0].message);
-                    return;
                 };
-            };
-            _me.state.patentStateOption = [];
-            for (var item in data4[0].data) {
-                _me.state.patentStateOption.push(
-                    <Select.Option value={item} key={item}>{data4[0].data[item]}</Select.Option>
-                )
+            } else {
+                _me.state.patentStateOption = [];
+                for (var item in data4[0].data) {
+                    _me.state.patentStateOption.push(
+                        <Select.Option value={item} key={item}>{data4[0].data[item]}</Select.Option>
+                    )
+                };
             };
         }).always(function () {
             this.setState({
@@ -433,7 +433,12 @@ const PatentDesc = React.createClass({
                                 </p>
                                 <div className="widthThird">
                                     <span>负责人:</span>
-                                    <Select placeholder='请填写负责人' value={this.state.adminName} style={{ width: 150 }} onChange={(e) => { this.setState({ adminName: e }); }}>{this.state.adminOption}</Select>
+                                    <Select placeholder='请填写负责人'
+                                        value={this.state.adminName}
+                                        style={{ width: 150 }}
+                                        onChange={(e) => { this.setState({ adminName: e }); }}>
+                                        {this.state.adminOption}
+                                    </Select>
                                 </div>
                             </div>
                             <div>

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

@@ -111,7 +111,7 @@ const Patent = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/user/patent/getUnitNames",
+            url: globalConfig.context + "/api/admin/getUnitNames",
             success: function (data) {
                 if (data.error.length || !data.data) {
                     return;

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

@@ -25,7 +25,7 @@ const OrgDesc = React.createClass({
         this.setState({
             visible: false,
         });
-        this.props.closeDesc(false,true);
+        this.props.closeDesc(false, true);
     },
     componentWillReceiveProps(nextProps) {
         this.state.visible = nextProps.showDesc;
@@ -40,6 +40,10 @@ const OrgDesc = React.createClass({
                             width='600px'
                             footer=''
                             className="admin-desc-content">
+                            <Tabs defaultActiveKey="1" onChange={callback}>
+                                <Tabs.TabPane tab="Tab 1" key="1">Content of Tab Pane 1</Tabs.TabPane>
+                                <Tabs.TabPane tab="Tab 2" key="2">Content of Tab Pane 2</Tabs.TabPane>
+                            </Tabs>
                             <OrgCertify
                                 visible={this.state.visible}
                                 uid={this.props.data.id}

+ 1 - 1
package.json

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