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

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -464,7 +464,6 @@
     GetAuth() {
         this.apipost('dmcstatistics_get_GetGetDmcTotalTablePageAuth', {}, res => {
           if (res.data.resultCode == 1) {
-            //this.IsDMCIsOpenHotel = res.data.data.IsDMCIsOpenHotel;
             this.IsEditDinner = res.data.data.IsEditDinner;
           } else {
             this.$message.error(res.data.message);

src/components/busManagement/BusInfo.vue

@@ -202,10 +202,11 @@
               </el-option>
             </el-select>
           </td>
-           <td>回送费</td>
-           <td colspan="4" align="left" style="padding-left:5px;">
-              <el-input v-model="PostData.BackFee" @keyup.native="checkPrice(PostData,'BackFee')" placeholder="请输入回送费"  maxlength="10" class='w135'></el-input>
-           </td>
+          <td>回送费</td>
+          <td colspan="4" align="left" style="padding-left:5px;">
+            <el-input v-model="PostData.BackFee" @keyup.native="checkPrice(PostData,'BackFee')" placeholder="请输入回送费"
+              maxlength="10" class='w135'></el-input>
+          </td>
         </tr>
       </tfoot>
     </table>
@@ -285,8 +286,8 @@
           <el-table-column label="付款方式" min-width="150">
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
-                <el-select class='sel' v-model='subItem.PayType' :disabled="isShowBtn==1?true:false" :placeholder="$t('pub.pleaseSel')"
-                  @change="PayTypeChange(scope.row)">
+                <el-select class='sel' v-model='subItem.PayType' :disabled="isShowBtn==1||IsEditBus==0?true:false"
+                  :placeholder="$t('pub.pleaseSel')" @change="PayTypeChange(scope.row)">
                   <el-option label='请选择' :value='0'></el-option>
                   <el-option label='现付' :value='1'></el-option>
                   <el-option label='公司结算' :value='2'></el-option>
@@ -349,7 +350,7 @@
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.HighSpeedPrice" @keyup.native="checkPrice(subItem,'HighSpeedPrice')"
-                  placeholder="请输入费用" :disabled="isShowBtn==1?true:false"  class='w135'></el-input>
+                  placeholder="请输入费用" :disabled="isShowBtn==1||IsEditBus==0?true:false" class='w135'></el-input>
               </div>
             </template>
           </el-table-column>
@@ -358,7 +359,7 @@
               <div>
                 <div v-for="(subItem,index) in scope.row.BusPlanOrderList" class="comBTM">
                   <el-select class='sel w135' v-model='subItem.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')"
-                    @change="PayTypeChange(subItem)" :disabled="isShowBtn==1?true:false">
+                    @change="PayTypeChange(subItem)" :disabled="isShowBtn==1||IsEditBus==0?true:false">
                     <el-option label='请选择' :value='0'></el-option>
                     <el-option label='现付' :value='1'></el-option>
                     <el-option label='公司结算' :value='2'></el-option>
@@ -375,15 +376,15 @@
             <template slot-scope="scope">
               <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
                 <el-input v-model="subItem.UseNum" @keyup.native="checkPrice(subItem,'UseNum')"
-                  :disabled="isShowBtn==1?true:false"></el-input>
+                  :disabled="isShowBtn==1||IsEditBus==0?true:false"></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" class="comBTM">
-                <el-input v-model="subItem.CostPrice" :disabled="isShowBtn==1?true:false"  @keyup.native="checkPrice(subItem,'CostPrice')"
-                  placeholder="请输入成本价"  class="w135"></el-input>
+                <el-input v-model="subItem.CostPrice" :disabled="isShowBtn==1||IsEditBus==0?true:false"
+                  @keyup.native="checkPrice(subItem,'CostPrice')" placeholder="请输入成本价" class="w135"></el-input>
               </div>
             </template>
           </el-table-column>
@@ -410,13 +411,13 @@
           </el-table-column>
         </el-table>
         <div class="upBtnList">
-          <input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(0)"
+          <input v-if="IsEditBus==0" type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(0)"
             :disabled="disButton" value="保存草稿" />
-          <input type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(1)"
+          <input v-if="IsEditBus==1" type="button" class="normalBtn" :class="{'disClick':!isSubmit}" @click="SaveList(1)"
             :disabled="disButton" value="保存" />
-            <span v-if="isShowBtn==1" style="color:red;margin-left:10px;">
-                已制单，不能再修改价格和付款方式！
-            </span>
+          <span v-if="isShowBtn==1" style="color:red;margin-left:10px;">
+            已制单，不能再修改价格和付款方式！
+          </span>
         </div>
       </el-form>
     </div>
@@ -547,6 +548,7 @@
         loading: false,
         isSubmit: true,
         isShowBtn: 1, //1禁用高速费，成本费，高速付款方式文本框
+        IsEditBus:0,//车辆修改权限
       };
     },
     methods: {
@@ -560,7 +562,7 @@
       },
       /*获取车辆成本价格*/
       getBusPrice(obj) {
-        if(this.isShowBtn!=1){
+        if (this.isShowBtn != 1) {
           let tempCostFee = 0;
           var tempHighSpeedFee = 0;
           if (obj.AirportPickUp == 3 || obj.AirportPickUp == 4) {
@@ -624,8 +626,9 @@
       /*获取车辆类型列表*/
       getBusTypeList() {
         this.apipost(
-          "bus_get_GetBusTypePriceList",
-          {StartDate:this.parametersData.StartDate},
+          "bus_get_GetBusTypePriceList", {
+            StartDate: this.parametersData.StartDate
+          },
           res => {
             if (res.data.resultCode == 1) {
               this.BusTypeList = res.data.data;
@@ -686,7 +689,7 @@
         if (this.isSubmit) {
           this.isSubmit = false;
           this.apipost('bus_get_SetPlan_V2', this.PostData, res => {
-              this.isSubmit = true;
+            this.isSubmit = true;
             if (res.data.resultCode == 1) {
               this.Success("保存成功！");
               this.MsgBus.$emit('msg');
@@ -788,7 +791,7 @@
             .length - 1];
         }
         let newPlanData = this.PlanTableData[index].BusPlanOrderList[subIndex];
-        newPlanData.AirportPickUp=oldPlanData.AirportPickUp;
+        newPlanData.AirportPickUp = oldPlanData.AirportPickUp;
         newPlanData.DriverName = oldPlanData.DriverName;
         newPlanData.DriverTel = oldPlanData.DriverTel;
         newPlanData.BusNum = oldPlanData.BusNum;
@@ -797,9 +800,20 @@
         newPlanData.PayType = oldPlanData.PayType;
         newPlanData.BookGroup = oldPlanData.BookGroup;
         newPlanData.HighSpeedPayType = oldPlanData.HighSpeedPayType;
+      },
+      GetAuth() {
+        this.apipost('dmcstatistics_get_GetGetDmcTotalTablePageAuth', {}, res => {
+          if (res.data.resultCode == 1) {
+            this.IsEditBus = res.data.data.IsEditBus;
+          } else {
+            this.$message.error(res.data.message);
+          }
+        }, err => {})
       }
+
     },
     mounted() {
+      this.GetAuth();
       this.GetUseTypeList();
       this.GetAirportPickUpList();
       this.GeAccommodationTypeList();