车订单 bug

src/components/CarDealerOrder/components/OrderList.vue

@@ -582,9 +582,11 @@
             <el-table :data="[scope.row]" style="width:100%" border>
               <el-table-column :label="$t('objFill.caravanshopcol.t1')" min-width="100" style="background:#EAEAEA">
                 <template slot-scope="scopes">
-                  <div>{{scope.row.CarModel.CarName+'/'+scope.row.CarModel.CarNo }}</div>
-                  <span style="color: #999999;">{{ scope.row.UseDate }}</span>
-                  <span style="color: #999999;">{{ scope.row.UseDay }}</span>
+                  <div v-if="scope.row.CarModel">
+                    {{ scope.row.CarModel.CarName+'/'+scope.row.CarModel.CarNo }}
+                  </div>
+                  <span style="color: #999999;">{{ scope.row.UseDateStr }}</span>
+                  <span style="color: #999999;">/ {{ scope.row.UseDay }}天</span>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('objFill.caravanshopcol.t2')" min-width="200" style="background:#EAEAEA">
@@ -593,7 +595,7 @@
                     <div class="fz12 c9e" v-for="(x, i) in scope.row.NewOrderDetailList">
                       <span class="mr">{{$t('objFill.unit.thefirst')}} {{x.Day}} {{$t('objFill.unit.day')}}</span>
 
-                      <span class="ml mr">{{$t('objFill.driver')}}:
+                      <span class="ml mr" v-if="x.DriverModel">{{$t('objFill.driver')}}:
                         {{x.DriverModel.DriverName}}/{{x.DriverModel.DriverTel}}</span>
                       <span class="ml mr"
                         v-if="x.CopilotDriverModel">{{$t('objFill.assistantdriver')}}：{{x.CopilotDriverModel.DriverName}}/{{x.CopilotDriverModel.DriverTel}}</span>

src/components/CarDealerOrder/components/ReservationOrder.vue

@@ -213,16 +213,16 @@ export default {
     return {
       useTypes: [
         {
-          StatusName: this.$t('objFill.v100.pickup'),StatusId: 1
+          StatusName: this.$t('objFill.pickup'),StatusId: 1
         },
         {
-          StatusName: this.$t('objFill.v100.send'),StatusId: 2
+          StatusName: this.$t('objFill.send'),StatusId: 2
         },
         {
-          StatusName: this.$t('objFill.v100.halfday'),StatusId: 3
+          StatusName: this.$t('objFill.halfday'),StatusId: 3
         },
         {
-          StatusName: this.$t('objFill.v100.allday'), StatusId: 4
+          StatusName: this.$t('objFill.allday'), StatusId: 4
         }
       ],
       userInfo: {},