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

src/components/CarDealerOrder/components/OrderList.vue

@@ -555,7 +555,7 @@
               </span>
             </div>
 
-            <div class="c9e fz12" v-if="chind.OrderType==2">
+            <div class="c9e fz12">
               <span>主{{ $t('OrderList.search.orderId') }}：</span>
               <span>{{ chind.MainId}}</span>
               <span class="copy cblack cursor-pointer" v-if="copyId != chind.MainId"
@@ -645,6 +645,11 @@
               <span class="fz15 fbold">{{ scope.row.PlatformMoney }}</span>
             </template>
           </el-table-column>
+          <el-table-column width="115" label="行驶公里" min-width="70" style="background:#EAEAEA">
+            <template slot-scope="scope">
+              <span class="fz15">{{ scope.row.RunKM }}</span>
+            </template>
+          </el-table-column>
           <el-table-column width="115" label="油费支出" min-width="70" style="background:#EAEAEA">
             <template slot-scope="scope">
               <span class="fz15 fbold">{{ scope.row.OutOilFee }}</span>
@@ -806,6 +811,11 @@
                 <span class="fz15 fbold">{{ scope.row.PlatformMoney }}</span>
               </template>
             </el-table-column>
+            <el-table-column width="115" label="行驶公里" min-width="70" style="background:#EAEAEA">
+              <template slot-scope="scope">
+                <span class="fz15">{{ scope.row.RunKM }}</span>
+              </template>
+            </el-table-column>
             <el-table-column width="115" label="油费支出" min-width="70" style="background:#EAEAEA">
               <template slot-scope="scope">
                 <span class="fz15 fbold">{{ scope.row.OutOilFee }}</span>

src/components/CarDealerOrder/components/ReservationOrder.vue

@@ -181,6 +181,18 @@
             @keyup.native="handleCurrentChange(1)" @change="handleCurrentChange(1)"/>
           </span>
         </li>
+        <li>
+          <span><em>系统团号</em>
+            <el-input clearable type="Number" v-model="msg.OrderTCNUM" placeholder="系统团号"
+            @keyup.native="handleCurrentChange(1)" @change="handleCurrentChange(1)"/>
+          </span>
+        </li>
+        <li>
+          <span><em>组团号</em>
+            <el-input clearable type="Number" v-model="msg.TCNUM" placeholder="系统团号"
+            @keyup.native="handleCurrentChange(1)" @change="handleCurrentChange(1)"/>
+          </span>
+        </li>
         <li>
           <span><em>{{$t('fnc.khmingcheng')}}</em>
             <el-select v-model="msg.CustomerId" filterable @change="handleCurrentChange(1)">
@@ -264,6 +276,7 @@ export default {
         OrderType: 0,
         MainId: null,
         OrderTCNUM: '',
+        TCNUM: '',
       },
       total: 0,
       currentPage: 1,