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

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2164,7 +2164,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="14" class="RL_Order">
+            <td colspan="15" class="RL_Order">
               <span class="RL-remarkTitle" v-if="item.GuestList.length > 0">{{ $t("salesModule.MD") }}:</span>
               <p class="RL-redType RL-remarkCon" v-if="item.GuestList.length > 0">
                 <span style="color: blue !important" v-for="childItem in item.GuestList"
@@ -2218,7 +2218,7 @@
                 </p>
               </div>
             </td>
-            <td colspan="4" style="height: 40px; cursor: pointer">
+            <td colspan="5" style="height: 40px; cursor: pointer">
               <div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
                 <span>收款单据：</span>
                 <span v-for="(item2, index2) in item.FinanceList" :key="index2">
@@ -2947,7 +2947,7 @@
         <tbody>
           <tr>
             <td></td>
-            <td colspan="15">
+            <td colspan="16">
               {{ $t("ground.bentuanjiwei") }}:
               <span class="RL-redType">{{ ConfigData.Config.YSeat }}Y + {{ ConfigData.Config.CSeat }}E
                 + {{ ConfigData.Config.FSeat }}F </span>&nbsp; {{ $t("ground.syjiwei") }}:

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -785,7 +785,7 @@
             </div>
           </td>
           <td
-            :colspan="isEditOrderCreate == 1 ? 9 : 8"
+            :colspan="isEditOrderCreate == 1 ? 10 : 9"
             class="groupTourOrder_tickets"
             style="height: 20px; cursor: pointer"
             @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"

src/components/orderCommon/order-form.vue

@@ -27,6 +27,10 @@
   <div class="commonOrderForm">
     <p class="title">
       {{ $t("salesModule.SignImdi") }}
+      <span v-if="crmOrderObj">
+        <span style="color: red;">引流人：{{crmOrderObj.LureEmpNmae}} </span>
+        <span style="color: #2AAEF2;">/客人：{{crmOrderObj.CRMGuestName}}</span>
+      </span>
       <span class="fr">
         <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmit()" />
         <input type="button" class="normalBtn" :value="$t('salesModule.SignImdi')" @click="submitForm('addMsg')" />
@@ -571,6 +575,8 @@
       SonControlID: "-1",
       IsShowMessagesMoney: "2",
       QuotationUrl: "", //单团附件
+      LureEmpId: 0, //引流id
+      CRMGuestId: 0, //客人ID
         },
         uploadLloading: false,
         rules: {
@@ -651,6 +657,7 @@
         SingleDMCPrice: 0, // 单地接;
         TotalNumber: 0, //总人数
         priceObj: {}, //团期价格信息
+        crmOrderObj: null
       };
     },
     filters: {
@@ -1328,59 +1335,80 @@
       },
       //清空表单信息
       clearMsg() {
-        this.addMsg.OrderId = "0";
-        this.addMsg.TCID = "0";
-        this.addMsg.IsIntermodal = "2";
-        this.addMsg.IsReturnIntermodal = "2";
-        this.addMsg.Unit_Price = "0";
-        this.addMsg.TC_Price = "0";
-        this.addMsg.ManNum = "0";
-        this.addMsg.ChirdNum = "0";
-        this.addMsg.ChirdNeedBedNum = "0";
-        this.addMsg.BabyNum = "0";
-        this.addMsg.OldPeopleNum = "0";
-        this.addMsg.SingleRoomNum = "0";
-        this.addMsg.PreferPrice = "0";
-        this.addMsg.YSeatNum = "0";
-        this.addMsg.ESeatNum = "0";
-        this.addMsg.FSeatNum = "0";
-        this.addMsg.Commission = "0";
-        this.addMsg.BrandId = "";
-        this.addMsg.PlatformAccount = "";
-        this.addMsg.TradeWay = "2";
-        this.addMsg.GuestNum = "0";
-        this.addMsg.IsChildrenTour = "0";
-        this.addMsg.OrderId = "0";
-        this.addMsg.IsBirdDiscount = "0";
-        this.addMsg.PredictRoomNum = "0";
-        this.addMsg.BigRoomNum = "0";
-        this.addMsg.TripleRoomNum = "0";
-        this.addMsg.TradeDate = "";
-        this.addMsg.CostType = "";
-        this.addMsg.PlatformOrder = "";
+        this.addMsg = {
+      price: 0,
+      GroupTypeNeedHouse: 0,
+      OrderId: 0,
+      OneSex: 0,
+      TCID: 0,
+      CustomerType: "",
+      GroupType: "",
+      IndustryCategory: "",
+      ContactName: "",
+      ContactMobile: "",
+      CustomerId: "",
+      DepartureCityId: 0,
+      ReturnArriveCityId: "",
+      IsIntermodal: "2",
+      IsReturnIntermodal: "2",
+      Unit_Price: 0,
+      TC_Price: 0,
+      ManNum: 0, // 成人数量
+      ChirdNum: 0, // 小孩数量
+      ChirdNoNeedBedNum: 0,
+      ChirdNeedBedNum: 0,
+      BabyNum: 0,
+      OldPeopleNum: 0,
+      SingleRoomNum: 0,
+      PreferPrice: 0,
+      YSeatNum: 0,
+      ESeatNum: 0,
+      FSeatNum: 0,
+      Commission: 0,
+      ClientSource: 0,
+      BrandId: 0,
+      TradeWay: "2",
+      PlatformAccount: "",
+      PlatformOrder: "",
+      GuestNum: 0,
+      IsChildrenTour: 0,
+      IsBirdDiscount: 0,
+      PredictRoomNum: 0,
+      BigRoomNum: 0,
+      TripleRoomNum: 0,
+      TradeDate: "",
+      CostType: "",
+      Remarks: "",
+      VisaNum: 0,
+      SafeNum: 0,
+      AirticketNum: 0,
+      ScenicRefundArr: [],
+      GoCityTime: "",
+      BackCityTime: "",
+      CommissionSharePeople: 0,
+      CommissionShareMoney: 0,
+      OrderForm: "1",
+      SonControlID: "-1",
+      IsShowMessagesMoney: "2",
+      QuotationUrl: "", //单团附件
+      LureEmpId: 0, //引流id
+      CRMGuestId: 0, //客人ID
+        }
+        this.remarkMsg = {
+          zc: "",
+          bzc: "",
+          fjf: "",
+          ye: "",
+          lr: "",
+          dd: "",
+          df: "",
+          dc: "",
+          srf: "",
+          qz: "",
+          qzf: "",
+        }
         this.clientSourceList = [];
-        this.addMsg.Remarks = "";
-        this.addMsg.MinOrderPrice = "";
-        this.addMsg.VisaNum = "0";
-        this.addMsg.SafeNum = "0";
-        this.addMsg.AirticketNum = "0";
         this.addMsg.ScenicRefundArr = [];
-        this.ScenicRefundMoney = 0;
-        this.addMsg.CommissionSharePeople = "-1";
-        this.addMsg.CommissionShareMoney = "0";
-        this.addMsg.IsShowMessagesMoney = "2";
-        this.addMsg.OneSex = "0";
-        this.remarkMsg.zc = "";
-        this.remarkMsg.bzc = "";
-        this.remarkMsg.fjf = "";
-        this.remarkMsg.ye = "";
-        this.remarkMsg.lr = "";
-        this.remarkMsg.dd = "";
-        this.remarkMsg.df = "";
-        this.remarkMsg.dc = "";
-        this.remarkMsg.srf = "";
-        this.remarkMsg.qz = "";
-        this.remarkMsg.qzf = "";
       },
       saveOrder() {
         // 判断单团类型
@@ -1776,21 +1804,39 @@
       this.getCityList();
       //获取交易方式
       this.getTradeWay();
+
+      // crm自动登陆传过来的参数
+      if (this.$route.query.crmOrderObj) {
+        this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
+        this.addMsg.LureEmpId = this.crmOrderObj.LureEmpId //引流id
+        this.addMsg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID
+      }
       
     },
     watch: {
       productObj:{
         handler(oldValue, newVal){
+          this.clearMsg();
+          this.getTravelPirceInfo()
           this.addMsg.DepartureCityId = oldValue.StartCityID
           this.addMsg.ReturnArriveCityId = oldValue.ReturnArriveCityId
-        }
+          this.addMsg.GoCityTime = this.starTime = oldValue.StartCityTime;
+          this.addMsg.BackCityTime = this.endTime = oldValue.BackCityTime;
+          // crm自动登陆传过来的参数
+          if (this.$route.query.crmOrderObj) {
+            this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
+            this.addMsg.LureEmpId = this.crmOrderObj.LureEmpId //引流id
+            this.addMsg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID
+          }
+        },
+        deep: true
       },
       //监听TCID变化
       PTCID: function (oldValue, newVal) {
-        if (oldValue != newVal) {
-          this.clearMsg();
-          this.getTravelPirceInfo()
-        }
+        // if (oldValue != newVal) {
+        //   this.clearMsg();
+        //   this.getTravelPirceInfo()
+        // }
       }
     }
   };