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

src/components/SalesModule/addPassenger.vue

@@ -156,7 +156,7 @@
               </el-select>
             </el-form-item>
           </li>
-          <li v-if="addMsg.Nationality==2">
+          <li v-if="addMsg.Nationality==NationalityId">
             <el-form-item :label="$t('visaT.Chinesesurname')" prop="SurNameID">
               <el-select class="w230" ref="options" v-model="addMsg.SurNameID" filterable remote reserve-keyword
                 placeholder="请输入关键词" :remote-method="(query)=>remoteMethod(query,1)" @change="(e)=>getName(e,1)">
@@ -167,7 +167,7 @@
               </el-select>
             </el-form-item>
           </li>
-          <li v-if="addMsg.Nationality==2">
+          <li v-if="addMsg.Nationality==NationalityId">
             <el-form-item :label="$t('admin.admin_Surname')" prop="NameID">
               <el-select class="w230" ref="optionsNames" v-model="addMsg.NameID" filterable remote reserve-keyword
                 :placeholder="$t('rule.qsrzwm')" :remote-method="(query)=>remoteMethod(query)"
@@ -204,7 +204,7 @@
           </li>
           <li>
             <!--国内线且国籍是中国的才验证身份证-->
-            <el-form-item :label="$t('admin.admin_IDcard')" prop="IdCard" v-if="LineId==90&&addMsg.Nationality==2">
+            <el-form-item :label="$t('admin.admin_IDcard')" prop="IdCard" v-if="LineId==90&&addMsg.Nationality==NationalityId">
               <el-input v-model="addMsg.IdCard" type="text" :class=" IdCardSure ? '' : 'colorRed'" size=mini
                 class="w230" :placeholder="$t('visaT.Pleasefillin')" @blur.prevent="authentication()">
               </el-input>
@@ -675,6 +675,7 @@
         TravelTypeList: [],
         UnitTypeList: [],
         DutyTypeList: [],
+        NationalityId:0,
         ppAge: 0,
         loading: false,
         PassportNoSure: true,
@@ -945,6 +946,18 @@
           },
           err => {}
         );
+      },
+       GetDefaultCountryList() {
+        this.apipost(
+          "dict_get_GetDefaultCountryList", {
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              this.NationalityId = res.data.data.ID
+            } else {}
+          },
+          err => {}
+        );
       },
       getUnitType() {
         this.apipost(
@@ -1505,7 +1518,7 @@
                   return ;
                 }
                
-             if(this.addMsg.Nationality===2){
+             if(this.addMsg.Nationality===this.NationalityId){
                   // 单个字母开头（E或G）后跟8位数字
                 const pattern1 = /^[EGH][0-9]{8}$/;
                 // 两个字母开头（E开头，第二个字母不能是I或O）后跟7位数字
@@ -1690,7 +1703,7 @@
         this.addMsg.PassportAddress = "";
         this.addMsg.PassportExpiry = "";
         this.addMsg.PassportNo = "";
-        this.addMsg.Nationality = 2;
+        this.addMsg.Nationality = this.NationalityId;
         this.addMsg.Marriage = "";
         this.addMsg.Address = "";
         this.addMsg.AddressDetail = "";
@@ -1855,7 +1868,8 @@
                   this.Roominformation() //调取下房间信息
                   this.Transformation(this.addMsg.SurName, 'SurName', 1)
                   this.Transformation(this.addMsg.Name, 'Name', 2)
-                  if (this.LineId == 90 && this.addMsg.Nationality == 2) {
+                  //this.LineId == 90 && 
+                  if (this.addMsg.Nationality == this.NationalityId) {
                     this.addMsg.Birthday = this.getBirthdayFromIdCard(IdCard);
                   }
                 }
@@ -1922,6 +1936,7 @@
       },
     },
     mounted() {
+      this.GetDefaultCountryList();
       this.getTravelType();
       this.getDutyType();
       this.getUnitType();