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

src/components/Hotel/reservation/HotelOrderList.vue

@@ -248,7 +248,7 @@
                 if (res.data.resultCode == 1) {
                     this.HotelList = res.data.data;
                 } else {
-                    message.errorMsg(res.data.message);
+                    this.Error(res.data.message)
                 }
                 },
                 err => {}

src/components/SalesModule/productQuery.vue

@@ -2543,7 +2543,7 @@
           },
           (res) => {
             if (res.data.resultCode == 1) {
-              this.minPrice = res.data.data.LowDeposit;
+              this.minPrice = res.data.data&&res.data.data.LowDeposit;
             }
           },
           (err) => {}

src/components/TravelManager/TravelTeam/priceGroup.vue

@@ -933,7 +933,13 @@
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
     <div class="buy-box" v-show="isShowTeamOrder">
-      <orderForm @success="reSearchPage" @close="closeForm" :PTCID="teamInfo.TCID" :POrderId="0" :PBranchId="0" :PProductType="2" :showCity="false">
+      <orderForm @success="reSearchPage" @close="closeForm" 
+      :PTCID="teamInfo.TCID" 
+      :POrderId="0" 
+      :PBranchId="0" 
+      :PProductType="2" 
+      :showCity="false"
+      :productObj="teamInfo">
       </orderForm>
     </div>
   </div>

src/components/orderCommon/order-form.vue

@@ -38,7 +38,7 @@
           <!-- 客户类型 -->
           <el-form-item :label="$t('fnc.khleixing')" prop="CustomerType">
             <el-select v-model="addMsg.CustomerType" filterable :placeholder="$t('pub.pleaseSel')" @change="
-                  resetMsg(addMsg.CustomerType), getTypePrice();
+                  resetMsg(addMsg.CustomerType); getTypePrice();
                   resetSelect();
                   getClientSource();
                   getCustomer();
@@ -81,8 +81,8 @@
               ">
             <el-select v-model="addMsg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')"
               @change="changeCustomer">
-              <el-option v-for="item in customerList" :label="item.customerName + '-' + item.contact"
-                :value="item.customerId" :key="item.customerId">
+              <el-option v-for="(item,index) in customerList" :label="item.customerName + '-' + item.contact"
+                :value="item.customerId" :key="index">
               </el-option>
             </el-select>
           </el-form-item>
@@ -375,7 +375,7 @@
           <el-form-item :label="$t('salesModule.ScenicRefund')">
             <el-select filterable multiple class="multiple_input" v-model="addMsg.ScenicRefundArr"
               :placeholder="$t('pub.pleaseSel')" @change="ScenicRefundMethods">
-              <el-option v-for="item in ScenicRefundList" :label="item.ScenicName" :value="item.Id" :key="item.Id">
+              <el-option v-for="(item,index) in ScenicRefundList" :label="item.ScenicName" :value="item.Id" :key="index">
               </el-option>
             </el-select>
           </el-form-item>
@@ -395,7 +395,7 @@
           <el-form-item :label="$t('salesModule.CustomFrom')" prop="ClientSource">
             <el-select v-model="addMsg.ClientSource" filterable :placeholder="$t('pub.pleaseSel')"
               @change='changeClientSource'>
-              <el-option v-for="item in clientSourceList" :label="item.Name" :value="item.Id" :key="item.Id">
+              <el-option v-for="(item,index) in clientSourceList" :label="item.Name" :value="item.Id" :key="index">
               </el-option>
             </el-select>
           </el-form-item>
@@ -482,6 +482,10 @@
       PProductType: {
         type: Number,
         default: 0, //产品类型(1-常规团，2-包机团)
+      },
+      productObj:{
+        type: Object,
+        default: {},
       }
     },
     data() {
@@ -1044,7 +1048,7 @@
           },
           (res) => {
             if (res.data.resultCode == 1) {
-              this.minPrice = res.data.data.LowDeposit;
+              this.minPrice = res.data.data&&res.data.data.LowDeposit;
             }
           },
         );
@@ -1484,8 +1488,13 @@
           Number(this.addMsg.AirticketNum);
         this.addMsg.IsChildrenTour = this.priceObj.IsSupportChildren;
         this.addMsg.IsBirdDiscount = this.priceObj.IsBirdDiscount;
-        this.apipost(
-          "sellorder_post_SetTravelTeamOrderForB2B",
+        let url
+        if(this.PProductType==1){
+          url = 'sellorder_post_SetOrderInfo_02'
+        }else if(this.PProductType==2){
+          url = 'sellorder_post_SetTravelTeamOrderForB2B' //团下单接口sellorder_post_SetOrderInfoForB2B
+        }
+        this.apipost(url,
           this.addMsg,
           (res) => {
             if (res.data.resultCode == 1) {
@@ -1752,6 +1761,13 @@
       this.CurrentUserInfo = this.getLocalStorage();
       //获取客户类型
       this.getCustomerType();
+      // 当前线路报价
+      this.getMinPrice(this.productObj.LineID)
+      // 可退景点
+      this.getScenicRefund(this.PTCID);
+      //获取所有账户列表
+      this.getPlatformAccount(this.productObj.PlatformAccountTypeId)
+      this.getPlatformAccountNew()
       //参团类型
       this.getJoinType();
       //获取员工列表
@@ -1760,8 +1776,15 @@
       this.getCityList();
       //获取交易方式
       this.getTradeWay();
+      
     },
     watch: {
+      productObj:{
+        handler(oldValue, newVal){
+          this.addMsg.DepartureCityId = oldValue.StartCityID
+          this.addMsg.ReturnArriveCityId = oldValue.ReturnArriveCityId
+        }
+      },
       //监听TCID变化
       PTCID: function (oldValue, newVal) {
         if (oldValue != newVal) {

src/components/scenicSpot/reservation/OrderList.vue

@@ -512,7 +512,7 @@
           </div>
           <div class="c9e fz12">
             <span>订单编号：</span>
-            <span>{{ item.OrderN联o }}({{ item.OrderId}})</span>
+            <span>{{ item.OrderNo }}({{ item.OrderId}})</span>
             <span class="copy cblack cursor-pointer" v-if="copyId != item.OrderId" @click="CopyHandler(item)">复制</span>
             <span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else><i class="el-icon-check mr"></i>已复制</span>
           </div>
@@ -803,9 +803,10 @@
           >
             <span class="c059FF6">明细/编辑</span>
           </div> -->
-          <div v-if="item.OrderStatus == 1 && pagesTitle == '销售'" class="row-c cursor-pointer radius5 change py5"
-            @click="goRoomDetails(item, '门票预定变更')">
-            <span class="c059FF6">订单变更</span>
+          <div v-if="(item.OrderStatus == 1 && pagesTitle == '销售')||(item.OrderStatus >1 && item.OrderStatus != 3
+            &&pagesTitle=='OP'&&is_correlationOP)" class="row-c cursor-pointer radius5 change py5"
+            @click="goRoomDetails(item, pagesTitle=='销售'?'门票预定变更':'编辑取票方式')">
+            <span class="c059FF6">{{pagesTitle=='销售'?'订单变更':'编辑取票方式'}}</span>
           </div>
           <div v-if="item.OrderStatus > 1" class="row-c cursor-pointer radius5 change1 py5"
             @click="clickRightButtom(item, 4)">
@@ -814,9 +815,10 @@
           </div>
           <div
             v-if="item.OrderStatus >1 && item.OrderStatus != 3
+            && item.OrderStatus != 4
             &&pagesTitle=='OP'&&is_correlationOP"
             class="row-c cursor-pointer radius5 change py5"
-            @click="clickCorrelation(item)"
+            @click="clickCorrelation(item,1)"
           >
             <span class="c059FF6">编辑关联OP</span>
           </div>
@@ -887,7 +889,7 @@
       </div>
     </el-dialog>
     <!-- 变更订单 -->
-    <el-dialog custom-class="w800" title="变更订单" :visible.sync="ChangeOrderDialog">
+    <el-dialog custom-class="w800" :title="pagesTitle=='销售'?'变更订单':'编辑取票方式'" :visible.sync="ChangeOrderDialog">
       <div style="padding-bottom:20px">
         <div class="flexOne-form-bj">
           <h3>取票方式</h3>
@@ -896,25 +898,19 @@
             <div>
               <el-radio v-model="msgParameter.MailingState" label="1">自行取票</el-radio>
               <el-radio v-model="msgParameter.MailingState" label="2">邮寄票券</el-radio>
+              <el-radio v-model="msgParameter.MailingState" label="4">电子券</el-radio>
             </div>
           </div>
-          <div class="flexOne-description">
+          <div class="flexOne-description" v-if="msgParameter.MailingState==1">
             <b>自行取票说明</b>
-            <p>自行前往指定位置取票，當您完成付款後我們將通過郵件通知您取票的門票訊息</p>
+            <p>自取地址：{{msgParameter.SelffetchAddress?msgParameter.SelffetchAddress:'-'}}</p>
           </div>
           <div class="flexOne-infor-box">
-            <b>客人讯息 邮寄讯息</b>
-            <el-form label-width="80px" :model="msgParameter" :rules="rules2" ref="msgParameter">
+            <b>{{msgParameter.MailingState==1?'客人讯息':msgParameter.MailingState==2?'邮寄讯息':''}}</b>
+            <el-form v-if="msgParameter.MailingState!=4" label-width="80px" :model="msgParameter" :rules="rules2" ref="msgParameter">
               <div class="infor-list">
-                <!-- <div class="list-title">
-                <li>中文姓名</li>
-                <li>英文姓名</li>
-                <li>性别</li>
-                <li>联络电话</li>
-                <li>收件地址</li>
-              </div> -->
                 </span>
-                <div class="list-centent" :class="{ 'active': msg.MailingState == 1 }">
+                <div class="list-centent" :class="{ 'active': msgParameter.MailingState == 1 }">
                   <li>
                     <el-form-item label="中文名" prop="Name">
                       <el-input v-model="msgParameter.Name" placeholder="请输入名称" />
@@ -937,6 +933,12 @@
                         placeholder="请输入邮寄地址" />
                     </el-form-item>
                   </li>
+                  <li v-if="msgParameter.MailingState == 2">
+                    <el-form-item label="邮寄费" prop="MailingMoney">
+                      <el-input type="Number" style="border-radius: 3px;" v-model="msgParameter.MailingMoney"
+                        placeholder="请输入邮寄费" />
+                    </el-form-item>
+                  </li>
                   <li class="bottom">
                     <el-form-item label="性别" prop="Sex">
                       <el-radio v-model="msgParameter.Sex" label="1">男</el-radio>
@@ -946,7 +948,7 @@
                 </div>
               </div>
             </el-form>
-            <div style="margin-top: 20px;">
+            <div v-if="pagesTitle=='销售'" style="margin-top: 20px;">
               <el-input style="width: 100%;" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
                 v-model="msgParameter.Remark" placeholder="订单备注" />
             </div>
@@ -1055,6 +1057,9 @@ export default {
           message: '请输入邮寄地址',
           trigger: 'blur'
         }],
+        MailingMoney: [
+          { required: true, message: "请输入邮寄费用", trigger: "blur" },
+        ],
       },
       outerVisible: false,
       rules: {
@@ -1122,7 +1127,7 @@ export default {
       this.close()
       this.$emit('success')
     },
-    clickCorrelation(item){
+    clickCorrelation(item,type){
       this.CorrelationObj = item
       this.CorrelationObj.TypeNum = 2
       this.isShowCorrelation = true
@@ -1172,7 +1177,24 @@ export default {
       if (this.msgParameter.MailingState == '1') {
         this.msgParameter.MailingAddress = ''
       }
-      let m = {
+      let m
+      let url
+      if(this.pagesTitle=='OP'){
+        m = {
+          OrderId: this.msgParameter.OrderId,
+          MailingMoney: this.msgParameter.MailingMoney,
+          MailingState: this.msgParameter.MailingState,//邮寄状态 1自取 2邮寄
+          MailingAddress: this.msgParameter.MailingAddress,//MailingState =2 填写邮寄
+          SelffetchAddress: this.msgParameter.SelffetchAddress,//自取地址
+          Name: this.msgParameter.Name,
+          EName: this.msgParameter.EName,
+          Sex: this.msgParameter.Sex,//1男2女
+          Mobile: this.msgParameter.Mobile,
+        }
+        url = 'dict_post_SetTicketOrderMailingState'
+      }
+      if(this.pagesTitle=='销售'){
+        m = {
           IsUpdateMailing: 1,
           OrderId: this.msgParameter.OrderId,
           CouponsId: this.msgParameter.CouponsId,
@@ -1188,16 +1210,18 @@ export default {
           Mobile: this.msgParameter.Mobile,
           Remark: this.msgParameter.Remark,
         }
+        url = 'ticket_post_SetSaleTicketOrder'
+      }
       this.loading3 = true
-      this.apipost("ticket_post_SetSaleTicketOrder", m,
+      this.apipost(url, m,
         res => {
           this.loading3 = false
           if (res.data.resultCode == 1) {
-            this.Success('变更成功');
+            this.Success(`${this.pagesTitle=='销售'?'变更订单':'编辑取票方式'}成功`);
             this.$emit('success')
             this.ChangeOrderDialog = false
           } else {
-            this.Error('变更失败')
+            this.Error(`${this.pagesTitle=='销售'?'变更订单':'编辑取票方式'}失败`)
           }
         },
         err => {
@@ -1314,8 +1338,29 @@ export default {
         this.msgParameter.MailingState = JSON.stringify(this.msgParameter.MailingState)
         this.msgParameter.Sex = JSON.stringify(this.msgParameter.Sex)
         this.ChangeOrderDialog = true
+        // 获取自取地址
+        this.GetTicketCouponsInfo()
       }
     },
+    GetTicketCouponsInfo(){
+      this.apipost('ticket_post_GetTicketCouponsInfo',{
+        CouponsId: this.msgParameter.CouponsId,
+        OpenTime: this.msgParameter.UseDate,
+      },
+      res => {
+          this.loading3 = false
+          if (res.data.resultCode == 1) {
+            this.msgParameter.SelffetchAddress = res.data.data.SelffetchAddress
+            let arr = res.data.data.TicketPriceList.sort((a,b)=>{
+              return a.MailingMoney-b.MailingMoney
+            })
+            this.msgParameter.MailingMoney = this.msgParameter.MailingMoney?this.msgParameter.MailingMoney:arr[0].MailingMoney
+          }
+        },
+        err => {
+          this.Error(err.message)
+        })
+    },
     clickRightButtom(item, type) {
       // 0取消订单 1确认订单 2已邮寄 3设置自提地址 4收损
       this.msg.OrderId = item.OrderId;

src/components/scenicSpot/reservation/ReservationOrder.vue

@@ -376,7 +376,7 @@ export default {
           if (res.data.resultCode == 1) {
             this.HotelList = res.data.data;
           } else {
-            message.errorMsg(res.data.message);
+            this.Error(res.data.message)
           }
         },
         err => { }