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

src/components/Hotel/roomReservationsDetails.vue

@@ -118,7 +118,6 @@
               <td v-if="childIndex==0" :rowspan="6">
                 {{subItem.RealityHouseTypeCount}}
               </td>
-
               <td v-if="childIndex==0" :rowspan="6">
                 <table class="hotelTable">
                   <tr>
@@ -199,10 +198,24 @@
               </td> -->
               <!-- 单价/每人 -->
               <td>
-                <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
-                  @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
-                  :disabled="IsEditHotel==0?true:false">
-                </el-input>
+                <template v-if="childIndex==1">
+                  <template v-if="CurrentUserInfo.EmployeeId == 615">
+                    <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
+                      @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'></el-input>
+                  </template>
+                  <template v-else>
+                    <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
+                      @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
+                      :disabled="(IsEditHotel==0||childItem.IsHaveStockPrice==1)?true:false">
+                    </el-input>
+                  </template>
+                </template>
+                <template v-else>
+                  <el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
+                    @input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
+                    :disabled="IsEditHotel==0?true:false">
+                  </el-input>
+                </template>
               </td>
               <!-- 免减人数 -->
               <td>
@@ -732,9 +745,8 @@
                     ID: subItem.NewHotelId
                   });
                   //默认成日元
-                  if(subItem.CurrencyId==0)
-                  {
-                    subItem.CurrencyId=3;
+                  if (subItem.CurrencyId == 0) {
+                    subItem.CurrencyId = 3;
                   }
                   this.calculationPrice(subItem);
                   subItem.OrderDetailsList.forEach((x, index1) => {
@@ -774,7 +786,7 @@
             return item.ID === obj.CurrencyId; //筛选出匹配数据
           });
         }
-        
+
         //日元
         let jpaObj = this.allCurrencyList.find(item => {
           return item.ID === 3; //筛选出匹配数据
@@ -805,13 +817,12 @@
           else if (currentObj.ID == 3) {
             obj.NewTotalPrice = "";
           } else {
-            if(currentObj.CurrentRate>1)
-            {
-              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)/currentObj.CurrentRate).toFixed(2);
-            }
-            else
-            {
-              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)*currentObj.CurrentRate).toFixed(2);
+            if (currentObj.CurrentRate > 1) {
+              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice * jpaObj.PayRate) / currentObj.CurrentRate)
+                .toFixed(2);
+            } else {
+              obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice * jpaObj.PayRate) * currentObj.CurrentRate)
+                .toFixed(2);
             }
           }
         } else {

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -468,6 +468,7 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
+      this.msg.LineId=14;//默认日本线
       // this.msg.StartDate = '';
       // this.msg.TCNUM = 'NRTCA07190704A';
       this.getLineList();