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

src/components/LeaderManagement/leaderManagement.vue

@@ -307,8 +307,15 @@
             <em>{{$t('admin.admin_GuideLeibie')}}</em>
             <el-select v-model="msg.LeaderGuidClass" clearable :placeholder="$t('system.ph_choice')">
               <el-option :label="$t('system.ph_buxian')" :value='-1'></el-option>
-              <el-option :label="$t('admin.admin_cpGuide')" :value='0'></el-option>
-              <el-option :label="$t('admin.admin_waiGuide')" :value='1'></el-option>
+              <template v-if="msg.Type==3">
+                <el-option :label="$t('admin.admin_cpGuide')" :value='0'></el-option>
+                <el-option :label="$t('admin.admin_waiGuide')" :value='1'></el-option>
+              </template>
+              <template v-else>
+                <el-option :label="$t('op.CompanyLeader')" :value="0"></el-option>
+                <el-option :label="$t('op.THLeader')" :value="1"></el-option>
+                <el-option :label="$t('op.LXLeader')" :value="2"></el-option>
+              </template>
             </el-select>
           </span>
         </li>
@@ -461,18 +468,25 @@
     <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center
       :before-close="closeChangeMachie" :close-on-click-modal="false">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
-        <el-form-item>
-          <el-radio-group v-model="addMsg.LeaderGuidClass">
-            <el-radio :label="0">{{$t('admin.admin_waiGuideT')}}</el-radio>
-            <el-radio :label="1">{{$t('admin.admin_GuideLeibieT')}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="$t('system.query_workType')" prop="Type" v-if="addMsg.LeaderGuidClass==0">
+        <el-form-item :label="$t('system.query_workType')" prop="Type">
           <el-select v-model="addMsg.Type" :placeholder="$t('admin.admin_workType')" class="w210">
             <el-option v-for='item in workTypeList' :key="item.Value" :label="item.Key" :value="item.Value">
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="addMsg.Type==3?'导游类型':'领队类型'">
+          <el-select v-model="addMsg.LeaderGuidClass" :placeholder="$t('system.ph_choice')">
+            <template v-if="addMsg.Type==3">
+              <el-option :key="0" :label="$t('admin.admin_cpGuide')" :value='0'></el-option>
+              <el-option :key="1" :label="$t('admin.admin_waiGuide')" :value='1'></el-option>
+            </template>
+            <template v-else>
+              <el-option :key="0" :label="$t('op.CompanyLeader')" :value="0"></el-option>
+              <el-option :key="1" :label="$t('op.THLeader')" :value="1"></el-option>
+              <el-option :key="2" :label="$t('op.LXLeader')" :value="2"></el-option>
+            </template>
+          </el-select>
+        </el-form-item>
         <el-form-item :label="$t('admin.admin_language')" class='multiple_input LanguageList'
           v-if="addMsg.Type==3&&addMsg.LeaderGuidClass==0">
           <el-select v-model="LanguageIdS" multiple :placeholder="$t('admin.admin_phlanguage')" class="w210">
@@ -946,7 +960,11 @@
           res => {
             if (res.data.resultCode == 1) {
               res.data.data.forEach(item => {
-                this.workTypeList.push(item);
+                var obj = {
+                  Key: item.Key,
+                  Value: Number(item.Value)
+                }
+                this.workTypeList.push(obj);
               });
             }
           });
@@ -1073,7 +1091,7 @@
       },
       initAddMsg() {
         this.addMsg.ID = "0";
-        this.addMsg.Type = "3";
+        this.addMsg.Type = 3;
         this.addMsg.EmployeeId = "";
         this.addMsg.Surname = "";
         this.addMsg.Name = "";
@@ -1120,28 +1138,43 @@
           },
           res => {
             let LanguageIdArr = [];
-            this.addMsg = res.data.data;
-            this.addMsg.LeaderGuidClass = this.addMsg.LeaderGuidClass ? this.addMsg.LeaderGuidClass : 0;
-            this.addMsg.Type = this.addMsg.Type.toString();
-            this.addMsg.Sex = this.addMsg.Sex.toString();
-            this.addMsg.LeaderGuidType = this.addMsg.LeaderGuidType.toString();
-            this.addMsg.VisaNumber = this.addMsg.VisaNumber.toString();
-            if (this.addMsg.emRB_Department_Id) {
-              this.getPost(this.addMsg.RB_Branch_id, this.addMsg.emRB_Department_Id);
-              this.getDerpartMent(this.addMsg.RB_Branch_id)
-            }
-            if (this.addMsg.LanguageId) {
-              this.addMsg.LanguageId = this.addMsg.LanguageId.substr(
-                0,
-                this.addMsg.LanguageId.length - 1
-              );
-              LanguageIdArr = this.addMsg.LanguageId.split(",");
-              LanguageIdArr.forEach(x => {
-                this.LanguageIdS.push(Number(x));
-              });
+            var tempData = res.data.data;
+            if (tempData) {
+              this.addMsg.ID = tempData.ID;
+              this.addMsg.Type = tempData.Type;
+              this.addMsg.EmployeeId = tempData.EmployeeId;
+              this.addMsg.RB_Branch_id = tempData.RB_Branch_id;
+              this.addMsg.emRB_Department_Id = tempData.emRB_Department_Id;
+              this.addMsg.emRB_Post_Id = tempData.emRB_Post_Id;
+              this.addMsg.EmAccount = tempData.EmAccount;
+              this.addMsg.Surname = tempData.Surname;
+              this.addMsg.Name = tempData.Name;
+              this.addMsg.EnSurname = tempData.EnSurname;
+              this.addMsg.EnName = tempData.EnName;
+              this.addMsg.IdCard = tempData.IdCard;
+              this.addMsg.BirthDate = tempData.BirthDate;
+              this.addMsg.BirthPlace = tempData.BirthPlace;
+              this.addMsg.Sex = tempData.Sex.toString();
+              this.addMsg.MobilePhone = tempData.MobilePhone;
+              this.addMsg.SpareTel = tempData.SpareTel;
+              this.addMsg.Passport = tempData.Passport;
+              this.addMsg.IssuePlace = tempData.IssuePlace;
+              this.addMsg.IssueDate = tempData.IssueDate;
+              this.addMsg.ExpiryDate = tempData.ExpiryDate;
+              this.addMsg.CountryID = tempData.CountryID;
+              this.addMsg.LanguageId = tempData.LanguageId;
+              this.addMsg.Remarks = tempData.Remarks;
+              this.addMsg.VisaNumber = tempData.VisaNumber.toString();
+              this.addMsg.LeaderGuidType = tempData.LeaderGuidType.toString();
+              this.addMsg.LeaderGuidClass = tempData.LeaderGuidClass;
+              this.addMsg.ValidDate = tempData.ValidDate;
+              this.addMsg.CityName = tempData.CityName;
+              this.addMsg.EmPassword = "";
+              this.LanguageIdS = tempData.LanguageIdList;
+              if (this.addMsg.CityName && this.addMsg.CityName != '') {
+                this.searchKey(this.addMsg.CityName)
+              }
             }
-            this.searchKey(this.addMsg.CityName)
-            this.addMsg.EmPassword = "";
           });
       },
       //弹出框关闭初始化弹框内表单
@@ -1151,7 +1184,6 @@
       },
       //弹出框取消 初始化谈框内表单
       resetForm(formName) {
-        // this.$refs[formName].resetFields();
         this.initAddMsg();
         this.LanguageIdS = [];
       }

src/components/SalesModule/addPassenger.vue

@@ -188,8 +188,7 @@
           </li>
           <li>
             <el-form-item :label="$t('admin.admin_EnSurname')" prop="EName">
-              <el-input v-model='addMsg.EName' type="text" size=mini class="w230"
-                :placeholder="$t('visaT.peEnglish')">
+              <el-input v-model='addMsg.EName' type="text" size=mini class="w230" :placeholder="$t('visaT.peEnglish')">
               </el-input>
             </el-form-item>
           </li>
@@ -721,6 +720,7 @@
           EmergencyContact: "",
           EmergencyAddress: "",
           EmergencyTel: "",
+          EmergencyRelation: "",
           IsCriminalRecord: "2",
           TravelCost: "",
           TravelName: "",
@@ -1110,11 +1110,11 @@
               this.savePassenger(type);
             } else {
               this.btnState = true
-              if (this.addMsg.SurName == '') {
+              if (this.addMsg.Nationality == 2 && this.addMsg.SurName == '') {
                 this.Error(this.$t('objFill.v101.Rest.qingtxgrxx')[0]);
                 return false;
               }
-              if (this.addMsg.Name == '') {
+              if (this.addMsg.Nationality == 2 && this.addMsg.Name == '') {
                 this.Error(this.$t('objFill.v101.Rest.qingtxgrxx')[1]);
                 return false;
               }
@@ -1506,6 +1506,7 @@
         this.addMsg.EmergencyContact = "";
         this.addMsg.EmergencyAddress = "";
         this.addMsg.EmergencyTel = "";
+        this.addMsg.EmergencyRelation = "";
         this.addMsg.IsCriminalRecord = "2";
         this.addMsg.TravelCost = "";
         this.addMsg.TravelName = "";

src/components/TravelManager/TravelLeader/Leader.vue

@@ -259,10 +259,11 @@
         <li>
           <span>
             <em>{{$t('system.query_workType')}}</em>
-            <el-select v-model="msg.Type" clearable :placeholder="$t('system.ph_choice')">
+            <el-select v-model="msg.LeaderGuidClass" clearable :placeholder="$t('system.ph_choice')">
               <el-option :label="$t('system.ph_buxian')" :value='DefaultSelectValue'></el-option>
-              <el-option v-for="item in workTypeList" :key="item.Key" :label="item.Key" :value="item.Value">
-              </el-option>
+              <el-option key="0" :label="$t('op.CompanyLeader')" :value="0"></el-option>
+              <el-option key="1" :label="$t('op.THLeader')" :value="1"></el-option>
+              <el-option key="2" :label="$t('op.LXLeader')" :value="2"></el-option>
             </el-select>
           </span>
         </li>
@@ -328,7 +329,7 @@
       </div>
     </div>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
-      layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total="msg.total">
+      layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total">
     </el-pagination>
     <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center
       :before-close="closeChangeMachie">
@@ -383,7 +384,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item :label="$t('admin.admin_IDcard')" class="other_input">
           <el-input type="text" v-model="addMsg.IdCard" :placeholder="$t('admin.admin_phIDcard')" class="w210">
           </el-input>
@@ -476,7 +476,7 @@
         //默认图片
         defaultImg: 'this.src="' + require("../../../assets/img/default_head_img.jpg") + '"',
         //下拉框默认值
-        DefaultSelectValue: 0,
+        DefaultSelectValue: -1,
         //分公司默认值
         BranchDefaultValue: -1,
         //请求数据参数
@@ -489,7 +489,8 @@
           total: 0,
           currentPage: 1,
           // 查询类型【1-地接查询(领兼地和导游),2-操作查询领队】
-          QueryType: 2
+          QueryType: 2,
+          LeaderGuidClass: -1,
         },
         addMsg: {
           ID: "0",

src/components/systemManagement/airportManagement.vue

@@ -77,6 +77,7 @@
         <th>{{$t('system.table_ENname')}}</th>
         <th>{{$t('system.query_IATA')}}</th>
         <th>{{$t('system.query_ICAO')}}</th>
+        <th>所属时区</th>
         <th>{{$t('system.table_city')}}</th>
         <th>{{$t('hotel.table_operater')}}</th>
         <th>{{$t('hotel.table_operattime')}}</th>
@@ -87,6 +88,7 @@
         <td>{{item.En_name}}</td>
         <td>{{item.IATA}}</td>
         <td>{{item.ICAO}}</td>
+        <td>{{item.UTCZone}}</td>
         <td>{{item.CityName}}</td>
         <td>{{item.EmName}}</td>
         <td>{{item.UpdateDate}}</td>
@@ -149,7 +151,8 @@
           <el-input type="text" v-model="addMsg.En_name" :placeholder="$t('system.ph_ENname')" class="w210"></el-input>
         </el-form-item>
         <el-form-item :label="$t('system.query_IATA')" prop="IATA">
-          <el-input type="text" v-model="addMsg.IATA" :placeholder="$t('system.ph_IATA')" maxlength="3" class="w210">
+          <el-input type="text" v-model="addMsg.IATA" :placeholder="$t('system.ph_IATA')" maxlength="3" class="w210"
+            @blur="getAirportConfig()">
           </el-input>
         </el-form-item>
         <el-form-item :label="$t('system.query_ICAO')" prop="ICAO">
@@ -160,11 +163,14 @@
           <el-input type="text" v-model="addMsg.RankNum" :placeholder="$t('system.table_rankNum')" class="w210"
             @keyup.native="checkInteger(addMsg,'RankNum')"></el-input>
         </el-form-item>
+        <el-form-item label="所属时区">
+          <el-input type="text" v-model="addMsg.UTCZone" class="w210"></el-input>
+        </el-form-item>
         <el-form-item :label="$t('objFill.jingdu')">
-          <el-input type="text" v-model="addMsg.Lng"  class="w210"></el-input>
+          <el-input type="text" v-model="addMsg.Lng" class="w210"></el-input>
         </el-form-item>
         <el-form-item :label="$t('objFill.weidu')">
-          <el-input type="text" v-model="addMsg.Lat"  class="w210"></el-input>
+          <el-input type="text" v-model="addMsg.Lat" class="w210"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -209,6 +215,7 @@
           //纬
           Lat: '',
           TrafficType: 1, //机场
+          UTCZone: 0, //时区
         },
         DataList: [],
         BranchGetList: [],
@@ -228,47 +235,35 @@
         dialogTitle: '',
         rules: { //表单必填验证
           Country_id: [{
-              required: true,
-              message: this.$t('visaT.qxzguojia'),
-              trigger: 'change'
-            }
-            //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
+            required: true,
+            message: this.$t('visaT.qxzguojia'),
+            trigger: 'change'
+          }],
           Province_id: [{
-              required: true,
-              message: this.$t('ground.qxzs'),
-              trigger: 'change'
-            }
-            //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
+            required: true,
+            message: this.$t('ground.qxzs'),
+            trigger: 'change'
+          }],
           City_id: [{
-              required: true,
-              message: this.$t('objFill.qxzshi'),
-              trigger: 'change'
-            }
-            //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
+            required: true,
+            message: this.$t('objFill.qxzshi'),
+            trigger: 'change'
+          }],
           District_id: [{
-              required: true,
-              message: this.$t('objFill.qxzquxian'),
-              trigger: 'change'
-            }
-            //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
+            required: true,
+            message: this.$t('objFill.qxzquxian'),
+            trigger: 'change'
+          }],
           Name: [{
-              required: true,
-              message: this.$t('system.ph_name'),
-              trigger: 'blur'
-            }
-            //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
+            required: true,
+            message: this.$t('system.ph_name'),
+            trigger: 'blur'
+          }],
           En_name: [{
-              required: true,
-              message: this.$t('system.ph_ENname'),
-              trigger: 'blur'
-            }
-            //{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
-          ],
+            required: true,
+            message: this.$t('system.ph_ENname'),
+            trigger: 'blur'
+          }],
           IATA: [{
               required: true,
               message: this.$t('system.ph_IATA'),
@@ -297,6 +292,29 @@
       }
     },
     methods: {
+      getAirportConfig() {
+        var pMsg = {
+          IATA: this.addMsg.IATA,
+        };
+        if (pMsg.IATA && pMsg.IATA != '') {
+          this.apipost('airport_post_GetAirportConfig', pMsg, res => {
+            if (res.data.resultCode == 1) {
+              var tempData = res.data.data;
+              if (tempData) {
+                if (tempData.UTCZone) {
+                  this.addMsg.UTCZone = tempData.UTCZone;
+                }
+                if (tempData.Lat) {
+                  this.addMsg.Lat = tempData.Lat;
+                }
+                if (tempData.Lng) {
+                  this.addMsg.Lng = tempData.Lng;
+                }
+              }
+            }
+          }, err => {})
+        }
+      },
       getList() { //获取列表
         this.loading = true;
         if (this.msg.Country_id == '') {
@@ -507,6 +525,7 @@
         this.addMsg.Lng = '';
         this.addMsg.Lat = '';
         this.addMsg.TrafficType = 1;
+        this.addMsg.UTCZone = 0;
       },
       resetPageIndex() { //查询初始化页码
         this.msg.pageIndex = 1;