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

src/components/TravelManager/TravelTeam/priceGroup.vue

@@ -662,18 +662,17 @@
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
     </el-pagination>
-    <div class="buy-box" v-show="showBuy">
-      <buyGroup @change="changeBuy" :info="buyInfo"></buyGroup>
+    <div class="buy-box" v-show="isShowTeamOrder">
+      <orderForm @success="reSearchPage" @close="closeForm" :priceObj="teamInfo"></orderForm>
     </div>
   </div>
 </template>
 <script>
-  import buyGroup from "../../../pubComponents/buyGroup.vue";
+  //订单表单
+  import orderForm from "../../orderCommon/order-form.vue";
   export default {
     data() {
       return {
-        buyInfo: null,
-        showBuy: false,
         pickerOptions0: {
           disabledDate: (time) => {
             let starTime = new Date(this.starTime);
@@ -686,63 +685,11 @@
             return time.getTime() < endTime.getTime() - 5.64e7;
           },
         },
-        //当前登录用户信息
-        CurrentUserInfo: {},
-        userId: "",
-        createByInfo: "",
         starTime: "",
         endTime: "",
         loading: true,
         currentPage: 1,
         total: 0,
-        addObj: {},
-        rules: {
-          CustomerType: [{
-            required: true,
-            message: "请选择客户类型",
-            trigger: "change",
-          }, ],
-          CustomerId: [{
-            required: false,
-            message: "请选择客户门店",
-            trigger: "change",
-          }, ],
-          DepartureCityId: [{
-            required: true,
-            message: "请选择出发城市",
-            trigger: "change",
-          }, ],
-          GroupType: [{
-            required: true,
-            message: "请选择参团类型",
-            trigger: "change",
-          }, ],
-          ClientSource: [{
-            required: true,
-            message: "请选择客人来源",
-            trigger: "change",
-          }, ],
-          TradeWay: [{
-            required: true,
-            message: "请选择交易方式",
-            trigger: "change",
-          }, ],
-          ContactName: [{
-            required: true,
-            message: "请输入联系人姓名",
-            trigger: "blur",
-          }, ],
-          ContactMobile: [{
-              required: true,
-              message: "请输入联系人电话",
-              trigger: "blur",
-            },
-            {
-              pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
-              message: "请输入正确的手机",
-            },
-          ],
-        },
         msg: {
           pageIndex: 1,
           pageSize: 10,
@@ -751,16 +698,27 @@
           EndTime: "",
         },
         dataList: [],
-        TotalNumber: 0,
+        isShowTeamOrder: false, //是否显示订单弹窗
+        teamInfo: {},//团队信息
       };
     },
     components: {
-      buyGroup: buyGroup
-    },
-    filters: {
-
+      orderForm: orderForm
     },
+ 
     methods: {
+      //刷新页面
+      reSearchPage() {
+        this.isShowTeamOrder = false;
+        this.teamInfo={};
+        this.getList();
+      },
+      //关闭窗口
+      closeForm()
+      {
+        this.isShowTeamOrder=false;
+        this.teamInfo={};
+      },
       //跳转到报名清单
       gotoOrder(item) {
         this.OpenNewPage('/groupTourOrderByTuan', {
@@ -768,137 +726,6 @@
           tcmun: item.TCNUM
         });
       },
-      saveOrder(addMsg) {
-        // 判断单团类型
-        if (addMsg.GroupType == 2) {
-          if (addMsg.IndustryCategory == "") {
-            this.Error("请填写行业类别！");
-            return;
-          }
-          if (addMsg.QuotationUrl == "") {
-            this.Error("请上传附件！");
-            return;
-          }
-        }
-        //验证人数和机位数 20190807 修改 如果是不是单地接才判断
-        if (addMsg.GroupType !== "4" && addMsg.GroupType !== "3") {
-          if (addMsg.ChirdNoNeedBedNum == "") {
-            addMsg.ChirdNoNeedBedNum = 0;
-            // this.$message.warning("请输入儿童不占床数！如果没有请输入0！");
-            // return;
-          }
-          if (addMsg.ChirdNeedBedNum == "") {
-            addMsg.ChirdNeedBedNum = 0;
-            // this.$message.warning("请输入儿童占床数！如果没有请输入0！");
-            // return;
-          }
-          if (
-            Number(addMsg.ManNum) +
-            Number(addMsg.ChirdNum) +
-            Number(addMsg.OldPeopleNum) !=
-            Number(addMsg.YSeatNum) +
-            Number(addMsg.ESeatNum) +
-            Number(addMsg.FSeatNum)
-          ) {
-            this.$message.warning("人数和机位数不相等！");
-            return;
-          }
-          if (
-            Number(addMsg.AirticketNum) +
-            Number(addMsg.ManNum) +
-            Number(addMsg.ChirdNum) +
-            Number(addMsg.OldPeopleNum) +
-            Number(addMsg.BabyNum) <
-            Number(addMsg.VisaNum)
-          ) {
-            this.$message.warning("签证数量不能大于人数总和！");
-            return;
-          }
-
-          if (
-            Number(addMsg.AirticketNum) +
-            Number(addMsg.ManNum) +
-            Number(addMsg.ChirdNum) +
-            Number(addMsg.OldPeopleNum) +
-            Number(addMsg.BabyNum) <
-            Number(addMsg.SafeNum)
-          ) {
-            this.$message.warning("保险数量不能大于人数总和！");
-            return;
-          }
-          if (
-            Number(addMsg.ChirdNum) -
-            Number(addMsg.ChirdNeedBedNum) +
-            Number(addMsg.BabyNum) >
-            Number(addMsg.ManNum) +
-            Number(addMsg.OldPeopleNum) +
-            Number(addMsg.ChirdNeedBedNum)
-          ) {
-            this.$message.warning("儿童占床数量不足！");
-            return;
-          }
-          if (
-            Number(addMsg.ChirdNeedBedNum) > Number(addMsg.ChirdNum)
-          ) {
-            this.$message.warning("儿童占床不能大于儿童数！");
-            return;
-          }
-        }
-
-        if (this.userId == this.createByInfo) {
-          if (addMsg.CommissionSharePeople == "-1") {
-            addMsg.CommissionShareMoney = "0";
-          }
-        }
-        if (addMsg.GroupType == 4) {
-          addMsg.TC_Price = this.SingleDMCPricex; //地接时 本团单价
-          addMsg.Unit_Price = this.SingleDMCPrice; // 地接时 成交单价
-          if (addMsg.ChirdNoNeedBedNum == "") {
-            addMsg.ChirdNoNeedBedNum = 0;
-          }
-        }
-        let ChirdNum = Number(addMsg.ChirdNum);
-        if (addMsg.GroupType == 4) {
-          ChirdNum = 0;
-        }
-        // 判断交易方式是外交平台和平台付款
-        if (addMsg.TradeWay == 1 || addMsg.TradeWay == 3) {
-          if (addMsg.PlatformAccount == "") {
-            this.Error("请选择收款账户！");
-            return;
-          }
-        }
-        addMsg.GuestNum =
-          Number(addMsg.ManNum) +
-          ChirdNum +
-          Number(addMsg.OldPeopleNum) +
-          Number(addMsg.BabyNum) +
-          Number(addMsg.AirticketNum);
-        addMsg.IsChildrenTour = this.addObj.IsSupportChildren;
-        addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
-        this.apipost(
-          "sellorder_post_SetTravelTeamOrderForB2B",
-          addMsg,
-          (res) => {
-            if (res.data.resultCode == 1) {
-              this.$message.success(res.data.message);
-              this.$refs["addMsg"].resetFields();
-              this.clearMsg();
-
-            } else {
-              this.$message.error(res.data.message);
-            }
-          },
-          (err) => {}
-        );
-      },
-      changeBuy(info) {
-        if (!info) {
-          this.showBuy = false
-        } else {
-          this.saveOrder(info)
-        }
-      },
       // 结束日期不能大于开始日期
       dataDui() {
         if (this.msg.StartTime > this.msg.EndTime && this.msg.EndTime !== "") {
@@ -907,9 +734,8 @@
         }
       },
       goBuy(obj) {
-        this.showBuy = true;
-        this.buyInfo = obj
-        this.addObj = obj
+        this.isShowTeamOrder = true;
+        this.teamInfo = obj;
       },
       getList() {
         this.loading = true;
@@ -938,7 +764,6 @@
       },
     },
     mounted() {
-      this.CurrentUserInfo = this.getLocalStorage();
       this.getList();
     },
   };