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

src/components/dmc/manager/dmcTotalTable.vue

@@ -545,7 +545,7 @@
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
 
     <el-dialog custom-class='w450' title="行程下载" :visible.sync="travelControlTripLayerShow" center>
-      <tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1">
+      <tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="2">
       </tripDownLoadCommon>
     </el-dialog>
 

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -185,11 +185,13 @@
     max-height: 400px;
     overflow: auto;
   }
-  ._TravelPricePopover .ScenicDiv{
+
+  ._TravelPricePopover .ScenicDiv {
     width: 450px;
     max-height: 400px;
     overflow: auto;
   }
+
   ._TravelPricePopover table {
     padding: 10px 0 0 20px;
     background-color: #ededed;
@@ -775,7 +777,7 @@
                     <el-form-item style="margin-top:1px;">
                       <span class="TP_Sendprepend" style="margin:3px -1px 0 0">销售公司</span>
                       <el-select class="w350 multiple_input" :class="{'SaleBranchList':priceData.SaleBranchIdArray==''}"
-                        v-model="priceData.SaleBranchIdArray" multiple>
+                        v-model="priceData.SaleBranchIdArray" multiple @change="ChangeSaleBranch(priceData)">
                         <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
                         </el-option>
                       </el-select>
@@ -1009,7 +1011,7 @@
         selectFilghtList: [],
         FinfoList: [],
         //选中景点
-        ScenicList:[],
+        ScenicList: [],
         //下拉框默认值
         SelectDefaultValue: 0,
         SelectOtherDefault: -1,
@@ -1067,6 +1069,17 @@
       };
     },
     methods: {
+      //销售公司改变方法
+      ChangeSaleBranch(item) {
+        var str = "";
+        if (item.SaleBranchIdArray && item.SaleBranchIdArray.length > 0) {
+          item.SaleBranchIdArray.forEach(subItem => {
+            str += subItem + ",";
+          });
+          str = str.substring(0, str.lastIndexOf(','));
+        }
+        item.SaleBranchId = str;
+      },
       //调用子组件方法
       GetHotelUsePriceList(HotelId, UseDay, index, hotelSubIndex) {
         let str = `comPriceHotelInfo${index}${hotelSubIndex}`;
@@ -1180,7 +1193,7 @@
                 //销售清位时间
                 SaleClearOrderHour: 0,
                 //可退景点下拉列表
-                ScenicBackList:[],
+                ScenicBackList: [],
               };
             }
             this.returnPriceList.push(objItem);
@@ -1574,15 +1587,15 @@
         });
       },
       //选中景点选择框
-      getScenic(item){
-        item.IsChecked=!item.IsChecked;
+      getScenic(item) {
+        item.IsChecked = !item.IsChecked;
         this.initScenic();
       },
       //初始化景点
-      initScenic(){
-        this.ScenicList=[];
-        this.priceData.ScenicBackList.forEach(x=>{
-          if(x.IsChecked){
+      initScenic() {
+        this.ScenicList = [];
+        this.priceData.ScenicBackList.forEach(x => {
+          if (x.IsChecked) {
             this.ScenicList.push(x);
           }
         })
@@ -1816,4 +1829,5 @@
       commonPHInfo: commonPHlInfo
     }
   };
+
 </script>