소스 검색

面谈思路表详情增加本次面谈项目

dev01 1 개월 전
부모
커밋
3e42b78eb0
2개의 변경된 파일40개의 추가작업 그리고 30개의 파일을 삭제
  1. 2 10
      src/pages/customerProfile/index.jsx
  2. 38 20
      src/pages/interviewDetail/index.jsx

+ 2 - 10
src/pages/customerProfile/index.jsx

@@ -1063,11 +1063,7 @@ class CustomerProfile extends Component {
 
                       <View style={{fontWeight: 600, color: "red"}}>
                         <Text>首次面谈时间:</Text>
-                        { dtails.interviewList.length ? (
-                          <Text>{ dtails.interviewList[dtails.interviewList.length - 1].createTime }</Text>
-                        ) : (
-                          <Text>暂无面谈记录</Text>
-                        ) }
+                        <Text>{ dtails.firstInterviewDate || '暂无面谈记录' }</Text>
                       </View>
 
                       <View className="item">
@@ -1269,11 +1265,7 @@ class CustomerProfile extends Component {
 
                       <View style={{fontWeight: 600, color: "red"}}>
                         <Text>首次面谈时间:</Text>
-                        { dtails.interviewList.length ? (
-                          <Text>{ dtails.interviewList[dtails.interviewList.length - 1].createTime }</Text>
-                        ) : (
-                          <Text>暂无面谈记录</Text>
-                        ) }
+                        <Text>{ dtails.firstInterviewDate || '暂无面谈记录' }</Text>
                       </View>
 
                       <View className="item">

+ 38 - 20
src/pages/interviewDetail/index.jsx

@@ -740,8 +740,8 @@ class CustomerProfile extends Component {
       if (!res.error.length) {
         this.setState({
           projectList: res.data.list,
-          projectingList: res.data.list.filter(item => !item.type),
-          projectedList: res.data.list.filter(item => item.type === 1)
+          projectingList: res.data.list.filter(item => item.prdid === this.$instance.router.params.prdid),
+          projectedList: res.data.list.filter(item => item.prdid !== this.$instance.router.params.prdid)
         });
       }
     })
@@ -1129,12 +1129,8 @@ class CustomerProfile extends Component {
                       </View>
 
                       <View style={{fontWeight: 600, color: "red"}}>
-                        <Text>首次面谈时间:</Text>
-                        { dtails.interviewList.length ? (
-                          <Text>{ dtails.interviewList[dtails.interviewList.length - 1].createTime }</Text>
-                        ) : (
-                          <Text>暂无面谈记录</Text>
-                        ) }
+                      <Text>首次面谈时间:</Text>
+                        <Text>{ dtails.firstInterviewDate || '暂无面谈记录' }</Text>
                       </View>
 
                       <View className="item">
@@ -1151,6 +1147,19 @@ class CustomerProfile extends Component {
                       </View>
 
                       <View className="item">
+                        <View className="item-title">
+                          本次面谈项目:
+                        </View>
+                        <View className="item-value">
+                          {
+                            this.state.projectingList.map((item) => {
+                              return <View>{this.renderProjectItemName(item)}</View>
+                            })
+                          }
+                        </View>
+                      </View>
+
+                      <View className="item">
                         <View className="item-value">
                           <View style={{color: "red", marginTop: '24rpx', fontWeight: 600}}>
                             <Text>已面谈项目:</Text>
@@ -1407,12 +1416,8 @@ class CustomerProfile extends Component {
                       </View>
 
                       <View style={{fontWeight: 600, color: "red"}}>
-                        <Text>首次面谈时间:</Text>
-                        { dtails.interviewList.length ? (
-                          <Text>{ dtails.interviewList[dtails.interviewList.length - 1].createTime }</Text>
-                        ) : (
-                          <Text>暂无面谈记录</Text>
-                        ) }
+                      <Text>首次面谈时间:</Text>
+                        <Text>{ dtails.firstInterviewDate || '暂无面谈记录' }</Text>
                       </View>
 
                       <View className="item">
@@ -1432,6 +1437,19 @@ class CustomerProfile extends Component {
                       </View>
 
                       <View className="item">
+                        <View className="item-title">
+                          本次面谈项目:
+                        </View>
+                        <View className="item-value">
+                          {
+                            this.state.projectingList.map((item) => {
+                              return <View>{this.renderProjectItemName(item)}</View>
+                            })
+                          }
+                        </View>
+                      </View>
+
+                      <View className="item">
                         <View className="item-value">
                           <View style={{color: "red", marginTop: '24rpx', fontWeight: 600}}>
                             <Text>已面谈项目:</Text>
@@ -1457,12 +1475,12 @@ class CustomerProfile extends Component {
                         </View>
                         <View className="val">
                           专利&nbsp;<Text className="num">{dtails.patentCount || 0}</Text>&nbsp;&nbsp;&nbsp;
-                            其中发明专利&nbsp;<Text className="num">{dtails.inventionPatentCount || 0}</Text>&nbsp;&nbsp;&nbsp;
-                            实用新型&nbsp;<Text className="num">{dtails.utilityModelCount || 0}</Text>&nbsp;&nbsp;&nbsp;
-                            外观设计&nbsp;<Text className="num">{dtails.appearancePatentCount || 0}</Text>&nbsp;&nbsp;&nbsp;
-                            软著&nbsp;<Text className="num">{dtails.softwareWorksCount || 0}</Text>&nbsp;&nbsp;&nbsp;
-                            标准&nbsp;<Text className="num">{dtails.standard == 1 ? '有' : '无'}</Text>&nbsp;&nbsp;&nbsp;
-                            其他类型&nbsp;<Text className="num">{dtails.otherCount || 0}</Text>&nbsp;&nbsp;&nbsp;
+                            其中发明专利&nbsp;<Text className="num">{dtails.inventionPatentCount || ''}</Text>&nbsp;&nbsp;&nbsp;
+                            实用新型&nbsp;<Text className="num">{dtails.utilityModelCount || ''}</Text>&nbsp;&nbsp;&nbsp;
+                            外观设计&nbsp;<Text className="num">{dtails.appearancePatentCount || ''}</Text>&nbsp;&nbsp;&nbsp;
+                            软著&nbsp;<Text className="num">{dtails.softwareWorksCount || ''}</Text>&nbsp;&nbsp;&nbsp;
+                            标准&nbsp;<Text className="num">{String(dtails.standard) === '1' ? '有' : String(dtails.standard) === '0' ? '无' : ''}</Text>&nbsp;&nbsp;&nbsp;
+                            其他类型&nbsp;<Text className="num">{dtails.otherCount || ''}</Text>&nbsp;&nbsp;&nbsp;
                         </View>
 
                         <View className="tit" style={{ margin: '32rpx 0 20rpx;'}}>2.财务数据</View>