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

src/assets/utils/AuthCode.js

@@ -4,5 +4,10 @@
 
 var AuthCode = {
     EidtCoupon:"IsEidtCoupon",//优惠券修改权限
+    LeaderAudit:'IsLeaderAudit', //领队报账审核权限
+    EditOrderCreateBy:"EditOrderCreateBy",//修改业务员
+    EditRoomDinnerTIcket:"EditRoomDinnerTIcket",//房餐景点修改权限
+    EditQuotation:"EditQuotation",//报价单修改权限
+
 };
 export default AuthCode;
\ No newline at end of file

src/components/DomesticModule/OrderDataStati.vue

@@ -64,14 +64,13 @@
   export default {
     data() {
       return {
-
         Year: new Date().getFullYear(),
         Month: new Date().getMonth() + 1,
         date: new Date().getDate(),
-        IsInter:-1,//月统计[0-国内，1-国际]
+        IsInter: -1, //月统计[0-国内，1-国际]
         YearS: new Date().getFullYear(),
         MonthS: '',
-        IsInters:-1,//年统计[0-国内，1-国际]
+        IsInters: -1, //年统计[0-国内，1-国际]
         clientHeight: '',
         yearList: [],
         MonthList: [],
@@ -266,7 +265,7 @@
         let msg = {
           Year: this.YearS,
           Month: '',
-          IsInter:this.IsInters
+          IsInter: this.IsInters
         }
         this.apipost('Domestic_Ticket_post_GetProfitList', msg, r => {
           if (r.data.resultCode == 1) {

src/components/DomesticModule/OrderDetails.vue

@@ -146,7 +146,7 @@
                   <th>航班</th>
                   <th>航段</th>
                 </tr>
-                <tr v-for="(i,d) in item.FlightList">
+                <tr v-for="(i,d) in item.FlightList" :key="d">
                   <td>{{i.AirlineName}}</td>
                   <td>{{i.FlightNo}}</td>
                   <td>{{i.Leg}}</td>
@@ -337,4 +337,5 @@
       },
     }
   }
+
 </script>

src/components/DomesticModule/SettlementOrder.vue

@@ -75,7 +75,7 @@
           <th>操作人</th>
           <th>操作</th>
         </tr>
-        <tr v-for="(item,index) in dataList">
+        <tr v-for="(item,index) in dataList" :key="index">
           <td>{{item.IsInter==0?"国内机票":"国际机票"}}</td>
           <td>{{item.Term}}</td>
           <td>¥{{item.Money}}</td>
@@ -91,7 +91,6 @@
             <span>{{item.PayMoney}}</span>
           </td>
           <td :class="Math.abs(item.Money-item.InCome)>0?'_color_red':''">
-            <!-- ¥{{Math.abs(item.Money-item.InCome)}} -->
             <span v-if="item.Money > item.InCome">{{(item.Money- item.InCome).toFixed(2)}}</span>
             <span v-else>0</span>
           </td> 

src/components/FinancialModule/platOrderquery.vue

@@ -216,7 +216,7 @@
         <th width="80">{{$t('Operation.Op_platZaitu')}}</th>
         <th width="80">{{$t('Operation.Op_daishou')}}</th>
         <th width="60">{{$t('admin.admin_status')}}</th>
-        <th v-if="isEditOrderCreate==1 || userId==1" width="140">{{$t('admin.admin_operate')}}</th>
+        <th v-if="isEditOrderCreate==1" width="140">{{$t('admin.admin_operate')}}</th>
       </tr>
       <tr>
         <td v-show="list.length==0" colspan="15" align="center">{{$t('system.content_noData')}}</td>
@@ -364,12 +364,12 @@
         <td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
         <td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td>
         <td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
-        <td v-if="isEditOrderCreate==1||userId==1">
+        <td v-if="isEditOrderCreate==1">
           <button class="normalBtn" style="margin-left:0;width:95px;padding:0" @click="getSalerInfo(item)">{{$t('salesModule.UpdateYWY')}}</button>
         </td>
       </tr>
       <tr style="height:20px">
-        <td :colspan="isEditOrderCreate==1||userId==1 ?17:16" class="RL_Order" style="height:20px">
+        <td :colspan="isEditOrderCreate==1 ?17:16" class="RL_Order" style="height:20px">
           <span style="font-size: 14px;color: #333333">{{$t('salesModule.MD')}}:</span>
           <span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span>
           <p v-if="item.cancelGuestList && item.cancelGuestList.length>0">
@@ -867,12 +867,12 @@
       },
       // 获取修改业务员权限
       GetEditOrderCreateByAuth() {
-        this.apipost('sellorder_get_GetEditOrderCreateByAuth', {}, res => {
-          if (res.data.resultCode == 1) {
-             this.isEditOrderCreate=res.data.data;
+        var actionCode = this.$AuthCode.EditOrderCreateBy;
+        this.CheckUserAuth(actionCode, res => {
+          if (res.data.resultCode == 1 && res.data.data == 1) {
+             this.isEditOrderCreate = 1;
           }
-        }, err => {})
-        
+        });
       },
     },
     created(){

src/components/Hotel/HotelContract.vue

@@ -310,10 +310,7 @@
             this.IsOperation = res.data.data.IsOperation;
             this.IsEditHotel = res.data.data.IsEditHotel;
             this.IsEditHotelPeople = res.data.data.IsEditHotelPeople;
-            if (this.CurrentUserInfo.EmployeeId == 615||this.CurrentUserInfo.EmployeeId==46) {
-              this.IsEditHotel = 1;
-              this.IsEditHotelPeople = 1;
-            }
+ 
             let list = res.data.data.HotelOrderListReport;
             this.CreateBy = res.data.data.CreateBy;
             this.CreateByPhoto = res.data.data.CreateByPhoto;
@@ -431,7 +428,7 @@
         var str="";
         this.list.forEach(item => {
           item.HotelOrderList.forEach(subItem => {
-            if(isUpload&&subItem.PayStyle==1&&subItem.ContractUrl==''&&this.CurrentUserInfo.EmployeeId!=615){
+            if(isUpload&&subItem.PayStyle==1&&subItem.ContractUrl==''){
                str+=`请上传${item.UseTimeStr}的手配书`
                isUpload=false;
             }
@@ -486,7 +483,7 @@
         var str="";
         this.list.forEach(item => {
           item.HotelOrderList.forEach(subItem => {
-            if(isUpload&&subItem.PayStyle==1&&subItem.ContractUrl==''&&this.CurrentUserInfo.EmployeeId!=615){
+            if(isUpload&&subItem.PayStyle==1&&subItem.ContractUrl==''){
                str+=`请上传${item.UseTimeStr}的手配书`
                isUpload=false;
             }

src/components/Hotel/roomReservationsDetails.vue

@@ -37,8 +37,8 @@
         <li>
           <input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')"
             @click="saveList(1)" />
-          <input v-if="IsOperation==1&&(CurrentUserInfo.EmployeeId==615||CurrentUserInfo.EmployeeId==46)" type="button"
-            class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)" />
+          <input v-if="IsOperation==1&& EditBtn" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')"
+            @click="saveList(1)" />
           <span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('ground.yizhidanbng')}}</span>
         </li>
       </ul>
@@ -123,7 +123,7 @@
                   </tr>
                 </table>
                 <el-button slot="reference" style="background:#E95252; border-color:#E95252;" type="primary"
-                  v-if="CurrentUserInfo.EmployeeId == 615" @click="IsShowMoreUpdate=true">
+                  v-if="EditBtn" @click="IsShowMoreUpdate=true">
                   批量修改酒店
                 </el-button>
               </el-popover>
@@ -306,7 +306,7 @@
               <!-- 单价/每人 -->
               <td>
                 <template v-if="childIndex==1">
-                  <template v-if="CurrentUserInfo.EmployeeId == 615||CurrentUserInfo.EmployeeId==46">
+                  <template v-if="EditBtn">
                     <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
                       @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'></el-input>
                   </template>
@@ -529,7 +529,7 @@
                       </el-select>
                     </td>
                   </tr>
-                  <tr >
+                  <tr>
                     <td colspan="2" style="height:5px;">
                     </td>
                   </tr>
@@ -548,7 +548,7 @@
                       </span>
                     </td>
                   </tr>
-                  <tr v-if="CurrentUserInfo.EmployeeId == 615">
+                  <tr v-if="EditBtn">
                     <td width="70" style="text-align:right;">{{$t('ground.shifoutbgxfj')}}:</td>
                     <td>
                       <el-select class='w135 sel' v-model='subItem.IsSyncHotelCount'>
@@ -603,6 +603,7 @@
   export default {
     data() {
       return {
+        EditBtn: false, //房餐景点修改权限
         //当前登录用户
         CurrentUserInfo: {},
         defaultSelectValue: 0,
@@ -935,12 +936,13 @@
 
           if (res.data.resultCode == 1) {
             this.IsOperation = res.data.data.IsOperation;
+            if (this.IsEditHotel == 0) {
               this.IsEditHotel = res.data.data.IsEditHotel;
+            }
+            if (this.IsEditHotelPeople == 0) {
               this.IsEditHotelPeople = res.data.data.IsEditHotelPeople;
-            if (this.CurrentUserInfo.EmployeeId == 615 || this.CurrentUserInfo.EmployeeId == 46) {
-              this.IsEditHotel = 1;
-              this.IsEditHotelPeople = 1;
             }
+
             let list = res.data.data.HotelOrderListReport;
             this.CreateBy = res.data.data.CreateBy;
             this.CreateByPhoto = res.data.data.CreateByPhoto;
@@ -1058,8 +1060,7 @@
         var str = "";
         this.list.forEach(item => {
           item.HotelOrderList.forEach(subItem => {
-            if (isUpload && subItem.PayStyle == 1 && subItem.ContractUrl == '' && this.CurrentUserInfo
-              .EmployeeId != 615) {
+            if (isUpload && subItem.PayStyle == 1 && subItem.ContractUrl == '' && !EditBtn) {
               str += `请上传${item.UseTimeStr}的手配书`
               isUpload = false;
             }
@@ -1114,8 +1115,7 @@
         var str = "";
         this.list.forEach(item => {
           item.HotelOrderList.forEach(subItem => {
-            if (isUpload && subItem.PayStyle == 1 && subItem.ContractUrl == '' && this.CurrentUserInfo
-              .EmployeeId != 615) {
+            if (isUpload && subItem.PayStyle == 1 && subItem.ContractUrl == '' && !EditBtn) {
               str += `请上传${item.UseTimeStr}的手配书`
               isUpload = false;
             }
@@ -1193,9 +1193,20 @@
             this.allCurrencyList = res.data.data;
           }
         }, err => {});
+      },
+      GetAuth() {
+        var actionCode = this.$AuthCode.EditRoomDinnerTIcket;
+        this.CheckUserAuth(actionCode, res => {
+          if (res.data.resultCode == 1 && res.data.data == 1) {
+            this.EditBtn = true;
+            this.IsEditHotel = 1;
+            this.IsEditHotelPeople = 1;
           }
+        });
+      },
     },
     mounted() {
+      this.GetAuth();
       this.getAllCurrency();
       let userInfo = this.getLocalStorage()
       this.CurrentUserInfo = userInfo;

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -9,7 +9,7 @@
           </template>
           <template v-else>
             <span style="color:red;font-size:14px;">{{$t('ground.yizhidbnxg')}}!</span>
-            <input v-if="CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')"
+            <input v-if="EditBtn" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')"
               @click="saveList(1)" />
           </template>
         </li>
@@ -230,6 +230,7 @@
   export default {
     data() {
       return {
+        EditBtn:false,//房餐景点修改权限
         IsEditDinner: 0, //1有权限操作餐配
         defaultSelectValue: 0,
         list: [],
@@ -470,9 +471,18 @@
             this.$message.error(res.data.message);
           }
         }, err => {})
+      },
+       CheckAuth() {
+        var actionCode = this.$AuthCode.EditRoomDinnerTIcket;
+        this.CheckUserAuth(actionCode, res => {
+          if (res.data.resultCode == 1 && res.data.data == 1) {
+            this.EditBtn = true;
           }
+        });
+      },
     },
     mounted() {
+      this.CheckAuth();
       this.GetAuth();
       let userInfo = this.getLocalStorage();
       this.CurrentUserInfo = userInfo;

src/components/administrative/AirticketCommission.vue

@@ -11,7 +11,7 @@
     <div class="query-box">
       <ul>
         <li>
-          <input v-if="IsAuth==1 || CurrentUserInfo.EmployeeId==5|| CurrentUserInfo.EmployeeId==615" type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" :disabled="isDisable"  />
+          <input v-if="IsAuth==1" type="button" class="normalBtn" @click="CreateAirticketCommission()" value="生成提成报表" :disabled="isDisable"  />
         </li>
       </ul>
     </div>