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

src/components/Complaints/ComplaintsManage.vue

@@ -53,7 +53,7 @@
         <li>
           <span>
             <em>投诉编号</em>
-            <el-input placeholder="" v-model="queryMsg.ID"></el-input>
+            <el-input placeholder="" v-model="queryMsg.ID" @keyup.native="checkInteger(queryMsg,'ID')"></el-input>
           </span>
         </li>
         <li>
@@ -80,13 +80,13 @@
         <li>
           <span>
             <em>团队编号</em>
-            <el-input placeholder="" v-model="queryMsg.TCID"></el-input>
+            <el-input placeholder="" v-model="queryMsg.TCID"  @keyup.native="checkInteger(queryMsg,'TCID')" ></el-input>
           </span>
         </li>
         <li>
           <span>
             <em>订单号</em>
-            <el-input placeholder="" v-model="queryMsg.OrderID"></el-input>
+            <el-input placeholder="" v-model="queryMsg.OrderID" @keyup.native="checkInteger(queryMsg,'OrderID')"></el-input>
           </span>
         </li>
         <li>

src/components/Hotel/HotelProductManage2.vue

@@ -279,6 +279,7 @@
                 <el-option label="请选择" :value='0'></el-option>
                 <el-option :key="1" label="税入R0" :value="1"></el-option>
                 <el-option :key="2" label="税别R10" :value="2"></el-option>
+                <el-option :key="3" label="税别R0" :value="3"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -525,6 +526,7 @@
                 <el-option label="请选择" :value='0'></el-option>
                 <el-option :key="1" label="税入R0" :value="1"></el-option>
                 <el-option :key="2" label="税别R10" :value="2"></el-option>
+                <el-option :key="3" label="税别R0" :value="3"></el-option>
               </el-select>
             </el-form-item>
           </el-col>