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

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -347,7 +347,6 @@
                 <!-- <template v-if="CostNumberList&&CostNumberList.length>0">
                   {{( (Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
                 </template> -->
-                <div>测试</div>
               </td>
               <td>
                 {{getDayXiaoJi(3,2)}}

src/components/TravelManager/TravelNewQuotation/priceDialog.vue

@@ -114,7 +114,7 @@
       <div class="switchDiv clearfix" style="width:98%;">
         <div class="DirectPriceCenter">
           <div class="singlePrice clearfix">
-            <CostNewPrice ref="CostNewPrice" :postConfig="postData" :OtherPrice="otherPrice"
+            <CostNewPrice ref="CostNewPrice" :postConfig="postData" :OtherPrice="OtherPrice"
               :dayCostPrice="dayCostPriceList" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
               :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"
               :teamPrice="teamPrice"
@@ -288,7 +288,7 @@
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
-        otherPrice: {
+        OtherPrice: {
           CostId: 0, //主键编号
           ConfigID: 0, //配置编号
           OfferId: 0, //报价单编号
@@ -376,7 +376,7 @@
           offerId: offerId
         };
         this.apipost(
-          "travel_get_GetMyTravelInfo_V2",
+          "travel_get_GetMyTravelInfo_V3",
           msg,
           res => {
             if (res.data.resultCode == 1) {
@@ -417,40 +417,49 @@
               this.postData.OfferPayType = tempData.OfferPayType;
               this.postData.SaleOfferPayType=tempData.SaleOfferPayType;
               this.LineList = tempData.LineList;
-              if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
-                0) {
-                this.dayCostPriceList = tempData.dayCostPriceList;
+              if(tempData.OfferArray) {  
+        this.currentData = tempData.OfferArray.find(item => item.IsDefault)
+        this.OtherPrice = this.currentData.otherPrice
+        this.dayCostPriceList = this.currentData.dayCostPriceList
+        this.CostCurrencyList = this.currentData.CostCurrencyList
+        this.CostNumberList = this.currentData.CostNumberList
+        this.queryMsg = this.currentData.queryMsg
+        this.teamPrice = this.currentData.teamPrice
               }
+              // if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
+              //   0) {
+              //   this.dayCostPriceList = tempData.dayCostPriceList;
+              // }
 
-              if (tempData.otherPrice) {
-                this.otherPrice = tempData.otherPrice;
-              }
-              if (tempData.teamPrice) {
-                this.teamPrice = tempData.teamPrice;
-              }
-              if (tempData.CostNumberList && tempData.CostNumberList != null && tempData.CostNumberList.length > 0) {
-                this.CostNumberList = tempData.CostNumberList;
-              }
-              if (tempData.CostCurrencyList && tempData.CostCurrencyList != null && tempData.CostCurrencyList.length >
-                0) {
-                this.CostCurrencyList = tempData.CostCurrencyList;
-              }
-              if (tempData.CurrencyNumberListExt && tempData.CurrencyNumberListExt != null && tempData
-                .CurrencyNumberListExt.length > 0) {
-                this.CurrencyNumberListExt = tempData.CurrencyNumberListExt;
-              }
-              if (this.CostCurrencyList && this.CostCurrencyList.length > 0 &&
-                this.CurrencyNumberListExt) {
-                this.CostCurrencyList.forEach(item => {
-                  let currencyNumberItem = {
-                    Key: item.CurrencyId,
-                    currencyNumberList: []
-                  };
-                  if (this.CurrencyNumberListExt.length == 0) {
-                    this.CurrencyNumberListExt.push(currencyNumberItem);
-                  }
-                });
-              }
+              // if (tempData.otherPrice) {
+              //   this.otherPrice = tempData.otherPrice;
+              // }
+              // if (tempData.teamPrice) {
+              //   this.teamPrice = tempData.teamPrice;
+              // }
+              // if (tempData.CostNumberList && tempData.CostNumberList != null && tempData.CostNumberList.length > 0) {
+              //   this.CostNumberList = tempData.CostNumberList;
+              // }
+              // if (tempData.CostCurrencyList && tempData.CostCurrencyList != null && tempData.CostCurrencyList.length >
+              //   0) {
+              //   this.CostCurrencyList = tempData.CostCurrencyList;
+              // }
+              // if (tempData.CurrencyNumberListExt && tempData.CurrencyNumberListExt != null && tempData
+              //   .CurrencyNumberListExt.length > 0) {
+              //   this.CurrencyNumberListExt = tempData.CurrencyNumberListExt;
+              // }
+              // if (this.CostCurrencyList && this.CostCurrencyList.length > 0 &&
+              //   this.CurrencyNumberListExt) {
+              //   this.CostCurrencyList.forEach(item => {
+              //     let currencyNumberItem = {
+              //       Key: item.CurrencyId,
+              //       currencyNumberList: []
+              //     };
+              //     if (this.CurrencyNumberListExt.length == 0) {
+              //       this.CurrencyNumberListExt.push(currencyNumberItem);
+              //     }
+              //   });
+              // }
             } else {
               this.Error(res.data.message);
             }