页面修改

src/components/Hotel/roomReservationsDetails.vue

@@ -193,7 +193,8 @@
                     </td>
                   </tr>
                 </table>
-                <span style="color:red;font-weight:bold">报价金额：{{subItem.OfferUnitPrice}}/人</span>
+                <span style="font-weight:bold;font-size:14px;">报价酒店：<font style="color:red;">{{subItem.OfferHotelName}}(
+                    {{subItem.OfferUnitPrice}}/标间)</font></span>
               </td>
               <!-- 机位总数/(Y/E/F) -->
               <td v-if="childIndex==0" :rowspan="6">
@@ -215,9 +216,9 @@
                   <tr>
                     <td width="70" style="text-align:center;" colspan="2">
                       <span style="color:green">{{subItem.NewHotelName}}</span>
-                      <el-popover placement="right" width="540" trigger="click" >
+                      <el-popover placement="right" width="540" trigger="click">
                         <comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList"
-                          :UseDate="item.UseTimeStr" :Country="ChooseCountry" >
+                          :UseDate="item.UseTimeStr" :Country="ChooseCountry">
                         </comCheckHotel>
                         <el-button size="small" type="danger" :data-index="'comCheckHotel'+index+subIndex+''"
                           slot="reference" style="cursor:pointer;"
@@ -953,6 +954,7 @@
           }
         }
         this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => {
+          console.log("dmcstatistics_get_GetHotelStaticsDetail_V2", res.data);
           if (res.data.resultCode == 1) {
             this.IsOperation = res.data.data.IsOperation;
             if (this.IsEditHotel == 0) {
@@ -969,7 +971,7 @@
             if (list != null && list.length > 0) {
               list.forEach((item, sIndex) => {
                 item.HotelOrderList.forEach(subItem => {
-    
+
                   subItem.hotelList.push({
                     Name: subItem.NewHotelName,
                     ID: subItem.NewHotelId

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -440,7 +440,15 @@
                   {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
                 </td>
                 <td colspan="2">
-                  {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                  <template v-if="postConfig.LineId==14">
+                    {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                  </template>
+                  <template v-else-if="postConfig.LineId==168">
+                    {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                  </template>
+                  <template v-else>
+                    {{subItem.SubtotalMoney}}
+                  </template>
                 </td>
                 <td colspan="4">
                   {{subItem.TotalMoney}}
@@ -594,7 +602,7 @@
       },
       //其它成本价格
       getCostTotalMoney() {
-          //机票+税金+联运+过夜+保险+领队导游分摊
+        //机票+税金+联运+过夜+保险+领队导游分摊
         let totalMoney = this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
           this.getConvertMoney(this.teamPrice.TaxPrice) +
           this.getConvertMoney(this.teamPrice.UnionPrice) +

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -321,7 +321,7 @@
                   @keyup.native="checkPrice(teamPrice,'NightPrice'),getchange()"></el-input>
               </el-form-item>
             </td>
-            <td  >
+            <td>
               <el-form-item label="签证">
                 <el-input type="text" v-model='teamPrice.VisaPrice' class="w100"
                   @keyup.native="checkPrice(teamPrice,'VisaPrice'),getchange()"></el-input>
@@ -456,7 +456,17 @@
                     {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
                   </td>
                   <td>
-                    {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                    <template v-if="postConfig.LineId==14">
+                      {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                    </template>
+                    <template v-else-if="postConfig.LineId==168">
+                      {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                    </template>
+                    <template v-else>
+                      <el-input placeholder="" v-model="subItem.SubtotalMoney"
+                        @keyup.native="checkPrice(subItem,'SubtotalMoney')" class="w70">
+                      </el-input>
+                    </template>
                   </td>
                   <td colspan="4">
                     {{subItem.TotalMoney}}

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -52,9 +52,7 @@
                       <span class="spanlink" @click="goUrl('ticketManagement',subItem,'门票管理')">
                         {{subItem.ScenicName}}
                       </span>
-                      <template v-if="subItem.ScenicOfferPrice&& subItem.ScenicOfferPrice>0">
-                        <br /> 景点报价:<font style="color:red;">{{subItem.ScenicOfferPrice}}</font>
-                      </template>
+
                     </td>
                   </tr>
                   <tr>
@@ -74,6 +72,13 @@
                     </td>
                   </tr>
                 </table>
+                <template v-if="subItem.ScenicOfferPrice&& subItem.ScenicOfferPrice>0">
+                  <br />
+                  <span style="font-weight:bold;font-size:14px;"> 报价景点：<font style="color:red;">
+                      {{subItem.ScenicOfferName}}
+                      ({{subItem.ScenicOfferPrice}}/人)</font>
+                  </span>
+                </template>
               </td>
               <td v-if="childIndex==0" :rowspan="3">
                 {{subItem.UseAccount}}