no message

src/components/busManagement/BookAcar/components/tripBusOrderList.vue

@@ -362,7 +362,7 @@
               </div>
             </div>
             <div class="c9e fz12" v-if="item.CustomerName">
-              <span>客人信息：{{ item.CustomerName }}({{ item.CustomerContact }})/{{ item.CustomerTel }}</span>
+              <span>客人信息：{{ item.UseCompName }}({{ item.UseName }})</span>
             </div>
             <div class="row c9e fz12">
               <template v-if="item.EmName">
@@ -452,9 +452,11 @@
                   </div>
                 </template>
                 </el-table-column>
-                <el-table-column  width="100" label="用车类型" style="background:#EAEAEA">
+                <el-table-column min-width="120" label="车辆信息" style="background:#EAEAEA">
                   <template slot-scope="scope">
-                    {{ item.BusTypeName }}
+                    <div><span>用车类型：</span> {{ item.BusTypeName }}</div>
+                    <div><span>司机：</span>{{ item.DriverInfo }}</div>
+                    <div><span>车牌号：</span>{{ item.BusNo }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column label="导游信息" style="background:#EAEAEA">
@@ -476,6 +478,15 @@
                     {{ item.Money?item.Money.toFixed(2):0.00 }}
                   </template>
                 </el-table-column>
+                <el-table-column
+                  label="手配费"
+                  min-width="70"
+                  style="background:#EAEAEA"
+                >
+                  <template slot-scope="scope">
+                    {{ item.ShouPeiFee }}
+                  </template>
+                </el-table-column>
                 <template slot="append" v-if="item.CreateRemark">
                   <div style="padding:10px;color:#f1416c">客户备注：{{item.CreateRemark}}</div>
                 </template>
@@ -620,6 +631,14 @@
                 <i v-loading="msg.OrderId==item.Id&&loading1"></i>
                 <span class="c20C997">确认订单</span>
               </div>
+              <div
+                v-if="pagesTitle!='销售'"
+                class="row-c cursor-pointer radius5 change py5"
+                @click="driver(item.Id)"
+              >
+                <i v-loading="msg.OrderId==item.Id&&loading2"></i>
+                <span class="c059FF6">添加司机车牌号</span>
+              </div>
               <div
                 v-if="item.OfferState == 2"
                 class="row-c cursor-pointer radius5 confirm py5"
@@ -1060,11 +1079,19 @@
           },
           // 司机确定
           driverdetermine() {
+            this.loading2 = false
+            if(!this.drivermsg.DriverInfo||!this.drivermsg.BusNo){
+              this.$message.error('司机名称和车牌号不能为空');
+              return
+            }
             this.apipost('tripbus_SetBusPriceInfo', this.drivermsg, res => {
               if (res.data.resultCode == 1) {
+                this.loading2 = true
                 this.dialogVisible = false
+                this.$emit('success')
                 this.$forceUpdate();
               } else {
+                this.loading2 = true
                 this.Error(res.data.message);
               }
             }, err => {})
@@ -1434,13 +1461,7 @@
           }
           if (this.loading0) return;
           this.loading0 = true
-          let url
-          if(this.Title!='销售'){
-            url = 'CancelSellBusTrip'
-          }else{
-            url = 'tripbus_CancelSellBusTrip'
-          }
-          this.apipost(url,
+          this.apipost('tripbus_CancelSellBusTrip',
               {
                 OrderId: this.cancelOrderId,
                 IsOP: this.Title!='销售'?1:0,