11

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -688,7 +688,7 @@
                         {{item.StartDateWeekStr}}</font>)
                     </span>
                     <template v-if="item.RelationPriceList && item.RelationPriceList.length > 0">
-                      <el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
+                      <el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')" placement="top-start">
                         <el-popover width="350" trigger="click" popper-class="TC_HotelPop">
                           <table width="100%" border="0" cellspacing="0" cellpadding="0">
                             <tr>
@@ -1577,6 +1577,12 @@
                       <el-dropdown-item @click.native="ckChangePrice(item,2)">
                         团队类型变更
                       </el-dropdown-item>
+                      <!-- <el-dropdown-item @click.native="shorTripDialog(item,1)">
+                        系列合并
+                      </el-dropdown-item>
+                      <el-dropdown-item @click.native="shorTripDialog(item,2)">
+                        当团合并
+                      </el-dropdown-item> -->
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
@@ -1950,6 +1956,11 @@
         <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
       </el-dialog>
     </div>
+    <div v-if="isShowPriceTripDialog">
+      <el-dialog :visible.sync="isShowPriceTripDialog" width="1400px" :title="$t('objFill.baojiaxiangqing')">
+        <comChooseTrip :priceObj="priceObj" :mergeType="mergeType" ref="dialog"></comChooseTrip>
+      </el-dialog>
+    </div>
     <!-- 修改出团公司 -->
     <EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel="CancelGroupType"
       @Success="getControlList()" />
@@ -2275,6 +2286,9 @@
           },
         },
         teamList: [], //团队类型列表
+        isShowPriceTripDialog: false,
+        priceObj: {},
+        mergeType: 1,
       };
     },
     //监听器
@@ -2286,6 +2300,12 @@
       },
     },
     methods: {
+      //显示合并团队弹窗
+      shorTripDialog(item, type) {
+        this.priceObj = item;
+        this.mergeType = type;
+        this.isShowPriceTripDialog = true;
+      },
       //团队类型
       getTravelTeamList() {
         this.apipost(

src/components/commonPage/comChooseTrip.vue

@@ -94,23 +94,13 @@
         <el-col :span="6">
           <el-form-item :label="$t('system.table_ssLine')" label-width="115px;">
             <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
-              @change="getLinePlaceList()">
+              @change="getLineTeamList">
               <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
               <el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID"
                 :key="item.LineID"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item :label="$t('system.query_dest')" label-width="115px;">
-            <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
-              @change="getLineTeamList()">
-              <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
-              <el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
-                :key="item.LtID"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="6">
           <el-form-item :label="$t('active.ad_xlmc')" label-width="115px;">
             <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
@@ -132,41 +122,53 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="10">
-          <el-form-item :label="$t('scen.sc_ftTime')" label-width="115px;">
-            <DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate"
-              :EndGroupDate="queryMsg.EndGroupDate" @change="(date) => (queryMsg.StartGroupDate = date)"></DateLimit>
-            <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
-              :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <!--出团类型-->
           <el-form-item :label="$t('objFill.v101.chutuanleix')" label-width="115px;">
             <el-select class="w150" v-model="queryMsg.QTeamType">
               <el-option v-for="item in teamList" :key="item.ID" :label="item.Name" :value="item.ID">
               </el-option>
             </el-select>
-            <input type="button" class="hollowFixedBtn" @click="resetPageIndex(), GetList()"
-              :value="$t('pub.searchBtn')" />
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item :label="$t('scen.sc_ftTime')" label-width="115px;">
+            <DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate"
+              :EndGroupDate="queryMsg.EndGroupDate" @change="(date) => (queryMsg.StartGroupDate = date)"></DateLimit>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-button @click="resetPageIndex()" size="small">{{$t('pub.searchBtn')}}</el-button>
+          <el-button type="primary" size="small" @click="saveMerage" :loading="saveLoading">合并</el-button>
+        </el-col>
       </el-row>
     </el-form>
     <table style="width: 100%" class="table-striped" v-loading="queryMsg.loading">
       <tr>
         <th width="50">
-          {{ $t("fnc.xuanze") }}
+          <font style="cursor:pointer;" @click="isAllCheck=!isAllCheck,checkAll()"> {{!isAllCheck?"全选":"取消全选"}}</font>
         </th>
         <th>
           {{ $t("objFill.v101.chufari") }}
         </th>
-        <th colspan="2">
+        <th>
           {{ $t("visa.v_tuanhao") }}
         </th>
+        <th>
+          {{ $t("scen.sc_cp") }}
+        </th>
+        <th>
+          {{ $t("system.table_ssLine") }}
+        </th>
+        <th>
+          {{ $t("active.ad_xlmc") }}
+        </th>
         <th>
           {{ $t("ground.tianshu") }}
         </th>
+        <th>
+          {{$t("Operation.Op_tradePrice")}}
+        </th>
         <th>
           {{$t('Operation.Op_directPrice')}}
         </th>
@@ -177,14 +179,22 @@
       <tbody v-for="(item, index) in dataList" :key="index">
         <tr>
           <td rowspan="2">
-            <el-checkbox v-model="item.Checked" @change="changeTrip(item)"></el-checkbox>
+            <el-checkbox v-model="item.Checked"></el-checkbox>
           </td>
           <td>
             {{ item.StartDate }}
           </td>
-          <td colspan="2">{{ item.TCNUM }}({{ item.TCID }})</td>
+          <td>{{ item.TCNUM }}({{ item.TCID }})</td>
+          <td>
+            {{item.OutBranchName}}
+          </td>
+          <td>{{ item.LineName }} </td>
+          <td>{{ item.LtName }}</td>
+          <td>
+            {{ item.DayNum }}{{ $t("hotel.hotel_day") }}{{ item.NightNum }}{{ $t("Operation.Op_night") }}
+          </td>
           <td>
-            {{ item.DayNum }}
+            {{item.B2BPrice}}
           </td>
           <td>
             {{ item.B2CPrice }}
@@ -199,7 +209,7 @@
           </td>
         </tr>
         <tr>
-          <td colspan="6" style="text-align: left">
+          <td colspan="10" style="text-align: left">
             <span class="title">
               {{ item.Title }}
             </span>
@@ -208,7 +218,7 @@
       </tbody>
       <tfoot>
         <tr>
-          <td colspan="7">
+          <td colspan="10">
             <div class="noData" v-show="queryMsg.noData">
               {{ $t("system.content_noData") }}
             </div>
@@ -227,7 +237,22 @@
     components: {
       DateLimit,
     },
-    props: ["IsMultiple"],
+    props: ["priceObj", "mergeType"],
+    watch: {
+      priceObj: {
+        handler: function (val, oldVal) {
+          console.log("w_priceObj", this.priceObj);
+          this.resetPageIndex();
+        },
+        deep: true
+      },
+      mergeType: {
+        handler: function (val, oldVal) {
+
+        },
+        deep: true
+      }
+    },
     data() {
       return {
         queryMsg: {
@@ -273,7 +298,6 @@
         },
         queryCommonData: {
           LineList: [],
-          PlaceList: [],
           LineTeamList: [],
         },
         teamList: [], //团队类型列表
@@ -284,6 +308,8 @@
             return startTime.getTime() >= time.getTime();
           },
         },
+        isAllCheck: false,
+        saveLoading: false,
       };
     },
     created() {
@@ -295,19 +321,35 @@
         "-" +
         myDate.getDate();
       this.queryMsg.StartGroupDate = nowDate;
+      this.getLineList();
     },
     methods: {
-      //选中切换
-      changeTrip(item) {
-        //单选
-        if (!this.IsMultiple) {
-          this.dataList.forEach((x) => {
-            if (x.TCID == item.TCID) {
-              //item.Checked = !item.Checked;
-            } else {
-              x.Checked = false;
+      saveMerage() {
+        var tempArray = [];
+        this.dataList.forEach(item => {
+          if (item.Checked) {
+            tempArray.push(item.TCID)
+          }
+        });
+        if (tempArray && tempArray.length == 0) {
+          this.Error("请选择要合并的团")
+        }
+        this.apipost(
+          "travel_post_TravelPirceMerge", {
+            Ids: tempArray,
+          },
+          (res) => {
+            if (res.data.resultCode == 1) {
+               this.Success(res.data.message);
             }
-          });
+          }
+        );
+      },
+      checkAll() {
+        if (this.dataList && this.dataList.length > 0) {
+          this.dataList.forEach(item => {
+            item.Checked = this.isAllCheck;
+          })
         }
       },
       //获取线路列表
@@ -319,26 +361,11 @@
           (res) => {
             if (res.data.resultCode == 1) {
               this.queryCommonData.LineList = res.data.data;
-              this.queryCommonData.PlaceList = [];
               this.queryCommonData.LineTeamList = [];
             }
           }
         );
       },
-      //获取目的地列表
-      getLinePlaceList() {
-        this.queryMsg.PlaceID = 0;
-        this.queryMsg.LineteamId = 0;
-        let msg = {
-          lineID: this.queryMsg.LineId,
-        };
-        this.apipost("team_post_GetLinePlace", msg, (res) => {
-          if (res.data.resultCode == 1) {
-            this.queryCommonData.PlaceList = res.data.data;
-            this.queryCommonData.LineTeamList = [];
-          }
-        });
-      },
       //获取系列列表
       getLineTeamList() {
         this.queryMsg.LineteamId = 0;
@@ -362,6 +389,7 @@
       resetPageIndex() {
         this.queryMsg.pageIndex = 1;
         this.queryMsg.currentPage = 1;
+        this.GetList();
       },
       GetList() {
         this.queryMsg.loading = true;
@@ -413,8 +441,21 @@
       },
     },
     mounted() {
+      console.log("mounted_this.priceObj", this.priceObj);
+      if (this.priceObj) {
+        if (this.priceObj.LineID) {
+          this.queryMsg.LineId = this.priceObj.LineID;
+          this.getLineTeamList();
+        }
+        if (this.priceObj.ltID) {
+          this.queryMsg.LineteamId = this.priceObj.ltID;
+        }
+        if (this.priceObj.TeamType) {
+          this.queryMsg.QTeamType = this.priceObj.TeamType;
+        }
+        this.resetPageIndex();
+      }
       this.getTeamList();
-      this.getLineList();
     },
   };