Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/components/SamePayment.vue

@@ -29,7 +29,8 @@
               <table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
                 <tr>
                     <th>单号</th>
-                    <th width="300px">付款对象</th>
+                    <th>公司</th>
+                    <th width="250px">付款对象</th>
                     <th>原币</th>
                     <th>本位币</th>
                     <th>状态</th>
@@ -38,7 +39,10 @@
                 <tr class="_color_b" v-for="(item,index) in DataList" :key="index">
                     <td class="hover_text" @click="goDetail(item.FrID)" ><span>{{item.FrID}}</span></td>
                     <td>
-                      <div style="width: 300px;">
+                      {{item.BranchName}}
+                    </td>
+                    <td>
+                      <div style="width: 250px;">
                         {{item.RemitterName}}
                       </div>
                     </td>

src/components/SalesModule/groupTourOrderByTuanOne.vue

@@ -2535,10 +2535,10 @@
               message: '请输入联系人电话',
               trigger: 'blur'
             },
-            {
-              pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
-              message: '请输入正确的手机'
-            }
+            // {
+            //   pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
+            //   message: '请输入正确的手机'
+            // }
           ],
           GatherAddress: [{
             required: true,

src/components/SalesModule/groupTourOrderOne.vue

@@ -2091,10 +2091,10 @@
               message: '请输入联系人电话',
               trigger: 'blur'
             },
-            {
-              pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
-              message: '请输入正确的手机'
-            }
+            // {
+            //   pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
+            //   message: '请输入正确的手机'
+            // }
           ],
           GatherAddress: [{
             required: true,

src/components/orderCommon/order-form2.vue

@@ -793,10 +793,10 @@
               message: "请输入联系人电话",
               trigger: "blur",
             },
-            {
-              pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
-              message: "请输入正确的手机",
-            },
+            // {
+            //   pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
+            //   message: "请输入正确的手机",
+            // },
           ],
           SurName: [{
             required: true,
@@ -833,10 +833,10 @@
               message: "请输入联系人电话",
               trigger: "blur",
             },
-            {
-              pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
-              message: "请输入正确的手机",
-            },
+            // {
+            //   pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
+            //   message: "请输入正确的手机",
+            // },
           ],
           GatherAddress: [{
             required: true,