页面修改

src/components/LeaderManagement/leaderReimbursement.vue

@@ -362,7 +362,7 @@
               <span v-else-if="subItem.PayStyle === 11">刷卡</span>
               <span v-else-if="subItem.PayStyle === 10">领队导游垫付</span>
               <span v-else></span>
-              </br>
+              <br/>
               <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
             </td>
             <td v-if="childIndex==0" :rowspan="6">
@@ -476,7 +476,7 @@
               {{subItem.UseAccount}}
             </td>
             <td>
-              {{peopleStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}
+              {{peopleStrToWord(childItem.PeopleType)}}:{{childItem.UsePeopleNum}}
             </td>
             <td>
               {{childItem.Discount}}
@@ -488,7 +488,7 @@
               </p>
             </td>
             <td>
-              {{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
+              {{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
             </td>
             <td>
               {{childItem.DiscountPrice}}%
@@ -504,7 +504,7 @@
               <span v-else-if="subItem.PayStyle === 11">刷卡</span>
               <span v-else-if="subItem.PayStyle === 10">领队导游垫付</span>
               <span v-else></span>
-              </br>
+              <br/>
               <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
             </td>
             <td v-if="childIndex==0" :rowspan="3">
@@ -1219,7 +1219,7 @@
         obj.forEach(x => {
           totalPrice +=
             x.PeoplePrice *
-            (x.PeopleNum - x.Discount) *
+            (x.UsePeopleNum - x.Discount) *
             (1 - x.DiscountPrice / 100);
         });
         if (!(sObj.PayStyle == 1 || sObj.PayStyle == 11)) {
@@ -1298,7 +1298,7 @@
             if (res.data.resultCode == 1) {
               let nav = res.data.data.list;
               this.LineId = res.data.data.EntryId;
-              if (nav[0].OutBranchId == 1216) {
+              if (nav[0].OutBranchId == 1216 || this.myLineId==90) {
                 this.IsShowRMB = true;
               }
               let num = 0;

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -111,7 +111,13 @@
                 {{personStrToWord(childItem.PeopleType)}}
               </td>
               <td>
-                {{childItem.PeopleNum}}
+                <template v-if="EditBtn">
+                  <el-input class='w135' v-model='childItem.UsePeopleNum'
+                    @keyup.native="checkInteger(childItem,'UsePeopleNum')" type="text"></el-input>
+                </template>
+                <template v-else>
+                  {{childItem.UsePeopleNum}}
+                </template>
               </td>
               <td>
                 <template v-if="EditBtn">
@@ -119,21 +125,20 @@
                     @keyup.native="checkPrice(childItem,'PeoplePrice')" type="text"></el-input>
                 </template>
                 <template v-else>
-
                   <span class="spanlink" v-if='childItem.PeoplePrice==0'
                     @click="goUrl('RestaurantPackage',subItem,'套餐查询')">{{$t('leader.leader_Set')}}</span>
                   <template v-else>
                     <el-input class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.PeoplePrice'
-                      @keyup.native="checkInteger(childItem,'PeoplePrice')"></el-input>
+                      @keyup.native="checkPrice(childItem,'PeoplePrice')"></el-input>
                   </template>
                 </template>
               </td>
               <td>
                 <el-input class='w50 tcenter' @input='calculationPrice(subItem)' maxlength='2'
-                  v-model='childItem.Discount' @keyup.native="checkInteger(childItem,'Discount')"></el-input>
+                  v-model='childItem.Discount' @keyup.native="checkPrice(childItem,'Discount')"></el-input>
               </td>
               <td>
-                {{(childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice}}
+                {{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}}
               </td>
               <td>
                 <!--返佣-->
@@ -378,7 +383,7 @@
         obj.DiningPriceList.forEach((item, index) => {
           var tempPrice = 0;
           var coefficient = 1;
-          totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (coefficient - item.DiscountPrice /
+          totalPrice += item.PeoplePrice * (item.UsePeopleNum - item.Discount) * (coefficient - item.DiscountPrice /
             100);
           totalPrice += tempPrice;
         })