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

src/components/TravelManager/TravelTeam/chooseCustomer.vue

@@ -2,6 +2,25 @@
 
 </style>
 <template>
+<div>
+    <div style="border: none; display: flex; margin-bottom: 20px">
+      <ul style="overflow: initial!important;display: flex; width: 100%">
+        <li style="display: flex">
+          <span style="width: 60px; line-height: 34px">
+            <em>{{$t('salesModule.keyWords')}}</em>
+          </span>
+          <el-input v-model="qMsg.CustomerName" :placeholder="$t('salesModule.InputPhone')"></el-input>
+        </li>
+        <li>
+          <input
+            type="button"
+            class="hollowFixedBtn"
+            :value="$t('pub.searchBtn')"
+            @click="resetPageIndex(),getCustomerList()"
+          >
+        </li>
+      </ul>
+    </div>
   <el-card class="box-card">
     <div slot="header" class="clearfix">
       <span>选择同行</span>
@@ -37,7 +56,7 @@
         layout="total,prev, pager, next, jumper" :page-size="qMsg.pageSize" :total="qMsg.total">
       </el-pagination>
     </div>
-  </el-card>
+  </el-card></div>
 </template>
 <script>
   export default {
@@ -46,6 +65,7 @@
         loading: false,
         dataList: [], //数据列表
         qMsg: {
+          CustomerName: '',
           pageIndex: 1,
           currentPage: 1,
           pageSize: 8,
@@ -75,6 +95,7 @@
         this.qMsg.pageIndex = val;
         this.getCustomerList();
       },
+      resetPageIndex() {this.qMsg.pageIndex = 1;},
       // 获取合作伙伴列表
       getCustomerList() {
         this.loading = true;

src/components/TravelManager/TravelTeam/priceGroup.vue

@@ -1200,7 +1200,7 @@
         addMsg.IsChildrenTour = this.addObj.IsSupportChildren;
         addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
         this.apipost(
-          "sellorder_post_SetOrderInfo",
+          "sellorder_post_SetTravelTeamOrderForB2B",
           addMsg,
           (res) => {
             if (res.data.resultCode == 1) {

src/pubComponents/buyGroup.vue

@@ -669,6 +669,14 @@
         TotalNumber: 0,
       };
     },
+    watch: {
+      info: {
+        handler: function() {
+        this.goBuy(this.info)
+      },
+      deep: true
+      }
+    },
     components: {
     },
     filters: {
@@ -1364,7 +1372,9 @@
         }
         this.autoRemarks("VisaNum", "不要签证数量");
       },
+      // 计算价格
       getTotalPrice(t) {
+        console.log('getTotalPrice', this.addObj)
         if (t === 3) {
           if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
             this.$message.error("请输入正确的价格！");
@@ -1416,14 +1426,14 @@
               Number(this.addMsg.ManNum) +
               Number(this.addMsg.ChirdNum) +
               Number(this.addMsg.OldPeopleNum)) -
-            this.addObj.BackVisaPrice *
+            (this.addObj.BackVisaPrice || 0) *
             (Number(this.addMsg.AirticketNum) +
               Number(this.addMsg.ManNum) +
               Number(this.addMsg.ChirdNum) +
               Number(this.addMsg.BabyNum) +
               Number(this.addMsg.OldPeopleNum) -
               Number(this.addMsg.VisaNum));
-          let danfang =
+              let danfang =
             Number(this.addMsg.SingleRoomNum) * this.addObj.SingleRoomPrice;
           let ertongbed =
             this.addObj.ChildNeedPrice * Number(this.addMsg.ChirdNeedBedNum) -
@@ -1483,7 +1493,7 @@
               Number(this.addMsg.ManNum) +
               Number(this.addMsg.ChirdNum) +
               Number(this.addMsg.OldPeopleNum)) -
-            this.addObj.BackVisaPrice *
+            (this.addObj.BackVisaPrice || 0) *
             (Number(this.addMsg.AirticketNum) +
               Number(this.addMsg.ManNum) +
               Number(this.addMsg.ChirdNum) +
@@ -1515,6 +1525,18 @@
             dandijie =
               this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
           }
+          console.log('this.addObj.OtherPrice', this.addObj.OtherPrice, (Number(this.addMsg.ManNum) +
+              Number(this.addMsg.ChirdNum) +
+              Number(this.addMsg.OldPeopleNum)),this.addObj.VisaPrice,(Number(this.addMsg.AirticketNum) +
+              Number(this.addMsg.ManNum) +
+              Number(this.addMsg.ChirdNum) +
+              Number(this.addMsg.OldPeopleNum)),(Number(this.addMsg.AirticketNum) +
+              Number(this.addMsg.ManNum) +
+              Number(this.addMsg.ChirdNum) +
+              Number(this.addMsg.BabyNum) +
+              Number(this.addMsg.OldPeopleNum) -
+              Number(this.addMsg.VisaNum)))
+          
           this.addMsg.PreferPrice =
             dandijie +
             lianyun +
@@ -1670,9 +1692,12 @@
       },
     // todo  购买的产品信息，需要从外部传入
       goBuy(obj) {
+        console.log('goBuy', obj)
+        if(!obj) return
         this.isUpdateSharePeople = false;
         this.isShowLayer = true;
         this.addObj = obj;
+        this.addObj.SingleDMCPrice = this.addObj.SingleDMCPrice || 0
         this.addMsg.DepartureCityId = obj.StartCityID;
         this.addMsg.ReturnArriveCityId = obj.ReturnArriveCityId;
 
@@ -1893,7 +1918,7 @@
         if (this.addMsg.ClientSource == 4 && this.addMsg.Remarks.indexOf(text) == -1) {
           this.addMsg.Remarks = '飞猪订单；' + this.addMsg.Remarks
         }
-      }
+      },
     },
     mounted() {
       let userInfo = this.getLocalStorage();
@@ -1911,6 +1936,7 @@
         let nowDay = this.FormartDate(new Date());
         this.msg.StartTime = nowDay;
       }
+      this.goBuy(this.info)
       this.getEmployee();
       this.getStartList();
       this.getKhlxList();