no message

src/components/busManagement/BookAcar/CharterPreview.vue

@@ -662,19 +662,6 @@
               });
           },
           setFormMsg(){
-            // this.types.forEach(x=>{
-            //   if(x.checked){
-            //     let y = {
-            //       TicketType: x.TicketCouponsType,
-            //       TicketName: x.TicketName,
-            //       Unit_Price: x.B2BPrice,
-            //       Num: x.num,
-            //       Money: x.B2BPrice*x.num,
-            //       TicketId: x.TicketID
-            //     }
-            //     this.msg.DetailList.push(y)
-            //   }
-            // })
               this.types.forEach(x=>{
                 if(x.checked){
                   this.msg.Unit_Price = x.B2BPrice

src/components/busManagement/BookAcar/components/orderList.vue

@@ -969,11 +969,12 @@
         makeAdocument(row, index, num, name) {
           this.BillMakingMsg.ReFinanceId = row.OrderId;
           this.BillMakingMsg.ReFinanceId2 = num;
-          if (name == "Hand") {
-            this.BillMakingMsg.OtherType = 62;
-          } else {
-            this.BillMakingMsg.OtherType = 66;
-          }
+          // if (name == "Hand") {
+          //   this.BillMakingMsg.OtherType = 62;
+          // } else {
+          //   this.BillMakingMsg.OtherType = 66;
+          // }
+          this.BillMakingMsg.OtherType = 67;
           let text = "";
           let query = {};
           if (num == 1) {

src/components/busManagement/BookAcar/list.vue

@@ -327,7 +327,7 @@
       methods: {
         goUrl(){
           this.$router.push({
-                name: 'addEditVehicle',
+                name: 'CharterAddEditVehicle',
                 query: {
                     blank: "y",
                     tab: "新增/编辑团订"

src/components/busManagement/BookAcar/order.vue

@@ -4,7 +4,9 @@
   <template>
     <div>
       <el-tabs v-model="tab" @tab-click="handleClick">
-        <el-tab-pane label="团队订单" name="0">用户管理</el-tab-pane>
+        <el-tab-pane label="团队订单" name="0">
+          <TeamOrder :pagesTitle="pagesTitle"></TeamOrder>
+        </el-tab-pane>
         <el-tab-pane label="接机订单" name="1">
           <BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder>
         </el-tab-pane>
@@ -19,8 +21,9 @@
   </template>
   <script>
     import BookAcarOrder from './components/BookAcarOrder.vue';
+    import TeamOrder from '../../busManagement/tripBusOrder.vue';
     export default {
-      components: { BookAcarOrder },
+      components: { TeamOrder,BookAcarOrder },
       data() {
         return {
           pagesTitle: '销售',

src/components/busManagement/BookAcar/orderOP.vue

@@ -4,7 +4,9 @@
   <template>
     <div>
       <el-tabs v-model="tab" @tab-click="handleClick">
-        <el-tab-pane label="团队订单" name="0">用户管理</el-tab-pane>
+        <el-tab-pane label="团队订单" name="0">
+          <TeamOrder></TeamOrder>
+        </el-tab-pane>
         <el-tab-pane label="接机订单" name="1">
           <BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder>
         </el-tab-pane>
@@ -19,8 +21,9 @@
   </template>
   <script>
     import BookAcarOrder from './components/BookAcarOrder.vue';
+    import TeamOrder from '../../busManagement/tripBusOrder.vue';
     export default {
-      components: { BookAcarOrder },
+      components: { TeamOrder,BookAcarOrder },
       data() {
         return {
           pagesTitle: 'OP',

src/components/busManagement/tripBusOrder.vue

@@ -28,6 +28,7 @@
         </li>
         <li><span><em>状态</em></span>
           <el-select v-model='msg.OfferState' clearable>
+            <el-option label='不限' value='-1' key='-1'></el-option>
             <el-option label='等待报价' value='2' key='2'></el-option>
             <el-option label='已报价' value='3' key='3'></el-option>
             <el-option label='确认报价' value='4' key='4'></el-option>
@@ -36,6 +37,9 @@
         </li>
         <li>
           <input type="button" class="normalBtn" value="查询" @click="getList(); resetPageIndex()" />
+          <button class="hollowFixedBtn" type="primary" @click="goUrl">
+            添加
+          </button>
         </li>
       </ul>
     </div>
@@ -97,14 +101,14 @@
               {{ item.OfferStateName }}
             </td>
             <td>
-              <template v-if="item.SureId == 0">
+              <!-- <template v-if="item.SureId == 0">
                 <span style="color:red">待确认</span>
               </template>
               <template v-else>
                 <span style="color:red">已确认</span><br />
                 <span style="color:red">确认人:{{ item.SureByName }}</span><br />
                 <span style="color:red">确认时间:{{ item.SureTime }}</span>
-              </template>
+              </template> -->
             </td>
             <td>
               <div class="link" style="display: flex;
@@ -123,7 +127,7 @@
     <!-- 详情 -->
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
-    <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="isShowPrice" center>
+    <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="isShowPrice" center width="850px">
       <el-form :inline="true" :label-position="labelPosition" label-width="90px">
         <el-form-item label="下单人:" style="width: 48%;">
           <div style="max-width: 205px;">{{ postMsg.CustomerName }}</div>
@@ -187,21 +191,26 @@
 
       <div v-if="postMsg.details && postMsg.details.length > 0">
         <el-table :data="postMsg.details" max-height="300px" show-summary sum-text="小计"
-          :header-cell-style="{ background: '#eef1f6', color: '#606266' }" style="width: 100%">
-          <el-table-column prop="UseDate" label="日期" width="100" align='center'>
+          :header-cell-style="{ background: '#eef1f6', color: '#606266' }" style="width: 100%" align='center'>
+          <el-table-column prop="UseDate" label="日期" width="100">
           </el-table-column>
-          <el-table-column prop="" label="Day" width="80" align='center'>
+          <el-table-column prop="" label="Day" width="80">
             <template slot-scope="scope">
               <span>
                 Day {{ String(scope.row.DayNum) }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="UseTypeName" label="用车类型" width="100" align='center'>
+          <el-table-column prop="UseTypeName" label="用车类型" width="100">
           </el-table-column>
-          <el-table-column prop="TripInfo" label="行程" min-width="200">
+          <el-table-column prop="TripInfo" label="行程">
+            <template slot-scope="scope">
+              <el-tooltip class="item" effect="dark" :content="scope.row.TripInfo" placement="bottom">
+                {{scope.row.TripInfo?scope.row.TripInfo:'-'}}
+              </el-tooltip>
+            </template>
           </el-table-column>
-          <el-table-column prop="UnitPrice" label="价格" width="90" align='center'>
+          <el-table-column prop="UnitPrice" label="价格">
             <template slot-scope="scope">
               <el-input v-if="priceType == 1" v-model="scope.row.UnitPrice" @input="calcPrice()"
                 @keyup.native="checkInteger(scope.row, 'UnitPrice')" style="width:90px;"></el-input>
@@ -210,16 +219,16 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="StopBusPrice" label="停车费" width="90" align='center'>
+          <el-table-column prop="StopBusPrice" label="停车费">
             <template slot-scope="scope">
-              <el-input v-if="priceType == 1" v-model="scope.row.StopBusPrice" @input="calcPrice()"
+              <el-input  v-if="priceType == 1" v-model="scope.row.StopBusPrice" @input="calcPrice()"
                 @keyup.native="checkInteger(scope.row, 'StopBusPrice')" style="width:90px;"></el-input>
               <span v-if="priceType != 1">
                 {{ scope.row.StopBusPrice }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column prop="RoomPrice" label="司机住宿费" width="100" align='center'>
+          <el-table-column prop="RoomPrice" label="司机住宿费">
             <template slot-scope="scope">
               <el-input v-if="priceType == 1" v-model="scope.row.RoomPrice" @input="calcPrice()"
                 @keyup.native="checkInteger(scope.row, 'RoomPrice')" style="width:90px;"></el-input>
@@ -321,6 +330,7 @@
 
 <script>
   export default {
+    props:['pagesTitle'],
     data() {
       return {
         drivermsg: {
@@ -343,7 +353,7 @@
           TeamName: "", //团体名称
           StartTime: "", //开始时间
           EndTime: "", //结束时间
-          OfferState: "", //报价状态
+          OfferState: "-1", //报价状态
         },
         boxHeight: 0,
         offsetwidth: 0,
@@ -395,6 +405,15 @@
 
     },
     methods: {
+      goUrl(){
+        this.$router.push({
+              name: 'CharterAddEditVehicle',
+              query: {
+                  blank: "y",
+                  tab: "新增/编辑团订"
+              }
+          });
+      },
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
         this.getList();
@@ -405,7 +424,8 @@
       },
       getList() {
         this.loading = true
-        this.apipost('tripbus_GetErpTripBusPage', this.msg, res => {
+        // tripbus_GetErpTripBusPage
+        this.apipost('tripbus_GetTripBusPage', this.msg, res => {
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
@@ -545,7 +565,7 @@
         myDate.getDate();
       this.msg.StartTime = nowDate;
       let width = window.innerWidth - 50;
-      let height = window.innerHeight - 65 - 210;
+      let height = window.innerHeight - 65 - 300;
       this.boxHeight = height;
       this.offsetwidth = width;
       this.getList();
@@ -553,7 +573,7 @@
   }
 
 </script>
-<style>
+<style scoped>
   .splitTrCss td {
     background: #eee !important;
   }
@@ -564,6 +584,7 @@
   }
 
   .busStatisticsTalbe {
+    width: 100%;
     background: #ccc;
   }
 
@@ -654,9 +675,6 @@
     overflow: auto;
     max-height: 350px;
   }
-
-</style>
-<style scoped>
   /deep/.el-form-item {
     margin-bottom: 0px;
   }
@@ -664,7 +682,7 @@
   .total {
     display: flex;
     width: 100%;
-    justify-content: center;
+    justify-content: end;
     font-weight: bold;
     margin-bottom: 20px;
     margin-top: 10px;
@@ -675,5 +693,4 @@
     width: 100%;
     justify-content: space-between;
   }
-
 </style>