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

src/components/SalesModule/addPassenger.vue

 <style>
-.heightauto .el-input{
+  .heightauto .el-input {
     height: auto !important;
-}
+  }
+
   .addPassenger .btmTitle {
     padding: 0 10px;
     margin: 20px 0 20px 0;
@@ -134,9 +135,11 @@
     top: 0;
     cursor: pointer;
   }
-  .colorRed input{
+
+  .colorRed input {
     color: red !important;
   }
+
 </style>
 <template>
   <div class="addPassenger">
@@ -147,11 +150,13 @@
         <el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="100px">
           <li>
             <el-form-item label="身份证号码" prop="IdCard" v-if="LineId === 14 || LineId === 2">
-              <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写" @blur.prevent="authentication()">
+              <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写"
+                @blur.prevent="authentication()">
               </el-input>
             </el-form-item>
             <el-form-item label="身份证号码" v-else>
-              <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写" @blur.prevent="authentication()">
+              <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写"
+                @blur.prevent="authentication()">
               </el-input>
             </el-form-item>
           </li>
@@ -169,8 +174,10 @@
           </li>
           <li>
             <el-form-item label="性别" prop="Sex">
-              <el-checkbox v-model="addMsg.Sex" true-label='1' false-label='2' @change="Roominformation()">男</el-checkbox>
-              <el-checkbox v-model="addMsg.Sex" true-label='2' false-label='1' @change="Roominformation()">女</el-checkbox>
+              <el-checkbox v-model="addMsg.Sex" true-label='1' false-label='2' @change="Roominformation()">男
+              </el-checkbox>
+              <el-checkbox v-model="addMsg.Sex" true-label='2' false-label='1' @change="Roominformation()">女
+              </el-checkbox>
             </el-form-item>
           </li>
           <li>
@@ -193,8 +200,8 @@
           </li>
           <li>
             <el-form-item label="出生日期" prop="Birthday">
-              <el-date-picker v-model='addMsg.Birthday' class="w230" @change="zhanchuangTips(addMsg.Birthday)" value-format="yyyy-MM-dd" type="date"
-                              placeholder="选择日期"></el-date-picker>
+              <el-date-picker v-model='addMsg.Birthday' class="w230" @change="zhanchuangTips(addMsg.Birthday)"
+                value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
             </el-form-item>
           </li>
           <li>
@@ -224,8 +231,8 @@
           </li>
           <li>
             <el-form-item label="护照过期日" prop="PassportExpiry">
-              <el-date-picker v-model='addMsg.PassportExpiry' class="w230"  :class=" guoqi ? 'colorRed' : ''" @change="timeOver" value-format="yyyy-MM-dd" type="date"
-                              placeholder="选择日期"></el-date-picker>
+              <el-date-picker v-model='addMsg.PassportExpiry' class="w230" :class=" guoqi ? 'colorRed' : ''"
+                @change="timeOver" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
             </el-form-item>
           </li>
           <li>
@@ -250,8 +257,6 @@
               </el-input>
             </el-form-item>
           </li>
-
-
           <li>
             <el-form-item label="家庭详细地址" prop="AddressDetail">
               <el-input v-model="addMsg.AddressDetail" type="text" class="w230" size=mini maxlength="200"
@@ -325,8 +330,10 @@
           </li>
           <li>
             <el-form-item label="是否占床">
-              <el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='1' :false-label='0' @change="Roominformation()">是</el-checkbox>
-              <el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='0' :false-label='1' @change="Roominformation()">否</el-checkbox>
+              <el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='1' :false-label='0'
+                @change="Roominformation()">是</el-checkbox>
+              <el-checkbox v-model="addMsg.IsBed" name="IsBed" :true-label='0' :false-label='1'
+                @change="Roominformation()">否</el-checkbox>
             </el-form-item>
           </li>
           <li v-if="isOneDay !== 1">
@@ -335,8 +342,10 @@
                 <el-option v-for="item in roomlist" :key="item.ID" :label="item.HouseInfo" :value="item.ID">
                 </el-option>
               </el-select>
-              <input type="button" value="新增房间" class="normalBtn" v-if="!UpdateOrderHouseBtn" @click="addhouse()" title="需要拼房，但没有双人间（半间）的点击新增房间"/>
-              <input type="button" value="刷新房间" class="normalBtn" v-if="UpdateOrderHouseBtn" @click="SellUpdateOrderHouse()" title="选择人数后没有房间的点击刷新"/>
+              <input type="button" value="新增房间" class="normalBtn" v-if="!UpdateOrderHouseBtn" @click="addhouse()"
+                title="需要拼房，但没有双人间（半间）的点击新增房间" />
+              <input type="button" value="刷新房间" class="normalBtn" v-if="UpdateOrderHouseBtn"
+                @click="SellUpdateOrderHouse()" title="选择人数后没有房间的点击刷新" />
             </el-form-item>
           </li>
           <li>
@@ -355,7 +364,7 @@
               </el-select>
             </el-form-item>
           </li>
-          <li >
+          <li>
             <el-form-item label="签证状态">
               <el-select v-model="addMsg.VisaState" filterable size=mini class="w120">
                 <el-option :key="0" label="正常" :value="0">
@@ -396,10 +405,7 @@
             </el-form-item>
             <el-form-item label="景点">
               <el-select v-model="addMsg.CouponsIds" multiple placeholder="请选择" class="heightauto">
-                <el-option
-                  v-for="item in JingDianList"
-                  :key="item.CouponsId"
-                  :label="item.CouponsName"
+                <el-option v-for="item in JingDianList" :key="item.CouponsId" :label="item.CouponsName"
                   :value="item.CouponsId">
                 </el-option>
               </el-select>
@@ -436,7 +442,6 @@
           </li>
         </div>
         <p>
-
         </p>
         <div
           style="width: 100%; min-height: 200px; background: #f1f1f1; line-height: 200px; margin: 10px 0; border-radius: 4px;position: relative; text-align: center;">
@@ -449,7 +454,6 @@
         <input type="button" value="开始识别" class="normalBtn" @click="commonTextDiscern" />
       </div>
     </div>
-
     <p class="btmTitle">日本签证补录资料</p>
     <div class="cont1">
       <el-form label-width="120px">
@@ -470,7 +474,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="40">
           <el-col :span="6">
             <el-form-item label="曾有国籍">
@@ -493,7 +496,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="40">
           <el-col :span="6">
             <el-form-item label="配偶/监护人职位">
@@ -519,7 +521,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="40">
           <el-col :span="6">
             <el-form-item label="上次去时间" prop="Birthday">
@@ -544,7 +545,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="40">
           <el-col :span="6">
             <el-form-item label="酒店电话/友人电话" prop="Birthday">
@@ -567,7 +567,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="40">
           <el-col :span="6">
             <el-form-item label="紧急人电话" prop="Birthday">
@@ -593,7 +592,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="40">
           <el-col :span="6">
             <el-form-item label="报名旅行社" prop="Birthday">
@@ -612,7 +610,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
       </el-form>
     </div>
     <p style="text-align: center; padding: 20px 0;">
@@ -629,9 +626,9 @@
   export default {
     data() {
       return {
-        TravelTypeList:[],
-        UnitTypeList:[],
-        DutyTypeList:[],
+        TravelTypeList: [],
+        UnitTypeList: [],
+        DutyTypeList: [],
         ppAge: 0,
         loading: false,
         appkey_ocr: "OGAhU38ib8EweXMtPVqCbkpN",
@@ -667,9 +664,9 @@
           Duty: "",
           EconomicCapabilityList: [],
           Remarks: "",
-          TravelType:'',
-          UnitType:'',
-          DutyType:'',
+          TravelType: '',
+          UnitType: '',
+          DutyType: '',
           IsHightSchool: "2",
           IsRecommend: "2",
           PassportIssued: "",
@@ -708,21 +705,27 @@
           VisaReplaceId: "0",
           SafeReplaceId: "0",
           VisaState: 0, //签证状态
-          HouseId:'',//房间信息
+          HouseId: '', //房间信息
           CouponsIds: []
         },
         UpdateOrderHouseBtn: false,
         EconomicCapabilityS: [],
         rules: {
-          DutyType: [
-            { required: true, message: '请选择职务类型', trigger: 'change' }
-          ],
-          UnitType: [
-            { required: true, message: '请选择单位类型', trigger: 'change' }
-          ],
-          TravelType: [
-            { required: true, message: '请选择出游类型', trigger: 'change' }
-          ],
+          DutyType: [{
+            required: true,
+            message: '请选择职务类型',
+            trigger: 'change'
+          }],
+          UnitType: [{
+            required: true,
+            message: '请选择单位类型',
+            trigger: 'change'
+          }],
+          TravelType: [{
+            required: true,
+            message: '请选择出游类型',
+            trigger: 'change'
+          }],
           IdCard: [{
             required: true,
             message: "请填身份证号码",
@@ -797,8 +800,7 @@
             required: true,
             message: "请填写手机号码",
             trigger: "blur"
-          }
-          ],
+          }],
           Nationality: [{
             required: true,
             message: "请选择国籍",
@@ -831,7 +833,7 @@
         AirStartStatus: 2,
         SafeStartStatus: 2,
         btnState: true,
-        roomlist:[],
+        roomlist: [],
         isOneDay: 0,
         LineId: 0,
         EndDateStr: '',
@@ -840,54 +842,48 @@
       };
     },
     methods: {
-      getDutyType(){
+      getDutyType() {
         this.apipost(
-          "dict_get_GetDictValueCommonList",
-          {
+          "dict_get_GetDictValueCommonList", {
             Key: 'SK_CRM_DutyType',
           },
           res => {
             if (res.data.resultCode == 1) {
               this.DutyTypeList = res.data.data
-            }else{ 
-            }
+            } else {}
           },
           err => {}
         );
       },
-      getUnitType(){
+      getUnitType() {
         this.apipost(
-          "dict_get_GetDictValueCommonList",
-          {
+          "dict_get_GetDictValueCommonList", {
             Key: 'SK_CRM_UnitType',
           },
           res => {
             if (res.data.resultCode == 1) {
               this.UnitTypeList = res.data.data
-            }else{ 
-            }
+            } else {}
           },
           err => {}
         );
       },
-      getTravelType(){
+      getTravelType() {
         this.apipost(
-          "dict_get_GetDictValueCommonList",
-          {
+          "dict_get_GetDictValueCommonList", {
             Key: 'SK_CRM_TravelType',
           },
           res => {
             if (res.data.resultCode == 1) {
               this.TravelTypeList = res.data.data
-            }else{ 
-            }
+            } else {}
           },
           err => {}
         );
       },
-      jsGetAge(strBirthday){
+      jsGetAge(strBirthday) {
         let returnAge;
-        let strBirthdayArr=strBirthday.split("-");
+        let strBirthdayArr = strBirthday.split("-");
         let birthYear = Number(strBirthdayArr[0]);
         let birthMonth = Number(strBirthdayArr[1]);
         let birthDay = Number(strBirthdayArr[2]);
@@ -895,55 +891,44 @@
         let nowYear = d.getFullYear();
         let nowMonth = d.getMonth() + 1;
         let nowDay = d.getDate();
-        if(nowYear === birthYear){
-          returnAge = 1;//同年 则为0岁
+        if (nowYear === birthYear) {
+          returnAge = 1; //同年 则为0岁
         } else {
-            let ageDiff = nowYear - birthYear ; //年之差
-            if(ageDiff > 0){
-                if(nowMonth == birthMonth) {
-                    let dayDiff = nowDay - birthDay;//日之差
-                    if(dayDiff < 0)
-                    {
+          let ageDiff = nowYear - birthYear; //年之差
+          if (ageDiff > 0) {
+            if (nowMonth == birthMonth) {
+              let dayDiff = nowDay - birthDay; //日之差
+              if (dayDiff < 0) {
                 returnAge = ageDiff - 1;
+              } else {
+                returnAge = ageDiff;
               }
-                    else
-                    {
-                        returnAge = ageDiff ;
-                    }
-                }
-                else
-                {
-                    let monthDiff = nowMonth - birthMonth;//月之差
-                    if(monthDiff < 0)
-                    {
+            } else {
+              let monthDiff = nowMonth - birthMonth; //月之差
+              if (monthDiff < 0) {
                 returnAge = ageDiff - 1;
-                    }
-                    else
-                    {
-                        returnAge = ageDiff ;
-                    }
+              } else {
+                returnAge = ageDiff;
               }
             }
-            else
-            {
-                returnAge = -1;//返回-1 表示出生日期输入错误 晚于今天
+          } else {
+            returnAge = -1; //返回-1 表示出生日期输入错误 晚于今天
           }
         }
-        return returnAge;//返回周岁年龄
+        return returnAge; //返回周岁年龄
       },
-      zhanchuangTips: function (b){
+      zhanchuangTips: function (b) {
         let age = this.jsGetAge(b)
         this.ppAge = age
         if (age == -1) {
-          this.$message.error('出生日期'+ b +'有误')
+          this.$message.error('出生日期' + b + '有误')
           this.addMsg.Birthday = ''
           return
         }
       },
-      getJingDIan: function (){
+      getJingDIan: function () {
         this.apipost(
-          "sellorder_post_GetGuestScenicRefundList",
-          {
+          "sellorder_post_GetGuestScenicRefundList", {
             TCID: this.addMsg.TCID,
             OrderId: this.addMsg.OrderId,
             GuestId: this.addMsg.Id
@@ -951,17 +936,17 @@
           res => {
             if (res.data.resultCode == 1) {
               this.JingDianList = res.data.data
-            }else{ 
+            } else {
               this.$message.error('操作失败')
             }
           },
           err => {}
         );
       },
-      CompareDate(d1, d2){
-        return ((new Date(d1.replace(/-/g,"\/"))) < (new Date(d2.replace(/-/g,"\/"))));
+      CompareDate(d1, d2) {
+        return ((new Date(d1.replace(/-/g, "\/"))) < (new Date(d2.replace(/-/g, "\/"))));
       },
-      timeOver: function(){
+      timeOver: function () {
         this.guoqi = this.CompareDate(this.addMsg.PassportExpiry, this.EndDateStr)
         if (this.guoqi) {
           this.$message.error("客人护照过期时间小于团队出发日期后六个月")
@@ -1147,8 +1132,7 @@
                   chinaFirstName = word.substring(0, 1);
                   chinaLastName = word.substring(1, word.length);
                 }
-              } catch (e) {
-              }
+              } catch (e) {}
             }
           } else if (word_name == '性别') {
             if (word == '女/F' || word.indexOf('女') != -1 || word.indexOf('F') != -1) {
@@ -1180,8 +1164,7 @@
                   enFirstName = word.split('，')[0];
                   enLastName = word.split('，')[1];
                 }
-              } catch (e) {
-              }
+              } catch (e) {}
             }
           } else if (word_name == '护照号码') {
             if (word.indexOf('i') != -1) {
@@ -1270,8 +1253,7 @@
                 chinaFirstName = word.split('/')[0];
                 enFirstName = word.split('/')[1];
               }
-            } catch (e) {
-            }
+            } catch (e) {}
           } else if (word_name == '名') {
             try {
               chinaLastName = word;
@@ -1281,8 +1263,7 @@
                 chinaLastName = word.split('/')[0];
                 enLastName = word.split('/')[1];
               }
-            } catch (e) {
-            }
+            } catch (e) {}
           } else if (word_name == '性别') {
             try {
               if (word == 'M' || word.indexOf('M') != -1 || word.indexOf('m') == -1 || word.indexOf('男') != -1) {
@@ -1296,8 +1277,7 @@
                   'Name': '女'
                 };
               }
-            } catch (e) {
-            }
+            } catch (e) {}
           } else if (word_name == '出生日期') {
             birthday = this.formatDateWithTaiwan(word)
           } else if (word_name == '护照号') {
@@ -1414,8 +1394,7 @@
                   'Name': '女'
                 };
               }
-            } catch (e) {
-            }
+            } catch (e) {}
           } else if (word_name == '出生日期') {
             birthday = this.formatDateWithTaiwan(word)
           } else if (word_name == 'name') {
@@ -1437,8 +1416,7 @@
                   enFirstName = word;
                   enLastName = word;
                 }
-              } catch (e) {
-              }
+              } catch (e) {}
             }
           } else if (word_name == '护照号码') {
             if (word.indexOf('i') != -1) {
@@ -1647,7 +1625,6 @@
       },
       submitForm(addMsg, type) {
         if (this.btnState === true) {
-          
           //提交创建、修改表单
           this.$refs[addMsg].validate(valid => {
             this.btnState = false
@@ -1665,7 +1642,6 @@
         if ((this.LineId === 14 || this.LineId === 2) && this.addMsg.IdCard === '') {
           return this.$message.error('请填写身份证号码！');
         }
-        
         this.addMsg.EconomicCapabilityList = [];
         this.EconomicCapabilityS.forEach(x => {
           if (x.isShow == true) {
@@ -1679,7 +1655,7 @@
         if (this.addMsg.Marriage == "") {
           this.addMsg.Marriage = "0";
         }
-        if(this.ppAge <= 10 && this.addMsg.IsBed == 1) {
+        if (this.ppAge <= 10 && this.addMsg.IsBed == 1) {
           this.$confirm(this.$t('该游客未满十岁确认占床?'), this.$t('tips.tips'), {
             confirmButtonText: '确认',
             cancelButtonText: '取消',
@@ -1693,7 +1669,7 @@
           this.seveInfo(type)
         }
       },
-      seveInfo(type){
+      seveInfo(type) {
         this.apipost(
           "sellorder_post_SetTravelGuestInfo_V2",
           this.addMsg,
@@ -1719,7 +1695,7 @@
         this.apipost(
           "dict_post_GetList", {
             Key: "SK_Visa_EconomicCapability",
-            IsTimer:1
+            IsTimer: 1
           },
           res => {
             this.EconomicCapabilityS = res.data.data;
@@ -1924,11 +1900,10 @@
               this.SafeStartStatus = this.addMsg.IsNeedSafe;
               this.zhanchuangTips(obj.Birthday)
               this.$forceUpdate();
-              this.getHouselist(obj.Sex.toString(),obj.TCID,obj.OrderId,obj.IsBed)
-              if ( this.$route.query.isOneDay === 1) {
+              this.getHouselist(obj.Sex.toString(), obj.TCID, obj.OrderId, obj.IsBed)
+              if (this.$route.query.isOneDay === 1) {
                 this.addMsg.IsBed = 0
               }
-              // this.Roominformation()
             } else {
               this.$message.error();
             }
@@ -2023,7 +1998,7 @@
         this.addMsg.AirReplaceId = "0";
         this.addMsg.VisaReplaceId = "0";
         this.addMsg.SafeReplaceId = "0";
-        this.addMsg.VisaState=0;
+        this.addMsg.VisaState = 0;
         this.GetGuestMustVisaAir();
         let userInfo = this.getLocalStorage();
         var BranchName = userInfo.BranchName;
@@ -2039,15 +2014,19 @@
         }
         this.addMsg.IssuingAuthority = "公安部出入境管理局";
       },
-      Roominformation(){
+      Roominformation() {
         let TCIDs = this.addMsg.TCID;
         let OrderId = this.addMsg.OrderId;
         let IsBed = this.addMsg.IsBed;
         let Sex = this.addMsg.Sex;
-        if(Sex ==1 || Sex == 2) {
+        if (Sex == 1 || Sex == 2) {
           this.apipost(
-            "sellorder_post_GetHouseDetailsByOrderID",
-            {TCIDs: TCIDs, OrderId: OrderId, Sex: Sex, IsBed: IsBed},
+            "sellorder_post_GetHouseDetailsByOrderID", {
+              TCIDs: TCIDs,
+              OrderId: OrderId,
+              Sex: Sex,
+              IsBed: IsBed
+            },
             res => {
               if (res.data.resultCode == 1) {
                 this.roomlist = res.data.data;
@@ -2059,16 +2038,16 @@
                 this.$message.error(res.data.message);
               }
             },
-            err => {
-            }
+            err => {}
           );
         }
       },
-      SellUpdateOrderHouse(){
+      SellUpdateOrderHouse() {
         let OrderId = this.addMsg.OrderId;
         this.apipost(
-            "sellorder_post_SellUpdateOrderHouse_V2",
-            {OrderId: OrderId},
+          "sellorder_post_SellUpdateOrderHouse_V2", {
+            OrderId: OrderId
+          },
           res => {
             if (res.data.resultCode == 1) {
               this.Roominformation()
@@ -2077,15 +2056,18 @@
               this.$message.error(res.data.message);
             }
           },
-            err => {
-            }
+          err => {}
         );
       },
-      getHouselist(Sex,TCID,OrderId,IsBed){
-        if(Sex ==1 || Sex == 2){
+      getHouselist(Sex, TCID, OrderId, IsBed) {
+        if (Sex == 1 || Sex == 2) {
           this.apipost(
-            "sellorder_post_GetHouseDetailsByOrderID",
-            {TCIDs:TCID,OrderId:OrderId,Sex:Sex,IsBed:IsBed},
+            "sellorder_post_GetHouseDetailsByOrderID", {
+              TCIDs: TCID,
+              OrderId: OrderId,
+              Sex: Sex,
+              IsBed: IsBed
+            },
             res => {
               if (res.data.resultCode == 1) {
                 this.roomlist = res.data.data;
@@ -2095,17 +2077,19 @@
             },
             err => {}
           );
-        }else {
+        } else {
           this.$message.error('请选择性别');
         }
       },
-      addhouse(){
+      addhouse() {
         let orderId = this.addMsg.OrderId;
         let sex = this.addMsg.Sex;
-        if(sex ==1 || sex == 2) {
+        if (sex == 1 || sex == 2) {
           this.apipost(
-            "sellorder_get_BatchSetOrderHouse_V2",
-            {orderId: orderId, sex: sex,},
+            "sellorder_get_BatchSetOrderHouse_V2", {
+              orderId: orderId,
+              sex: sex,
+            },
             res => {
               if (res.data.resultCode == 1) {
                 this.Roominformation()
@@ -2113,22 +2097,21 @@
                 this.$message.error(res.data.message);
               }
             },
-            err => {
-            }
+            err => {}
           );
         }
       },
       authentication() {
         let IdCard = this.addMsg.IdCard;
         if (this.$route.query.guestId == 0) {
-          if(IdCard.length == 18){
+          if (IdCard.length == 18) {
             this.apipost(
-              "sellorder_post_GetGusetByIDCard",
-              {IdCard: this.addMsg.IdCard,},
+              "sellorder_post_GetGusetByIDCard", {
+                IdCard: this.addMsg.IdCard,
+              },
               res => {
                 if (res.data.resultCode == 1) {
                   let obj = res.data.data;
-                  
                   this.addMsg.SurName = obj.SurName;
                   this.addMsg.Name = obj.Name;
                   this.addMsg.ESurName = obj.ESurName;
@@ -2152,24 +2135,18 @@
                   this.addMsg.HistoryRecord = obj.HistoryRecord;
                   this.addMsg.Duty = obj.Duty;
                   this.addMsg.Remarks = obj.Remarks;
-                  this.addMsg.TravelType =Number(obj.TravelType);
+                  this.addMsg.TravelType = Number(obj.TravelType);
                   this.addMsg.UnitType = Number(obj.UnitType);
                   this.addMsg.DutyType = Number(obj.DutyType);
                   this.addMsg.IsHightSchool = obj.IsHightSchool;
                   this.addMsg.IsRecommend = obj.IsRecommend;
-
-
                   this.addMsg.Id = this.$route.query.guestId;
                   this.addMsg.TCID = this.$route.query.TCID;
                   this.addMsg.OrderId = this.$route.query.orderId;
                   this.Roominformation() //调取下房间信息
-
-                } else {
-                  // this.$message.error(res.data.message);
                 }
               },
-              err => {
-              }
+              err => {}
             );
           }
         }

src/components/TravelManager/TravelNewQuotation/QuotationPrice_SWT.vue

@@ -1770,6 +1770,30 @@
       },
       //保存数据
       SaveData(type) {
+        if (!this.postData.DayNum) {
+          this.postData.DayNum = 0;
+        }
+        if (!this.postData.GuestNum) {
+          this.postData.GuestNum = 0;
+        }
+        if (!this.postData.FocNum) {
+          this.postData.FocNum = 0;
+        }
+        if (!this.postData.SalePrice) {
+          this.postData.SalePrice = 0;
+        }
+        if (!this.postData.SingleRoomPrice) {
+          this.postData.SingleRoomPrice = 0;
+        }
+        if (!this.postData.HotelDisNum) {
+          this.postData.HotelDisNum = 0;
+        }
+        if (!this.postData.DinnerDisNum) {
+          this.postData.DinnerDisNum = 0;
+        }
+        if (!this.postData.TicketDisNum) {
+          this.postData.TicketDisNum = 0;
+        }
         //酒店默认值赋值
         if (this.postData.SWTHotelList && this.postData.SWTHotelList.length > 0) {
           this.postData.SWTHotelList.forEach(item => {
@@ -1835,6 +1859,24 @@
             })
           })
         }
+        if (this.postData.SWTBusOtherList && this.postData.SWTBusOtherList.length > 0) {
+          this.postData.SWTBusOtherList.forEach(rootItem => {
+            rootItem.SubBusList.forEach(item => {
+              if (!item.Kilometre) {
+                item.Kilometre = 0;
+              }
+              if (!item.VNDPrice) {
+                item.VNDPrice = 0;
+              }
+              if (!item.Times) {
+                item.Times = 0;
+              }
+              if (!item.Price) {
+                item.Price = 0;
+              }
+            })
+          })
+        }
         //船票默认值赋值
         if (this.postData.SWTShipList && this.postData.SWTShipList.length > 0) {
           this.postData.SWTShipList.forEach(item => {

src/components/newTravelmanager/travelLineTrip/HotelTrip.vue

@@ -29,6 +29,7 @@
   .Ht_hotelSelect .el-input {
     height: auto !important;
   }
+
 </style>
 <template>
   <div class="Traveltrip-item-box">
@@ -101,10 +102,9 @@
           <td valign="middle" colspan="5">
             <!--酒店-->
             <el-select v-if="!dayObj.isRead &&IsDirect==1&&TeamType!=2" class="w478 Ht_hotelSelect" size="mini"
-                       v-model="HotelChooseArray"
-                       multiple :multiple-limit="(TeamType==0||TeamType==3)?3:1" @visible-change="getHotelList($event)"
-                       @change="changeHotelList()"
-                       filterable placeholder="请选择" :disabled="IsOpenHotel==1?true:false">
+              v-model="HotelChooseArray" multiple :multiple-limit="(TeamType==0||TeamType==3)?3:1"
+              @visible-change="getHotelList($event)" @change="changeHotelList()" filterable placeholder="请选择"
+              :disabled="IsOpenHotel==1?true:false">
               <el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID">
                 <span style="float: left">{{ getHotelItemLabel(item) }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
@@ -117,8 +117,8 @@
               </span>
               <span v-if="hotelArray.length>0">&nbsp;/或同级</span>
             </span>
-            <el-input type="text" v-if="!dayObj.isRead&&IsDirect==0&&hotelArray[0]" v-model="hotelArray[0].HotelName" @change="noDirectHotelChange"
-                      class="w478"></el-input>
+            <el-input type="text" v-if="!dayObj.isRead&&IsDirect==0&&hotelArray[0]" v-model="hotelArray[0].HotelName"
+              @change="noDirectHotelChange" class="w478"></el-input>
             <span class="TC-hotelName" v-if="dayObj.isRead&&IsDirect==0">
               {{hotelArray[0].HotelName}} &nbsp;/或同级
             </span>
@@ -130,7 +130,7 @@
 </template>
 <script>
   export default {
-    props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig","TeamType",
+    props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig", "TeamType",
       "IsOpenHotel" //0可以添加删除酒店，1-不能修改酒店信息
     ],
     data() {
@@ -139,64 +139,13 @@
         QDinnerList: [],
         QDinnerList2: [],
         DefaultSelectValue: 0,
-        breakFirstList: [{
-          Id: 1,
-          name: "酒店内享用早餐"
-        },
-          {
-            Id: 2,
-            name: "酒店外享用早餐"
-          },
-          {
-            Id: 4,
-            name: "机上简餐或自理"
-          },
-          {
-            Id: 3,
-            name: "方便游玩敬请自理"
-          }
-        ],
+        breakFirstList: [  ],
         showDining: false,
         HotelChooseArray: this.dayObj.HotelChooseArray,
         dinnerArray: this.dayObj.DinnerArray,
         hotelArray: this.dayObj.HotelArray,
-        otherDinner: [{
-          ID: -1,
-          Name: "机上简餐或自理",
-          City: 0,
-          About: "",
-          PicPath: ""
-        },
-          {
-            ID: -2,
-            Name: "酒店享用",
-            City: 0,
-            About: "",
-            PicPath: ""
-          },
-          {
-            ID: -5,
-            Name: "方便游玩敬请自理",
-            City: 0,
-            About: "",
-            PicPath: ""
-          }
-        ],
-        hotelHotSpringDinner: [{
-          ID: -3,
-          Name: "温泉御膳料理",
-          City: 0,
-          About: "",
-          PicPath: ""
-        },
-          {
-            ID: -4,
-            Name: "酒店自助百汇",
-            City: 0,
-            About: "",
-            PicPath: ""
-          }
-        ],
+        otherDinner: [],
+        hotelHotSpringDinner: [],
         isFirstInitDinner: false //初始含有酒店列表，加载完酒店数据在初始化餐厅列表
       };
     },
@@ -204,13 +153,14 @@
       // 非直采酒店
       noDirectHotelChange: function () {
         if (this.hotelArray[0].MD5Sign === '') {
-          this.hotelArray[0].MD5Sign= this.md5(`DayNum=${this.hotelArray[0].DayNum}&Type=3${new Date()}`)
+          this.hotelArray[0].MD5Sign = this.md5(`DayNum=${this.hotelArray[0].DayNum}&Type=3${new Date()}`)
         }
       },
       //非直采餐厅
       noDirectDinnerChange: function (dIndex) {
         if (this.dinnerArray[dIndex].MD5Sign === '') {
-          this.dinnerArray[dIndex].MD5Sign= this.md5(`DayNum=${this.dinnerArray[dIndex].DayNum}&Type=2${new Date()}`);
+          this.dinnerArray[dIndex].MD5Sign = this.md5(
+          `DayNum=${this.dinnerArray[dIndex].DayNum}&Type=2${new Date()}`);
         }
       },
       //获取交通城市
@@ -289,7 +239,6 @@
                   let hotelDescribeObj = this.$tripUtils.tripDescribeObj();
                   hotelDescribeObj.Id = hotelObj.HotelId;
                   hotelDescribeObj.Describe = obj.WarmTip;
-                  //this.WarmTripDescribe.HotelDescribeArr.push(hotelDescribeObj);
                   if (hotelDescribeObj.Describe != null && hotelDescribeObj.Describe != "") {
                     this.dayObj.WarmTipObj.Description += "<p>" + hotelDescribeObj.Describe + "</p>";
                   }
@@ -373,8 +322,7 @@
                 this.QDinnerList2 = JSON.parse(JSON.stringify(this.QDinnerList));
               }
             },
-            err => {
-            }
+            err => {}
           );
         }
       },
@@ -419,7 +367,6 @@
               dinnerDescribeObj.Id = dinnerObj.DinnerId;
               dinnerDescribeObj.Describe = obj.About;
               dinnerDescribeObj.Sort = dinnerObj.UseDinnerType;
-              //this.WarmTripDescribe.DinnerDescribeArr.push(dinnerDescribeObj);
               if (dinnerDescribeObj.Describe != null && dinnerDescribeObj.Describe != "") {
                 this.dayObj.WarmTipObj.Description += "<p>" + dinnerDescribeObj.Describe + "</p>";
               }
@@ -620,7 +567,7 @@
             });
           });
           this.dayObj.DinnerArray.forEach(x => {
-            if (x.DinnerId != 0&&x.UseDinnerType!=1) {
+            if (x.DinnerId != 0 && x.UseDinnerType != 1) {
               if (!this.checkDinnerExists(this.QDinnerList, x.DinnerId)) {
                 this.QDinnerList.push({
                   ID: x.DinnerId,
@@ -650,6 +597,23 @@
         });
         return isExist;
       },
+      //获取配置餐厅信息
+      getConfigDinnerList() {
+        this.apipost(
+          "travel_get_GetConfigDinnerList", {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.breakFirstList= res.data.data.breakFirstList;
+              this.otherDinner=res.data.data.otherDinner;
+              this.hotelHotSpringDinner=res.data.data.hotelHotSpringDinner;
+            }
+          },
+          err => {}
+        );
+      }
+    },
+    created() {
+      this.getConfigDinnerList();
     },
     mounted() {
       this.initializationData();