|
@@ -241,7 +241,7 @@ const Task = React.createClass({
|
|
|
assignVisible: false,
|
|
|
releaseDate: [],
|
|
|
patentType: -1,
|
|
|
- patentNameType: 0,
|
|
|
+ patentNameType: -1,
|
|
|
startType: 0, //外包供应商类型
|
|
|
// 判断是否是退回给咨询师经理
|
|
|
flag: false,
|
|
@@ -919,7 +919,7 @@ const Task = React.createClass({
|
|
|
dataIndex: "officialCost",
|
|
|
key: "officialCost",
|
|
|
render: (text) => {
|
|
|
- return text === 1 ? '含官费' : '不含官费'
|
|
|
+ return text === 1 ? '有官费' : '无官费'
|
|
|
},
|
|
|
},
|
|
|
{
|
|
@@ -2153,7 +2153,7 @@ const Task = React.createClass({
|
|
|
message.warning('请选择专利类型')
|
|
|
return
|
|
|
}
|
|
|
- if (!this.state.patentNameType) {
|
|
|
+ if (this.state.patentNameType === -1) {
|
|
|
message.warning('请选择专利类型名称')
|
|
|
return
|
|
|
}
|
|
@@ -2563,6 +2563,7 @@ const Task = React.createClass({
|
|
|
let arr = data.data || []
|
|
|
let allTotalAmount = 0
|
|
|
let type = 0;
|
|
|
+ let type1 = 0;
|
|
|
for (let i = 0; i < arr.length; i++) {
|
|
|
thisData = arr[i]
|
|
|
allTotalAmount =
|
|
@@ -2584,7 +2585,7 @@ const Task = React.createClass({
|
|
|
remarks: thisData.remarks, //备注
|
|
|
cid: thisData.cid, //机构id
|
|
|
costReduction: thisData.costReduction,//费减
|
|
|
- officiaCost: thisData.officiaCost,//费减
|
|
|
+ officialCost: thisData.officialCost,//官费
|
|
|
type: thisData.type, //0其他 1专利申请 2专利买卖
|
|
|
})
|
|
|
type=thisData.type
|
|
@@ -2601,12 +2602,17 @@ const Task = React.createClass({
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if(type === 1 || type === 2){
|
|
|
+ this.setState({
|
|
|
+ patentType: type === 1 ? 0 : type === 2 ? 1 : -1, //0其他 1专利申请 2专利买卖
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
this.setState({
|
|
|
tid: id,
|
|
|
PayNodeCompany: companyNameArr,
|
|
|
thirdInfoList: theArr,
|
|
|
allTotalAmount: allTotalAmount,
|
|
|
- patentType: type === 1 ? 0 : type === 2 ? 1 : -1, //0其他 1专利申请 2专利买卖
|
|
|
},()=>{
|
|
|
this.projectTypeTabContent(this.state.projectType);
|
|
|
})
|
|
@@ -4186,26 +4192,48 @@ const Task = React.createClass({
|
|
|
<Radio.Group
|
|
|
value={this.state.patentNameType}
|
|
|
onChange={(e) => {
|
|
|
- this.setState({ patentNameType: e.target.value })
|
|
|
+ let _this = this;
|
|
|
+ if(this.state.thirdInfoList.length >0){
|
|
|
+ confirm({
|
|
|
+ title: '确定要切换吗?',
|
|
|
+ content: '切换将删除所有第三信息和付款节点',
|
|
|
+ onOk() {
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
+ _this.setState({ patentNameType: e.target.value },()=>{
|
|
|
+ _this.projectTypeTabContent(_this.state.projectType);
|
|
|
+ })
|
|
|
+ _this.confirmDeletNew(-1,resolve,reject)
|
|
|
+ if(_this.state.payNodeList.length > 0){
|
|
|
+ _this.payNodeConfirmDeletNew(-1,resolve,reject);
|
|
|
+ }
|
|
|
+ }).catch(() => console.log('Oops errors!'));
|
|
|
+ },
|
|
|
+ onCancel() {},
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ this.setState({ patentNameType: e.target.value },()=>{
|
|
|
+ this.projectTypeTabContent(this.state.projectType);
|
|
|
+ })
|
|
|
+ }
|
|
|
}}
|
|
|
>
|
|
|
<Radio value={0}>实用新型专利</Radio>
|
|
|
<Radio value={1}>发明专利</Radio>
|
|
|
<Radio value={2}>外观专利</Radio>
|
|
|
- <Radio value={3}>
|
|
|
- 其他
|
|
|
- <Input
|
|
|
- disabled={this.state.patentNameType !== 3}
|
|
|
- value={this.state.patentName}
|
|
|
- style={{ marginLeft: '15px' }}
|
|
|
- onChange={(e) => {
|
|
|
- this.setState({
|
|
|
- patentName: e.target.value,
|
|
|
- })
|
|
|
- }}
|
|
|
- placeholder="请填写专利名称"
|
|
|
- />
|
|
|
- </Radio>
|
|
|
+ {/*<Radio value={3}>*/}
|
|
|
+ {/* 其他*/}
|
|
|
+ {/* <Input*/}
|
|
|
+ {/* disabled={this.state.patentNameType !== 3}*/}
|
|
|
+ {/* value={this.state.patentName}*/}
|
|
|
+ {/* style={{ marginLeft: '15px' }}*/}
|
|
|
+ {/* onChange={(e) => {*/}
|
|
|
+ {/* this.setState({*/}
|
|
|
+ {/* patentName: e.target.value,*/}
|
|
|
+ {/* })*/}
|
|
|
+ {/* }}*/}
|
|
|
+ {/* placeholder="请填写专利名称"*/}
|
|
|
+ {/* />*/}
|
|
|
+ {/*</Radio>*/}
|
|
|
</Radio.Group>
|
|
|
</FormItem>
|
|
|
</div>
|
|
@@ -4237,8 +4265,11 @@ const Task = React.createClass({
|
|
|
type="primary"
|
|
|
onClick={(e) => {
|
|
|
if(this.state.projectType === 1 && this.state.patentType === -1){
|
|
|
- message.info('请先选择专利类型')
|
|
|
- }else{
|
|
|
+ message.info('请先选择专利类型');
|
|
|
+ }else if(this.state.projectType === 1 && this.state.patentNameType === -1){
|
|
|
+ message.info('请先选择专利名称');
|
|
|
+ }
|
|
|
+ else{
|
|
|
this.addThirdList()
|
|
|
}
|
|
|
}}
|
|
@@ -4441,6 +4472,8 @@ const Task = React.createClass({
|
|
|
{...this.props}
|
|
|
tid={this.state.tid}
|
|
|
projectType={this.state.projectType} //0正常 1专利 2软著 3审计
|
|
|
+ patentNameType={this.state.patentNameType}
|
|
|
+ patentName={this.state.patentName}
|
|
|
patentType={this.state.patentType}
|
|
|
status={this.state.refundStatus}
|
|
|
isPreviewPay={true}
|
|
@@ -5576,6 +5609,7 @@ const Task = React.createClass({
|
|
|
</Spin>
|
|
|
</Modal>
|
|
|
{this.state.ThirdListVisible ? <NewSupplier
|
|
|
+ patentNameType={this.state.patentNameType}
|
|
|
ThirdId={this.state.ThirdId}
|
|
|
tid={this.state.tid}
|
|
|
patentType={this.state.patentType}
|