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

src/components/Hotel/HotelInfo.vue

@@ -271,7 +271,7 @@
       <DMCchooseImg @closeImg="closeDMCchooseImg" ref="DMCchooseImg1" @headCallBack="getDMCimg" v-bind:imgType="1">
       </DMCchooseImg>
     </el-dialog>
-    <el-dialog custom-class="mapList" :title="$t('ground.hotel_mapLocation')" center :visible.sync="selectAddress">
+    <el-dialog custom-class="mapList" :title="$t('hotel.hotel_mapLocation')" center :visible.sync="selectAddress">
       <googleMap @refList="googleMap" v-bind:address="addMsg.Address" @headCallBack="headCall"></googleMap>
     </el-dialog>
     <div class="btn-list">

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2207,7 +2207,9 @@
               </td>
               <td class="RL-BTNlist" rowspan="2">
                 <el-button-group v-if="isShow===true">
-                  <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
+                  <el-tooltip
+                   v-if="ConfigData.Config.IsCurrentMaxStartData==0||userId==1"
+                   class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
                     <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF'
                       icon="iconfont icon-bianji-smal" @click='getDetail(childItem)'></el-button>
                   </el-tooltip>
@@ -5088,6 +5090,7 @@
               this.ConfigData.Config = res.data.data.config;
               this.SetNoticeMsg.OutNotice = res.data.data.config.OutNotice;
               this.ConfigData.Leader = res.data.data.leader;
+              console.log(" this.ConfigData.Config", this.ConfigData.Config);
             }
           }
         );

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -492,6 +492,12 @@
                     <span>{{$t('scen.sc_cp')}}</span>
                     {{item.OutBranchName}}
                   </p>
+                  <p class="travelnowrap" v-if="item.IsSetOut==0">
+                    <span style="color:blue">正常发团</span>
+                  </p>
+                  <p class="travelnowrap" v-if="item.IsSetOut==1">
+                    <span style="color:red">取消发团</span>
+                  </p>
                   <p class="travelnowrap" v-if="item.WordPath!=''">
                     <a style="cursor:pointer;"
                       :href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
@@ -988,6 +994,12 @@
                       <el-dropdown-item>
                         <div @click='goOPCommissionInfo(item.TCID)'>查看OP提成 </div>
                       </el-dropdown-item>
+                     <el-dropdown-item v-if="item.IsSetOut==0">
+                        <div @click='setIsSetOutOffer(item,1)'>取消发团 </div>
+                      </el-dropdown-item>
+                      <el-dropdown-item v-if="item.IsSetOut==1">
+                        <div @click='setIsSetOutOffer(item,0)'>正常发团 </div>
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
@@ -2279,7 +2291,22 @@
             tab: '报价单'
           }
         });
-      }
+      },
+      //保存报价单
+      setIsSetOutOffer(item,IsSetOut) {
+        var updateMsg = {
+            TCID: item.TCID,
+            IsSetOut: IsSetOut
+          };
+          this.apipost("travel_post_SetIsSetOutService", updateMsg, res => {
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message);
+              this.getControlList();
+            } else {
+              this.Info(res.data.message);
+            }
+          });
+      },
     },
     filters: {
       formatStartDate(value) {