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

src/components/FinancialModule/accDetail/AccountNewCollectingOrPay.vue

@@ -427,9 +427,9 @@ export default {
           if(this.msg.RB_Branch_Id==0&&this.msg.HelpBranchId==1218){TemplateId2=35;FBranchId=1218;}
           if(this.msg.RB_Branch_Id==1218&&this.msg.HelpBranchId==0){TemplateId2=35;FBranchId=1218;}
 
-          if(this.msg.RB_Branch_Id==1252&&this.msg.HelpBranchId==0){TemplateId2=35;FBranchId=1252;}
+          if(this.msg.RB_Branch_Id==1252&&this.msg.HelpBranchId==0){TemplateId2=292;FBranchId=1252;}
           if(this.msg.RB_Branch_Id==1252&&this.msg.HelpBranchId==1218){TemplateId2=292;}
-          if(this.msg.RB_Branch_Id==0&&this.msg.HelpBranchId==1252){TemplateId2=35;FBranchId=1252;}
+          if(this.msg.RB_Branch_Id==0&&this.msg.HelpBranchId==1252){TemplateId2=292;FBranchId=1252;}
           if(this.msg.RB_Branch_Id==1218&&this.msg.HelpBranchId==1252){TemplateId2=292;}
 
           if(this.msg.RB_Branch_Id==1248||this.msg.HelpBranchId==1248){TemplateId2=289;FBranchId=1248;}

src/components/SalesModule/addPassenger.vue

@@ -930,13 +930,13 @@
         if(type) {
           findIndex = this.options.findIndex(x=>x.value==e)
           let obj = this.options[findIndex]
-          this.addMsg.SurName = obj.name
-          this.addMsg.ESurName = obj.label
+          this.addMsg.SurName = obj.name.toUpperCase();
+          this.addMsg.ESurName = obj.label.toUpperCase();
         }else{
           findIndex = this.optionsNames.findIndex(x=>x.value==e)
           let obj = this.optionsNames[findIndex]
-          this.addMsg.Name = obj.name
-          this.addMsg.EName = obj.label
+          this.addMsg.Name = obj.name.toUpperCase();
+          this.addMsg.EName = obj.label.toUpperCase();
         }
       },
       remoteMethod(query,type) {
@@ -1092,12 +1092,12 @@
             if (tempObj) {
               //中文姓
               if (tempObj.SurName && tempObj.SurName != '') {
-                this.addMsg.SurName = tempObj.SurName;
+                this.addMsg.SurName = tempObj.SurName.toUpperCase();
                 this.Transformation(this.addMsg.SurName, 'SurName');
               }
               //中文名
               if (tempObj.Name && tempObj.Name != '') {
-                this.addMsg.Name = tempObj.Name;
+                this.addMsg.Name = tempObj.Name.toUpperCase();
                 this.Transformation(this.addMsg.Name, 'Name');
               }
               //性别
@@ -1388,7 +1388,7 @@
             this.options.push({
               label: x.toUpperCase(),
               value: index+1,
-              name: this.addMsg.SurName,
+              name: this.addMsg.SurName.toUpperCase(),
             })
           })
          if(names!=null&&names.length==1){
@@ -1423,16 +1423,21 @@
             this.optionsNames.push({
               label: x.toUpperCase(),
               value: index+1,
-              name: this.addMsg.Name,
+              name: this.addMsg.Name.toUpperCase(),
             })
           })
           if(names!=null&&names.length==1){
-            setTimeout(() => {
-              if(this.optionsNames.length>0){
-                this.addMsg.NameID=this.optionsNames[0].value;
-                this.addMsg.EName=this.optionsNames[0].label;
-              }
-            }, 500);
+            if(input){
+              this.addMsg.NameID = this.optionsNames[0].value;
+              this.addMsg.EName = this.optionsNames[0].label;
+            }else{
+              setTimeout(() => {
+                  if(this.optionsNames.length>0){
+                    this.addMsg.NameID=this.optionsNames[0].value;
+                    this.addMsg.EName=this.optionsNames[0].label;
+                  }
+              }, 500);
+            }
           }else{
             let findIndex = this.optionsNames.findIndex(x=>x.label==this.addMsg.EName)
             if(findIndex!=-1){
@@ -1908,17 +1913,17 @@
           },
 
            getData: function () {
-        this.loading = true
-        this.apipost("sellorder_get_GetTravelGuestList", {
-          OrderId: this.$route.query.orderId
-        }, res => {
-          if (res.data.resultCode == 1) {
-            this.GroupStartDateStr = res.data.data.GroupStartDateStr;
-          } else {
-            this.$message.error(res.data.message)
-          }
-          this.loading = false
-        });
+            this.loading = true
+            this.apipost("sellorder_get_GetTravelGuestList", {
+              OrderId: this.$route.query.orderId
+            }, res => {
+              if (res.data.resultCode == 1) {
+                this.GroupStartDateStr = res.data.data.GroupStartDateStr;
+              } else {
+                this.$message.error(res.data.message)
+              }
+              this.loading = false
+            });
       },
     },
     mounted() {