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

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1099,6 +1099,12 @@
                         v-if="item.OrderLeaderGuestNum >= 1">+{{ item.OrderLeaderGuestNum }}</span>{{ $t("Operation.Op_people") }}
                     </i>
                   </p>
+                  <p>
+                    <span>已收订</span>
+                    <i>
+                      <span class="TCL-redType">{{ item.DJNum }}</span> {{ $t("Operation.Op_people") }}
+                    </i>
+                  </p>
                   <p v-if="item.SingleDMNum > 0">
                     <span>{{ $t("salesModule.SingleJ") }}</span>
                     <i>{{ item.SingleDMNum }}</i>
@@ -3314,7 +3320,7 @@
                   that.Success(res.data.message);
                   ttMsg.configId = res.data.data;
                   that.getControlList();
-                  that.gotoUrl(path,ttMsg);
+                  that.gotoUrl(path, ttMsg);
                 } else {
                   that.Error(res.data.message);
                 }
@@ -3481,7 +3487,7 @@
             "】" +
             this.$t("objFill.v101.dictriqiwei") +
             this.CopyTripAndFeatureMsg.StartDate;
-            tipMsg+=",变更日期后,请重新同步酒店信息。";
+          tipMsg += ",变更日期后,请重新同步酒店信息。";
         }
         that.Confirm(tipMsg, function () {
           that.saveLoading = true;
@@ -3492,7 +3498,7 @@
               that.saveLoading = false;
               if (res.data.resultCode == 1) {
                 if (that.CopyTripAndFeatureMsg.updateType == 1) {
-                  that.Success(that.$t("objFill.v101.fuzhixingccg")+res.data.message);
+                  that.Success(that.$t("objFill.v101.fuzhixingccg") + res.data.message);
                 } else {
                   that.Success(res.data.message);
                 }

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -541,7 +541,7 @@
                     <span>{{$t('Operation.Op_teamNotice')}}</span>
                     {{item.OutNotice==1?"OK":$t('visa.v_zanding')}}
                   </p>
-                   <p class="travelnowrap" v-if="item.IsSetOut == 0">
+                  <p class="travelnowrap" v-if="item.IsSetOut == 0">
                     <span style="color: blue">{{ $t("objFill.zhengchangft") }}</span>
                   </p>
                   <p class="travelnowrap" v-if="item.IsSetOut == 1">
@@ -718,6 +718,12 @@
                         v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('hotel.hotel_people')}}
                     </i>
                   </p>
+                  <p>
+                    <span>已收订</span>
+                    <i>
+                      <span class="TCL-redType">{{ item.DJNum }}</span> {{ $t("Operation.Op_people") }}
+                    </i>
+                  </p>
                   <p>
                     <span>{{$t('Operation.Op_takeSeat')}}</span>
                     <i>{{item.Occupied}}</i>{{$t('hotel.hotel_people')}}
@@ -1079,7 +1085,7 @@
                       <el-dropdown-item @click.native='reSubmit(item)' v-if="item.AuditStatus==3">
                         {{$t('objFill.v101.chongxtjshe')}}
                       </el-dropdown-item>
-                        <el-dropdown-item v-if="item.IsSetOut == 0">
+                      <el-dropdown-item v-if="item.IsSetOut == 0">
                         <div @click="setIsSetOutOffer(item, 1)">
                           {{ $t("objFill.quxiaofatuan") }}
                         </div>