页面修改

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

@@ -721,6 +721,7 @@
           EmergencyContact: "",
           EmergencyAddress: "",
           EmergencyTel: "",
+          EmergencyRelation:"",
           IsCriminalRecord: "2",
           TravelCost: "",
           TravelName: "",
@@ -1506,6 +1507,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",