|
@@ -381,7 +381,7 @@ class CustomerProfile extends Component {
|
|
|
message = '请输入面谈达成的目的,并且在20字以上';
|
|
|
flag = false;
|
|
|
} else {
|
|
|
- if (this.state.dtails.interviewList.length) {
|
|
|
+ if (this.state.dtails.interviewList.length && !!this.state.dtails.interviewList[0].prdid) {
|
|
|
if (!params.interviewFeedback || (params.interviewFeedback && params.interviewFeedback.length < 20)) {
|
|
|
message = '请输入面谈后的反馈,并且在20字以上';
|
|
|
flag = false;
|
|
@@ -435,7 +435,7 @@ class CustomerProfile extends Component {
|
|
|
message = '请输入经理/上级面谈建议,并且在20字以上';
|
|
|
flag = false;
|
|
|
} else {
|
|
|
- if (this.state.dtails.interviewList.length) {
|
|
|
+ if (this.state.dtails.interviewList.length && !!this.state.dtails.interviewList[0].prdid) {
|
|
|
if (!params.interviewFeedback || (params.interviewFeedback && params.interviewFeedback.length < 20)) {
|
|
|
message = '请输入面谈后的反馈,并且在20字以上';
|
|
|
flag = false;
|
|
@@ -553,19 +553,20 @@ class CustomerProfile extends Component {
|
|
|
// 计算专利总数
|
|
|
countZlNum({ inventionPatentCount, utilityModelCount, appearancePatentCount, softwareWorksCount, otherCount }) {
|
|
|
let count = 0;
|
|
|
- if (inventionPatentCount && !isNaN(inventionPatentCount)) {
|
|
|
+ debugger
|
|
|
+ if (!isNaN(String(inventionPatentCount))) {
|
|
|
count += Number(inventionPatentCount);
|
|
|
}
|
|
|
- if (utilityModelCount && !isNaN(utilityModelCount)) {
|
|
|
+ if (!isNaN(String(utilityModelCount))) {
|
|
|
count += Number(utilityModelCount);
|
|
|
}
|
|
|
- if (appearancePatentCount && !isNaN(appearancePatentCount)) {
|
|
|
+ if (!isNaN(String(appearancePatentCount))) {
|
|
|
count += Number(appearancePatentCount);
|
|
|
}
|
|
|
- if (softwareWorksCount && !isNaN(softwareWorksCount)) {
|
|
|
+ if (!isNaN(String(softwareWorksCount))) {
|
|
|
count += Number(softwareWorksCount);
|
|
|
}
|
|
|
- if (otherCount && !isNaN(otherCount)) {
|
|
|
+ if (!isNaN(String(otherCount))) {
|
|
|
count += Number(otherCount);
|
|
|
}
|
|
|
return count;
|
|
@@ -1577,11 +1578,11 @@ class CustomerProfile extends Component {
|
|
|
info: {
|
|
|
uid: this.props.customerList[this.props.interviewIdx].id,
|
|
|
id: dtails.id,
|
|
|
- inventionPatentCount: dtails.inventionPatentCount || 0,
|
|
|
- utilityModelCount: dtails.utilityModelCount || 0,
|
|
|
- appearancePatentCount: dtails.appearancePatentCount || 0,
|
|
|
- softwareWorksCount: dtails.softwareWorksCount || 0,
|
|
|
- otherCount: dtails.otherCount || 0,
|
|
|
+ inventionPatentCount: dtails.inventionPatentCount || '',
|
|
|
+ utilityModelCount: dtails.utilityModelCount || '',
|
|
|
+ appearancePatentCount: dtails.appearancePatentCount || '',
|
|
|
+ softwareWorksCount: dtails.softwareWorksCount || '',
|
|
|
+ otherCount: dtails.otherCount || '',
|
|
|
}
|
|
|
})
|
|
|
}}
|
|
@@ -1589,12 +1590,12 @@ class CustomerProfile extends Component {
|
|
|
}
|
|
|
</View>
|
|
|
<View className="val">
|
|
|
- 专利 <Text className="num">{dtails.patentCount || ''}</Text>
|
|
|
+ 专利 <Text className="num">{dtails.patentCount}</Text>
|
|
|
其中发明专利 <Text className="num">{dtails.inventionPatentCount || ''}</Text>
|
|
|
实用新型 <Text className="num">{dtails.utilityModelCount || ''}</Text>
|
|
|
外观设计 <Text className="num">{dtails.appearancePatentCount || ''}</Text>
|
|
|
软著 <Text className="num">{dtails.softwareWorksCount || ''}</Text>
|
|
|
- 标准 <Text className="num">{dtails.standard == 1 ? '有' : '无'}</Text>
|
|
|
+ 标准 <Text className="num">{String(dtails.standard) === '1' ? '有' : String(dtails.standard) === '0' ? '无' : ''}</Text>
|
|
|
其他类型 <Text className="num">{dtails.otherCount || ''}</Text>
|
|
|
</View>
|
|
|
|
|
@@ -1960,10 +1961,10 @@ class CustomerProfile extends Component {
|
|
|
this.setState({ dtails });
|
|
|
}}>
|
|
|
<Label className='radio-list__label'>
|
|
|
- <Radio className='radio-list__radio' value={1} checked={dtails.standard == 1}>有</Radio>
|
|
|
+ <Radio className='radio-list__radio' value={1} checked={String(dtails.standard) === '1'}>有</Radio>
|
|
|
</Label>
|
|
|
<Label className='radio-list__label'>
|
|
|
- <Radio className='radio-list__radio' value={0} checked={!dtails.standard}>无</Radio>
|
|
|
+ <Radio className='radio-list__radio' value={0} checked={String(dtails.standard) === '0'}>无</Radio>
|
|
|
</Label>
|
|
|
</RadioGroup>
|
|
|
</View>
|