yee 7 years ago
parent
commit
5c383cf93a

+ 3 - 3
js/component/account/services/intellectualDesc.jsx

@@ -18,8 +18,8 @@ const IntellectualDescFrom = Form.create()(React.createClass({
             crossDomain: false,
             url: globalConfig.context + "/api/user/cognizance/intellectualDetail",
             data: {
-                id: id != undefined ? id : this.props.data.id,
-                type: type != undefined ? type : this.props.data.type
+                id: id ? id : this.props.data.id,
+                type: type ? type : this.props.data.type
             }
         }).done((data) => {
             if (!data.data) {
@@ -232,7 +232,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                         <Button><Icon type="upload" /> 上传知识产权证书 </Button>
                     </Upload>
                     <p style={{ margin: '10px 0' }}>{theData.propertyRightUrl ? <a onClick={newDownloadFile.bind(null, theData.id, 'property_right', '/api/user/cognizance/downloadPropertyRight', 'downloadPropertyRight')}>{theData.propertyRightDownloadFileName}</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传知识产权证书!</span>}</p>
-                    {theData.type != 0 ? <p style={{ margin: '10px 0' }}>
+                    {(theData.type && theData.type != 0) ? <p style={{ margin: '10px 0' }}>
                         {theData.manuscript ? <a onClick={newDownloadFile.bind(null, this.props.data.id, 'manuscript', '/api/user/cognizance/downloadManuscript', this.props.data.type)}>稿件下载</a> : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传稿件!</span>}
                     </p> : <span></span>}
                 </div>

+ 4 - 4
js/component/manageCenter/servicesManage/contract/contract.jsx

@@ -446,13 +446,13 @@ const Contract = React.createClass({
                             disabled={!hasSelected}
                             onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                         <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                            <span>创建时间:</span>
-                            <DatePicker style={{ width: '240px' }}
+                            <span>签订时间:</span>
+                            <DatePicker style={{ width: '140px' }}
                                 allowClear={false}
                                 value={this.state.startDateFormattedDate ? moment(this.state.startDateFormattedDate) : null}
                                 onChange={(date, dateString) => { this.setState({ startDateFormattedDate: dateString }) }} />
-                            <span>结束时间:</span>
-                            <DatePicker style={{ width: '240px' }}
+                            <span></span>
+                            <DatePicker style={{ width: '140px' }}
                                 allowClear={false}
                                 value={this.state.endDateFormattedDate ? moment(this.state.endDateFormattedDate) : null}
                                 onChange={(date, dateString) => { this.setState({ endDateFormattedDate: dateString }) }} />

+ 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 +
-            "&" + "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);
+            "?" + "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));
     },
     searchSwitch() {
         this.setState({