no message

src/components/busManagement/BookAcar/addEditVehicle.vue

@@ -352,7 +352,7 @@
                 </div>
               </div>
           </div>
-          <div class="flexOne-form-bj" v-if="msg.details.length>0">
+          <div class="flexOne-form-bj" v-if="msg.details&&msg.details.length>0">
             <h3>订单信息</h3>
             <div class="flexOne-infor-box">
             <b></b>
@@ -411,7 +411,7 @@
           <div class="right-form">
             <!-- <h6>订单明细</h6> -->
             <div class="right-form-list">
-              <template  v-if="isCheck&&msg.details.length>0">
+              <template  v-if="isCheck&&msg.details&&msg.details.length>0">
                 <template v-for="x in msg.details">
                   <div class="right-list">
                     <div>
@@ -429,7 +429,7 @@
           <div class="right-Money">
             <div>
               <span>订单总天数：</span>
-              <b>{{ msg.details.length }}</b>
+              <b>{{ msg.details&&msg.details.length }}</b>
             </div>
           </div>
           <div class="right-Submit">
@@ -720,10 +720,12 @@
           
         },
         created() {
-          this.msg.Id = this.$route.query.Id?this.$route.query.Id:0
+          if(this.$route.query&&this.$route.query.Id){
+            this.msg.Id = this.$route.query.Id
+          }
           this.vehicleinit()
           this.vehicleList()
-          if(this.msg.Id){
+          if(this.msg.Id>0){
             this.getOrderInfo()
           }
         }

src/components/busManagement/tripBusOrder.vue

@@ -121,6 +121,7 @@
             <td>
               <div class="link" style="display: flex;
               flex-flow: nowrap;">
+                <!-- <button class="normalBtn" type="primary" @click="clickCancel(item)">取消用车</button> -->
                 <button class="hollowFixedBtn" type="primary" @click="goUrl(item.Id)">编辑</button>
                 <button class="hollowFixedBtn" type="primary" @click="SetTripBusPrice(item, 2)">详情</button>
                 <button class="normalBtn" type="primary" v-if="item.OfferState == 2" @click="SetTripBusPrice(item, 1)">报价</button>
@@ -332,6 +333,38 @@
         <el-button type="primary" @click="driverdetermine()">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog
+          custom-class="w600"
+          title="取消订单"
+          :visible.sync="cancelOrderDialog"
+        >
+          <div style="padding-bottom:20px">
+            <el-input
+              type="textarea"
+              autofocus
+              rows="5"
+              placeholder="请填写取消订单的缘由"
+              clear="w300"
+              v-model="CancelMsg.CancelRemark"
+            ></el-input>
+            <el-row :gutter="20" style="margin-top: 20px;">
+              <el-col :span="24" style="text-align: right;">
+                <input
+                  type="button"
+                  class="normalBtn"
+                  value="取消订单"
+                  @click="cancellation"
+                />
+                <input
+                  type="button"
+                  class="hollowFixedBtn"
+                  value="关闭"
+                  @click="cancelOrderDialog = false"
+                />
+              </el-col>
+            </el-row>
+          </div>
+      </el-dialog>
   </div>
 </template>
 
@@ -340,6 +373,11 @@
     props:['pagesTitle'],
     data() {
       return {
+        cancelOrderDialog: false,
+        CancelMsg:{
+          Id:0,
+          CancelRemark:''
+        },
         drivermsg: {
           Id: '',
           DriverInfo: "",
@@ -413,6 +451,26 @@
 
     },
     methods: {
+      clickCancel(item){
+        this.CancelMsg.Id = item.Id
+        this.cancelOrderDialog = true
+      },
+      // 取消用车
+      cancellation(){
+        if(!this.CancelMsg.CancelRemark){
+          this.Error('请输入取消缘由');
+          return
+        }
+        this.apipost('tripbus_CancelBusTrip', this.CancelMsg, res => {
+          this.cancelOrderDialog = false
+          if (res.data.resultCode == 1) {
+            this.getList()
+            this.cancelOrderDialog = false;
+          } else {
+            this.Error(res.data.message);
+          }
+        }, err => {})
+      },
       goUrl(Id){
         let text
         if(Id){