|
@@ -158,7 +158,6 @@ class NewSupplier extends Component{
|
|
|
companyName: this.state.thirdCompanyName, //第三方名称
|
|
|
quantity: this.state.thirdQuantity, //数量
|
|
|
remarks: this.state.thirdRemarks, //备注
|
|
|
- unitPrice: this.state.thirdUnitPrice, //单价
|
|
|
}
|
|
|
if(isHave){
|
|
|
data.cid = customerId //公司id 只有软著类要传cid,其他类型都是非必填的
|
|
@@ -190,6 +189,13 @@ class NewSupplier extends Component{
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ //projectType 0正常 1专利 2软著 3审计
|
|
|
+ //软著不需要传 单价
|
|
|
+ if(this.props.projectType !== 2){
|
|
|
+ data.unitPrice = this.state.thirdUnitPrice; //单价
|
|
|
+ }
|
|
|
+
|
|
|
if(this.props.projectType === 3){ //审计
|
|
|
data.assets = this.state.assets; //资产
|
|
|
data.audit = this.state.audit; //0无审计 1年审 2专审
|
|
@@ -297,9 +303,16 @@ class NewSupplier extends Component{
|
|
|
thirdUnitPrice: value,
|
|
|
})
|
|
|
}}
|
|
|
- style={{ width: '220px' }}
|
|
|
+ dropdownStyle={{ width: 220 }}
|
|
|
+ style={{
|
|
|
+ width: '220px',
|
|
|
+ }}
|
|
|
/>
|
|
|
- <span className="mandatory">*</span>
|
|
|
+ <span className="mandatory" style={{
|
|
|
+ marginLeft: '-2px',
|
|
|
+ }}>
|
|
|
+ *
|
|
|
+ </span>
|
|
|
</Form.Item>
|
|
|
</div> : <div/>}
|
|
|
<div className="clearfix">
|
|
@@ -316,13 +329,22 @@ class NewSupplier extends Component{
|
|
|
}}
|
|
|
style={{ width: '220px' }}
|
|
|
/>
|
|
|
- <span className="mandatory">*</span>
|
|
|
+ <span className="mandatory" style={{
|
|
|
+ marginLeft: '-2px',
|
|
|
+ }}>
|
|
|
+ *
|
|
|
+ </span>
|
|
|
</Form.Item>
|
|
|
</div>
|
|
|
{/*专利 的专利申请 和 软著没有总价*/}
|
|
|
{this.props.projectType !== 2 && this.props.patentType !==0 ?<div className="clearfix">
|
|
|
<Form.Item {...formItemLayout} label="总价(万元)">
|
|
|
- <span>{(this.state.thirdQuantity * 1000000) * (this.state.thirdUnitPrice * 1000000) / 1000000 / 1000000}</span>
|
|
|
+ <span>
|
|
|
+ {
|
|
|
+ ((this.state.thirdQuantity || 0) * 1000000) *
|
|
|
+ ((this.state.thirdUnitPrice || 0) * 1000000) / 1000000 / 1000000
|
|
|
+ }
|
|
|
+ </span>
|
|
|
</Form.Item>
|
|
|
</div> : <div/>}
|
|
|
{this.props.projectType === 2 ? <div>
|