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

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -122,15 +122,24 @@
       },
       //保存数据
       SaveData() {
+        var currencyNumList = [];
+        if (this.CurrencyNumberListExt != null && this.CurrencyNumberListExt.length > 0) {
+          this.CurrencyNumberListExt.forEach((item, index) => {
+            item.currencyNumberList.forEach(subItem => {
+              currencyNumList.push(subItem);
+            });
+          });
+        }
         var nObj = {
           config: this.postData,
           dayCostPriceList: this.dayCostPriceList,
           otherPrice: this.otherPrice,
           teamPrice: this.teamPrice,
           CostCurrencyList: this.CostCurrencyList,
-          CostNumberList: this.CostNumberList
+          CostNumberList: this.CostNumberList,
+          CurrencyNumberListExt: currencyNumList
         };
-        console.log("请求参数", nObj);
+        
         this.apipost(
           "travel_post_SetConfigOffer_V2", nObj,
           res => {
@@ -161,7 +170,6 @@
           "travel_get_GetMyTravelInfo_V2",
           msg,
           res => {
-            console.log("res.data.data", res.data);
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
               if (tempData.ID && tempData.ID > 0) {
@@ -205,13 +213,16 @@
               if (tempData.teamPrice) {
                 this.teamPrice = tempData.teamPrice;
               }
-              if(tempData.CostNumberList && tempData.CostNumberList!=null && tempData.CostNumberList.length>0)
-              {
-                this.CostNumberList=tempData.CostNumberList;
+              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.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;
               }
             } else {
               this.Error(res.data.message);
@@ -219,7 +230,8 @@
           },
           err => {}
         );
-      }
+      },
+       
     },
     created() {
       this.getPostData();
@@ -228,5 +240,4 @@
       DirectQuotation: DirectQuotation
     }  
   };
-
 </script>
\ No newline at end of file