页面修改

src/components/busManagement/BusInfo.vue

@@ -135,18 +135,21 @@
     color: #fff;
     border: 1px solid #d1d1d1;
   }
+
   .disClick:hover {
     background-color: #d1d1d1 !important;
     cursor: default !important;
     box-shadow: none !important;
   }
 
-  .busInfo .comBTM{
-    margin-bottom:10px;
+  .busInfo .comBTM {
+    margin-bottom: 10px;
   }
-  .busInfo .comBTM:last-child{
+
+  .busInfo .comBTM:last-child {
     margin-bottom: 0;
   }
+
   .park_List {
     width: 50px;
     height: 34px;
@@ -220,12 +223,6 @@
                     </el-option>
                   </el-select>
                 </em>
-                <!--用车类型-->
-                <!-- <span v-for="childItem in UseTypeArray" class="BusinfoSpan">
-                  <span v-if="childItem.Id==1" class="subName"
-                    :class="{'spanCked':subItem.UseType==childItem.Id,'disSpan':forbidInput==true}"
-                    @click="UseTypeClick(childItem.Id,scope.$index,subIndex);getBusPrice(scope.row)">{{childItem.Name}}</span>
-                </span> -->
                 <span style="width:30px;display:inline-block;">
                   <a v-if="subIndex>0" @click="DeleteSubItem(scope.row,subIndex),getBusPrice(subItem)"
                     style="color:blue;cursor:pointer">删除</a>
@@ -362,7 +359,7 @@
                     <el-option label='预付' :value='3'></el-option>
                     <el-option label='合团公司支付' :value='6'></el-option>
                     <el-option label='自由活动-无用车' :value='7'></el-option>
-                    <el-option label="酒店接送~免車資" :value='8'></el-option>
+                    <el-option label="酒店接送" :value='8'></el-option>
                   </el-select>
                 </div>
               </div>
@@ -433,27 +430,6 @@
           DayNum: 0,
           TotalNumber: 0
         },
-        /*表单json*/
-        // PostData: {
-        //   Id: 0,
-        //   BusCode: "",
-        //   DriverName: "",
-        //   DriverTel: "",
-        //   BusType: 0,
-        //   CarrierNum: "",
-        //   BusNum: "",
-        //   StartDate: "",
-        //   UseDays: "",
-        //   SupplierId: "",
-        //   CostPrice: "",
-        //   SalesPrice: "",
-        //   Country: 0,
-        //   Province: 0,
-        //   City: 0,
-        //   District: 0,
-        //   PlanList: [],
-        //   TCID: 0
-        // },
         PostData: [],
         //公用信息
         CommonList: [],
@@ -560,7 +536,7 @@
         GuideName: '',
         loading: false,
         isSubmit: true,
-        isShowBtn:0
+        isShowBtn: 0
       };
     },
     methods: {
@@ -576,9 +552,10 @@
       getBusPrice(obj) {
         let tempCostFee = 0;
         var tempHighSpeedFee = 0;
-
         if (obj.BusType) {
-          obj.PayType = 2;
+          console.log("obj",obj);
+          //obj.PayType = 2;
+          //高速付款方式默认现付
           obj.HighSpeedPayType = 1;
           let busTypeObj = this.BusTypeList.find(item => item.Id === obj.BusType);
           if (busTypeObj) {
@@ -613,7 +590,7 @@
       },
       AddSubItem(item) {
         let msg = Object.assign({}, item.BusPlanOrderList[0]);
-        msg.Id=0;
+        msg.Id = 0;
         item.BusPlanOrderList.push(msg);
       },
       DeleteSubItem(item, index) {
@@ -676,9 +653,12 @@
             if (response.data.resultCode == 1) {
               this.PlanTableData = response.data.data.busExtend.BusPlanReportList;
               this.PlanTableData.forEach(x => {
-                if (x.BookGroup == '' || x.BookGroup == null) {
-                  x.BookGroup = this.$route.query.NewCombinationNum;
+                x.BusPlanOrderList.forEach(subItem => {
+                  if (subItem.BookGroup == '' || subItem.BookGroup == null) {
+                    subItem.BookGroup = this.$route.query.NewCombinationNum;
                   }
+              
+                })
               });
               this.PostData = response.data.data.busExtend;
               this.CommonList = response.data.data.commonList;
@@ -708,20 +688,7 @@
           }, err => {})
         }
       },
-      //用车类型点击事件
-      UseTypeClick(value, index, subIndex) {
-        if (this.forbidInput == true) {
-          return;
-        }
-        if (
-          this.PlanTableData[index].DetailList[subIndex].UseType == "0" ||
-          this.PlanTableData[index].DetailList[subIndex].UseType != value
-        ) {
-          this.PlanTableData[index].DetailList[subIndex].UseType = value;
-        } else if (this.PlanTableData[index].DetailList[subIndex].UseType == value) {
-          this.PlanTableData[index].DetailList[subIndex].UseType = "0";
-        }
-      },
+
       //司机住宿点击事件
       AccommodationCLick(value, item) {
         if (