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

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -31,6 +31,10 @@
 .TC_firTable td{height:20px!important;text-align: center!important;}
 .TC_midTable td{text-align: center!important;}
 .TC_showUnion{float:right;color:#2aaef2;cursor: pointer;margin-bottom:10px;}
+.TCL_Content span{
+  display: inline-block;
+  margin-right:10px;
+}
 </style>
 <template>
   <div>
@@ -59,6 +63,16 @@
               </el-select>
             </span>
           </li>
+          <li>
+            <span>
+              <em>团控类型</em>
+              <el-select class="w150" v-model="queryMsg.FreePlanType" filterable :placeholder="$t('pub.pleaseSel')">
+                <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
+                <el-option label="自由行" :value="1" :key="1"></el-option>
+                <el-option label="计划方案" :value="2" :key="2"></el-option>
+              </el-select>
+            </span>
+          </li>
           <li>
             <span>
               <em>团号</em>
@@ -263,6 +277,7 @@
                 <div>
                   <div class="TC_teamType">
                     <span v-if="item.IsB2B==0" title="内部团">内</span>
+                    <span v-if="item.FreePlan==1" title="计划方案">方</span>
                   </div>
                   <div class="TCL-OutBranchName" title="销售公司">{{item.OutBranchName}}</div>
                   <div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
@@ -542,6 +557,9 @@
                       <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">删除</el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" @click.native="setUpPlat(item)">上架</el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">下架</el-dropdown-item>
+                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
+                        {{$t('Operation.Op_jietuan')}}
+                      </el-dropdown-item>
                       <el-dropdown-item @click.native="goB2B(item.ConfigId)">B2B预览</el-dropdown-item>
                       <el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>分销联运</el-dropdown-item>
                       <el-dropdown-item @click.native='ckSellPoint(item)'>本团卖点</el-dropdown-item>
@@ -550,7 +568,7 @@
                 </div>
               </div>
             </div>
-            <div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark">
+            <div class="TC_remarkContent" v-if="item.OPRemark||item.OPInnerRemark||item.PriceTagList">
               <div class="clearfix TCL-redType" v-if="item.OPRemark">
                 <div class="TCL_remarkTitle">OP对外备注：</div>
                 <div class="TCL_Content">{{item.OPRemark}}</div>
@@ -559,6 +577,12 @@
                 <div class="TCL_remarkTitle">OP对内备注：</div>
                 <div class="TCL_Content">{{item.OPInnerRemark}}</div>
               </div>
+              <div class="clearfix TCL-redType" v-if="item.PriceTagList.length>0">
+                <div class="TCL_remarkTitle">标签：</div>
+                <div class="TCL_Content">
+                  <span v-for="chidItem in item.PriceTagList">{{chidItem.Content}}</span>
+                </div>
+              </div>
             </div>
           </li>
         </ul>
@@ -721,7 +745,9 @@
           RateOn: "-1",
           TeamType:1,//小包团
           //是否显示联运
-          IsShowUnion: 1
+          IsShowUnion: 1,
+          //团控状态
+          FreePlanType:-1
         },
         remarkMsg: {
           TCID: 0,
@@ -874,6 +900,7 @@
                   });
                 }
               });
+              console.log(this.queryCommonData.dataList,'dataList');
             }
           },
           err => {}
@@ -1273,7 +1300,24 @@
         }else{
           this.queryCommonData.UnionText = '显示联运'
         }
+      },
+      //结团/正常
+      OutGroup(TCID, Status) {
+        let msg = {
+          TCID: TCID,
+          Status: Status,
+        }
+        this.apipost('travel_post_SetPriceStatus', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.Success(res.data.message)
+            this.getControlList()
+            this.queryCommonData.checkDialogAll = false
+            this.queryCommonData.ckedplat = []
+          } else {
+            this.Info(res.data.message)
           }
+        })
+      },
     },
     filters: {
       formatStartDate(value) {