no message

src/assets/utils/commonUtils.js

@@ -24,7 +24,8 @@ var commonUtils = {
     el_Isdecimal: /^\d+(\.\d{0,2})?$/, //验证只能输入2位小数
     el_IsdecimalTrr: /^\d+(\.\d{0,8})?$/, //验证只能输入8位小数
     el_IsdecimalAll: /^[0-9]+([.]{1}[0-9]+){0,1}$/, //验证不限小数的
-    el_ISphone: /^((0\d{2,3}-\d{7,8})|(1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}))$/, //最新验证输入手机号 包括电话号码
+    // /^((0\d{2,3}-\d{7,8})|(1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}))$/
+    el_ISphone: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/, //最新验证输入手机号 包括电话号码  
     el_IsFax: /^[+]{0,1}(\d){1,3}[ ]?([-]?((\d)|[ ]){1,12})+$/, //验证传真号
     el_IsInventer: /^(\-|\+?)\d+(\.\d+)?$/, //可以输入带正负号整数
     el_IsIDnumber: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/, //验证身份证号

src/components/Hotel/reservation/HotelOrderList.vue

@@ -52,21 +52,30 @@
                   </el-select>
                 </span>
               </li>
+              <li>
+                <span>
+                  <em>{{$t('OrderList.search.roomType')}}</em>
+                  <el-select v-model="msg.RoomType" :placeholder="$t('OrderList.rooms.roomType')" class="w110 HworkInput">
+                    <el-option :key="0" :value="0" :label="$t('OrderList.rooms.default')"></el-option>
+                    <el-option v-for="item in roomType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
+                  </el-select>
+                </span>
+              </li>
               <li>
                 <span><em>{{$t('OrderList.search.orderNum')}}</em>
-                <el-input type="Number" v-model="msg.OrderNo" :placeholder="$t('OrderList.search.orderNum')" class="w200"/>
+                <el-input type="Number" v-model="msg.OrderNo" :placeholder="$t('OrderList.search.orderNum')" class="w110"/>
                 </span>
               </li>
               <li>
                 <span><em>订单ID</em>
-                <el-input type="Number" v-model="msg.OrderId" placeholder="订单ID" class="w200"/>
+                <el-input type="Number" v-model="msg.OrderId" placeholder="订单ID" class="w110"/>
                 </span>
               </li>
               <li>
                 <span>
                   <em>{{$t('hotel.hotel')}}</em>
                   <!-- multiple_input w300  multiple collapse-tags-->
-                  <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')"  style="height: 34px;"
+                  <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" class="w110"  style="height: 34px;"
                     filterable>
                     <el-option :key="0" :value="0" :label="$t('OrderList.search.allHotel')"></el-option>
                     <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
@@ -92,15 +101,7 @@
                 <el-input type="Number" v-model="msg.orderId" :placeholder="$t('OrderList.search.orderId')" class="w200"/>
                 </span>
               </li> -->
-              <li>
-                <span>
-                  <em>{{$t('OrderList.search.roomType')}}</em>
-                  <el-select v-model="msg.RoomType" :placeholder="$t('OrderList.rooms.roomType')" class="w110 HworkInput">
-                    <el-option :key="0" :value="0" :label="$t('OrderList.rooms.default')"></el-option>
-                    <el-option v-for="item in roomType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
-                  </el-select>
-                </span>
-              </li>
+              
               <!-- <li>
                 <span>
                   <em>{{$t('OrderList.search.orderType')}}</em>

src/components/Hotel/reservation/OrderList.vue

@@ -572,7 +572,7 @@
         </div>
         <div class="column px15 bgf5 radius5 flex-g pa relative">
           <div class="fz12">收款单据</div>
-          <div class="row wrap orderNo fz12 py c3FC4FF">
+          <div class="row wrap orderNo fz12 py">
             <span
             class="cursor-pointer radius5 mr px5" 
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
@@ -600,7 +600,7 @@
         </div>
         <div class="column px15 bgf5 radius5 ml flex-g pa relative">
           <div class="fz12">退款单据</div>
-          <div class="row wrap orderNo fz12 py c3FC4FF">
+          <div class="row wrap orderNo fz12 py">
             <span
             class="cursor-pointer radius5 mr px5" 
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
@@ -628,7 +628,7 @@
         </div>
         <div class="column px15 bgf5 radius5 ml flex-g pa relative">
           <div class="fz12">成本单据</div>
-          <div class="row wrap orderNo fz12 py c3FC4FF">
+          <div class="row wrap orderNo fz12 py">
             <span
             class="cursor-pointer radius5 mr px5" 
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
@@ -656,7 +656,7 @@
         </div>
         <div class="column px15 bgf5 radius5 ml flex-g pa relative">
           <div class="fz12">手配费单据</div>
-          <div class="row wrap orderNo fz12 py c3FC4FF">
+          <div class="row wrap orderNo fz12 py">
             <span
             class="cursor-pointer radius5 mr px5" 
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,

src/components/busManagement/BookAcar/components/orderList.vue

@@ -540,7 +540,7 @@
           <div class="row justify-sb mt mb20">
             <div class="column px15 bgf5 radius5 flex-g pa relative">
               <div class="fz12">收款单据</div>
-              <div class="row wrap orderNo fz12 py c3FC4FF">
+              <div class="row wrap orderNo fz12 py">
                 <span
                 class="cursor-pointer radius5 mr px5" 
                 :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
@@ -568,7 +568,7 @@
             </div>
             <div class="column px15 bgf5 radius5 ml flex-g pa relative">
               <div class="fz12">退款单据</div>
-              <div class="row wrap orderNo fz12 py c3FC4FF">
+              <div class="row wrap orderNo fz12 py">
                 <span
                 class="cursor-pointer radius5 mr px5" 
                 :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
@@ -596,7 +596,7 @@
             </div>
             <div class="column px15 bgf5 radius5 ml flex-g pa relative">
               <div class="fz12">成本单据</div>
-              <div class="row wrap orderNo fz12 py c3FC4FF">
+              <div class="row wrap orderNo fz12 py">
                 <span
                 class="cursor-pointer radius5 mr px5" 
                 :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,

src/components/scenicSpot/reservation/OrderList.vue

@@ -640,7 +640,7 @@
         </div>
         <div class="column px15 bgf5 radius5 ml flex-g pa relative">
           <div class="fz12">退款单据</div>
-          <div class="row wrap orderNo fz12 py c3FC4FF">
+          <div class="row wrap orderNo fz12 py">
             <span class="cursor-pointer radius5 mr px5" 
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
             'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.RefundList"
@@ -656,7 +656,7 @@
         </div>
         <div class="column px15 bgf5 radius5 ml flex-g pa relative">
           <div class="fz12">成本单据</div>
-          <div class="row wrap orderNo fz12 py c3FC4FF">
+          <div class="row wrap orderNo fz12 py">
             <span class="cursor-pointer radius5 mr px5" 
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
             'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.CostList"