Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/busManagement/BusInfo.vue

@@ -135,24 +135,23 @@
     color: #fff;
     border: 1px solid #d1d1d1;
   }
-
   .disClick:hover {
     background-color: #d1d1d1 !important;
     cursor: default !important;
     box-shadow: none !important;
   }
 
-  .busInfo .el-input__inner,
-  .el-select {
-    margin-bottom: 10px;
+  .busInfo .comBTM{
+    margin-bottom:10px;
+  }
+  .busInfo .comBTM:last-child{
+    margin-bottom: 0;
   }
-
   .park_List {
     width: 50px;
     height: 34px;
     line-height: 34px;
     text-align: left;
-    margin-bottom: 10px;
   }
 
 </style>
@@ -210,7 +209,7 @@
           <el-table-column fixed label="酒店名称" prop="HotelName" min-width="200"></el-table-column>
           <el-table-column fixed label="用车计划" min-width="350">
             <template slot-scope="scope">
-              <div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList">
+              <div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM">
                 <em>
                   <!--接机送机-->
                   <el-select class="w150" placeholder="请选择" v-model="subItem.AirportPickUp" :disabled="forbidInput"
@@ -232,7 +231,7 @@
                     style="color:blue;cursor:pointer">删除</a>
                 </span>
                 <span style="display:inline-block;width:30px;margin-left:5px;">
-                  <span class="busAddbtn" @click="AddSubItem(scope.row)" style="margin-bottom:10px;">
+                  <span class="busAddbtn" @click="AddSubItem(scope.row)" v-if="subIndex==0">
                     <i class="iconfont icon-img_haha"></i>
                   </span>
                 </span>
@@ -241,28 +240,28 @@
           </el-table-column>
           <el-table-column label="司机姓名" min-width="120">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.DriverName"></el-input>
               </div>
             </template>
           </el-table-column>
           <el-table-column label="联系电话" min-width="140">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.DriverTel"></el-input>
               </div>
             </template>
           </el-table-column>
           <el-table-column label="车牌号码" min-width="100">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.BusNum"></el-input>
               </div>
             </template>
           </el-table-column>
           <el-table-column label="供应商" min-width="150">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-select filterable placeholder="请选择" v-model="subItem.BusCompany">
                   <el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>
@@ -273,7 +272,7 @@
           </el-table-column>
           <el-table-column label="车辆类型" min-width="150">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-select filterable placeholder="请选择" v-model="subItem.BusType" :disabled="forbidInput"
                   @change='getBusPrice(subItem)'>
                   <el-option :key="0" :value="0" label="请选择"></el-option>
@@ -285,7 +284,7 @@
           </el-table-column>
           <el-table-column label="付款方式" min-width="150">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-select class='sel' v-model='subItem.PayType' :placeholder="$t('pub.pleaseSel')"
                   @change="PayTypeChange(scope.row)">
                   <el-option label='请选择' :value='0'></el-option>
@@ -301,7 +300,7 @@
           </el-table-column>
           <el-table-column label="合团支付团号" min-width="150">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input class='w120' type="text" v-model='subItem.PayTypeTCNUM' v-show="subItem.PayType==6">
                 </el-input>
               </div>
@@ -316,7 +315,7 @@
                     @click="getBeforeInfo(scope.$index),getBusPrice(scope.row)"></i>
                 </el-tooltip>
               </div> -->
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input class='w170' type="text" v-model="subItem.BookGroup"></el-input>
               </div>
             </template>
@@ -324,7 +323,7 @@
           <el-table-column label="司机住宿" min-width="180">
             <template slot-scope="scope">
               <!--司机住宿类型-->
-              <div v-for="childItem in scope.row.BusPlanOrderList" style="margin-bottom:10px;">
+              <div v-for="childItem in scope.row.BusPlanOrderList" class="comBTM">
                 <span v-for="subItem in AccommodationTypeArray">
                   <span class="subName" :class="{'spanCked':childItem.AccommodationType==subItem.Id}"
                     @click="AccommodationCLick(subItem.Id,childItem)">{{subItem.Name}}</span>
@@ -338,14 +337,14 @@
           </el-table-column>
           <el-table-column label="泊车说明" min-width="180">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.ParkExplain" placeholder="请输入说明"></el-input>
               </div>
             </template>
           </el-table-column>
           <el-table-column label="高速费用" min-width="150">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.HighSpeedPrice" @keyup.native="checkPrice(subItem,'HighSpeedPrice')"
                   placeholder="请输入费用"></el-input>
               </div>
@@ -354,7 +353,7 @@
           <el-table-column label="高速费用付款方式" min-width="150">
             <template slot-scope="scope">
               <div>
-                <div v-for="(subItem,index) in scope.row.BusPlanOrderList">
+                <div v-for="(subItem,index) in scope.row.BusPlanOrderList" class="comBTM">
                   <el-select class='sel' v-model='subItem.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')"
                     @change="PayTypeChange(subItem)">
                     <el-option label='请选择' :value='0'></el-option>
@@ -371,14 +370,14 @@
           </el-table-column>
           <el-table-column label="使用人数" min-width="100">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.UseNum" @keyup.native="checkPrice(subItem,'UseNum')"></el-input>
               </div>
             </template>
           </el-table-column>
           <el-table-column label="成本价" min-width="150">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.CostPrice" @keyup.native="checkPrice(subItem,'CostPrice')"
                   placeholder="请输入成本价"></el-input>
               </div>
@@ -386,27 +385,27 @@
           </el-table-column>
           <el-table-column label="备注" min-width="180">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input type="text" v-model="subItem.Remarks"></el-input>
               </div>
             </template>
           </el-table-column>
           <el-table-column label="停车场" min-width="100">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList" class="park_List">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="park_List comBTM">
                 {{subItem.IsHavearking=='0'?'无':'有'}}
               </div>
             </template>
           </el-table-column>
           <el-table-column label="小计" min-width="100">
             <template slot-scope="scope">
-              <div v-for="subItem in scope.row.BusPlanOrderList" class="park_List">
+              <div v-for="subItem in scope.row.BusPlanOrderList" class="park_List comBTM">
                 {{subItem.CostPrice*(Number(subItem.TransferNum)+1) + Number(subItem.HighSpeedPrice)}}
               </div>
             </template>
           </el-table-column>
         </el-table>
-        <div class="upBtnList">
+        <div class="upBtnList" v-if="isShowBtn==0">
           <input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(0)"
             :disabled="disButton" value="保存草稿" />
           <input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(1)"
@@ -561,6 +560,7 @@
         GuideName: '',
         loading: false,
         isSubmit: true,
+        isShowBtn:0
       };
     },
     methods: {
@@ -682,6 +682,7 @@
               });
               this.PostData = response.data.data.busExtend;
               this.CommonList = response.data.data.commonList;
+              this.isShowBtn = response.data.data.busExtend.IsOperation;
             }
           },
           null