|
@@ -441,27 +441,27 @@ const AchievementDetailShow = Form.create()(React.createClass({
|
|
<FormItem className="half-item"
|
|
<FormItem className="half-item"
|
|
{...formItemLayout}
|
|
{...formItemLayout}
|
|
label="成果所有人名称" >
|
|
label="成果所有人名称" >
|
|
- <span>{theData.ownerName}</span>
|
|
|
|
|
|
+ <span>{theData.iOwnerName || theData.ownerName}</span>
|
|
</FormItem>
|
|
</FormItem>
|
|
<FormItem className="half-item"
|
|
<FormItem className="half-item"
|
|
{...formItemLayout}
|
|
{...formItemLayout}
|
|
label="所有人证件号" >
|
|
label="所有人证件号" >
|
|
- <span>{theData.ownerIdNumber}</span>
|
|
|
|
|
|
+ <span>{theData.iOwnerIdNumber || theDate.ownerIdNumber}</span>
|
|
</FormItem>
|
|
</FormItem>
|
|
<FormItem className="half-item"
|
|
<FormItem className="half-item"
|
|
{...formItemLayout}
|
|
{...formItemLayout}
|
|
label="所有人联系电话" >
|
|
label="所有人联系电话" >
|
|
- <span>{theData.ownerMobile}</span>
|
|
|
|
|
|
+ <span>{theData.iOwnerMobile || theData.ownerMobile}</span>
|
|
</FormItem>
|
|
</FormItem>
|
|
<FormItem className="half-item"
|
|
<FormItem className="half-item"
|
|
{...formItemLayout}
|
|
{...formItemLayout}
|
|
label="所有人电子邮箱" >
|
|
label="所有人电子邮箱" >
|
|
- <span>{theData.ownerEmail}</span>
|
|
|
|
|
|
+ <span>{theData.iOwnerEmail || theData.ownerEmail}</span>
|
|
</FormItem>
|
|
</FormItem>
|
|
<FormItem className="half-item"
|
|
<FormItem className="half-item"
|
|
{...formItemLayout}
|
|
{...formItemLayout}
|
|
label="所有人通信地址" >
|
|
label="所有人通信地址" >
|
|
- <span>{theData.ownerPostalAddress}</span>
|
|
|
|
|
|
+ <span>{theData.iOwnerPostalAddress || theData.ownerPostalAddress}</span>
|
|
</FormItem>
|
|
</FormItem>
|
|
</div>
|
|
</div>
|
|
<div className="clearfix">
|
|
<div className="clearfix">
|
|
@@ -478,7 +478,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
|
|
})()}
|
|
})()}
|
|
</FormItem>
|
|
</FormItem>
|
|
</div>
|
|
</div>
|
|
- {theData.ownerType == "1" ? <div className="clearfix">
|
|
|
|
|
|
+ {theData.ownerType == "9" ? <div className="clearfix">
|
|
<FormItem className="half-item"
|
|
<FormItem className="half-item"
|
|
{...formItemLayout}
|
|
{...formItemLayout}
|
|
label="所属组织名称" >
|
|
label="所属组织名称" >
|