Parcourir la source

客户档案和公出面谈调整

dev01 il y a 1 mois
Parent
commit
11900fa975

+ 5 - 3
src/pages/applyDepart/index.jsx

@@ -136,10 +136,11 @@ class ApplyDepart extends Component {
       }
   }
 
-  handleCustomerNext({ uaiId }) {
+  handleCustomerNext({ uid, uaiId }) {
     let { interviewIdx, uaiIdList } = this.state;
+    uaiIdList[interviewIdx] = {uid, uaiId};
     interviewIdx = interviewIdx + 1;
-    uaiIdList.push(uaiId);
+    
     this.setState({ interviewIdx, uaiIdList });
   }
 
@@ -196,6 +197,7 @@ class ApplyDepart extends Component {
                         <InterviewCustomer
                             interviewIdx={interviewIdx}
                             customerList={interviewCustomerList}
+                            uaiIdList={this.state.uaiIdList}
                             onPrevClick={this.handleCustomerPrev.bind(this)}
                             onNextClick={this.handleCustomerNext.bind(this)}
                         />
@@ -203,7 +205,7 @@ class ApplyDepart extends Component {
                         <PublicContent
                             enterpriseInfor={this.state.enterpriseInfor}
                             selectArrderLocation={this.state.selectArrderLocation}
-                            uaiIdList={this.state.uaiIdList}
+                            uaiIdList={this.state.uaiIdList.map(item => item.uaiId)}
                         />
                     )
                 }

+ 85 - 60
src/pages/customerProfile/index.jsx

@@ -114,6 +114,11 @@ class CustomerProfile extends Component {
     }
   }
 
+  addCommas(num) {
+    let newNum = num.toString().replace(/,/g, '');
+    return newNum.replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
+  }
+
   toggleAddressPicker(e) {
     if (!Object.keys(e).length) {
       this.setState({ addressPickerShow: false });
@@ -247,25 +252,27 @@ class CustomerProfile extends Component {
     )
       .then((v) => {
         if (v.error.length === 0) {
+          let dtailsData = {
+            ...v.data,
+            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),
+            enterpriseCount: this.addCommas(v.data.enterpriseCount || 0),
+            earlyCommunication: '',
+            customerDemand: '',
+            interviewIdeas: '',
+            interviewPurpose: '',
+            interviewRecommend: '',
+            interviewFeedback: '',
+            followUpPlan: ''
+          }
+          let patentCount = this.countZlNum(dtailsData);
           this.setState({
-            dtails: {
-              ...v.data,
-              companyCount: v.data.companyCount || 0,
-              socialSecurityCount: v.data.socialSecurityCount || 0,
-              externalInvestCount: v.data.externalInvestCount || 0,
-              financialRevenue: v.data.financialRevenue || 0,
-              financialTax: v.data.financialTax || 0,
-              financialProperty: v.data.financialProperty || 0,
-              financialRd: v.data.financialRd || 0,
-              enterpriseCount: v.data.enterpriseCount || 0,
-              earlyCommunication: '',
-              customerDemand: '',
-              interviewIdeas: '',
-              interviewPurpose: '',
-              interviewRecommend: '',
-              interviewFeedback: '',
-              followUpPlan: ''
-            }
+            dtails: { ...dtailsData, patentCount }
           })
         } else {
           setTimeout(() => {
@@ -363,7 +370,7 @@ class CustomerProfile extends Component {
       params = {
         ...params,
         channelType: dtails.channelType,
-        enterpriseCount: dtails.enterpriseCount,
+        enterpriseCount: dtails.enterpriseCount.replace(/,/g, ''),
         channelIndicators: dtails.channelIndicators,
       };
     } else {
@@ -385,17 +392,17 @@ class CustomerProfile extends Component {
         softwareWorksCount: dtails.softwareWorksCount,
         otherCount: dtails.otherCount,
         //     financialData: dtails.financialData,
-        companyCount: dtails.companyCount,
-        socialSecurityCount: dtails.socialSecurityCount,
-        externalInvestCount: dtails.externalInvestCount,
+        companyCount: dtails.companyCount.replace(/,/g, ''),
+        socialSecurityCount: dtails.socialSecurityCount.replace(/,/g, ''),
+        externalInvestCount: dtails.externalInvestCount.replace(/,/g, ''),
         externalInvestIndustry: dtails.externalInvestIndustry,
         externalInvestIndustryName: dtails.externalInvestIndustryName,
         externalInvestId: dtails.externalInvestId,
         externalInvestName: dtails.externalInvestName,
-        financialRevenue: dtails.financialRevenue,
-        financialTax: dtails.financialTax,
-        financialProperty: dtails.financialProperty,
-        financialRd: dtails.financialRd,
+        financialRevenue: dtails.financialRevenue.replace(/,/g, ''),
+        financialTax: dtails.financialTax.replace(/,/g, ''),
+        financialProperty: dtails.financialProperty.replace(/,/g, ''),
+        financialRd: dtails.financialRd.replace(/,/g, ''),
         standard: dtails.standard,
         businessScope: dtails.businessScope,
       };
@@ -436,6 +443,27 @@ class CustomerProfile extends Component {
     })
   }
 
+  // 计算专利总数
+  countZlNum({ inventionPatentCount, utilityModelCount, appearancePatentCount, softwareWorksCount, otherCount }) {
+    let count = 0;
+    if (inventionPatentCount && !isNaN(inventionPatentCount)) {
+      count += Number(inventionPatentCount);
+    }
+    if (utilityModelCount && !isNaN(utilityModelCount)) {
+      count += Number(utilityModelCount);
+    }
+    if (appearancePatentCount && !isNaN(appearancePatentCount)) {
+      count += Number(appearancePatentCount);
+    }
+    if (softwareWorksCount && !isNaN(softwareWorksCount)) {
+      count += Number(softwareWorksCount);
+    }
+    if (otherCount && !isNaN(otherCount)) {
+      count += Number(otherCount);
+    }
+    return count;
+  }
+
   // 修改客户档案
   update() {
     // const { upType, info } = this.state
@@ -506,7 +534,13 @@ class CustomerProfile extends Component {
     if (this.state.upType == 5) {
       this.postAddProject();
     } else {
-      this.setState({ isOpened: false, dtails: { ...this.state.dtails, ...this.state.info } })
+      if (this.state.upType == 1) {
+        // 计算专利
+        let patentCount = this.countZlNum(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 } })
+      }
     }
   }
   postAddProject() {
@@ -909,7 +943,6 @@ class CustomerProfile extends Component {
 
                           <View className="link" onClick={() => {
                             let currAddress = [];
-                            console.log(dtails.locationProvince, dtails.locationCity, dtails.locationArea)
                             if (dtails.locationProvince && dtails.locationCity && dtails.locationArea) {
                               currAddress = [dtails.locationProvince, dtails.locationCity, dtails.locationArea];
                             }
@@ -950,16 +983,15 @@ class CustomerProfile extends Component {
                           渠道企业数:
                       </View>
                         <View className="item-value">
-                          <AtInputNumber
+                          <AtInput
                             min={0}
-                            max={99999}
                             value={dtails.enterpriseCount}
                             name='companyCount'
                             type='number'
                             placeholder='请输入数量'
                             size='mini'
                             onChange={value => {
-                              dtails.enterpriseCount = value;
+                              dtails.enterpriseCount = this.addCommas(value);
                               this.setState({ dtails })
                             }}
                           />
@@ -1045,7 +1077,7 @@ class CustomerProfile extends Component {
                         <View className="item-value">
                           <View className="link" onClick={() => {
                             let currAddress = [];
-                            if (!dtails.locationProvince && !dtails.locationCity && !dtails.locationArea) {
+                            if (dtails.locationProvince && dtails.locationCity && dtails.locationArea) {
                               currAddress = [dtails.locationProvince, dtails.locationCity, dtails.locationArea];
                             }
                             this.setState({ addressPickerShow: true, currAddress })
@@ -1081,57 +1113,54 @@ class CustomerProfile extends Component {
                         </View>
                       </View>
 
-                      <View className="item">
+                      <View className="item flex">
                         <View className="item-title">母/子公司数:</View>
                         <View className="item-value">
-                          <AtInputNumber
+                          <AtInput
                             min={0}
-                            max={99999}
                             value={dtails.companyCount}
                             name='companyCount'
                             type='number'
                             placeholder='请输入数量'
                             size='mini'
                             onChange={value => {
-                              dtails.companyCount = value;
+                              dtails.companyCount = this.addCommas(value);
                               this.setState({ dtails })
                             }}
                           />
                         </View>
                       </View>
 
-                      <View className="item">
+                      <View className="item flex">
                         <View className="item-title">社保人数:</View>
                         <View className="item-value">
-                          <AtInputNumber
+                          <AtInput
                             min={0}
-                            max={99999}
                             value={dtails.socialSecurityCount}
                             name='socialSecurityCount'
                             type='number'
                             placeholder='请输入数量'
                             size='mini'
                             onChange={value => {
-                              dtails.socialSecurityCount = value;
+                              dtails.socialSecurityCount = this.addCommas(value);
                               this.setState({ dtails })
                             }}
                           />
                         </View>
                       </View>
 
-                      <View className="item">
+                      <View className="item flex">
                         <View className="item-title">对外投资控股的企业数:</View>
                         <View className="item-value">
-                          <AtInputNumber
+                          <AtInput
                             min={0}
-                            max={99999}
                             value={dtails.externalInvestCount}
                             name='externalInvestCount'
                             type='number'
                             placeholder='请输入数量'
                             size='mini'
                             onChange={value => {
-                              dtails.externalInvestCount = value;
+                              dtails.externalInvestCount = this.addCommas(value);
                               this.setState({ dtails })
                             }}
                           />
@@ -1249,76 +1278,72 @@ class CustomerProfile extends Component {
                         </View>
 
                         <View className="tit" style={{ margin: '32rpx 0 20rpx;'}}>2.财务数据</View>
-                        <View className="item">
+                        <View className="item flex">
                           <View className="item-title">营收(万元):</View>
                           <View className="item-value">
-                            <AtInputNumber
+                            <AtInput
                               min={0}
-                              max={99999}
                               value={dtails.financialRevenue}
                               name='financialRevenue'
                               type='number'
                               placeholder='请输入数量'
                               size='mini'
                               onChange={value => {
-                                dtails.financialRevenue = value;
+                                dtails.financialRevenue = this.addCommas(value);
                                 this.setState({ dtails })
                               }}
                             />
                           </View>
                         </View>
 
-                        <View className="item">
+                        <View className="item flex">
                           <View className="item-title">税收(万元):</View>
                           <View className="item-value">
-                            <AtInputNumber
+                            <AtInput
                               min={0}
-                              max={99999}
                               value={dtails.financialTax}
                               name='financialTax'
                               type='number'
                               placeholder='请输入数量'
                               size='mini'
                               onChange={value => {
-                                dtails.financialTax = value;
+                                dtails.financialTax = this.addCommas(value);
                                 this.setState({ dtails })
                               }}
                             />
                           </View>
                         </View>
 
-                        <View className="item">
+                        <View className="item flex">
                           <View className="item-title">资产(万元):</View>
                           <View className="item-value">
-                            <AtInputNumber
+                            <AtInput
                               min={0}
-                              max={99999}
                               value={dtails.financialProperty}
                               name='financialProperty'
                               type='number'
                               placeholder='请输入数量'
                               size='mini'
                               onChange={value => {
-                                dtails.financialProperty = value;
+                                dtails.financialProperty = this.addCommas(value);
                                 this.setState({ dtails })
                               }}
                             />
                           </View>
                         </View>
                         
-                        <View className="item">
+                        <View className="item flex">
                           <View className="item-title">研发费用(万元):</View>
                           <View className="item-value">
-                            <AtInputNumber
+                            <AtInput
                               min={0}
-                              max={99999}
                               value={dtails.financialRd}
                               name='financialRd'
                               type='number'
                               placeholder='请输入数量'
                               size='mini'
                               onChange={value => {
-                                dtails.financialRd = value;
+                                dtails.financialRd = this.addCommas(value);
                                 this.setState({ dtails })
                               }}
                             />

+ 22 - 13
src/pages/customerProfile/index.less

@@ -111,15 +111,15 @@
         margin-bottom: 5px;
 
         .up {
-          // background: #70B603;
-          // color: #FFFFFF;
-          // padding: 10px 20px;
-          // font-size: 26px;
-          // border-radius: 8px;
-          // font-weight: 400;
+          background: #70B603;
+          color: #FFFFFF;
+          padding: 10px 20px;
+          font-size: 26px;
+          border-radius: 8px;
           font-weight: 400;
-          color: #3864ef;
-          font-size: 26rpx;
+          // font-weight: 400;
+          // color: #3864ef;
+          // font-size: 26rpx;
         }
 
         .txt {
@@ -251,8 +251,11 @@
   border-radius: 20px;
 
   .item {
-    padding-bottom: 30px;
-
+    padding-bottom: 16px;
+    &.flex {
+      display: flex;
+      align-items: center;
+    }
     &-title {
       display: flex;
       flex-flow: row nowrap;
@@ -282,9 +285,15 @@
       }
 
       .tbuttom {
-        position: absolute;
-        right: 0;
-        color: #3864ef;
+        // position: absolute;
+        // right: 0;
+        // color: #3864ef;
+        background: #70B603;
+        color: #FFFFFF;
+        padding: 10px 20px;
+        font-size: 26px;
+        border-radius: 8px;
+        font-weight: 400;
       }
     }
 

+ 178 - 92
src/pages/interview/index.jsx

@@ -55,6 +55,8 @@ class CustomerProfile extends Component {
       upType: -1,
       isOpened: false,
       dtails: {},
+      projectingList: [],
+      projectedList: [],
       projectList: [],
       info: {},
       sector: {},
@@ -119,6 +121,11 @@ class CustomerProfile extends Component {
     }
   }
 
+  addCommas(num) {
+    let newNum = num.toString().replace(/,/g, '');
+    return newNum.replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
+  }
+
   handlePrevClick() {
     this.props.onPrevClick();
   }
@@ -263,25 +270,47 @@ class CustomerProfile extends Component {
     )
       .then((v) => {
         if (v.error.length === 0) {
+          // 是否在面谈中,表示本次面谈未结束
+          let isInterviewIng = this.props.uaiIdList.some(item => item.uid == v.data.uid);
+
+          let earlyCommunication = '',
+          customerDemand = '',
+          interviewIdeas = '',
+          interviewPurpose = '',
+          interviewRecommend = '',
+          interviewFeedback = '',
+          followUpPlan = '';
+          if (isInterviewIng) {
+            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;
+          }
+          let dtailsData = {
+            ...v.data,
+            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),
+            enterpriseCount: this.addCommas(v.data.enterpriseCount || 0),
+            earlyCommunication,
+            customerDemand,
+            interviewIdeas,
+            interviewPurpose,
+            interviewRecommend,
+            interviewFeedback,
+            followUpPlan,
+          }
+          let patentCount = this.countZlNum(dtailsData);
           this.setState({
-            dtails: {
-              ...v.data,
-              companyCount: v.data.companyCount || 0,
-              socialSecurityCount: v.data.socialSecurityCount || 0,
-              externalInvestCount: v.data.externalInvestCount || 0,
-              financialRevenue: v.data.financialRevenue || 0,
-              financialTax: v.data.financialTax || 0,
-              financialProperty: v.data.financialProperty || 0,
-              financialRd: v.data.financialRd || 0,
-              earlyCommunication: '',
-              customerDemand: '',
-              interviewIdeas: '',
-              interviewPurpose: '',
-              interviewRecommend: '',
-              interviewFeedback: '',
-              followUpPlan: '',
-            }
-          })
+            dtails: { ...dtailsData, patentCount }
+          });
         } else {
           setTimeout(() => {
             Taro.navigateBack({
@@ -414,12 +443,19 @@ class CustomerProfile extends Component {
       type: 1, // 1、更新档案和面谈,0、只更新档案
     };
 
+    // 是否在面谈中,表示本次面谈未结束
+    let curruaiIdList = this.props.uaiIdList.filter(item => item.uid == dtails.uid);
+    if (curruaiIdList.length) {
+      // 面谈编号
+      params.uaiId = curruaiIdList[0].uaiId;
+    }
+
     if (dtails.newChannel == 1) {
       // 渠道客户
       params = {
         ...params,
         channelType: dtails.channelType,
-        enterpriseCount: dtails.enterpriseCount,
+        enterpriseCount: dtails.enterpriseCount.replace(/,/g, ''),
         channelIndicators: dtails.channelIndicators,
         interviewIdeas: dtails.interviewIdeas,
         interviewPurpose: dtails.interviewPurpose,
@@ -445,17 +481,17 @@ class CustomerProfile extends Component {
         softwareWorksCount: dtails.softwareWorksCount,
         otherCount: dtails.otherCount,
         financialData: dtails.financialData,
-        companyCount: dtails.companyCount,
-        socialSecurityCount: dtails.socialSecurityCount,
-        externalInvestCount: dtails.externalInvestCount,
+        companyCount: dtails.companyCount.replace(/,/g, ''),
+        socialSecurityCount: dtails.socialSecurityCount.replace(/,/g, ''),
+        externalInvestCount: dtails.externalInvestCount.replace(/,/g, ''),
         externalInvestIndustry: dtails.externalInvestIndustry,
         externalInvestIndustryName: dtails.externalInvestIndustryName,
         externalInvestId: dtails.externalInvestId,
         externalInvestName: dtails.externalInvestName,
-        financialRevenue: dtails.financialRevenue,
-        financialTax: dtails.financialTax,
-        financialProperty: dtails.financialProperty,
-        financialRd: dtails.financialRd,
+        financialRevenue: dtails.financialRevenue.replace(/,/g, ''),
+        financialTax: dtails.financialTax.replace(/,/g, ''),
+        financialProperty: dtails.financialProperty.replace(/,/g, ''),
+        financialRd: dtails.financialRd.replace(/,/g, ''),
         standard: dtails.standard,
         businessScope: dtails.businessScope,
       };
@@ -493,6 +529,27 @@ class CustomerProfile extends Component {
     })
   }
 
+  // 计算专利总数
+  countZlNum({ inventionPatentCount, utilityModelCount, appearancePatentCount, softwareWorksCount, otherCount }) {
+    let count = 0;
+    if (inventionPatentCount && !isNaN(inventionPatentCount)) {
+      count += Number(inventionPatentCount);
+    }
+    if (utilityModelCount && !isNaN(utilityModelCount)) {
+      count += Number(utilityModelCount);
+    }
+    if (appearancePatentCount && !isNaN(appearancePatentCount)) {
+      count += Number(appearancePatentCount);
+    }
+    if (softwareWorksCount && !isNaN(softwareWorksCount)) {
+      count += Number(softwareWorksCount);
+    }
+    if (otherCount && !isNaN(otherCount)) {
+      count += Number(otherCount);
+    }
+    return count;
+  }
+
   // 修改客户档案
   update() {
     // const { upType, info } = this.state
@@ -563,7 +620,14 @@ class CustomerProfile extends Component {
     if (this.state.upType == 5) {
       this.postAddProject();
     } else {
-      this.setState({ isOpened: false, dtails: { ...this.state.dtails, ...this.state.info } })
+      if (this.state.upType == 1) {
+        // 计算专利
+        let patentCount = this.countZlNum(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 } })
+      }
+      
     }
   }
   postAddProject() {
@@ -653,7 +717,11 @@ class CustomerProfile extends Component {
     const params = { uid, pageNo: 1, pageSize: 9999 }
     queryProjectList(params).then(res => {
       if (!res.error.length) {
-        this.setState({ projectList: res.data.list });
+        this.setState({
+          projectList: res.data.list,
+          projectingList: res.data.list.filter(item => !item.type),
+          projectedList: res.data.list.filter(item => item.type === 1)
+        });
       }
     })
   }
@@ -1005,16 +1073,15 @@ class CustomerProfile extends Component {
                       <View className="item">
                         <View className="item-title">渠道企业数:</View>
                         <View className="item-value">
-                          <AtInputNumber
+                          <AtInput
                             min={0}
-                            max={99999}
                             value={dtails.enterpriseCount}
                             name='companyCount'
                             type='number'
                             placeholder='请输入数量'
                             size='mini'
                             onChange={value => {
-                              dtails.enterpriseCount = value;
+                              dtails.enterpriseCount = this.addCommas(value);
                               this.setState({ dtails })
                             }}
                           />
@@ -1096,18 +1163,29 @@ class CustomerProfile extends Component {
                           }
                         </View>
                         <View className="item-value">
-                          {
-                            this.state.projectList.map(item => {
+                        {
+                            this.state.projectingList.map(item => {
                               return <View style={{ display: 'flex', alignItems: 'center' }}>
                                 <Text style={{ fontSize: '30rpx' }} style={{ marginRight: '10rpx' }}>
                                   {this.renderProjectItemName(item)}
                                 </Text>
+                                <AtIcon value="close" size='15' color="#f00" onClick={() => { this.handleDelProject(item) }} />
 
-                                { item.type == 0 && <AtIcon value="close" size='15' color="#f00" onClick={() => { this.handleDelProject(item) }} /> }
-                                
+                               
                               </View>
                             })
                           }
+                          <View style={{color: "red", marginTop: '24rpx', fontWeight: 600}}>
+                            <Text>已面谈项目:</Text>
+                            {
+                              this.state.projectedList.map((item, idx) => {
+                                if (idx == this.state.projectedList.length - 1) {
+                                  return <Text>{this.renderProjectItemName(item)}</Text>
+                                }
+                                return <Text>{this.renderProjectItemName(item)}、</Text>
+                              })
+                            }
+                          </View>
                         </View>
                       </View>   
 
@@ -1143,7 +1221,7 @@ class CustomerProfile extends Component {
                             面谈达成的目的:
                             <Text className="titleTips">(20字以上)</Text>
                           </View>
-                          <View className="tbuttom">
+                          <View>
                             {dtails.interviewList.length ? (
                               <AtIcon value='clock' size='20' color='#1E90FF' onClick={() => this.openInteractHis('interviewPurpose')}></AtIcon>
                             ) : null}
@@ -1169,7 +1247,7 @@ class CustomerProfile extends Component {
                             经理/上级面谈建议:
                             <Text className="titleTips">(由经理/上级口述,本人整理,20字以上)</Text>
                           </View>
-                          <View className="tbuttom">
+                          <View>
                             {dtails.interviewList.length ? (
                               <AtIcon value='clock' size='20' color='#1E90FF' onClick={() => this.openInteractHis('interviewRecommend')}></AtIcon>
                             ) : null}
@@ -1197,7 +1275,7 @@ class CustomerProfile extends Component {
                                 面谈后的反馈:
                                 <Text className="titleTips">(20字以上)</Text>
                               </View>
-                              <View className="tbuttom">
+                              <View>
                                 {dtails.interviewList.length ? (
                                   <AtIcon value='clock' size='20' color='#1E90FF' onClick={() => this.openInteractHis('interviewFeedback')}></AtIcon>
                                 ) : null}
@@ -1223,7 +1301,7 @@ class CustomerProfile extends Component {
                                 后续跟进计划:
                                 <Text className="titleTips">(20字以上)</Text>
                               </View>
-                              <View className="tbuttom">
+                              <View>
                                 {dtails.interviewList.length ? (
                                   <AtIcon value='clock' size='20' color='#1E90FF' onClick={() => this.openInteractHis('followUpPlan')}></AtIcon>
                                 ) : null}
@@ -1284,57 +1362,54 @@ class CustomerProfile extends Component {
                         </view>
                       </View>
 
-                      <View className="item">
+                      <View className="item flex">
                         <view className="item-title">母/子公司数:</view>
                         <view className="item-value">
-                          <AtInputNumber
+                          <AtInput
                             min={0}
-                            max={99999}
                             value={dtails.companyCount}
                             name='companyCount'
                             type='number'
                             placeholder='请输入数量'
                             size='mini'
                             onChange={value => {
-                              dtails.companyCount = value;
+                              dtails.companyCount = this.addCommas(value);
                               this.setState({ dtails })
                             }}
                           />
                         </view>
                       </View>
 
-                      <View className="item">
+                      <View className="item flex">
                         <view className="item-title">社保人数:</view>
                         <view className="item-value">
-                          <AtInputNumber
+                          <AtInput
                             min={0}
-                            max={99999}
                             value={dtails.socialSecurityCount}
                             name='socialSecurityCount'
                             type='number'
                             placeholder='请输入数量'
                             size='mini'
                             onChange={value => {
-                              dtails.socialSecurityCount = value;
+                              dtails.socialSecurityCount = this.addCommas(value);
                               this.setState({ dtails })
                             }}
                           />
                         </view>
                       </View>
 
-                      <View className="item">
+                      <View className="item flex">
                         <view className="item-title">对外投资控股的企业数:</view>
                         <view className="item-value">
-                          <AtInputNumber
+                          <AtInput
                             min={0}
-                            max={99999}
                             value={dtails.externalInvestCount}
                             name='externalInvestCount'
                             type='number'
                             placeholder='请输入数量'
                             size='mini'
                             onChange={value => {
-                              dtails.externalInvestCount = value;
+                              dtails.externalInvestCount = this.addCommas(value);
                               this.setState({ dtails })
                             }}
                           />
@@ -1420,15 +1495,28 @@ class CustomerProfile extends Component {
                         </View>
                         <View className="item-value">
                           {
-                            this.state.projectList.map(item => {
+                            this.state.projectingList.map(item => {
                               return <View style={{ display: 'flex', alignItems: 'center' }}>
                                 <Text style={{ fontSize: '30rpx' }} style={{ marginRight: '10rpx' }}>
                                   {this.renderProjectItemName(item)}
                                 </Text>
                                 <AtIcon value="close" size='15' color="#f00" onClick={() => { this.handleDelProject(item) }} />
+
+                               
                               </View>
                             })
                           }
+                          <View style={{color: "red", marginTop: '24rpx', fontWeight: 600}}>
+                            <Text>已面谈项目:</Text>
+                            {
+                              this.state.projectedList.map((item, idx) => {
+                                if (idx == this.state.projectedList.length - 1) {
+                                  return <Text>{this.renderProjectItemName(item)}</Text>
+                                }
+                                return <Text>{this.renderProjectItemName(item)}、</Text>
+                              })
+                            }
+                          </View>
                         </View>
                       </View>
 
@@ -1472,76 +1560,72 @@ class CustomerProfile extends Component {
                         </View>
 
                         <View className="tit" style={{ margin: '32rpx 0 20rpx;'}}>2.财务数据</View>
-                        <View className="item">
+                        <View className="item flex">
                           <View className="item-title">营收(万元):</View>
                           <View className="item-value">
-                            <AtInputNumber
+                            <AtInput
                               min={0}
-                              max={99999}
                               value={dtails.financialRevenue}
                               name='financialRevenue'
                               type='number'
                               placeholder='请输入数量'
                               size='mini'
                               onChange={value => {
-                                dtails.financialRevenue = value;
+                                dtails.financialRevenue = this.addCommas(value);
                                 this.setState({ dtails })
                               }}
                             />
                           </View>
                         </View>
 
-                        <View className="item">
+                        <View className="item flex">
                           <View className="item-title">税收(万元):</View>
                           <View className="item-value">
-                            <AtInputNumber
+                            <AtInput
                               min={0}
-                              max={99999}
                               value={dtails.financialTax}
                               name='financialTax'
                               type='number'
                               placeholder='请输入数量'
                               size='mini'
                               onChange={value => {
-                                dtails.financialTax = value;
+                                dtails.financialTax = this.addCommas(value);
                                 this.setState({ dtails })
                               }}
                             />
                           </View>
                         </View>
 
-                        <View className="item">
+                        <View className="item flex">
                           <View className="item-title">资产(万元):</View>
                           <View className="item-value">
-                            <AtInputNumber
+                            <AtInput
                               min={0}
-                              max={99999}
                               value={dtails.financialProperty}
                               name='financialProperty'
                               type='number'
                               placeholder='请输入数量'
                               size='mini'
                               onChange={value => {
-                                dtails.financialProperty = value;
+                                dtails.financialProperty = this.addCommas(value);
                                 this.setState({ dtails })
                               }}
                             />
                           </View>
                         </View>
                         
-                        <View className="item">
+                        <View className="item flex">
                           <View className="item-title">研发费用(万元):</View>
                           <View className="item-value">
-                            <AtInputNumber
+                            <AtInput
                               min={0}
-                              max={99999}
                               value={dtails.financialRd}
                               name='financialRd'
                               type='number'
                               placeholder='请输入数量'
                               size='mini'
                               onChange={value => {
-                                dtails.financialRd = value;
+                                dtails.financialRd = this.addCommas(value);
                                 this.setState({ dtails })
                               }}
                             />
@@ -1556,7 +1640,7 @@ class CustomerProfile extends Component {
                               客户的难处:
                               <Text className="titleTips">(20字以上)</Text>
                             </View>
-                            <View className="tbuttom">
+                            <View>
                               {dtails.interviewList.length ? (
                                 <AtIcon value='clock' size='20' color='#1E90FF' onClick={() => this.openInteractHis('earlyCommunication')}></AtIcon>
                               ) : null}
@@ -1582,7 +1666,7 @@ class CustomerProfile extends Component {
                               客户的需求:
                               <Text className="titleTips">(20字以上)</Text>
                             </View>
-                            <View className="tbuttom">
+                            <View>
                               {dtails.interviewList.length ? (
                                 <AtIcon value='clock' size='20' color='#1E90FF' onClick={() => this.openInteractHis('customerDemand')}></AtIcon>
                               ) : null}
@@ -1608,7 +1692,7 @@ class CustomerProfile extends Component {
                               面谈思路:
                               <Text className="titleTips">(20字以上)</Text>
                             </View>
-                            <View className="tbuttom">
+                            <View>
                               {dtails.interviewList.length ? (
                                 <AtIcon value='clock' size='20' color='#1E90FF' onClick={() => this.openInteractHis('interviewIdeas')}></AtIcon>
                               ) : null}
@@ -1634,7 +1718,7 @@ class CustomerProfile extends Component {
                               面谈达成的目的:
                               <Text className="titleTips">(20字以上)</Text>
                             </View>
-                            <View className="tbuttom">
+                            <View>
                               {dtails.interviewList.length ? (
                                 <AtIcon value='clock' size='20' color='#1E90FF' onClick={() => this.openInteractHis('interviewPurpose')}></AtIcon>
                               ) : null}
@@ -1660,7 +1744,7 @@ class CustomerProfile extends Component {
                               经理/上级面谈建议:
                               <Text className="titleTips">(由经理/上级口述,本人整理,20字以上)</Text>
                             </View>
-                            <View className="tbuttom">
+                            <View>
                               {dtails.interviewList.length ? (
                                 <AtIcon value='clock' size='20' color='#1E90FF' onClick={() => this.openInteractHis('interviewRecommend')}></AtIcon>
                               ) : null}
@@ -1688,7 +1772,7 @@ class CustomerProfile extends Component {
                                   面谈后的反馈:
                                   <Text className="titleTips">(20字以上)</Text>
                                 </View>
-                                <View className="tbuttom">
+                                <View>
                                   {dtails.interviewList.length ? (
                                     <AtIcon value='clock' size='20' color='#1E90FF' onClick={() => this.openInteractHis('interviewFeedback')}></AtIcon>
                                   ) : null}
@@ -1714,7 +1798,7 @@ class CustomerProfile extends Component {
                                   后续跟进计划:
                                   <Text className="titleTips">(20字以上)</Text>
                                 </View>
-                                <View className="tbuttom">
+                                <View>
                                   {dtails.interviewList.length ? (
                                     <AtIcon value='clock' size='20' color='#1E90FF' onClick={() => this.openInteractHis('followUpPlan')}></AtIcon>
                                   ) : null}
@@ -1908,23 +1992,25 @@ class CustomerProfile extends Component {
                 </View> : null}
 
 
-                {this.state.isOpened && <RadioGroup onChange={e => {
-                  let currProject = this.state.allProjectList.find(item => item.id == e.target.value);
-                  this.setState({
-                    checkOptions: [e.target.value],
-                    checkProject: [currProject]
-                  });
-                }}>
-                  {this.state.options.map((item, i) => {
-                    return (
-                      <View>
-                        <Label className='radio-list__label' for={i} key={i}>
-                          <Radio className='radio-list__radio' value={item.value} checked={this.state.checkOptions.indexOf(item.value) > -1}>{item.label}</Radio>
-                        </Label>
-                      </View>
-                    )
-                  })}
-                </RadioGroup>}
+                {this.state.isOpened && <View style={{height: '550rpx', overflow: 'auto'}}>
+                  <RadioGroup onChange={e => {
+                    let currProject = this.state.allProjectList.find(item => item.id == e.target.value);
+                    this.setState({
+                      checkOptions: [e.target.value],
+                      checkProject: [currProject]
+                    });
+                  }}>
+                    {this.state.options.map((item, i) => {
+                      return (
+                        <View>
+                          <Label className='radio-list__label' for={i} key={i}>
+                            <Radio className='radio-list__radio' value={item.value} checked={this.state.checkOptions.indexOf(item.value) > -1}>{item.label}</Radio>
+                          </Label>
+                        </View>
+                      )
+                    })}
+                  </RadioGroup>
+                </View>}
               </View>
             }
 

+ 22 - 13
src/pages/interview/index.less

@@ -111,15 +111,15 @@
         margin-bottom: 5px;
 
         .up {
-          // background: #70B603;
-          // color: #FFFFFF;
-          // padding: 10px 20px;
-          // font-size: 26px;
-          // border-radius: 8px;
-          // font-weight: 400;
+          background: #70B603;
+          color: #FFFFFF;
+          padding: 10px 20px;
+          font-size: 26px;
+          border-radius: 8px;
           font-weight: 400;
-          color: #3864ef;
-          font-size: 26rpx;
+          // font-weight: 400;
+          // color: #3864ef;
+          // font-size: 26rpx;
 
         }
 
@@ -252,8 +252,11 @@
   border-radius: 20px;
 
   .item {
-    padding-bottom: 30px;
-
+    padding-bottom: 16px;
+    &.flex {
+      display: flex;
+      align-items: center;
+    }
     &-title {
       display: flex;
       flex-flow: row nowrap;
@@ -283,9 +286,15 @@
       }
 
       .tbuttom {
-        position: absolute;
-        right: 0;
-        color: #3864ef;
+        background: #70B603;
+        color: #FFFFFF;
+        padding: 10px 20px;
+        font-size: 26px;
+        border-radius: 8px;
+        font-weight: 400;
+        // position: absolute;
+        // right: 0;
+        // color: #3864ef;
       }
     }
 

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

@@ -248,7 +248,7 @@ class CustomerProfile extends Component {
                     <View className="val">跟进说明:<Text className="t">{item.result}</Text></View>
                     <View className="val">公出时间:<Text className="t">{item.releaseStarts}</Text></View>
                     <View className="val">公出人:<Text className="t">{item.aname}</Text></View>
-                    <View className="val">公出目标:<Text className="t">{item.remarks}</Text></View>
+                    {/* <View className="val">公出目标:<Text className="t">{item.remarks}</Text></View>
                     <View className="val">公出计划:<Text className="t">{item.plan}</Text></View>
                     <View className="val">预计效果:<Text className="t">{item.expectedEffect}</Text></View>
                     <View className="tit">
@@ -291,7 +291,7 @@ class CustomerProfile extends Component {
                           }}
                         >填写</View>
                       }
-                    </View>
+                    </View> */}
                     <View className="val" style={{ fontWeight: 400 }}>{item.nextPlan || "无"}</View>
                   </View>
                 )