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

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -65,7 +65,7 @@
           layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
         </el-pagination>
         <ul>
-          <li v-for="(item,index) in queryDataObj.dataList" :key="index"
+          <li v-for="(item,index) in queryDataObj.dataList" :key="item.GTeamId"
             :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
             <div class="TC_remarkContent">
               <div class="el-col w_20">
@@ -107,7 +107,7 @@
                 <div class="p20">
                   <div class="mb title"><i class="iconfont icon-tuandui"></i><span>合作伙伴</span></div>
                   <template v-for="(subItem,subIndex) in item.TravelTeamPartnerList">
-                    <el-tag :key="subIndex+1000" style="margin: 0 10px 10px 0;">{{subItem.CustomerName}}</el-tag>
+                    <el-tag :key="subIndex+10000" style="margin-right:10px;">{{subItem.CustomerName}}</el-tag>
                   </template>
                 </div>
               </div>
@@ -156,28 +156,29 @@
         </el-pagination>
       </div>
     </div>
-    <el-dialog class="app-attachment-dialog" style="width:1000px;height:800px;margin:0 auto;z-index:99999"
-      :title="dialogTitle" :visible.sync="isShowEditTeamDialog" :close-on-click-modal="false">
-      <editTeamInfo :id="ID"></editTeamInfo>
+    <el-dialog class="app-attachment-dialog" width="900" :title="dialogTitle" :visible.sync="isShowEditTeamDialog"
+      :close-on-click-modal="false">
+      <editTeamInfo :Q_GTeamId="GTeamId" @success="refreshPage"></editTeamInfo>
     </el-dialog>
   </div>
 </template>
 <script>
-  import editTeamInfo from "./editTeamInfo"; //新增修改包机团
+  import editTeamInfo from "../TravelTeam/editTeamInfo"; //新增修改包机团
+
   export default {
-    components: {
-      editTeamInfo
-    },
     provide() {
       return {
         reload: this.reload
       }
     },
+    components: {
+      editTeamInfo
+    },
     data() {
       return {
         isShowEditTeamDialog: false, //是否显示新增修改包机团弹窗
         dialogTitle: "添加包机信息", //弹窗名称
-        ID: '',
+        GTeamId: 0, //包机团队Id
         //查询参数
         queryMsg: {
           pageIndex: 1,
@@ -216,9 +217,6 @@
           }
         },
       };
-    },
-    components: {
-
     },
     //监听器
     watch: {
@@ -232,12 +230,18 @@
       editTeam(item) {
         if (item) {
           this.dialogTitle = "修改包机信息";
+          this.GTeamId = item.GTeamId;
         } else {
           this.dialogTitle = "添加包机信息";
+          this.GTeamId = 0;
         }
         this.isShowEditTeamDialog = true;
       },
-
+      //刷新页面
+      refreshPage() {
+        this.isShowEditTeamDialog = false;
+        this.getTravelTeamList();
+      },
       //翻页
       handleCurrentChange(val) {
         this.queryMsg.pageIndex = val;

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -45,16 +45,19 @@
         <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
           :subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
           v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
-
+         <!--常规团-->
         <TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
           :priceList="PriceList" v-if="TeamType==0" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType" :CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect"></TravelPrice>
+        <!--小包团-->
         <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
           v-if="TeamType==1" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType"></TravelPrice2>
+        <!--一日游-->
         <TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
           v-if="TeamType==2" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType"></TravelPrice3>
+        <!--地接团-->
         <TravelPrice4 @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
           :PostDaysTrip="PostDaysTrip" v-if="TeamType==3" :priceList="PriceList" :PostConfig="PostConfig"
           :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice4>