yee 7 years ago
parent
commit
9644674f00

+ 1 - 1
js/component/manageCenter/demand/techDemandDesc.jsx

@@ -1283,7 +1283,7 @@ const DemandDetail = React.createClass({
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + "/api/admin/demand/achievementDemand",
-            data: { id: this.state.data.id },
+            data: { id: this.props.data.id },
             success: function (data) {
                 let theArr = [];
                 if (!data.data) {

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

@@ -360,17 +360,17 @@ const Patent = React.createClass({
     },
     exportComposite() {
         window.open(globalConfig.context + "/api/admin/patent/exportComposite" +
-            "?" + "serialNumber" + "=" + (this.state.number || null) +
-            "&" + "patentNumber" + "=" + (this.state.patentNumber || null) +
-            "&" + "patentName" + "=" + (this.state.patentName || null) +
-            "&" + "locationProvince" + "=" + (this.state.province || null) +
-            "&" + "uid" + "=" + (this.state.unitId || null) +
-            "&" + "uid" + "=" + (this.state.contractId || null) +
-            "&" + "patentCatagory" + "=" + (this.state.patentCatagory || null) +
-            "&" + "patentState" + "=" + (this.state.patentState || null) +
-            "&" + "createTime" + "=" + (this.state.createTime || null) +
-            "&" + "patentApplicationDate" + "=" + (this.state.acceptTime || null) +
-            "&" + "author" + "=" + (this.state.author || null));
+            "?" + "serialNumber" + "=" + (this.state.number || '') +
+            "&" + "patentNumber" + "=" + (this.state.patentNumber || '') +
+            "&" + "patentName" + "=" + (this.state.patentName || '') +
+            "&" + "locationProvince" + "=" + (this.state.province || '') +
+            "&" + "uid" + "=" + (this.state.unitId || '') +
+            "&" + "uid" + "=" + (this.state.contractId || '') +
+            "&" + "patentCatagory" + "=" + (this.state.patentCatagory || '') +
+            "&" + "patentState" + "=" + (this.state.patentState || '') +
+            "&" + "createTime" + "=" + (this.state.createTime || '') +
+            "&" + "patentApplicationDate" + "=" + (this.state.acceptTime || '') +
+            "&" + "author" + "=" + (this.state.author || ''));
     },
     searchSwitch() {
         this.setState({

File diff suppressed because it is too large
+ 92 - 0
js/component/sign/content.jsx


+ 2 - 10
js/user/signIn.js

@@ -5,8 +5,7 @@ import '../../css/base.less';
 import '../../css/sign.less';
 
 import LoginTop from '../component/login/loginTop.jsx';
-import Account from '../component/sign/account.jsx';
-import GroupAccount from '../component/sign/groupAccount.jsx';
+import Content from '../component/sign/content.jsx';
 import LoginFooter from '../component/login/loginFooter.jsx';
 
 const TabPane = Tabs.TabPane;
@@ -14,14 +13,7 @@ const TabPane = Tabs.TabPane;
 ReactDOM.render(
     <div className="wrap">
         <LoginTop />
-        <Tabs type="card" defaultActiveKey="1" className="signIn-form">
-            <TabPane tab="个人注册" key="1">
-                <Account />
-            </TabPane>
-            <TabPane tab="团体注册" key="2" className="tabtwo">
-                <GroupAccount />
-            </TabPane>
-        </Tabs>
+        <Content />
         <LoginFooter />
     </div>,
     document.getElementById('root')