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

src/components/LeaderManagement/leaderPerformance.vue

@@ -326,6 +326,7 @@
               <el-option label="年榜" :value='3'></el-option>
               <el-option label="总榜" :value='1'></el-option>
               <el-option label="人均" :value='4'></el-option>
+              <el-option label="回佣人均" :value='5'></el-option>
               </el-option>
             </el-select>
           </span>
@@ -364,6 +365,10 @@
               人均
               <i></i>
             </li>
+            <li :class="msg.Type==5?'Day_active':''" @click="msg.Type=5,getStatis()">
+              回佣人均
+              <i></i>
+            </li>
           </ul>
           <div class="ChampionsLeague clearfix">
             <div class="championList" v-for="item in yajun" :key="item.subCode">
@@ -490,7 +495,7 @@
           QMonthStr: this.msg.MonthStr,
           ShoppingID:this.msg.ShoppingID
         };
-        if(msg.Type==4)
+        if(msg.Type==4||msg.Type==5)
         {
           msg.QMonthStr=this.msg.Year+","+this.msg.Month;
         }
@@ -516,7 +521,6 @@
           err => {}
         );
       },
-
       //获取工作类型(值获取领兼地和导游)
       getWorkType() {
         this.apipost(

src/components/LeaderManagement/leaderReimbursement.vue

@@ -125,7 +125,7 @@
       </tr>
       <tr v-if="TotalNav.reimburseTotalPrice">
         <td>总金额</td>
-        <td colspan="15">
+        <td colspan="16">
           <span v-for="item in TotalNav.busPrice">{{item.Str + '：' +item.TotalPrice}} &nbsp;&nbsp;&nbsp;&nbsp;</span>
         </td>
       </tr>
@@ -222,7 +222,8 @@
             <td style="white-space:nowrap; ">
               <p class="cursorpointer text-decoration"
                 @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
-                {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
+                <!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}} -->
+                 {{moneyFormat(childItem.UnitPrice)}}
               </p>
             </td>
             <td style="white-space:nowrap; ">
@@ -375,7 +376,8 @@
             <td>
               <p class="cursorpointer text-decoration"
                 @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')">
-                {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
+                {{ moneyFormat(childItem.PeoplePrice) }}
+                 <!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}} -->
               </p>
             </td>
             <td>
@@ -447,7 +449,8 @@
             <td>
               <p class="cursorpointer text-decoration"
                 @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'admissionStatisticsDetails')">
-                {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
+                <!-- {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}} -->
+                  {{ moneyFormat(childItem.PeoplePrice)}}
               </p>
             </td>
             <td>

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -4,12 +4,13 @@
       <ul>
         <li>
           <template v-if="IsOperation != 1">
-            <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-            <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
+            <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" :disabled="IsDisabled" />
+            <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" :disabled="IsDisabled" />
           </template>
           <template v-else>
             <span style="color:red;font-size:14px;">已制单，不能在修改!</span>
-            <input v-if="CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+            <input v-if="CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存"
+              @click="saveList(1)" />
           </template>
         </li>
       </ul>
@@ -193,7 +194,9 @@
         loading: false,
         IsOperation: '',
         //当前登录人信息
-        CurrentUserInfo:{},
+        CurrentUserInfo: {},
+        //是否禁用按钮
+        IsDisabled: false,
       };
     },
     methods: {
@@ -281,6 +284,7 @@
         obj.TotalPrice = totalPrice.toFixed(2);
       },
       saveList(type) {
+        this.IsDisabled = true;
         if (type == 0) {
           this.list.forEach(item => {
             item.DiningSummaryList.forEach(insideItem => {
@@ -313,7 +317,9 @@
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message);
             this.getList();
+            this.IsDisabled = false;
           } else {
+            this.IsDisabled = false;
             this.$message.error(res.data.message);
           }
         }, err => {})

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -4,8 +4,8 @@
       <ul>
         <li>
           <template v-if="IsOperation !=1">
-            <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-            <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
+            <input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" :disabled="IsDisabled" />
+            <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" :disabled="IsDisabled" />
           </template>
           <template v-else>
             <span style="color:red;font-size:14px;">已制单，不能在修改!</span>
@@ -161,6 +161,8 @@
         IsOperation: '',
         //当前登录人信息
         CurrentUserInfo:{},
+        //是否禁用按钮
+        IsDisabled:false,
       }
     },
     methods: {
@@ -213,6 +215,7 @@
         }, err => {})
       },
       saveList(type) {
+        this.IsDisabled=true;
         if (type == 0) {
           this.DataList.forEach(item => {
             item.ScenicStatisticsList.forEach(insideItem => {
@@ -247,10 +250,13 @@
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message);
             this.getList();
+            this.IsDisabled=false;
           } else {
+            this.IsDisabled=false;
             this.$message.error(res.data.message);
           }
         }, err => {})
+
       },
     },
     mounted() {