dev01 пре 1 месец
родитељ
комит
664fb6b9b6

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

@@ -296,10 +296,10 @@ class CustomerProfile extends Component {
             companyCount: this.addCommas(v.data.companyCount || 0),
             socialSecurityCount: this.addCommas(v.data.socialSecurityCount || 0),
             externalInvestCount: this.addCommas(v.data.externalInvestCount || 0),
-            financialRevenue: this.addCommas(v.data.financialRevenue || 0),
-            financialTax: this.addCommas(v.data.financialTax || 0),
-            financialProperty: this.addCommas(v.data.financialProperty || 0),
-            financialRd: this.addCommas(v.data.financialRd || 0),
+            financialRevenue: this.addCommas(v.data.financialRevenue || ''),
+            financialTax: this.addCommas(v.data.financialTax || ''),
+            financialProperty: this.addCommas(v.data.financialProperty || ''),
+            financialRd: this.addCommas(v.data.financialRd || ''),
             enterpriseCount: this.addCommas(v.data.enterpriseCount || 0),
             earlyCommunication: '',
             customerDemand: '',
@@ -1359,13 +1359,13 @@ 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.patentCount || ''}</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">{dtails.standard == 1 ? '有' : '无'}</Text>&nbsp;&nbsp;&nbsp;
-                            其他类型&nbsp;<Text className="num">{dtails.otherCount || 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>

+ 2 - 2
src/pages/egressDetails/index.jsx

@@ -470,7 +470,7 @@ class EgressDetails extends Component {
       })
     } else {
       Taro.navigateTo({
-        url: url + "?id=" + data.uids + "&notRequired=true&readonly=true"
+        url: url + "?id=" + data.uids + "&prdid="+ data.prdList[0].id +"&notRequired=true&readonly=true"
       });
     }
   }
@@ -688,7 +688,7 @@ class EgressDetails extends Component {
                   dtails.viewPermission == 1 &&
                   <View className="tbuttom">
                     { dtails.type == 0 ? (
-                      <View onClick={e => {
+                      <View style={{ margin: '6px 0'}} onClick={e => {
                         e.stopPropagation()
                         this.onSelFiles(dtails, 2)
                       }}>查看面谈思路表</View>

+ 12 - 12
src/pages/interview/index.jsx

@@ -324,10 +324,10 @@ class CustomerProfile extends Component {
             companyCount: this.addCommas(v.data.companyCount || 0),
             socialSecurityCount: this.addCommas(v.data.socialSecurityCount || 0),
             externalInvestCount: this.addCommas(v.data.externalInvestCount || 0),
-            financialRevenue: this.addCommas(v.data.financialRevenue || 0),
-            financialTax: this.addCommas(v.data.financialTax || 0),
-            financialProperty: this.addCommas(v.data.financialProperty || 0),
-            financialRd: this.addCommas(v.data.financialRd || 0),
+            financialRevenue: this.addCommas(v.data.financialRevenue || ''),
+            financialTax: this.addCommas(v.data.financialTax || ''),
+            financialProperty: this.addCommas(v.data.financialProperty || ''),
+            financialRd: this.addCommas(v.data.financialRd || ''),
             enterpriseCount: this.addCommas(v.data.enterpriseCount || 0),
             earlyCommunication,
             customerDemand,
@@ -1284,7 +1284,7 @@ class CustomerProfile extends Component {
                         </View>
                       </View>
 
-                      {dtails.interviewList && dtails.interviewList.length ? (
+                      {dtails.interviewList && dtails.interviewList.length && !!dtails.interviewList[0].prdid ? (
                         <>
                           <View className="item">
                             <View className="item-title">
@@ -1589,13 +1589,13 @@ 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.patentCount || ''}</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">{dtails.standard == 1 ? '有' : '无'}</Text>&nbsp;&nbsp;&nbsp;
-                            其他类型&nbsp;<Text className="num">{dtails.otherCount || 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>
@@ -1815,7 +1815,7 @@ class CustomerProfile extends Component {
                           </View>
                         </View>
 
-                        {dtails.interviewList && dtails.interviewList.length ? (
+                        {dtails.interviewList && dtails.interviewList.length && !!dtails.interviewList[0].prdid ? (
                           <>
                             <View className="item">
                               <View className="item-title">

+ 24 - 2
src/pages/interviewDetail/components/InteractList.jsx

@@ -20,17 +20,39 @@ class InteractList extends Component {
     this.props.onClose();
   }
 
+  renderStatusName(data) {
+    if (data.prStatus == 3) {
+      return <View className="statusName red">已撤销</View>
+    } else if (data.prStatus == 4) {
+      return <View className="statusName blue">已驳回</View>
+    }
+    return null;
+  }
+
   render() {
     const hisItems = this.props.list.map(record => {
         return { title: record.createTime, content: [record[this.props.type] || '空'] }
     })
     return (
         <AtFloatLayout isOpened={this.props.isOpened} title={this.props.title} scrollY onClose={this.handleClose}>
-          <AtTimeline 
+          {/* <AtTimeline 
               pending 
               items={hisItems}
           >
-          </AtTimeline>
+          </AtTimeline> */}
+          <View className="time-list">
+            { this.props.list.map(item => (
+              <View className="time-list-item">
+                <View className="time-list-item-dot"></View>
+                <View className={[3,4].indexOf(item.prStatus) > -1 ? 'time-list-item__content grey' : 'time-list-item__content'}>
+                  { this.renderStatusName(item) }
+                  <View className="title">{ item.createTime }</View>
+                  <View className="content">{ item[this.props.type] || '空' }</View>
+                </View>
+              </View>
+            )) }
+            
+          </View>
         </AtFloatLayout>
     )
   }

+ 38 - 0
src/pages/interviewDetail/components/index.less

@@ -10,4 +10,42 @@
   margin-top: 8rpx;
   font-size: 25rpx;
   font-weight: 400;
+}
+
+.time-list {
+  &-item {
+    margin: 12rpx 0;
+    &__content {
+      padding: 16rpx;
+      position: relative;
+     &.grey {
+      background-color: rgba(192,192,192, .4);
+     }
+    }
+    &__content .statusName {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translateX(-25%);
+      transform: translateY(-25%);
+      font-weight: 600;
+      font-size: 32rpx;
+    }
+    &__content .title {
+      color: #333;
+      font-weight: 600;
+    }
+    &__content .content {
+      color: #999;
+      margin-top: 8rpx;
+      font-size: 25rpx;
+      font-weight: 400;
+    }
+  }
+}
+.red {
+  color: red;
+}
+.blue {
+  color: blue;
 }

+ 21 - 19
src/pages/interviewDetail/index.jsx

@@ -17,6 +17,7 @@ import {
 import Skeleton from "taro-skeleton";
 import {
   queryByUidAll,
+  getInterviewByPrdid,
   updateUser,
   addOneContact,
   findCustomerContacts,
@@ -294,8 +295,9 @@ class CustomerProfile extends Component {
   // 客户档案详情
   queryByUidAll() {
     const id = this.$instance.router.params.id;
+    // getInterviewByPrdid({prdid: this.$instance.router.params.prdid})
     queryByUidAll(
-      false,
+      true,
       { id }
     )
       .then((v) => {
@@ -311,13 +313,13 @@ class CustomerProfile extends Component {
             financialProperty: this.addCommas(v.data.financialProperty || 0),
             financialRd: this.addCommas(v.data.financialRd || 0),
             enterpriseCount: this.addCommas(v.data.enterpriseCount || 0),
-            earlyCommunication: v.data.interviewList[0].earlyCommunication,
-            customerDemand: v.data.interviewList[0].customerDemand,
-            interviewIdeas: v.data.interviewList[0].interviewIdeas,
-            interviewPurpose: v.data.interviewList[0].interviewPurpose,
-            interviewRecommend: v.data.interviewList[0].interviewRecommend,
-            interviewFeedback: v.data.interviewList[0].interviewFeedback,
-            followUpPlan: v.data.interviewList[0].followUpPlan,
+            earlyCommunication: v.data.interviewList.length ? v.data.interviewList[0].earlyCommunication : '',
+            customerDemand: v.data.interviewList.length ? v.data.interviewList[0].customerDemand : '',
+            interviewIdeas: v.data.interviewList.length ? v.data.interviewList[0].interviewIdeas : '',
+            interviewPurpose: v.data.interviewList.length ? v.data.interviewList[0].interviewPurpose : '',
+            interviewRecommend: v.data.interviewList.length ? v.data.interviewList[0].interviewRecommend : '',
+            interviewFeedback: v.data.interviewList.length ? v.data.interviewList[0].interviewFeedback : '',
+            followUpPlan: v.data.interviewList.length ? v.data.interviewList[0].followUpPlan : '',
           }
           let patentCount = this.countZlNum(dtailsData);
           this.setState({
@@ -1164,7 +1166,7 @@ class CustomerProfile extends Component {
                           <AtTextarea
                             value={dtails.interviewIdeas}
                             maxLength={200}
-                            placeholder='请编写本次面谈客户思路~'
+                            placeholder='~'
                             height={70}
                             onChange={value => {
                               dtails.interviewIdeas = value;
@@ -1191,7 +1193,7 @@ class CustomerProfile extends Component {
                           <AtTextarea
                             value={dtails.interviewPurpose}
                             maxLength={200}
-                            placeholder='请编写本次面谈达成的目的~'
+                            placeholder='~'
                             height={70}
                             onChange={value => {
                               dtails.interviewPurpose = value;
@@ -1220,7 +1222,7 @@ class CustomerProfile extends Component {
                               <AtTextarea
                                 value={dtails.interviewFeedback}
                                 maxLength={200}
-                                placeholder='请编写本次面谈后的反馈~'
+                                placeholder='~'
                                 height={70}
                                 onChange={value => {
                                   dtails.interviewFeedback = value;
@@ -1247,7 +1249,7 @@ class CustomerProfile extends Component {
                               <AtTextarea
                                 value={dtails.followUpPlan}
                                 maxLength={200}
-                                placeholder='请编写后续跟进计划~'
+                                placeholder='~'
                                 height={70}
                                 onChange={value => {
                                   dtails.followUpPlan = value;
@@ -1554,7 +1556,7 @@ class CustomerProfile extends Component {
                             <AtTextarea
                               value={dtails.earlyCommunication}
                               maxLength={200}
-                              placeholder='请编写本次面谈客户难处~'
+                              placeholder='~'
                               height={70}
                               onChange={value => {
                                 dtails.earlyCommunication = value;
@@ -1581,7 +1583,7 @@ class CustomerProfile extends Component {
                             <AtTextarea
                               value={dtails.customerDemand}
                               maxLength={200}
-                              placeholder='请编写本次面谈客户需求~'
+                              placeholder='~'
                               height={70}
                               onChange={value => {
                                 dtails.customerDemand = value;
@@ -1608,7 +1610,7 @@ class CustomerProfile extends Component {
                             <AtTextarea
                               value={dtails.interviewIdeas}
                               maxLength={200}
-                              placeholder='请编写本次面谈客户思路~'
+                              placeholder='~'
                               height={70}
                               onChange={value => {
                                 dtails.interviewIdeas = value;
@@ -1635,7 +1637,7 @@ class CustomerProfile extends Component {
                             <AtTextarea
                               value={dtails.interviewPurpose}
                               maxLength={200}
-                              placeholder='请编写本次面谈达成的目的~'
+                              placeholder='~'
                               height={70}
                               onChange={value => {
                                 dtails.interviewPurpose = value;
@@ -1662,7 +1664,7 @@ class CustomerProfile extends Component {
                             <AtTextarea
                               value={dtails.interviewRecommend}
                               maxLength={200}
-                              placeholder='请编写本次面谈建议~'
+                              placeholder='~'
                               height={70}
                               onChange={value => {
                                 dtails.interviewRecommend = value;
@@ -1691,7 +1693,7 @@ class CustomerProfile extends Component {
                                 <AtTextarea
                                   value={dtails.interviewFeedback}
                                   maxLength={200}
-                                  placeholder='请编写本次面谈后的反馈~'
+                                  placeholder='~'
                                   height={70}
                                   onChange={value => {
                                     dtails.interviewFeedback = value;
@@ -1718,7 +1720,7 @@ class CustomerProfile extends Component {
                                 <AtTextarea
                                   value={dtails.followUpPlan}
                                   maxLength={200}
-                                  placeholder='请编写后续跟进计划~'
+                                  placeholder='~'
                                   height={70}
                                   onChange={value => {
                                     dtails.followUpPlan = value;