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

src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue

@@ -159,7 +159,7 @@
       <tr>
         <th width="50">{{$t('salesModule.Xu')}}</th>
         <th width="80">{{$t('Operation.Op_chutuan')}}</th>
-        <th width='200'>{{$t('Operation.Op_TeamName')}}</th>
+        <th width='200'>系列</th>
         <th width="80">{{$t('fnc.tuanqi')}}</th>
         <th width="80">{{$t('Operation.Op_jinchudian')}}</th>
         <th width="100">{{$t('Operation.Op_ArriveTime')}}</th>
@@ -169,7 +169,6 @@
         <th width="80">{{$t('Operation.Op_orderNum')}}</th>
         <th width="100">{{$t('leader.leader_Leader')}}</th>
         <th width="100">{{$t('leader.leader_Guide')}}</th>
-        <th>{{$t('pub.pubRemark')}}</th>
       </tr>
       <tbody v-for="item in DataList">
         <tr>
@@ -199,7 +198,20 @@
           <td><span :class="item.GuideName!=''&&item.GuideName!=null?'RS_RedType PingFangSC Order_RS':'Order_RS'"
               @click="goUrl('leaderArrangement',item.TCID,'设置导游')">{{item.GuideName!=""&&item.GuideName!=null?item.GuideName:"设置导游"}}</span>
           </td>
-          <td><span class="RS_Nameover">{{item.OPRemark}}</span></td>
+        </tr>
+        <tr>
+          <td>
+            团名
+          </td>
+          <td colspan="6">
+            <span class="RS_Nameover"> {{item.Title}}</span>
+          </td>
+          <td>
+            备注
+          </td>
+          <td colspan="6">
+            <span class="RS_Nameover">{{item.OPRemark}}</span>
+          </td>
         </tr>
       </tbody>
     </table>

src/components/confirmationOrderDownLoad.vue

@@ -64,7 +64,7 @@
           @click="gernalFeature(0)" />
         <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD"
           @click="gernalFeature(1)" /> -->
-        <input type="button" value="新版行程" class="travelControlTripBtn" @click="goUrlView()" />
+        <input type="button" value="新版行程" class="travelControlTripBtn" @click="goUrlView()" style="display:none;" />
         <el-checkbox v-model="isShowTime">显示行程日期</el-checkbox>
         <a class="travelControlTripBtn" v-if="priceList.length>0&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
           width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
@@ -180,11 +180,8 @@
                 <div class="collection-item clearfix">
                   <div><img src="../assets/img/TravelControlTripIcon11.png" />机场服务</div>
                   <span>
-                    <template v-if="orderTripdiff&&orderTripdiff.airportService&&orderTripdiff.airportService!=''">
-                      {{orderTripdiff.airportService}}
-                    </template>
-                    <template v-else-if="orderMsg&&orderMsg.airportServicePerson&&orderMsg.airportServicePerson!=''">
-                      {{orderMsg.airportServicePerson+"/"+ orderMsg.airportServicePhone}}
+                    <template v-if="orderMsg&&orderMsg.airportServicePerson&&orderMsg.airportServicePerson!=''">
+                      {{orderMsg.airportServicePerson}}
                     </template>
                   </span>
                 </div>
@@ -203,18 +200,10 @@
                   <div><img src="../assets/img/TravelControlTripIcon13.png" />紧急联系人</div>
                   <template>
                     <span v-if='vshowLLR'>
-                      <template v-if="orderTripdiff&&orderTripdiff.emergencyContact!=''">
-                        {{orderTripdiff.emergencyContact}}
-                      </template>
-                      <template
-                        v-else-if="orderMsg.branchManager&&orderMsg.branchManager!=''&&orderMsg.mobilePhone&&orderMsg.mobilePhone!=''">
-                        {{orderMsg.branchManager+"/"+orderMsg.mobilePhone}}
-                      </template>
-                      <template v-else-if="orderMsg.sellName!=''&&orderMsg.sellTel!=''">
-                        {{orderMsg.sellName+"/"+orderMsg.sellTel}}
+                      <template v-if="orderMsg.emergencyContact!=''">
+                        {{orderMsg.emergencyContact}}
                       </template>
                     </span>
-                    <span v-else></span>
                   </template>
                 </div>
               </td>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -648,7 +648,7 @@
                     </el-input>
                   </el-form-item>
                   <span class="TP_Sendprepend">{{$t('sm.songqianshijian')}}</span>
-                  <el-form-item prop="SendVisaTime" style="margin-top:1px;">
+                  <el-form-item prop="SendVisaTime">
                     <el-date-picker clearable class="w150" v-model="priceData.SendVisaTime" type="date"
                       value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
                   </el-form-item>
@@ -730,15 +730,20 @@
                       <template slot="prepend">{{$t('sm.jihedidian')}}</template>
                     </el-input>
                   </el-form-item>
-                  <el-form-item>
-                    <span class="TP_Sendprepend" style="margin-left:0;width:120px;">{{$t('sm.xiaoshouzt')}}</span>
-                    <el-select class="w180" v-model="priceData.TCSaleState">
-                      <el-option v-for="item in TeamList" :key="item.Id" :label="item.name" :value="item.Id">
-                      </el-option>
-                    </el-select>
+                  <el-form-item style="margin-top:1px;">
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w260"
+                      v-model="priceData.AirportService">
+                      <template slot="prepend">{{$t('op.AirSupplier')}}</template>
+                    </el-input>
+                  </el-form-item>
+                  <el-form-item prop="EmergencyContact">
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w260"
+                      v-model="priceData.EmergencyContact">
+                      <template slot="prepend">紧急联系人</template>
+                    </el-input>
                   </el-form-item>
                   <el-form-item>
-                    <el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat" v-model="priceData.GatherTag">
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w260 ComSeat" v-model="priceData.GatherTag">
                       <template slot="prepend">{{$t('op.JHbiaoshi')}}</template>
                     </el-input>
                   </el-form-item>
@@ -778,15 +783,15 @@
                         <i class="iconfont icon-arrow-down SimulaDrop"></i>
                       </div>
                     </el-popover>
-                    <el-form-item style="margin-top:1px;">
-                      <el-input :placeholder="$t('pub.pleaseImport')" class="w460 ComSeat"
-                        v-model="priceData.AirportService">
-                        <template slot="prepend">{{$t('op.AirSupplier')}}</template>
-                      </el-input>
+                    <el-form-item>
+                      <span class="TP_Sendprepend" style="margin-left:0;width:120px;">{{$t('sm.xiaoshouzt')}}</span>
+                      <el-select class="w180" v-model="priceData.TCSaleState">
+                        <el-option v-for="item in TeamList" :key="item.Id" :label="item.name" :value="item.Id">
+                        </el-option>
+                      </el-select>
                     </el-form-item>
                   </div>
                 </div>
-
                 <div class="clearfix">
                   <div class="leftSetInfo">
                     <span class="TPbaseSet"></span>
@@ -1363,6 +1368,7 @@
                 PriceOfferName: "", //报价单名称
                 IsUseCompanyBus: 0, //是否使用公司车辆
                 BusPriceId: 0, //公司车辆编号
+                EmergencyContact: "", //紧急联系人
               };
             }
             this.returnPriceList.push(objItem);