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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -714,7 +714,7 @@
                       </el-tooltip>
                     </template>
                     <!-- <template v-if="item.TeamPriceList && item.TeamPriceList.length > 0">
-                      <el-tooltip class="item" effect="dark" content="合并列表">
+                      <el-tooltip class="item" effect="dark" content="合并列表(和平国旅合并团队使用)">
                         <el-popover width="350" trigger="click" popper-class="TC_HotelPop">
                           <table width="100%" border="0" cellspacing="0" cellpadding="0">
                             <tr>
@@ -732,8 +732,8 @@
                               </td>
                             </tr>
                           </table>
-                          <el-button slot="reference" circle size="mini" type="primary" 
-                            style="width: 20px; height: 20px; padding: 4px" style="">
+                          <el-button slot="reference" circle size="mini" type="success"
+                            style="width: 20px; height: 20px; padding: 4px" @click="showTripDialog(item)">
                             {{ item.TeamPriceList.length }}
                           </el-button>
                         </el-popover>
@@ -1577,12 +1577,9 @@
                       <el-dropdown-item @click.native="ckChangePrice(item,2)">
                         团队类型变更
                       </el-dropdown-item>
-                      <!-- <el-dropdown-item @click.native="shorTripDialog(item,1)">
-                        系列合并
+                      <el-dropdown-item @click.native="showTripDialog(item,1)" style="display:none;">
+                        团队合并
                       </el-dropdown-item>
-                      <el-dropdown-item @click.native="shorTripDialog(item,2)">
-                        当团合并
-                      </el-dropdown-item> -->
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
@@ -1957,7 +1954,7 @@
       </el-dialog>
     </div>
     <div v-if="isShowPriceTripDialog">
-      <el-dialog :visible.sync="isShowPriceTripDialog" width="1400px" :title="$t('objFill.baojiaxiangqing')">
+      <el-dialog :visible.sync="isShowPriceTripDialog" width="1400px" title="团队合并" @close="getControlList()">
         <comChooseTrip :priceObj="priceObj" :mergeType="mergeType" ref="dialog"></comChooseTrip>
       </el-dialog>
     </div>
@@ -2301,7 +2298,7 @@
     },
     methods: {
       //显示合并团队弹窗
-      shorTripDialog(item, type) {
+      showTripDialog(item, type) {
         this.priceObj = item;
         this.mergeType = type;
         this.isShowPriceTripDialog = true;

src/components/commonPage/changeOffer.vue

@@ -89,8 +89,8 @@
                 <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">
+                <br/>
                 <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'>

src/components/commonPage/comChooseTrip.vue

@@ -181,6 +181,9 @@
         <th>
           {{ $t("objFill.v101.tuanweizku") }}
         </th>
+        <th>
+          {{ $t("Operation.Op_caozuoop") }}
+        </th>
         <th>
           {{$t('system.table_operation')}}
         </th>
@@ -202,9 +205,9 @@
               {{ item.LtName }}
             </td>
             <td>
-              {{ item.StartDate }}
+              {{ item.StartDate }}({{item.StartDateWeekStr}})
             </td>
-            <td>{{ item.TCNUM }}({{ item.TCID }})</td>
+            <td>{{ item.TCNUM }}({{ item.TCID }})【{{item.TCStateName}}】</td>
             <td>
               {{item.OutBranchName}}
             </td>
@@ -225,6 +228,9 @@
               (item.SurplusFSeat + item.SurplusCSeat + item.SurplusYSeat)
             }}
             </td>
+            <td>
+              {{item.OPName}}
+            </td>
             <td>
               <template v-if="rootItem.TCIDList.length>1">
                 <el-button type="text" @click="splitTravelPrice(item)">拆分</el-button>
@@ -235,7 +241,7 @@
       </template>
       <tfoot>
         <tr>
-          <td colspan="9">
+          <td colspan="11">
             <div class="noData" v-show="queryMsg.noData">
               {{ $t("system.content_noData") }}
             </div>
@@ -321,15 +327,19 @@
     methods: {
       //团队拆分
       splitTravelPrice(item) {
+        var that = this;
+        var tipMsg = "是否要将【" + item.TCNUM + "(" + item.TCID + ")】进行拆分?";
+        that.Confirm(tipMsg, function () {
           var postMsg = {
             Ids: item.TCID
           };
-        this.apipost("travel_post_TravelPriceSplit", postMsg, res => {
+          that.apipost("travel_post_TravelPriceSplit", postMsg, res => {
             if (res.data.resultCode == 1) {
-            this.Success(res.data.message);
-            this.GetList();
+              that.Success(res.data.message);
+              that.GetList();
             }
           });
+        });
       },
       //合并
       saveMerage() {
@@ -424,22 +434,6 @@
           (err) => {}
         );
       },
-      //获取选中的行程
-      getChooseData() {
-        var tempArray = [];
-        this.dataList.forEach((item) => {
-          if (item.Checked) {
-            tempArray.push(item);
-          }
-        });
-        return tempArray;
-      },
-      //清空数据
-      clearData() {
-        // this.dataList=[];
-        // this.queryMsg.pageIndex=1;
-        // this.queryMsg.total=0;
-      },
       //团队类型
       getTeamList() {
         this.apipost("travel_GetTeamTypeEnumList", {}, (res) => {
@@ -450,7 +444,6 @@
       },
     },
     mounted() {
-      console.log("mounted_this.priceObj", this.priceObj);
       if (this.priceObj) {
         if (this.priceObj.LineID) {
           this.queryMsg.LineId = this.priceObj.LineID;