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

src/components/Login2019.vue

@@ -167,12 +167,20 @@
             <i class="icon-login-password iconfont icon-mima" :style="{color: pwd_bline==true?'#E95252':'#000000'}"></i>
             <input class="input FPF_b" @focus="pwd_bline=true" @blur="pwd_bline=false" autocomplete="new-password"
               maxlength="20" v-model="password" style="background-color:transparent !important" type="password"
-              placeholder="请输入新密码" />
+              placeholder="新密码：大写字母+小写字母+数字或?!&$%#_" />
+            <div class="pwd_bline_left" :class="pwd_bline==true?'_bline_w':''"></div>
+            <div class="pwd_bline_right" :class="pwd_bline==true?'_bline_w':''"></div>
+          </div>
+          <div class="login-commonBotm">
+            <i class="icon-login-password iconfont icon-mima" :style="{color: pwd_bline==true?'#E95252':'#000000'}"></i>
+            <input class="input FPF_b" @focus="pwd_bline=true" @blur="pwd_bline=false" autocomplete="new-password"
+              maxlength="20" v-model="passwordSure" style="background-color:transparent !important" type="password"
+              placeholder="确认密码：大写字母+小写字母+数字或?!&$%#_" />
             <div class="pwd_bline_left" :class="pwd_bline==true?'_bline_w':''"></div>
             <div class="pwd_bline_right" :class="pwd_bline==true?'_bline_w':''"></div>
           </div>
 
-          <div class="login-commonBotm btValidate">
+          <!-- <div class="login-commonBotm btValidate">
             <i class="icon-login-password iconfont icon-yanzhengma"
               :style="{color: validate_bline==true?'#E95252':'#000000'}"></i>
             <input class="input FPF_b phoneValidate" maxlength="4" onkeyup="value=value.replace(/[^\d]/g,'')"
@@ -184,7 +192,7 @@
               <span v-show="show" @click="getCode" class="FPF_s">获取验证码</span>
               <span v-show="!show" class="count FPF_s">{{count}}s重新获取</span>
             </div>
-          </div>
+          </div> -->
           <div class="forgetPw">
             <div class="error-msg" style="float:left;width:auto;">
               <div v-show="passwordIsShow"><img src="../assets/img/login-error-tips.png" />{{ passwordErrorMsg }}</div>
@@ -233,6 +241,7 @@
         },
         groupModel: "",
         password: "",
+        passwordSure:"",
         mobileNumber: "",
         code: "",
         mobileCodeType: 1,
@@ -437,12 +446,16 @@
         this.mobileCodeType = 2;
       },
       changePwd() {
+        if (this.passwordSure != this.password) {
+          this.Error('新密码和确认密码不一致');
+          return;
+        }
         let msg = {
           password: this.password,
-          mobileNumber: this.mobileNumber,
-          code: this.code
+          mobileNumber: this.mobileNumber
+         // code: this.code
         };
-        this.apipost("user_change_password_by_mobileNumber", msg, res => {
+        this.apipost("user_change_password_by_mobile", msg, res => {
           if (res.data.resultCode == 1) {
             this.isShow = 1;
             this.$notify.success({

src/components/PersonalInfoSet.vue

@@ -773,26 +773,26 @@
               </el-input>
             </el-form-item>
             <el-form-item v-if="visible" label="新密码" style="margin-bottom:30px;" prop="Pwd">
-              <el-input type="password" class="w400" v-model="passWordMsg.Pwd" maxlength="15" placeholder="请输入新密码">
+              <el-input type="password" class="w400" v-model="passWordMsg.Pwd" maxlength="15" placeholder="密码格式：大写字母+小写字母+数字或?!&$%#_">
                 <i slot="suffix" title="显示密码" @click="changePass('show')" style="cursor:pointer;"
                   class="el-input__icon iconfont icon-yincang"></i>
               </el-input>
             </el-form-item>
             <el-form-item v-else label="新密码" style="margin-bottom:30px;" prop="Pwd">
-              <el-input type="text" class="w400" v-model="passWordMsg.Pwd" maxlength="15" placeholder="请输入新密码">
+              <el-input type="text" class="w400" v-model="passWordMsg.Pwd" maxlength="15" placeholder="密码格式：大写字母+小写字母+数字或?!&$%#_">
                 <i slot="suffix" title="隐藏密码" @click="changePass('hide')" style="cursor:pointer;"
                   class="el-input__icon iconfont icon-xianshi"></i>
               </el-input>
             </el-form-item>
             <el-form-item v-if="SureVisible" label="确认密码" style="margin-bottom:30px;" prop="surePassword">
               <el-input type="password" class="w400" v-model="passWordMsg.surePassword" maxlength="15"
-                placeholder="请输入新密码">
+                placeholder="密码格式：大写字母+小写字母+数字或?!&$%#_">
                 <i slot="suffix" title="显示密码" @click="changePass2('show')" style="cursor:pointer;"
                   class="el-input__icon iconfont icon-yincang"></i>
               </el-input>
             </el-form-item>
             <el-form-item v-else label="确认密码" style="margin-bottom:30px;" prop="surePassword">
-              <el-input type="text" class="w400" v-model="passWordMsg.surePassword" maxlength="15" placeholder="请输入新密码">
+              <el-input type="text" class="w400" v-model="passWordMsg.surePassword" maxlength="15" placeholder="密码格式：大写字母+小写字母+数字或?!&$%#_">
                 <i slot="suffix" title="隐藏密码" @click="changePass2('hide')" style="cursor:pointer;"
                   class="el-input__icon iconfont icon-xianshi"></i>
               </el-input>

src/components/administrative/userManagement.vue

@@ -166,11 +166,11 @@
               readonly></el-input>
           </el-form-item>
           <el-form-item :label="$t('adm.adm_newPd')" prop="Pwd">
-            <el-input class="w217" type="password" v-model="pwdMsg.Pwd" :placeholder="$t('pub.pleaseImport')">
+            <el-input class="w217" type="password" v-model="pwdMsg.Pwd" placeholder="新密码：大写字母+小写字母+数字或?!&$%#_">
             </el-input>
           </el-form-item>
           <el-form-item :label="$t('adm.adm_Reinput')" prop="Pwd1">
-            <el-input class="w217" type="password" v-model="pwdMsg.Pwd1" :placeholder="$t('pub.pleaseImport')">
+            <el-input class="w217" type="password" v-model="pwdMsg.Pwd1" placeholder="确认密码：大写字母+小写字母+数字或?!&$%#_">
             </el-input>
           </el-form-item>
         </el-form>

src/components/orderCommon/order-form.vue

@@ -32,8 +32,8 @@
           </el-form-item>
           <!-- 参团类型 -->
           <el-form-item :label="$t('fnc.ctleixing')" prop="GroupType">
-            <el-select v-model="addMsg.GroupType" @change="groupTypeChange(), gettypechange(addMsg.GroupType)"
-              filterable :placeholder="$t('pub.pleaseSel')">
+            <el-select v-model="addMsg.GroupType" @change="changeGroupType(addMsg.GroupType)" filterable
+              :placeholder="$t('pub.pleaseSel')">
               <el-option v-for="item in joinTypeList" v-if="item.Id != 5" :label="item.Name" :value="item.Id"
                 :key="item.Id">
               </el-option>
@@ -252,7 +252,7 @@
         <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
           <el-form-item :label="$t('salesModule.SingleRoomNum')" prop="SingleRoomNum">
             <el-input v-model="addMsg.SingleRoomNum" @keyup.native="checkInteger(addMsg, 'SingleRoomNum')" @input="
-                  yzBigBed2();
+                  yzSingleBed();
                   getTotalPrice();
                   autoRemarks('SingleRoomNum', '单房数量');
                 "></el-input>
@@ -270,7 +270,7 @@
         <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
           <el-form-item :label="$t('salesModule.TripleRoomNum')" prop="TripleRoomNum">
             <el-input v-model="addMsg.TripleRoomNum" @keyup.native="checkInteger(addMsg, 'TripleRoomNum')" @input="
-                  yzBigBed1();
+                  yzThreeBed();
                   getTotalPrice();
                   autoRemarks('TripleRoomNum', '三人房');
                 "></el-input>
@@ -586,6 +586,10 @@
         tradeWayList: [], //交易方式列表
         ScenicRefundList: [], //可退景点列表
         employeeList: [], //员工列表
+        PlatformAccountList: [], //平台账户绑定列表
+        PlatformAccountList1: [], //所有平台账户列表
+        DiplomacyPlatformAccountList: [], //外交平台账户列表
+        ScenicRefundMoney: 0, //可退景点的金额
         remarkMsg: {
           zc: "",
           bzc: "",
@@ -600,51 +604,27 @@
           qzf: "",
         },
         otherRemark: "",
-        PlatformAccountList: [],
-        ScenicRefundMoney: 0,
         SingleDMCPricex: 0, // 单地接;
         SingleDMCPrice: 0, // 单地接;
-        PlatformAccountList1: [],
-        PlatformAccountList2: [],
-        TotalNumber: 0,
+        TotalNumber: 0, //总人数
       };
     },
     methods: {
       //参团类型切换
-      groupTypeChange(val) {
-        if (val === "4") {
-          this.addMsg.ManNum = 0;
-          this.addMsg.ChirdNoNeedBedNum = 0;
-          this.addMsg.ChirdNeedBedNum = 0;
-          this.addMsg.BabyNum = 0;
-          this.addMsg.OldPeopleNum = 0;
-          this.addMsg.ManNum = 0;
-          this.getNumber();
-          this.getHouseNo();
-          this.getTotalPrice();
-        } else if (val === "1") {
-          this.addMsg.AirticketNum = 0;
-          this.getNumber();
-          this.getHouseNo();
-          this.getTotalPrice();
-        }
-        this.addMsg.GroupTypeNeedHouse = "0";
-      },
-      gettypechange(type) {
+      changeGroupType(type) {
         if ((type = !2)) {
           this.addMsg.IndustryCategory = "";
           this.addMsg.QuotationUrl = "";
         }
+        //单地接
         if (type == 4) {
           this.HightUnitPrice = "1";
           this.addMsg.AirticketNum = 0;
           this.addMsg.ManNum = 0;
-          // this.addMsg.ChirdNum = 0;
           this.addMsg.BabyNum = 0;
           this.addMsg.OldPeopleNum = 0;
           this.addMsg.ChirdNoNeedBedNum = 0;
           this.addMsg.ChirdNeedBedNum = 0;
-
           this.addMsg.PreferPrice = 0;
           this.addMsg.SafeNum = 0;
           this.addMsg.VisaNum = 0;
@@ -654,12 +634,10 @@
           this.HightUnitPrice = "2";
           this.addMsg.AirticketNum = 0;
           this.addMsg.ManNum = 0;
-          // this.addMsg.ChirdNum = 0;
           this.addMsg.BabyNum = 0;
           this.addMsg.OldPeopleNum = 0;
           this.addMsg.ChirdNoNeedBedNum = 0;
           this.addMsg.ChirdNeedBedNum = 0;
-
           this.addMsg.PreferPrice = 0;
           this.addMsg.SafeNum = 0;
           this.addMsg.VisaNum = 0;
@@ -667,56 +645,44 @@
           this.addMsg.YSeatNum = 0;
         }
         this.Unit_PriceList = [];
+        this.addMsg.GroupTypeNeedHouse = "0";
       },
       //验证签证人数
       yzVisaNum: function () {
         let ChirdNum = Number(this.addMsg.ChirdNum);
+        //地接
         if (this.addMsg.GroupType == 4) {
           ChirdNum = 0;
         }
-        let count =
-          Number(this.addMsg.AirticketNum) +
-          Number(this.addMsg.ManNum) +
-          ChirdNum +
-          Number(this.addMsg.BabyNum) +
-          Number(this.addMsg.OldPeopleNum);
+        let count = Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + ChirdNum +
+          Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum);
         if (count < this.addMsg.VisaNum) {
           this.addMsg.VisaNum = count;
-          this.$message.error("签证人数不能大于总人数");
+          this.Error("签证人数不能大于总人数");
         }
       },
       //验证保险人数
       yzSafeNum: function () {
         let ChirdNum = Number(this.addMsg.ChirdNum);
+        //单地接
         if (this.addMsg.GroupType == 4) {
           ChirdNum = 0;
         }
-        let count =
-          Number(this.addMsg.AirticketNum) +
-          Number(this.addMsg.ManNum) +
-          ChirdNum +
-          Number(this.addMsg.BabyNum) +
-          Number(this.addMsg.OldPeopleNum);
-        this.TotalNumber = count
+        let count = Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + ChirdNum +
+          Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum);
+        this.TotalNumber = count;
         if (count < this.addMsg.SafeNum) {
           this.addMsg.SafeNum = count;
-          this.$message.error("保险人数不能大于总人数");
+          this.Error("保险人数不能大于总人数");
         }
       },
       // 自动添加备注
       autoRemarks: function (key, text) {
-        let count =
-          Number(this.addMsg.AirticketNum) +
-          Number(this.addMsg.ManNum) +
-          Number(this.addMsg.ChirdNum) +
-          Number(this.addMsg.BabyNum) +
-          Number(this.addMsg.OldPeopleNum);
+        let count = Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
+          Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum);
 
         this.remarkMsg.qz = "";
-        if (
-          this.addMsg[key].toString() !== "0" &&
-          this.addMsg[key].toString() !== ""
-        ) {
+        if (this.addMsg[key].toString() !== "0" && this.addMsg[key].toString() !== "") {
           if (
             this.addMsg[key].toString() !== count.toString() &&
             this.addMsg[key].toString() !== ""
@@ -993,19 +959,16 @@
           }
         }
       },
-      //可退景点
+      //可退景点(获取可退景点的可退金额)
       ScenicRefundMethods() {
-        if (this.addMsg.ScenicRefundArr.length == 0) {
-          this.ScenicRefundMoney = 0;
-        } else {
         this.ScenicRefundMoney = 0;
+        if (this.addMsg.ScenicRefundArr && this.addMsg.ScenicRefundArr.length > 0) {
           this.addMsg.ScenicRefundArr.forEach((x) => {
             let listIndex = this.ScenicRefundList.findIndex(
               (item) => item.Id == x
             );
             if (listIndex != -1) {
-              this.ScenicRefundMoney +=
-                this.ScenicRefundList[listIndex].RefundMoney;
+              this.ScenicRefundMoney += this.ScenicRefundList[listIndex].RefundMoney;
             }
           });
         }
@@ -1016,7 +979,7 @@
       tradeWayMethods(val) {
         if (val == 3) {
           this.addMsg.PlatformAccount = "";
-          this.PlatformAccountList = this.PlatformAccountList2;
+          this.PlatformAccountList = this.DiplomacyPlatformAccountList;
         }
         if (val == 1) {
           this.addMsg.PlatformAccount = "";
@@ -1046,6 +1009,7 @@
               Number(this.addMsg.OldPeopleNum));
         }
       },
+      //获取线路最低定金金额
       getMinPrice(id) {
         this.apipost(
           "line_post_Get", {
@@ -1056,15 +1020,11 @@
               this.minPrice = res.data.data.LowDeposit;
             }
           },
-          (err) => {}
         );
       },
-      //客户类型切换
+      //客户类型切换 清空客户编号
       resetSelect() {
-        if (this.addMsg.CustomerType == 1) {
-          this.addMsg.CustomerId = "";
-        }
-        if (this.addMsg.CustomerType == 2) {
+        if (this.addMsg.CustomerType == 1 || this.addMsg.CustomerType == 2) {
           this.addMsg.CustomerId = "";
         }
       },
@@ -1075,6 +1035,7 @@
           this.addMsg.ContactMobile = "";
         }
       },
+      //计算少价金额
       getTypePrice() {
         if (this.addMsg.CustomerType == 1) {
           this.addMsg.TC_Price = this.priceObj.B2BMemberPrice;
@@ -1165,13 +1126,10 @@
             },
           );
         }
-        //  let cj='成交单价-最低成交价格（标准单价-符合人数[成人，儿童，老人]条件的最高少价）'
+        //let cj='成交单价-最低成交价格（标准单价-符合人数[成人，儿童，老人]条件的最高少价）'
         let chajia = Number(this.addMsg.Unit_Price) - (this.addMsg.TC_Price - yh);
         let ewtc = chajia > 0 ? chajia * 0.5 * num : chajia * num; //额外提成
-        this.addMsg.Commission = (
-          Number(this.addMsg.PreferPrice) * 0.01 +
-          ewtc
-        ).toFixed(2);
+        this.addMsg.Commission = (Number(this.addMsg.PreferPrice) * 0.01 + ewtc).toFixed(2);
         this.addMsg.CommissionShareMoney = "0";
         if (
           (this.addMsg.CustomerType == 1 || this.addMsg.CustomerType == 2) &&
@@ -1188,6 +1146,7 @@
           }
         }
       },
+      //预计用房数
       getHouseNo() {
         //算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量 8.7新增单地接儿童不占床  减去 儿童不占床
         let etbzc = 0;
@@ -1223,37 +1182,27 @@
         if (this.addMsg.GroupType == 4) {
           ChirdNum = 0;
         }
-        this.addMsg.ChirdNum =
-          this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1;
-        this.addMsg.VisaNum =
-          Number(this.addMsg.AirticketNum) +
-          Number(this.addMsg.ManNum) +
-          ChirdNum +
-          Number(this.addMsg.BabyNum) +
-          Number(this.addMsg.OldPeopleNum);
-        this.addMsg.SafeNum =
-          Number(this.addMsg.AirticketNum) +
-          Number(this.addMsg.ManNum) +
-          ChirdNum +
-          Number(this.addMsg.BabyNum) +
-          Number(this.addMsg.OldPeopleNum);
-        this.TotalNumber =
-          Number(this.addMsg.AirticketNum) +
-          Number(this.addMsg.ManNum) +
-          ChirdNum +
-          Number(this.addMsg.BabyNum) +
-          Number(this.addMsg.OldPeopleNum);
-        var SeatNum =
-          Number(this.addMsg.ManNum) +
-          Number(this.addMsg.ChirdNum) +
-          Number(this.addMsg.OldPeopleNum) -
-          (Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum));
+        //儿童人数
+        this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1;
+        //签证人数
+        this.addMsg.VisaNum = Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) +
+          ChirdNum + Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum);
+        //保险人数
+        this.addMsg.SafeNum = Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + ChirdNum +
+          Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum);
+        //总人数
+        this.TotalNumber = Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + ChirdNum + Number(this.addMsg
+          .BabyNum) + Number(this.addMsg.OldPeopleNum);
+        //座位数
+        var SeatNum = Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum) - (
+          Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum));
         this.addMsg.YSeatNum = SeatNum < 0 ? 0 : SeatNum;
         if (this.addMsg.GroupType == 4) {
           this.addMsg.YSeatNum = 0;
         }
         this.autoRemarks("VisaNum", "不要签证数量");
       },
+      //计算价格
       getTotalPrice(t) {
         if (t === 3) {
           if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
@@ -1273,158 +1222,65 @@
           }
         }
         this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1;
+        var DiscountPrice = 0; //早鸟优惠价格
+        //享受早鸟优惠
         if (this.priceObj.IsBirdDiscount == 1) {
-          //早鸟优惠
-          //this.addMsg.Unit_Price  //成交单价
-          //BabyPrice 婴儿价
-          //BabyChargePrice  儿童附加费
-          //OldManChargePrice  老人 附加费
-          //DiscountPrice 早鸟优惠
-          let chengren =
-            Number(this.addMsg.ManNum) *
-            (Number(this.addMsg.Unit_Price) - this.priceObj.DiscountPrice);
-          let ertong =
-            Number(this.addMsg.ChirdNum) *
-            (Number(this.addMsg.Unit_Price) -
-              this.priceObj.DiscountPrice +
-              this.priceObj.BabyChargePrice);
-
-          let yinger = Number(this.addMsg.BabyNum) * this.priceObj.BabyPrice;
-          let laoren =
-            Number(this.addMsg.OldPeopleNum) *
-            (Number(this.addMsg.Unit_Price) -
-              this.priceObj.DiscountPrice +
-              this.priceObj.OldManChargePrice);
-          let zafeiqianzhen =
-            this.priceObj.OtherPrice *
-            (Number(this.addMsg.ManNum) +
-              Number(this.addMsg.ChirdNum) +
-              Number(this.addMsg.OldPeopleNum)) +
-            this.priceObj.VisaPrice *
-            (Number(this.addMsg.AirticketNum) +
-              Number(this.addMsg.ManNum) +
-              Number(this.addMsg.ChirdNum) +
-              Number(this.addMsg.OldPeopleNum)) -
-            this.priceObj.BackVisaPrice *
-            (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 =
-            Number(this.addMsg.SingleRoomNum) * this.priceObj.SingleRoomPrice;
-          let ertongbed =
-            this.priceObj.ChildNeedPrice * Number(this.addMsg.ChirdNeedBedNum) -
-            this.priceObj.ChildNoNeedPrice *
-            (Number(this.addMsg.ChirdNum) -
-              Number(this.addMsg.ChirdNeedBedNum));
-          let lianyun =
-            (Number(this.addMsg.ManNum) +
-              Number(this.addMsg.ChirdNum) +
-              Number(this.addMsg.OldPeopleNum)) *
-            (Number(this.stratPrice) + Number(this.returnPrice));
-          let dandijie;
-
-          if (this.addMsg.GroupType == 4) {
-            dandijie =
-              this.SingleDMCPrice * Number(this.addMsg.AirticketNum) -
-              this.priceObj.ChildNoNeedPrice *
-              Number(this.addMsg.ChirdNoNeedBedNum);
-            ertong = 0;
-            ertongbed = 0;
-            zafeiqianzhen = 0;
-          } else {
-            dandijie =
-              this.priceObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
-          }
-          this.addMsg.PreferPrice =
-            dandijie +
-            lianyun +
-            chengren +
-            ertong +
-            yinger +
-            laoren +
-            zafeiqianzhen +
-            danfang +
-            ertongbed -
-            this.ScenicRefundMoney *
-            (Number(this.addMsg.ManNum) +
-              Number(this.addMsg.ChirdNum) +
-              Number(this.addMsg.OldPeopleNum));
-        } else {
-          let chengren =
-            Number(this.addMsg.ManNum) * Number(this.addMsg.Unit_Price);
-          let ertong =
-            Number(this.addMsg.ChirdNum) *
-            (Number(this.addMsg.Unit_Price) + this.priceObj.BabyChargePrice);
-          let yinger = Number(this.addMsg.BabyNum) * this.priceObj.BabyPrice;
-          let laoren =
-            Number(this.addMsg.OldPeopleNum) *
-            (Number(this.addMsg.Unit_Price) + this.priceObj.OldManChargePrice);
+          DiscountPrice = Number(this.priceObj.DiscountPrice);
+        }
+        //成人价格=成人人数*(成交单价-早鸟优惠)
+        let chengren = Number(this.addMsg.ManNum) * (Number(this.addMsg.Unit_Price) - DiscountPrice);
+        //儿童价格=儿童人数*(单价-早鸟优惠+儿童附加费)
+        let ertong = Number(this.addMsg.ChirdNum) *
+          (Number(this.addMsg.Unit_Price) - DiscountPrice + Number(this.priceObj.BabyChargePrice));
+        //婴儿价格=婴儿人数*婴儿价格
+        let yinger = Number(this.addMsg.BabyNum) * (Number(this.priceObj.BabyPrice));
+        //老人价格=老人人数*(单价-早鸟优惠+老人附加费)
+        let laoren = Number(this.addMsg.OldPeopleNum) *
+          (Number(this.addMsg.Unit_Price) - this.priceObj.DiscountPrice + this.priceObj.OldManChargePrice);
+        //杂费签证费
         let zafeiqianzhen =
-            this.priceObj.OtherPrice *
-            (Number(this.addMsg.ManNum) +
-              Number(this.addMsg.ChirdNum) +
-              Number(this.addMsg.OldPeopleNum)) +
-            this.priceObj.VisaPrice *
-            (Number(this.addMsg.AirticketNum) +
-              Number(this.addMsg.ManNum) +
-              Number(this.addMsg.ChirdNum) +
-              Number(this.addMsg.OldPeopleNum)) -
-            this.priceObj.BackVisaPrice *
-            (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 =
-            Number(this.addMsg.SingleRoomNum) * this.priceObj.SingleRoomPrice;
+          this.priceObj.OtherPrice * (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg
+            .OldPeopleNum)) +
+          this.priceObj.VisaPrice * (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this
+            .addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) -
+          this.priceObj.BackVisaPrice * (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 = Number(this.addMsg.SingleRoomNum) * this.priceObj.SingleRoomPrice;
+        //儿童占床、不占床价格
         let ertongbed =
           this.priceObj.ChildNeedPrice * Number(this.addMsg.ChirdNeedBedNum) -
-            this.priceObj.ChildNoNeedPrice *
-            (Number(this.addMsg.ChirdNum) -
-              Number(this.addMsg.ChirdNeedBedNum));
-          let lianyun =
-            (Number(this.addMsg.ManNum) +
-              Number(this.addMsg.ChirdNum) +
-              Number(this.addMsg.OldPeopleNum)) *
+          this.priceObj.ChildNoNeedPrice * (Number(this.addMsg.ChirdNum) - Number(this.addMsg.ChirdNeedBedNum));
+        //联运
+        let lianyun = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) *
           (Number(this.stratPrice) + Number(this.returnPrice));
-          let dandijie;
+        //单地接
+        let dandijie = 0;
         if (this.addMsg.GroupType == 4) {
-            dandijie =
-              this.SingleDMCPrice * Number(this.addMsg.AirticketNum) -
-              this.priceObj.ChildNoNeedPrice *
-              Number(this.addMsg.ChirdNoNeedBedNum);
+          dandijie = this.SingleDMCPrice * Number(this.addMsg.AirticketNum) - this.priceObj.ChildNoNeedPrice * Number(
+            this.addMsg.ChirdNoNeedBedNum);
           ertong = 0;
           ertongbed = 0;
           zafeiqianzhen = 0;
         } else {
-            dandijie =
-              this.priceObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
-          }
-          this.addMsg.PreferPrice =
-            dandijie +
-            lianyun +
-            chengren +
-            ertong +
-            yinger +
-            laoren +
-            zafeiqianzhen +
-            danfang +
-            ertongbed -
-            this.ScenicRefundMoney *
+          dandijie = this.priceObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
+        }
+        //退景点费用
+        var refundScenicPrice = this.ScenicRefundMoney *
           (Number(this.addMsg.ManNum) +
             Number(this.addMsg.ChirdNum) +
             Number(this.addMsg.OldPeopleNum));
-        }
+        //总应收价格
+        this.addMsg.PreferPrice = dandijie + lianyun + chengren + ertong + yinger + laoren + zafeiqianzhen + danfang +
+          ertongbed - refundScenicPrice;
         this.getTicheng();
         if (!t) {
           this.getTypePrice();
         }
       },
-      yzBigBed2() {
+      //验证单房数量
+      yzSingleBed() {
         let x =
           Number(this.addMsg.AirticketNum) +
           Number(this.addMsg.ManNum) +
@@ -1441,6 +1297,7 @@
         this.getHouseNo();
         this.autoRemarks("SingleRoomNum", "单房数量");
       },
+      //验证大床房
       yzBigBed() {
         let x =
           Number(this.addMsg.AirticketNum) +
@@ -1458,7 +1315,8 @@
         this.getHouseNo();
         this.autoRemarks("BigRoomNum", "大床房");
       },
-      yzBigBed1() {
+      //验证三人房
+      yzThreeBed() {
         let x =
           Number(this.addMsg.AirticketNum) +
           Number(this.addMsg.ManNum) +
@@ -1628,7 +1486,7 @@
             this.addMsg.CommissionShareMoney = "0";
           }
         }
-
+        //单地接
         if (this.addMsg.GroupType == 4) {
           this.addMsg.TC_Price = this.SingleDMCPricex; //地接时 本团单价
           this.addMsg.Unit_Price = this.SingleDMCPrice; // 地接时 成交单价
@@ -1673,23 +1531,7 @@
           },
         );
       },
-      // todo  购买的产品信息，需要从外部传入
-      goBuy(obj) {
-        this.isUpdateSharePeople = false;
-        this.priceObj = obj;
-        this.addMsg.DepartureCityId = obj.StartCityID;
-        this.addMsg.ReturnArriveCityId = obj.ReturnArriveCityId;
-        this.addMsg.GoCityTime = this.starTime = obj.StartCityTime;
-        this.addMsg.BackCityTime = this.endTime = obj.BackCityTime;
-        this.addMsg.SonControlID = obj.SonControlID;
-        this.getMinPrice(obj.LineID);
-        this.getScenicRefund(obj.TCID);
-        this.getPlatformAccount(obj.PlatformAccountTypeId);
-        this.getPlatformAccountNew();
-        this.clearMsg();
-        this.SingleDMCPrice = obj.SingleDMCPrice;
-        this.SingleDMCPricex = obj.SingleDMCPrice;
-      },
+      //获取所有账户列表
       getPlatformAccount(typeIdtwo) {
         let platBranchId = this.CurrentUserInfo.RB_Branch_id;
         this.apipost(
@@ -1703,19 +1545,20 @@
             }
           });
       },
+      //获取外交平台账户列表
       getPlatformAccountNew() {
         this.apipost(
           "Financial_get_GetDiplomacyPlatformList", {},
           (res) => {
             if (res.data.resultCode == 1) {
-              this.PlatformAccountList2 = [];
+              this.DiplomacyPlatformAccountList = [];
               let data = res.data.data;
               data.forEach((item) => {
                 let obj = {
                   Alias: item.Name,
                   ID: item.ID,
                 };
-                this.PlatformAccountList2.push(obj);
+                this.DiplomacyPlatformAccountList.push(obj);
               });
             }
           });