Просмотр исходного кода

1、公出模块调整;2、公出情况增加审核信息

dev01 1 день назад
Родитель
Сommit
c5978f8998

+ 4 - 2
src/pages/applyDepart/publicContent.jsx

@@ -686,7 +686,8 @@ class PublicContent extends Component {
                         reason: v,
                     });
                     }}
-                    maxLength={200}
+                    count={false}
+                    maxLength={1000}
                     placeholder={
                     this.props.enterpriseInfor.type == 2
                         ? "详细说明本次公出的内容,预计完成的内容"
@@ -713,7 +714,8 @@ class PublicContent extends Component {
                       plan: v,
                     });
                   }}
-                  maxLength={200}
+                  count={false}
+                  maxLength={1000}
                   placeholder="本次公出准备工作"
                 />
               </View>

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

@@ -764,7 +764,8 @@ class EgressDetails extends Component {
                       opinion: value,
                     });
                   }}
-                  // maxLength={20}
+                  count={false}
+                  maxLength={1000}
                   placeholder="请填写审批意见"
                 />
                 <View className="operation">

+ 22 - 22
src/pages/interview/myUser.jsx

@@ -1304,9 +1304,9 @@ class CustomerProfile extends Component {
                         <View className="item-value">
                           <AtTextarea
                             value={dtails.interviewIdeas}
-                            maxLength={200}
                             placeholder='请编写本次面谈客户思路~'
-                            height={70}
+                            count={false}
+                            maxLength={1000}
                             onChange={value => {
                               dtails.interviewIdeas = value;
                               this.setState({ dtails });
@@ -1330,9 +1330,9 @@ class CustomerProfile extends Component {
                         <View className="item-value">
                           <AtTextarea
                             value={dtails.interviewPurpose}
-                            maxLength={200}
                             placeholder='请编写本次面谈达成的目的~'
-                            height={70}
+                            count={false}
+                            maxLength={1000}
                             onChange={value => {
                               dtails.interviewPurpose = value;
                               this.setState({ dtails });
@@ -1358,9 +1358,9 @@ class CustomerProfile extends Component {
                             <View className="item-value">
                               <AtTextarea
                                 value={dtails.interviewFeedback}
-                                maxLength={200}
                                 placeholder='请编写本次面谈后的反馈~'
-                                height={70}
+                                count={false}
+                                maxLength={1000}
                                 onChange={value => {
                                   dtails.interviewFeedback = value;
                                   this.setState({ dtails });
@@ -1384,9 +1384,9 @@ class CustomerProfile extends Component {
                             <View className="item-value">
                               <AtTextarea
                                 value={dtails.followUpPlan}
-                                maxLength={200}
                                 placeholder='请编写后续跟进计划~'
-                                height={70}
+                                count={false}
+                                maxLength={1000}
                                 onChange={value => {
                                   dtails.followUpPlan = value;
                                   this.setState({ dtails });
@@ -1758,9 +1758,9 @@ class CustomerProfile extends Component {
                           <View className="item-value">
                             <AtTextarea
                               value={dtails.earlyCommunication}
-                              maxLength={200}
                               placeholder='请编写本次面谈客户难处~'
-                              height={70}
+                              count={false}
+                              maxLength={1000}
                               onChange={value => {
                                 dtails.earlyCommunication = value;
                                 this.setState({ dtails });
@@ -1784,9 +1784,9 @@ class CustomerProfile extends Component {
                           <View className="item-value">
                             <AtTextarea
                               value={dtails.customerDemand}
-                              maxLength={200}
                               placeholder='请编写本次面谈客户需求~'
-                              height={70}
+                              count={false}
+                              maxLength={1000}
                               onChange={value => {
                                 dtails.customerDemand = value;
                                 this.setState({ dtails });
@@ -1810,9 +1810,9 @@ class CustomerProfile extends Component {
                           <View className="item-value">
                             <AtTextarea
                               value={dtails.interviewIdeas}
-                              maxLength={200}
                               placeholder='请编写本次面谈客户思路~'
-                              height={70}
+                              count={false}
+                              maxLength={1000}
                               onChange={value => {
                                 dtails.interviewIdeas = value;
                                 this.setState({ dtails });
@@ -1836,9 +1836,9 @@ class CustomerProfile extends Component {
                           <View className="item-value">
                             <AtTextarea
                               value={dtails.interviewPurpose}
-                              maxLength={200}
                               placeholder='请编写本次面谈达成的目的~'
-                              height={70}
+                              count={false}
+                              maxLength={1000}
                               onChange={value => {
                                 dtails.interviewPurpose = value;
                                 this.setState({ dtails });
@@ -1862,9 +1862,9 @@ class CustomerProfile extends Component {
                           <View className="item-value">
                             <AtTextarea
                               value={dtails.interviewRecommend}
-                              maxLength={500}
                               placeholder='请编写本次面谈建议~'
-                              height={70}
+                              count={false}
+                              maxLength={1000}
                               onChange={value => {
                                 dtails.interviewRecommend = value;
                                 this.setState({ dtails });
@@ -1890,9 +1890,9 @@ class CustomerProfile extends Component {
                               <View className="item-value">
                                 <AtTextarea
                                   value={dtails.interviewFeedback}
-                                  maxLength={200}
                                   placeholder='请编写本次面谈后的反馈~'
-                                  height={70}
+                                  count={false}
+                                  maxLength={1000}
                                   onChange={value => {
                                     dtails.interviewFeedback = value;
                                     this.setState({ dtails });
@@ -1916,9 +1916,9 @@ class CustomerProfile extends Component {
                               <View className="item-value">
                                 <AtTextarea
                                   value={dtails.followUpPlan}
-                                  maxLength={200}
                                   placeholder='请编写后续跟进计划~'
-                                  height={70}
+                                  count={false}
+                                  maxLength={1000}
                                   onChange={value => {
                                     dtails.followUpPlan = value;
                                     this.setState({ dtails });

+ 18 - 18
src/pages/interview/otherUser.jsx

@@ -109,7 +109,7 @@ class CustomerOtherProfile extends Component {
           customerDemand = list[list.length - 1].customerDemand;
           interviewIdeas = list[list.length - 1].interviewIdeas;
           interviewPurpose = list[list.length - 1].interviewPurpose;
-          interviewRecommend = list[list.length - 1].earlyCommunication;
+          interviewRecommend = list[list.length - 1].interviewRecommend;
           interviewFeedback = list[list.length - 1].interviewFeedback;
           followUpPlan = list[list.length - 1].followUpPlan;
         }
@@ -172,10 +172,10 @@ class CustomerOtherProfile extends Component {
     let flag = true;
     let message = '';
 
-    if (dtails.myUser === 1 && !params.earlyCommunication || (params.earlyCommunication && params.earlyCommunication.length < 20)) {
+    if (dtails.newChannel === 0 && !params.earlyCommunication || (params.earlyCommunication && params.earlyCommunication.length < 20)) {
       message = '请输入客户的难处,并且在20字以上';
       flag = false;
-    } else if (dtails.myUser === 1 && !params.customerDemand || (params.customerDemand && params.customerDemand.length < 20)) {
+    } else if (dtails.newChannel === 0 && !params.customerDemand || (params.customerDemand && params.customerDemand.length < 20)) {
       message = '请输入客户的需求,并且在20字以上';
       flag = false;
     } else if (!params.interviewIdeas || (params.interviewIdeas && params.interviewIdeas.length < 20)) {
@@ -184,7 +184,7 @@ class CustomerOtherProfile extends Component {
     } else if (!params.interviewPurpose || (params.interviewPurpose && params.interviewPurpose.length < 20)) {
       message = '请输入面谈达成的目的,并且在20字以上';
       flag = false;
-    } else if (dtails.myUser === 1 && !params.interviewRecommend || (params.interviewRecommend && params.interviewRecommend.length < 20)) {
+    } else if (dtails.newChannel === 0 && !params.interviewRecommend || (params.interviewRecommend && params.interviewRecommend.length < 20)) {
       message = '请输入经理/上级面谈建议,并且在20字以上';
       flag = false;
     } else {
@@ -376,9 +376,9 @@ class CustomerOtherProfile extends Component {
                     <View className="item-value">
                       <AtTextarea
                         value={dtails.earlyCommunication || ''}
-                        maxLength={200}
                         placeholder='请编写本次面谈客户难处~'
-                        height={70}
+                        count={false}
+                        maxLength={1000}
                         onChange={value => {
                           dtails.earlyCommunication = value;
                           this.setState({ dtails });
@@ -402,9 +402,9 @@ class CustomerOtherProfile extends Component {
                     <View className="item-value">
                       <AtTextarea
                         value={dtails.customerDemand || ''}
-                        maxLength={200}
                         placeholder='请编写本次面谈客户需求~'
-                        height={70}
+                        count={false}
+                        maxLength={1000}
                         onChange={value => {
                           dtails.customerDemand = value;
                           this.setState({ dtails });
@@ -431,9 +431,9 @@ class CustomerOtherProfile extends Component {
                 <View className="item-value">
                   <AtTextarea
                     value={dtails.interviewIdeas || ''}
-                    maxLength={200}
                     placeholder='请编写本次面谈客户思路~'
-                    height={70}
+                    count={false}
+                    maxLength={1000}
                     onChange={value => {
                       dtails.interviewIdeas = value;
                       this.setState({ dtails });
@@ -457,9 +457,9 @@ class CustomerOtherProfile extends Component {
                 <View className="item-value">
                   <AtTextarea
                     value={dtails.interviewPurpose || ''}
-                    maxLength={200}
                     placeholder='请编写本次面谈达成的目的~'
-                    height={70}
+                    count={false}
+                    maxLength={1000}
                     onChange={value => {
                       dtails.interviewPurpose = value;
                       this.setState({ dtails });
@@ -484,9 +484,9 @@ class CustomerOtherProfile extends Component {
                   <View className="item-value">
                     <AtTextarea
                       value={dtails.interviewRecommend || ''}
-                      maxLength={500}
                       placeholder='请编写本次面谈建议~'
-                      height={70}
+                      count={false}
+                      maxLength={1000}
                       onChange={value => {
                         dtails.interviewRecommend = value;
                         this.setState({ dtails });
@@ -513,9 +513,9 @@ class CustomerOtherProfile extends Component {
                     <View className="item-value">
                       <AtTextarea
                         value={dtails.interviewFeedback || ''}
-                        maxLength={200}
                         placeholder='请编写本次面谈后的反馈~'
-                        height={70}
+                        count={false}
+                        maxLength={1000}
                         onChange={value => {
                           dtails.interviewFeedback = value;
                           this.setState({ dtails });
@@ -539,9 +539,9 @@ class CustomerOtherProfile extends Component {
                     <View className="item-value">
                       <AtTextarea
                         value={dtails.followUpPlan || ''}
-                        maxLength={200}
                         placeholder='请编写后续跟进计划~'
-                        height={70}
+                        count={false}
+                        maxLength={1000}
                         onChange={value => {
                           dtails.followUpPlan = value;
                           this.setState({ dtails });

+ 28 - 30
src/pages/interviewDetail/index.jsx

@@ -1214,9 +1214,9 @@ class CustomerProfile extends Component {
                         <View className="item-value">
                           <AtTextarea
                             value={dtails.interviewIdeas || ''}
-                            maxLength={200}
                             placeholder='~'
-                            height={70}
+                            count={false}
+                            maxLength={1000}
                             onChange={value => {
                               dtails.interviewIdeas = value;
                               this.setState({ dtails });
@@ -1241,9 +1241,9 @@ class CustomerProfile extends Component {
                         <View className="item-value">
                           <AtTextarea
                             value={dtails.interviewPurpose || ''}
-                            maxLength={200}
                             placeholder='~'
-                            height={70}
+                            count={false}
+                            maxLength={1000}
                             onChange={value => {
                               dtails.interviewPurpose = value;
                               this.setState({ dtails });
@@ -1270,9 +1270,9 @@ class CustomerProfile extends Component {
                             <View className="item-value">
                               <AtTextarea
                                 value={dtails.interviewFeedback || ''}
-                                maxLength={200}
                                 placeholder='~'
-                                height={70}
+                                count={false}
+                                maxLength={1000}
                                 onChange={value => {
                                   dtails.interviewFeedback = value;
                                   this.setState({ dtails });
@@ -1297,9 +1297,9 @@ class CustomerProfile extends Component {
                             <View className="item-value">
                               <AtTextarea
                                 value={dtails.followUpPlan || ''}
-                                maxLength={200}
                                 placeholder='~'
-                                height={70}
+                                count={false}
+                                maxLength={1000}
                                 onChange={value => {
                                   dtails.followUpPlan = value;
                                   this.setState({ dtails });
@@ -1619,9 +1619,9 @@ class CustomerProfile extends Component {
                           <View className="item-value">
                             <AtTextarea
                               value={dtails.earlyCommunication || ''}
-                              maxLength={200}
                               placeholder='~'
-                              height={70}
+                              count={false}
+                              maxLength={1000}
                               onChange={value => {
                                 dtails.earlyCommunication = value;
                                 this.setState({ dtails });
@@ -1646,9 +1646,9 @@ class CustomerProfile extends Component {
                           <View className="item-value">
                             <AtTextarea
                               value={dtails.customerDemand || ''}
-                              maxLength={200}
                               placeholder='~'
-                              height={70}
+                              count={false}
+                              maxLength={1000}
                               onChange={value => {
                                 dtails.customerDemand = value;
                                 this.setState({ dtails });
@@ -1673,9 +1673,9 @@ class CustomerProfile extends Component {
                           <View className="item-value">
                             <AtTextarea
                               value={dtails.interviewIdeas || ''}
-                              maxLength={200}
                               placeholder='~'
-                              height={70}
+                              count={false}
+                              maxLength={1000}
                               onChange={value => {
                                 dtails.interviewIdeas = value;
                                 this.setState({ dtails });
@@ -1700,9 +1700,9 @@ class CustomerProfile extends Component {
                           <View className="item-value">
                             <AtTextarea
                               value={dtails.interviewPurpose || ''}
-                              maxLength={200}
                               placeholder='~'
-                              height={70}
+                              count={false}
+                              maxLength={1000}
                               onChange={value => {
                                 dtails.interviewPurpose = value;
                                 this.setState({ dtails });
@@ -1727,9 +1727,9 @@ class CustomerProfile extends Component {
                           <View className="item-value">
                             <AtTextarea
                               value={dtails.interviewRecommend || ''}
-                              maxLength={500}
                               placeholder='~'
-                              height={70}
+                              count={false}
+                              maxLength={1000}
                               onChange={value => {
                                 dtails.interviewRecommend = value;
                                 this.setState({ dtails });
@@ -1756,9 +1756,9 @@ class CustomerProfile extends Component {
                               <View className="item-value">
                                 <AtTextarea
                                   value={dtails.interviewFeedback || ''}
-                                  maxLength={200}
                                   placeholder='~'
-                                  height={70}
+                                  count={false}
+                                  maxLength={1000}
                                   onChange={value => {
                                     dtails.interviewFeedback = value;
                                     this.setState({ dtails });
@@ -1783,9 +1783,9 @@ class CustomerProfile extends Component {
                               <View className="item-value">
                                 <AtTextarea
                                   value={dtails.followUpPlan || ''}
-                                  maxLength={200}
                                   placeholder='~'
-                                  height={70}
+                                  count={false}
+                                  maxLength={1000}
                                   onChange={value => {
                                     dtails.followUpPlan = value;
                                     this.setState({ dtails });
@@ -1808,7 +1808,7 @@ class CustomerProfile extends Component {
             )}
         </View>
 
-        <AtModal
+        {/* <AtModal
           isOpened={this.state.isOpened}
           onClose={() => {
             this.setState({
@@ -1928,7 +1928,6 @@ class CustomerProfile extends Component {
                   cursor={-1}
                 />
 
-                {/* 高新项目 */}
                 {this.state.checkProject.length && this.state.checkProject[0].cSort == 9 ? <View style={{ backgroundColor: '#eee', padding: '20rpx 24rpx', margin: '24rpx' }}>
                   <RadioGroup onChange={e => {
                     const { info } = this.state;
@@ -1948,7 +1947,6 @@ class CustomerProfile extends Component {
                   </View>}
                 </View> : null}
 
-                {/* 会员项目 */}
                 {this.state.checkProject.length && this.state.checkProject[0].cSort == 6 ? <View style={{ backgroundColor: '#eee', padding: '20rpx 24rpx', margin: '24rpx' }}>
                   <RadioGroup onChange={e => {
                     const { info } = this.state;
@@ -2002,9 +2000,9 @@ class CustomerProfile extends Component {
             }}>取消</Button>
             <Button type='primary' onClick={this.update}>确定修改</Button>
           </AtModalAction>
-        </AtModal>
+        </AtModal> */}
 
-        <AtModal
+        {/* <AtModal
           isOpened={this.state.isAdd}
           onClose={() => {
             this.setState({
@@ -2109,10 +2107,10 @@ class CustomerProfile extends Component {
               }}>取消</Button>
             <Button type='primary' onClick={this.add}>保存</Button>
           </AtModalAction>
-        </AtModal>
+        </AtModal> */}
 
         {/* 新增项目 */}
-        <AtModal
+        {/* <AtModal
           isOpened={this.state.addItemShow}
           onClose={this.handleCloseAddItemDialog}
         >
@@ -2132,7 +2130,7 @@ class CustomerProfile extends Component {
             <Button type='secondary' onClick={this.handleCloseAddItemDialog}>取消</Button>
             <Button type='primary' onClick={this.handleAddItemSave}>保存</Button>
           </AtModalAction>
-        </AtModal>
+        </AtModal> */}
 
         {/* 多选框 */}
         <CheckboxPicker

+ 33 - 0
src/pages/situation/approve-list.jsx

@@ -0,0 +1,33 @@
+import React, { Component } from "react";
+import { View } from "@tarojs/components";
+
+const formatStatus = status => {
+  const STATUS_ENUM = {
+    0: '驳回',
+    1: '发起',
+    2: '同意',
+    3: '打卡',
+    4: '撤销',
+    5: '修改'
+  }
+  return STATUS_ENUM[status] || '-'
+}
+
+const renderApproveItem = data => {
+  return data.map(item => {
+    return <View className='approve-list-item' style={{ marginBottom: '8rpx' }}>{`${item.aname},${formatStatus(item.status)},${item.remarks}`}</View>
+  })
+}
+
+const ApproveList = props => {
+  return (
+    <View className='approve-wrap' style={{ color: '#1E90FF', fontSize: '26rpx', fontWeight: 500 }}>
+      <View className='label' style={{ margin: '16rpx 0 8rpx', fontWeight: 600 }}>公出审核:</View>
+      <View className='approve-list'>
+        {renderApproveItem(props.data || [])}
+      </View>
+    </View>
+  )
+}
+
+export default ApproveList

+ 6 - 0
src/pages/situation/index.jsx

@@ -22,6 +22,7 @@ import "taro-ui/dist/style/components/modal.scss";
 import MessageNoticebar from "../../components/common/messageNoticebar";
 import { getContactType } from "../../utils/tools";
 import Superior from "../../components/common/superior";
+import ApproveList from './approve-list'
 
 class CustomerProfile extends Component {
   $instance = getCurrentInstance();
@@ -293,9 +294,14 @@ class CustomerProfile extends Component {
                       }
                     </View> */}
                     <View className="val" style={{ fontWeight: 400 }}>{item.nextPlan || "无"}</View>
+
+                    <View className="val">
+                      <ApproveList data={item.logList}></ApproveList>
+                    </View>
                   </View>
                 )
               }
+              
             </View>
           )}
         </View>