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

src/components/LeaderManagement/leaderManagement.vue

@@ -517,8 +517,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('admin.admin_IDcard')" prop="IdCard" class="other_input"
-          v-if="addMsg.LeaderGuidClass==0">
+        <el-form-item :label="$t('admin.admin_IDcard')" class="other_input" v-if="addMsg.LeaderGuidClass==0">
           <el-input type="text" v-model="addMsg.IdCard" :placeholder="$t('admin.admin_phIDcard')" class="w210">
           </el-input>
         </el-form-item>
@@ -1067,38 +1066,34 @@
         });
       },
       initAddMsg() {
-        //初始化创建、修改表单数据
-        let newMsg = {
-          ID: "0",
-          Type: "3",
-          EmployeeId: "",
-          Surname: "",
-          Name: "",
-          EnSurname: "",
-          EnName: "",
-          IdCard: "",
-          BirthDate: "",
-          BirthPlace: "",
-          Sex: "",
-          MobilePhone: "",
-          Passport: "",
-          IssuePlace: "",
-          IssueDate: "",
-          ExpiryDate: "",
-          CountryID: "",
-          LanguageId: "",
-          Remarks: "",
-          VisaNumber: "",
-          LeaderGuidType: "",
-          LeaderGuidClass: 0,
-          SpareTel: '',
-          emRB_Department_Id: '',
-          emRB_Post_Id: '',
-          RB_Branch_id: '',
-          EmAccount: '',
-          EmPassword: ''
-        };
-        this.addMsg = newMsg;
+        this.addMsg.ID = "0";
+        this.addMsg.Type = "3";
+        this.addMsg.EmployeeId = "";
+        this.addMsg.Surname = "";
+        this.addMsg.Name = "";
+        this.addMsg.EnSurname = "";
+        this.addMsg.EnName = "";
+        this.addMsg.IdCard = "";
+        this.addMsg.BirthDate = "";
+        this.addMsg.BirthPlace = "";
+        this.addMsg.Sex = "";
+        this.addMsg.MobilePhone = "";
+        this.addMsg.Passport = "";
+        this.addMsg.IssuePlace = "";
+        this.addMsg.IssueDate = "";
+        this.addMsg.ExpiryDate = "";
+        this.addMsg.CountryID = "";
+        this.addMsg.LanguageId = "";
+        this.addMsg.Remarks = "";
+        this.addMsg.VisaNumber = "";
+        this.addMsg.LeaderGuidType = "";
+        this.addMsg.LeaderGuidClass = 0;
+        this.addMsg.SpareTel = '';
+        this.addMsg.emRB_Department_Id = '';
+        this.addMsg.emRB_Post_Id = '';
+        this.addMsg.RB_Branch_id = "";
+        this.addMsg.EmAccount = "";
+        this.addMsg.EmPassword = '';
       },
       //翻页功能按钮
       handleCurrentChange(val) {
@@ -1118,6 +1113,7 @@
             ID: ID
           },
           res => {
+            console.log("leaderData",res.data.data);
             let LanguageIdArr = [];
             this.addMsg = res.data.data;
             this.addMsg.LeaderGuidClass = this.addMsg.LeaderGuidClass ? this.addMsg.LeaderGuidClass : 0;
@@ -1150,7 +1146,8 @@
       },
       //弹出框取消 初始化谈框内表单
       resetForm(formName) {
-        this.$refs[formName].resetFields();
+       // this.$refs[formName].resetFields();
+       this.initAddMsg();
         this.LanguageIdS = [];
       }
     },

src/components/TravelManager/Ticket/TravelMyTicket.vue

@@ -1082,7 +1082,6 @@
       },
       //机票转出
       setOut() {
-
         if (this.outData.ReciveEmployeeId == 0) {
           this.Warning(this.$t('objFill.v101.qingxzjsreny'));
           return false;
@@ -1094,7 +1093,7 @@
             that.outData,
             res => {
               if (res.data.resultCode == 1) {
-                that.Success(this.$t('objFill.v101.zhuancjwcgo'));
+                that.Success(that.$t('objFill.v101.zhuancjwcgo'));
                 that.isShowSet = false;
                 that.outData.ReciveEmployeeId = 0;
                 that.outData.OutNum = "";

src/components/TravelManager/TravelLeader/Leader.vue

@@ -297,7 +297,8 @@
             <div class="nainfo">{{$t('admin.admin_xing')}}：<span class="naIn">{{item.Surname}}/{{item.EnSurname}}</span>
             </div>
             <div class="nainfo">{{$t('admin.admin_ming')}}：<span class="naIn">{{item.Name}}/{{item.EnName}}</span></div>
-            <div class="midList">{{$t('system.table_sex')}}：{{item.Sex==0?$t('pub.man')+'/M':$t('pub.woman')+'/F'}}</div>
+            <div class="midList">{{$t('system.table_sex')}}：{{item.Sex==0?$t('pub.man')+'/M':$t('pub.woman')+'/F'}}
+            </div>
             <div>{{$t('system.query_company')}}：{{item.BranchName}}</div>
             <div>{{$t('system.query_goCoun')}}：{{item.CountryName}}</div>
             <div>{{$t('system.table_Passport')}}：{{item.Passport}}</div>
@@ -383,7 +384,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item :label="$t('admin.admin_IDcard')" prop="IdCard" class="other_input">
+        <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>
         </el-form-item>
@@ -875,30 +876,30 @@
         });
       },
       initAddMsg() {
-        //初始化创建、修改表单数据
-        let newMsg = {
-          ID: "0",
-          Type: 1,
-          EmployeeId: "",
-          Surname: "",
-          Name: "",
-          EnSurname: "",
-          EnName: "",
-          IdCard: "",
-          BirthDate: "",
-          BirthPlace: "",
-          Sex: "",
-          MobilePhone: "",
-          Passport: "",
-          IssuePlace: "",
-          IssueDate: "",
-          ExpiryDate: "",
-          CountryID: "",
-          LanguageId: "",
-          Remarks: "",
-          VisaNumber: ""
-        };
-        this.addMsg = newMsg;
+        this.addMsg.ID = "0";
+        this.addMsg.Type = 1;
+        this.addMsg.EmployeeId = "";
+        this.addMsg.Surname = "";
+        this.addMsg.Name = "";
+        this.addMsg.EnSurname = "";
+        this.addMsg.EnName = "";
+        this.addMsg.IdCard = "";
+        this.addMsg.BirthDate = "";
+        this.addMsg.BirthPlace = "";
+        this.addMsg.Sex = "";
+        this.addMsg.MobilePhone = "";
+        this.addMsg.SpareTel = "";
+        this.addMsg.Passport = "";
+        this.addMsg.IssuePlace = "";
+        this.addMsg.IssueDate = "";
+        this.addMsg.ExpiryDate = "";
+        this.addMsg.CountryID = "";
+        this.addMsg.LanguageId = "";
+        this.addMsg.Remarks = "";
+        this.addMsg.VisaNumber = "";
+        this.addMsg.LeaderGuidType = "";
+        this.addMsg.LeaderGuidClass = "";
+        this.addMsg.ValidDate = "";
       },
       //翻页功能按钮
       handleCurrentChange(val) {