Merge branch 'feature/admin_optimize' of 47.111.118.107:wmtx/platform into feature/admin_optimize

Application/Admin/Controller/StatementMangementController.class.php

@@ -39,6 +39,9 @@ class StatementMangementController extends ThinkController
 
         if ($_REQUEST['company_id']) {
             $map['company_name'] = $_REQUEST['company_id'];
+            if ($_REQUEST['company_id']=='万盟天下科技') {
+                $map['company_name'] = '海南万盟天下科技有限公司';
+            }
         }
 
         $data = M("statement","tab_")

Application/Admin/View/StatementMangement/createDownstreamOrder.html

@@ -203,9 +203,9 @@
 
     var CHECK = {
       number: /^\d+(\.{1}\d+)?$/,
-      mobile:/^1[3456789]\d{9}$/,
-      BankNo:/^([1-9]{1})(\d{15}|\d{18})$/,
-      money:/((^[1-9]\d*)|^0)(\.\d{0,2}){0,1}$/
+      mobile: /^1[3456789]\d{9}$/,
+      BankNo: /^([1-9]{1})\d{10,19}$/,
+      money: /((^[1-9]\d*)|^0)(\.\d{0,2}){0,1}$/
     }
 
     var queryData = [];
@@ -592,8 +592,8 @@
         return;
       }
       var myreg = /^(((13[0-9]{1})|(14[0-9]{1})|(17[0]{1})|(15[0-3]{1})|(15[5-9]{1})|(18[0-9]{1}))+\d{8})$/;
-      if (!myreg.test(second_party_info['link_phone'])) {
-        layer.msg("乙方联系电话必须有效");
+      if (!second_party_info['link_phone']) {
+        layer.msg("乙方联系电话不能为空");
         return;
       }
       if (!second_party_info["bank_account"]) {
@@ -614,8 +614,8 @@
         return;
       }
 
-      if(!myreg.test(first_party_info['jfTel'])) {
-        layer.msg("甲方联系电话必须有效");
+      if(!first_party_info['jfTel']) {
+        layer.msg("甲方联系电话不能为空");
         return;
       }