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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -132,10 +132,10 @@
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
       <tr>
-        <th colspan="23" class="bgwhite">酒店使用 </th>
+        <th colspan="24" class="bgwhite">酒店使用 </th>
       </tr>
       <tr>
-        <th colspan="23" class="bgwhite">
+        <th colspan="24" class="bgwhite">
           税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br />
           税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)<br />
           司导间【月结】不计入总金额
@@ -144,6 +144,7 @@
       <tr class="title">
         <th width="90">使用时间</th>
         <th width="150">酒店名称</th>
+        <th width="150">更换酒店</th>
         <th width="70">占床<br />不占床</th>
         <th width="70">实际<br />用房数</th>
         <th width="70">房间<br />类型</th>
@@ -172,10 +173,16 @@
             <td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length"
               style="white-space:nowrap; ">{{outItem.UseTimeStr}}
             </td>
-            <td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">{{subItem.HotelName}}
-              <p class="cursorpointer" style="margin-top:5px;color: blue;">
-                <a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
-              </p>
+            <td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">
+             <template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''">
+                <span style="text-decoration:line-through"> {{subItem.HotelName}}</span>
+              </template>
+              <template v-else>
+                {{subItem.HotelName}}
+              </template>
+            </td>
+           <td v-if="childIndex==0" :rowspan="6" style="text-align:left;color:red; ">
+               {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
             </td>
             <td v-if="childIndex==0" :rowspan="6">
               {{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
@@ -317,7 +324,7 @@
       </template>
       <tr v-if="TotalNav.reimburseTotalPrice">
         <td>总金额</td>
-        <td colspan="22">
+        <td colspan="23">
           {{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
         </td>
       </tr>

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -3,9 +3,14 @@
     <div class="query-box" style="border-bottom: none;">
       <ul>
         <li>
-          <input v-if="IsOperation !=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+          <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)" />
+          </template>
+          <template v-else>
+            <span style="color:red;font-size:14px;">已制单，不能在修改!</span>
+          </template>
           <input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-          <input v-if="IsOperation !=1" type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
         </li>
       </ul>
     </div>
@@ -75,7 +80,7 @@
                 {{childItem.PeopleNum}}
               </td>
               <td>
-                <el-input  class='w50 tcenter' v-model='childItem.UsePeopleNum' type="number"
+                <el-input class='w50 tcenter' v-model='childItem.UsePeopleNum' type="number"
                   @input='calculationPrice(subItem)' @keyup.native="checkInteger(childItem,'UsePeopleNum')"></el-input>
               </td>
               <td>
@@ -86,7 +91,12 @@
                 <span class="spanlink" v-if='childItem.PeoplePrice==0'
                   @click="goUrl('ticketManagement',subItem,'门票管理')">设置</span>
                 <span v-else>
-                  {{childItem.PeoplePrice}}
+                  <template v-if="CurrentUserInfo.EmployeeId==615">
+                     <el-input class='w135' v-model='childItem.PeoplePrice' @keyup.native="checkPrice(childItem,'PeoplePrice')" type="text"></el-input>
+                  </template>
+                  <template v-else>
+                     {{childItem.PeoplePrice}}
+                  </template>
                 </span>
               </td>
               <td>
@@ -127,8 +137,8 @@
                   </tr>
                 </table>
               </td>
-              <td v-if="childIndex==0" :rowspan="3" >
-                <el-input  type='textarea' rows="4" class='w170' v-model='subItem.Remarks'></el-input>
+              <td v-if="childIndex==0" :rowspan="3">
+                <el-input type='textarea' rows="4" class='w170' v-model='subItem.Remarks'></el-input>
               </td>
             </tr>
           </template>
@@ -148,7 +158,9 @@
         flightTotal: 0,
         GuestNum: 0,
         loading: false,
-        IsOperation:'',
+        IsOperation: '',
+        //当前登录人信息
+        CurrentUserInfo:{},
       }
     },
     methods: {
@@ -209,9 +221,8 @@
                 if (!subItem.Discount) {
                   subItem.Discount = 0;
                 }
-                 if(!subItem.UsePeopleNum)
-                {
-                  subItem.UsePeopleNum=0;
+                if (!subItem.UsePeopleNum) {
+                  subItem.UsePeopleNum = 0;
                 }
               });
             })
@@ -225,9 +236,8 @@
                 if (!subItem.Discount) {
                   subItem.Discount = 0;
                 }
-                if(!subItem.UsePeopleNum)
-                {
-                  subItem.UsePeopleNum=0;
+                if (!subItem.UsePeopleNum) {
+                  subItem.UsePeopleNum = 0;
                 }
               });
             })
@@ -244,6 +254,8 @@
       },
     },
     mounted() {
+      let userInfo = this.getLocalStorage();
+      this.CurrentUserInfo = userInfo;
       this.TCNUM = this.$route.query.TCNUM;
       this.flightTotal = this.$route.query.flightTotal;
       this.GuestNum = this.$route.query.GuestNum;