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

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1371,7 +1371,7 @@
               <span class="colorE95252" v-show="!returnPriceShow">{{ $t("pub.NoPrice") }}！</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isChecked == true">
+          <el-col :span="4" v-if="isChecked == true">
             <template>
               <el-form-item :label="$t('fnc.cjdanjia')" prop="Unit_Price" v-if="HightUnitPrice === '2'">
                 <el-select v-model="addMsg.Unit_Price" filterable :placeholder="$t('pub.pleaseSel')"
@@ -1385,23 +1385,26 @@
                 <!--:disabled="addMsg.GroupType==4" -->
               </el-form-item>
             </template>
+            
+          </el-col>
+          <el-col :span="8"  v-if="isChecked == true">
             <div style="display: flex;align-items: center;">
-            <el-form-item :label="$t('salesModule.UpTeamPrice')" v-show="addMsg.GroupType != 4">
-              <el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
-            </el-form-item>
-
-            <el-form-item v-show="addMsg.GroupType != 4">
-              <p v-if="LessMoney == 0" style="line-height: 18px; color: #e95252">
-                {{ $t("salesModule.Notice1") }}
-              </p>
-              <p v-else="LessMoney > 0" style="line-height: 18px; color: #e95252">
-                {{ $t("salesModule.Notice2") }}{{ LessMoney
-                }}{{ $t("salesModule.Notice3") }}
-              </p>
-            </el-form-item>
-            </div>
+              <el-form-item :label="$t('salesModule.UpTeamPrice')" v-show="addMsg.GroupType != 4">
+                <el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
+              </el-form-item>
+  
+              <el-form-item v-show="addMsg.GroupType != 4">
+                <p v-if="LessMoney == 0" style="line-height: 18px; color: #e95252">
+                  {{ $t("salesModule.Notice1") }}
+                </p>
+                <p v-else="LessMoney > 0" style="line-height: 18px; color: #e95252">
+                  {{ $t("salesModule.Notice2") }}{{ LessMoney
+                  }}{{ $t("salesModule.Notice3") }}
+                </p>
+              </el-form-item>
+              </div>
           </el-col>
-          <el-col :span="5" v-else>
+          <el-col :span="4" v-else>
             <el-form-item :label="$t('fnc.cjdanjia')" prop="Unit_Price">
               <el-input v-model="addMsg.Unit_Price" class="w210" @keyup.native="
                   checkPrice(addMsg, 'Unit_Price');

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1061,7 +1061,7 @@
                         {{$t('op.HotelXJ')}}
                       </el-dropdown-item>
                       <!-- 结团 -->
-                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2,item.TravelEndAudit)">
+                      <el-dropdown-item v-if="item.Status==1&&Number(item.OrderGuestNum)>0" @click.native="OutGroup(item.TCID,2,item.TravelEndAudit)">
                         {{$t('Operation.Op_jietuan')}}
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1,item.TravelEndAudit)">

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -697,7 +697,7 @@
                         @click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}</el-dropdown-item>
                       <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
                         {{$t('Operation.Op_xiajia')}}</el-dropdown-item>
-                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
+                      <el-dropdown-item v-if="item.Status==1&&Number(item.OrderGuestNum)>0" @click.native="OutGroup(item.TCID,2)">
                         {{$t('Operation.Op_jietuan')}}
                       </el-dropdown-item>
                       <el-dropdown-item @click.native="goB2B(item.ConfigId)">{{$t('Operation.Op_b2bView')}}

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -660,7 +660,7 @@
                       <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
                         {{$t('Operation.Op_xiajia')}}
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
+                      <el-dropdown-item v-if="item.Status==1&&Number(item.OrderGuestNum)>0" @click.native="OutGroup(item.TCID,2)">
                         {{$t('Operation.Op_jietuan')}}
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">{{$t('visaT.sale')}}