页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue

@@ -162,7 +162,6 @@
               </td>
             </tr>
           </table>
-
         </div>
         <br />
         <!--去掉删除功能 closable @close="handleClose(index)"-->
@@ -209,7 +208,6 @@
           CostNumberList: []
         },
         orderList: [],
-       
         queryMsg: {
           IsDefault: false,
           //汇率输入
@@ -217,7 +215,7 @@
           //人数
           PeopleNumber: ""
         },
-    
+
         LineTeamList: [], //系列下拉列表
         companyList: [], //出团公司
         teamList: [],
@@ -273,15 +271,14 @@
       },
       handleClose(index) {
         if (this.orderList.length <= 1) {
-          return
+          return;
         }
         if (this.tabsActive === index) {
-          this.tabsActive = 0
-          this.orderList.splice(index, 1)
-          this.changeTabs()
+          this.tabsActive = 0;
+          this.orderList.splice(index, 1);
+          this.changeTabs();
         } else {
-
-          this.orderList.splice(index, 1)
+          this.orderList.splice(index, 1);
         }
       },
       changeTabs() {
@@ -336,6 +333,20 @@
         for (let i = 0; i < this.orderList.length; i++) {
           this.orderList[i].dayCostPrice = this.createDayTripPriceItem([...this.orderList[i].dayCostPrice]);
         }
+        //判断是否选择币种
+        if (this.orderList && this.orderList.length > 0) {
+          this.orderList.forEach(rootItem => {
+            if (rootItem && rootItem.dayCostPrice && rootItem.dayCostPrice.length > 0) {
+              rootItem.dayCostPrice.forEach(dItem => {
+                console.log(dItem.CurrencyId, "dItem.CurrencyId ");
+                if (dItem.CurrencyId == 0 && rootItem.CostCurrencyList && rootItem.CostCurrencyList.length >
+                  0) {
+                  dItem.CurrencyId = rootItem.CostCurrencyList[0].CurrencyId;
+                }
+              })
+            }
+          });
+        }
         this.$forceUpdate()
       },
       //生成行程报价
@@ -375,6 +386,7 @@
         } else {
           dayCostPrice.length = this.postConfig.DayNum;
         }
+
         return dayCostPrice
       },
       //价格转换器
@@ -419,6 +431,7 @@
           teamPrice: JSON.parse(JSON.stringify(this.teamPrice)),
           CostNumberList: JSON.parse(JSON.stringify(this.CostNumberList)),
         })
+        this.$forceUpdate();
         this.tabsActive = this.orderList.length - 1
         this.changeTabs()
       },
@@ -436,7 +449,7 @@
             }
           });
         }
-        return CurrencyNumberListExt
+        return CurrencyNumberListExt;
       },
     },
     mounted() {

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -135,6 +135,9 @@
           ContractUrl: "", //合同地址
           PriceRemark: "", //定价备注
           ContractArray: [],
+          TaxPrice:0,//税金
+          UnionPrice:0,//联运价格
+          NightPrice:0,//过夜费
         },
         LineList: [], //线路列表
         loading: false

src/components/TravelManager/TravelNewQuotation/priceDialog.vue

@@ -116,11 +116,11 @@
       <div class="switchDiv clearfix" style="width:98%;">
         <div class="DirectPriceCenter">
           <div class="singlePrice clearfix" v-loading="loading">
-            <CostNewPrice ref="CostNewPrice" :postConfig="postData" :OtherPrice="OtherPrice"
+            <CostNewPriceCC ref="CostNewPrice" :postConfig="postData" :OtherPrice="OtherPrice"
               :dayCostPrice="dayCostPriceList" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
               :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt" :teamPrice="teamPrice"
               :loading="loading">
-            </CostNewPrice>
+            </CostNewPriceCC>
           </div>
         </div>
       </div>
@@ -128,7 +128,7 @@
   </div>
 </template>
 <script>
-  import CostNewPrice from "../TravelNewQuotation/CostNewPriceCC";
+  import CostNewPriceCC from "../TravelNewQuotation/CostNewPriceCC";
   export default {
     props: ['ConfigId', 'OfferId'],
     data() {
@@ -305,6 +305,7 @@
               this.postData.OutDateTime = tempData.OutDateTime;
               this.postData.OfferPayType = tempData.OfferPayType;
               this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
+              this.postData.TeamTypeName = tempData.TeamTypeName;
               this.LineList = tempData.LineList;
               if (tempData.OfferArray) {
                 this.currentData = tempData.OfferArray.find(item => item.IsDefault);
@@ -341,7 +342,7 @@
       this.getPostData()
     },
     components: {
-      CostNewPrice: CostNewPrice
+      CostNewPriceCC: CostNewPriceCC
     }
   };