页面修改

src/components/Hotel/roomReservationsDetails.vue

@@ -22,7 +22,7 @@
       <ul>
         <li>
           <input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-          <input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+          <input  v-if="IsOperation==1&&CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
           <span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能再修改!</span>
         </li>
       </ul>
@@ -694,7 +694,6 @@
             if (this.CurrentUserInfo.EmployeeId == 615) {
               this.IsEditHotel = 1;
               this.IsEditHotelPeople = 1;
-              
             }
             let list = res.data.data.HotelOrderListReport;
             this.CreateBy = res.data.data.CreateBy;

src/components/scenicSpot/admissionStatistics.vue

@@ -105,7 +105,7 @@
                       {{thirdItem.UseTimeStr}}
                     </td>
                     <td style="text-align:left;padding-left:3px;">
-                      {{thirdItem.ScenicName}}
+                      {{thirdItem.ScenicName}} 【<span style="color:red">{{getUseTypeStr(thirdItem.TicketPriceList)}}</span>】
                     </td>
                     <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
                       <div class="link">
@@ -158,6 +158,25 @@
       }
     },
     methods: {
+      getUseTypeStr(item) {
+        var str = '';
+        if (item) {
+          item.forEach(childItem => {
+            var useStr = "";
+            if (childItem.PeopleType == 1) {
+              useStr = "成人"
+            }
+            if (childItem.PeopleType == 2) {
+              useStr = "中人"
+            }
+            if (childItem.PeopleType == 3) {
+              useStr = "小人"
+            }
+            str+=useStr+":"+childItem.UsePeopleNum+"，";
+          });
+        }
+        return str.substring(0,str.lastIndexOf('，'));
+      },
       getLineList() {
         this.apipost("line_post_GetAllList", {}, res => {
           if (res.data.resultCode == 1) {
@@ -284,10 +303,12 @@
   .admissionStatisticsTalbe tr td {
     font-size: 12px;
   }
+
   .admissionStatisticsTalbe tr td .link p:hover {
     text-decoration: underline;
     cursor: pointer;
   }
+
   .admissionStatistics_tripDetails {
     padding: 0;
     box-shadow: 0px 1px 3px 0px #dedede;