|
@@ -3494,20 +3494,18 @@ const NewService = Form.create()(
|
|
|
message.warning("服务名称不匹配!");
|
|
|
return false;
|
|
|
}
|
|
|
- if (this.state.displayFees === "block") {
|
|
|
- if (this.state.officialCost === "") {
|
|
|
- message.warning("请选择官费!");
|
|
|
- return false;
|
|
|
- }
|
|
|
- debugger;
|
|
|
- if (this.state.officialCost == "1") {
|
|
|
- if (this.state.costReduction === "") {
|
|
|
- message.warning("请选择费减!");
|
|
|
- return false;
|
|
|
- }
|
|
|
- // 不含官费
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (this.state.displayFees === "block") {
|
|
|
+ // if (this.state.officialCost === "") {
|
|
|
+ // message.warning("请选择官费!");
|
|
|
+ // return false;
|
|
|
+ // }
|
|
|
+ // if (this.state.officialCost == "1") {
|
|
|
+ // if (this.state.costReduction === "") {
|
|
|
+ // message.warning("请选择费减!");
|
|
|
+ // return false;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
if (!this.state.commodityPrice) {
|
|
|
message.warning("请输入金额!");
|
|
|
this.refs.commodityPrice.focus();
|
|
@@ -7262,10 +7260,8 @@ const NewService = Form.create()(
|
|
|
>
|
|
|
<span style={{ color: "red", marginRight: "27px" }}>*</span>
|
|
|
<Radio.Group
|
|
|
- disabled={
|
|
|
- this.state.officialCost === "0" ||
|
|
|
- this.state.patentType === 1
|
|
|
- }
|
|
|
+ //disabled={this.state.officialCost === "0" || this.state.patentType === 1}
|
|
|
+ disabled={this.state.officialCost === 0 || (this.state.patentType !== 0 && this.state.patentType !== 2)}
|
|
|
value={this.state.costReduction}
|
|
|
onChange={(e) => {
|
|
|
this.setState({ costReduction: e.target.value });
|