|
@@ -38,16 +38,17 @@ class ApplyPaymentModal extends Component{
|
|
|
loading: true
|
|
|
})
|
|
|
values.tid = this.props.tid;
|
|
|
- if(this.props.previewPayInfor.nodeId){ //催款
|
|
|
- values.nodeId = this.props.previewPayInfor.nodeId;
|
|
|
- values.chooseType = 1; //支付选择 0第三方 1催款 2官费
|
|
|
- values.tpcId = this.props.previewPayInfor.cid; //第三方机构id
|
|
|
- }else{
|
|
|
- values.chooseType = 0 //支付选择 0第三方 1催款 2官费
|
|
|
- values.tpcId = this.props.previewPayInfor.id; //第三方机构id
|
|
|
- }
|
|
|
if(this.props.type === 2){
|
|
|
values.chooseType = 2; //支付类型 0第三方 1催款 2官费
|
|
|
+ }else{
|
|
|
+ if(this.props.previewPayInfor.nodeId){ //催款
|
|
|
+ values.nodeId = this.props.previewPayInfor.nodeId;
|
|
|
+ values.chooseType = 1; //支付选择 0第三方 1催款 2官费
|
|
|
+ values.tpcId = this.props.previewPayInfor.cid; //第三方机构id
|
|
|
+ }else{
|
|
|
+ values.chooseType = 0 //支付选择 0第三方 1催款 2官费
|
|
|
+ values.tpcId = this.props.previewPayInfor.id; //第三方机构id
|
|
|
+ }
|
|
|
}
|
|
|
values.companyName = values.companyName.split('-')[0];
|
|
|
$.ajax({
|
|
@@ -76,9 +77,7 @@ class ApplyPaymentModal extends Component{
|
|
|
render() {
|
|
|
const { getFieldDecorator,setFieldsValue } = this.props.form;
|
|
|
const { previewPayInfor } = this.props;
|
|
|
- if(!previewPayInfor){
|
|
|
- return;
|
|
|
- }
|
|
|
+ if(this.props.type !== 2 && !previewPayInfor){return;}
|
|
|
return(
|
|
|
<Modal
|
|
|
maskClosable={false}
|
|
@@ -113,7 +112,7 @@ class ApplyPaymentModal extends Component{
|
|
|
label="付款单位/个人:"
|
|
|
>
|
|
|
{getFieldDecorator('companyName', {
|
|
|
- initialValue: previewPayInfor.companyName,
|
|
|
+ initialValue: this.props.type === 2 ? '国家知识产权局' : previewPayInfor.companyName,
|
|
|
rules: [{
|
|
|
required: true,
|
|
|
message: '请输入付款单位/个人!',
|
|
@@ -126,43 +125,43 @@ class ApplyPaymentModal extends Component{
|
|
|
)}
|
|
|
</Form.Item>
|
|
|
{/* 0正常 1专利 2软著 3审计 */}
|
|
|
- {this.props.projectType === 1 && this.props.patentType === 1 ?<Form.Item
|
|
|
- {...formItemLayout}
|
|
|
- style={{
|
|
|
- display:'flex'
|
|
|
- }}
|
|
|
- label="支付状态:"
|
|
|
- >
|
|
|
- {getFieldDecorator('paymentStatus', {
|
|
|
- constructor: this.state.paymentStatus,
|
|
|
- rules: [{ required: false, message: '请选择支付状态!' }],
|
|
|
- })(
|
|
|
- <Radio.Group onChange={(e)=>{
|
|
|
- this.setState({
|
|
|
- paymentStatus: e.target.value
|
|
|
- })
|
|
|
- if(e.target.value === 1){
|
|
|
- setFieldsValue({
|
|
|
- quantity:parseInt(previewPayInfor.quantity),
|
|
|
- applicationAmount:(previewPayInfor.partyAmount ?
|
|
|
- ((parseFloat(previewPayInfor.totalAmount) * 1000000) - (parseFloat(previewPayInfor.partyAmount) * 1000000)) / 1000000 :
|
|
|
- parseFloat(previewPayInfor.totalAmount))/2
|
|
|
- });
|
|
|
- } else if(e.target.value === 2){
|
|
|
- setFieldsValue({
|
|
|
- quantity:parseInt(previewPayInfor.quantity),
|
|
|
- applicationAmount:(previewPayInfor.partyAmount ?
|
|
|
- ((parseFloat(previewPayInfor.totalAmount) * 1000000) - (parseFloat(previewPayInfor.partyAmount) * 1000000)) / 1000000 :
|
|
|
- parseFloat(previewPayInfor.totalAmount))
|
|
|
- });
|
|
|
- }
|
|
|
- }}>
|
|
|
- <Radio value={0}>自定义</Radio>
|
|
|
- <Radio value={1}>半款</Radio>
|
|
|
- <Radio value={2}>全款</Radio>
|
|
|
- </Radio.Group>
|
|
|
- )}
|
|
|
- </Form.Item> : <div/>}
|
|
|
+ {/*{this.props.projectType === 1 && this.props.patentType === 1 ?<Form.Item*/}
|
|
|
+ {/* {...formItemLayout}*/}
|
|
|
+ {/* style={{*/}
|
|
|
+ {/* display:'flex'*/}
|
|
|
+ {/* }}*/}
|
|
|
+ {/* label="支付状态:"*/}
|
|
|
+ {/* >*/}
|
|
|
+ {/* {getFieldDecorator('paymentStatus', {*/}
|
|
|
+ {/* constructor: this.state.paymentStatus,*/}
|
|
|
+ {/* rules: [{ required: false, message: '请选择支付状态!' }],*/}
|
|
|
+ {/* })(*/}
|
|
|
+ {/* <Radio.Group onChange={(e)=>{*/}
|
|
|
+ {/* this.setState({*/}
|
|
|
+ {/* paymentStatus: e.target.value*/}
|
|
|
+ {/* })*/}
|
|
|
+ {/* if(e.target.value === 1){*/}
|
|
|
+ {/* setFieldsValue({*/}
|
|
|
+ {/* quantity:parseInt(previewPayInfor.quantity),*/}
|
|
|
+ {/* applicationAmount:(previewPayInfor.partyAmount ?*/}
|
|
|
+ {/* ((parseFloat(previewPayInfor.totalAmount) * 1000000) - (parseFloat(previewPayInfor.partyAmount) * 1000000)) / 1000000 :*/}
|
|
|
+ {/* parseFloat(previewPayInfor.totalAmount))/2*/}
|
|
|
+ {/* });*/}
|
|
|
+ {/* } else if(e.target.value === 2){*/}
|
|
|
+ {/* setFieldsValue({*/}
|
|
|
+ {/* quantity:parseInt(previewPayInfor.quantity),*/}
|
|
|
+ {/* applicationAmount:(previewPayInfor.partyAmount ?*/}
|
|
|
+ {/* ((parseFloat(previewPayInfor.totalAmount) * 1000000) - (parseFloat(previewPayInfor.partyAmount) * 1000000)) / 1000000 :*/}
|
|
|
+ {/* parseFloat(previewPayInfor.totalAmount))*/}
|
|
|
+ {/* });*/}
|
|
|
+ {/* }*/}
|
|
|
+ {/* }}>*/}
|
|
|
+ {/* <Radio value={0}>自定义</Radio>*/}
|
|
|
+ {/* <Radio value={1}>半款</Radio>*/}
|
|
|
+ {/* <Radio value={2}>全款</Radio>*/}
|
|
|
+ {/* </Radio.Group>*/}
|
|
|
+ {/* )}*/}
|
|
|
+ {/* </Form.Item> : <div/>}*/}
|
|
|
{this.props.type !== 2 ? <Form.Item
|
|
|
{...formItemLayout}
|
|
|
style={{
|
|
@@ -182,27 +181,27 @@ class ApplyPaymentModal extends Component{
|
|
|
)
|
|
|
}
|
|
|
</Form.Item> : <div/>}
|
|
|
- {
|
|
|
- this.props.type === 2 ?
|
|
|
- <Form.Item
|
|
|
- {...formItemLayout}
|
|
|
- style={{
|
|
|
- display:'flex'
|
|
|
- }}
|
|
|
- label="官费(万元):"
|
|
|
- >
|
|
|
- {/*costReduction 费减 0否 1 是*/}
|
|
|
- {/*reductionAmount 费减金额*/}
|
|
|
- {/*officialUnitPrice 官费单价*/}
|
|
|
- <div>
|
|
|
- {
|
|
|
- previewPayInfor.costReduction === 1 ?
|
|
|
- (isNaN(parseFloat(previewPayInfor.reductionAmount)) ? previewPayInfor.reductionAmount : parseFloat(previewPayInfor.reductionAmount)):
|
|
|
- (isNaN(parseFloat(previewPayInfor.officialUnitPrice)) ? previewPayInfor.officialUnitPrice : parseFloat(previewPayInfor.officialUnitPrice))
|
|
|
- }
|
|
|
- </div>
|
|
|
- </Form.Item> : <div/>
|
|
|
- }
|
|
|
+ {/*{*/}
|
|
|
+ {/* this.props.type === 2 ?*/}
|
|
|
+ {/* <Form.Item*/}
|
|
|
+ {/* {...formItemLayout}*/}
|
|
|
+ {/* style={{*/}
|
|
|
+ {/* display:'flex'*/}
|
|
|
+ {/* }}*/}
|
|
|
+ {/* label="官费(万元):"*/}
|
|
|
+ {/* >*/}
|
|
|
+ {/* /!*costReduction 费减 0否 1 是*!/*/}
|
|
|
+ {/* /!*reductionAmount 费减金额*!/*/}
|
|
|
+ {/* /!*officialUnitPrice 官费单价*!/*/}
|
|
|
+ {/* <div>*/}
|
|
|
+ {/* {*/}
|
|
|
+ {/* previewPayInfor.costReduction === 1 ?*/}
|
|
|
+ {/* (isNaN(parseFloat(previewPayInfor.reductionAmount)) ? previewPayInfor.reductionAmount : parseFloat(previewPayInfor.reductionAmount)):*/}
|
|
|
+ {/* (isNaN(parseFloat(previewPayInfor.officialUnitPrice)) ? previewPayInfor.officialUnitPrice : parseFloat(previewPayInfor.officialUnitPrice))*/}
|
|
|
+ {/* }*/}
|
|
|
+ {/* </div>*/}
|
|
|
+ {/* </Form.Item> : <div/>*/}
|
|
|
+ {/*}*/}
|
|
|
<Form.Item
|
|
|
{...formItemLayout}
|
|
|
style={{
|
|
@@ -210,9 +209,9 @@ class ApplyPaymentModal extends Component{
|
|
|
}}
|
|
|
label="数量(个):"
|
|
|
>
|
|
|
- {previewPayInfor.quantity}
|
|
|
+ {this.props.type === 2 ? this.props.commodityQuantity : previewPayInfor.quantity}
|
|
|
</Form.Item>
|
|
|
- <Form.Item
|
|
|
+ {this.props.type !== 2 ? <Form.Item
|
|
|
{...formItemLayout}
|
|
|
style={{
|
|
|
display:'flex'
|
|
@@ -225,7 +224,7 @@ class ApplyPaymentModal extends Component{
|
|
|
|
|
|
}
|
|
|
</div>
|
|
|
- </Form.Item>
|
|
|
+ </Form.Item> : null}
|
|
|
<Form.Item
|
|
|
{...formItemLayout}
|
|
|
style={{
|
|
@@ -239,34 +238,35 @@ class ApplyPaymentModal extends Component{
|
|
|
})(
|
|
|
<InputNumber
|
|
|
// disabled={previewPayInfor.quantity <= 1 || this.state.paymentStatus !== 0}
|
|
|
- disabled={true}
|
|
|
+ disabled={this.props.type !== 2}
|
|
|
style={{ width: '200px' }}
|
|
|
precision={0}
|
|
|
placeholder="请输入本次申请支付数量"
|
|
|
+ min={1}
|
|
|
onChange={(e)=>{
|
|
|
//0正常 1专利 2软著 3审计
|
|
|
//软著 专利申请不需要计算,因为单价未知
|
|
|
- if(!(this.props.projectType === 2 || (this.props.projectType === 1 && this.props.patentType === 0))){
|
|
|
- //官费
|
|
|
- if(this.props.type === 2){
|
|
|
- this.props.form.setFieldsValue({
|
|
|
- applicationAmount: (previewPayInfor.costReduction === 1 ?
|
|
|
- previewPayInfor.reductionAmount :
|
|
|
- previewPayInfor.officialUnitPrice) * 1000000 * e / 1000000,
|
|
|
- });
|
|
|
- }else {
|
|
|
- let num = previewPayInfor.unitPrice * 1000000 * e / 1000000;
|
|
|
- this.props.form.setFieldsValue({
|
|
|
- applicationAmount: num,
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
+ // if(!(this.props.projectType === 2 || (this.props.projectType === 1 && this.props.patentType === 0))){
|
|
|
+ // //官费
|
|
|
+ // if(this.props.type === 2){
|
|
|
+ // this.props.form.setFieldsValue({
|
|
|
+ // applicationAmount: (previewPayInfor.costReduction === 1 ?
|
|
|
+ // previewPayInfor.reductionAmount :
|
|
|
+ // previewPayInfor.officialUnitPrice) * 1000000 * e / 1000000,
|
|
|
+ // });
|
|
|
+ // }else {
|
|
|
+ // let num = previewPayInfor.unitPrice * 1000000 * e / 1000000;
|
|
|
+ // this.props.form.setFieldsValue({
|
|
|
+ // applicationAmount: num,
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // }
|
|
|
}}
|
|
|
/>
|
|
|
)}
|
|
|
</Form.Item>
|
|
|
{/* 0正常 1专利 2软著 3审计 */}
|
|
|
- <Form.Item
|
|
|
+ {this.props.type !== 2 ? <Form.Item
|
|
|
{...formItemLayout}
|
|
|
style={{
|
|
|
display:'flex'
|
|
@@ -296,7 +296,7 @@ class ApplyPaymentModal extends Component{
|
|
|
style={{ width: '200px' }}
|
|
|
placeholder="请输入本次申请支付金额"/>
|
|
|
)}
|
|
|
- </Form.Item>
|
|
|
+ </Form.Item> : null}
|
|
|
<Form.Item
|
|
|
{...formItemLayout}
|
|
|
style={{
|