页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -22,6 +22,7 @@
     color: #106BAF;
     font-weight: bold;
     background-color: #D1EEEE;
+    white-space:nowrap; 
   }
 
   .CostNewTable td {
@@ -156,11 +157,10 @@
           </div>
         </div>
         <br />
-
         <table class="CostPriceTable CostNewTable">
           <thead>
             <tr>
-              <td colspan="9" class="CP_ComTitle2 CostcomCenter">报价信息</td>
+              <td colspan="12" class="CP_ComTitle2 CostcomCenter">报价信息</td>
             </tr>
             <tr>
               <td width="170" class="CP_ComTitle2 CostcomCenter">币种</td>
@@ -170,7 +170,7 @@
                   <i class="iconfont icon-quxiao" style="display:inline-block;" @click="DeleteCurrency(index)"></i>
                 </span>
               </td>
-              <td :colspan="9-2-CostCurrencyList.length+1">
+              <td :colspan="12-2-CostCurrencyList.length+1">
                 <el-form-item class="w70">
                   <el-select v-model='currencyType' @change="getRate(currencyType),addCurrency()">
                     <el-option v-for="item in currencyTypeArr" :label='item.Name' :value='item.ID' :key='item.ID'>
@@ -186,7 +186,7 @@
                   @keyup.native="checkRate(item,'ExchangeRate'),getchange()">
                 </el-input>
               </td>
-              <td :colspan="9-2-CostCurrencyList.length+1">
+              <td :colspan="12-2-CostCurrencyList.length+1">
                 <el-input class="w70" v-model='queryMsg.RateInput'
                   @keyup.native="checkRate(queryMsg,'RateInput'),getchange()">
                 </el-input>
@@ -201,7 +201,7 @@
                   <i class="iconfont icon-quxiao" @click="DeletePNumber(index),getchange()"></i>
                 </span>
               </td>
-              <td width="150" :colspan="9-2-CostNumberList.length+1">
+              <td width="150" :colspan="12-2-CostNumberList.length+1">
                 <el-form-item>
                   <el-input class="w50" v-model='queryMsg.PeopleNumber'
                     @keyup.native="checkInteger(queryMsg,'PeopleNumber'),getchange()"></el-input>
@@ -219,23 +219,26 @@
                     @keyup.native="checkPrice(childItem,'Money',true),getchange()"></el-input>
                 </el-form-item>
               </td>
-              <td :colspan="9-2-getCurrencyNumberList(item.CurrencyId).length+1">
+              <td :colspan="12-2-getCurrencyNumberList(item.CurrencyId).length+1">
               </td>
             </tr>
           </thead>
           <tr>
-            <td colspan="9"></td>
+            <td colspan="12"></td>
           </tr>
           <tr>
             <td rowspan="2" width='180' class="CP_ComTitle2 CostcomCenter">Day</td>
             <td rowspan="2" width='200' class="CP_ComTitle2 CostcomCenter">行程大点</td>
             <td rowspan="2" width="100" class="CP_ComTitle2 CostcomCenter">币种</td>
             <td rowspan="2" width='60' class="CP_ComTitle2 CostcomCenter">酒店</td>
-            <td rowspan="2" width='100' class="CP_ComTitle2 CostcomCenter">车</td>
+            <td colspan="3" width='100' class="CP_ComTitle2 CostcomCenter">车</td>
             <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="3" width='100' class="CP_ComTitle2 CostcomCenter">餐</td>
           </tr>
           <tr>
+            <td width="120" class="CP_ComTitle2 CostcomCenter">总车资</td>
+            <td width="100" class="CP_ComTitle2 CostcomCenter">人数</td>
+            <td width="100" class="CP_ComTitle2 CostcomCenter" style="white-space:nowrap; ">每人车资</td>
             <td width="120" class="CP_ComTitle2 CostcomCenter">早</td>
             <td width="100" class="CP_ComTitle2 CostcomCenter">中</td>
             <td width="100" class="CP_ComTitle2 CostcomCenter">晚</td>
@@ -266,6 +269,16 @@
                 @keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()">
               </el-input>
             </td>
+            <td>
+              <template v-if="CostNumberList&&CostNumberList.length>0">
+                {{CostNumberList[0].PeopleNumber}}
+              </template>
+            </td>
+            <td>
+              <template v-if="CostNumberList&&CostNumberList.length>0">
+                {{Number(subItem.BusCostPrice)/Number(CostNumberList[0].PeopleNumber)}}
+              </template>
+            </td>
             <td>
               <el-input type='text' v-model="subItem.ScenicCostPrice" class="w70"
                 @keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input>
@@ -286,33 +299,79 @@
           </tr>
           <tr>
             <td colspan="3" class="CP_ComTitle2 CostcomCenter">
+              <template v-if="dayCostPrice&&dayCostPrice.length>0">
+                <span>{{getCurrencyName(dayCostPrice[0].CurrencyId)}}</span>
+              </template>
               小计
             </td>
             <td>
-              {{getDayXiaoJi(1)}}
+              {{getDayXiaoJi(1,1)}}
             </td>
             <td>
-              {{getDayXiaoJi(2)}}
+              {{getDayXiaoJi(2,1)}}
             </td>
             <td>
-              {{getDayXiaoJi(3)}}
+              <template v-if="CostNumberList&&CostNumberList.length>0">
+                {{CostNumberList[0].PeopleNumber}}
+              </template>
             </td>
             <td>
-              {{getDayXiaoJi(4)}}
+              <template v-if="CostNumberList&&CostNumberList.length>0">
+                {{(Number(getDayXiaoJi(2,1))/Number(CostNumberList[0].PeopleNumber)).toFixed(2)}}
+              </template>
             </td>
             <td>
-              {{getDayXiaoJi(5)}}
+              {{getDayXiaoJi(3,1)}}
             </td>
             <td>
-              {{getDayXiaoJi(6)}}
+              {{getDayXiaoJi(4,1)}}
+            </td>
+            <td>
+              {{getDayXiaoJi(5,1)}}
+            </td>
+            <td>
+              {{getDayXiaoJi(6,1)}}
             </td>
           </tr>
           <tr>
-            <td colspan="9"></td>
+            <td colspan="3" class="CP_ComTitle2 CostcomCenter">
+              人民币 小计
+            </td>
+            <td>
+              {{getDayXiaoJi(1,2)}}
+            </td>
+            <td>
+              {{getDayXiaoJi(2,2)}}
+            </td>
+            <td>
+              <template v-if="CostNumberList&&CostNumberList.length>0">
+                {{CostNumberList[0].PeopleNumber}}
+              </template>
+            </td>
+            <td>
+              <template v-if="CostNumberList&&CostNumberList.length>0">
+                {{(Number(getDayXiaoJi(2,2))/Number(CostNumberList[0].PeopleNumber)).toFixed(2)}}
+              </template>
+            </td>
+            <td>
+              {{getDayXiaoJi(3,2)}}
+            </td>
+            <td>
+              {{getDayXiaoJi(4,2)}}
+            </td>
+            <td>
+              {{getDayXiaoJi(5,2)}}
+            </td>
+            <td>
+              {{getDayXiaoJi(6,2)}}
+            </td>
+          </tr>
+          <tr>
+            <td colspan="12"></td>
           </tr>
           <tr>
-            <td class="CP_ComTitle2" colspan="4">内陆段交通部分</td>
-            <td class="CP_ComTitle2" colspan="5">杂支部分</td>
+            <td class="CP_ComTitle2" colspan="5">内陆段交通部分</td>
+            <td class="CP_ComTitle2" colspan="6">杂支部分</td>
           </tr>
           <tr>
             <td class="CP_ComTitle2 CostcomCenter">1</td>
@@ -327,7 +386,7 @@
                 </el-select>
               </el-form-item>
             </td>
-            <td>
+            <td colspan="2">
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.InlandAirTicketMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
@@ -335,7 +394,7 @@
             </td>
             <td class="CP_ComTitle2 CostcomCenter">1</td>
             <td colspan="2" class="CP_ComTitle2">签证费(每人)</td>
-            <td colspan="2">
+            <td colspan="3">
               <el-form-item>
                 <el-input type='text' class="w100" v-model="OtherPrice.VisaMoney"
                   @keyup.native="checkPrice(OtherPrice,'VisaMoney'),getchange()"></el-input>
@@ -355,7 +414,7 @@
                 </el-select>
               </el-form-item>
             </td>
-            <td>
+            <td colspan="2">
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.InlandShipTicketMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandShipTicketMoney'),getchange()"></el-input>
@@ -363,7 +422,7 @@
             </td>
             <td class="CP_ComTitle2 CostcomCenter">2</td>
             <td colspan="2" class="CP_ComTitle2">保险费(每人)</td>
-            <td colspan="2">
+            <td colspan="3">
               <el-form-item>
                 <el-input type='text' class="w100" v-model="OtherPrice.SafeMoney"
                   @keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
@@ -383,7 +442,7 @@
                 </el-select>
               </el-form-item>
             </td>
-            <td>
+            <td colspan="2">
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.InlandTrainTicketMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandTrainTicketMoney'),getchange()"></el-input>
@@ -391,7 +450,7 @@
             </td>
             <td class="CP_ComTitle2 CostcomCenter">3</td>
             <td colspan="2" class="CP_ComTitle2">领队小费</td>
-            <td colspan="2">
+            <td colspan="3">
               <el-form-item>
                 <el-input type='text' class="w100" v-model="OtherPrice.LeaderTripMoney"
                   @keyup.native="checkPrice(OtherPrice,'LeaderTripMoney'),getchange()"></el-input>
@@ -399,10 +458,10 @@
             </td>
           </tr>
           <tr>
-            <td colspan="4"></td>
+            <td colspan="5"></td>
             <td class="CP_ComTitle2 CostcomCenter">4</td>
             <td colspan="2" class="CP_ComTitle2">司机、导游小费</td>
-            <td colspan="2">
+            <td colspan="3">
               <el-form-item>
                 <el-input type='text' class="w100" v-model="OtherPrice.DriverGuideMoney"
                   @keyup.native="checkPrice(OtherPrice,'DriverGuideMoney'),getchange()"></el-input>
@@ -413,31 +472,31 @@
             <td class="CP_ComTitle2">
               小计
             </td>
-            <td colspan="3">
+            <td colspan="4">
               {{Number(OtherPrice.InlandAirTicketMoney)+Number(OtherPrice.InlandShipTicketMoney)+Number(OtherPrice.InlandTrainTicketMoney)}}
             </td>
             <td class="CP_ComTitle2">
               小计
             </td>
-            <td colspan="4">
+            <td colspan="5">
               {{Number(OtherPrice.VisaMoney)+Number(OtherPrice.SafeMoney)+Number(OtherPrice.LeaderTripMoney)+Number(OtherPrice.DriverGuideMoney)}}
             </td>
           </tr>
           <tr>
-            <td colspan="9"></td>
+            <td colspan="12"></td>
           </tr>
           <tr>
             <td class="CP_ComTitle2" colspan="2">其他支出</td>
-            <td class="CP_ComTitle2" colspan="2">机票</td>
-            <td class="CP_ComTitle2" colspan="2">收入</td>
+            <td class="CP_ComTitle2" colspan="3">机票</td>
+            <td class="CP_ComTitle2" colspan="3">收入</td>
             <td class="CP_ComTitle2" colspan="3">团负费</td>
           </tr>
           <tr>
             <td class="CP_ComTitle2 CostcomCenter">摘要</td>
             <td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
-            <td class="CP_ComTitle2 CostcomCenter">摘要</td>
+            <td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
             <td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
-            <td class="CP_ComTitle2 CostcomCenter">摘要</td>
+            <td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
             <td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
             <td class="CP_ComTitle2 CostcomCenter">摘要</td>
             <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br />(人民币)</td>
@@ -450,14 +509,14 @@
                   @keyup.native="checkPrice(OtherPrice,'SalesCommissionMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
-            <td class="CP_ComTitle2">机票</td>
+            <td class="CP_ComTitle2" colspan="2">机票</td>
             <td>
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.AirTicketMoeny"
                   @keyup.native="checkPrice(OtherPrice,'AirTicketMoeny'),getchange()"></el-input>
               </el-form-item>
             </td>
-            <td class="CP_ComTitle2">客人小费收入</td>
+            <td class="CP_ComTitle2" colspan="2">客人小费收入</td>
             <td>
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.TripMoney"
@@ -480,8 +539,8 @@
                   @keyup.native="checkPrice(OtherPrice,'OfficeCommissionMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
-            <td colspan="2"></td>
-            <td class="CP_ComTitle2">导游人头费</td>
+            <td colspan="3"></td>
+            <td class="CP_ComTitle2" colspan="2">导游人头费</td>
             <td>
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.GuidePeopleMoney"
@@ -490,45 +549,45 @@
             </td>
             <td colspan="3"></td>
           </tr>
-            <tr>
-            <td class="CP_ComTitle2" >
+          <tr>
+            <td class="CP_ComTitle2">
               小计
             </td>
-            <td >
-               {{Number(OtherPrice.SalesCommissionMoney)+Number(OtherPrice.OfficeCommissionMoney)}}
+            <td>
+              {{Number(OtherPrice.SalesCommissionMoney)+Number(OtherPrice.OfficeCommissionMoney)}}
             </td>
-            <td class="CP_ComTitle2"  >
-             小计
+            <td class="CP_ComTitle2">
+              小计
             </td>
-            <td >
+            <td colspan="2">
               {{Number(OtherPrice.AirTicketMoeny)}}
             </td>
-             <td class="CP_ComTitle2"  >
-             小计
+            <td class="CP_ComTitle2">
+              小计
             </td>
-            <td>
+            <td colspan="2">
               {{Number(OtherPrice.TripMoney)+Number(OtherPrice.GuidePeopleMoney)}}
             </td>
-              <td class="CP_ComTitle2"  >
-             小计
+            <td class="CP_ComTitle2">
+              小计
             </td>
             <td colspan="2">
               {{Number(OtherPrice.KBMoney)}}
             </td>
           </tr>
           <tr>
-            <td colspan="9"></td>
+            <td colspan="12"></td>
           </tr>
           <tr>
-            <td colspan="9" class="CP_ComTitle2">领队分摊部分</td>
+            <td colspan="12" class="CP_ComTitle2">领队分摊部分</td>
           </tr>
           <tr>
             <td class="CP_ComTitle2 CostcomCenter">人数</td>
             <td class="CP_ComTitle2 CostcomCenter">机票</td>
             <td class="CP_ComTitle2 CostcomCenter">门票</td>
             <td class="CP_ComTitle2 CostcomCenter">单房差</td>
-            <td class="CP_ComTitle2 CostcomCenter">内陆段交通</td>
-            <td class="CP_ComTitle2 CostcomCenter">杂费</td>
+            <td class="CP_ComTitle2 CostcomCenter" colspan="2">内陆段交通</td>
+            <td class="CP_ComTitle2 CostcomCenter" colspan="2">杂费</td>
             <td class="CP_ComTitle2 CostcomCenter" colspan="3">小计</td>
           </tr>
           <tr>
@@ -551,13 +610,13 @@
                   @keyup.native="checkPrice(OtherPrice,'SingleRoomShareMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
-            <td>
+            <td colspan="2">
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.InlandTrafficShareMoney"
                   @keyup.native="checkPrice(OtherPrice,'InlandTrafficShareMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
-            <td>
+            <td colspan="2">
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.OtherShareMoney"
                   @keyup.native="checkPrice(OtherPrice,'OtherShareMoney'),getchange()"></el-input>
@@ -570,27 +629,27 @@
             <td>{{item.AirTicketMoney}}</td>
             <td>{{item.TicketMoney}}</td>
             <td>{{item.SingleRoomMoney}}</td>
-            <td>{{item.InlandTrafficMoney}}</td>
-            <td>{{item.OtherMoney}}</td>
+            <td colspan="2">{{item.InlandTrafficMoney}}</td>
+            <td colspan="2">{{item.OtherMoney}}</td>
             <td colspan="3">{{item.SubtotalMoney}}</td>
           </tr>
           <tr>
-            <td colspan="9"></td>
+            <td colspan="12"></td>
           </tr>
           <tr>
-            <td colspan="9" class="CP_ComTitle2">成本统计（以下报价为每人费用）</td>
+            <td colspan="12" class="CP_ComTitle2">成本统计（以下报价为每人费用）</td>
           </tr>
           <tr>
             <td class="CP_ComTitle2">人数统计</td>
-            <td colspan="8">计算规则: (房+餐+车+景点)*汇率+内陆段交通+杂支部分+其他资产+机票票+收入+团负费+领队分摊+地接报价*汇率</td>
+            <td colspan="11">计算规则: (房+餐+车+景点)*汇率+内陆段交通+杂支部分+其他资产+机票票+收入+团负费+领队分摊+地接报价*汇率</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
             <td>{{item.PeopleNumber}}+1</td>
-            <td colspan="8">{{item.TotalMoney}}</td>
+            <td colspan="11">{{item.TotalMoney}}</td>
           </tr>
           <tr>
             <td class="CP_ComTitle2">备注</td>
-            <td colspan="8">
+            <td colspan="11">
               <el-input type="textarea" v-model="OtherPrice.OtherRemark"></el-input>
             </td>
           </tr>
@@ -624,40 +683,44 @@
 
     },
     methods: {
-      getDayXiaoJi(type) {
+      getDayXiaoJi(type, currencyType) {
         var xiaoJi = 0;
         this.dayCostPrice.forEach(item => {
+          var currencyRate = 1;
+          if (currencyType == 2) {
+            currencyRate = this.getCurrencyMoney(item.CurrencyId);
+          }
           //酒店
           if (type == 1) {
-            xiaoJi += Number(item.HotelCostPrice);
+            xiaoJi += Number(item.HotelCostPrice) * Number(currencyRate);
           }
           //车
           if (type == 2) {
-            xiaoJi += Number(item.BusCostPrice);
+            xiaoJi += Number(item.BusCostPrice) * Number(currencyRate);
           }
           //景点
           if (type == 3) {
-            xiaoJi += Number(item.ScenicCostPrice);
+            xiaoJi += Number(item.ScenicCostPrice) * Number(currencyRate);
           }
           //早餐
           if (type == 4) {
-            xiaoJi += Number(item.BreakfastCostPrice);
+            xiaoJi += Number(item.BreakfastCostPrice) * Number(currencyRate);
           }
           //午餐
           if (type == 5) {
-            xiaoJi += Number(item.LunchCostPrice);
+            xiaoJi += Number(item.LunchCostPrice) * Number(currencyRate);
           }
           //午餐
           if (type == 6) {
-            xiaoJi += Number(item.DinnerCostPrice);
+            xiaoJi += Number(item.DinnerCostPrice) * Number(currencyRate);
           }
         });
-        return xiaoJi;
+        return xiaoJi.toFixed(2);
       },
       ReCalc() {},
       //获取汇率
       getCurrencyMoney(currencyId) {
-        let currency =1;
+        let currency = 1;
         this.CostCurrencyList.forEach(x => {
           if (x.CurrencyId == currencyId) {
             currency = x.ExchangeRate;
@@ -665,6 +728,16 @@
         });
         return currency;
       },
+      //获取币种名称
+      getCurrencyName(currencyId) {
+        let CurrencyName = "";
+        this.CostCurrencyList.forEach(x => {
+          if (x.CurrencyId == currencyId) {
+            CurrencyName = x.CurrencyName;
+          }
+        });
+        return CurrencyName;
+      },
       //判断币种是否相等
       checkExists(CurrencyId) {
         var flag = false;

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -182,6 +182,7 @@
           res => {
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
+              console.log("tempData",tempData);
               if (tempData.ID && tempData.ID > 0) {
                 this.postData.ID = tempData.ID;
               }
@@ -242,14 +243,11 @@
                     Key: item.CurrencyId,
                     currencyNumberList: []
                   };
-                  if(this.CurrencyNumberListExt.length==0)
-                  {
-this.CurrencyNumberListExt.push(currencyNumberItem);
+                  if (this.CurrencyNumberListExt.length == 0) {
+                    this.CurrencyNumberListExt.push(currencyNumberItem);
                   }
-                  
                 });
               }
-              console.log("tempData.CurrencyNumberListExt",tempData.CurrencyNumberListExt);
             } else {
               this.Error(res.data.message);
             }