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

src/assets/common/lang/zhTW/fill.js

@@ -1012,7 +1012,7 @@ export const obj = {
     t1: '車/使用時間/天數',
     t2: '用車詳情',
     t3: '總金額',
-    t4: '代收金額',
+    t4: '待收金額',
     t5: '實收',
     t6: '退款',
     t7: '平台在途金額',

src/components/CarDealerOrder/components/ReservationOrder.vue

@@ -160,16 +160,25 @@
             </el-select>
           </span>
         </li>
-        <!-- <li>
+        <li>
+          <span>
+            <em>订单类型</em>
+            <el-select v-model="msg.OrderType" @change="handleCurrentChange(1)">
+              <el-option :key="0" :value="0" label="不限"></el-option>
+              <el-option v-for="item in orderType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
           <span><em>主{{ $t('OrderList.search.orderId') }}</em>
             <el-input clearable type="Number" v-model="msg.MainId" :placeholder="$t('objFill.orderid')"
-            @keyup.native="handleCurrentChange(1)"/>
+            @keyup.native="handleCurrentChange(1)" @change="handleCurrentChange(1)"/>
           </span>
-        </li> -->
+        </li>
         <li>
           <span><em>{{ $t('OrderList.search.orderId') }}</em>
             <el-input clearable type="Number" v-model="msg.OrderId" :placeholder="$t('objFill.orderid')"
-            @keyup.native="handleCurrentChange(1)"/>
+            @keyup.native="handleCurrentChange(1)" @change="handleCurrentChange(1)"/>
           </span>
         </li>
         <li>
@@ -252,6 +261,7 @@ export default {
         IsFinish: -1,
         Sort: 1,
         OrderId: null,
+        OrderType: 0,
         MainId: null,
         OrderTCNUM: '',
       },
@@ -262,8 +272,8 @@ export default {
         { Name: this.$t('OrderList.orderStatus.cancel'), ID: '2' },
       ],
       orderType: [
-        { Name: this.$t('OrderList.orderType.tour'), ID: '1' },
-        { Name: this.$t('OrderList.orderType.guest'), ID: '2' },
+        { Name: '常规', ID: '1' },
+        { Name: '包车', ID: '2' },
       ],
       Datelist: '',
       DatelistUse: '',