瀏覽代碼

单位客户查询和公共客户查询领取逻辑更改

dev01 2 月之前
父節點
當前提交
61e9783d59

+ 9 - 10
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -358,14 +358,14 @@ const QueryCustomer = React.createClass({
         this.setState({
           loading: false,
           verification: true,
-
+          verificationMyUser: e.myUser,
           id: obj.id,
           name: obj.name,
           orgCode: obj.orgCode,
           ProvinceCity: [obj.province, obj.city, obj.area],
-          content: e.myUser == 1 ? obj.contacts : '',
+          // content: e.myUser == 1 ? obj.contacts : '',
           position: obj.position,
-          telnum: e.myUser == 1 ? obj.contactMobile : '',
+          // telnum: e.myUser == 1 ? obj.contactMobile : '',
           businessScope: !!obj.businessScope ? obj.businessScope.split(',') : [],
           selectCooperationProjects: selectCooperationProjects,
           level: obj.level,
@@ -519,11 +519,10 @@ const QueryCustomer = React.createClass({
         message.warning('请输入正确的统一社会信用代码!')
         return
       }
-      if (/.*[\u4e00-\u9fa5]+.*$/.test(values.content)) {
-      } else {
+      if (!!values.content && !/.*[\u4e00-\u9fa5]+.*$/.test(values.content)) {
         message.error("请填写正确的联系人,且至少包含一个汉字");
         return false;
-      };
+      }
       if (/.*[\u4e00-\u9fa5]+.*$/.test(values.position)) {
       } else {
         message.error("请填写正确的职位,且至少包含一个汉字");
@@ -533,11 +532,11 @@ const QueryCustomer = React.createClass({
         message.warning('请选择地区');
         return false;
       };
-      if (values.content.length > 32) {
+      if (!!values.content && values.content.length > 32) {
         message.warning('联系人字数不超过32个')
         return false;
       };
-      if (values.length > 13) {
+      if (!!values.telnum && values.telnum.length > 13) {
         message.warning('电话号码字数不超过13个')
         return false;
       };
@@ -808,7 +807,7 @@ const QueryCustomer = React.createClass({
                         {...formItemLayout}
                         label="联系人" >
                         {getFieldDecorator('content', {
-                          rules: [{ required: true, message: '此项为必填项!' }],
+                          rules: [{ required: this.state.verificationMyUser != 1, message: '此项为必填项!' }],
                           initialValue: this.state.content
                         })(
                           <Input placeholder="联系人姓名" />
@@ -832,7 +831,7 @@ const QueryCustomer = React.createClass({
                         {...formItemLayout}
                         label="联系电话" >
                         {getFieldDecorator('telnum', {
-                          rules: [{ required: true, message: '此项为必填项!' }],
+                          rules: [{ required: this.state.verificationMyUser != 1, message: '此项为必填项!' }],
                           initialValue: this.state.telnum
                         })(
                           <Input placeholder="请填写手机号,仅填座机号时,请后续补充手机号" />

+ 9 - 10
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -469,14 +469,14 @@ const QueryCustomer = React.createClass({
         this.setState({
           loading: false,
           verification: true,
-
+          verificationMyUser: e.myUser,
           id: obj.id,
           name: obj.name,
           orgCode: obj.orgCode,
           ProvinceCity: [obj.province, obj.city, obj.area],
-          content: e.myUser == 1 ? obj.contacts : '',
+          // content: e.myUser == 1 ? obj.contacts : '',
           position: obj.position,
-          telnum: e.myUser == 1 ? obj.contactMobile : '',
+          // telnum: e.myUser == 1 ? obj.contactMobile : '',
           businessScope: !!obj.businessScope ? obj.businessScope.split(',') : [],
           selectCooperationProjects: selectCooperationProjects,
           level: obj.level,
@@ -515,11 +515,10 @@ const QueryCustomer = React.createClass({
         message.warning('请输入正确的统一社会信用代码!')
         return
       }
-      if (/.*[\u4e00-\u9fa5]+.*$/.test(values.content)) {
-      } else {
+      if (!!values.content && !/.*[\u4e00-\u9fa5]+.*$/.test(values.content)) {
         message.error("请填写正确的联系人,且至少包含一个汉字");
         return false;
-      };
+      }
       if (/.*[\u4e00-\u9fa5]+.*$/.test(values.position)) {
       } else {
         message.error("请填写正确的职位,且至少包含一个汉字");
@@ -529,11 +528,11 @@ const QueryCustomer = React.createClass({
         message.warning('请选择地区');
         return false;
       };
-      if (values.content.length > 32) {
+      if (!!values.content && values.content.length > 32) {
         message.warning('联系人字数不超过32个')
         return false;
       };
-      if (values.length > 13) {
+      if (!!values.telnum && values.telnum.length > 13) {
         message.warning('电话号码字数不超过13个')
         return false;
       };
@@ -985,7 +984,7 @@ const QueryCustomer = React.createClass({
                         {...formItemLayout}
                         label="联系人" >
                         {getFieldDecorator('content', {
-                          rules: [{ required: true, message: '此项为必填项!' }],
+                          rules: [{ required: this.state.verificationMyUser != 1, message: '此项为必填项!' }],
                           initialValue: this.state.content
                         })(
                           <Input placeholder="联系人姓名" />
@@ -1009,7 +1008,7 @@ const QueryCustomer = React.createClass({
                         {...formItemLayout}
                         label="联系电话" >
                         {getFieldDecorator('telnum', {
-                          rules: [{ required: true, message: '此项为必填项!' }],
+                          rules: [{ required: this.state.verificationMyUser != 1, message: '此项为必填项!' }],
                           initialValue: this.state.telnum
                         })(
                           <Input placeholder="请填写手机号,仅填座机号时,请后续补充手机号" />