|
@@ -43,8 +43,8 @@ import { getChannel } from "../../utils/tools";
|
|
|
import Superior from "../../components/common/superior";
|
|
|
import CheckboxPicker from "../../components/common/CheckboxPicker";
|
|
|
import AddressPicker from "../../components/common/addressPicker"
|
|
|
-import InteractList from "./components/InteractList";
|
|
|
import CustomerProjectSelect from '../../components/common/CustomerProjectSelect';
|
|
|
+import InterviewHisList from "../../components/common/InterviewHisList";
|
|
|
|
|
|
class CustomerProfile extends Component {
|
|
|
$instance = getCurrentInstance();
|
|
@@ -684,6 +684,7 @@ class CustomerProfile extends Component {
|
|
|
if (this.state.upType == 1) {
|
|
|
// 计算专利
|
|
|
let patentCount = this.countZlNum(this.state.info);
|
|
|
+ console.log(this.state.info)
|
|
|
this.setState({ isOpened: false, dtails: { ...this.state.dtails, ...this.state.info, patentCount } })
|
|
|
} else {
|
|
|
this.setState({ isOpened: false, dtails: { ...this.state.dtails, ...this.state.info } })
|
|
@@ -702,7 +703,8 @@ class CustomerProfile extends Component {
|
|
|
});
|
|
|
return;
|
|
|
} else {
|
|
|
- let isAdded = projectList.some(item => item.pid == checkProject[0].id)
|
|
|
+ let normalProjectList = projectList.filter(item => item.status === 0);
|
|
|
+ let isAdded = normalProjectList.some(item => item.pid == checkProject[0].id)
|
|
|
if (isAdded) {
|
|
|
Taro.showToast({
|
|
|
title: checkProject[0].bname + '已存在,请勿重复添加!',
|
|
@@ -1617,11 +1619,12 @@ class CustomerProfile extends Component {
|
|
|
info: {
|
|
|
uid: this.props.customerList[this.props.interviewIdx].id,
|
|
|
id: dtails.id,
|
|
|
- inventionPatentCount: dtails.inventionPatentCount || '',
|
|
|
- utilityModelCount: dtails.utilityModelCount || '',
|
|
|
- appearancePatentCount: dtails.appearancePatentCount || '',
|
|
|
- softwareWorksCount: dtails.softwareWorksCount || '',
|
|
|
- otherCount: dtails.otherCount || '',
|
|
|
+ inventionPatentCount: dtails.inventionPatentCount,
|
|
|
+ utilityModelCount: dtails.utilityModelCount,
|
|
|
+ appearancePatentCount: dtails.appearancePatentCount,
|
|
|
+ softwareWorksCount: dtails.softwareWorksCount,
|
|
|
+ otherCount: dtails.otherCount,
|
|
|
+ standard: dtails.standard,
|
|
|
}
|
|
|
})
|
|
|
}}
|
|
@@ -1630,12 +1633,12 @@ class CustomerProfile extends Component {
|
|
|
</View>
|
|
|
<View className="val">
|
|
|
专利 <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.inventionPatentCount}</Text>
|
|
|
+ 实用新型 <Text className="num">{dtails.utilityModelCount}</Text>
|
|
|
+ 外观设计 <Text className="num">{dtails.appearancePatentCount}</Text>
|
|
|
+ 软著 <Text className="num">{dtails.softwareWorksCount}</Text>
|
|
|
标准 <Text className="num">{String(dtails.standard) === '1' ? '有' : String(dtails.standard) === '0' ? '无' : ''}</Text>
|
|
|
- 其他类型 <Text className="num">{dtails.otherCount || ''}</Text>
|
|
|
+ 其他类型 <Text className="num">{dtails.otherCount}</Text>
|
|
|
</View>
|
|
|
|
|
|
<View className="tit" style={{ margin: '32rpx 0 20rpx;'}}>2.财务数据</View>
|
|
@@ -1643,19 +1646,19 @@ class CustomerProfile extends Component {
|
|
|
<View className="item-title">营收(万元):</View>
|
|
|
<View className="item-value">
|
|
|
<View style={{width: '260rpx'}}>
|
|
|
- <AtInput
|
|
|
- min={0}
|
|
|
- value={dtails.financialRevenue}
|
|
|
- name='financialRevenue'
|
|
|
- type='number'
|
|
|
- placeholder='请输入数量'
|
|
|
- size='mini'
|
|
|
- onChange={value => {
|
|
|
- dtails.financialRevenue = this.addCommas(value);
|
|
|
- this.setState({ dtails })
|
|
|
- }}
|
|
|
- cursor={-1}
|
|
|
- />
|
|
|
+ <AtInput
|
|
|
+ min={0}
|
|
|
+ value={dtails.financialRevenue}
|
|
|
+ name='financialRevenue'
|
|
|
+ type='number'
|
|
|
+ placeholder='请输入数量'
|
|
|
+ size='mini'
|
|
|
+ onChange={value => {
|
|
|
+ dtails.financialRevenue = this.addCommas(value);
|
|
|
+ this.setState({ dtails })
|
|
|
+ }}
|
|
|
+ cursor={-1}
|
|
|
+ />
|
|
|
</View>
|
|
|
</View>
|
|
|
</View>
|
|
@@ -1996,14 +1999,14 @@ class CustomerProfile extends Component {
|
|
|
<View style={{ display: 'flex', margin: '12rpx 0' }}>
|
|
|
<Text style={{ fontSize: '32rpx', marginRight: '16rpx', width: '172rpx' }}>标准</Text>
|
|
|
<RadioGroup title="标准" onChange={e => {
|
|
|
- dtails.standard = Number(e.target.value);
|
|
|
- this.setState({ dtails });
|
|
|
+ info.standard = Number(e.target.value);
|
|
|
+ this.setState({ info });
|
|
|
}}>
|
|
|
<Label className='radio-list__label'>
|
|
|
- <Radio className='radio-list__radio' value={1} checked={String(dtails.standard) === '1'}>有</Radio>
|
|
|
+ <Radio className='radio-list__radio' value={1} checked={String(info.standard) === '1'}>有</Radio>
|
|
|
</Label>
|
|
|
<Label className='radio-list__label'>
|
|
|
- <Radio className='radio-list__radio' value={0} checked={String(dtails.standard) === '0'}>无</Radio>
|
|
|
+ <Radio className='radio-list__radio' value={0} checked={String(info.standard) === '0'}>无</Radio>
|
|
|
</Label>
|
|
|
</RadioGroup>
|
|
|
</View>
|
|
@@ -2011,10 +2014,10 @@ class CustomerProfile extends Component {
|
|
|
name='otherCount'
|
|
|
title='其他'
|
|
|
type='number'
|
|
|
- value={dtails.otherCount}
|
|
|
+ value={info.otherCount}
|
|
|
onChange={e => {
|
|
|
this.setState({
|
|
|
- info: Object.assign(dtails, {
|
|
|
+ info: Object.assign(info, {
|
|
|
otherCount: e,
|
|
|
})
|
|
|
})
|
|
@@ -2258,7 +2261,7 @@ class CustomerProfile extends Component {
|
|
|
></CheckboxPicker>
|
|
|
|
|
|
{/* 沟通情况历史记录 */}
|
|
|
- <InteractList
|
|
|
+ <InterviewHisList
|
|
|
isOpened={this.state.interactShow}
|
|
|
list={this.state.interactList}
|
|
|
type={this.state.interactShowType}
|