新增报价单变更酒店

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -213,7 +213,15 @@
                 {{subItem.Title}}
               </td>
               <td>
+                <template v-if="subItem.HotelChangeContent&&subItem.HotelChangeContent!=''">
+                  <font style="text-decoration: line-through;"> {{subItem.HotelName}}</font>
+                  <br />
+                  <font style="color:red;">{{subItem.HotelChangeContent}}</font>
+                  <br />
+                </template>
+                <template v-else>
                   {{subItem.HotelName}}<br />
+                </template>
                 <template v-if="subItem.ContainDinnerType==1">{{$t('objFill.hanzaocan')}}</template>
                 <template v-if="subItem.ContainDinnerType==2">{{$t('objFill.hanwancan')}}</template>
                 <template v-if="subItem.ContainDinnerType==3">{{$t('objFill.v101.hanzaowanc')}}</template>

src/components/commonPage/changeOffer.vue

@@ -50,7 +50,7 @@
           <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">原金额</td>
           <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">地接金额</td>
           <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">变更值</td>
-          <td style="width:250px;" class="CP_ComTitle2 CostcomCenter">变更备注</td>
+          <td style="width:300px;" class="CP_ComTitle2 CostcomCenter">变更备注</td>
           <td style="width:100px;" class="CP_ComTitle2 CostcomCenter">
             <a style="color:blue;cursor:pointer;" @click="AddOfferObj()">添加</a>
           </td>
@@ -89,6 +89,14 @@
                 <el-option v-for="(cItem,cIndex) in changeRemarkList" :key="cIndex" :label="cItem.Name"
                   :value="cItem.Name"></el-option>
               </el-select>
+
+              <template v-if="item.ChangeType==1">
+                <el-select filterable remote :remote-method="(query) => remoteSearchAdGroup(query, item)"
+                  v-model='item.ChangeContent' :placeholder="$t('objFill.qingshurujdmc')" :loading="loading">
+                  <el-option v-for="(x) in item.HotelList" :key="x.ID" :label="x.Name" :value='x.Name'>
+                  </el-option>
+                </el-select>
+              </template>
             </td>
             <td>
               <a style="color:red;cursor:pointer;" @click="DeleteOfferChange(item,index)">删除</a>
@@ -117,6 +125,38 @@
       };
     },
     methods: {
+      getHotel(subItem, HotelId) {
+        subItem.HotelList.forEach(x => {
+          if (x.Name == HotelId) {
+            subItem.ChangeContent = x.Name
+          }
+        })
+        this.$forceUpdate()
+      },
+      remoteSearchAdGroup(query, subItem) {
+        if (query !== '') {
+          this.loading = true;
+          this.initHotel(query, subItem)
+        } else {
+          subItem.HotelList = []
+        }
+      },
+      //初始化酒店列表
+      initHotel(query, subItem) {
+        this.apipost(
+          "hotel_post_GetList", {
+            Name: query
+          },
+          res => {
+            this.loading = false
+            if (res.data.resultCode == 1) {
+              subItem.HotelList = res.data.data;
+              this.$forceUpdate()
+            }
+          },
+          null
+        );
+      },
       getDiJiePrice(item) {
         var postMsg = {
           OfferId: this.qMsg.OfferId,
@@ -191,6 +231,8 @@
           ChangeRemarks: "",
           OldPrice: 0, //原报价项目单金额
           DJPrice: 0, //地接价格
+          ChangeContent: "", //变更内容
+          HotelList: [],
         }
         obj.OfferId = this.qMsg.OfferId;
         obj.EidtType = this.qMsg.EditType;

src/components/commonPage/comChooseTrip.vue

@@ -137,6 +137,12 @@
               :EndGroupDate="queryMsg.EndGroupDate" @change="(date) => (queryMsg.StartGroupDate = date)"></DateLimit>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item :label="$t('hotel.hotel_EndDate')" label-width="115px;">
+            <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="6">
           <el-button @click="resetPageIndex()" size="small">{{$t('pub.searchBtn')}}</el-button>
           <el-button type="primary" size="small" @click="saveMerage" :loading="saveLoading">合并</el-button>
@@ -149,19 +155,19 @@
           <font style="cursor:pointer;" @click="isAllCheck=!isAllCheck,checkAll()"> {{!isAllCheck?"全选":"取消全选"}}</font>
         </th>
         <th>
-          {{ $t("objFill.v101.chufari") }}
+          {{ $t('Operation.Op_TeamName') }}
         </th>
         <th>
-          {{ $t("visa.v_tuanhao") }}
+          {{ $t("system.table_ssLine") }}/{{ $t("active.ad_xlmc") }}
         </th>
         <th>
-          {{ $t("scen.sc_cp") }}
+          {{ $t("objFill.v101.chufari") }}
         </th>
         <th>
-          {{ $t("system.table_ssLine") }}
+          {{ $t("visa.v_tuanhao") }}
         </th>
         <th>
-          {{ $t("active.ad_xlmc") }}
+          {{ $t("scen.sc_cp") }}
         </th>
         <th>
           {{ $t("ground.tianshu") }}
@@ -175,11 +181,25 @@
         <th>
           {{ $t("objFill.v101.tuanweizku") }}
         </th>
+        <th>
+          {{$t('system.table_operation')}}
+        </th>
       </tr>
-      <tbody v-for="(item, index) in dataList" :key="index">
-        <tr>
-          <td rowspan="2">
-            <el-checkbox v-model="item.Checked"></el-checkbox>
+      <template v-for="(rootItem, rootIndex) in dataList">
+        <tbody :key="rootIndex">
+          <tr v-for="(item,index) in rootItem.priceList" style="border-bottom:1px solid #dcdfe6;"
+            :key="`r1_`+rootIndex+`p_`+index">
+            <td v-if="index==0" :rowspan="rootItem.priceList.length">
+              <el-checkbox v-model="rootItem.Checked"></el-checkbox>
+            </td>
+            <td style="text-align: left;max-width:200px;">
+              <span class="title">
+                {{ item.Title }}
+              </span>
+            </td>
+            <td>{{ item.LineName }}
+              <br />
+              {{ item.LtName }}
             </td>
             <td>
               {{ item.StartDate }}
@@ -188,8 +208,6 @@
             <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>
@@ -207,18 +225,17 @@
               (item.SurplusFSeat + item.SurplusCSeat + item.SurplusYSeat)
             }}
             </td>
-        </tr>
-        <tr>
-          <td colspan="10" style="text-align: left">
-            <span class="title">
-              {{ item.Title }}
-            </span>
+            <td>
+              <template v-if="rootItem.TCIDList.length>1">
+                <el-button type="text" @click="splitTravelPrice(item)">拆分</el-button>
+              </template>
             </td>
           </tr>
         </tbody>
+      </template>
       <tfoot>
         <tr>
-          <td colspan="10">
+          <td colspan="9">
             <div class="noData" v-show="queryMsg.noData">
               {{ $t("system.content_noData") }}
             </div>
@@ -232,10 +249,12 @@
   </div>
 </template>
 <script>
+  import Temporarystaff from '../administrative/Temporarystaff.vue';
   import DateLimit from "../public/DateLimit.vue";
   export default {
     components: {
       DateLimit,
+      Temporarystaff,
     },
     props: ["priceObj", "mergeType"],
     watch: {
@@ -256,38 +275,12 @@
     data() {
       return {
         queryMsg: {
-          AirTicketId: 0,
-          ApplyMaxNum: -1,
-          ApplyMinNum: -1,
-          CreateBy: 0,
-          DayNum: -1,
           EndGroupDate: "",
-          FlightState: 0,
-          GroupState: [],
-          HotelId: 0,
-          HotelUseTime: "",
-          IsShowUnion: 0,
-          IsWarning: false,
           LineId: 0,
-          LineIdList: [],
           LineteamId: 0,
-          OnlyShowOverTeam: "false",
-          OutBranchId: -1,
-          OutBranchIds: [],
-          PlaceID: 0,
-          RateOn: "-1",
-          RateOnDay: "-1",
-          SaleBranchId: [],
-          SalePlat: [],
           StartGroupDate: "",
           TCID: 0,
           TCNUM: "",
-          TCState: [3],
-          TeamMaxNum: -1,
-          TeamMinNum: -1,
-          TeamType: 0,
-          UnionCityId: 0,
-          WarningQuery: "-1",
           pageIndex: 1,
           pageSize: 10,
           currentPage: 1,
@@ -295,6 +288,7 @@
           noData: true,
           loading: false,
           QTeamType: 0,
+          Title: "",
         },
         queryCommonData: {
           LineList: [],
@@ -322,13 +316,27 @@
         myDate.getDate();
       this.queryMsg.StartGroupDate = nowDate;
       this.getLineList();
+      this.getTeamList();
     },
     methods: {
+      //团队拆分
+      splitTravelPrice(item) {
+        var postMsg = {
+          Ids: item.TCID
+        };
+        this.apipost("travel_post_TravelPriceSplit", postMsg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success(res.data.message);
+            this.GetList();
+          }
+        });
+      },
+      //合并
       saveMerage() {
         var tempArray = [];
         this.dataList.forEach(item => {
           if (item.Checked) {
-            tempArray.push(item.TCID)
+            tempArray.push(item.TCIDStr)
           }
         });
         if (tempArray && tempArray.length == 0) {
@@ -336,11 +344,12 @@
         }
         this.apipost(
           "travel_post_TravelPirceMerge", {
-            Ids: tempArray,
+            Ids: tempArray.toString(),
           },
           (res) => {
             if (res.data.resultCode == 1) {
               this.Success(res.data.message);
+              this.GetList();
             }
           }
         );
@@ -394,7 +403,7 @@
       GetList() {
         this.queryMsg.loading = true;
         this.apipost(
-          "travel_get_GetTravelPrciePageList_V2",
+          "travel_get_GetTravelPrcieMergePage",
           this.queryMsg,
           (res) => {
             this.queryMsg.loading = false;
@@ -455,7 +464,7 @@
         }
         this.resetPageIndex();
       }
-      this.getTeamList();
+
     },
   };