|
@@ -51,16 +51,14 @@ class ApplyPaymentModal extends Component{
|
|
|
values.tid = this.props.tid;
|
|
|
if(this.props.previewPayInfor.nodeId){ //催款
|
|
|
values.nodeId = this.props.previewPayInfor.nodeId;
|
|
|
- values.chooseType = 1; //支付选择 0第三方 1催款
|
|
|
- values.tcpid = this.props.previewPayInfor.cid; //第三方机构id
|
|
|
+ values.chooseType = 1; //支付选择 0第三方 1催款 2官费
|
|
|
+ values.tpcId = this.props.previewPayInfor.cid; //第三方机构id
|
|
|
}else{
|
|
|
- values.chooseType = 0 //支付选择 0第三方 1催款
|
|
|
- values.tcpid = this.props.previewPayInfor.id; //第三方机构id
|
|
|
+ values.chooseType = 0 //支付选择 0第三方 1催款 2官费
|
|
|
+ values.tpcId = this.props.previewPayInfor.id; //第三方机构id
|
|
|
}
|
|
|
if(this.props.type === 2){
|
|
|
- values.paymentType = 1; //支付类型 0第三方 1官费(用来做判断发起区别)
|
|
|
- }else{
|
|
|
- values.paymentType = 0; //支付类型 0第三方 1官费(用来做判断发起区别)
|
|
|
+ values.chooseType = 2; //支付类型 0第三方 1催款 2官费
|
|
|
}
|
|
|
values.companyName = values.companyName.split('-')[0];
|
|
|
$.ajax({
|
|
@@ -139,7 +137,7 @@ class ApplyPaymentModal extends Component{
|
|
|
)}
|
|
|
</Form.Item>
|
|
|
{/* 0正常 1专利 2软著 3审计 */}
|
|
|
- {this.props.projectType === 3 && this.props.patentType === 3 ?<Form.Item
|
|
|
+ {this.props.projectType === 1 && this.props.patentType === 1 ?<Form.Item
|
|
|
{...formItemLayout}
|
|
|
style={{
|
|
|
display:'flex'
|
|
@@ -202,36 +200,31 @@ class ApplyPaymentModal extends Component{
|
|
|
<div>***</div>
|
|
|
</Form.Item> : <div/>
|
|
|
}
|
|
|
- <Form.Item
|
|
|
- {...formItemLayout}
|
|
|
- style={{
|
|
|
- display:'flex'
|
|
|
- }}
|
|
|
- label="数量(个):"
|
|
|
- >
|
|
|
- {getFieldDecorator('quantity', {
|
|
|
- initialValue: parseInt(previewPayInfor.quantity),
|
|
|
- rules: [{ required: false, message: '请输入數量!' }],
|
|
|
- })(
|
|
|
- <Input disabled={previewPayInfor.quantity <= 1 || (this.props.projectType === 3 && this.props.patentType === 3)} style={{ width: '200px' }} placeholder="请输入數量" type={'number'}/>
|
|
|
- )}
|
|
|
- </Form.Item>
|
|
|
{
|
|
|
- this.props.projectType === 3 && this.props.patentType === 3 ?
|
|
|
+ this.props.projectType !== 0?
|
|
|
<Form.Item
|
|
|
{...formItemLayout}
|
|
|
style={{
|
|
|
display:'flex'
|
|
|
}}
|
|
|
- label="本次申请支付数量:"
|
|
|
+ label="数量(个):"
|
|
|
+ >
|
|
|
+ {previewPayInfor.quantity}
|
|
|
+ </Form.Item>:
|
|
|
+ <Form.Item
|
|
|
+ {...formItemLayout}
|
|
|
+ style={{
|
|
|
+ display:'flex'
|
|
|
+ }}
|
|
|
+ label="数量(个):"
|
|
|
>
|
|
|
{getFieldDecorator('quantity', {
|
|
|
initialValue: parseInt(previewPayInfor.quantity),
|
|
|
- rules: [{ required: false, message: '请输入支付数量!' }],
|
|
|
+ rules: [{ required: false, message: '请输入數量!' }],
|
|
|
})(
|
|
|
- <Input disabled={previewPayInfor.quantity <= 1 || this.state.paymentStatus !== 0} style={{ width: '200px' }} placeholder="请输入數量" type={'number'}/>
|
|
|
+ <Input disabled={previewPayInfor.quantity <= 1} style={{ width: '200px' }} placeholder="请输入數量" type={'number'}/>
|
|
|
)}
|
|
|
- </Form.Item> : <div/>}
|
|
|
+ </Form.Item>
|
|
|
}
|
|
|
<Form.Item
|
|
|
{...formItemLayout}
|
|
@@ -247,6 +240,22 @@ class ApplyPaymentModal extends Component{
|
|
|
{/* <Input disabled={true} style={{ width: '200px' }} placeholder="请输入总价" type={'number'}/>*/}
|
|
|
{/*)}*/}
|
|
|
</Form.Item>
|
|
|
+ {
|
|
|
+ this.props.projectType === 1 && this.props.type === 2?
|
|
|
+ <Form.Item
|
|
|
+ {...formItemLayout}
|
|
|
+ style={{
|
|
|
+ display:'flex'
|
|
|
+ }}
|
|
|
+ label="本次申请支付数量:"
|
|
|
+ >
|
|
|
+ {getFieldDecorator('quantity', {
|
|
|
+ initialValue: 1,
|
|
|
+ rules: [{ required: false, message: '请输入本次申请支付数量!' }],
|
|
|
+ })(
|
|
|
+ <Input disabled={previewPayInfor.quantity <= 1 || this.state.paymentStatus !== 0} style={{ width: '200px' }} placeholder="请输入本次申请支付数量" type={'number'}/>
|
|
|
+ )}
|
|
|
+ </Form.Item> : <div/>}
|
|
|
{/*<Form.Item*/}
|
|
|
{/* {...formItemLayout}*/}
|
|
|
{/* style={{*/}
|
|
@@ -294,9 +303,14 @@ class ApplyPaymentModal extends Component{
|
|
|
)}
|
|
|
</Form.Item>
|
|
|
<Form.Item>
|
|
|
- <Button type="primary" htmlType="submit">
|
|
|
- 确定申请支付
|
|
|
- </Button>
|
|
|
+ <div style={{
|
|
|
+ display: 'flex',
|
|
|
+ justifyContent: 'center',
|
|
|
+ }}>
|
|
|
+ <Button type="primary" htmlType="submit" style={{width:'60%',height:'40px'}}>
|
|
|
+ {this.props.type === 2 ? "确定申请付官费" : "确定申请支付"}
|
|
|
+ </Button>
|
|
|
+ </div>
|
|
|
</Form.Item>
|
|
|
</Form>
|
|
|
</div>
|