页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -128,10 +128,10 @@
           </tr>
           <tr>
             <td class="CP_comBack">汇率</td>
-            <!-- <td v-for='item in OfferCostPriceObj.CostCurrencyList'>
+            <td v-for='item in OtherPrice.CostCurrencyList'>
               <el-input class="w80" v-model='item.ExchangeRate' @keyup.native="checkRate(item,'ExchangeRate')">
               </el-input>
-            </td> -->
+            </td>
             <td>
               <el-input class="w100" v-model='queryMsg.RateInput' @keyup.native="checkRate(queryMsg,'RateInput')">
               </el-input>
@@ -564,7 +564,62 @@
           }
           this.dayCostPrice.length = this.postConfig.DayNum;
         }
-        console.log(" this.dayCostPrice", this.dayCostPrice);
+      },
+        //添加币种
+      addCurrency() {
+        var currencyId = this.currencyType;
+        var ckedName;
+        var ckedRate = this.queryMsg.RateInput;
+        if (currencyId == "") {
+          this.Info("请选择币种");
+          return;
+        }
+        if (ckedRate == "") {
+          this.Info("请输入汇率");
+          return;
+        }
+        this.currencyTypeArr.forEach(x => {
+          if (currencyId == x.ID) {
+            ckedName = x.Name;
+          }
+        });
+        if (
+          this.$tripUtils.isInObjArr(
+            this.OfferCostPriceObj.CostCurrencyList,
+            "CurrencyId",
+            currencyId
+          )
+        ) {
+          this.Info("币种已经存在");
+          return;
+        }
+        var CurObj = this.$tripUtils.CostCurrency();
+        CurObj.CurrencyName = ckedName;
+        CurObj.ExchangeRate = ckedRate;
+        CurObj.CurrencyId = currencyId;
+        this.OtherPrice.CostCurrencyList.push(CurObj);
+        this.currencyType = "";
+        this.queryMsg.RateInput = "";
+        let currencyNumberItem = {
+          Key: currencyId,
+          currencyNumberList: []
+        };
+        if (this.OtherPrice.CurrencyNumberListExt.length > 0) {
+          if (
+            this.OtherPrice.CurrencyNumberListExt[0].currencyNumberList
+              .length > 0
+          ) {
+            this.OtherPrice.CurrencyNumberListExt[0].currencyNumberList.forEach(
+              x => {
+                let tempData = JSON.parse(JSON.stringify(x));
+                tempData.CurrencyId = currencyId;
+                tempData.Money = 0.0;
+                currencyNumberItem.currencyNumberList.push(tempData);
+              }
+            );
+          }
+        }
+        this.OtherPrice.CurrencyNumberListExt.push(currencyNumberItem);
       },
       //添加人数费用
       addPeoNunber() {
@@ -575,7 +630,7 @@
         }
         if (
           this.$tripUtils.isInObjArr(
-            this.OfferCostPriceObj.CostNumberList,
+            this.OtherPrice.CostNumberList,
             "PeopleNumber",
             PeopleNumber
           )
@@ -585,8 +640,8 @@
         }
         var CostNumberObj = this.$tripUtils.CostNumber();
         CostNumberObj.PeopleNumber = PeopleNumber;
-        this.OfferCostPriceObj.CostNumberList.push(CostNumberObj);
-        this.OfferCostPriceObj.CurrencyNumberListExt.forEach(x => {
+        this.OtherPrice.CostNumberList.push(CostNumberObj);
+        this.OtherPrice.CurrencyNumberListExt.forEach(x => {
           var CurrencyNumberObj = this.$tripUtils.CurrencyNumber();
           CurrencyNumberObj.CurrencyId = x.Key;
           CurrencyNumberObj.PeopleNumber = PeopleNumber;
@@ -630,6 +685,7 @@
     },
     mounted() {
       this.getAllCurrency();
+      console.log("OtherPrice",this.OtherPrice);
     },
     watch: {
 

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -80,6 +80,7 @@
           OtherShareMoney: 0, //杂费分摊费用
           CostCurrencyList: [], //选择的币种
           CostNumberList: [], //人数
+          CurrencyNumberListExt:[],//币种和人数列表
         },
         //团报价信息
         teamPrice: {
@@ -147,9 +148,19 @@
             if (res.data.resultCode == 1) {
                var tempData=res.data.data;
                this.LineList=tempData.LineList;
-               this.dayCostPriceList=tempData.dayCostPriceList;
-               this.otherPrice=tempData.otherPrice;
-               this.teamPrice=tempData.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;
+               }
+               
             } else {
               this.Error(res.data.message);
             }