Bladeren bron

知识产权情况增加非空校验

dev01 1 maand geleden
bovenliggende
commit
ce012137a9
3 gewijzigde bestanden met toevoegingen van 44 en 6 verwijderingen
  1. 19 1
      src/pages/customerProfile/index.jsx
  2. 22 3
      src/pages/interview/index.jsx
  3. 3 2
      src/pages/interviewDetail/index.jsx

+ 19 - 1
src/pages/customerProfile/index.jsx

@@ -339,7 +339,7 @@ class CustomerProfile extends Component {
       // 渠道客户
       if (!params.channelType) {
         flag = false;
-        message = '请选择渠道性质';
+        message = '请选择渠道类别';
       } else if (!params.enterpriseCount) {
         flag = false;
         message = '请输入渠道所覆盖企业数';
@@ -375,6 +375,24 @@ class CustomerProfile extends Component {
       } else if (!Number(params.financialRd)) {
         message = '请输入研发费用,并且不能为0';
         flag = false;
+      } else if (params.inventionPatentCount === '' || params.inventionPatentCount === null || params.inventionPatentCount === undefined) {
+        message = '请输入知识产权发明专利数量';
+        flag = false;
+      } else if (params.utilityModelCount === '' || params.utilityModelCount === null || params.utilityModelCount === undefined) {
+        message = '请输入知识产权实用新型数量';
+        flag = false;
+      } else if (params.appearancePatentCount === '' || params.appearancePatentCount === null || params.appearancePatentCount === undefined) {
+        message = '请输入知识产权外观设计数量';
+        flag = false;
+      } else if (params.softwareWorksCount === '' || params.softwareWorksCount === null || params.softwareWorksCount === undefined) {
+        message = '请输入知识产权软著数量';
+        flag = false;
+      } else if (params.standard === '' || params.standard === null || params.standard === undefined) {
+        message = '请选择知识产权标准情况';
+        flag = false;
+      } else if (params.otherCount === '' || params.otherCount === null || params.otherCount === undefined) {
+        message = '请输入知识产权其他类型数量';
+        flag = false;
       }
     }
     return { flag, message };

+ 22 - 3
src/pages/interview/index.jsx

@@ -117,7 +117,7 @@ class CustomerProfile extends Component {
 
   componentDidUpdate(prevProps) {
     const { interviewIdx, customerList } = this.props;
-    if (interviewIdx != prevProps.interviewIdx && interviewIdx >= 0 && interviewIdx < customerList.length) {
+    if ((interviewIdx != prevProps.interviewIdx && interviewIdx >= 0 && interviewIdx < customerList.length)) {
       this.queryByUidAll();
       this.getProjectList();
     }
@@ -383,7 +383,7 @@ class CustomerProfile extends Component {
       // 渠道客户
       if (!params.channelType) {
         flag = false;
-        message = '请选择渠道性质';
+        message = '请选择渠道类别';
       } else if (!params.enterpriseCount) {
         flag = false;
         message = '请输入渠道所覆盖企业数';
@@ -408,6 +408,7 @@ class CustomerProfile extends Component {
         }
       }
     } else {
+      console.log(params.inventionPatentCount)
       if (!params.locationProvince) {
         message = '请选择企业所在地省市区';
         flag = false;
@@ -435,6 +436,24 @@ class CustomerProfile extends Component {
       } else if (!Number(params.financialRd)) {
         message = '请输入研发费用,并且不能为0';
         flag = false;
+      } else if (params.inventionPatentCount === '' || params.inventionPatentCount === null || params.inventionPatentCount === undefined) {
+        message = '请输入知识产权发明专利数量';
+        flag = false;
+      } else if (params.utilityModelCount === '' || params.utilityModelCount === null || params.utilityModelCount === undefined) {
+        message = '请输入知识产权实用新型数量';
+        flag = false;
+      } else if (params.appearancePatentCount === '' || params.appearancePatentCount === null || params.appearancePatentCount === undefined) {
+        message = '请输入知识产权外观设计数量';
+        flag = false;
+      } else if (params.softwareWorksCount === '' || params.softwareWorksCount === null || params.softwareWorksCount === undefined) {
+        message = '请输入知识产权软著数量';
+        flag = false;
+      } else if (params.standard === '' || params.standard === null || params.standard === undefined) {
+        message = '请选择知识产权标准情况';
+        flag = false;
+      } else if (params.otherCount === '' || params.otherCount === null || params.otherCount === undefined) {
+        message = '请输入知识产权其他类型数量';
+        flag = false;
       } else if (!params.earlyCommunication || (params.earlyCommunication && params.earlyCommunication.length < 20)) {
         message = '请输入客户的难处,并且在20字以上';
         flag = false;
@@ -1583,7 +1602,7 @@ class CustomerProfile extends Component {
                         <View className="tit" style={{ margin: '32rpx 0 20rpx;'}}>
                           <Text>
                             1.知识产权情况
-                                <Text className="txt">(专利信息、标准、专利、软著)</Text>
+                            <Text className="txt">(专利信息、标准、专利、软著)</Text>
                           </Text>
                           {
                             dtails.myUser == 1 &&

+ 3 - 2
src/pages/interviewDetail/index.jsx

@@ -737,11 +737,12 @@ class CustomerProfile extends Component {
     let uid = this.$instance.router.params.id;
     const params = { uid, pageNo: 1, pageSize: 9999 }
     queryProjectList(params).then(res => {
+      let urlPrdid = this.$instance.router.params.prdid;
       if (!res.error.length) {
         this.setState({
           projectList: res.data.list,
-          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)
+          projectingList: res.data.list.filter(item => item.prdid == urlPrdid),
+          projectedList: res.data.list.filter(item => item.prdid != urlPrdid)
         });
       }
     })