|
@@ -1,3 +1,4 @@
|
|
|
+// 变更--驳回
|
|
|
import React, { Component } from "react";
|
|
|
import {
|
|
|
Form,
|
|
@@ -1043,7 +1044,7 @@ class ChangeApply extends Component {
|
|
|
changeProSubmit() {
|
|
|
if (this.state.gid == undefined || !this.state.gid) {
|
|
|
message.warning("服务名称不匹配!");
|
|
|
- return false;
|
|
|
+ return
|
|
|
}
|
|
|
let reg = /^([0]|[1-9][0-9]*)$/;
|
|
|
if (
|
|
@@ -1051,36 +1052,29 @@ class ChangeApply extends Component {
|
|
|
!reg.test(this.state.commodityQuantity)
|
|
|
) {
|
|
|
message.warning("请输入正确商品数量!");
|
|
|
- this.refs.commodityQuantity.focus();
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (this.state.patentType === "") {
|
|
|
- message.warning("请选择专利类型!");
|
|
|
- return
|
|
|
+ return
|
|
|
}
|
|
|
- if (this.state.displayFees === "block") {
|
|
|
- if (this.state.officialCost === "") {
|
|
|
+ if (this.state.displayFees === 'block') {
|
|
|
+ if (this.state.patentType === "" && !this.state.patentTransfer) {
|
|
|
+ message.warning("请选择专利类型!");
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.state.officialCost === '') {
|
|
|
message.warning("请选择官费!");
|
|
|
return
|
|
|
}
|
|
|
- }
|
|
|
- if (this.state.patentType === 0 || this.state.patentType === 2) {
|
|
|
- if (this.state.officialCost === 1) {
|
|
|
- if (this.state.costReduction === "") {
|
|
|
- message.warning("请选择费减!");
|
|
|
- return
|
|
|
- }
|
|
|
+ if (this.state.costReduction === "" && (this.state.patentType === 0 || this.state.patentType === 2) && this.state.officialCost === 1) {
|
|
|
+ message.warning("请选择费减!");
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
if (!this.state.commodityPrice) {
|
|
|
message.warning("请输入金额!");
|
|
|
- this.refs.commodityPrice.focus();
|
|
|
- return false;
|
|
|
+ return
|
|
|
}
|
|
|
if (!this.state.main) {
|
|
|
message.warning("请选择是否为主要项目!");
|
|
|
- this.refs.commodityQuantity.focus();
|
|
|
- return false;
|
|
|
+ return
|
|
|
}
|
|
|
this.setState({
|
|
|
loading: true
|