|
@@ -19,7 +19,7 @@ import {
|
|
|
Radio,
|
|
|
Icon,
|
|
|
Tooltip,
|
|
|
- Switch
|
|
|
+ Switch,
|
|
|
} from "antd";
|
|
|
// import $ from "jquery/src/ajax";
|
|
|
import "../userMangagement.less";
|
|
@@ -73,6 +73,7 @@ import UpdateSales from './updatesales';
|
|
|
import SelectList from '../../../common/mysuspend/selectList'; //
|
|
|
import FlowChart from '../../../common/flowchart'; // 流程图
|
|
|
import Gxczx from '../../../common/orderDetail/gxczx' // 高新纯咨询合同说明详情
|
|
|
+import Property from '../../../common/orderDetail/property' // 知识产权情况
|
|
|
|
|
|
const Option = AutoComplete.Option;
|
|
|
const confirm = Modal.confirm;
|
|
@@ -2167,6 +2168,14 @@ const NewService = Form.create()(
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
+ if (!this.state.isProperty) {
|
|
|
+ message.warn("请完善知识产权情况!")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.state.isProperty == 2 && !this.state.patentStatus) {
|
|
|
+ message.warn("请完善知识产权情况!")
|
|
|
+ return
|
|
|
+ }
|
|
|
if (!this.state.orderRemarks) {
|
|
|
message.warning("订单留言不能为空");
|
|
|
this.refs.orderRemarksRef.focus();
|
|
@@ -2256,6 +2265,8 @@ const NewService = Form.create()(
|
|
|
knowledgeOther: this.state.isShow ? this.state.knowledgeOther : undefined, //知识产权服务其他描述
|
|
|
auditOther: this.state.isShow ? this.state.auditOther : undefined, //审计服务其他描述
|
|
|
addDeductionOther: this.state.isShow ? this.state.addDeductionOther : undefined, //加计扣除服务其他描述
|
|
|
+
|
|
|
+ patentStatus: this.state.patentStatus, //知识产权情况
|
|
|
},
|
|
|
}).done(
|
|
|
function (data) {
|
|
@@ -2407,6 +2418,9 @@ const NewService = Form.create()(
|
|
|
auditOther: thisData.auditOther, //审计服务其他描述
|
|
|
addDeductionOther: thisData.addDeductionOther, //加计扣除服务其他描述
|
|
|
|
|
|
+ patentStatus: thisData.patentStatus, // 知识产权情况
|
|
|
+ isProperty: thisData.patentStatus == null ? null : thisData.patentStatus == 0 ? 1 : 2,
|
|
|
+
|
|
|
orgCodeUrl: thisData.contractPictureUrl
|
|
|
? splitUrl(
|
|
|
thisData.contractPictureUrl,
|
|
@@ -3095,11 +3109,18 @@ const NewService = Form.create()(
|
|
|
});
|
|
|
} else if (e == 6) {
|
|
|
this.setState({
|
|
|
- listFlag: true,
|
|
|
- listCuiFlag: true,
|
|
|
- hetongFlag: true,
|
|
|
- tuiKuanFlag: true,
|
|
|
+ // listFlag: true,
|
|
|
+ // listCuiFlag: true,
|
|
|
+ // hetongFlag: true,
|
|
|
+ // tuiKuanFlag: true,
|
|
|
+ // displayList: false,
|
|
|
+
|
|
|
+ listFlag: false,
|
|
|
+ listCuiFlag: false,
|
|
|
+ hetongFlag: false,
|
|
|
+ tuiKuanFlag: false,
|
|
|
displayList: false,
|
|
|
+
|
|
|
});
|
|
|
} else if (e == 7) {
|
|
|
this.setState({
|
|
@@ -6563,7 +6584,19 @@ const NewService = Form.create()(
|
|
|
</div>
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
- {/* 服务内容结束 */}
|
|
|
+ {/* 知识产权情况 */}
|
|
|
+ {this.state.processStatus == 0 ?
|
|
|
+ <Property
|
|
|
+ isCreat={true}
|
|
|
+ isProperty={this.state.isProperty}
|
|
|
+ setProperty={e => { this.setState({ isProperty: e, patentStatus: e == 1 && 0 }) }}
|
|
|
+ patentStatus={this.state.patentStatus}
|
|
|
+ setPatentS={e => { this.setState({ patentStatus: e }) }}
|
|
|
+ /> :
|
|
|
+ <Property
|
|
|
+ patentStatus={this.state.patentStatus}
|
|
|
+ />}
|
|
|
+
|
|
|
<div className="clearfix">
|
|
|
{this.state.processStatus == 0 ? (
|
|
|
<div className="clearfix">
|
|
@@ -7442,10 +7475,16 @@ const NewService = Form.create()(
|
|
|
});
|
|
|
} else if (e == 6) {
|
|
|
this.setState({
|
|
|
- listFlag: true,
|
|
|
- listCuiFlag: true,
|
|
|
- hetongFlag: true,
|
|
|
- tuiKuanFlag: true,
|
|
|
+ // listFlag: true,
|
|
|
+ // listCuiFlag: true,
|
|
|
+ // hetongFlag: true,
|
|
|
+ // tuiKuanFlag: true,
|
|
|
+ // displayList: false,
|
|
|
+
|
|
|
+ listFlag: false,
|
|
|
+ listCuiFlag: false,
|
|
|
+ hetongFlag: false,
|
|
|
+ tuiKuanFlag: false,
|
|
|
displayList: false,
|
|
|
});
|
|
|
} else if (e == 7) {
|